[jbosstools-commits] JBoss Tools SVN: r6320 - in trunk/as/plugins: org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/ejb3 and 8 other directories.

Author: rob.stryker(a)jboss.com Date: 2008-02-14 18:14:19 -0500 (Thu, 14 Feb 2008) New Revision: 6320 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java Removed: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossServerRuntime.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBoss32ServerRuntime.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBoss40ServerRuntime.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBoss42ServerRuntime.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBoss50ServerRuntime.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer50.java 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/ejb3/EJB30SupportVerifier.java trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ClientAllRuntimeClasspathProvider.java trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/WebtoolsProjectJBossClasspathContainerInitializer.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/server/IJBossServerRuntime.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml Log: JBIDE-1774 server startup, shutdown, and project classpath with 5.0 runtimes completed. 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 2008-02-14 20:55:44 UTC (rev 6319) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/plugin.xml 2008-02-14 23:14:19 UTC (rev 6320) @@ -32,6 +32,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="5.0"/> + <factory class="org.jboss.ide.eclipse.as.classpath.core.runtime.ProjectRuntimeClasspathProvider$Factory"/> + <type class="org.eclipse.jst.common.project.facet.core.IClasspathProvider"/> + </adapter> </extension> <extension @@ -46,7 +53,7 @@ <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" + 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" 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/ejb3/EJB30SupportVerifier.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/ejb3/EJB30SupportVerifier.java 2008-02-14 20:55:44 UTC (rev 6319) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/ejb3/EJB30SupportVerifier.java 2008-02-14 23:14:19 UTC (rev 6320) @@ -26,7 +26,7 @@ import org.eclipse.jdt.core.IClasspathEntry; import org.eclipse.wst.server.core.IRuntime; import org.jboss.ide.eclipse.as.classpath.core.runtime.WebtoolsProjectJBossClasspathContainerInitializer.WebtoolsProjectJBossClasspathContainer; -import org.jboss.ide.eclipse.as.core.server.internal.AbstractJBossServerRuntime; +import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; /** * @@ -35,7 +35,7 @@ */ public class EJB30SupportVerifier { public static boolean verify(IRuntime rt) { - AbstractJBossServerRuntime ajbsr = (AbstractJBossServerRuntime)rt.loadAdapter(AbstractJBossServerRuntime.class, null); + IJBossServerRuntime ajbsr = (IJBossServerRuntime)rt.loadAdapter(IJBossServerRuntime.class, null); // i refuse to verify. if they say they support, believe them if( ajbsr == null ) return true; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ClientAllRuntimeClasspathProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ClientAllRuntimeClasspathProvider.java 2008-02-14 20:55:44 UTC (rev 6319) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ClientAllRuntimeClasspathProvider.java 2008-02-14 23:14:19 UTC (rev 6320) @@ -33,7 +33,7 @@ import org.eclipse.jst.server.core.RuntimeClasspathProviderDelegate; import org.eclipse.wst.server.core.IRuntime; import org.jboss.ide.eclipse.as.classpath.core.ClasspathCorePlugin; -import org.jboss.ide.eclipse.as.core.server.internal.AbstractJBossServerRuntime; +import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; /** * This class uses the "throw everything you can find" strategy @@ -54,8 +54,8 @@ if( runtime == null ) return new IClasspathEntry[0]; - AbstractJBossServerRuntime ajbsrt = (AbstractJBossServerRuntime)runtime.loadAdapter(AbstractJBossServerRuntime.class, new NullProgressMonitor()); - if( ajbsrt == null ) { + IJBossServerRuntime jbsrt = (IJBossServerRuntime)runtime.loadAdapter(IJBossServerRuntime.class, new NullProgressMonitor()); + if( jbsrt == null ) { // log error IStatus status = new Status(IStatus.WARNING, ClasspathCorePlugin.PLUGIN_ID, "Runtime " + runtime.getName() + "is not of the proper type"); ClasspathCorePlugin.getDefault().getLog().log(status); @@ -63,28 +63,30 @@ } IPath loc = runtime.getLocation(); - String config = ajbsrt.getJBossConfiguration(); - if( runtime.getRuntimeType().getId().endsWith("32")) { + String config = jbsrt.getJBossConfiguration(); + String version = runtime.getRuntimeType().getVersion(); + if( "3.2".equals(version)) return get32(loc, config); - } else if( runtime.getRuntimeType().getId().endsWith("40")) { - return get40(loc, config); - } else if( runtime.getRuntimeType().getId().endsWith("42")) { - return get42(loc, config); - } + if( "4.0".equals(version)) + return get40(loc,config); + if("4.2".equals(version)) + return get42(loc,config); + if("5.0".equals(version)) + return get50(loc,config); return null; } protected IClasspathEntry[] get32(IPath location, String config) { - ArrayList list = new ArrayList(); + ArrayList<IClasspathEntry> list = new ArrayList<IClasspathEntry>(); IPath configPath = location.append("server").append(config); addEntries(location.append("client"), list); addEntries(location.append("lib"), list); addEntries(configPath.append("lib"), list); - return (IClasspathEntry[]) list.toArray(new IClasspathEntry[list.size()]); + return list.toArray(new IClasspathEntry[list.size()]); } protected IClasspathEntry[] get40(IPath location, String config) { - ArrayList list = new ArrayList(); + ArrayList<IClasspathEntry> list = new ArrayList<IClasspathEntry>(); IPath configPath = location.append("server").append(config); IPath deployPath = configPath.append("deploy"); addEntries(location.append("client"), list); @@ -93,11 +95,11 @@ addEntries(deployPath.append("jboss-web.deployer").append("jsf-libs"), list); addEntries(deployPath.append("jboss-aop-jdk50.deployer"), list); addEntries(deployPath.append("ejb3.deployer"), list); - return (IClasspathEntry[]) list.toArray(new IClasspathEntry[list.size()]); + return list.toArray(new IClasspathEntry[list.size()]); } protected IClasspathEntry[] get42(IPath location, String config) { - ArrayList list = new ArrayList(); + ArrayList<IClasspathEntry> list = new ArrayList<IClasspathEntry>(); IPath configPath = location.append("server").append(config); IPath deployPath = configPath.append("deploy"); addEntries(location.append("client"), list); @@ -106,14 +108,27 @@ addEntries(deployPath.append("jboss-web.deployer").append("jsf-libs"), list); addEntries(deployPath.append("jboss-aop-jdk50.deployer"), list); addEntries(deployPath.append("ejb3.deployer"), list); - return (IClasspathEntry[]) list.toArray(new IClasspathEntry[list.size()]); + return list.toArray(new IClasspathEntry[list.size()]); } + protected IClasspathEntry[] get50(IPath location, String config) { + ArrayList<IClasspathEntry> list = new ArrayList<IClasspathEntry>(); + IPath configPath = location.append("server").append(config); + IPath deployerPath = configPath.append("deployers"); + IPath deployPath = configPath.append("deploy"); + addEntries(location.append("client"), list); + addEntries(location.append("lib"), list); + addEntries(configPath.append("lib"), list); + addEntries(deployPath.append("jbossweb.sar").append("jsf-libs"),list); + addEntries(deployerPath.append("jboss-aop-jboss5.deployer"), list); + addEntries(deployerPath.append("ejb3.deployer"), list); + return list.toArray(new IClasspathEntry[list.size()]); + } protected IClasspathEntry getEntry(IPath path) { return JavaRuntime.newArchiveRuntimeClasspathEntry(path).getClasspathEntry(); } - protected void addEntries(IPath folder, ArrayList list) { + protected void addEntries(IPath folder, ArrayList<IClasspathEntry> list) { if( folder.toFile().exists()) { String[] files = folder.toFile().list(); for( int i = 0; i < files.length; i++ ) { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/WebtoolsProjectJBossClasspathContainerInitializer.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/WebtoolsProjectJBossClasspathContainerInitializer.java 2008-02-14 20:55:44 UTC (rev 6319) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/WebtoolsProjectJBossClasspathContainerInitializer.java 2008-02-14 23:14:19 UTC (rev 6320) @@ -38,7 +38,7 @@ import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.ServerCore; -import org.jboss.ide.eclipse.as.core.server.internal.AbstractJBossServerRuntime; +import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; /** * This is a class that would ultimately try to respond to different facets @@ -59,8 +59,8 @@ private static final IProjectFacet WEB_FACET = ProjectFacetsManager.getProjectFacet("jst.web"); private static final IProjectFacet EJB_FACET = ProjectFacetsManager.getProjectFacet("jst.ejb"); private static final IProjectFacet EAR_FACET = ProjectFacetsManager.getProjectFacet("jst.ear"); - private static final IProjectFacet UTILITY_FACET = ProjectFacetsManager.getProjectFacet("jst.utility"); - private static final IProjectFacet CONNECTOR_FACET = ProjectFacetsManager.getProjectFacet("jst.connector"); +// private static final IProjectFacet UTILITY_FACET = ProjectFacetsManager.getProjectFacet("jst.utility"); +// private static final IProjectFacet CONNECTOR_FACET = ProjectFacetsManager.getProjectFacet("jst.connector"); private static final IProjectFacet APP_CLIENT_FACET = ProjectFacetsManager.getProjectFacet("jst.appclient"); @@ -127,30 +127,32 @@ IRuntime runtime = ServerCore.findRuntime(runtimeId); if( runtime == null ) return; - Object serverRuntime = runtime.loadAdapter(AbstractJBossServerRuntime.class, null); + IJBossServerRuntime jbRuntime = (IJBossServerRuntime)runtime.loadAdapter(IJBossServerRuntime.class, null); - if( serverRuntime == null ) return; - AbstractJBossServerRuntime jbRuntime = (AbstractJBossServerRuntime)serverRuntime; + if( jbRuntime != null ) { - String serverHome = runtime.getLocation().toOSString(); - String configName = jbRuntime.getJBossConfiguration(); - - String jbossVersion = jbRuntime.getId(); - - entries = loadClasspathEntries2(runtimeId, facetId, facetVersion, - serverHome, configName, jbossVersion, jbRuntime); + String serverHome = runtime.getLocation().toOSString(); + String configName = jbRuntime.getJBossConfiguration(); + + String jbossVersion = jbRuntime.getRuntime().getRuntimeType().getVersion(); + + entries = loadClasspathEntries2(runtimeId, facetId, facetVersion, + serverHome, configName, jbossVersion, jbRuntime); + } } protected IClasspathEntry[] loadClasspathEntries2(String runtimeId, String facetId, String facetVersion, String serverHome, String configName, String jbVersion, - AbstractJBossServerRuntime jbsRuntime) { + IJBossServerRuntime jbsRuntime) { if( facetId.equals(JST_JAVA_FACET.getId())) { return loadJREClasspathEntries(jbsRuntime); - } else if( jbVersion.equals("4.2")) { + } else if("5.0".equals(jbVersion)) { + return loadClasspathEntriesDefault(facetId, facetVersion, serverHome, configName); + } else if( "4.2".equals(jbVersion)) { return loadClasspathEntries42(facetId, facetVersion, serverHome, configName); - } else if( jbVersion.equals("4.0")) + } else if( "4.0".equals(jbVersion)) { return loadClasspathEntries40(facetId, facetVersion, serverHome, configName); - if( jbVersion.equals("3.2")) + } else if( "3.2".equals(jbVersion)) return loadClasspathEntries32( facetId, facetVersion, serverHome, configName); return loadClasspathEntriesDefault(facetId, facetVersion, serverHome, configName); } @@ -166,15 +168,15 @@ } protected IClasspathEntry[] getEntries(IPath folder) { String[] files = folder.toFile().list(); - ArrayList list = new ArrayList(); + ArrayList<IClasspathEntry> list = new ArrayList<IClasspathEntry>(); for( int i = 0; i < files.length; i++ ) { if( files[i].endsWith(".jar")) { list.add(getEntry(folder.append(files[i]))); } } - return (IClasspathEntry[]) list.toArray(new IClasspathEntry[list.size()]); + return list.toArray(new IClasspathEntry[list.size()]); } - protected IClasspathEntry[] loadJREClasspathEntries(AbstractJBossServerRuntime jbsRuntime) { + protected IClasspathEntry[] loadJREClasspathEntries(IJBossServerRuntime jbsRuntime) { IVMInstall vmInstall = jbsRuntime.getVM(); if (vmInstall != null) { String name = vmInstall.getName(); @@ -187,7 +189,7 @@ protected IClasspathEntry[] loadClasspathEntries42(String facetId, String facetVersion, String serverHome, String configName) { IPath homePath = new Path(serverHome); IPath configPath = homePath.append("server").append(configName); - ArrayList list = new ArrayList(); + ArrayList<IClasspathEntry> list = new ArrayList<IClasspathEntry>(); if (facetId.equals(WEB_FACET.getId())) { IPath jsfDir = configPath.append("deploy").append("jboss-web.deployer").append("jsf-libs"); list.add(getEntry(configPath.append("lib").append("jsp-api.jar"))); @@ -222,13 +224,13 @@ } else if( facetId.equals(APP_CLIENT_FACET.getId())) { list.add(getEntry(homePath.append("client").append("jbossall-client.jar"))); } - return (IClasspathEntry[]) list.toArray(new IClasspathEntry[list.size()]); + return list.toArray(new IClasspathEntry[list.size()]); } protected IClasspathEntry[] loadClasspathEntries40(String facetId, String facetVersion, String serverHome, String configName) { IPath homePath = new Path(serverHome); IPath configPath = homePath.append("server").append(configName); - ArrayList list = new ArrayList(); + ArrayList<IClasspathEntry> list = new ArrayList<IClasspathEntry>(); if (facetId.equals(WEB_FACET.getId())) { IPath jsfDir = configPath.append("deploy").append("jbossweb-tomcat55.sar").append("jsf-libs"); list.add(getEntry(configPath.append("lib").append("javax.servlet.jsp.jar"))); @@ -259,14 +261,14 @@ } else if( facetId.equals(APP_CLIENT_FACET.getId())) { list.add(JavaRuntime.newArchiveRuntimeClasspathEntry(homePath.append("client").append("jbossall-client.jar")).getClasspathEntry()); } - return (IClasspathEntry[]) list.toArray(new IClasspathEntry[list.size()]); + return list.toArray(new IClasspathEntry[list.size()]); } protected IClasspathEntry[] loadClasspathEntries32(String facetId, String facetVersion, String serverHome, String configName) { IPath homePath = new Path(serverHome); IPath configPath = homePath.append("server").append(configName); - ArrayList list = new ArrayList(); + ArrayList<IClasspathEntry> list = new ArrayList<IClasspathEntry>(); if (facetId.equals(WEB_FACET.getId())) { IPath p = configPath.append("deploy").append("jbossweb-tomcat50.sar"); list.add(getEntry(p.append("jsp-api.jar"))); @@ -277,7 +279,7 @@ } else if( facetId.equals(APP_CLIENT_FACET.getId())) { list.add(getEntry(homePath.append("client").append("jbossall-client.jar"))); } - return (IClasspathEntry[]) list.toArray(new IClasspathEntry[list.size()]); + return list.toArray(new IClasspathEntry[list.size()]); } protected IClasspathEntry[] loadClasspathEntriesDefault(String facetId, String facetVersion, String serverHome, String configName) { return new IClasspathEntry[0]; 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 2008-02-14 20:55:44 UTC (rev 6319) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java 2008-02-14 23:14:19 UTC (rev 6320) @@ -42,7 +42,7 @@ import org.eclipse.wst.server.core.IServerLifecycleListener; import org.eclipse.wst.server.core.ServerCore; import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; -import org.jboss.ide.eclipse.as.core.server.internal.AbstractJBossServerRuntime; +import org.jboss.ide.eclipse.as.core.server.internal.LocalJBossServerRuntime; import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper; /** @@ -91,8 +91,8 @@ return Status.OK_STATUS; // server has no runtime so we can't set this up. } - AbstractJBossServerRuntime ajbsr = (AbstractJBossServerRuntime) - server2.getRuntime().loadAdapter(AbstractJBossServerRuntime.class, null); + LocalJBossServerRuntime ajbsr = (LocalJBossServerRuntime) + server2.getRuntime().loadAdapter(LocalJBossServerRuntime.class, null); if(ajbsr != null ) { IPath loc = server2.getRuntime().getLocation(); IPath configFolder = loc.append("server").append(ajbsr.getJBossConfiguration()); @@ -271,8 +271,8 @@ public void loadDefaults(IServer server, String configFolder) { ArrayList<XPathCategory> retVal = new ArrayList<XPathCategory>(); - AbstractJBossServerRuntime ajbsr = (AbstractJBossServerRuntime) - server.getRuntime().loadAdapter(AbstractJBossServerRuntime.class, new NullProgressMonitor()); + LocalJBossServerRuntime ajbsr = (LocalJBossServerRuntime) + server.getRuntime().loadAdapter(LocalJBossServerRuntime.class, new NullProgressMonitor()); Path p = (Path)rtToPortsFile.get(server.getRuntime().getRuntimeType().getVersion()); if( p == null ) return; URL url = FileLocator.find(JBossServerCorePlugin.getDefault().getBundle(), p, null); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerRuntime.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerRuntime.java 2008-02-14 20:55:44 UTC (rev 6319) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerRuntime.java 2008-02-14 23:14:19 UTC (rev 6320) @@ -39,4 +39,8 @@ public void setVM(IVMInstall install); public String getJBossConfiguration(); public void setJBossConfiguration(String config); + + // for startup + public String getDefaultRunArgs(); + public String getDefaultRunVMArgs(); } Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossServerRuntime.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossServerRuntime.java 2008-02-14 20:55:44 UTC (rev 6319) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossServerRuntime.java 2008-02-14 23:14:19 UTC (rev 6320) @@ -1,108 +0,0 @@ -/** - * JBoss, a Division of Red Hat - * Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * -* This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ide.eclipse.as.core.server.internal; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.Status; -import org.eclipse.jdt.launching.IVMInstall; -import org.eclipse.jdt.launching.IVMInstallType; -import org.eclipse.jdt.launching.JavaRuntime; -import org.eclipse.wst.server.core.IRuntime; -import org.eclipse.wst.server.core.ServerCore; -import org.eclipse.wst.server.core.model.RuntimeDelegate; -import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; -import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants; -import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; - -public abstract class AbstractJBossServerRuntime extends RuntimeDelegate implements IJBossServerRuntime { - - public void setDefaults(IProgressMonitor monitor) { - String location = Platform.getOS().equals(Platform.WS_WIN32) - ? "c:/program files/jboss-" : "/usr/bin/jboss-"; - String version = getRuntime().getRuntimeType().getVersion(); - location += version + ".x"; - getRuntimeWorkingCopy().setLocation(new Path(location)); - getRuntimeWorkingCopy().setName(getNextRuntimeName()); - setAttribute(IJBossServerRuntime.PROPERTY_CONFIGURATION_NAME, IJBossServerConstants.DEFAULT_SERVER_NAME); - setVM(null); - } - - private String getNextRuntimeName() { - String version = getRuntime().getRuntimeType().getVersion(); - String base = "JBoss " + version + " Runtime"; - IRuntime rt = ServerCore.findRuntime(base); - if (rt == null) - return base; - - int i = 0; - while (rt != null) { - rt = ServerCore.findRuntime(base + " " + ++i); - } - return base + " " + i; - } - - public IStatus validate() { - IStatus s = super.validate(); - if( !s.isOK()) return s; - - if( getJBossConfiguration().equals("")) - return new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, 0, "Runtime Configuration Not Set", null); - - return Status.OK_STATUS; - } - - public IVMInstall getVM() { - String id = getAttribute(PROPERTY_VM_ID, (String)null); - String type = getAttribute(PROPERTY_VM_TYPE_ID, (String)null); - - IVMInstallType vmInstallType = JavaRuntime.getVMInstallType(type); - IVMInstall[] vmInstalls = vmInstallType.getVMInstalls(); - - for (int i = 0; i < vmInstalls.length; i++) { - if (id.equals(vmInstalls[i].getId())) - return vmInstalls[i]; - } - - // not found, return default vm - return JavaRuntime.getDefaultVMInstall(); - } - - public void setVM(IVMInstall selectedVM) { - if( selectedVM == null ) - selectedVM = JavaRuntime.getDefaultVMInstall(); - - setAttribute(IJBossServerRuntime.PROPERTY_VM_ID, selectedVM.getId()); - setAttribute(IJBossServerRuntime.PROPERTY_VM_TYPE_ID, selectedVM - .getVMInstallType().getId()); - } - - public String getJBossConfiguration() { - return getAttribute(PROPERTY_CONFIGURATION_NAME, (String)""); - } - - public void setJBossConfiguration(String config) { - setAttribute(IJBossServerRuntime.PROPERTY_CONFIGURATION_NAME, config); - } -} Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBoss32ServerRuntime.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBoss32ServerRuntime.java 2008-02-14 20:55:44 UTC (rev 6319) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBoss32ServerRuntime.java 2008-02-14 23:14:19 UTC (rev 6320) @@ -1,30 +0,0 @@ -/** - * JBoss, a Division of Red Hat - * Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * -* This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ide.eclipse.as.core.server.internal; - - -public class JBoss32ServerRuntime extends AbstractJBossServerRuntime { - - public JBoss32ServerRuntime() { - // TODO Auto-generated constructor stub - } -} Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBoss40ServerRuntime.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBoss40ServerRuntime.java 2008-02-14 20:55:44 UTC (rev 6319) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBoss40ServerRuntime.java 2008-02-14 23:14:19 UTC (rev 6320) @@ -1,29 +0,0 @@ -/** - * JBoss, a Division of Red Hat - * Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * -* This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ide.eclipse.as.core.server.internal; - - -public class JBoss40ServerRuntime extends AbstractJBossServerRuntime { - - public JBoss40ServerRuntime() { - } -} Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBoss42ServerRuntime.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBoss42ServerRuntime.java 2008-02-14 20:55:44 UTC (rev 6319) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBoss42ServerRuntime.java 2008-02-14 23:14:19 UTC (rev 6320) @@ -1,6 +0,0 @@ -package org.jboss.ide.eclipse.as.core.server.internal; - -public class JBoss42ServerRuntime extends AbstractJBossServerRuntime { - public JBoss42ServerRuntime() { - } -} \ No newline at end of file Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBoss50ServerRuntime.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBoss50ServerRuntime.java 2008-02-14 20:55:44 UTC (rev 6319) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBoss50ServerRuntime.java 2008-02-14 23:14:19 UTC (rev 6320) @@ -1,6 +0,0 @@ -package org.jboss.ide.eclipse.as.core.server.internal; - -public class JBoss50ServerRuntime extends AbstractJBossServerRuntime { - public JBoss50ServerRuntime() { - } -} \ No newline at end of file Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java 2008-02-14 20:55:44 UTC (rev 6319) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java 2008-02-14 23:14:19 UTC (rev 6320) @@ -51,8 +51,8 @@ import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathModel; import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathQuery; import org.jboss.ide.eclipse.as.core.server.IDeployableServer; +import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants; import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; -import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants; import org.jboss.ide.eclipse.as.core.util.ArgsUtil; /** Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer50.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer50.java 2008-02-14 20:55:44 UTC (rev 6319) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer50.java 2008-02-14 23:14:19 UTC (rev 6320) @@ -1,39 +0,0 @@ -/** - * JBoss, a Division of Red Hat - * Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * -* This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ide.eclipse.as.core.server.internal; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.wst.server.core.internal.ServerWorkingCopy; -import org.jboss.ide.eclipse.as.core.extensions.polling.TimeoutPoller; -import org.jboss.ide.eclipse.as.core.server.IServerPollingAttributes; - -/** - * @author rob.stryker <rob.stryker(a)redhat.com&gt; - * - */ -public class JBossServer50 extends JBossServer { - public void setDefaults(IProgressMonitor monitor) { - ServerWorkingCopy wc = (ServerWorkingCopy)getServerWorkingCopy(); - wc.setAttribute(IServerPollingAttributes.STARTUP_POLLER_KEY, TimeoutPoller.POLLER_ID); - wc.setAttribute(IServerPollingAttributes.START_TIMEOUT, 60000); - } -} Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java (from rev 6311, trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossServerRuntime.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java 2008-02-14 23:14:19 UTC (rev 6320) @@ -0,0 +1,129 @@ +/** + * JBoss, a Division of Red Hat + * Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * +* This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ide.eclipse.as.core.server.internal; + +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Path; +import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.Status; +import org.eclipse.jdt.launching.IVMInstall; +import org.eclipse.jdt.launching.IVMInstallType; +import org.eclipse.jdt.launching.JavaRuntime; +import org.eclipse.wst.server.core.IRuntime; +import org.eclipse.wst.server.core.ServerCore; +import org.eclipse.wst.server.core.model.RuntimeDelegate; +import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; +import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants; +import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; + +import sun.security.action.GetLongAction; + +public class LocalJBossServerRuntime extends RuntimeDelegate implements IJBossServerRuntime { + + public void setDefaults(IProgressMonitor monitor) { + String location = Platform.getOS().equals(Platform.WS_WIN32) + ? "c:/program files/jboss-" : "/usr/bin/jboss-"; + String version = getRuntime().getRuntimeType().getVersion(); + location += version + ".x"; + getRuntimeWorkingCopy().setLocation(new Path(location)); + getRuntimeWorkingCopy().setName(getNextRuntimeName()); + setAttribute(IJBossServerRuntime.PROPERTY_CONFIGURATION_NAME, IJBossServerConstants.DEFAULT_SERVER_NAME); + setVM(null); + } + + private String getNextRuntimeName() { + String version = getRuntime().getRuntimeType().getVersion(); + String base = "JBoss " + version + " Runtime"; + IRuntime rt = ServerCore.findRuntime(base); + if (rt == null) + return base; + + int i = 0; + while (rt != null) { + rt = ServerCore.findRuntime(base + " " + ++i); + } + return base + " " + i; + } + + public IStatus validate() { + IStatus s = super.validate(); + if( !s.isOK()) return s; + + if( getJBossConfiguration().equals("")) + return new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, 0, "Runtime Configuration Not Set", null); + + return Status.OK_STATUS; + } + + public IVMInstall getVM() { + String id = getAttribute(PROPERTY_VM_ID, (String)null); + String type = getAttribute(PROPERTY_VM_TYPE_ID, (String)null); + + IVMInstallType vmInstallType = JavaRuntime.getVMInstallType(type); + IVMInstall[] vmInstalls = vmInstallType.getVMInstalls(); + + for (int i = 0; i < vmInstalls.length; i++) { + if (id.equals(vmInstalls[i].getId())) + return vmInstalls[i]; + } + + // not found, return default vm + return JavaRuntime.getDefaultVMInstall(); + } + + public void setVM(IVMInstall selectedVM) { + if( selectedVM == null ) + selectedVM = JavaRuntime.getDefaultVMInstall(); + + setAttribute(IJBossServerRuntime.PROPERTY_VM_ID, selectedVM.getId()); + setAttribute(IJBossServerRuntime.PROPERTY_VM_TYPE_ID, selectedVM + .getVMInstallType().getId()); + } + + public String getJBossConfiguration() { + return getAttribute(PROPERTY_CONFIGURATION_NAME, (String)""); + } + + public void setJBossConfiguration(String config) { + setAttribute(IJBossServerRuntime.PROPERTY_CONFIGURATION_NAME, config); + } + + public String getDefaultRunArgs() { + return "--configuration=" + getJBossConfiguration() + " "; + } + + public String getDefaultRunVMArgs() { + String name = getRuntime().getName(); + String ret = "-Dprogram.name=\"JBossTools " + name + "\" "; + if( Platform.getOS().equals(Platform.OS_MACOSX)) + ret += "-server "; + ret += "-Xms256m -Xmx512m -XX:MaxPermSize=256m "; + if( Platform.getOS().equals(Platform.OS_LINUX)) + ret += "-Djava.net.preferIPv4Stack=true "; + ret += "-Dsun.rmi.dgc.client.gcInterval=3600000 "; + ret += "-Dsun.rmi.dgc.server.gcInterval=3600000 "; + ret += "-Djava.endorsed.dirs=" + (getRuntime().getLocation().append("lib").append("endorsed")) + " "; + + return ret; + } +} Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java 2008-02-14 20:55:44 UTC (rev 6319) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java 2008-02-14 23:14:19 UTC (rev 6320) @@ -41,7 +41,6 @@ import org.eclipse.jdt.launching.StandardClasspathProvider; import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.ServerUtil; -import org.eclipse.wst.server.core.internal.ServerType; import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; @@ -84,16 +83,17 @@ public static String getDefaultArgs(JBossServer jbs) throws CoreException { IJBossServerRuntime rt = findJBossServerRuntime(jbs.getServer()); if (rt != null) { - return "--configuration=" + rt.getJBossConfiguration(); + return rt.getDefaultRunArgs(); } throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, "Runtime not found")); } public static String getDefaultVMArgs(JBossServer jbs) throws CoreException { - String ret = "-Xms256m -Xmx512m -XX:MaxPermSize=256m "; - if( Platform.getOS().equals(Platform.OS_LINUX)) - ret += "-Djava.net.preferIPv4Stack=true"; - return ret; + IJBossServerRuntime rt = findJBossServerRuntime(jbs.getServer()); + if (rt != null) { + return rt.getDefaultRunVMArgs(); + } + throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, "Runtime not found")); } @@ -140,8 +140,7 @@ * if one does not already exist. */ public static ILaunchConfigurationWorkingCopy createLaunchConfiguration(IServer server) throws CoreException { - ILaunchConfigurationType launchConfigType = - ((ServerType) server.getServerType()).getLaunchConfigurationType(); + ILaunchConfigurationType launchConfigType = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurationType(LAUNCH_TYPE); if (launchConfigType == null) return null; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2008-02-14 20:55:44 UTC (rev 6319) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2008-02-14 23:14:19 UTC (rev 6320) @@ -59,7 +59,7 @@ <serverType behaviourClass="org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior" - class="org.jboss.ide.eclipse.as.core.server.internal.JBossServer50" + class="org.jboss.ide.eclipse.as.core.server.internal.JBossServer" description="%jboss.version.50.description" hasConfiguration="false" id="org.jboss.ide.eclipse.as.50" @@ -73,13 +73,32 @@ startTimeout="450000" stopTimeout="450000" supportsRemoteHosts="false"/> - </extension> + + <serverType + behaviourClass="org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior" + class="org.jboss.ide.eclipse.as.core.server.internal.DeployableServer" + description="A server which only provides a deploy folder for publishing." + hasConfiguration="false" + id="org.jboss.ide.eclipse.as.systemCopyServer" + initialState="stopped" + launchConfigId="org.jboss.ide.eclipse.as.core.server.stripped.launchConfiguration" + launchModes="run" + name="JBoss Deploy-Only Server" + runtime="true" + runtimeTypeId="org.jboss.ide.eclipse.as.runtime.stripped" + startBeforePublish="false" + startTimeout="100000" + stopTimeout="100000" + supportsRemoteHosts="true"/> + + </extension> + <extension point="org.eclipse.wst.server.core.runtimeTypes"> <runtimeType vendor="%providerName" - class="org.jboss.ide.eclipse.as.core.server.internal.JBoss32ServerRuntime" + class="org.jboss.ide.eclipse.as.core.server.internal.LocalJBossServerRuntime" description="%jboss.version.32.description" name="JBoss 3.2 Runtime" id="org.jboss.ide.eclipse.as.runtime.32" @@ -102,7 +121,7 @@ </runtimeType> <runtimeType vendor="%providerName" - class="org.jboss.ide.eclipse.as.core.server.internal.JBoss40ServerRuntime" + class="org.jboss.ide.eclipse.as.core.server.internal.LocalJBossServerRuntime" description="%jboss.version.40.description" name="JBoss 4.0 Runtime" id="org.jboss.ide.eclipse.as.runtime.40" @@ -131,7 +150,7 @@ </runtimeType> <runtimeType vendor="%providerName" - class="org.jboss.ide.eclipse.as.core.server.internal.JBoss42ServerRuntime" + class="org.jboss.ide.eclipse.as.core.server.internal.LocalJBossServerRuntime" description="%jboss.version.42.description" name="JBoss 4.2 Runtime" id="org.jboss.ide.eclipse.as.runtime.42" @@ -160,7 +179,7 @@ </runtimeType> <runtimeType vendor="%providerName" - class="org.jboss.ide.eclipse.as.core.server.internal.JBoss50ServerRuntime" + class="org.jboss.ide.eclipse.as.core.server.internal.LocalJBossServerRuntime" description="%jboss.version.50.description" name="JBoss 5.0 Runtime" id="org.jboss.ide.eclipse.as.runtime.50" Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2008-02-14 20:55:44 UTC (rev 6319) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2008-02-14 23:14:19 UTC (rev 6320) @@ -63,7 +63,7 @@ import org.eclipse.wst.server.ui.wizard.WizardFragment; import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants; import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; -import org.jboss.ide.eclipse.as.core.server.internal.AbstractJBossServerRuntime; +import org.jboss.ide.eclipse.as.core.server.internal.LocalJBossServerRuntime; import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages; import org.jboss.ide.eclipse.as.ui.Messages; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2008-02-14 20:55:44 UTC (rev 6319) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2008-02-14 23:14:19 UTC (rev 6320) @@ -53,21 +53,19 @@ 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" + 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" 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"/> - <fragment + 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"/> + <fragment class="org.jboss.ide.eclipse.as.ui.wizards.StrippedServerWizardFragment" id="org.jboss.ide.eclipse.as.ui.strippedServerWizardFragment" typeIds="org.jboss.ide.eclipse.as.systemCopyServer"/> </extension> - <extension - point="org.eclipse.ui.startup"> + <extension point="org.eclipse.ui.startup"> <startup /> </extension>