Author: dgolovin Date: 2007-08-03 18:19:09 -0400 (Fri, 03 Aug 2007) New Revision: 2904 Modified: trunk/jst/features/org.jboss.tools.jst.feature/feature.xml trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebModelPlugin.java Log: JBoss AS 4.2.0 initialization during startup is moved to separate plugin org.jboss.tools.jst.firstrun. Modified: trunk/jst/features/org.jboss.tools.jst.feature/feature.xml =================================================================== --- trunk/jst/features/org.jboss.tools.jst.feature/feature.xml 2007-08-03 22:13:35 UTC (rev 2903) +++ trunk/jst/features/org.jboss.tools.jst.feature/feature.xml 2007-08-03 22:19:09 UTC (rev 2904) @@ -1,24 +1,24 @@ -<?xml version="1.0" encoding="UTF-8"?> -<feature - id="org.jboss.tools.jst_feature" - label="Jst Feature" - version="2.0.0"> - - <description url="http://www.jboss.org/tools"> - JBossTools JST Feature - </description> - - <copyright> +<?xml version="1.0" encoding="UTF-8"?> +<feature + id="org.jboss.tools.jst_feature" + label="Jst Feature" + version="2.0.0"> + + <description url="http://www.jboss.org/tools"> + JBossTools JST Feature + </description> + + <copyright> Copyright (c) 2007 Exadel, Inc and Red Hat, Inc. Distributed under license by Red Hat, Inc. All rights reserved. This program is made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html Contributors: -Exadel, Inc. and Red Hat, Inc. - initial API and implementation - </copyright> - - <license url="http://www.eclipse.org/legal/epl-v10.html"> +Exadel, Inc. and Red Hat, Inc. - initial API and implementation + </copyright> + + <license url="http://www.eclipse.org/legal/epl-v10.html"> Eclipse Public License - v 1.0 THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR @@ -214,43 +214,50 @@ No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting -litigation. - </license> - - <plugin - id="org.jboss.tools.jst.web" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jst.web.debug" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jst.web.debug.ui" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jst.web.ui" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jst.web.verification" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jst.jsp" - download-size="0" - install-size="0" - version="0.0.0"/> - -</feature> +litigation. + </license> + + <plugin + id="org.jboss.tools.jst.web" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jst.web.debug" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jst.web.debug.ui" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jst.web.ui" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jst.web.verification" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jst.jsp" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jst.firstrun" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + +</feature> Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebModelPlugin.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebModelPlugin.java 2007-08-03 22:13:35 UTC (rev 2903) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/WebModelPlugin.java 2007-08-03 22:19:09 UTC (rev 2904) @@ -44,17 +44,11 @@ import org.jboss.tools.common.projecttemplates.ProjectTemplatesPlugin; import org.osgi.framework.BundleContext; +/** + * + */ public class WebModelPlugin extends BaseUIPlugin { - public static final String JBOSS_AS_HOME = "../../../../jboss-eap/jboss-as"; // JBoss AS home directory (relative to plugin)- <RHDS_HOME>/jbossas. - - public static final String JBOSS_AS_RUNTIME_TYPE_ID = "org.jboss.ide.eclipse.as.runtime.42"; - public static final String JBOSS_AS_TYPE_ID = "org.jboss.ide.eclipse.as.42"; - public static final String JBOSS_AS_NAME = "JBoss Application Server 4.2"; - public static final String JBOSS_AS_HOST = "localhost"; - public static final String JBOSS_AS_DEFAULT_CONFIGURATION_NAME = "default"; - - public static final String FIRST_START_PREFERENCE_NAME = "FIRST_START"; public static final String PLUGIN_ID = "org.jboss.tools.jst.web"; static WebModelPlugin instance; @@ -95,23 +89,14 @@ } public void stop(BundleContext context) throws Exception { -// PreferenceModelUtilities.getPreferenceModel().save(); super.stop(context); } public void start(BundleContext context) throws Exception { super.start(context); - // Eskimo - // asinc exec removed because registered server dosen't appears in New Project dialog - // when calling of these dialogs is cause of loadind the plugin hierarchy ProjectTemplatesPlugin.getDefault(); - initJbossAS(); } - - - - static public ILaunchConfiguration findLaunchConfig(String name) throws CoreException { ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager(); ILaunchConfigurationType launchConfigurationType = launchManager.getLaunchConfigurationType( "org.eclipse.ant.AntLaunchConfigurationType" ); @@ -126,81 +111,6 @@ return null; } - /* - * Init bundled JBoss AS Runtime and Server. - */ - private void initJbossAS() { - try { - this.getPreferenceStore().setDefault(FIRST_START_PREFERENCE_NAME, true); - boolean firstStart = this.getPreferenceStore().getBoolean(FIRST_START_PREFERENCE_NAME); - if(!firstStart) { - return; - } - this.getPreferenceStore().setValue(FIRST_START_PREFERENCE_NAME, false); - - String jbossASLocation = null; - String pluginLocation = EclipseResourceUtil.getInstallPath(this.getBundle()); - File jbossASDir = new File(pluginLocation, JBOSS_AS_HOME); - if(jbossASDir.isDirectory()) { - jbossASLocation = jbossASDir.getAbsolutePath(); - } else { - return; - } - - IPath jbossAsLocationPath = new Path(jbossASLocation); - String type = null; - String version = null; - - IServer[] servers = ServerCore.getServers(); - for(int i=0; i<servers.length; i++) { - IRuntime runtime = servers[i].getRuntime(); - if(runtime!=null && runtime.getLocation().equals(jbossAsLocationPath)) { - return; - } - } - - IRuntimeWorkingCopy runtime = null; - IRuntime[] runtimes = ServerCore.getRuntimes(); - String runtimeId = null; - for(int i=0; i<runtimes.length; i++) { - if(runtimes[0].getLocation().equals(jbossASLocation)) { - runtime = runtimes[0].createWorkingCopy(); - runtimeId = null; - break; - } - } - - IProgressMonitor progressMonitor = new NullProgressMonitor(); - if(runtime==null) { - IRuntimeType[] runtimeTypes = ServerUtil.getRuntimeTypes(type, version, JBOSS_AS_RUNTIME_TYPE_ID); - if(runtimeTypes.length>0) { - runtime = runtimeTypes[0].createRuntime(runtimeId, progressMonitor); - runtime.setLocation(jbossAsLocationPath); - IVMInstall defaultVM = JavaRuntime.getDefaultVMInstall(); - // IJBossServerRuntime.PROPERTY_VM_ID - ((RuntimeWorkingCopy)runtime).setAttribute("PROPERTY_VM_ID", defaultVM.getId()); - // IJBossServerRuntime.PROPERTY_VM_TYPE_ID - ((RuntimeWorkingCopy)runtime).setAttribute("PROPERTY_VM_TYPE_ID", defaultVM.getVMInstallType().getId()); - // IJBossServerRuntime.PROPERTY_CONFIGURATION_NAME - ((RuntimeWorkingCopy)runtime).setAttribute("org.jboss.ide.eclipse.as.core.runtime.configurationName", JBOSS_AS_DEFAULT_CONFIGURATION_NAME); - - runtime.save(false, progressMonitor); - } - } - - if(runtime!=null) { - IServerType serverType = ServerCore.findServerType(JBOSS_AS_TYPE_ID); - IServerWorkingCopy server = serverType.createServer(null, null, runtime, progressMonitor); - - server.setHost(JBOSS_AS_HOST); - server.setName(JBOSS_AS_NAME); - server.save(false, progressMonitor); - } - } catch (CoreException e) { - getPluginLog().logError("Can't create new JBoss Server.", e); - } - } - public static String getTemplateStateLocation() { return ProjectTemplatesPlugin.getTemplateStateLocation(); }