Author: rob.stryker(a)jboss.com Date: 2010-06-24 04:19:53 -0400 (Thu, 24 Jun 2010) New Revision: 22980 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java Log: JBIDE-6525 - EAP 5.0 should default to workspace metadata Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java 2010-06-24 07:57:27 UTC (rev 22979) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java 2010-06-24 08:19:53 UTC (rev 22980) @@ -44,6 +44,7 @@ import org.jboss.ide.eclipse.as.core.server.IDeployableServer; import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; 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.ui.JBossServerUISharedImages; import org.jboss.ide.eclipse.as.ui.Messages; @@ -187,7 +188,7 @@ JBossServer jbs = (JBossServer)serverWC.loadAdapter(JBossServer.class, new NullProgressMonitor()); jbs.setUsername("admin"); //$NON-NLS-1$ jbs.setPassword("admin"); //$NON-NLS-1$ - jbs.setDeployLocationType(isAS5() ? IDeployableServer.DEPLOY_SERVER : IDeployableServer.DEPLOY_METADATA); + jbs.setDeployLocationType(isAS50() ? IDeployableServer.DEPLOY_SERVER : IDeployableServer.DEPLOY_METADATA); serverWC.setRuntime((IRuntime)getTaskModel().getObject(TaskModel.TASK_RUNTIME)); serverWC.setServerConfiguration(null); // no inside jboss folder } @@ -204,9 +205,8 @@ return ajbsrt; } - protected boolean isAS5() { - return getRuntime().getRuntime().getRuntimeType(). - getVersion().equals("5.0"); //$NON-NLS-1$ + protected boolean isAS50() { + return getRuntime().getRuntime().getRuntimeType().equals(IJBossToolingConstants.SERVER_AS_50); } public boolean isComplete() {