[jbosstools-commits] JBoss Tools SVN: r34216 - in trunk/as/plugins: org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core and 6 other directories.

Wednesday, 24 August 2011

Author: rob.stryker(a)jboss.com
Date: 2011-08-24 04:50:30 -0400 (Wed, 24 Aug 2011)
New Revision: 34216

Modified:
  
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.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/internal/AbstractLocalJBossServerRuntime.java
  
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7Server.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/ServerUtil.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.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7ServerWizardFragment.java
  
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.properties
   trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
Log:
JBIDE-9574 - initial impl for eap 6 server type

Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java	2011-08-24
06:58:46 UTC (rev 34215)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java	2011-08-24
08:50:30 UTC (rev 34216)
@@ -41,8 +41,10 @@
 import org.jboss.ide.eclipse.as.core.server.internal.launch.IStartLaunchDelegate;
 import
org.jboss.ide.eclipse.as.core.server.internal.launch.IStartLaunchSetupParticipant;
 import
org.jboss.ide.eclipse.as.core.server.internal.launch.LocalJBossStartLaunchDelegate;
+import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7Server;
 import org.jboss.ide.eclipse.as.core.server.internal.v7.LocalJBoss7StartLaunchDelegate;
 import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
+import org.jboss.ide.eclipse.as.core.util.ServerUtil;
 
 /**
  * Manages the extensions for this plugin
@@ -126,7 +128,7 @@
 			return true;
 		String[] allTypes = sTypes.split(","); //$NON-NLS-1$
 		for( int i = 0; i < allTypes.length; i++ ) {
-			if( allTypes[i].equals(serverType.getId())) {
+			if( allTypes[i].trim().equals(serverType.getId())) {
 				return true;
 			}
 		}
@@ -366,7 +368,7 @@
 		return JBossLaunchDelegates;
 	}
 	public ArrayList<IStartLaunchSetupParticipant> getSetupParticipants(IServer
server) {
-		if( server.getServerType().getId().equals(IJBossToolingConstants.SERVER_AS_70)) {
+		if( ServerUtil.isJBoss7(server)) {
 			return JBoss7setupParticipants;
 		}
 		return JBossSetupParticipants;

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-08-24
06:58:46 UTC (rev 34215)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java	2011-08-24
08:50:30 UTC (rev 34216)
@@ -269,6 +269,7 @@
 		rtToPortsFile.put(IConstants.AS_70,
properties.append(IJBossToolingConstants.DEFAULT_PROPS_70));
 		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));
 	}
 
 	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/server/internal/AbstractLocalJBossServerRuntime.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractLocalJBossServerRuntime.java	2011-08-24
06:58:46 UTC (rev 34215)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractLocalJBossServerRuntime.java	2011-08-24
08:50:30 UTC (rev 34216)
@@ -127,6 +127,7 @@
 		String typeId = rtType.getId();
 		if( typeId.equals(IConstants.EAP_50) 
 				|| typeId.equals(IConstants.AS_60)
+				|| typeId.equals(IConstants.EAP_60)
 				|| typeId.equals(IConstants.AS_70)) {
 			return EnvironmentsManager.getDefault().getEnvironment("JavaSE-1.6");
//$NON-NLS-1$
 		}

Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7Server.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7Server.java	2011-08-24
06:58:46 UTC (rev 34215)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7Server.java	2011-08-24
08:50:30 UTC (rev 34216)
@@ -22,6 +22,7 @@
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.wst.server.core.IRuntime;
+import org.jboss.ide.eclipse.as.core.extensions.polling.WebPortPoller;
 import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
 import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
 import org.jboss.ide.eclipse.as.core.util.ServerUtil;
@@ -32,7 +33,11 @@
 		setAttribute(DEPLOY_DIRECTORY_TYPE, DEPLOY_SERVER);
 		setAttribute(IJBossToolingConstants.WEB_PORT_DETECT, true);
 		setAttribute(IJBossToolingConstants.WEB_PORT,
IJBossToolingConstants.JBOSS_WEB_DEFAULT_PORT);
-		setAttribute(IJBossToolingConstants.STARTUP_POLLER_KEY,
JBoss7ManagerServicePoller.POLLER_ID);
+		// In an emergency, we can switch pollers for EAP
+		if( isEAP(getServer()))
+			setAttribute(IJBossToolingConstants.STARTUP_POLLER_KEY, WebPortPoller.WEB_POLLER_ID);
+		else
+			setAttribute(IJBossToolingConstants.STARTUP_POLLER_KEY,
JBoss7ManagerServicePoller.POLLER_ID);
 	}
 	public boolean hasJMXProvider() {
 		return false;

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-08-24
06:58:46 UTC (rev 34215)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java	2011-08-24
08:50:30 UTC (rev 34216)
@@ -27,6 +27,7 @@
 	public static final String EAP_RUNTIME_PREFIX =
"org.jboss.ide.eclipse.as.runtime.eap."; //$NON-NLS-1$
 	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$
 	
 	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$
@@ -38,6 +39,7 @@
 	public static final String EAP_SERVER_PREFIX =
"org.jboss.ide.eclipse.as.eap."; //$NON-NLS-1$
 	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$
 	
 	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$

Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java	2011-08-24
06:58:46 UTC (rev 34215)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java	2011-08-24
08:50:30 UTC (rev 34216)
@@ -95,35 +95,13 @@
 		return p;
 	}
 	
-//	public static void cloneConfigToMetadata(IServer server, IProgressMonitor monitor) {
-//		IPath dest = JBossServerCorePlugin.getServerStateLocation(server);
-//		dest = dest.append(IJBossServerConstants.CONFIG_IN_METADATA);
-//		IRuntime rt = server.getRuntime();
-//		IJBossServerRuntime jbsrt =
(IJBossServerRuntime)rt.loadAdapter(IJBossServerRuntime.class, new
NullProgressMonitor());
-//		IPath src =
rt.getLocation().append(IJBossServerConstants.SERVER).append(jbsrt.getJBossConfiguration());
-//		dest.toFile().mkdirs();
-//		
-//		File[] subFiles = src.toFile().listFiles();
-//		dest.toFile().mkdirs();
-//		String[] excluded = IJBossServerConstants.JBOSS_TEMPORARY_FOLDERS;
-//		for (int i = 0; i < subFiles.length; i++) {
-//			boolean found = false;
-//			for( int j = 0; j < excluded.length; j++)
-//				if( subFiles[i].getName().equals(excluded[j]))
-//					found = true;
-//			if( !found ) {
-//				File newDest = new File(dest.toFile(), subFiles[i].getName());
-//				FileUtil.fileSafeCopy(subFiles[i], newDest, null);
-//			}
-//		}
-//	}
-	
 	public static boolean isJBoss7(IServer server) {
 		return isJBoss7(server.getServerType());
 	}
 	
 	public static boolean isJBoss7(IServerType type) {
-		return type.getId().equals(IJBossToolingConstants.SERVER_AS_70);
+		return type.getId().equals(IJBossToolingConstants.SERVER_AS_70)
+				 || type.getId().equals(IJBossToolingConstants.SERVER_EAP_60);
 	}
 	
 	public static void createStandardFolders(IServer server) {

Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties
===================================================================

--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties	2011-08-24 06:58:46
UTC (rev 34215)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties	2011-08-24 08:50:30
UTC (rev 34216)
@@ -40,6 +40,10 @@
 jboss.eap.version.50.description=JBoss Enterprise Application Platform (EAP) 5.x
 jboss.eap.version.50.runtime.name=JBoss Enterprise Application Platform 5.x Runtime
 
+jboss.eap.version.60.name=JBoss Enterprise Application Platform 6.x
+jboss.eap.version.60.description=JBoss Enterprise Application Platform (EAP) 6.x
+jboss.eap.version.60.runtime.name=JBoss Enterprise Application Platform 6.x Runtime
+
 deploy.runtime.name=Deploy Only Runtime
 deploy.runtime.description=A runtime provided to allow a deploy-only server the ability
to deploy all project types.
 
@@ -49,8 +53,9 @@
 Bundle-Vendor.0 = JBoss by Red Hat
 Bundle-Name.0 = JBoss AS Core Plug-in
 
-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.eap.43,org.jboss.ide.eclipse.as.runtime.eap.50
-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.eap.43,org.jboss.ide.eclipse.as.eap.50
-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.eap.43,org.jboss.ide.eclipse.as.eap.50,org.jboss.ide.eclipse.as.systemCopyServer
-ServerTypesJBoss6OrHigher=org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.70
+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.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.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.eap.43,org.jboss.ide.eclipse.as.eap.50,org.jboss.ide.eclipse.as.eap.60,org.jboss.ide.eclipse.as.systemCopyServer
+ServerTypesJBoss6OrHigher=org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.70,org.jboss.ide.eclipse.as.eap.60

ServerTypesJBoss6OrLower=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
+ServerTypesJBoss7=org.jboss.ide.eclipse.as.70,org.jboss.ide.eclipse.as.eap.60
\ No newline at end of file

Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml	2011-08-24 06:58:46 UTC (rev
34215)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml	2011-08-24 08:50:30 UTC (rev
34216)
@@ -163,7 +163,24 @@
             stopTimeout="450000"
             supportsRemoteHosts="true"/>
 
+      <serverType
+           
behaviourClass="org.jboss.ide.eclipse.as.core.server.internal.v7.DelegatingJBoss7ServerBehavior"
+           
class="org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7Server"
+            description="%jboss.eap.version.60.description"
+            hasConfiguration="false"
+            id="org.jboss.ide.eclipse.as.eap.60"
+            initialState="stopped"
+           
launchConfigId="org.jboss.ide.eclipse.as.core.server.JBoss7StartupConfiguration"
+            launchModes="run,debug,profile"
+            name="%jboss.eap.version.60.name"
+            runtime="true"
+            runtimeTypeId="org.jboss.ide.eclipse.as.runtime.eap.60"
+            startBeforePublish="false"
+            startTimeout="450000"
+            stopTimeout="450000"
+            supportsRemoteHosts="true"/>
 
+
       <serverType
            
behaviourClass="org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior"
            
class="org.jboss.ide.eclipse.as.core.server.internal.DeployableServer"
@@ -593,6 +610,60 @@
           </moduleType>
       </runtimeType>
 
+      <runtimeType
+             vendor="%enterpriseProviderName"
+            
class="org.jboss.ide.eclipse.as.core.server.internal.v7.LocalJBoss7ServerRuntime"
+             description="%jboss.eap.version.60.description"
+             name="%jboss.eap.version.60.runtime.name"
+             id="org.jboss.ide.eclipse.as.runtime.eap.60"
+             version="6.0">
+          <moduleType
+                types="jst.appclient"
+                versions="5.0, 6.0"/>
+          <moduleType
+                types="wst.web"
+                versions="1.0,1.2,1.3,1.4"/>
+          <moduleType
+                types="jst.web"
+                versions="2.2, 2.3, 2.4, 2.5, 3.0"/>
+          <moduleType
+                types="jst.ejb"
+                versions="1.0, 1.1, 2.0, 2.1, 3.0, 3.1"/>
+          <moduleType
+                types="jst.ear"
+                versions="1.2, 1.3, 1.4, 5.0, 6.0"/>
+          <moduleType
+	         types="jst.connector"
+	         versions="1.0, 1.5, 1.6"/>
+	      <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,4.6,4.7,4.9"/>
+          <moduleType
+                types="jst.jboss.sar"
+                versions="1.0"/>
+          <moduleType
+                types="jbt.bpel.module"
+                versions="1.1, 2.0">
+          </moduleType>
+          <moduleType
+                types="bpel.module"
+                versions="1.1, 2.0">
+          </moduleType>
+          <moduleType
+                types="jboss.osgi"
+                versions="1.0">
+          </moduleType>
+          
+      </runtimeType>
 
 
       <runtimeType
@@ -776,7 +847,7 @@
            
class="org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ManagerServicePoller"
            
id="org.jboss.ide.eclipse.as.core.server.JBoss7ManagerServicePoller"
             name="JBoss 7 Manager Service"
-            serverTypes="org.jboss.ide.eclipse.as.70"
+            serverTypes="org.jboss.ide.eclipse.as.70,
org.jboss.ide.eclipse.as.eap.60"
             supportsShutdown="true"
             supportsStartup="true">
        </serverPoller>

Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7ServerWizardFragment.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7ServerWizardFragment.java	2011-08-24
06:58:46 UTC (rev 34215)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7ServerWizardFragment.java	2011-08-24
08:50:30 UTC (rev 34216)
@@ -8,6 +8,8 @@
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Preferences;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.widgets.Composite;
@@ -16,6 +18,7 @@
 import org.eclipse.wst.server.core.TaskModel;
 import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
 import org.jboss.ide.eclipse.as.core.server.bean.JBossServerType;
+import org.jboss.ide.eclipse.as.ui.IPreferenceKeys;
 import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin;
 import org.jboss.ide.eclipse.as.ui.Messages;
 
@@ -41,11 +44,12 @@
 
 	protected void fillWidgets() {
 		IRuntime rt = (IRuntime) getTaskModel().getObject(TaskModel.TASK_RUNTIME);
+		
 		if (rt != null) {
 			try {
 				fillNameWidgets(rt);
 				fillHomeDir(rt);
-				fillJREWidgets(getRuntime());
+				fillJREWidgets(rt);
 			} catch (Exception e) {
 				IStatus status = new Status(IStatus.ERROR, JBossServerUIPlugin.PLUGIN_ID,
MessageFormat.format(Messages.JBoss7ServerWizardFragment_could_not_create_ui,
rt.getName()), e);
 				JBossServerUIPlugin.getDefault().getLog().log(status);

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	2011-08-24
06:58:46 UTC (rev 34215)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java	2011-08-24
08:50:30 UTC (rev 34216)
@@ -195,6 +195,8 @@
 			
 			String locationDefault = Platform.getOS().equals(Platform.WS_WIN32) 
 			? "c:/program files/jboss-" : "/usr/bin/jboss-"; //$NON-NLS-1$
//$NON-NLS-2$
+			if( isEAP() )
+				locationDefault += "eap-"; //$NON-NLS-1$
 			String version = rt.getRuntimeType().getVersion();
 			locationDefault += version + ".x"; //$NON-NLS-1$
 			homeDir = (value != null && value.length() != 0) ? value : locationDefault;
@@ -204,12 +206,16 @@
 		}
 		homeDirText.setText(homeDir);
 		
-		((IRuntimeWorkingCopy)rt).setLocation(new Path(homeDir));
-		homeDirText.setEditable(true);
-		homeDirButton.setEnabled(true);
+		boolean isWC = rt instanceof IRuntimeWorkingCopy;
+		if( isWC ) {
+			((IRuntimeWorkingCopy)rt).setLocation(new Path(homeDir));
+		} 
+		homeDirText.setEnabled(isWC);
+		homeDirButton.setEnabled(isWC);
 	}
 	
-	protected void fillConfigWidgets(IJBossServerRuntime jbsrt) {
+	protected void fillConfigWidgets(IRuntime rt) {
+		IJBossServerRuntime jbsrt = getRuntime();
 		String dirText = jbsrt.getConfigLocation();
 		configDirText.setText(dirText == null ? IConstants.SERVER : dirText);
 		configurations.setConfiguration(jbsrt.getJBossConfiguration() == null 
@@ -217,7 +223,8 @@
 		configurations.getTable().setVisible(true);
 	}
 	
-	protected void fillJREWidgets(IJBossServerRuntime jbsrt) {
+	protected void fillJREWidgets(IRuntime rt) {
+		IJBossServerRuntime jbsrt = getRuntime();
 		if (jbsrt.isUsingDefaultJRE()) {
 			jreCombo.select(0);
 		} else {
@@ -235,13 +242,17 @@
 		jreComboIndex = jreCombo.getSelectionIndex();
 		if( jreCombo.getSelectionIndex() < 0 && jreCombo.getItemCount() > 0)
 			jreCombo.select(0);
+		
+		boolean isWC = rt instanceof IRuntimeWorkingCopy;
+		jreCombo.setEnabled(isWC);
+		jreButton.setEnabled(isWC);
 	}
 	
 	protected void fillWidgets() {
-		IJBossServerRuntime rt = getRuntime();
+		IRuntime rt = (IRuntime) getTaskModel().getObject(TaskModel.TASK_RUNTIME);
 		if (rt != null) {
-			fillNameWidgets(rt.getRuntime());
-			fillHomeDir(rt.getRuntime());
+			fillNameWidgets(rt);
+			fillHomeDir(rt);
 			fillConfigWidgets(rt);
 			fillJREWidgets(rt);
 		}
@@ -679,6 +690,11 @@
 			v = "6.";
 		if( !isEAP() && v.startsWith("7."))
 			v = "7.";
+		if( isEAP() && v.startsWith("6."))
+			v = "7.";
+		if( !isEAP() && v.startsWith("7."))
+			v = "7.";
+
 		return version.startsWith(v) ? null : NLS.bind(Messages.rwf_homeIncorrectVersion, v,
version);
 	}
 
@@ -780,13 +796,14 @@
 
 	public void performFinish(IProgressMonitor monitor) throws CoreException {
 		exit();
-		IRuntimeWorkingCopy r = (IRuntimeWorkingCopy) getTaskModel().getObject(
-				TaskModel.TASK_RUNTIME);
-		IRuntime saved = r.save(false, new NullProgressMonitor());
-		Preferences prefs = JBossServerUIPlugin.getDefault().getPluginPreferences();
-		prefs.setValue(IPreferenceKeys.RUNTIME_HOME_PREF_KEY_PREFIX +
saved.getRuntimeType().getId(), homeDir);
-
-		getTaskModel().putObject(TaskModel.TASK_RUNTIME, saved);
+		IRuntime rt = (IRuntime)getTaskModel().getObject(TaskModel.TASK_RUNTIME);
+		if( rt instanceof IRuntimeWorkingCopy ) {
+			IRuntimeWorkingCopy r = (IRuntimeWorkingCopy) rt;
+			IRuntime saved = r.save(false, new NullProgressMonitor());
+			Preferences prefs = JBossServerUIPlugin.getDefault().getPluginPreferences();
+			prefs.setValue(IPreferenceKeys.RUNTIME_HOME_PREF_KEY_PREFIX +
saved.getRuntimeType().getId(), homeDir);
+			getTaskModel().putObject(TaskModel.TASK_RUNTIME, saved);
+		}
 	}
 
 	public boolean isComplete() {

Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.properties	2011-08-24 06:58:46 UTC
(rev 34215)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.properties	2011-08-24 08:50:30 UTC
(rev 34216)
@@ -23,9 +23,10 @@
 NavigatorContent_XMLConfiguration=XML Configuration
 NavigatorContent_JMX=JMX
 
-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.eap.43,org.jboss.ide.eclipse.as.runtime.eap.50
-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.eap.43,org.jboss.ide.eclipse.as.eap.50
-JBossServer6AndBelow=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
-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.eap.43,org.jboss.ide.eclipse.as.eap.50,org.jboss.ide.eclipse.as.systemCopyServer
+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.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.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.eap.43,org.jboss.ide.eclipse.as.eap.50,org.jboss.ide.eclipse.as.eap.60,org.jboss.ide.eclipse.as.systemCopyServer
+RuntimeTypesJBoss6OrLower=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.eap.43,org.jboss.ide.eclipse.as.runtime.eap.50
+ServerTypesJBoss6OrLower=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
 ServerTypesJBoss6OrHigher=org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.70
-ServerTypesJBoss7=org.jboss.ide.eclipse.as.70
\ No newline at end of file
+ServerTypesJBoss7=org.jboss.ide.eclipse.as.70,org.jboss.ide.eclipse.as.eap.60
\ No newline at end of file

Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml	2011-08-24 06:58:46 UTC (rev
34215)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml	2011-08-24 08:50:30 UTC (rev
34216)
@@ -31,22 +31,17 @@
          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.51,org.jboss.ide.eclipse.as.runtime.eap.43,org.jboss.ide.eclipse.as.runtime.eap.50,org.jboss.ide.eclipse.as.runtime.60"
+            typeIds="%RuntimeTypesJBoss6OrLower"
         	id="org.jboss.ide.eclipse.as.ui.JBossRuntimeWizardFragment"/>
       <fragment
            
class="org.jboss.ide.eclipse.as.ui.wizards.JBoss7ServerWizardFragment"
             id="org.jboss.ide.eclipse.as.ui.jboss7ServerWizardFragment"
-            typeIds="org.jboss.ide.eclipse.as.runtime.70"/>
+            typeIds="%ServerTypesJBoss7"/>
       <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.51,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50,org.jboss.ide.eclipse.as.60"/>
-   <!--
+            typeIds="%ServerTypesJBoss6OrLower"/>
       <fragment
-           
class="org.jboss.ide.eclipse.as.ui.wizards.JBoss7ServerWizardFragment"
-            id="org.jboss.ide.eclipse.as.ui.jboss7ServerWizardFragment"
-            typeIds="org.jboss.ide.eclipse.as.70"/>  -->
-      <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"/>
@@ -181,7 +176,7 @@
             id="org.jboss.ide.eclipse.as.ui.editor.passwordSection"
             insertionId="org.eclipse.wst.server.editor.overview.left"
             order="10"
-            typeIds="%JBossServer6AndBelow"/>
+            typeIds="%ServerTypesJBoss6OrLower"/>
       <section
             class="org.jboss.ide.eclipse.as.ui.editor.ServerModeSection"
             id="org.jboss.ide.eclipse.as.ui.editor.serverModeSection"
@@ -268,7 +263,7 @@
          point="org.jboss.ide.eclipse.as.ui.ServerEditorPortSection">
       <section
            
class="org.jboss.ide.eclipse.as.ui.editor.PortSection$JNDIPortEditorExtension"
-            serverIds="%JBossServer6AndBelow">
+            serverIds="%ServerTypesJBoss6OrLower">
       </section>
       <section
            
class="org.jboss.ide.eclipse.as.ui.editor.PortSection$WebPortEditorExtension"
@@ -280,7 +275,7 @@
       </section>
       <section
            
class="org.jboss.ide.eclipse.as.ui.editor.PortSection$JBoss7ManagementPortEditorExtension"
-            serverIds="org.jboss.ide.eclipse.as.70">
+            serverIds="%ServerTypesJBoss7">
       </section>
    </extension>
 


    

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

[jbosstools-commits] JBoss Tools SVN: r34216 - in trunk/as/plugins: org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core and 6 other directories.