Author: rob.stryker(a)jboss.com Date: 2009-01-06 17:03:00 -0500 (Tue, 06 Jan 2009) New Revision: 12911 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java Log: JBIDE-3495 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2009-01-06 21:03:50 UTC (rev 12910) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2009-01-06 22:03:00 UTC (rev 12911) @@ -10,7 +10,7 @@ rwf_Explanation=A JBoss Server runtime references a JBoss installation directory.\nIt can be used to set up classpaths for projects which depend on this runtime,\nas well as by a "server" which will be able to start and stop instances of JBoss. rwf_BaseName=JBoss _VERSION_ Runtime rwf_NameInUse=Runtime name already in use -rwf_invalidDirectory=Invalid Directory +rwf_invalidDirectory=The home directory does not exist, is missing key files, or is of the incorrect version. rwf_nameTextBlank=The name field must not be blank rwf_homeDirBlank=The directory field must not be blank swf_Title=Create a new JBoss Server 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 2009-01-06 21:03:50 UTC (rev 12910) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2009-01-06 22:03:00 UTC (rev 12911) @@ -63,6 +63,8 @@ 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.util.JBossServerType; +import org.jboss.ide.eclipse.as.core.util.ServerBeanLoader; import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages; import org.jboss.ide.eclipse.as.ui.Messages; @@ -442,9 +444,13 @@ } protected boolean isHomeValid() { - return homeDir != null - && new Path(homeDir).append("bin").append("run.jar").toFile() - .exists(); + if( homeDir == null || !(new File(homeDir).exists())) return false; + String version = new ServerBeanLoader().getFullServerVersion(new File(homeDir, JBossServerType.AS.getSystemJarPath())); + IRuntime rt = (IRuntime) getTaskModel().getObject( + TaskModel.TASK_RUNTIME); + String v = rt.getRuntimeType().getVersion(); + return new Path(homeDir).append("bin").append("run.jar").toFile().exists() + && version.startsWith(v); } private void browseHomeDirClicked() {