Author: rob.stryker(a)jboss.com
Date: 2009-06-03 05:21:14 -0400 (Wed, 03 Jun 2009)
New Revision: 15672
Modified:
branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java
branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties
branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
Log:
fix for JBIDE-3394 to branch
Modified:
branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java
===================================================================
---
branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java 2009-06-03
08:49:42 UTC (rev 15671)
+++
branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java 2009-06-03
09:21:14 UTC (rev 15672)
@@ -259,6 +259,7 @@
rtToPortsFile.put("org.jboss.ide.eclipse.as.runtime.40", new
Path("properties").append("jboss.40.default.ports.properties"));
rtToPortsFile.put("org.jboss.ide.eclipse.as.runtime.42", new
Path("properties").append("jboss.42.default.ports.properties"));
rtToPortsFile.put("org.jboss.ide.eclipse.as.runtime.50", new
Path("properties").append("jboss.50.default.ports.properties"));
+ rtToPortsFile.put("org.jboss.ide.eclipse.as.runtime.51", new
Path("properties").append("jboss.51.default.ports.properties"));
rtToPortsFile.put("org.jboss.ide.eclipse.as.runtime.eap.43", new
Path("properties").append("jboss.eap.43.default.ports.properties"));
}
Modified:
branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties
===================================================================
---
branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties 2009-06-03
08:49:42 UTC (rev 15671)
+++
branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties 2009-06-03
09:21:14 UTC (rev 15672)
@@ -19,6 +19,10 @@
jboss.version.50.description=JBoss Application Server 5.0
jboss.version.50.runtime.name=JBoss 5.0 Runtime
+jboss.version.51.name=JBoss AS 5.1
+jboss.version.51.description=JBoss Application Server 5.1
+jboss.version.51.runtime.name=JBoss 5.1 Runtime
+
jboss.eap.version.43.name=JBoss Enterprise Application Platform 4.3
jboss.eap.version.43.description=JBoss Enterprise Application Platform (EAP) 4.3
jboss.eap.version.43.runtime.name=JBoss Enterprise Application Platform 4.3 Runtime
Modified: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
===================================================================
---
branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2009-06-03
08:49:42 UTC (rev 15671)
+++
branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2009-06-03
09:21:14 UTC (rev 15672)
@@ -79,6 +79,23 @@
<serverType
behaviourClass="org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior"
class="org.jboss.ide.eclipse.as.core.server.internal.JBossServer"
+ description="%jboss.version.51.description"
+ hasConfiguration="false"
+ id="org.jboss.ide.eclipse.as.51"
+ initialState="stopped"
+
launchConfigId="org.jboss.ide.eclipse.as.core.server.startupConfiguration"
+ launchModes="run,debug,profile"
+ name="%jboss.version.51.name"
+ runtime="true"
+ runtimeTypeId="org.jboss.ide.eclipse.as.runtime.51"
+ startBeforePublish="false"
+ startTimeout="450000"
+ stopTimeout="450000"
+ supportsRemoteHosts="false"/>
+
+ <serverType
+
behaviourClass="org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior"
+ class="org.jboss.ide.eclipse.as.core.server.internal.JBossServer"
description="%jboss.eap.version.43.description"
hasConfiguration="false"
id="org.jboss.ide.eclipse.as.eap.43"
@@ -237,7 +254,41 @@
versions="4.2,4.3,4.4,4.5,5.0">
</moduleType>
</runtimeType>
+ <runtimeType
+ vendor="%providerName"
+
class="org.jboss.ide.eclipse.as.core.server.internal.LocalJBossServerRuntime"
+ description="%jboss.version.51.description"
+ name="%jboss.version.51.runtime.name"
+ id="org.jboss.ide.eclipse.as.runtime.51"
+ version="5.1">
+ <moduleType
+ types="jst.web"
+ versions="2.2, 2.3, 2.4, 2.5"/>
+ <moduleType
+ types="jst.ejb"
+ versions="1.0, 1.1, 2.0, 2.1, 3.0"/>
+ <moduleType
+ types="jst.ear"
+ versions="1.2, 1.3, 1.4, 5.0"/>
+ <moduleType
+ types="jst.connector"
+ versions="1.0, 1.5"/>
+ <moduleType
+ types="jst.utility"
+ versions="1.0"/>
+ <moduleType
+ types="jboss.package"
+ versions="1.0"/>
+ <moduleType
+ types="jboss.singlefile"
+ versions="1.0"/>
+ <moduleType
+ types="jst.jboss.esb"
+ versions="4.2,4.3,4.4,4.5,5.0">
+ </moduleType>
+ </runtimeType>
+
<runtimeType
vendor="%enterpriseProviderName"
class="org.jboss.ide.eclipse.as.core.server.internal.LocalJBossServerRuntime"
@@ -436,6 +487,10 @@
runtimeTypeId="org.jboss.ide.eclipse.as.runtime.50"
runtime-component="org.jboss.ide.eclipse.as.runtime.component"
version="5.0"/>
+ <runtimeFacetMapping
+ runtimeTypeId="org.jboss.ide.eclipse.as.runtime.51"
+ runtime-component="org.jboss.ide.eclipse.as.runtime.component"
+ version="5.1"/>
<runtimeFacetMapping
runtimeTypeId="org.jboss.ide.eclipse.as.runtime.stripped"
runtime-component="org.jboss.ide.eclipse.as.runtime.stripped.component"
@@ -505,6 +560,9 @@
<runtime-component-version
type="org.jboss.ide.eclipse.as.runtime.component"
version="5.0"/>
+ <runtime-component-version
+ type="org.jboss.ide.eclipse.as.runtime.component"
+ version="5.1"/>
<supported>
@@ -559,6 +617,19 @@
<facet id="jst.appclient" version="1.2,1.3,1.4,5.0"/>
</supported>
+ <supported>
+ <runtime-component
+ id="org.jboss.ide.eclipse.as.runtime.component"
+ version="5.1"/>
+ <facet id="jst.web" version="2.2,2.3,2.4,2.5"/>
+ <facet id="jst.java" version="1.3,1.4,5.0,6.0"/>
+ <facet id="jst.utility" version="1.0"/>
+ <facet id="jst.connector" version="1.0,1.5"/>
+ <facet id="jst.ejb" version="2.0,2.1,3.0"/>
+ <facet id="jst.ear" version="1.2,1.3,1.4,5.0"/>
+ <facet id="jst.appclient" version="1.2,1.3,1.4,5.0"/>
+ </supported>
+
</extension>
Modified: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
===================================================================
--- branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2009-06-03
08:49:42 UTC (rev 15671)
+++ branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2009-06-03
09:21:14 UTC (rev 15672)
@@ -9,11 +9,11 @@
point="org.eclipse.wst.server.ui.serverImages">
<image
icon="icons/jboss.gif"
-
typeIds="org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.eap.43"
+
typeIds="org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.eap.43"
id="org.jboss.ide.eclipse.as.ui.jbossIcon"/>
<image
icon="icons/jboss.gif"
-
typeIds="org.jboss.ide.eclipse.as.runtime.32,org.jboss.ide.eclipse.as.runtime.40,org.jboss.ide.eclipse.as.runtime.42,org.jboss.ide.eclipse.as.runtime.50,org.jboss.ide.eclipse.as.runtime.eap.43"
+
typeIds="org.jboss.ide.eclipse.as.runtime.32,org.jboss.ide.eclipse.as.runtime.40,org.jboss.ide.eclipse.as.runtime.42,org.jboss.ide.eclipse.as.runtime.50,org.jboss.ide.eclipse.as.runtime.51,org.jboss.ide.eclipse.as.runtime.eap.43"
id="org.jboss.ide.eclipse.as.ui.jbossIcon"/>
<!--
@@ -65,12 +65,12 @@
point="org.eclipse.wst.server.ui.wizardFragments">
<fragment
class="org.jboss.ide.eclipse.as.ui.wizards.JBossRuntimeWizardFragment"
-
typeIds="org.jboss.ide.eclipse.as.runtime.32,org.jboss.ide.eclipse.as.runtime.40,org.jboss.ide.eclipse.as.runtime.42,org.jboss.ide.eclipse.as.runtime.50,org.jboss.ide.eclipse.as.runtime.eap.43"
+
typeIds="org.jboss.ide.eclipse.as.runtime.32,org.jboss.ide.eclipse.as.runtime.40,org.jboss.ide.eclipse.as.runtime.42,org.jboss.ide.eclipse.as.runtime.50,org.jboss.ide.eclipse.as.runtime.51,org.jboss.ide.eclipse.as.runtime.eap.43"
id="org.jboss.ide.eclipse.as.ui.jboss32RuntimeWizardFragmentragment"/>
<fragment
class="org.jboss.ide.eclipse.as.ui.wizards.JBossServerWizardFragment"
id="org.jboss.ide.eclipse.as.ui.jbossServerWizardFragment"
-
typeIds="org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.eap.43"/>
+
typeIds="org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.eap.43"/>
<fragment
class="org.jboss.ide.eclipse.as.ui.wizards.StrippedServerWizardFragment"
id="org.jboss.ide.eclipse.as.ui.strippedServerWizardFragment"
@@ -177,25 +177,25 @@
id="org.jboss.ide.eclipse.as.ui.editor.deployServer.deployDir"
insertionId="org.eclipse.wst.server.editor.overview.left"
order="10"
- typeIds="org.jboss.ide.eclipse.as.systemCopyServer,
org.jboss.ide.eclipse.as.32, org.jboss.ide.eclipse.as.40, org.jboss.ide.eclipse.as.42,
org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.eap.43"/>
+ typeIds="org.jboss.ide.eclipse.as.systemCopyServer,
org.jboss.ide.eclipse.as.32, org.jboss.ide.eclipse.as.40, org.jboss.ide.eclipse.as.42,
org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.eap.43"/>
<section
class="org.jboss.ide.eclipse.as.ui.editor.PollerSection"
id="org.jboss.ide.eclipse.as.ui.editor.pollerSection"
insertionId="org.eclipse.wst.server.editor.overview.right"
order="10"
- typeIds="org.jboss.ide.eclipse.as.32, org.jboss.ide.eclipse.as.40,
org.jboss.ide.eclipse.as.42,
org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.eap.43"/>
+ typeIds="org.jboss.ide.eclipse.as.32, org.jboss.ide.eclipse.as.40,
org.jboss.ide.eclipse.as.42,
org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.eap.43"/>
<section
class="org.jboss.ide.eclipse.as.ui.editor.PortSection"
id="org.jboss.ide.eclipse.as.ui.editor.portSection"
insertionId="org.eclipse.wst.server.editor.overview.right"
order="11"
- typeIds="org.jboss.ide.eclipse.as.32, org.jboss.ide.eclipse.as.40,
org.jboss.ide.eclipse.as.42,
org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.eap.43"/>
+ typeIds="org.jboss.ide.eclipse.as.32, org.jboss.ide.eclipse.as.40,
org.jboss.ide.eclipse.as.42,
org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.eap.43"/>
<section
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"
-
typeIds="org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.eap.43"/>
+
typeIds="org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.eap.43"/>
</extension>