Author: rob.stryker(a)jboss.com Date: 2011-12-12 09:25:10 -0500 (Mon, 12 Dec 2011) New Revision: 37218 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/properties/TODO Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/plugin.xml trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/CustomRuntimeClasspathModel.java 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/util/IJBossToolingConstants.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerCreationUtils.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/plugin.properties trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/plugin.xml trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.properties trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml Log: JBIDE-10430 NEW_SERVER_ADAPTER constants added all over the codebase where appropriate, also fixed the jira Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/plugin.xml 2011-12-12 14:05:42 UTC (rev 37217) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/plugin.xml 2011-12-12 14:25:10 UTC (rev 37218) @@ -101,6 +101,13 @@ <factory class="org.jboss.ide.eclipse.as.classpath.core.runtime.ProjectRuntimeClasspathProvider$Factory"/> <type class="org.eclipse.jst.common.project.facet.core.IClasspathProvider"/> </adapter> + + <adapter> + <runtime-component + id="org.jboss.ide.eclipse.as.runtime.component" version="7.1"/> + <factory class="org.jboss.ide.eclipse.as.classpath.core.runtime.ProjectRuntimeClasspathProvider$Factory"/> + <type class="org.eclipse.jst.common.project.facet.core.IClasspathProvider"/> + </adapter> <adapter> <runtime-component @@ -115,12 +122,22 @@ <factory class="org.jboss.ide.eclipse.as.classpath.core.runtime.ProjectRuntimeClasspathProvider$Factory"/> <type class="org.eclipse.jst.common.project.facet.core.IClasspathProvider"/> </adapter> + + <adapter> + <runtime-component + id="org.jboss.ide.eclipse.eap.runtime.component" version="6.0"/> + <factory class="org.jboss.ide.eclipse.as.classpath.core.runtime.ProjectRuntimeClasspathProvider$Factory"/> + <type class="org.eclipse.jst.common.project.facet.core.IClasspathProvider"/> + </adapter> + <!-- NEW_SERVER_ADAPTER Add the adapter for the new runtime above this line --> </extension> + + <!-- NEW_SERVER_ADAPTER add id for new runtime in the runtimeIds field below --> <extension point="org.eclipse.jst.server.core.runtimeClasspathProviders"> <runtimeClasspathProvider id="org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget" - runtimeTypeIds="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.60,org.jboss.ide.eclipse.as.runtime.70,org.jboss.ide.eclipse.as.runtime.eap.43,org.jboss.ide.eclipse.as.runtime.eap.50" + runtimeTypeIds="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.60,org.jboss.ide.eclipse.as.runtime.70,org.jboss.ide.eclipse.as.runtime.71,org.jboss.ide.eclipse.as.runtime.eap.43,org.jboss.ide.eclipse.as.runtime.eap.50,org.jboss.ide.eclipse.as.runtime.eap.60" class="org.jboss.ide.eclipse.as.classpath.core.runtime.ClientAllRuntimeClasspathProvider"/> </extension> <extension Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/CustomRuntimeClasspathModel.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/CustomRuntimeClasspathModel.java 2011-12-12 14:05:42 UTC (rev 37217) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/CustomRuntimeClasspathModel.java 2011-12-12 14:25:10 UTC (rev 37218) @@ -98,6 +98,10 @@ if(AS_70.equals(type.getId())) return getDefaultAS70Entries(); + if(AS_71.equals(type.getId())) + return getDefaultAS70Entries(); + + // NEW_SERVER_ADAPTER add logic for new adapter here return new IDefaultPathProvider[]{}; } 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-12-12 14:05:42 UTC (rev 37217) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java 2011-12-12 14:25:10 UTC (rev 37218) @@ -271,6 +271,7 @@ rtToPortsFile.put(IConstants.EAP_43, properties.append(IJBossToolingConstants.DEFAULT_PROPS_EAP_43)); rtToPortsFile.put(IConstants.EAP_50, properties.append(IJBossToolingConstants.DEFAULT_PROPS_EAP_50)); rtToPortsFile.put(IConstants.EAP_60, properties.append(IJBossToolingConstants.DEFAULT_PROPS_70)); + // TODO NEW_SERVER_ADAPTER Add the new server ID to port mapping file above this line } private static ArrayList<XPathCategory> loadDefaults(IServer server, String configFolder) { 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-12-12 14:05:42 UTC (rev 37217) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java 2011-12-12 14:25:10 UTC (rev 37218) @@ -29,6 +29,7 @@ public static final String EAP_43 = "org.jboss.ide.eclipse.as.runtime.eap.43"; //$NON-NLS-1$ public static final String EAP_50 = "org.jboss.ide.eclipse.as.runtime.eap.50"; //$NON-NLS-1$ public static final String EAP_60 = "org.jboss.ide.eclipse.as.runtime.eap.60"; //$NON-NLS-1$ + // NEW_SERVER_ADAPTER Add the new runtime constant above this line public static final String SERVER_AS_32 = "org.jboss.ide.eclipse.as.32"; //$NON-NLS-1$ public static final String SERVER_AS_40 = "org.jboss.ide.eclipse.as.40"; //$NON-NLS-1$ @@ -42,6 +43,7 @@ public static final String SERVER_EAP_43 = "org.jboss.ide.eclipse.as.eap.43"; //$NON-NLS-1$ public static final String SERVER_EAP_50 = "org.jboss.ide.eclipse.as.eap.50"; //$NON-NLS-1$ public static final String SERVER_EAP_60 = "org.jboss.ide.eclipse.as.eap.60"; //$NON-NLS-1$ + // NEW_SERVER_ADAPTER Add the new server id above this line public static final String DEPLOY_ONLY_RUNTIME = "org.jboss.ide.eclipse.as.runtime.stripped"; //$NON-NLS-1$ public static final String DEPLOY_ONLY_SERVER = "org.jboss.ide.eclipse.as.systemCopyServer"; //$NON-NLS-1$ @@ -60,8 +62,8 @@ public static final String V6_1 = "6.1"; //$NON-NLS-1$ public static final String V7_0 = "7.0"; //$NON-NLS-1$ public static final String V7_1 = "7.1"; //$NON-NLS-1$ + // NEW_SERVER_ADAPTER Add the new version string above this line - /* Files or folders inside the TOOLING */ public static final String LOG = "log"; //$NON-NLS-1$ public static final String TEMP_DEPLOY = "tempDeploy"; //$NON-NLS-1$ @@ -85,6 +87,7 @@ 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$ public static final String DEFAULT_PROPS_EAP_60 = "jboss.eap.60.default.ports.properties"; //$NON-NLS-1$ + // NEW_SERVER_ADAPTER Add the new properties file for this server adapter above this line // Poller constants public static final String DEFAULT_STARTUP_POLLER = WebPortPoller.WEB_POLLER_ID; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerCreationUtils.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerCreationUtils.java 2011-12-12 14:05:42 UTC (rev 37217) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerCreationUtils.java 2011-12-12 14:25:10 UTC (rev 37218) @@ -34,6 +34,7 @@ runtimeServerTypeMap.put(IJBossToolingConstants.AS_70, IJBossToolingConstants.SERVER_AS_70); runtimeServerTypeMap.put(IJBossToolingConstants.EAP_43, IJBossToolingConstants.SERVER_EAP_43); runtimeServerTypeMap.put(IJBossToolingConstants.EAP_50, IJBossToolingConstants.SERVER_EAP_50); + // NEW_SERVER_ADAPTER Add the server / runtime mapping here } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties 2011-12-12 14:05:42 UTC (rev 37217) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties 2011-12-12 14:25:10 UTC (rev 37218) @@ -56,6 +56,8 @@ deploy.server.name=Deploy Only deploy.server.description=A server which only provides a deploy folder for publishing. + +# NEW_SERVER_ADAPTER Add the new runtime and server ID to the proper constants below! AllJBossRuntimeTypes=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.60,org.jboss.ide.eclipse.as.runtime.70,org.jboss.ide.eclipse.as.runtime.71,org.jboss.ide.eclipse.as.runtime.eap.43,org.jboss.ide.eclipse.as.runtime.eap.50,org.jboss.ide.eclipse.as.runtime.eap.60 AllJBossServerTypes=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.60,org.jboss.ide.eclipse.as.70,org.jboss.ide.eclipse.as.71,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50,org.jboss.ide.eclipse.as.eap.60, AllJBTServerTypes=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.60,org.jboss.ide.eclipse.as.70,org.jboss.ide.eclipse.as.71,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50,org.jboss.ide.eclipse.as.eap.60,org.jboss.ide.eclipse.as.systemCopyServer Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2011-12-12 14:05:42 UTC (rev 37217) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2011-12-12 14:25:10 UTC (rev 37218) @@ -213,8 +213,10 @@ runtimeTypeId="org.jboss.ide.eclipse.as.runtime.stripped" supportsRemoteHosts="true"/> - </extension> + <!-- NEW_SERVER_ADAPTER Add the new server type above this line --> + </extension> + <extension point="org.eclipse.wst.server.core.runtimeTypes"> <runtimeType @@ -447,8 +449,9 @@ <moduleType types="bpel.module" versions="1.1, 2.0"/> <moduleType types="jboss.osgi" versions="1.0"/> </runtimeType> + + <!-- NEW_SERVER_ADAPTER Add the new Runtime type above this line --> - <runtimeType class="org.jboss.ide.eclipse.as.core.server.internal.DeployableServerRuntime" description="%deploy.runtime.description" @@ -604,6 +607,7 @@ supportsShutdown="true" supportsStartup="true"> </serverPoller> + <!-- NEW_SERVER_ADAPTER Add a new management poller above if the new server type requires a custom poller --> </extension> @@ -662,6 +666,7 @@ runtimeTypeId="org.jboss.ide.eclipse.as.runtime.eap.60" runtime-component="org.jboss.ide.eclipse.eap.runtime.component" version="6.0"/> + <!-- NEW_SERVER_ADAPTER Add the new runtime to runtime-component mapping above this line --> </extension> @@ -885,6 +890,7 @@ <facet id="jst.webfragment" version="3.0"/> </supported> + <!-- NEW_SERVER_ADAPTER Add the new runtime component version and facets above this line --> </extension> @@ -979,6 +985,7 @@ version="6.0"> </facet> </default-facets> + <!-- NEW_SERVER_ADAPTER Add the new default facet for a new runtime above this line --> </extension> <extension @@ -1142,7 +1149,10 @@ typeId="local"> </behaviour> </extension> + <!-- NEW_SERVER_ADAPTER Add the behaviour extension for a new server type above this line --> + + <!-- The default publisher declaration. --> <extension point="org.jboss.ide.eclipse.as.core.publishers"> Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/properties/TODO =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/properties/TODO (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/properties/TODO 2011-12-12 14:25:10 UTC (rev 37218) @@ -0,0 +1 @@ +# NEW_SERVER_ADAPTER Add the default port xpaths in it's own file in this folder \ No newline at end of file Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/plugin.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/plugin.properties 2011-12-12 14:05:42 UTC (rev 37217) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/plugin.properties 2011-12-12 14:25:10 UTC (rev 37218) @@ -2,6 +2,7 @@ Bundle-Name.0 = JBossAS RSE Tools RSEMethodName=Remote System Deployment +# Add the new runtime and server id's to the constants below when applicable AllJBossRuntimeTypes=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.60,org.jboss.ide.eclipse.as.runtime.70,org.jboss.ide.eclipse.as.runtime.71,org.jboss.ide.eclipse.as.runtime.eap.43,org.jboss.ide.eclipse.as.runtime.eap.50,org.jboss.ide.eclipse.as.runtime.eap.60 AllJBossServerTypes=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.60,org.jboss.ide.eclipse.as.70,org.jboss.ide.eclipse.as.71,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50,org.jboss.ide.eclipse.as.eap.60, AllJBTServerTypes=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.60,org.jboss.ide.eclipse.as.70,org.jboss.ide.eclipse.as.71,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50,org.jboss.ide.eclipse.as.eap.60,org.jboss.ide.eclipse.as.systemCopyServer Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/plugin.xml 2011-12-12 14:05:42 UTC (rev 37217) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/plugin.xml 2011-12-12 14:25:10 UTC (rev 37218) @@ -23,4 +23,5 @@ typeId="rse"> </behaviour> </extension> + <!-- NEW_SERVER_ADAPTER Add the new RSE behaviour delegate if needed for the new server above this line --> </plugin> Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.properties 2011-12-12 14:05:42 UTC (rev 37217) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.properties 2011-12-12 14:25:10 UTC (rev 37218) @@ -23,6 +23,7 @@ NavigatorContent_XMLConfiguration=XML Configuration NavigatorContent_JMX=JMX +# NEW_SERVER_ADAPTER Add the new server and runtime ids to the constants below this line when applicable AllJBossRuntimeTypes=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.60,org.jboss.ide.eclipse.as.runtime.70,org.jboss.ide.eclipse.as.runtime.71,org.jboss.ide.eclipse.as.runtime.eap.43,org.jboss.ide.eclipse.as.runtime.eap.50,org.jboss.ide.eclipse.as.runtime.eap.60 AllJBossServerTypes=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.60,org.jboss.ide.eclipse.as.70,org.jboss.ide.eclipse.as.71,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50,org.jboss.ide.eclipse.as.eap.60, AllJBTServerTypes=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.60,org.jboss.ide.eclipse.as.70,org.jboss.ide.eclipse.as.71,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50,org.jboss.ide.eclipse.as.eap.60,org.jboss.ide.eclipse.as.systemCopyServer 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-12 14:05:42 UTC (rev 37217) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2011-12-12 14:25:10 UTC (rev 37218) @@ -45,6 +45,7 @@ class="org.jboss.ide.eclipse.as.ui.wizards.JBoss7ServerWizardFragment" id="org.jboss.ide.eclipse.as.ui.jboss7ServerWizardFragment" typeIds="%ServerTypesJBoss7"/> + <!-- NEW_SERVER_ADAPTER Add the wizard fragment (if applicable) for the new server adapter above this line --> <fragment class="org.jboss.ide.eclipse.as.ui.wizards.StrippedServerWizardFragment" id="org.jboss.ide.eclipse.as.ui.strippedServerWizardFragment" @@ -187,6 +188,8 @@ insertionId="org.eclipse.wst.server.editor.overview.left" order="9" typeIds="%AllJBTServerTypes"/> + + <!-- NEW_SERVER_ADAPTER Add the server editor sections for a new server above this line --> </extension> @@ -281,6 +284,8 @@ class="org.jboss.ide.eclipse.as.ui.editor.PortSection$JBoss7ManagementPortEditorExtension" serverIds="%ServerTypesJBoss7"> </section> + + <!-- NEW_SERVER_ADAPTER Add the new port sections in the server editor above this line --> </extension>