### Eclipse Workspace Patch 1.0
#P org.jboss.tools.esb.project.ui
Index: src/org/jboss/tools/esb/project/ui/preference/controls/JBossRuntimeListFieldEditor.java
===================================================================
--- src/org/jboss/tools/esb/project/ui/preference/controls/JBossRuntimeListFieldEditor.java	(revision 44663)
+++ src/org/jboss/tools/esb/project/ui/preference/controls/JBossRuntimeListFieldEditor.java	(working copy)
@@ -562,20 +562,6 @@
 			}
 
 			JBossESBRuntime jarJbws = (JBossESBRuntime) jars.getValue();
-			if (current != null
-					&& current.getName().equals(name.getValueAsString())
-					&& current.getHomeDir().equals(homeDir.getValueAsString())
-					&& current.getVersion().equals(version.getValueAsString())
-					&& current.isUserConfigClasspath() == jarJbws
-							.isUserConfigClasspath()
-					&& current.getConfiguration().equals(configuration.getText())
-					&& (!jarJbws.isUserConfigClasspath() || hasSameLibraies(
-							current.getLibraries(), jarJbws.getLibraries()))) {
-
-				setErrorMessage(null);
-				setPageComplete(false);
-				return;
-			}
 
 			if (jarJbws.isUserConfigClasspath()
 					&& jarJbws.getLibraries().size() == 0) {
@@ -592,28 +578,16 @@
 			}
 			
 			if (!runtimeExist(homeDir.getValueAsString(),  (String)version.getValue(), configuration.getText())) {
-				final Combo vCombo = (Combo)this.version.getEditorControls()[1];
-				String[] vStrings = vCombo.getItems();
-				for( int i = 0; i < vStrings.length; i++ ) {
-					boolean works = runtimeExist(homeDir.getValueAsString(),  vStrings[i], configuration.getText());
-					if( works ) { 
-						final String newVersion = vStrings[i];
-						final int i2 = i;
-						Display.getDefault().asyncExec(new Runnable() { 
-							public void run() {
-								vCombo.select(i2);
-								version.setValue(newVersion);
-							}
-						});
-						return;
-					}
-				}
-				setErrorMessage(NLS.bind(JBossESBUIMessages.Label_JBoss_Runtime_Load_Error, version.getValue()));
+                String[] boundStrings = new String[]{version.getValueAsString()};
+                String message = NLS.bind(
+                        JBossFacetCoreMessages.Error_Version_Not_Supported, boundStrings);
+				setErrorMessage(message);
 				setPageComplete(false);
 				return;
 			}
 
 			setErrorMessage(null);
+			setMessage(JBossESBUIMessages.JBoss_Runtime_List_Field_Editor_Create_A_Runtime);
 
 			// validate version matches what's in the runtime zip or show warning
             String homeLocation = homeDir.getValueAsString();
#P org.jboss.tools.esb.project.core
Index: src/org/jboss/tools/esb/core/messages/JBossFacetCore.properties
===================================================================
--- src/org/jboss/tools/esb/core/messages/JBossFacetCore.properties	(revision 44663)
+++ src/org/jboss/tools/esb/core/messages/JBossFacetCore.properties	(working copy)
@@ -1,5 +1,6 @@
 Error_Copy=Exception while copying runtime jars: {0}
-Warning_No_Exact_ESB_Runtime_Match=No exact match found for ESB runtime version {0}. Assuming compatible with latest version\: {1}.
+Warning_No_Exact_ESB_Runtime_Match=Selected runtime supports ESB version {0}. Assuming compatible with version\: {1}.
+Error_Version_Not_Supported=ESB version {0} is not supported on the specified runtime. 
 # START NON-TRANSLATABLE
 ESB_Location=jbossesbruntimelocation
 # END NON-TRANSLATABLE
Index: src/org/jboss/tools/esb/core/messages/JBossFacetCoreMessages.java
===================================================================
--- src/org/jboss/tools/esb/core/messages/JBossFacetCoreMessages.java	(revision 44663)
+++ src/org/jboss/tools/esb/core/messages/JBossFacetCoreMessages.java	(working copy)
@@ -30,6 +30,7 @@
 	public static String Error_Add_Facet_JBossESB;
 	public static String Error_Remove_Facet_JBossESB;
 	public static String Warning_No_Exact_ESB_Runtime_Match;
+	public static String Error_Version_Not_Supported;
 
 
 	static {
Index: src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_47.java
===================================================================
--- src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_47.java	(revision 44663)
+++ src/org/jboss/tools/esb/core/runtime/ESBRuntimeResolver_47.java	(working copy)
@@ -23,6 +23,7 @@
 
 	private final static String CONFIG_MODEL_JAR_11 = "jbossesb-config-model-1.1.0.jar";
 	private final static String CONFIG_MODEL_JAR_12 = "jbossesb-config-model-1.2.0.jar";
+	private final static String JUDDI_CLIENT_JAR_301 = "juddi-client-3.0.1.jar";
 
 	
 	public boolean isValidESBRuntime(String location, String version, String configuration){
@@ -33,6 +34,7 @@
 		}
 			
 		return jarNames.contains(ROSETTA_JAR)
+				&& jarNames.contains(JUDDI_CLIENT_JAR_301)
 				&& jarNames.contains(CONFIG_MODEL_JAR_11)
 				&& jarNames.contains(CONFIG_MODEL_JAR_12);
 	}