[jbosstools-commits] JBoss Tools SVN: r22758 - in trunk/as/plugins: org.jboss.ide.eclipse.as.ui and 1 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Fri Jun 11 04:13:00 EDT 2010
Author: rob.stryker at jboss.com
Date: 2010-06-11 04:12:58 -0400 (Fri, 11 Jun 2010)
New Revision: 22758
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeLocator.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/JBossServerType.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
Log:
JBIDE-2814 - adding search capability for new jboss runtime
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/JBossServerType.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/JBossServerType.java 2010-06-11 07:49:24 UTC (rev 22757)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/JBossServerType.java 2010-06-11 08:12:58 UTC (rev 22758)
@@ -31,7 +31,7 @@
public static final JBossServerType AS = new JBossServerType(
"AS", //$NON-NLS-1$
"bin"+File.separatorChar + SYSTEM_JAR_NAME, //$NON-NLS-1$
- new String[]{"5.0", "4.2", "4.0", "3.2"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ new String[]{"6.0", "5.0", "4.2", "4.0", "3.2"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
public static final JBossServerType EAP = new JBossServerType(
"EAP", //$NON-NLS-1$
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeLocator.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeLocator.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeLocator.java 2010-06-11 08:12:58 UTC (rev 22758)
@@ -0,0 +1,217 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.ide.eclipse.as.ui.wizards;
+
+import java.io.File;
+import java.util.List;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.jdt.launching.JavaRuntime;
+import org.eclipse.jface.window.Window;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.wst.server.core.IRuntime;
+import org.eclipse.wst.server.core.IRuntimeType;
+import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
+import org.eclipse.wst.server.core.ServerUtil;
+import org.eclipse.wst.server.core.TaskModel;
+import org.eclipse.wst.server.core.internal.RuntimeWorkingCopy;
+import org.eclipse.wst.server.core.model.RuntimeLocatorDelegate;
+import org.eclipse.wst.server.ui.internal.Messages;
+import org.eclipse.wst.server.ui.internal.ServerUIPlugin;
+import org.eclipse.wst.server.ui.internal.wizard.TaskWizard;
+import org.eclipse.wst.server.ui.internal.wizard.WizardTaskUtil;
+import org.eclipse.wst.server.ui.internal.wizard.fragment.NewRuntimeWizardFragment;
+import org.eclipse.wst.server.ui.wizard.WizardFragment;
+import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
+import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants;
+import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
+import org.jboss.ide.eclipse.as.core.util.JBossServerType;
+import org.jboss.ide.eclipse.as.core.util.ServerBeanLoader;
+
+public class JBossRuntimeLocator extends RuntimeLocatorDelegate {
+
+ public JBossRuntimeLocator() {
+ // TODO Auto-generated constructor stub
+ }
+
+ @Override
+ public void searchForRuntimes(IPath path, IRuntimeSearchListener listener,
+ IProgressMonitor monitor) {
+ ServerBeanLoader loader = new ServerBeanLoader();
+ IRuntimeWorkingCopy wc = searchForRuntimes(path, loader, monitor);
+ if( wc != null )
+ listener.runtimeFound(wc);
+ }
+
+ public IRuntimeWorkingCopy searchForRuntimes(IPath path, ServerBeanLoader loader, IProgressMonitor monitor) {
+ if( loader.getServerType(path.toFile()) != JBossServerType.UNKNOWN) {
+ // return found
+ return createRuntime(path, loader);
+ }
+ File[] children = path.toFile().listFiles();
+ monitor.beginTask("Searching for JBoss runtime...", children.length); //$NON-NLS-1$
+ if( children != null ) {
+ for( int i = 0; i < children.length; i++ ) {
+ if( children[i].isDirectory()) {
+ SubProgressMonitor newMon = new SubProgressMonitor(monitor, 1);
+ IRuntimeWorkingCopy wc = searchForRuntimes(path.append(children[i].getName()), loader, newMon);
+ if( wc != null ) {
+ monitor.done();
+ return wc;
+ }
+ } else {
+ monitor.worked(1);
+ }
+ }
+ }
+ monitor.done();
+ return null;
+ }
+
+ public static IRuntimeWorkingCopy createRuntime(IPath path) {
+ return createRuntime(path, new ServerBeanLoader());
+ }
+
+ public static IRuntimeWorkingCopy createRuntime(IPath path, ServerBeanLoader loader) {
+ JBossServerType type = loader.getServerType(path.toFile());
+ if( type == JBossServerType.AS)
+ return createASRuntime(path, loader);
+ if( type == JBossServerType.EAP)
+ return createEAPRuntime(path, loader);
+ if( type == JBossServerType.SOAP)
+ return createSOAPRuntime(path, loader);
+ return null;
+ }
+
+ private static IRuntimeWorkingCopy createASRuntime(IPath path, ServerBeanLoader loader) {
+ String version = new ServerBeanLoader().getFullServerVersion(new File(path.toFile(), JBossServerType.AS.getSystemJarPath()));
+ String runtimeTypeId = null;
+ if( version.compareTo("4.0") < 0 ) //$NON-NLS-1$
+ runtimeTypeId=IJBossToolingConstants.AS_32;
+ else if( version.compareTo("4.2") < 0 ) //$NON-NLS-1$
+ runtimeTypeId=IJBossToolingConstants.AS_40;
+ else if( version.compareTo("5.0") < 0 ) //$NON-NLS-1$
+ runtimeTypeId=IJBossToolingConstants.AS_42;
+ else if( version.compareTo("5.1") < 0 ) //$NON-NLS-1$
+ runtimeTypeId=IJBossToolingConstants.AS_50;
+ else if( version.compareTo("6.0") < 0 ) //$NON-NLS-1$
+ runtimeTypeId=IJBossToolingConstants.AS_51;
+ else
+ runtimeTypeId=IJBossToolingConstants.AS_60;
+ if( runtimeTypeId != null ) {
+ try {
+ IRuntimeWorkingCopy wc = createRuntimeWorkingCopy(runtimeTypeId, path.toOSString(), IJBossRuntimeResourceConstants.DEFAULT_CONFIGURATION);
+ return launchRuntimeWizard(wc);
+ } catch( CoreException ce) {
+ }
+ }
+ return null;
+ }
+ private static IRuntimeWorkingCopy createEAPRuntime(IPath path, ServerBeanLoader loader) {
+ String version = new ServerBeanLoader().getFullServerVersion(new File(path.toFile(), JBossServerType.EAP.getSystemJarPath()));
+ String runtimeTypeId = null;
+ if( version.compareTo("5.0") < 0 ) //$NON-NLS-1$
+ runtimeTypeId=IJBossToolingConstants.EAP_43;
+ else
+ runtimeTypeId=IJBossToolingConstants.EAP_50;
+
+ if( runtimeTypeId != null ) {
+ try {
+ IRuntimeWorkingCopy wc = createRuntimeWorkingCopy(runtimeTypeId, path.toOSString(), IJBossRuntimeResourceConstants.DEFAULT_CONFIGURATION);
+ return launchRuntimeWizard(wc);
+ } catch( CoreException ce) {
+ }
+ }
+ return null;
+ }
+
+ private static IRuntimeWorkingCopy createSOAPRuntime(IPath path, ServerBeanLoader loader) {
+ return createEAPRuntime(path, loader);
+ }
+
+ private static IRuntimeWorkingCopy launchRuntimeWizard(final IRuntimeWorkingCopy wc) {
+ final IRuntimeWorkingCopy[] wcRet = new IRuntimeWorkingCopy[1];
+ Display.getDefault().syncExec(new Runnable() {
+ public void run() {
+ IRuntimeWorkingCopy wc2 = showWizard(wc);
+ wcRet[0] = wc2;
+ }
+ });
+ return wcRet[0];
+ }
+
+ // Copied from RuntimePreferencePage
+ protected static IRuntimeWorkingCopy showWizard(final IRuntimeWorkingCopy runtimeWorkingCopy) {
+ String title = null;
+ WizardFragment fragment = null;
+ TaskModel taskModel = new TaskModel();
+ if (runtimeWorkingCopy == null) {
+ title = Messages.wizNewRuntimeWizardTitle;
+ fragment = new WizardFragment() {
+ protected void createChildFragments(List<WizardFragment> list) {
+ list.add(new NewRuntimeWizardFragment());
+ list.add(WizardTaskUtil.SaveRuntimeFragment);
+ }
+ };
+ } else {
+ title = Messages.wizEditRuntimeWizardTitle;
+ final WizardFragment fragment2 = ServerUIPlugin.getWizardFragment(runtimeWorkingCopy.getRuntimeType().getId());
+ if (fragment2 == null) {
+ return null;
+ }
+ taskModel.putObject(TaskModel.TASK_RUNTIME, runtimeWorkingCopy);
+ fragment = new WizardFragment() {
+ protected void createChildFragments(List<WizardFragment> list) {
+ list.add(fragment2);
+ list.add(WizardTaskUtil.SaveRuntimeFragment);
+ }
+ };
+ }
+ TaskWizard wizard = new TaskWizard(title, fragment, taskModel);
+ wizard.setForcePreviousAndNextButtons(true);
+ WizardDialog dialog = new WizardDialog(new Shell(), wizard);
+ int result = dialog.open();
+ if( result == Window.OK ) {
+ IRuntime rt = (IRuntime)taskModel.getObject(TaskModel.TASK_RUNTIME);
+ if( rt != null ) {
+ IRuntimeWorkingCopy rtwc = rt.createWorkingCopy();
+ return rtwc;
+ }
+ }
+ return null;
+ }
+
+ public static IRuntimeWorkingCopy createRuntimeWorkingCopy(String runtimeId, String homeDir,
+ String config) throws CoreException {
+ IRuntimeType[] runtimeTypes = ServerUtil.getRuntimeTypes(null, null,
+ runtimeId);
+ IRuntimeType runtimeType = runtimeTypes[0];
+ IRuntimeWorkingCopy runtimeWC = runtimeType.createRuntime(null,
+ new NullProgressMonitor());
+ runtimeWC.setLocation(new Path(homeDir));
+ ((RuntimeWorkingCopy) runtimeWC).setAttribute(
+ IJBossServerRuntime.PROPERTY_VM_ID, JavaRuntime.getDefaultVMInstall().getId());
+ ((RuntimeWorkingCopy) runtimeWC).setAttribute(
+ IJBossServerRuntime.PROPERTY_VM_TYPE_ID, JavaRuntime.getDefaultVMInstall()
+ .getVMInstallType().getId());
+ ((RuntimeWorkingCopy) runtimeWC).setAttribute(
+ IJBossServerRuntime.PROPERTY_CONFIGURATION_NAME, config);
+ return runtimeWC;
+ }
+
+}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2010-06-11 07:49:24 UTC (rev 22757)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2010-06-11 08:12:58 UTC (rev 22758)
@@ -564,5 +564,13 @@
id="org.jboss.ide.eclipse.as.ui.launchConfigurationTypeImage1">
</launchConfigurationTypeImage>
</extension>
+ <extension
+ point="org.eclipse.wst.server.core.runtimeLocators">
+ <runtimeLocator
+ class="org.jboss.ide.eclipse.as.ui.wizards.JBossRuntimeLocator"
+ id="org.jboss.ide.eclipse.as.ui.wizards.jboss.runtimeLocator"
+ 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.60,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50">
+ </runtimeLocator>
+ </extension>
</plugin>
More information about the jbosstools-commits
mailing list