### Eclipse Workspace Patch 1.0
#P org.jboss.tools.seam.ui.test
Index: src/org/jboss/tools/seam/ui/test/wizard/PackageNamesTest.java
===================================================================
--- src/org/jboss/tools/seam/ui/test/wizard/PackageNamesTest.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/test/wizard/PackageNamesTest.java	(working copy)
@@ -12,13 +12,12 @@
 
 import junit.framework.TestCase;
 
-import org.eclipse.jface.wizard.IWizardPage;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
 import org.eclipse.wst.web.ui.internal.wizards.NewProjectDataModelFacetWizard;
+import org.jboss.tools.seam.core.SeamCoreMessages;
 import org.jboss.tools.seam.ui.ISeamUiConstants;
-import org.jboss.tools.seam.ui.SeamUIMessages;
 import org.jboss.tools.seam.ui.internal.project.facet.SeamInstallWizardPage;
 import org.jboss.tools.test.util.JobUtils;
 import org.jboss.tools.test.util.WorkbenchUtils;
@@ -69,7 +68,7 @@
 		// delay is needed to wait for dialog initialization is finished
 		// such as default runtime and configuration for seam wizard
 		JobUtils.delay(2000);
-		seamWizPg = (SeamInstallWizardPage)wizard.getPage(SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_SEAM_FACET);
+		seamWizPg = (SeamInstallWizardPage)wizard.getPage(SeamCoreMessages.SEAM_INSTALL_WIZARD_PAGE_SEAM_FACET);
 	}
 
 	public void testProjectNameWithUnderlines() {
#P org.jboss.tools.seam.ui
Index: src/org/jboss/tools/seam/ui/SeamUiImages.java
===================================================================
--- src/org/jboss/tools/seam/ui/SeamUiImages.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/SeamUiImages.java	(working copy)
@@ -17,6 +17,7 @@
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.graphics.Image;
+import org.jboss.tools.seam.core.SeamCoreMessages;
 
 public class SeamUiImages {
 
@@ -63,7 +64,7 @@
 	
 	protected SeamUiImages(URL registryUrl, SeamUiImages parent){
 
-		if(registryUrl == null) throw new IllegalArgumentException(SeamUIMessages.SEAM_UI_IMAGESBASE_URL_FOR_IMAGE_REGISTRY_CANNOT_BE_NULL);
+		if(registryUrl == null) throw new IllegalArgumentException(SeamCoreMessages.SEAM_UI_IMAGESBASE_URL_FOR_IMAGE_REGISTRY_CANNOT_BE_NULL);
 		baseUrl = registryUrl;
 		parentRegistry = parent;
 	}
@@ -90,7 +91,7 @@
 	}
 
 	private URL makeIconFileURL(String name) throws MalformedURLException {
-		if (name == null) throw new MalformedURLException(SeamUIMessages.SEAM_UI_IMAGESIMAGE_NAME_CANNOT_BE_NULL);
+		if (name == null) throw new MalformedURLException(SeamCoreMessages.SEAM_UI_IMAGESIMAGE_NAME_CANNOT_BE_NULL);
 		return new URL(baseUrl, name);
 	}	
 
Index: src/org/jboss/tools/seam/ui/messages_ja.properties
===================================================================
--- src/org/jboss/tools/seam/ui/messages_ja.properties	(revision 39311)
+++ src/org/jboss/tools/seam/ui/messages_ja.properties	(working copy)
@@ -1,181 +0,0 @@
-CREATE_NEW_SEAM_PROJECT=\u65B0\u898F Seam \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u4F5C\u6210
-GENERATE_SEAM_ENTITIES_WIZARD_TITLE=Seam \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u30FC\u306E\u751F\u6210
-GENERATE_SEAM_ENTITIES_WIZARD_PAGE_MESSAGE=Seam \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044
-GENERATE_SEAM_ENTITIES_WIZARD_HIBERNATE_CONFIGURATION_LABEL=Hibernate \u30B3\u30F3\u30BD\u30FC\u30EB\u69CB\u6210\:
-GENERATE_SEAM_ENTITIES_WIZARD_HIBERNATE_CONFIGURATION_MESSAGE=Hibernate \u30B3\u30F3\u30BD\u30FC\u30EB\u69CB\u6210\u306E\u9078\u629E
-GENERATE_SEAM_ENTITIES_WIZARD_HIBERNATE_CONFIGURATION_ERROR=Hibernate \u30B3\u30F3\u30BD\u30FC\u30EB\u69CB\u6210\u540D\u304C\u7A7A\u3067\u3059
-GENERATE_SEAM_ENTITIES_WIZARD_GROUP_LABEL=\u751F\u6210\u30E2\u30FC\u30C9
-GENERATE_SEAM_ENTITIES_WIZARD_REVERSE_ENGINEER_LABEL=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u304B\u3089\u30EA\u30D0\u30FC\u30B9\u30FB\u30A8\u30F3\u30B8\u30CB\u30A2\u30EA\u30F3\u30B0
-GENERATE_SEAM_ENTITIES_WIZARD_EXISTING_ENTITIES_LABEL=\u65E2\u5B58\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u30FC\u3092\u4F7F\u7528
-SEAM_INSTALL_WIZARD_PAGE_CONFIGURE_SEAM_FACET_SETTINGS=Seam \u30D5\u30A1\u30BB\u30C3\u30C8\u8A2D\u5B9A\u3092\u69CB\u6210\u3057\u307E\u3059
-SEAM_INSTALL_WIZARD_PAGE_CANNOT_USE_SELECTED_DEPLOYMENT6=\u9078\u629E\u3055\u308C\u305F\u30B5\u30FC\u30D0\u30FC\u30FB\u30E9\u30F3\u30BF\u30A4\u30E0 ''{1}'' \u306F EJB 3.0 \u3068 EAR 5.0 \u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u306A\u3044\u306E\u3067 ''{0}'' \u30C7\u30D7\u30ED\u30A4\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
-SEAM_PROJECT_WIZARD_PAGE1_SEAM_FACET_MUST_BE_SPECIFIED=Seam \u30D5\u30A1\u30BB\u30C3\u30C8\u304C\u6709\u52B9\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
-SEAM_PROJECT_SELECTION_DIALOG_SELECT_SEAM_WEB_PROJECT=Seam Web \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044
-SEAM_PROJECT_WIZARD_CREATE_STANDALONE_SEAM_WEB_PROJECT=\u30B9\u30BF\u30F3\u30C9\u30A2\u30ED\u30F3 Seam Web \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u4F5C\u6210\u3057\u307E\u3059
-SEAM_INSTALL_WIZARD_PAGE_SEAM_RUNTIME=Seam \u30E9\u30F3\u30BF\u30A4\u30E0\:
-SEAM_INSTALL_WIZARD_PAGE_DEPLOY_AS=\u6B21\u306E\u5F62\u5F0F\u3067\u30C7\u30D7\u30ED\u30A4\:
-SEAM_VIEW_LAYOUT_ACTION_GROUP_FLAT=\u30D5\u30E9\u30C3\u30C8
-SEAM_VIEW_LAYOUT_ACTION_GROUP_NODE=\u30CE\u30FC\u30C9
-SEAM_INSTALL_WIZARD_PAGE_CONNECTION_PROFILE=\u63A5\u7D9A\u30D7\u30ED\u30D5\u30A1\u30A4\u30EB\:
-SEAM_VIEW_LAYOUT_ACTION_GROUP_SEAM_PACKAGES=Seam \u30D1\u30C3\u30B1\u30FC\u30B8
-SEAM_RUNTIME_LIST_FIELD_EDITOR_SEAM_RUNTIME=Seam \u30E9\u30F3\u30BF\u30A4\u30E0
-SEAM_INSTALL_WIZARD_PAGE_DATABASE_TYPE=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30FB\u30BF\u30A4\u30D7\:
-SEAM_BASE_WIZARD_PAGE_LOCAL_CLASS_NAME=\u30ED\u30FC\u30AB\u30EB\u30FB\u30A4\u30F3\u30BF\u30FC\u30D5\u30A7\u30FC\u30B9\:
-SEAM_RUNTIME_LIST_FIELD_EDITOR_VERSION=\u30D0\u30FC\u30B8\u30E7\u30F3
-SEAM_INSTALL_WIZARD_PAGE_DATABASE_SCHEMA_NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30FB\u30B9\u30AD\u30FC\u30DE\u540D\:
-SEAM_INSTALL_WIZARD_PAGE_DATABASE_CATALOG_NAME=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30FB\u30AB\u30BF\u30ED\u30B0\u540D\:
-SEAM_PROJECT_SELECTION_DIALOG_SEAM_WEB_PROJECT=Seam Web \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8
-SEAM_PROJECT_SELECTION_DIALOG_SHOW_ALL_PROJECTS=\u5168\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u8868\u793A
-SEAM_PROJECT_LABEL_PROVIDER_SEAM_COMPONENTS=Seam \u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8
-SEAM_ENTITY_WIZARD_PAGE1_ENTITY_MASTER_PAGE=\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u30FC\u30FB\u30DE\u30B9\u30BF\u30FC\u30FB\u30DA\u30FC\u30B8
-SEAM_ENTITY_WIZARD_ENTITY_CREATING_OPERATION=\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u30FC\u4F5C\u6210\u64CD\u4F5C
-SEAM_RUNTIME_LIST_FIELD_EDITOR_NEW_SEAM_RUNTIME=\u65B0\u898F Seam \u30E9\u30F3\u30BF\u30A4\u30E0
-SEAM_RUNTIME_LIST_FIELD_EDITOR_EDIT_SEAM_RUNTIME=Seam \u30E9\u30F3\u30BF\u30A4\u30E0\u306E\u7DE8\u96C6
-SEAM_INSTALL_WIZARD_PAGE_DB_TABLES_ALREADY_EXISTS=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30FB\u30C6\u30FC\u30D6\u30EB\u306F\u65E2\u306B\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306B\u5B58\u5728\:
-SEAM_INSTALL_WIZARD_PAGE_RECREATE_DATABASE_TABLES_AND_DATA_ON_DEPLOY=\u30C7\u30D7\u30ED\u30A4\u6642\u306B\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306E\u30C6\u30FC\u30D6\u30EB\u3068\u30C7\u30FC\u30BF\u3092\u518D\u4F5C\u6210\:
-SEAM_RUNTIME_LIST_FIELD_EDITOR_PARENT_CONTROL_SHOULD_BE_COMPOSITE=\u89AA\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB\u306F\u30B3\u30F3\u30DD\u30B8\u30C3\u30C8\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
-SEAM_RUNTIME_LIST_FIELD_EDITOR_EDITOR_SUPPORTS_ONLY_GRID_LAYOUT=\u30A8\u30C7\u30A3\u30BF\u30FC\u306F\u30B0\u30EA\u30C3\u30C9\u30FB\u30EC\u30A4\u30A2\u30A6\u30C8\u306E\u307F\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u307E\u3059
-SEAM_RUNTIME_LIST_FIELD_EDITOR_CANNOT_OBTAIN_SEAM_VERSION_NUMBER=jboss-seam.jar \u30D5\u30A1\u30A4\u30EB\u304B\u3089 Seam \u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u53D6\u5F97\u3067\u304D\u307E\u305B\u3093\u3002
-SEAM_INSTALL_WIZARD_PAGE_SESSION_BEAN_PACKAGE_NAME=\u30BB\u30C3\u30B7\u30E7\u30F3 Bean \u30D1\u30C3\u30B1\u30FC\u30B8\u540D\:
-SEAM_CONVERSATION_WIZARD_ENTITY_CREATING_OPERATION=\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u30FC\u4F5C\u6210\u64CD\u4F5C
-SEAM_RUNTIME_LIST_FIELD_EDITOR_NAME_CANNOT_BE_EMPTY=\u540D\u524D\u306F\u7A7A\u6B04\u306B\u3067\u304D\u307E\u305B\u3093
-SEAM_RUNTIME_LIST_FIELD_EDITOR_CANNOT_FIND_JBOSS_SEAM_JAR=jboss-seam.jar \u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
-SEAM_RUNTIME_LIST_FIELD_EDITOR_CREATE_A_SEAM_RUNTIME=Seam \u30E9\u30F3\u30BF\u30A4\u30E0\u3092\u4F5C\u6210\u3057\u307E\u3059
-SEAM_RUNTIME_LIST_FIELD_EDITOR_MODIFY_SEAM_RUNTIME=\u65B0\u3057\u3044\u5024\u3092\u5165\u529B\u3057\u307E\u3059
-SEAM_BASE_WIZARD_OPERATION_IS_NOT_DEFINED_FOR_WIZARD=\u64CD\u4F5C\u306F\u30A6\u30A3\u30B6\u30FC\u30C9\u306B\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u305B\u3093
-SEAM_INSTALL_WIZARD_PAGE_ENTITY_BEAN_PACKAGE_NAME=\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u30FC Bean \u30D1\u30C3\u30B1\u30FC\u30B8\u540D\:
-SEAM_VIEW_LAYOUT_ACTION_GROUP_SCOPE_PRESENTATION=\u30B9\u30B3\u30FC\u30D7\u8868\u793A
-SEAM_CONVERSATION_WIZARD_CREATE_NEW_CONVERSATION=\u65B0\u898F\u5BFE\u8A71\u306E\u4F5C\u6210
-SEAM_CONVERSATION_WIZARD_PAGE1_SEAM_CONVERSATION=Seam \u5BFE\u8A71
-SEAM_INSTALL_WIZARD_PAGE_TEST_PACKAGE_NAME=\u30C6\u30B9\u30C8\u30FB\u30D1\u30C3\u30B1\u30FC\u30B8\u540D\:
-SEAM_VIEW_LAYOUT_ACTION_GROUP_HIERARCHICAL=\u968E\u5C64
-SEAM_RUNTIME_LIST_FIELD_EDITOR_HOME_FOLDER=\u30DB\u30FC\u30E0\u30FB\u30D5\u30A9\u30EB\u30C0\u30FC\:
-SEAM_WIZARD_FACTORY_SEAM_ENTITY_CLASS_NAME=Seam \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u30FC\u30FB\u30AF\u30E9\u30B9\u540D\:
-SEAM_ENTITY_WIZARD_PAGE1_ENTITY_CLASS_NAME=\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u30FC\u30FB\u30AF\u30E9\u30B9\u540D
-SEAM_INSTALL_WIZARD_PAGE_SEAM_FACET=Seam \u30D5\u30A1\u30BB\u30C3\u30C8
-SEAM_VIEW_LAYOUT_ACTION_GROUP_LABEL=\u30E9\u30D9\u30EB
-SEAM_PROJECT_WIZARD_NEW_SEAM_PROJECT=\u65B0\u898F Seam \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8
-SEAM_PROJECT_WIZARD_SEAM_WEB_PROJECT=Seam Web \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8
-SEAM_PROJECT_WIZARD_EAR_MEMBERSHIP=EAR \u30E1\u30F3\u30D0\u30FC\u30B7\u30C3\u30D7
-SEAM_RUNTIME_LIST_FIELD_EDITOR_NAME=\u540D\u524D
-SEAM_RUNTIME_LIST_FIELD_EDITOR_PATH=\u30D1\u30B9
-SEAM_INSTALL_WIZARD_PAGE_GENERAL=\u4E00\u822C
-SEAM_GENERATE_ENTITIES_WIZARD_54=org.hibernate.eclipse.launch.SeamUtil
-SEAM_WIZARD_FACTORY_SEAM_PROJECT=Seam \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\:
-SEAM_INSTALL_WIZARD_PAGE_DATABASE=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9
-SELECT_SEAM_PROJECT_ACTION_BROWSE=\u53C2\u7167...
-SHOW_PROJECT_SETTINGS_ACTION=<a>\u8A2D\u5B9A...</a>
-SEAM_INSTALL_WIZARD_PAGE_CODE_GENERATION=\u30B3\u30FC\u30C9\u751F\u6210
-SEAM_FORM_WIZARD_FORM_CREATING_OPERATION=\u30D5\u30A9\u30FC\u30E0\u751F\u6210\u64CD\u4F5C
-SEAM_WIZARD_FACTORY_LOCAL_INTERFACE_NAME=\u30ED\u30FC\u30AB\u30EB\u30FB\u30A4\u30F3\u30BF\u30FC\u30D5\u30A7\u30FC\u30B9\u540D\:
-SEAM_UI_IMAGESIMAGE_NAME_CANNOT_BE_NULL=\u30A4\u30E1\u30FC\u30B8\u540D\u306F\u7A7A\u6B04\u306B\u3067\u304D\u307E\u305B\u3093\u3002
-SEAM_RUNTIME_LIST_FIELD_EDITOR_VERSION2=\u30D0\u30FC\u30B8\u30E7\u30F3\:
-SEAM_WIZARD_FACTORY_SEAM_COMPONENT_NAME=Seam \u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u540D\:
-SEAM_INSTALL_WIZARD_PAGE_EDIT=\u7DE8\u96C6...
-SEAM_WIZARD_FACTORY_BEAN_NAME=Bean \u540D\:
-SEAM_WIZARD_FACTORY_PAGE_NAME=\u30DA\u30FC\u30B8\u540D\:
-SEAM_WIZARD_FACTORY_PACKAGE_NAME=\u30D1\u30C3\u30B1\u30FC\u30B8\u540D\:
-SEAM_ENTITY_WIZARD_PAGE1_PAGE=\u30DA\u30FC\u30B8
-SEAM_FORM_WIZARD_NEW_SEAM_FORM=\u65B0\u898F Seam \u30D5\u30A9\u30FC\u30E0
-SEAM_FORM_WIZARD_PAGE1_SEAM_FORM=Seam \u30D5\u30A9\u30FC\u30E0
-SEAM_WIZARD_FACTORY_METHOD_NAME=\u30E1\u30BD\u30C3\u30C9\u540D\:
-SEAM_INSTALL_WIZARD_PAGE_NEW=\u65B0\u898F...
-SEAM_BASE_WIZARD_PAGE_POJO_CLASS_NAME=POJO \u30AF\u30E9\u30B9\u540D\:
-SEAM_BASE_WIZARD_PAGE_SEAM_COMPONENTS=Seam \u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8
-SEAM_BASE_WIZARD_PAGE_LOCAL_INTERFACE=\u30ED\u30FC\u30AB\u30EB\u30FB\u30A4\u30F3\u30BF\u30FC\u30D5\u30A7\u30FC\u30B9
-SEAM_ACTION_WIZARD_PAGE1_SEAM_ACTION=Seam \u30A2\u30AF\u30B7\u30E7\u30F3
-SEAM_ACTION_WIZARD_NEW_SEAM_ACTION=\u65B0\u898F Seam \u30A2\u30AF\u30B7\u30E7\u30F3
-SEAM_ACTION_WIZARD_ACTION_CREATING_OPERATION=\u30A2\u30AF\u30B7\u30E7\u30F3\u751F\u6210\u64CD\u4F5C
-SEAM_RUNTIME_LIST_FIELD_EDITOR_NAME2=\u540D\u524D\:
-SEAM_WIZARD_FACTORY_MASTER_PAGE_NAME=\u30DE\u30B9\u30BF\u30FC\u30FB\u30DA\u30FC\u30B8\u540D\:
-SEAM_ENTITY_WIZARD_NEW_SEAM_ENTITY=\u65B0\u898F Seam \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u30FC
-SEAM_INSTALL_WIZARD_PAGE_ADD=\u8FFD\u52A0...
-CREATE_SEAM_WEB_PROJECTACTION_CREATE_SEAM_PROJECT=Seam \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u4F5C\u6210
-VALIDATOR_FACTORY_PATH_TO_A_FOLDER_CANNOT_BE_NULL=\u30D5\u30A9\u30EB\u30C0\u30FC\u3078\u306E\u30D1\u30B9\u306F\u7A7A\u6B04\u306B\u3067\u304D\u307E\u305B\u3093
-VALIDATOR_FACTORY_SEAM_HOME_FOLDER_DOES_NOT_EXISTS=Seam \u30DB\u30FC\u30E0\u30FB\u30D5\u30A9\u30EB\u30C0\u30FC\u306F\u5B58\u5728\u3057\u307E\u305B\u3093
-VALIDATOR_FACTORY_SEAM_RT_HOME_DIR_DOES_NOT_EXIST=\u9078\u629E\u3055\u308C\u305F Seam Web \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u7528\u306E Seam \u30E9\u30F3\u30BF\u30A4\u30E0 ''{0}'' \u306E\u30DB\u30FC\u30E0\u30FB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FC\u306F\u5B58\u5728\u3057\u307E\u305B\u3093
-VALIDATOR_FACTORY_SEAM_RT_HOME_DIR_IS_MISSING=Seam \u30E9\u30F3\u30BF\u30A4\u30E0''{0}'' \u306E\u30DB\u30FC\u30E0\u30FB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FC\u306F\u5B58\u5728\u3057\u307E\u305B\u3093
-VALIDATOR_FACTORY_SEAM_RT_RESOURCES_DIR_IS_MISSING=Seam \u30E9\u30F3\u30BF\u30A4\u30E0 ''{0}'' \u306E\u30EA\u30BD\u30FC\u30B9\u30FB\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u30FB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FC\u306F\u5B58\u5728\u3057\u307E\u305B\u3093
-VALIDATOR_FACTORY_SEAM_RT_TEMPLATES_DIR_DOES_NOT_EXIST=\u9078\u629E\u3055\u308C\u305FSeam Web \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u7528\u306E Seam \u30E9\u30F3\u30BF\u30A4\u30E0 ''{0}'' \u306E\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u30FB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FC\u306F\u5B58\u5728\u3057\u307E\u305B\u3093
-VALIDATOR_FACTORY_SEAM_RT_TEMPLATES_DIR_IS_MISSING=Seam \u30E9\u30F3\u30BF\u30A4\u30E0 ''{0}'' \u306E\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u30FB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FC\u306F\u5B58\u5728\u3057\u307E\u305B\u3093
-VALIDATOR_FACTORY_SEAM_RT_VIE_TEMPLATE_DIR_DOES_NOT_EXIST=\u9078\u629E\u3055\u308C\u305FSeam Web \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u7528\u306E Seam \u30E9\u30F3\u30BF\u30A4\u30E0 ''{0}'' \u306E\u30D3\u30E5\u30FC\u30FB\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u30FB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FC\u306F\u5B58\u5728\u3057\u307E\u305B\u3093
-VALIDATOR_FACTORY_JBOSS_AS_HOME_FOLDER_DOES_NOT_EXIST=JBoss AS \u30DB\u30FC\u30E0\u30FB\u30D5\u30A9\u30EB\u30C0\u30FC\u306F\u5B58\u5728\u3057\u307E\u305B\u3093
-VALIDATOR_FACTORY_COMPONENT_NAME_IS_NOT_VALID=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u540D\u306F\u7121\u52B9\u3067\u3059\u3002
-VALIDATOR_FACTORY_NAME_IS_NOT_VALID={0} \u540D\u306F\u7121\u52B9\u3067\u3059\u3002
-VALIDATOR_FACTORY_LOCAL_INTERFACE_NAME_IS_NOT_VALID=\u30ED\u30FC\u30AB\u30EB\u30FB\u30A4\u30F3\u30BF\u30FC\u30D5\u30A7\u30FC\u30B9\u540D\u306F\u7121\u52B9\u3067\u3059\u3002\n
-VALIDATOR_FACTORY_SELECTED_PRJ_IS_CLOSED=\u9078\u629E\u3057\u305F\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8 ''{0}'' \u306F\u9589\u3058\u3089\u308C\u307E\u3057\u305F
-VALIDATOR_FACTORY_PRJ_NOT_SELECTED=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u304C\u9078\u629E\u3055\u308C\u3066\u3044\u307E\u305B\u3093
-VALIDATOR_FACTORY_CONNECTION_PROFILE_IS_NOT_SELECTED=\u63A5\u7D9A\u30D7\u30ED\u30D5\u30A1\u30A4\u30EB\u304C\u9078\u629E\u3055\u308C\u3066\u3044\u307E\u305B\u3093
-VALIDATOR_FACTORY_SEAM_RT_SOURCE_TEMPLATES_DIR_DOES_NOT_EXIST=\u9078\u629E\u3055\u308C\u305F Seam Web \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E Seam \u30E9\u30F3\u30BF\u30A4\u30E0 ''{0}'' \u306E\u30BD\u30FC\u30B9\u30FB\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u30FB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FC\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
-VALIDATOR_FACTORY_SEAM_RUNTIME_IS_NOT_SELECTED=Seam \u30E9\u30F3\u30BF\u30A4\u30E0\u304C\u9078\u629E\u3055\u308C\u3066\u3044\u307E\u305B\u3093
-VALIDATOR_FACTORY_SEAM_RT_VIEW_DIR_IS_MISSING=Seam \u30E9\u30F3\u30BF\u30A4\u30E0 ''{0}'' \u306E\u30D3\u30E5\u30FC\u30FB\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u30FB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FC\u304C\u5B58\u5728\u3057\u307E\u305B\u3093
-VALIDATOR_FACTORY_SEAM_RT_CANNOT_BE_FOUND=\u9078\u629E\u3055\u308C\u305F Seam Web \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E ''{0}'' Seam \u30E9\u30F3\u30BF\u30A4\u30E0\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
-VALIDATOR_FACTORY_CANNOT_FIND_SEAM_RUNTIME=Seam \u30E9\u30F3\u30BF\u30A4\u30E0 ''{0}'' \u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
-VALIDATOR_FACTORY_SEAM_RT_SRC_DIR_IS_MISSING=Seam \u30E9\u30F3\u30BF\u30A4\u30E0 ''{0}'' \u306E\u30BD\u30FC\u30B9\u30FB\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u30FB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304C\u5B58\u5728\u3057\u307E\u305B\u3093
-VALIDATOR_FACTORY_SEAM_RT_NOT_CONFIGURED=\u9078\u629E\u3055\u308C\u305F Seam Web \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E Seam \u30E9\u30F3\u30BF\u30A4\u30E0\u304C\u69CB\u6210\u3055\u308C\u3066\u3044\u307E\u305B\u3093
-VALIDATOR_INVALID_SETTINGS=\u9078\u629E\u3055\u308C\u305F Seam \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306B\u306F\u4E0D\u6B63\u306A\u8A2D\u5B9A\u304C\u3042\u308A\u307E\u3059\u3002 "\u8A2D\u5B9A..."\u3092\u62BC\u3057\u3066\u4FEE\u6B63\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-SEAM_RUNTIME_LIST_FIELD_EDITOR_RUNTIME_NAME_IS_NOT_CORRECT=\u30E9\u30F3\u30BF\u30A4\u30E0\u540D\u304C\u4E0D\u6B63\u3067\u3059
-SEAM_GENERATE_ENTITIES_WIZARD_CAN_NOT_GENERATE_SEAM_ENTITIES=Seam \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u30FC\u3092\u751F\u6210\u3067\u304D\u307E\u305B\u3093
-SEAM_UI_IMAGESBASE_URL_FOR_IMAGE_REGISTRY_CANNOT_BE_NULL=\u30A4\u30E1\u30FC\u30B8\u767B\u9332\u306E\u30D9\u30FC\u30B9 URL \u306F\u7A7A\u6B04\u306B\u3067\u304D\u307E\u305B\u3093\u3002
-SEAM_GENERATE_ENTITIES_WIZARD_ACTION_CREATING_OPERATION=\u30A2\u30AF\u30B7\u30E7\u30F3\u751F\u6210\u64CD\u4F5C
-ABSTRACT_SEAM_CONTENT_PROVIDER_SEAM_PROJECT_CHANGE_EVENT_OCCURS_BUT_NO_SORCE_OF_PROJECT_PROVIDED=Seam \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u5909\u66F4\u30A4\u30D9\u30F3\u30C8\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u304C\u3001\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u30BD\u30FC\u30B9\u304C\u63D0\u4F9B\u3055\u308C\u3066\u3044\u307E\u305B\u3093
-SEAM_OPEN_ACTION_OPEN=\u958B\u304F
-TEXT_FIELD_EDITOR_PARENT_CONTROL_SHOULD_BE_COMPOSITE=\u89AA\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB\u306F\u30B3\u30F3\u30DD\u30B8\u30C3\u30C8\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
-TEXT_FIELD_EDITOR_EDITOR_SUPPORTS_ONLY_GRID_LAYOUT=\u30A8\u30C7\u30A3\u30BF\u30FC\u306F\u30B0\u30EA\u30C3\u30C9\u30FB\u30EC\u30A4\u30A2\u30A6\u30C8\u306E\u307F\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u307E\u3059
-BUTTON_FIELD_EDITOR_BROWSE=\u53C2\u7167...
-BUTTON_FIELD_EDITOR_NOT_IMPLEMENTED_YET=\u307E\u3060\u5B9F\u88C5\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u30A8\u30C7\u30A3\u30BF\u30FC\u3067\u5B9F\u30A2\u30AF\u30B7\u30E7\u30F3\u3092\u8A2D\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-SWT_FIELD_EDITOR_FACTORY_BROWS=\u53C2\u7167...
-SWT_FIELD_EDITOR_FACTORY_SELECT_SEAM_HOME_FOLDER=Seam \u30DB\u30FC\u30E0\u30FB\u30D5\u30A9\u30EB\u30C0\u30FC\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044
-SWT_FIELD_EDITOR_FACTORY_ERROR=\u30A8\u30E9\u30FC
-SWT_FIELD_EDITOR_FACTORY_NOT_IMPLEMENTED_YET=\u307E\u3060\u5B9F\u88C5\u3055\u308C\u3066\u3044\u307E\u305B\u3093
-SWT_FIELD_EDITOR_FACTORY_OK=Ok
-BASE_FIELD_EDITOR_NO_LABEL=\u30E9\u30D9\u30EB\u304C\u3042\u308A\u307E\u305B\u3093
-BASE_FIELD_EDITOR_PARENT_CONTROL_SHOULD_BE_COMPOSITE=\u89AA\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB\u306F\u30B3\u30F3\u30DD\u30B8\u30C3\u30C8\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
-BASE_FIELD_EDITOR_EDITOR_SUPPORTS_ONLY_GRID_LAYOUT=\u30A8\u30C7\u30A3\u30BF\u30FC\u306F\u30B0\u30EA\u30C3\u30C9\u30FB\u30EC\u30A4\u30A2\u30A6\u30C8\u306E\u307F\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u307E\u3059
-BASE_FIELD_EDITOR_PARENT_FOR_LABEL_IS_DIFFERENT=\u30E9\u30D9\u30EB\u306E\u89AA\u304C\u7570\u306A\u308A\u307E\u3059
-COMPOSITE_EDITOR_PARENT_CONTROL_SHOULD_BE_COMPOSITE=\u89AA\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB\u306F\u30B3\u30F3\u30DD\u30B8\u30C3\u30C8\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059
-COMPOSITE_EDITOR_EDITOR_SUPPORTS_ONLY_GRID_LAYOUT=\u30A8\u30C7\u30A3\u30BF\u30FC\u306F\u30B0\u30EA\u30C3\u30C9\u30FB\u30EC\u30A4\u30A2\u30A6\u30C8\u306E\u307F\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u307E\u3059
-COMPOSITE_EDITOR_THIS_METOD_CAN_BE_INVOKED=\u3053\u306E\u30E1\u30BD\u30C3\u30C9\u306F getEditorControls(parent) \u306E\u5F8C\u3067\u306E\u307F\u5B9F\u884C\u3067\u304D\u307E\u3059
-SEAM_RUNTIME_LIST_FIELD_EDITOR_PATH_TO_SEAM_HOME_DIRECTORY_CANNOT_BE_EMPTY=Seam \u30DB\u30FC\u30E0\u30FB\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3078\u306E\u30D1\u30B9\u306F\u7A7A\u6B04\u306B\u3067\u304D\u307E\u305B\u3093
-SEAM_TARGET_SERVER=\u30BF\u30FC\u30B2\u30C3\u30C8\u30FB\u30B5\u30FC\u30D0\u30FC
-RUNTIME_DELETE_CONFIRM_TITLE=\u30E9\u30F3\u30BF\u30A4\u30E0\u524A\u9664\u306E\u78BA\u8A8D
-RUNTIME_DELETE_NOT_USED_CONFIRM=\u30E9\u30F3\u30BF\u30A4\u30E0 ''{0}'' \u3092\u524A\u9664\u3057\u307E\u3059\u304B?
-RUNTIME_DELETE_USED_CONFIRM=\u30E9\u30F3\u30BF\u30A4\u30E0 ''{0}'' \u306F Seam \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3067\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u524A\u9664\u3057\u307E\u3059\u304B?
-OPEN_SEAM_COMPONENT_ACTION_ACTION_NAME=Seam \u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u958B\u304F
-OPEN_SEAM_COMPONENT_ACTION_DESCRIPTION=Seam \u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u958B\u304F
-OPEN_SEAM_COMPONENT_ACTION_TOOL_TIP=Seam \u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u958B\u304F
-OPEN_SEAM_COMPONENT_ACTION_MESSAGE=Seam \u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u540D\u306E\u30D7\u30EC\u30D5\u30A3\u30C3\u30AF\u30B9\u3084\u30D1\u30BF\u30FC\u30F3\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044 (? \= \u4EFB\u610F\u306E\u6587\u5B57, * \= \u4EFB\u610F\u306E\u6587\u5B57\u5217)\:
-OPEN_SEAM_COMPONENT_DIALOG_LOADING=Seam \u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u30ED\u30FC\u30C9
-OPEN_SEAM_COMPONENT_DIALOG_NAME=OpenSeamComponentDialog
-OPEN_SEAM_COMPONENT_DIALOG_WAIT=\u30D3\u30EB\u30C9\u4E2D\u304A\u5F85\u3061\u304F\u3060\u3055\u3044...
-FIND_DECLARATIONS_ACTION_ACTION_NAME=Seam \u5BA3\u8A00\u306E\u691C\u7D22
-FIND_DECLARATIONS_ACTION_DESCRIPTION=Seam \u5BA3\u8A00\u306E\u691C\u7D22
-FIND_DECLARATIONS_ACTION_TOOL_TIP=Seam \u5BA3\u8A00\u306E\u691C\u7D22
-FIND_REFERENCES_ACTION_ACTION_NAME=Seam \u53C2\u7167\u306E\u691C\u7D22
-FIND_REFERENCES_ACTION_DESCRIPTION=Seam \u53C2\u7167\u306E\u691C\u7D22
-FIND_REFERENCES_ACTION_TOOL_TIP=Seam \u53C2\u7167\u306E\u691C\u7D22
-VIEW_FOLDER_FILED_EDITOR=\u30D3\u30E5\u30FC\u30FB\u30D5\u30A9\u30EB\u30C0\u30FC\:
-SELECT_WORKSPACE_FOLDER_DIALOG_TITLE=\u30D5\u30A9\u30EB\u30C0\u30FC\u306E\u9078\u629E
-SELECT_WORKSPACE_FOLDER_DIALOG_MESSAGE=\u30D5\u30A9\u30EB\u30C0\u30FC\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044(&C)
-SeamSearchQuery_label=Seam {0} \u691C\u7D22
-SeamSearchQuery_singularPatternWithLimitTo=''{0}'' - {1} \u306B 1 \u500B\u306E\u4E00\u81F4 ({2})
-SeamSearchQuery_pluralPatternWithLimitTo=''{0}'' - {2} \u306B {1} \u500B\u306E\u4E00\u81F4 ({3})
-SeamSearchScope_scope_empty=\u7A7A\u306E\u691C\u7D22\u7BC4\u56F2
-SeamSearchScope_scope_single=''{0}''
-SeamSearchScope_scope_double=''{0}'', ''{1}''
-SeamSearchScope_scope_multiple=''{0}'', ''{1}'', ...
-SeamSearchScope_scope_LimitToDeclarations=\u5BA3\u8A00
-SeamSearchScope_scope_LimitToReferences=\u53C2\u7167
-SeamSearchQuery_pluralPattern=''{0}'' - {2} \u306B {1} \u500B\u306E\u4E00\u81F4 ({3})
-SeamSearchQuery_singularLabel=''{0}'' - {1} \u306B 1 \u500B\u306E\u4E00\u81F4 ({2})
-SeamSearchVisitor_scanning=Seam \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8 ''{0}'' \u5185\u306E\u30D5\u30A1\u30A4\u30EB {1} / {2} \u3092\u691C\u7D22\u4E2D
-SeamSearch="Seam \u691C\u7D22 - "
-SeamQuickFixFindDeclarations=''{0}'' \u306E Seam \u5BA3\u8A00\u306E\u691C\u7D22
-SeamQuickFixFindReferences=''{0}'' \u306E Seam \u53C2\u7167\u306E\u691C\u7D22
-SeamRuntimeListFieldEditor_ActionAdd=\u8FFD\u52A0(&A)
-SeamRuntimeListFieldEditor_ActionEdit=\u7DE8\u96C6(&E)
-SeamRuntimeListFieldEditor_ActionRemove=\u9664\u53BB(&R)
-POJO_CLASS_ALREADY_EXISTS=\u305D\u306E POJO \u30AF\u30E9\u30B9\u306F\u65E2\u306B\u5B58\u5728\u3057\u307E\u3059\!
-ENTITY_CLASS_ALREADY_EXISTS=\u305D\u306E\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u30FC\u30FB\u30AF\u30E9\u30B9\u306F\u65E2\u306B\u5B58\u5728\u3057\u307E\u3059\!
-PAGE_ALREADY_EXISTS=\u305D\u306E\u30DA\u30FC\u30B8\u306F\u65E2\u306B\u5B58\u5728\u3057\u307E\u3059\!
-MASTER_PAGE_ALREADY_EXISTS=\u305D\u306E\u30DE\u30B9\u30BF\u30FC\u30FB\u30DA\u30FC\u30B8\u306F\u65E2\u306B\u5B58\u5728\u3057\u307E\u3059\!
Index: src/org/jboss/tools/seam/ui/views/actions/RenameComponentAction.java
===================================================================
--- src/org/jboss/tools/seam/ui/views/actions/RenameComponentAction.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/views/actions/RenameComponentAction.java	(working copy)
@@ -22,9 +22,9 @@
 import org.jboss.tools.seam.core.ISeamProject;
 import org.jboss.tools.seam.core.ISeamXmlComponentDeclaration;
 import org.jboss.tools.seam.core.SeamCorePlugin;
+import org.jboss.tools.seam.core.SeamCoreMessages;
 import org.jboss.tools.seam.internal.core.SeamObject;
 import org.jboss.tools.seam.ui.SeamGuiPlugin;
-import org.jboss.tools.seam.ui.SeamUIMessages;
 import org.jboss.tools.seam.ui.refactoring.SeamRefactorContributionFactory;
 
 /**
@@ -38,7 +38,7 @@
 	}
 
 	public RenameComponentAction(ISeamComponent component) {
-		setText(SeamUIMessages.RENAME_SEAM_COMPONENT);
+		setText(SeamCoreMessages.RENAME_SEAM_COMPONENT);
 		this.component = component;
 	}
 
Index: src/org/jboss/tools/seam/ui/views/actions/SeamOpenAction.java
===================================================================
--- src/org/jboss/tools/seam/ui/views/actions/SeamOpenAction.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/views/actions/SeamOpenAction.java	(working copy)
@@ -12,7 +12,7 @@
 
 import org.eclipse.jface.action.Action;
 import org.jboss.tools.seam.core.IOpenableElement;
-import org.jboss.tools.seam.ui.SeamUIMessages;
+import org.jboss.tools.seam.core.SeamCoreMessages;
 
 /**
  * @author Viacheslav Kabanovich
@@ -21,7 +21,7 @@
 	IOpenableElement element;
 	
 	public SeamOpenAction(IOpenableElement element) {
-		setText(SeamUIMessages.SEAM_OPEN_ACTION_OPEN);
+		setText(SeamCoreMessages.SEAM_OPEN_ACTION_OPEN);
 		this.element = element;
 	}
 	
Index: src/org/jboss/tools/seam/ui/views/actions/SeamViewLayoutActionGroup.java
===================================================================
--- src/org/jboss/tools/seam/ui/views/actions/SeamViewLayoutActionGroup.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/views/actions/SeamViewLayoutActionGroup.java	(working copy)
@@ -26,7 +26,7 @@
 import org.eclipse.ui.IWorkbenchActionConstants;
 import org.eclipse.ui.actions.ActionGroup;
 import org.eclipse.ui.navigator.IExtensionStateModel;
-import org.jboss.tools.seam.ui.SeamUIMessages;
+import org.jboss.tools.seam.core.SeamCoreMessages;
 import org.jboss.tools.seam.ui.views.ViewConstants;
 
 /**
@@ -91,13 +91,13 @@
 			IMenuManager viewMenu = actionBars.getMenuManager();
 			// Create layout sub menu
 			if (layoutSubMenu == null) {
-				layoutSubMenu = new MenuManager(SeamUIMessages.SEAM_VIEW_LAYOUT_ACTION_GROUP_SEAM_PACKAGES, SeamUIMessages.SEAM_VIEW_LAYOUT_ACTION_GROUP_SEAM_PACKAGES);
+				layoutSubMenu = new MenuManager(SeamCoreMessages.SEAM_VIEW_LAYOUT_ACTION_GROUP_SEAM_PACKAGES, SeamCoreMessages.SEAM_VIEW_LAYOUT_ACTION_GROUP_SEAM_PACKAGES);
 				addLayoutActions(layoutSubMenu);
 				viewMenu.insertAfter(IWorkbenchActionConstants.MB_ADDITIONS, new Separator(LAYOUT_GROUP_NAME));
 			}
 			
 			if(scopeSubMenu == null) {
-				scopeSubMenu = new MenuManager(SeamUIMessages.SEAM_VIEW_LAYOUT_ACTION_GROUP_SCOPE_PRESENTATION, SeamUIMessages.SEAM_VIEW_LAYOUT_ACTION_GROUP_SCOPE_PRESENTATION);
+				scopeSubMenu = new MenuManager(SeamCoreMessages.SEAM_VIEW_LAYOUT_ACTION_GROUP_SCOPE_PRESENTATION, SeamCoreMessages.SEAM_VIEW_LAYOUT_ACTION_GROUP_SCOPE_PRESENTATION);
 				addScopeActions(scopeSubMenu);
 			}
 
@@ -162,7 +162,7 @@
 				int style = SWT.RADIO;
 				MenuItem mi = new MenuItem(menu, style, index);
 				flatLayoutItem = mi;
-				mi.setText(SeamUIMessages.SEAM_VIEW_LAYOUT_ACTION_GROUP_FLAT);
+				mi.setText(SeamCoreMessages.SEAM_VIEW_LAYOUT_ACTION_GROUP_FLAT);
 				mi.setSelection(isFlatLayout);
 				mi.addSelectionListener(new SelectionAdapter() {
 					@Override
@@ -192,7 +192,7 @@
 				int style = SWT.RADIO;
 				MenuItem mi = new MenuItem(menu, style, index);
 				hierarchicalLayoutItem = mi;
-				mi.setText(SeamUIMessages.SEAM_VIEW_LAYOUT_ACTION_GROUP_HIERARCHICAL);
+				mi.setText(SeamCoreMessages.SEAM_VIEW_LAYOUT_ACTION_GROUP_HIERARCHICAL);
 				mi.setSelection(!isFlatLayout);
 				mi.addSelectionListener(new SelectionAdapter() {
 					@Override
@@ -225,7 +225,7 @@
 				int style = SWT.RADIO;
 				MenuItem mi = new MenuItem(menu, style, index);
 				labelScopeItem = mi;
-				mi.setText(SeamUIMessages.SEAM_VIEW_LAYOUT_ACTION_GROUP_LABEL);
+				mi.setText(SeamCoreMessages.SEAM_VIEW_LAYOUT_ACTION_GROUP_LABEL);
 				mi.setSelection(isScopeLable);
 				mi.addSelectionListener(new SelectionAdapter() {
 					@Override
@@ -255,7 +255,7 @@
 				int style = SWT.RADIO;
 				MenuItem mi = new MenuItem(menu, style, index);
 				nodeScopeItem = mi;
-				mi.setText(SeamUIMessages.SEAM_VIEW_LAYOUT_ACTION_GROUP_NODE);
+				mi.setText(SeamCoreMessages.SEAM_VIEW_LAYOUT_ACTION_GROUP_NODE);
 				mi.setSelection(!isScopeLable);
 				mi.addSelectionListener(new SelectionAdapter() {
 					@Override
Index: src/org/jboss/tools/seam/ui/views/SeamProjectLabelProvider.java
===================================================================
--- src/org/jboss/tools/seam/ui/views/SeamProjectLabelProvider.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/views/SeamProjectLabelProvider.java	(working copy)
@@ -11,7 +11,7 @@
 package org.jboss.tools.seam.ui.views;
 
 import org.jboss.tools.seam.core.ISeamProject;
-import org.jboss.tools.seam.ui.SeamUIMessages;
+import org.jboss.tools.seam.core.SeamCoreMessages;
 
 /**
  * This implementation is designed for standard Projects Explorer 
@@ -27,7 +27,7 @@
 	@Override
 	public String getText(Object element) {
 		if(element instanceof ISeamProject) {
-			return SeamUIMessages.SEAM_PROJECT_LABEL_PROVIDER_SEAM_COMPONENTS;
+			return SeamCoreMessages.SEAM_PROJECT_LABEL_PROVIDER_SEAM_COMPONENTS;
 		}		
 		return super.getText(element);
 	}
Index: src/org/jboss/tools/seam/ui/views/AbstractSeamContentProvider.java
===================================================================
--- src/org/jboss/tools/seam/ui/views/AbstractSeamContentProvider.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/views/AbstractSeamContentProvider.java	(working copy)
@@ -43,10 +43,10 @@
 import org.jboss.tools.seam.core.ISeamProject;
 import org.jboss.tools.seam.core.ISeamScope;
 import org.jboss.tools.seam.core.SeamCorePlugin;
+import org.jboss.tools.seam.core.SeamCoreMessages;
 import org.jboss.tools.seam.core.event.ISeamProjectChangeListener;
 import org.jboss.tools.seam.core.event.SeamProjectChangeEvent;
 import org.jboss.tools.seam.ui.SeamGuiPlugin;
-import org.jboss.tools.seam.ui.SeamUIMessages;
 
 /**
  * Basic type for content providers that add seam components 
@@ -220,7 +220,7 @@
 		if(o instanceof ISeamElement) {
 			refresh(o);
 		} else {
-			SeamGuiPlugin.getPluginLog().logError(SeamUIMessages.ABSTRACT_SEAM_CONTENT_PROVIDER_SEAM_PROJECT_CHANGE_EVENT_OCCURS_BUT_NO_SORCE_OF_PROJECT_PROVIDED);
+			SeamGuiPlugin.getPluginLog().logError(SeamCoreMessages.ABSTRACT_SEAM_CONTENT_PROVIDER_SEAM_PROJECT_CHANGE_EVENT_OCCURS_BUT_NO_SORCE_OF_PROJECT_PROVIDED);
 		}
 	}
 
Index: src/org/jboss/tools/seam/ui/messages.properties
===================================================================
--- src/org/jboss/tools/seam/ui/messages.properties	(revision 39311)
+++ src/org/jboss/tools/seam/ui/messages.properties	(working copy)
@@ -1,209 +0,0 @@
-CREATE_NEW_SEAM_PROJECT = Create New Seam Project
-GENERATE_SEAM_ENTITIES_WIZARD_TITLE = Generate Seam Entities
-GENERATE_SEAM_ENTITIES_WIZARD_PAGE_MESSAGE = Select Seam project
-GENERATE_SEAM_ENTITIES_WIZARD_HIBERNATE_CONFIGURATION_LABEL = Hibernate Console Configuration:
-GENERATE_SEAM_ENTITIES_WIZARD_HIBERNATE_CONFIGURATION_MESSAGE = Select Hibernate Console Configuration
-GENERATE_SEAM_ENTITIES_WIZARD_HIBERNATE_CONFIGURATION_ERROR = Hibernate console configuration name is empty
-GENERATE_SEAM_ENTITIES_WIZARD_GROUP_LABEL = Generation Mode
-GENERATE_SEAM_ENTITIES_WIZARD_REVERSE_ENGINEER_LABEL = Reverse engineer from database
-GENERATE_SEAM_ENTITIES_WIZARD_EXISTING_ENTITIES_LABEL = Use existing entities
-SEAM_INSTALL_WIZARD_PAGE_CONFIGURE_SEAM_FACET_SETTINGS=Configure Seam Facet Settings
-SEAM_INSTALL_WIZARD_PAGE_CANNOT_USE_SELECTED_DEPLOYMENT6=''{0}'' deployment cannot be used, because selected Server Runtime ''{1}'' doesn't support EJB 3.0 and EAR 5.0 modules
-SEAM_PROJECT_WIZARD_PAGE1_SEAM_FACET_MUST_BE_SPECIFIED=Seam facet must be enabled
-SEAM_PROJECT_SELECTION_DIALOG_SELECT_SEAM_WEB_PROJECT=Select Seam Web Project
-SEAM_PROJECT_WIZARD_CREATE_STANDALONE_SEAM_WEB_PROJECT=Create standalone Seam Web Project
-SEAM_INSTALL_WIZARD_PAGE_SEAM_RUNTIME=Seam Runtime:
-SEAM_INSTALL_WIZARD_PAGE_DEPLOY_AS=Deploy as:
-SEAM_INSTALL_WIZARD_PAGE_EJB_PROJECT_NAME=EJB project name:
-SEAM_INSTALL_WIZARD_PAGE_EAR_PROJECT_NAME=EAR project name:
-SEAM_INSTALL_WIZARD_PAGE_TEST_PROJECT_NAME=Test project name:
-SEAM_VIEW_LAYOUT_ACTION_GROUP_FLAT=Flat
-SEAM_VIEW_LAYOUT_ACTION_GROUP_NODE=Node
-SEAM_INSTALL_WIZARD_PAGE_CONNECTION_PROFILE=Connection profile:
-SEAM_VIEW_LAYOUT_ACTION_GROUP_SEAM_PACKAGES=Seam Packages
-SEAM_RUNTIME_LIST_FIELD_EDITOR_SEAM_RUNTIME=Seam Runtime
-SEAM_INSTALL_WIZARD_PAGE_DATABASE_TYPE=Database Type:
-SEAM_BASE_WIZARD_PAGE_LOCAL_CLASS_NAME=Local interface:
-SEAM_RUNTIME_LIST_FIELD_EDITOR_VERSION=Version
-SEAM_RUNTIME_LIST_FIELD_EDITOR_RUNTIME_ALREADY_EXISTS=Runtime ''{0}'' already exists
-SEAM_INSTALL_WIZARD_PAGE_DATABASE_SCHEMA_NAME=Database Schema Name:
-SEAM_INSTALL_WIZARD_PAGE_DATABASE_CATALOG_NAME=Database Catalog Name:
-SEAM_PROJECT_SELECTION_DIALOG_SEAM_WEB_PROJECT=Seam Web Projects
-SEAM_PROJECT_SELECTION_DIALOG_SHOW_ALL_PROJECTS=Show all projects
-SEAM_PROJECT_LABEL_PROVIDER_SEAM_COMPONENTS=Seam Components
-SEAM_ENTITY_WIZARD_PAGE1_ENTITY_MASTER_PAGE=Entity master page
-SEAM_ENTITY_WIZARD_ENTITY_CREATING_OPERATION=Entity creating operation
-SEAM_RUNTIME_LIST_FIELD_EDITOR_NEW_SEAM_RUNTIME=New Seam Runtime
-SEAM_RUNTIME_LIST_FIELD_EDITOR_EDIT_SEAM_RUNTIME=Edit Seam Runtime
-SEAM_INSTALL_WIZARD_PAGE_DB_TABLES_ALREADY_EXISTS=DB Tables already exists in database:
-SEAM_INSTALL_WIZARD_PAGE_RECREATE_DATABASE_TABLES_AND_DATA_ON_DEPLOY=Recreate database tables and data on deploy:
-SEAM_RUNTIME_LIST_FIELD_EDITOR_PARENT_CONTROL_SHOULD_BE_COMPOSITE=Parent control should be Composite
-SEAM_RUNTIME_LIST_FIELD_EDITOR_EDITOR_SUPPORTS_ONLY_GRID_LAYOUT=Editor supports only grid layout
-SEAM_RUNTIME_LIST_FIELD_EDITOR_CANNOT_OBTAIN_SEAM_VERSION_NUMBER=Cannot obtain Seam version number from jboss-seam.jar file.
-SEAM_INSTALL_WIZARD_PAGE_SESSION_BEAN_PACKAGE_NAME=Session Bean Package Name:
-SEAM_INSTALL_WIZARD_PAGE_CREATE_TEST_PROJECT=Create Test Project:
-SEAM_CONVERSATION_WIZARD_ENTITY_CREATING_OPERATION=Entity creating operation
-SEAM_RUNTIME_LIST_FIELD_EDITOR_INPUTELEMENT_MUST_BE_LIST=inputElement must be an instance of List<SeamRuntime>.
-SEAM_RUNTIME_LIST_FIELD_EDITOR_NAME_CANNOT_BE_EMPTY=Name cannot be empty
-SEAM_RUNTIME_LIST_FIELD_EDITOR_CANNOT_FIND_JBOSS_SEAM_JAR=Cannot find jboss-seam.jar file
-SEAM_RUNTIME_LIST_FIELD_EDITOR_CREATE_A_SEAM_RUNTIME=Create a Seam Runtime
-SEAM_RUNTIME_LIST_FIELD_EDITOR_MODIFY_SEAM_RUNTIME=Input new values
-SEAM_BASE_WIZARD_OPERATION_IS_NOT_DEFINED_FOR_WIZARD=Operation is not defined for wizard
-SEAM_INSTALL_WIZARD_PAGE_ENTITY_BEAN_PACKAGE_NAME=Entity Bean Package Name:
-SEAM_VIEW_LAYOUT_ACTION_GROUP_SCOPE_PRESENTATION=Scope Presentation
-SEAM_CONVERSATION_WIZARD_CREATE_NEW_CONVERSATION=Create New Conversation
-SEAM_CONVERSATION_WIZARD_PAGE1_SEAM_CONVERSATION=Seam Conversation
-SEAM_INSTALL_WIZARD_PAGE_TEST_PACKAGE_NAME=Test Package Name:
-SEAM_VIEW_LAYOUT_ACTION_GROUP_HIERARCHICAL=Hierarchical
-SEAM_RUNTIME_LIST_FIELD_EDITOR_HOME_FOLDER=Home Folder:
-SEAM_WIZARD_FACTORY_SEAM_ENTITY_CLASS_NAME=Seam entity class name:
-SEAM_ENTITY_WIZARD_PAGE1_ENTITY_CLASS_NAME=Entity class name
-SEAM_INSTALL_WIZARD_PAGE_SEAM_FACET=Seam Facet
-SEAM_VIEW_LAYOUT_ACTION_GROUP_LABEL=Label
-SEAM_PROJECT_WIZARD_NEW_SEAM_PROJECT=New Seam Project
-SEAM_PROJECT_WIZARD_SEAM_WEB_PROJECT=Seam Web Project
-SEAM_PROJECT_WIZARD_EAR_MEMBERSHIP=EAR Membership
-SEAM_RUNTIME_LIST_FIELD_EDITOR_NAME=Name
-SEAM_RUNTIME_LIST_FIELD_EDITOR_PATH=Path
-SEAM_INSTALL_WIZARD_PAGE_GENERAL=General
-SEAM_INSTALL_WIZARD_PAGE_LIBRARIES=Libraries:
-SEAM_INSTALL_WIZARD_PAGE_COPY_LIBRARIES=Copy Libraries From Seam Runtime
-SEAM_INSTALL_WIZARD_PAGE_CONFIGURE_LATER=Configure Later
-SEAM_GENERATE_ENTITIES_WIZARD_54=org.hibernate.eclipse.launch.SeamUtil
-SEAM_WIZARD_FACTORY_SEAM_PROJECT=Seam Project:
-SEAM_INSTALL_WIZARD_PAGE_DATABASE=Database
-SELECT_SEAM_PROJECT_ACTION_BROWSE=Browse...
-SHOW_PROJECT_SETTINGS_ACTION=<a>Settings...</a>
-SEAM_INSTALL_WIZARD_PAGE_CODE_GENERATION=Code Generation
-SEAM_FORM_WIZARD_FORM_CREATING_OPERATION=Form creating operation
-SEAM_WIZARD_FACTORY_LOCAL_INTERFACE_NAME=Local interface name:
-SEAM_UI_IMAGESIMAGE_NAME_CANNOT_BE_NULL=Image name cannot be null.
-SEAM_RUNTIME_LIST_FIELD_EDITOR_VERSION2=Version:
-SEAM_WIZARD_FACTORY_SEAM_COMPONENT_NAME=Seam component name:
-SEAM_INSTALL_WIZARD_PAGE_EDIT=Edit...
-SEAM_WIZARD_FACTORY_BEAN_NAME=Bean name:
-SEAM_WIZARD_FACTORY_PAGE_NAME=Page name:
-SEAM_WIZARD_FACTORY_PACKAGE_NAME=Package name:
-SEAM_ENTITY_WIZARD_PAGE1_PAGE=Page
-SEAM_FORM_WIZARD_NEW_SEAM_FORM=New Seam Form
-SEAM_FORM_WIZARD_PAGE1_SEAM_FORM=Seam Form
-SEAM_WIZARD_FACTORY_METHOD_NAME=Method name:
-SEAM_INSTALL_WIZARD_PAGE_NEW=New...
-SEAM_INSTALL_WIZARD_PAGE_PACKAGE_NAME_NOT_VALID=Package name for {0} is not valid
-SEAM_BASE_WIZARD_PAGE_POJO_CLASS_NAME=POJO class name:
-SEAM_BASE_WIZARD_PAGE_SEAM_COMPONENTS=Seam component
-SEAM_BASE_WIZARD_PAGE_LOCAL_INTERFACE=Local interface
-SEAM_ACTION_WIZARD_PAGE1_SEAM_ACTION=Seam Action
-SEAM_ACTION_WIZARD_NEW_SEAM_ACTION=New Seam Action
-SEAM_ACTION_WIZARD_ACTION_CREATING_OPERATION=Action creating operation
-SEAM_RUNTIME_LIST_FIELD_EDITOR_NAME2=Name:
-SEAM_WIZARD_FACTORY_MASTER_PAGE_NAME=Master page name:
-SEAM_ENTITY_WIZARD_NEW_SEAM_ENTITY=New Seam Entity
-SEAM_INSTALL_WIZARD_PAGE_ADD=Add...
-CREATE_PROJECT_ACTION_UNABLE_TO_CREATE_WIZARD=Unable to create wizard ''{0}''
-CREATE_SEAM_WEB_PROJECTACTION_CREATE_SEAM_PROJECT=Create Seam Project
-VALIDATOR_FACTORY_SEAM_HOME_FOLDER_DOES_NOT_EXISTS=Seam Home folder doesn't exist
-VALIDATOR_FACTORY_SEAM_RT_HOME_DIR_DOES_NOT_EXIST=Seam Runtime ''{0}'' home directory doesn't exist for selected Seam Web Project
-VALIDATOR_FACTORY_SEAM_RT_HOME_DIR_IS_MISSING=Seam Runtime ''{0}'' home directory doesn't exist
-VALIDATOR_FACTORY_SEAM_RT_RESOURCES_DIR_IS_MISSING=Seam Runtime ''{0}'' resource templates directory doesn't exist
-VALIDATOR_FACTORY_SEAM_RT_TEMPLATES_DIR_DOES_NOT_EXIST=Seam Runtime ''{0}'' templates directory doesn't exist for selected Seam Web Project
-VALIDATOR_FACTORY_SEAM_RT_TEMPLATES_DIR_IS_MISSING=Seam Runtime ''{0}'' templates directory doesn't exist
-VALIDATOR_FACTORY_SEAM_RT_VIE_TEMPLATE_DIR_DOES_NOT_EXIST=Seam Runtime ''{0}'' view templates directory doesn't exist for selected Seam Web Project
-VALIDATOR_FACTORY_HOME_FOLDER_POINTS_TO_LOCATION_THAT_DOES_NOT_LOOK_LIKE_SEAM_HOME_FOLDER=Home folder points to location that does not look like seam home folder ('jboss-seam.jar' is missing)
-VALIDATOR_FACTORY_JBOSS_AS_HOME_FOLDER_DOES_NOT_EXIST=JBoss AS Home folder doesn't exist
-VALIDATOR_FACTORY_JBOSS_AS_HOME_FOLDER_POINT_TO_LOCATION_THAT_DOES_NOT_LOOK_LIKE_JBOSS_AS_HOME_FOLDER=JBoss AS Home Folder field points to location that doesn't look like JBoss AS home folder
-VALIDATOR_FACTORY_COMPONENT_NAME_IS_NOT_VALID=Component name is not invalid.
-VALIDATOR_FACTORY_NAME_IS_NOT_VALID={0} name is not valid.
-VALIDATOR_FACTORY_COMPONENT_ALREADY_EXISTS=Component {0} already exists.
-VALIDATOR_FACTORY_LOCAL_INTERFACE_NAME_IS_NOT_VALID=Local Interface name is not valid.\n
-VALIDATOR_FACTORY_PROJECT_DOES_NOT_EXIST=Project ''{0}'' doesn''t exist.
-VALIDATOR_FACTORY_SELECTED_PROJECT_IS_NOT_A_SEAM_WEB_PROJECT=Selected project ''{0}'' is not a Seam Project
-VALIDATOR_FACTORY_SELECTED_PRJ_IS_CLOSED=Selected project ''{0}'' is closed
-VALIDATOR_FACTORY_PRJ_NOT_SELECTED=Project is not selected
-VALIDATOR_FACTORY_CONNECTION_PROFILE_IS_NOT_SELECTED=Connection profile is not selected
-VALIDATOR_FACTORY_DRIVER_CLASS_PROPERTY_IS_EMPTY_FOR_SELECTED_CONNECTION_PROFILE=Driver Class property is empty for selected ''{0}'' connection profile
-VALIDATOR_FACTORY_SEAM_RT_SOURCE_TEMPLATES_DIR_DOES_NOT_EXIST=Seam Runtime ''{0}'' source templates directory doesn't exist for selected Seam Web Project
-VALIDATOR_FACTORY_SEAM_RUNTIME_IS_NOT_SELECTED=Seam Runtime is not selected
-VALIDATOR_FACTORY_SEAM_RT_VIEW_DIR_IS_MISSING=Seam Runtime ''{0}'' view templates directory doesn't exist
-VALIDATOR_FACTORY_SEAM_RT_CANNOT_BE_FOUND=Cannot find ''{0}'' Seam Runtime for selected Seam Web Project
-VALIDATOR_FACTORY_CANNOT_FIND_SEAM_RUNTIME=Cannot find Seam Runtime ''{0}''
-VALIDATOR_FACTORY_SEAM_RT_SRC_DIR_IS_MISSING=Seam Runtime ''{0}'' source templates directory doesn't exist
-VALIDATOR_FACTORY_TEST_PROJECT_ALREADY_EXISTS=Test project ''{0}'' already exists. Please select other name for new Seam project.
-VALIDATOR_FACTORY_TEST_PROJECT_CANNOT_BE_EMPTY=Test project name cannot be empty.
-VALIDATOR_FACTORY_EAR_PROJECT_ALREADY_EXISTS=EAR project ''{0}'' already exists. Please select other name for new Seam project.
-VALIDATOR_FACTORY_EAR_PROJECT_CANNOT_BE_EMPTY=EAR project name cannot be empty.
-VALIDATOR_FACTORY_EJB_PROJECT_ALREADY_EXISTS=EJB project ''{0}'' already exists. Please select other name for new Seam project.
-VALIDATOR_FACTORY_EJB_PROJECT_CANNOT_BE_EMPTY=EJB project name cannot be empty.
-VALIDATOR_FACTORY_SEAM_RT_NOT_CONFIGURED=Seam Runtime is not configured for selected Seam Web Project
-VALIDATOR_INVALID_SETTINGS=Selected seam project has some invalid settings. Please press "Settings..." and correct them.
-SEAM_RUNTIME_LIST_FIELD_EDITOR_RUNTIME_NAME_IS_NOT_CORRECT=Runtime name is not correct
-SEAM_GENERATE_ENTITIES_WIZARD_CAN_NOT_GENERATE_SEAM_ENTITIES=Can't generate seam entities
-SEAM_UI_IMAGESBASE_URL_FOR_IMAGE_REGISTRY_CANNOT_BE_NULL=Base url for image registry cannot be null.
-SEAM_GENERATE_ENTITIES_WIZARD_ACTION_CREATING_OPERATION=Action creating operation
-SEAM_GENERATE_ENTITIES_WIZARD_CAN_NOT_FIND_SEAM_RUNTIME=Can't find seam runtime for project {0}
-ABSTRACT_SEAM_CONTENT_PROVIDER_SEAM_PROJECT_CHANGE_EVENT_OCCURS_BUT_NO_SORCE_OF_PROJECT_PROVIDED=Seam Project change event occurs, but no soyrce of project provided
-SEAM_OPEN_ACTION_OPEN=Open
-SEAM_RUNTIME_LIST_FIELD_EDITOR_PATH_TO_SEAM_HOME_DIRECTORY_CANNOT_BE_EMPTY=Path to seam home directory cannot be empty
-SEAM_RUNTIME_LIST_FIELD_EDITOR_THE_SELECTED_SEAM_APPEARS_TO_BE_OF_INCOMATIBLE_VERSION=The selected seam appears to be of an incompatible version ''{0}''
-SEAM_TARGET_SERVER=Target Server
-RUNTIME_DELETE_CONFIRM_TITLE=Confirm Runtime Delete
-RUNTIME_DELETE_NOT_USED_CONFIRM=Are you sure you want to delete runtime ''{0}''?
-RUNTIME_DELETE_USED_CONFIRM=Runtime ''{0}'' is used by seam projects. Are you sure you want to delete it?
-OPEN_SEAM_COMPONENT_ACTION_ACTION_NAME=Open Seam Component
-OPEN_SEAM_COMPONENT_ACTION_DESCRIPTION=Open Seam Component
-OPEN_SEAM_COMPONENT_ACTION_TOOL_TIP=Open Seam Component
-OPEN_SEAM_COMPONENT_ACTION_MESSAGE=Enter seam component name prefix or pattern (? = any character, * = any string):
-OPEN_SEAM_COMPONENT_DIALOG_LOADING=Seam components loading
-OPEN_SEAM_COMPONENT_DIALOG_NAME=OpenSeamComponentDialog
-OPEN_SEAM_COMPONENT_DIALOG_WAIT=Wait for Build...
-FIND_DECLARATIONS_ACTION_ACTION_NAME=Find Seam Declarations
-FIND_DECLARATIONS_ACTION_DESCRIPTION=Find Seam Declarations
-FIND_DECLARATIONS_ACTION_TOOL_TIP=Find Seam Declarations
-FIND_REFERENCES_ACTION_ACTION_NAME=Find Seam References
-FIND_REFERENCES_ACTION_DESCRIPTION=Find Seam References
-FIND_REFERENCES_ACTION_TOOL_TIP=Find Seam References
-VIEW_FOLDER_FILED_EDITOR=View Folder:
-SeamSearchQuery_label=Seam {0} Search
-# The first argument will be replaced by the pattern, the second by the scope, last by limitTo patterns
-SeamSearchQuery_singularPatternWithLimitTo= ''{0}'' - 1 match in {1} ({2})
-# The first argument will be replaced by the pattern, the second by the count and the third by the scope, last by limitTo patterns
-SeamSearchQuery_pluralPatternWithLimitTo=''{0}'' - {1} matches in {2} ({3})
-SeamSearchScope_scope_empty=empty scope
-SeamSearchScope_scope_single=''{0}''
-SeamSearchScope_scope_double=''{0}'', ''{1}''
-SeamSearchScope_scope_multiple=''{0}'', ''{1}'', ...
-SeamSearchScope_scope_LimitToDeclarations=Declarations
-SeamSearchScope_scope_LimitToReferences=References
-# The first argument will be replaced by the pattern, the second by the count and the third by the scope
-SeamSearchQuery_pluralPattern= ''{0}'' - {1} matches in {2} ({3})
-# The first argument will be replaced by the pattern, the second by the scope
-SeamSearchQuery_singularLabel= ''{0}'' - 1 match in {1} ({2})
-SeamSearchVisitor_scanning= Scanning file {1} of {2} in Seam project ''{0}''
-SeamSearch="Seam Search - "
-SeamQuickFixFindDeclarations=Find Seam declarations for ''{0}''
-SeamQuickFixFindReferences=Find Seam references for ''{0}''
-SeamRuntimeListFieldEditor_ActionAdd=&Add
-SeamRuntimeListFieldEditor_ActionEdit=&Edit
-SeamRuntimeListFieldEditor_ActionRemove=&Remove
-POJO_CLASS_ALREADY_EXISTS=Such POJO class already exists!
-ENTITY_CLASS_ALREADY_EXISTS=Such entity class already exists!
-PAGE_ALREADY_EXISTS=Such page already exists!
-MASTER_PAGE_ALREADY_EXISTS=Such master page already exists!
-SEAM_REFACTOR = Seam Refactor
-RENAME_SEAM_COMPONENT = Rename Seam Component 
-RENAME_SEAM_CONTEXT_VARIABLE = Rename Seam Context Variable 
-FIND_USAGES_IN_EL = Find Usages in Expression Language 
-SEAM_COMPONENT_RENAME_HANDLER_ERROR = Error
-DELETE_NAME_ANNOTATION_MARKER_RESOLUTION_TITLE=Delete @Name annotation
-DELETE_REMOVE_ANNOTATION_MARKER_RESOLUTION_TITLE=Delete @Remove annotation
-DELETE_DESTROY_ANNOTATION_MARKER_RESOLUTION_TITLE=Delete @Destroy annotation
-DELETE_CREATE_ANNOTATION_MARKER_RESOLUTION_TITLE=Delete @Create annotation
-DELETE_UNWRAP_ANNOTATION_MARKER_RESOLUTION_TITLE=Delete @Unwrap annotation
-DELETE_OBSERVER_ANNOTATION_MARKER_RESOLUTION_TITLE=Delete @Oserver annotation
-ADD_NAME_ANNOTATION_MARKER_RESOLUTION_TITLE=Add @Name annotation
-RENAME_NAME_ANNOTATION_MARKER_RESOLUTION_TITLE=Rename @Name annotation
-ADD_ANNOTATED_REMOVE_METHOD_MARKER_RESOLUTION_TITLE=Add @Remove annotated method
-ADD_ANNOTATED_DESTROY_METHOD_MARKER_RESOLUTION_TITLE=Add @Destroy annotated method
-CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE=Change scope to ''{0}''
-ADD_SETTER_MARKER_RESOLUTION_TITLE=Add setter for ''{0}'' property in ''{1}'' class
-ADD_NEW_SEAM_RUNTIME_MARKER_RESOLUTION_TITLE=Add ''{0}'' Seam Runtime
Index: src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
===================================================================
--- src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java	(working copy)
@@ -67,6 +67,7 @@
 import org.jboss.tools.common.ui.widget.editor.IFieldEditorFactory;
 import org.jboss.tools.common.ui.widget.editor.ITaggedFieldEditor;
 import org.jboss.tools.seam.core.SeamCorePlugin;
+import org.jboss.tools.seam.core.SeamCoreMessages;
 import org.jboss.tools.seam.core.SeamUtil;
 import org.jboss.tools.seam.core.project.facet.SeamProjectPreferences;
 import org.jboss.tools.seam.core.project.facet.SeamRuntime;
@@ -74,7 +75,7 @@
 import org.jboss.tools.seam.core.project.facet.SeamVersion;
 import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties;
 import org.jboss.tools.seam.internal.core.project.facet.SeamFacetInstallDataModelProvider;
-import org.jboss.tools.seam.ui.SeamUIMessages;
+import org.jboss.tools.seam.internal.core.project.facet.SeamValidatorFactory;
 import org.jboss.tools.seam.ui.wizard.SeamFormWizard;
 import org.jboss.tools.seam.ui.wizard.SeamWizardFactory;
 import org.jboss.tools.seam.ui.wizard.SeamWizardUtils;
@@ -87,7 +88,7 @@
 public class SeamInstallWizardPage extends AbstractFacetWizardPage implements
 		IFacetWizardPage, IDataModelListener {
 
-	public static final String PAGE_DESCRIPTION = SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_CONFIGURE_SEAM_FACET_SETTINGS;
+	public static final String PAGE_DESCRIPTION = SeamCoreMessages.SEAM_INSTALL_WIZARD_PAGE_CONFIGURE_SEAM_FACET_SETTINGS;
 
 	private static final DriverClassHelpers HIBERNATE_HELPER = new DriverClassHelpers();
 
@@ -100,13 +101,13 @@
 	private IFieldEditor ejbProjectNameditor = IFieldEditorFactory.INSTANCE
 	.createTextEditor(
 			ISeamFacetDataModelProperties.SEAM_EJB_PROJECT,
-			SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_EJB_PROJECT_NAME,
+			SeamCoreMessages.SEAM_INSTALL_WIZARD_PAGE_EJB_PROJECT_NAME,
 			""); //$NON-NLS-1$
 
 	private IFieldEditor earProjectNameditor = IFieldEditorFactory.INSTANCE
 	.createTextEditor(
 			ISeamFacetDataModelProperties.SEAM_EAR_PROJECT,
-			SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_EAR_PROJECT_NAME,
+			SeamCoreMessages.SEAM_INSTALL_WIZARD_PAGE_EAR_PROJECT_NAME,
 			""); //$NON-NLS-1$
 	
 	private IFieldEditor libraryListEditor;
@@ -114,7 +115,7 @@
 	private IFieldEditor jBossAsDeployAsEditor = IFieldEditorFactory.INSTANCE
 			.createRadioEditor(
 					ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS,
-					SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_DEPLOY_AS, Arrays
+					SeamCoreMessages.SEAM_INSTALL_WIZARD_PAGE_DEPLOY_AS, Arrays
 							.asList(new String[] {
 									ISeamFacetDataModelProperties.DEPLOY_AS_WAR
 											.toUpperCase(),
@@ -141,31 +142,31 @@
 	private IFieldEditor sessionBeanPkgNameditor = IFieldEditorFactory.INSTANCE
 			.createTextEditor(
 					ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_NAME,
-					SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_SESSION_BEAN_PACKAGE_NAME,
+					SeamCoreMessages.SEAM_INSTALL_WIZARD_PAGE_SESSION_BEAN_PACKAGE_NAME,
 					""); //$NON-NLS-1$
 
 	private IFieldEditor entityBeanPkgNameditor = IFieldEditorFactory.INSTANCE
 			.createTextEditor(
 					ISeamFacetDataModelProperties.ENTITY_BEAN_PACKAGE_NAME,
-					SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_ENTITY_BEAN_PACKAGE_NAME,
+					SeamCoreMessages.SEAM_INSTALL_WIZARD_PAGE_ENTITY_BEAN_PACKAGE_NAME,
 					""); //$NON-NLS-1$
 
 	private IFieldEditor createTestProjectCheckboxeditor = IFieldEditorFactory.INSTANCE
 	.createCheckboxEditor(
 			ISeamFacetDataModelProperties.TEST_PROJECT_CREATING,
-			SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_CREATE_TEST_PROJECT,
+			SeamCoreMessages.SEAM_INSTALL_WIZARD_PAGE_CREATE_TEST_PROJECT,
 			true);
 	
 	private IFieldEditor testProjectNameditor = IFieldEditorFactory.INSTANCE
 	.createTextEditor(
 			ISeamFacetDataModelProperties.SEAM_TEST_PROJECT,
-			SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_TEST_PROJECT_NAME,
+			SeamCoreMessages.SEAM_INSTALL_WIZARD_PAGE_TEST_PROJECT_NAME,
 			""); //$NON-NLS-1$
 
 	private IFieldEditor testsPkgNameditor = IFieldEditorFactory.INSTANCE
 			.createTextEditor(
 					ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_NAME,
-					SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_TEST_PACKAGE_NAME,
+					SeamCoreMessages.SEAM_INSTALL_WIZARD_PAGE_TEST_PACKAGE_NAME,
 					""); //$NON-NLS-1$
 	
 	private Group databaseGroup;
@@ -174,8 +175,8 @@
 	 * 
 	 */
 	public SeamInstallWizardPage() {
-		super(SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_SEAM_FACET);
-		setTitle(SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_SEAM_FACET);
+		super(SeamCoreMessages.SEAM_INSTALL_WIZARD_PAGE_SEAM_FACET);
+		setTitle(SeamCoreMessages.SEAM_INSTALL_WIZARD_PAGE_SEAM_FACET);
 		setImageDescriptor(ImageDescriptor.createFromFile(SeamFormWizard.class,
 				"SeamWebProjectWizBan.png")); //$NON-NLS-1$
 		setDescription(PAGE_DESCRIPTION);
@@ -315,7 +316,7 @@
 		
 		model.setBooleanProperty(ISeamFacetDataModelProperties.SEAM_TEMPLATES_AND_LIBRARIES_COPYING, isNewProjectWizard());
 		
-		model.setBooleanProperty(ISeamFacetDataModelProperties.SEAM_RUNTIME_LIBRARIES_COPYING, libraryListEditor.getValueAsString().equals(SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_COPY_LIBRARIES) && isNewProjectWizard());
+		model.setBooleanProperty(ISeamFacetDataModelProperties.SEAM_RUNTIME_LIBRARIES_COPYING, libraryListEditor.getValueAsString().equals(SeamCoreMessages.SEAM_INSTALL_WIZARD_PAGE_COPY_LIBRARIES) && isNewProjectWizard());
 	}
 	
 	/*
@@ -404,7 +405,7 @@
 		root.setLayout(gridLayout);
 		Group generalGroup = new Group(root, SWT.NONE);
 		generalGroup.setLayoutData(gd);
-		generalGroup.setText(SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_GENERAL);
+		generalGroup.setText(SeamCoreMessages.SEAM_INSTALL_WIZARD_PAGE_GENERAL);
 		gridLayout = new GridLayout(3, false);
 
 		generalGroup.setLayout(gridLayout);
@@ -416,12 +417,12 @@
 		earProjectNameditor.setEnabled(getDeployAsDefaultValue().equals(ISeamFacetDataModelProperties.DEPLOY_AS_EAR));
 		
 		List<String> providers = new ArrayList<String>();
-		providers.add(SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_COPY_LIBRARIES);
-		providers.add(SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_CONFIGURE_LATER);
+		providers.add(SeamCoreMessages.SEAM_INSTALL_WIZARD_PAGE_COPY_LIBRARIES);
+		providers.add(SeamCoreMessages.SEAM_INSTALL_WIZARD_PAGE_CONFIGURE_LATER);
 		
 		libraryListEditor = IFieldEditorFactory.INSTANCE.createComboEditor(
 				ISeamFacetDataModelProperties.SEAM_LIBRARY_PROVIDER,
-				SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_LIBRARIES,
+				SeamCoreMessages.SEAM_INSTALL_WIZARD_PAGE_LIBRARIES,
 				providers,
 				providers.get(0));
 		
@@ -443,13 +444,13 @@
 
 		databaseGroup = new Group(root, SWT.NONE);
 		databaseGroup.setLayoutData(gd);
-		databaseGroup.setText(SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_DATABASE);
+		databaseGroup.setText(SeamCoreMessages.SEAM_INSTALL_WIZARD_PAGE_DATABASE);
 		gridLayout = new GridLayout(4, false);
 		databaseGroup.setLayout(gridLayout);
 		
 		jBossHibernateDbTypeEditor = IFieldEditorFactory.INSTANCE
 		.createComboEditor(ISeamFacetDataModelProperties.DB_TYPE,
-				SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_DATABASE_TYPE,
+				SeamCoreMessages.SEAM_INSTALL_WIZARD_PAGE_DATABASE_TYPE,
 				Arrays.asList(HIBERNATE_HELPER.getDialectNames()),
 				getDefaultDbType(), false);
 		registerEditor(jBossHibernateDbTypeEditor, databaseGroup, 4);
@@ -465,7 +466,7 @@
 
 		generationGroup.setLayoutData(gd);
 		generationGroup
-				.setText(SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_CODE_GENERATION);
+				.setText(SeamCoreMessages.SEAM_INSTALL_WIZARD_PAGE_CODE_GENERATION);
 		gridLayout = new GridLayout(3, false);
 		generationGroup.setLayout(gridLayout);
 		registerEditor(sessionBeanPkgNameditor, generationGroup, 3);
@@ -555,7 +556,7 @@
 		} else {
 			/*jBossHibernateDbTypeEditor = IFieldEditorFactory.INSTANCE
 			.createComboEditor(ISeamFacetDataModelProperties.DB_TYPE,
-					SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_DATABASE_TYPE,
+					SeamCoreMessages.SEAM_INSTALL_WIZARD_PAGE_DATABASE_TYPE,
 					Arrays.asList(HIBERNATE_HELPER.getDialectNames()),
 					getDefaultDbType(), false);*/
 			connProfileSelEditor = SeamWizardFactory
@@ -570,12 +571,12 @@
 			dbSchemaName = IFieldEditorFactory.INSTANCE
 				.createTextEditor(
 						ISeamFacetDataModelProperties.DB_DEFAULT_SCHEMA_NAME,
-						SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_DATABASE_SCHEMA_NAME,
+						SeamCoreMessages.SEAM_INSTALL_WIZARD_PAGE_DATABASE_SCHEMA_NAME,
 						""); //$NON-NLS-1$
 			dbCatalogName = IFieldEditorFactory.INSTANCE
 				.createTextEditor(
 						ISeamFacetDataModelProperties.DB_DEFAULT_CATALOG_NAME,
-						SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_DATABASE_CATALOG_NAME,
+						SeamCoreMessages.SEAM_INSTALL_WIZARD_PAGE_DATABASE_CATALOG_NAME,
 						"");	//$NON-NLS-1$
 			
 			jBossHibernateDbTypeEditor
@@ -596,12 +597,12 @@
 		dbTablesExists = IFieldEditorFactory.INSTANCE
 		.createCheckboxEditor(
 				ISeamFacetDataModelProperties.DB_ALREADY_EXISTS,
-				SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_DB_TABLES_ALREADY_EXISTS,
+				SeamCoreMessages.SEAM_INSTALL_WIZARD_PAGE_DB_TABLES_ALREADY_EXISTS,
 				false);
 		recreateTablesOnDeploy = IFieldEditorFactory.INSTANCE
 		.createCheckboxEditor(
 				ISeamFacetDataModelProperties.RECREATE_TABLES_AND_DATA_ON_DEPLOY,
-				SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_RECREATE_DATABASE_TABLES_AND_DATA_ON_DEPLOY,
+				SeamCoreMessages.SEAM_INSTALL_WIZARD_PAGE_RECREATE_DATABASE_TABLES_AND_DATA_ON_DEPLOY,
 				false);
 		registerEditor(dbTablesExists, databaseGroup, 4);
 		registerEditor(recreateTablesOnDeploy, databaseGroup, 4);
@@ -833,7 +834,7 @@
 			if (((IStatus.ERROR | IStatus.WARNING) & status.getSeverity() ) != 0 ){
 				return doPackStatus(status,
 					fieldName,
-					NLS.bind(SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_PACKAGE_NAME_NOT_VALID,
+					NLS.bind(SeamCoreMessages.SEAM_INSTALL_WIZARD_PAGE_PACKAGE_NAME_NOT_VALID,
 					targetName));
 			}
 			return SeamValidatorFactory.NO_ERRORS;
@@ -870,11 +871,11 @@
 					if("".equals(testProjectName.trim()))
 						return doPackStatus(status,
 								propertyName,
-								SeamUIMessages.VALIDATOR_FACTORY_TEST_PROJECT_CANNOT_BE_EMPTY);
+								SeamCoreMessages.VALIDATOR_FACTORY_TEST_PROJECT_CANNOT_BE_EMPTY);
 					
 					return doPackStatus(status,
 							propertyName,
-							NLS.bind(SeamUIMessages.VALIDATOR_FACTORY_TEST_PROJECT_ALREADY_EXISTS,
+							NLS.bind(SeamCoreMessages.VALIDATOR_FACTORY_TEST_PROJECT_ALREADY_EXISTS,
 									testProjectName));
 				}
 			}
@@ -888,11 +889,11 @@
 					if("".equals(earProjectName.trim()))
 						return doPackStatus(status,
 								propertyName,
-								SeamUIMessages.VALIDATOR_FACTORY_EAR_PROJECT_CANNOT_BE_EMPTY);
+								SeamCoreMessages.VALIDATOR_FACTORY_EAR_PROJECT_CANNOT_BE_EMPTY);
 					
 					return doPackStatus(status,
 							propertyName,
-							NLS.bind(SeamUIMessages.VALIDATOR_FACTORY_EAR_PROJECT_ALREADY_EXISTS,
+							NLS.bind(SeamCoreMessages.VALIDATOR_FACTORY_EAR_PROJECT_ALREADY_EXISTS,
 									earProjectName));
 				}
 
@@ -904,11 +905,11 @@
 					if("".equals(ejbProjectName.trim()))
 						return doPackStatus(status,
 								propertyName,
-								SeamUIMessages.VALIDATOR_FACTORY_EJB_PROJECT_CANNOT_BE_EMPTY);
+								SeamCoreMessages.VALIDATOR_FACTORY_EJB_PROJECT_CANNOT_BE_EMPTY);
 
 					return doPackStatus(status,
 							propertyName,
-							NLS.bind(SeamUIMessages.VALIDATOR_FACTORY_EJB_PROJECT_ALREADY_EXISTS,
+							NLS.bind(SeamCoreMessages.VALIDATOR_FACTORY_EJB_PROJECT_ALREADY_EXISTS,
 									ejbProjectName));
 				}
 			}
@@ -973,7 +974,7 @@
 											IStatus.ERROR,
 											SeamCorePlugin.PLUGIN_ID,
 											NLS.bind(
-													SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_CANNOT_USE_SELECTED_DEPLOYMENT6,
+													SeamCoreMessages.SEAM_INSTALL_WIZARD_PAGE_CANNOT_USE_SELECTED_DEPLOYMENT6,
 													new String[] {
 														deploymentType.toUpperCase(),
 														runtimeName.toString() })));
Index: src/org/jboss/tools/seam/ui/internal/project/facet/SeamValidatorFactory.java
===================================================================
--- src/org/jboss/tools/seam/ui/internal/project/facet/SeamValidatorFactory.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/internal/project/facet/SeamValidatorFactory.java	(working copy)
@@ -1,445 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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.tools.seam.ui.internal.project.facet;
-
-import java.io.File;
-import java.util.Map;
-import java.util.Properties;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.datatools.connectivity.IConnectionProfile;
-import org.eclipse.datatools.connectivity.ProfileManager;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaConventions;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.compiler.IProblem;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTParser;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.internal.corext.util.Messages;
-import org.eclipse.jdt.internal.ui.wizards.NewWizardMessages;
-import org.eclipse.osgi.util.NLS;
-import org.jboss.tools.common.ui.IValidator;
-import org.jboss.tools.common.ui.ValidatorFactory;
-import org.jboss.tools.seam.core.ISeamComponent;
-import org.jboss.tools.seam.core.ISeamProject;
-import org.jboss.tools.seam.core.SeamCorePlugin;
-import org.jboss.tools.seam.core.project.facet.SeamRuntime;
-import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager;
-import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties;
-import org.jboss.tools.seam.ui.SeamUIMessages;
-
-/**
- * 
- * @author eskimo
- * 
- */
-@SuppressWarnings("restriction")
-public class SeamValidatorFactory extends ValidatorFactory {
-
-	/**
-	 * 
-	 */
-	public static final IValidator JBOSS_SEAM_HOME_FOLDER_VALIDATOR = new IValidator() {
-		public Map<String, IStatus> validate(Object value, Object context) {
-			Map<String, IStatus> errors = FILE_SYSTEM_FOLDER_EXISTS.validate(
-					value, context);
-			if (!errors.isEmpty()) {
-				errors = createErrorMap();
-				errors.put(ISeamFacetDataModelProperties.JBOSS_SEAM_HOME, new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID,
-					SeamUIMessages.VALIDATOR_FACTORY_SEAM_HOME_FOLDER_DOES_NOT_EXISTS));
-				return errors;
-			}
-			String version = (String) context;
-
-			if (version.startsWith("2.")) { //$NON-NLS-1$
-				File seamJarFile = new File(value.toString(),
-						"lib/jboss-seam.jar"); //$NON-NLS-1$
-				if (!seamJarFile.isFile()) {
-					errors = createErrorMap();
-					errors.put(ISeamFacetDataModelProperties.JBOSS_SEAM_HOME,
-							new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, 
-									SeamUIMessages.VALIDATOR_FACTORY_HOME_FOLDER_POINTS_TO_LOCATION_THAT_DOES_NOT_LOOK_LIKE_SEAM_HOME_FOLDER));
-				}
-			} else {
-				File seamJarFile = new File(value.toString(), "jboss-seam.jar"); //$NON-NLS-1$
-				if (!seamJarFile.isFile()) {
-					errors = createErrorMap();
-					errors.put(ISeamFacetDataModelProperties.JBOSS_SEAM_HOME,
-							new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, 
-									SeamUIMessages.VALIDATOR_FACTORY_HOME_FOLDER_POINTS_TO_LOCATION_THAT_DOES_NOT_LOOK_LIKE_SEAM_HOME_FOLDER));
-				}
-			}
-
-			return errors;
-		}
-	};
-
-	/**
-	 * 
-	 */
-	public static final IValidator JBOSS_AS_HOME_FOLDER_VALIDATOR = new IValidator() {
-		public Map<String, IStatus> validate(Object value, Object context) {
-			Map<String, IStatus> errors = FILE_SYSTEM_FOLDER_EXISTS.validate(
-					value, context);
-			if (!errors.isEmpty()) {
-				errors = createErrorMap();
-				errors.put(ISeamFacetDataModelProperties.JBOSS_AS_HOME,
-						new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID,
-								SeamUIMessages.VALIDATOR_FACTORY_JBOSS_AS_HOME_FOLDER_DOES_NOT_EXIST));
-				return errors;
-			}
-			if (!new File(value.toString(), "bin/twiddle.jar").isFile()) { //$NON-NLS-1$
-				errors.put(ISeamFacetDataModelProperties.JBOSS_AS_HOME,
-					new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID,
-						SeamUIMessages.VALIDATOR_FACTORY_JBOSS_AS_HOME_FOLDER_POINT_TO_LOCATION_THAT_DOES_NOT_LOOK_LIKE_JBOSS_AS_HOME_FOLDER));
-			}
-			return errors;
-		}
-	};
-
-	/**
-	 * 
-	 */
-	public static final IValidator CLASS_QNAME_VALIDATOR = new IValidator() {
-		public Map<String, IStatus> validate(Object value, Object context) {
-			String classDecl = "class " + value.toString() + " {}"; //$NON-NLS-1$ //$NON-NLS-2$
-			ASTParser parser = ASTParser.newParser(AST.JLS3);
-			parser.setSource(classDecl.toCharArray());
-			parser.setProject((IJavaProject) context);
-			CompilationUnit compilationUnit = (CompilationUnit)parser.createAST(null);
-			IProblem[] problems = compilationUnit.getProblems();
-			if (problems.length > 0) {
-				return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID,
-					Messages.format(SeamUIMessages.VALIDATOR_FACTORY_COMPONENT_NAME_IS_NOT_VALID,
-						problems[0].getMessage())));
-			}
-			return SeamValidatorFactory.NO_ERRORS;
-		}
-	};
-
-	public static final IValidator PACKAGE_NAME_VALIDATOR = new IValidator() {
-		public Map<String, IStatus> validate(Object value, Object context) {
-			IStatus status = JavaConventions.validatePackageName(value.toString(),
-					DEFAULT_SOURCE_LEVEL,
-					DEFAULT_COMPLIANCE_LEVEL);
-			if (status.getSeverity() == IStatus.ERROR) {
-				return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, Messages.format(NewWizardMessages.NewTypeWizardPage_error_InvalidPackageName, status.getMessage())));
-			}
-
-			return SeamValidatorFactory.NO_ERRORS;
-		}
-	};
-
-	/**
-	 * 
-	 */
-	public static final IValidator FILESYSTEM_FILE_EXISTS_VALIDATOR = new IValidator() {
-		public java.util.Map<String, IStatus> validate(Object value,
-				Object context) {
-			return SeamValidatorFactory.NO_ERRORS;
-		};
-	};
-
-	/**
-	 * 
-	 * @author eskimo
-	 * 
-	 */
-	public static final IValidator SEAM_COMPONENT_NAME_VALIDATOR = new IValidator() {
-
-		public Map<String, IStatus> validate(Object value, Object context) {
-			String name = value.toString();
-			if(context != null && context instanceof ISeamProject){
-				ISeamProject seamProject = (ISeamProject)context;
-				ISeamComponent component = seamProject.getComponent(name);
-				if(component != null)
-					return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS.bind(SeamUIMessages.VALIDATOR_FACTORY_COMPONENT_ALREADY_EXISTS, name)));
-			}
-			
-			String[] segs = name.split("\\.");//$NON-NLS-1$
-			for(String segm : segs){
-				if(!segm.trim().equals(segm))
-					return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_NAME_IS_NOT_VALID));
-				
-				IStatus status = JavaConventions.validateClassFileName(segm
-						+ ".class", DEFAULT_SOURCE_LEVEL, DEFAULT_COMPLIANCE_LEVEL); //$NON-NLS-1$
-				if (!status.isOK())
-					return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_NAME_IS_NOT_VALID));
-			}
-			return NO_ERRORS;
-		}
-	};
-
-	/**
-	 * 
-	 * @author eskimo
-	 * 
-	 */
-	public static final IValidator SEAM_JAVA_INTEFACE_NAME_CONVENTION_VALIDATOR = new IValidator() {
-
-		public Map<String, IStatus> validate(Object value, Object context) {
-			if (!(context instanceof Object[])) {
-				throw new IllegalArgumentException(
-						"Context parameter should be instance of Object[]"); //$NON-NLS-1$
-			}
-
-			Object[] contextArray = ((Object[]) context);
-			IProject project = (IProject) contextArray[1];
-			IJavaProject jProject = JavaCore.create(project);
-
-			IStatus status = JavaConventions.validateJavaTypeName(value.toString(),
-					getCompilerSourceLevel(jProject), getCompilerComplianceLevel(jProject));			
-			if (((IStatus.ERROR | IStatus.WARNING) & status.getSeverity()) != 0) {
-				return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_LOCAL_INTERFACE_NAME_IS_NOT_VALID
-						+ status.getMessage()));
-			}
-			return NO_ERRORS;
-		}
-	};
-
-	public static final IValidator SEAM_METHOD_NAME_VALIDATOR = new IValidator() {
-
-		public Map<String, IStatus> validate(Object value, Object context) {
-			if (!(context instanceof Object[])) {
-				throw new IllegalArgumentException(
-						"Context parameter should be instance of Object[]"); //$NON-NLS-1$
-			}
-
-			Object[] contextArray = ((Object[]) context);
-			String targetName = contextArray[0].toString();
-			IProject project = (IProject) contextArray[1];
-			IJavaProject jProject = JavaCore.create(project);
-			
-			IStatus status = JavaConventions.validateMethodName(value.toString(),
-					getCompilerSourceLevel(jProject), getCompilerComplianceLevel(jProject));
-			
-			if (status.getSeverity() == IStatus.ERROR){
-				return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID,
-						NLS.bind(SeamUIMessages.VALIDATOR_FACTORY_NAME_IS_NOT_VALID, targetName)));
-			}
-
-			return NO_ERRORS;
-		}
-	};
-
-	public static final IValidator FILE_NAME_VALIDATOR = new IValidator() {
-
-		public Map<String, IStatus> validate(Object value, Object context) {
-			if (!(context instanceof Object[])) {
-				throw new IllegalArgumentException(
-						"Context parameter should be instance of Object[]"); //$NON-NLS-1$
-			}
-
-			Object[] contextArray = ((Object[]) context);
-			String targetName = contextArray[0].toString();
-			IProject project = (IProject) contextArray[1];
-
-			if ("".equals(value) //$NON-NLS-1$
-					|| !project.getLocation().isValidSegment(value.toString()))
-				return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID,
-						NLS.bind(SeamUIMessages.VALIDATOR_FACTORY_NAME_IS_NOT_VALID, targetName)));
-
-			return NO_ERRORS;
-		}
-	};
-
-	public static final IValidator SEAM_PROJECT_NAME_VALIDATOR = new IValidator() {
-		public Map<String, IStatus> validate(Object value, Object context) {
-
-			if (value == null || "".equals(value)) { //$NON-NLS-1$
-				return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_PRJ_NOT_SELECTED));
-			}
-			IResource project = ResourcesPlugin.getWorkspace().getRoot()
-					.findMember(value.toString());
-
-			if (project == null || !(project instanceof IProject)
-					|| !project.exists()) {
-				return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, 
-						NLS.bind(SeamUIMessages.VALIDATOR_FACTORY_PROJECT_DOES_NOT_EXIST,
-						value)));
-			} else {
-				IProject selection = (IProject) project;
-				try {
-					if (!selection.hasNature(ISeamProject.NATURE_ID)
-							|| SeamCorePlugin.getSeamPreferences(selection) == null
-							// ||
-							// selection.getAdapter(IFacetedProject.class)==null
-							// || !((IFacetedProject)selection.getAdapter(
-							// IFacetedProject
-							// .class)).hasProjectFacet(ProjectFacetsManager
-							// .getProjectFacet("jst.web"))
-							|| ""	.equals(SeamCorePlugin.getSeamPreferences(selection).get(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS, ""))) { //$NON-NLS-1$
-						return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, 
-								NLS.bind(SeamUIMessages.VALIDATOR_FACTORY_SELECTED_PROJECT_IS_NOT_A_SEAM_WEB_PROJECT,
-								project.getName())));
-					} else {
-						// TODO validate project(s) structure
-					}
-				} catch (CoreException e) {
-					// it might happen only if project is closed and project
-					// name typed by hand
-					return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
-							.bind(
-									SeamUIMessages.VALIDATOR_FACTORY_SELECTED_PRJ_IS_CLOSED,
-									project.getName())));
-				}
-			}
-			return NO_ERRORS;
-		}
-	};
-
-	private static class ConnectionProfileValidator implements IValidator {
-
-		private boolean allowEmptyConnection;
-
-		public ConnectionProfileValidator(boolean allowEmptyConnection) {
-			this.allowEmptyConnection = allowEmptyConnection;
-		}
-
-		public Map<String, IStatus> validate(Object value, Object context) {
-			if (!allowEmptyConnection && (value == null || "".equals(value.toString().trim()))) { //$NON-NLS-1$
-				return createErrormessage(
-						ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE,
-						new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_CONNECTION_PROFILE_IS_NOT_SELECTED));
-			} else {
-				IConnectionProfile connProfile = ProfileManager.getInstance()
-						.getProfileByName(value.toString());
-				Properties props = connProfile.getBaseProperties();
-				Object driverClass = props
-						.get("org.eclipse.datatools.connectivity.db.driverClass"); //$NON-NLS-1$
-
-				if (driverClass == null || "".equals(driverClass)) { //$NON-NLS-1$
-					return createErrormessage(
-							ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE,
-							new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, 
-									NLS.bind(SeamUIMessages.VALIDATOR_FACTORY_DRIVER_CLASS_PROPERTY_IS_EMPTY_FOR_SELECTED_CONNECTION_PROFILE,
-									value)));
-				}
-			}
-			return NO_ERRORS;
-		}
-	}
-
-	public static final IValidator CONNECTION_PROFILE_VALIDATOR = new ConnectionProfileValidator(false);
-
-	public static final IValidator CONNECTION_DRIVER_VALIDATOR = new ConnectionProfileValidator(true);
-
-	public static final IValidator SEAM_RUNTIME_NAME_VALIDATOR = new IValidator() {
-		public Map<String, IStatus> validate(Object value, Object context) {
-
-			Map<String, IStatus> errors = NO_ERRORS;
-			if (value == null || "".equals(value.toString().trim())) { //$NON-NLS-1$
-				errors = createErrormessage(
-						ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,
-						new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_SEAM_RUNTIME_IS_NOT_SELECTED));
-			} else {
-				SeamRuntime rt = SeamRuntimeManager.getInstance()
-						.findRuntimeByName(value.toString());
-				if (rt == null) {
-					errors = createErrormessage(
-							ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,
-							new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
-									.bind(
-											SeamUIMessages.VALIDATOR_FACTORY_CANNOT_FIND_SEAM_RUNTIME,
-											value)));
-				} else if (!new File(rt.getHomeDir()).exists()) {
-					errors = createErrormessage(
-							ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,
-							new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
-									.bind(
-											SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_HOME_DIR_IS_MISSING,
-											value)));
-				} else if (!new File(rt.getSeamGenDir()).exists()) {
-					errors = createErrormessage(
-							ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,
-							new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
-									.bind(
-											SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_TEMPLATES_DIR_IS_MISSING,
-											value)));
-				} else if (!new File(rt.getSrcTemplatesDir()).exists()) {
-					errors = createErrormessage(
-							ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,
-							new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
-									.bind(
-											SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_SRC_DIR_IS_MISSING,
-											value)));
-				} else if (!new File(rt.getViewTemplatesDir()).exists()) {
-					errors = createErrormessage(
-							ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,
-							new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
-									.bind(
-											SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_VIEW_DIR_IS_MISSING,
-											value)));
-				} else if (!new File(rt.getResourceTemplatesDir()).exists()) {
-					errors = createErrormessage(
-							ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,
-							new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
-									.bind(
-											SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_RESOURCES_DIR_IS_MISSING,
-											value)));
-				}
-			}
-			return errors;
-		}
-	};
-
-	public static final IValidator SEAM_RUNTIME_VALIDATOR = new IValidator() {
-		public java.util.Map<String, IStatus> validate(Object value,
-				Object context) {
-			Map<String, IStatus> errors = NO_ERRORS;
-
-			if (value == null || "".equals(value)) { //$NON-NLS-1$
-				errors = createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_NOT_CONFIGURED));
-			} else {
-				SeamRuntime rt = SeamRuntimeManager.getInstance()
-						.findRuntimeByName(value.toString());
-				if (rt == null) {
-					errors = createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
-							.bind(
-									SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_CANNOT_BE_FOUND,
-									value)));
-				} else if (!new File(rt.getHomeDir()).exists()) {
-					errors = createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
-							.bind(
-									SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_HOME_DIR_DOES_NOT_EXIST,
-									value)));
-				} else if (!new File(rt.getSeamGenDir()).exists()) {
-					errors = createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
-							.bind(
-									SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_TEMPLATES_DIR_DOES_NOT_EXIST,
-									value)));
-				} else if (!new File(rt.getSrcTemplatesDir()).exists()) {
-					errors = createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
-							.bind(
-									SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_SOURCE_TEMPLATES_DIR_DOES_NOT_EXIST,
-									value)));
-				} else if (!new File(rt.getViewTemplatesDir()).exists()) {
-					errors = createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
-							.bind(
-									SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_VIE_TEMPLATE_DIR_DOES_NOT_EXIST,
-									value)));
-					// } else if(!new
-					// File(rt.getResourceTemplatesDir()).exists()) {
-					// errors = createErrormessage(NLS.bind(
-					// "Seam Runtime '{0)' resource templates directory doesn't exist for selected Seam Web Project"
-					// ,value));
-				}
-			}
-			return errors;
-		}
-	};
-}
\ No newline at end of file
Index: src/org/jboss/tools/seam/ui/internal/project/facet/DataModelValidatorDelegate.java
===================================================================
--- src/org/jboss/tools/seam/ui/internal/project/facet/DataModelValidatorDelegate.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/internal/project/facet/DataModelValidatorDelegate.java	(working copy)
@@ -23,6 +23,7 @@
 import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
 import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
 import org.jboss.tools.common.ui.IValidator;
+import org.jboss.tools.seam.internal.core.project.facet.SeamValidatorFactory;
 
 /**
  * Delegate class used during validation process in wizard dialog. It contains 
Index: src/org/jboss/tools/seam/ui/marker/AbstractSeamMarkerResolution.java
===================================================================
--- src/org/jboss/tools/seam/ui/marker/AbstractSeamMarkerResolution.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/marker/AbstractSeamMarkerResolution.java	(working copy)
@@ -30,8 +30,8 @@
 import org.jboss.tools.common.refactoring.MarkerResolutionUtils;
 import org.jboss.tools.seam.core.ISeamProject;
 import org.jboss.tools.seam.core.SeamCorePlugin;
+import org.jboss.tools.seam.internal.core.project.facet.SeamValidatorFactory;
 import org.jboss.tools.seam.ui.SeamGuiPlugin;
-import org.jboss.tools.seam.ui.internal.project.facet.SeamValidatorFactory;
 
 /**
  * @author Daniel Azarov
Index: src/org/jboss/tools/seam/ui/marker/AddNewSeamRuntimeMarkerResolution.java
===================================================================
--- src/org/jboss/tools/seam/ui/marker/AddNewSeamRuntimeMarkerResolution.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/marker/AddNewSeamRuntimeMarkerResolution.java	(working copy)
@@ -29,12 +29,12 @@
 import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
 import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
 import org.jboss.tools.seam.core.SeamCorePlugin;
+import org.jboss.tools.seam.core.SeamCoreMessages;
 import org.jboss.tools.seam.core.project.facet.SeamRuntime;
 import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager;
 import org.jboss.tools.seam.core.project.facet.SeamVersion;
 import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties;
 import org.jboss.tools.seam.ui.SeamGuiPlugin;
-import org.jboss.tools.seam.ui.SeamUIMessages;
 import org.jboss.tools.seam.ui.preferences.SeamPreferencesMessages;
 import org.jboss.tools.seam.ui.widget.editor.SeamRuntimeListFieldEditor;
 
@@ -52,7 +52,7 @@
 		
 		IEclipsePreferences preferences = SeamCorePlugin.getSeamPreferences(project);
 		runtimeName = preferences.get(ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,"");
-		this.label = MessageFormat.format(SeamUIMessages.ADD_NEW_SEAM_RUNTIME_MARKER_RESOLUTION_TITLE, new Object[]{runtimeName});
+		this.label = MessageFormat.format(SeamCoreMessages.ADD_NEW_SEAM_RUNTIME_MARKER_RESOLUTION_TITLE, new Object[]{runtimeName});
 	}
 
 	public String getLabel() {
Index: src/org/jboss/tools/seam/ui/marker/SeamProblemMarkerResolutionGenerator.java
===================================================================
--- src/org/jboss/tools/seam/ui/marker/SeamProblemMarkerResolutionGenerator.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/marker/SeamProblemMarkerResolutionGenerator.java	(working copy)
@@ -26,10 +26,10 @@
 import org.jboss.tools.seam.core.ISeamProperty;
 import org.jboss.tools.seam.core.ISeamXmlComponentDeclaration;
 import org.jboss.tools.seam.core.SeamCorePlugin;
+import org.jboss.tools.seam.core.SeamCoreMessages;
 import org.jboss.tools.seam.internal.core.SeamComponentDeclaration;
 import org.jboss.tools.seam.internal.core.validation.SeamCoreValidator;
 import org.jboss.tools.seam.ui.SeamGuiPlugin;
-import org.jboss.tools.seam.ui.SeamUIMessages;
 
 /**
  * @author Daniel Azarov
@@ -84,119 +84,119 @@
 			if (messageId == SeamCoreValidator.NONUNIQUE_COMPONENT_NAME_MESSAGE_ID) {
 				return new IMarkerResolution[] {
 						new RenameAnnotationMarkerResolution(
-								SeamUIMessages.RENAME_NAME_ANNOTATION_MARKER_RESOLUTION_TITLE,
+								SeamCoreMessages.RENAME_NAME_ANNOTATION_MARKER_RESOLUTION_TITLE,
 								"org.jboss.seam.annotations.Name", file, start,
 								end),
 						new DeleteAnnotationMarkerResolution(
-								SeamUIMessages.DELETE_NAME_ANNOTATION_MARKER_RESOLUTION_TITLE,
+								SeamCoreMessages.DELETE_NAME_ANNOTATION_MARKER_RESOLUTION_TITLE,
 								"org.jboss.seam.annotations.Name", file, start,
 								end) };
 			} else if (messageId == SeamCoreValidator.DUPLICATE_REMOVE_MESSAGE_ID)
 				return new IMarkerResolution[] { new DeleteAnnotationMarkerResolution(
-						SeamUIMessages.DELETE_REMOVE_ANNOTATION_MARKER_RESOLUTION_TITLE,
+						SeamCoreMessages.DELETE_REMOVE_ANNOTATION_MARKER_RESOLUTION_TITLE,
 						"javax.ejb.Remove", file, start, end) };
 			else if (messageId == SeamCoreValidator.DUPLICATE_DESTROY_MESSAGE_ID)
 				return new IMarkerResolution[] { new DeleteAnnotationMarkerResolution(
-						SeamUIMessages.DELETE_DESTROY_ANNOTATION_MARKER_RESOLUTION_TITLE,
+						SeamCoreMessages.DELETE_DESTROY_ANNOTATION_MARKER_RESOLUTION_TITLE,
 						"org.jboss.seam.annotations.Destroy", file, start, end) };
 			else if (messageId == SeamCoreValidator.DUPLICATE_CREATE_MESSAGE_ID)
 				return new IMarkerResolution[] { new DeleteAnnotationMarkerResolution(
-						SeamUIMessages.DELETE_CREATE_ANNOTATION_MARKER_RESOLUTION_TITLE,
+						SeamCoreMessages.DELETE_CREATE_ANNOTATION_MARKER_RESOLUTION_TITLE,
 						"org.jboss.seam.annotations.Create", file, start, end) };
 			else if (messageId == SeamCoreValidator.DUPLICATE_UNWRAP_MESSAGE_ID)
 				return new IMarkerResolution[] { new DeleteAnnotationMarkerResolution(
-						SeamUIMessages.DELETE_UNWRAP_ANNOTATION_MARKER_RESOLUTION_TITLE,
+						SeamCoreMessages.DELETE_UNWRAP_ANNOTATION_MARKER_RESOLUTION_TITLE,
 						"org.jboss.seam.annotations.Unwrap", file, start, end) };
 			else if (messageId == SeamCoreValidator.DESTROY_METHOD_BELONGS_TO_STATELESS_SESSION_BEAN_MESSAGE_ID)
 				return new IMarkerResolution[] { new DeleteAnnotationMarkerResolution(
-						SeamUIMessages.DELETE_DESTROY_ANNOTATION_MARKER_RESOLUTION_TITLE,
+						SeamCoreMessages.DELETE_DESTROY_ANNOTATION_MARKER_RESOLUTION_TITLE,
 						"org.jboss.seam.annotations.Destroy", file, start, end) };
 			else if (messageId == SeamCoreValidator.CREATE_DOESNT_BELONG_TO_COMPONENT_MESSAGE_ID)
 				return new IMarkerResolution[] {
 						new AddAnnotationMarkerResolution(
-								SeamUIMessages.ADD_NAME_ANNOTATION_MARKER_RESOLUTION_TITLE,
+								SeamCoreMessages.ADD_NAME_ANNOTATION_MARKER_RESOLUTION_TITLE,
 								"org.jboss.seam.annotations.Name", file, start,
 								end, true),
 						new DeleteAnnotationMarkerResolution(
-								SeamUIMessages.DELETE_CREATE_ANNOTATION_MARKER_RESOLUTION_TITLE,
+								SeamCoreMessages.DELETE_CREATE_ANNOTATION_MARKER_RESOLUTION_TITLE,
 								"org.jboss.seam.annotations.Create", file,
 								start, end) };
 			else if (messageId == SeamCoreValidator.UNWRAP_DOESNT_BELONG_TO_COMPONENT_MESSAGE_ID)
 				return new IMarkerResolution[] {
 						new AddAnnotationMarkerResolution(
-								SeamUIMessages.ADD_NAME_ANNOTATION_MARKER_RESOLUTION_TITLE,
+								SeamCoreMessages.ADD_NAME_ANNOTATION_MARKER_RESOLUTION_TITLE,
 								"org.jboss.seam.annotations.Name", file, start,
 								end, true),
 						new DeleteAnnotationMarkerResolution(
-								SeamUIMessages.DELETE_UNWRAP_ANNOTATION_MARKER_RESOLUTION_TITLE,
+								SeamCoreMessages.DELETE_UNWRAP_ANNOTATION_MARKER_RESOLUTION_TITLE,
 								"org.jboss.seam.annotations.Unwrap", file,
 								start, end) };
 			else if (messageId == SeamCoreValidator.OBSERVER_DOESNT_BELONG_TO_COMPONENT_MESSAGE_ID)
 				return new IMarkerResolution[] {
 						new AddAnnotationMarkerResolution(
-								SeamUIMessages.ADD_NAME_ANNOTATION_MARKER_RESOLUTION_TITLE,
+								SeamCoreMessages.ADD_NAME_ANNOTATION_MARKER_RESOLUTION_TITLE,
 								"org.jboss.seam.annotations.Name", file, start,
 								end, true),
 						new DeleteAnnotationMarkerResolution(
-								SeamUIMessages.DELETE_OBSERVER_ANNOTATION_MARKER_RESOLUTION_TITLE,
+								SeamCoreMessages.DELETE_OBSERVER_ANNOTATION_MARKER_RESOLUTION_TITLE,
 								"org.jboss.seam.annotations.Observer", file,
 								start, end) };
 			else if (messageId == SeamCoreValidator.STATEFUL_COMPONENT_DOES_NOT_CONTAIN_REMOVE_ID)
 				return new IMarkerResolution[] { new AddAnnotatedMethodMarkerResolution(
-						SeamUIMessages.ADD_ANNOTATED_REMOVE_METHOD_MARKER_RESOLUTION_TITLE,
+						SeamCoreMessages.ADD_ANNOTATED_REMOVE_METHOD_MARKER_RESOLUTION_TITLE,
 						"javax.ejb.Remove", file, start, end) };
 			else if (messageId == SeamCoreValidator.STATEFUL_COMPONENT_DOES_NOT_CONTAIN_DESTROY_ID)
 				return new IMarkerResolution[] { new AddAnnotatedMethodMarkerResolution(
-						SeamUIMessages.ADD_ANNOTATED_DESTROY_METHOD_MARKER_RESOLUTION_TITLE,
+						SeamCoreMessages.ADD_ANNOTATED_DESTROY_METHOD_MARKER_RESOLUTION_TITLE,
 						"org.jboss.seam.annotations.Destroy", file, start, end) };
 			else if (messageId == SeamCoreValidator.STATEFUL_COMPONENT_WRONG_SCOPE_ID)
 				return new IMarkerResolution[] {
 						new ChangeScopeMarkerResolution(
-								SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE,
+								SeamCoreMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE,
 								"ScopeType.APPLICATION", file, start, end),
 						new ChangeScopeMarkerResolution(
-								SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE,
+								SeamCoreMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE,
 								"ScopeType.BUSINESS_PROCESS", file, start, end),
 						new ChangeScopeMarkerResolution(
-								SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE,
+								SeamCoreMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE,
 								"ScopeType.CONVERSATION", file, start, end),
 						new ChangeScopeMarkerResolution(
-								SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE,
+								SeamCoreMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE,
 								"ScopeType.EVENT", file, start, end),
 						new ChangeScopeMarkerResolution(
-								SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE,
+								SeamCoreMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE,
 								"ScopeType.METHOD", file, start, end),
 						new ChangeScopeMarkerResolution(
-								SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE,
+								SeamCoreMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE,
 								"ScopeType.SESSION", file, start, end),
 						new ChangeScopeMarkerResolution(
-								SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE,
+								SeamCoreMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE,
 								"ScopeType.UNSPECIFIED", file, start, end) };
 			else if (messageId == SeamCoreValidator.ENTITY_COMPONENT_WRONG_SCOPE_ID)
 				return new IMarkerResolution[] {
 						new ChangeScopeMarkerResolution(
-								SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE,
+								SeamCoreMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE,
 								"ScopeType.APPLICATION", file, start, end),
 						new ChangeScopeMarkerResolution(
-								SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE,
+								SeamCoreMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE,
 								"ScopeType.BUSINESS_PROCESS", file, start, end),
 						new ChangeScopeMarkerResolution(
-								SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE,
+								SeamCoreMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE,
 								"ScopeType.CONVERSATION", file, start, end),
 						new ChangeScopeMarkerResolution(
-								SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE,
+								SeamCoreMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE,
 								"ScopeType.EVENT", file, start, end),
 						new ChangeScopeMarkerResolution(
-								SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE,
+								SeamCoreMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE,
 								"ScopeType.METHOD", file, start, end),
 						new ChangeScopeMarkerResolution(
-								SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE,
+								SeamCoreMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE,
 								"ScopeType.PAGE", file, start, end),
 						new ChangeScopeMarkerResolution(
-								SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE,
+								SeamCoreMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE,
 								"ScopeType.SESSION", file, start, end),
 						new ChangeScopeMarkerResolution(
-								SeamUIMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE,
+								SeamCoreMessages.CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE,
 								"ScopeType.UNSPECIFIED", file, start, end) };
 		}else if(XML_EXTENSION.equals(file.getFileExtension())){
 			if (messageId == SeamCoreValidator.UNKNOWN_COMPONENT_PROPERTY_ID){
Index: src/org/jboss/tools/seam/ui/marker/AddSetterMarkerResolution.java
===================================================================
--- src/org/jboss/tools/seam/ui/marker/AddSetterMarkerResolution.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/marker/AddSetterMarkerResolution.java	(working copy)
@@ -31,8 +31,8 @@
 import org.jboss.tools.common.java.generation.JavaPropertyGenerator;
 import org.jboss.tools.seam.core.ISeamJavaComponentDeclaration;
 import org.jboss.tools.seam.core.ISeamProperty;
+import org.jboss.tools.seam.core.SeamCoreMessages;
 import org.jboss.tools.seam.ui.SeamGuiPlugin;
-import org.jboss.tools.seam.ui.SeamUIMessages;
 
 /**
  * @author Daniel Azarov
@@ -46,7 +46,7 @@
 	public AddSetterMarkerResolution(ISeamProperty property, ISeamJavaComponentDeclaration javaDeclaration){
 		this.property = property;
 		this.javaDeclaration = javaDeclaration;
-		this.label = MessageFormat.format(SeamUIMessages.ADD_SETTER_MARKER_RESOLUTION_TITLE, new Object[]{property.getName(), javaDeclaration.getClassName()});
+		this.label = MessageFormat.format(SeamCoreMessages.ADD_SETTER_MARKER_RESOLUTION_TITLE, new Object[]{property.getName(), javaDeclaration.getClassName()});
 	}
 
 	public String getLabel() {
Index: src/org/jboss/tools/seam/ui/wizard/SeamFormWizardPage1.java
===================================================================
--- src/org/jboss/tools/seam/ui/wizard/SeamFormWizardPage1.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/wizard/SeamFormWizardPage1.java	(working copy)
@@ -11,7 +11,7 @@
 package org.jboss.tools.seam.ui.wizard;
 
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.jboss.tools.seam.ui.SeamUIMessages;
+import org.jboss.tools.seam.core.SeamCoreMessages;
 
 /**
  * @author eskimo
@@ -24,7 +24,7 @@
 	 * @param pageName
 	 */
 	public SeamFormWizardPage1(IStructuredSelection is) {
-		super("seam.new.form.page1",SeamUIMessages.SEAM_FORM_WIZARD_PAGE1_SEAM_FORM,null, is); //$NON-NLS-1$
+		super("seam.new.form.page1",SeamCoreMessages.SEAM_FORM_WIZARD_PAGE1_SEAM_FORM,null, is); //$NON-NLS-1$
 		setMessage(getDefaultMessageText());
 	}
 
Index: src/org/jboss/tools/seam/ui/wizard/SeamEntityWizardPage1.java
===================================================================
--- src/org/jboss/tools/seam/ui/wizard/SeamEntityWizardPage1.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/wizard/SeamEntityWizardPage1.java	(working copy)
@@ -32,11 +32,11 @@
 import org.jboss.tools.common.ui.widget.editor.IFieldEditor;
 import org.jboss.tools.seam.core.SeamCorePlugin;
 import org.jboss.tools.seam.core.SeamProjectsSet;
+import org.jboss.tools.seam.core.SeamCoreMessages;
 import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties;
+import org.jboss.tools.seam.internal.core.project.facet.SeamValidatorFactory;
 import org.jboss.tools.seam.internal.core.validation.SeamProjectPropertyValidator;
 import org.jboss.tools.seam.ui.SeamGuiPlugin;
-import org.jboss.tools.seam.ui.SeamUIMessages;
-import org.jboss.tools.seam.ui.internal.project.facet.SeamValidatorFactory;
 
 /**
  * @author eskimo
@@ -147,7 +147,7 @@
 				editorRegistry.get(ISeamParameter.SEAM_ENTITY_CLASS_NAME).getValue(), null);
 
 		if(!errors.isEmpty()) {
-			setErrorMessage(NLS.bind(errors.get(IValidator.DEFAULT_ERROR).getMessage(),SeamUIMessages.SEAM_ENTITY_WIZARD_PAGE1_ENTITY_CLASS_NAME));
+			setErrorMessage(NLS.bind(errors.get(IValidator.DEFAULT_ERROR).getMessage(),SeamCoreMessages.SEAM_ENTITY_WIZARD_PAGE1_ENTITY_CLASS_NAME));
 			setPageComplete(false);
 			return;
 		}
@@ -163,7 +163,7 @@
 		}
 
 		errors = SeamValidatorFactory.FILE_NAME_VALIDATOR.validate(
-				editorRegistry.get(ISeamParameter.SEAM_MASTER_PAGE_NAME).getValue(), new Object[]{SeamUIMessages.SEAM_ENTITY_WIZARD_PAGE1_ENTITY_MASTER_PAGE,project,project});
+				editorRegistry.get(ISeamParameter.SEAM_MASTER_PAGE_NAME).getValue(), new Object[]{SeamCoreMessages.SEAM_ENTITY_WIZARD_PAGE1_ENTITY_MASTER_PAGE,project,project});
 
 		if(!errors.isEmpty()) {
 			setErrorMessage(errors.get(IValidator.DEFAULT_ERROR).getMessage());
@@ -172,7 +172,7 @@
 		}
 
 		errors = SeamValidatorFactory.FILE_NAME_VALIDATOR.validate(
-				editorRegistry.get(ISeamParameter.SEAM_PAGE_NAME).getValue(), new Object[]{SeamUIMessages.SEAM_ENTITY_WIZARD_PAGE1_PAGE,project});
+				editorRegistry.get(ISeamParameter.SEAM_PAGE_NAME).getValue(), new Object[]{SeamCoreMessages.SEAM_ENTITY_WIZARD_PAGE1_PAGE,project});
 
 		if(!errors.isEmpty()) {
 			setErrorMessage(errors.get(IValidator.DEFAULT_ERROR).getMessage());
@@ -187,7 +187,7 @@
 				IType component = javaProject.findType((String)editorRegistry.get(ISeamParameter.SEAM_PACKAGE_NAME).getValue()+"."+editorRegistry.get(ISeamParameter.SEAM_ENTITY_CLASS_NAME).getValue());
 				if(component != null){
 					setErrorMessage(null);
-					setMessage(SeamUIMessages.ENTITY_CLASS_ALREADY_EXISTS, IMessageProvider.WARNING);
+					setMessage(SeamCoreMessages.ENTITY_CLASS_ALREADY_EXISTS, IMessageProvider.WARNING);
 					setPageComplete(true);
 					return;
 				}
@@ -204,7 +204,7 @@
 		IFile masterPageFile = ResourcesPlugin.getWorkspace().getRoot().getFile(masterPage);
 		if(masterPageFile.exists()){
 			setErrorMessage(null);
-			setMessage(SeamUIMessages.MASTER_PAGE_ALREADY_EXISTS, IMessageProvider.WARNING);
+			setMessage(SeamCoreMessages.MASTER_PAGE_ALREADY_EXISTS, IMessageProvider.WARNING);
 			setPageComplete(true);
 			return;
 		}
@@ -214,7 +214,7 @@
 		IFile pageFile = ResourcesPlugin.getWorkspace().getRoot().getFile(page);
 		if(pageFile.exists()){
 			setErrorMessage(null);
-			setMessage(SeamUIMessages.PAGE_ALREADY_EXISTS, IMessageProvider.WARNING);
+			setMessage(SeamCoreMessages.PAGE_ALREADY_EXISTS, IMessageProvider.WARNING);
 			setPageComplete(true);
 			return;
 		}
Index: src/org/jboss/tools/seam/ui/wizard/SelectSeamProjectAction.java
===================================================================
--- src/org/jboss/tools/seam/ui/wizard/SelectSeamProjectAction.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/wizard/SelectSeamProjectAction.java	(working copy)
@@ -17,7 +17,7 @@
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.dialogs.ListDialog;
 import org.jboss.tools.common.ui.widget.editor.ButtonFieldEditor;
-import org.jboss.tools.seam.ui.SeamUIMessages;
+import org.jboss.tools.seam.core.SeamCoreMessages;
 
 public class SelectSeamProjectAction extends ButtonFieldEditor.ButtonPressedAction {
 
@@ -27,7 +27,7 @@
 	 * @param allowAllProjects If "false" show only projects with seam nature.
 	 */
 	public SelectSeamProjectAction(boolean allowAllProjects) {
-		super(SeamUIMessages.SELECT_SEAM_PROJECT_ACTION_BROWSE);
+		super(SeamCoreMessages.SELECT_SEAM_PROJECT_ACTION_BROWSE);
 		this.allowAllProjects = allowAllProjects;
 	}
 
Index: src/org/jboss/tools/seam/ui/wizard/SeamConversationWizardPage1.java
===================================================================
--- src/org/jboss/tools/seam/ui/wizard/SeamConversationWizardPage1.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/wizard/SeamConversationWizardPage1.java	(working copy)
@@ -12,7 +12,7 @@
 package org.jboss.tools.seam.ui.wizard;
 
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.jboss.tools.seam.ui.SeamUIMessages;
+import org.jboss.tools.seam.core.SeamCoreMessages;
 
 /**
  * @author eskimo
@@ -21,7 +21,7 @@
 public class SeamConversationWizardPage1 extends SeamBaseWizardPage {
 
 	public SeamConversationWizardPage1(IStructuredSelection initialSelection) {
-		super("seam.new.conversation.page1",SeamUIMessages.SEAM_CONVERSATION_WIZARD_PAGE1_SEAM_CONVERSATION,null, initialSelection);
+		super("seam.new.conversation.page1",SeamCoreMessages.SEAM_CONVERSATION_WIZARD_PAGE1_SEAM_CONVERSATION,null, initialSelection);
 		setMessage(getDefaultMessageText());
 	}
 
Index: src/org/jboss/tools/seam/ui/wizard/SeamDSXMLWizard.java
===================================================================
--- src/org/jboss/tools/seam/ui/wizard/SeamDSXMLWizard.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/wizard/SeamDSXMLWizard.java	(working copy)
@@ -45,7 +45,7 @@
 import org.jboss.tools.seam.internal.core.project.facet.SeamFacetFilterSetFactory;
 import org.jboss.tools.seam.internal.core.project.facet.SeamFacetInstallDataModelProvider;
 import org.jboss.tools.seam.internal.core.project.facet.SeamFacetPreInstallDelegate;
-import org.jboss.tools.seam.ui.internal.project.facet.SeamValidatorFactory;
+import org.jboss.tools.seam.internal.core.project.facet.SeamValidatorFactory;
 
 public class SeamDSXMLWizard extends BasicNewResourceWizard {
 	public static final String WIZARD_ID = "org.jboss.tools.seam.ui.wizard.SeamDSXMLWizard"; //$NON-NLS-1$
Index: src/org/jboss/tools/seam/ui/wizard/SeamActionWizard.java
===================================================================
--- src/org/jboss/tools/seam/ui/wizard/SeamActionWizard.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/wizard/SeamActionWizard.java	(working copy)
@@ -25,11 +25,11 @@
 import org.eclipse.ui.INewWizard;
 import org.eclipse.ui.PlatformUI;
 import org.jboss.tools.common.ui.widget.editor.INamedElement;
+import org.jboss.tools.seam.core.SeamCoreMessages;
 import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties;
 import org.jboss.tools.seam.internal.core.project.facet.SeamFacetInstallDataModelProvider;
 import org.jboss.tools.seam.ui.ISeamHelpContextIds;
 import org.jboss.tools.seam.ui.SeamGuiPlugin;
-import org.jboss.tools.seam.ui.SeamUIMessages;
 
 /**
  * 
@@ -53,7 +53,7 @@
 	 */
 	public SeamActionWizard() {
 		super(CREATE_SEAM_ACTION);
-		setWindowTitle(SeamUIMessages.SEAM_ACTION_WIZARD_NEW_SEAM_ACTION);
+		setWindowTitle(SeamCoreMessages.SEAM_ACTION_WIZARD_NEW_SEAM_ACTION);
 		setDefaultPageImageDescriptor(ImageDescriptor.createFromFile(SeamActionWizard.class, "SeamFormWizBan.png")); //$NON-NLS-1$
 	}
 
@@ -74,7 +74,7 @@
 		 * @param label
 		 */
 		public SeamActionCreateOperation() {
-			super((SeamUIMessages.SEAM_ACTION_WIZARD_ACTION_CREATING_OPERATION));
+			super((SeamCoreMessages.SEAM_ACTION_WIZARD_ACTION_CREATING_OPERATION));
 		}
 
 		@Override
Index: src/org/jboss/tools/seam/ui/wizard/SeamGenerateEntitiesWizardPage.java
===================================================================
--- src/org/jboss/tools/seam/ui/wizard/SeamGenerateEntitiesWizardPage.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/wizard/SeamGenerateEntitiesWizardPage.java	(working copy)
@@ -49,10 +49,10 @@
 import org.jboss.tools.common.ui.widget.field.RadioField;
 import org.jboss.tools.seam.core.SeamCorePlugin;
 import org.jboss.tools.seam.core.SeamProjectsSet;
+import org.jboss.tools.seam.core.SeamCoreMessages;
 import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties;
+import org.jboss.tools.seam.internal.core.project.facet.SeamValidatorFactory;
 import org.jboss.tools.seam.internal.core.validation.SeamProjectPropertyValidator;
-import org.jboss.tools.seam.ui.SeamUIMessages;
-import org.jboss.tools.seam.ui.internal.project.facet.SeamValidatorFactory;
 
 /**
  * @author Alexey Kazakov
@@ -68,8 +68,8 @@
 	IProject rootSeamProject;
 
 	public SeamGenerateEntitiesWizardPage() {
-		super("seam.generate.entities.page", SeamUIMessages.GENERATE_SEAM_ENTITIES_WIZARD_TITLE, null); //$NON-NLS-1$
-		setMessage(SeamUIMessages.GENERATE_SEAM_ENTITIES_WIZARD_PAGE_MESSAGE);
+		super("seam.generate.entities.page", SeamCoreMessages.GENERATE_SEAM_ENTITIES_WIZARD_TITLE, null); //$NON-NLS-1$
+		setMessage(SeamCoreMessages.GENERATE_SEAM_ENTITIES_WIZARD_PAGE_MESSAGE);
 	}
 
 	/* (non-Javadoc)
@@ -94,7 +94,7 @@
 				setMessage(null);
 			}
 		} else {
-			setMessage(SeamUIMessages.GENERATE_SEAM_ENTITIES_WIZARD_PAGE_MESSAGE);
+			setMessage(SeamCoreMessages.GENERATE_SEAM_ENTITIES_WIZARD_PAGE_MESSAGE);
 			setPageComplete(false);
 		}
 
@@ -111,13 +111,13 @@
 
 		String config = (String)configEditor.getValue();
 		if(config==null || config.length()==0) {
-			setMessage(SeamUIMessages.GENERATE_SEAM_ENTITIES_WIZARD_HIBERNATE_CONFIGURATION_MESSAGE);
+			setMessage(SeamCoreMessages.GENERATE_SEAM_ENTITIES_WIZARD_HIBERNATE_CONFIGURATION_MESSAGE);
 			setPageComplete(false);
 		}
 
 		Composite groupComposite = new GridLayoutComposite(top);
 		Group group = new Group(groupComposite, SWT.NONE);
-		group.setText(SeamUIMessages.GENERATE_SEAM_ENTITIES_WIZARD_GROUP_LABEL);
+		group.setText(SeamCoreMessages.GENERATE_SEAM_ENTITIES_WIZARD_GROUP_LABEL);
 		group.setLayout(new GridLayout(1, false));
 		group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
@@ -126,8 +126,8 @@
 		values.add("existing"); //$NON-NLS-1$
 		values.add("reverse"); //$NON-NLS-1$		
 		ArrayList<String> labels = new ArrayList<String>();
-		labels.add(SeamUIMessages.GENERATE_SEAM_ENTITIES_WIZARD_EXISTING_ENTITIES_LABEL);
-		labels.add(SeamUIMessages.GENERATE_SEAM_ENTITIES_WIZARD_REVERSE_ENGINEER_LABEL);		
+		labels.add(SeamCoreMessages.GENERATE_SEAM_ENTITIES_WIZARD_EXISTING_ENTITIES_LABEL);
+		labels.add(SeamCoreMessages.GENERATE_SEAM_ENTITIES_WIZARD_REVERSE_ENGINEER_LABEL);		
 		radios = new RadioField(radioComposite, labels, values, null, true);
 		radios.addPropertyChangeListener(this);
 		
@@ -292,7 +292,7 @@
 		if(!errors.isEmpty() || !isProjectSettingsOk()) {
 			IStatus errorMessage = errors.get(IValidator.DEFAULT_ERROR);
 			if(errorMessage==null) {
-				setErrorMessage(SeamUIMessages.VALIDATOR_INVALID_SETTINGS);
+				setErrorMessage(SeamCoreMessages.VALIDATOR_INVALID_SETTINGS);
 				setPageComplete(false);
 			} else {
 				if(errorMessage.getSeverity()==IStatus.ERROR) {
@@ -306,7 +306,7 @@
 		}
 		String config = (String)configEditor.getValue();
 		if(config==null || config.length()==0) {
-			setErrorMessage(SeamUIMessages.GENERATE_SEAM_ENTITIES_WIZARD_HIBERNATE_CONFIGURATION_ERROR);
+			setErrorMessage(SeamCoreMessages.GENERATE_SEAM_ENTITIES_WIZARD_HIBERNATE_CONFIGURATION_ERROR);
 			setPageComplete(false);
 			return;
 		}
Index: src/org/jboss/tools/seam/ui/wizard/SeamBaseWizardPage.java
===================================================================
--- src/org/jboss/tools/seam/ui/wizard/SeamBaseWizardPage.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/wizard/SeamBaseWizardPage.java	(working copy)
@@ -44,11 +44,11 @@
 import org.jboss.tools.common.ui.widget.editor.LabelFieldEditor;
 import org.jboss.tools.seam.core.SeamCorePlugin;
 import org.jboss.tools.seam.core.SeamProjectsSet;
+import org.jboss.tools.seam.core.SeamCoreMessages;
 import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties;
+import org.jboss.tools.seam.internal.core.project.facet.SeamValidatorFactory;
 import org.jboss.tools.seam.internal.core.validation.SeamProjectPropertyValidator;
 import org.jboss.tools.seam.ui.SeamGuiPlugin;
-import org.jboss.tools.seam.ui.SeamUIMessages;
-import org.jboss.tools.seam.ui.internal.project.facet.SeamValidatorFactory;
 
 /**
  * @author eskimo
@@ -110,7 +110,7 @@
 			} else if(isWar()) {
 				getEditor(ISeamParameter.SEAM_BEAN_NAME).setEnabled(false);	
 				LabelFieldEditor label = (LabelFieldEditor)((CompositeEditor)getEditor(ISeamParameter.SEAM_LOCAL_INTERFACE_NAME)).getEditors().get(0);
-				label.getLabelControl().setText(SeamUIMessages.SEAM_BASE_WIZARD_PAGE_POJO_CLASS_NAME);
+				label.getLabelControl().setText(SeamCoreMessages.SEAM_BASE_WIZARD_PAGE_POJO_CLASS_NAME);
 			} else {
 				getEditor(ISeamParameter.SEAM_BEAN_NAME).setEnabled(true);
 			}
@@ -231,13 +231,13 @@
 		if(!isValidRuntimeConfigured(project)) return;
 
 		LabelFieldEditor label = (LabelFieldEditor)((CompositeEditor)getEditor(ISeamParameter.SEAM_LOCAL_INTERFACE_NAME)).getEditors().get(0);
-		label.getLabelControl().setText(isWar?SeamUIMessages.SEAM_BASE_WIZARD_PAGE_POJO_CLASS_NAME: SeamUIMessages.SEAM_BASE_WIZARD_PAGE_LOCAL_CLASS_NAME);
+		label.getLabelControl().setText(isWar?SeamCoreMessages.SEAM_BASE_WIZARD_PAGE_POJO_CLASS_NAME: SeamCoreMessages.SEAM_BASE_WIZARD_PAGE_LOCAL_CLASS_NAME);
 
 		Map<String, IStatus> errors = SeamValidatorFactory.SEAM_COMPONENT_NAME_VALIDATOR.validate(
 				editorRegistry.get(ISeamParameter.SEAM_COMPONENT_NAME).getValue(), null);
 
 		if(!errors.isEmpty()) {
-			setErrorMessage(NLS.bind(errors.get(IValidator.DEFAULT_ERROR).getMessage(),SeamUIMessages.SEAM_BASE_WIZARD_PAGE_SEAM_COMPONENTS));
+			setErrorMessage(NLS.bind(errors.get(IValidator.DEFAULT_ERROR).getMessage(),SeamCoreMessages.SEAM_BASE_WIZARD_PAGE_SEAM_COMPONENTS));
 			setPageComplete(false);
 			return;
 		}
@@ -246,7 +246,7 @@
 				editorRegistry.get(ISeamParameter.SEAM_LOCAL_INTERFACE_NAME).getValue(), null);
 
 		if(!errors.isEmpty()) {
-			setErrorMessage(NLS.bind(errors.get(IValidator.DEFAULT_ERROR).getMessage(),SeamUIMessages.SEAM_BASE_WIZARD_PAGE_LOCAL_INTERFACE));
+			setErrorMessage(NLS.bind(errors.get(IValidator.DEFAULT_ERROR).getMessage(),SeamCoreMessages.SEAM_BASE_WIZARD_PAGE_LOCAL_INTERFACE));
 			setPageComplete(false);
 			return;
 		}
@@ -291,7 +291,7 @@
 		}
 
 		errors = SeamValidatorFactory.SEAM_JAVA_INTEFACE_NAME_CONVENTION_VALIDATOR.validate(
-				editorRegistry.get(ISeamParameter.SEAM_LOCAL_INTERFACE_NAME).getValue(), new Object[]{SeamUIMessages.SEAM_BASE_WIZARD_PAGE_LOCAL_INTERFACE,project});
+				editorRegistry.get(ISeamParameter.SEAM_LOCAL_INTERFACE_NAME).getValue(), new Object[]{SeamCoreMessages.SEAM_BASE_WIZARD_PAGE_LOCAL_INTERFACE,project});
 
 		if(!errors.isEmpty()) {
 			setErrorMessage(null);
@@ -307,7 +307,7 @@
 				IType component = javaProject.findType((String)editorRegistry.get(ISeamParameter.SEAM_PACKAGE_NAME).getValue()+"."+editorRegistry.get(ISeamParameter.SEAM_LOCAL_INTERFACE_NAME).getValue());
 				if(component != null){
 					setErrorMessage(null);
-					setMessage(SeamUIMessages.POJO_CLASS_ALREADY_EXISTS, IMessageProvider.WARNING);
+					setMessage(SeamCoreMessages.POJO_CLASS_ALREADY_EXISTS, IMessageProvider.WARNING);
 					setPageComplete(true);
 					return;
 				}
@@ -324,7 +324,7 @@
 		IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(page);
 		if(file.exists()){
 			setErrorMessage(null);
-			setMessage(SeamUIMessages.PAGE_ALREADY_EXISTS, IMessageProvider.WARNING);
+			setMessage(SeamCoreMessages.PAGE_ALREADY_EXISTS, IMessageProvider.WARNING);
 			setPageComplete(true);
 			return;
 		}
@@ -367,7 +367,7 @@
 
 		if(!errors.isEmpty() || !isProjectSettingsOk()) {
 			IStatus errorStatus = errors.get(IValidator.DEFAULT_ERROR);
-			String errorMessage = SeamUIMessages.VALIDATOR_INVALID_SETTINGS;
+			String errorMessage = SeamCoreMessages.VALIDATOR_INVALID_SETTINGS;
 			if(errorStatus!=null) {
 				errorMessage = errorStatus.getMessage();
 			}
Index: src/org/jboss/tools/seam/ui/wizard/OpenSeamComponentDialog.java
===================================================================
--- src/org/jboss/tools/seam/ui/wizard/OpenSeamComponentDialog.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/wizard/OpenSeamComponentDialog.java	(working copy)
@@ -42,8 +42,8 @@
 import org.jboss.tools.seam.core.ISeamComponent;
 import org.jboss.tools.seam.core.ISeamProject;
 import org.jboss.tools.seam.core.SeamCorePlugin;
+import org.jboss.tools.seam.core.SeamCoreMessages;
 import org.jboss.tools.seam.ui.SeamGuiPlugin;
-import org.jboss.tools.seam.ui.SeamUIMessages;
 import org.jboss.tools.seam.ui.SeamUiImages;
 import org.jboss.tools.seam.ui.views.SeamReferencedFilter;
 
@@ -105,7 +105,7 @@
 			ItemsFilter itemsFilter, IProgressMonitor progressMonitor)
 			throws CoreException {
 		
-		progressMonitor.subTask(SeamUIMessages.OPEN_SEAM_COMPONENT_DIALOG_WAIT);
+		progressMonitor.subTask(SeamCoreMessages.OPEN_SEAM_COMPONENT_DIALOG_WAIT);
 		
 		try {
 			Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
@@ -117,7 +117,7 @@
 				.getProjects();
 
 		progressMonitor.beginTask(
-				SeamUIMessages.OPEN_SEAM_COMPONENT_DIALOG_LOADING,
+				SeamCoreMessages.OPEN_SEAM_COMPONENT_DIALOG_LOADING,
 				projects.length);
 
 		for (int i = 0; i < projects.length; i++) {
@@ -189,7 +189,7 @@
 
 	protected IDialogSettings getDialogSettings() {
 		return new DialogSettings(
-				SeamUIMessages.OPEN_SEAM_COMPONENT_DIALOG_NAME);
+				SeamCoreMessages.OPEN_SEAM_COMPONENT_DIALOG_NAME);
 	}
 
 	public String getElementName(Object item) {
Index: src/org/jboss/tools/seam/ui/wizard/SeamFormWizard.java
===================================================================
--- src/org/jboss/tools/seam/ui/wizard/SeamFormWizard.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/wizard/SeamFormWizard.java	(working copy)
@@ -21,9 +21,9 @@
 import org.eclipse.ui.INewWizard;
 import org.eclipse.ui.PlatformUI;
 import org.jboss.tools.common.ui.widget.editor.INamedElement;
+import org.jboss.tools.seam.core.SeamCoreMessages;
 import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties;
 import org.jboss.tools.seam.ui.ISeamHelpContextIds;
-import org.jboss.tools.seam.ui.SeamUIMessages;
 
 /**
  * 
@@ -42,7 +42,7 @@
 	 */
 	public SeamFormWizard() {
 		super(CREATE_SEAM_FORM);
-		setWindowTitle(SeamUIMessages.SEAM_FORM_WIZARD_NEW_SEAM_FORM);
+		setWindowTitle(SeamCoreMessages.SEAM_FORM_WIZARD_NEW_SEAM_FORM);
 		setDefaultPageImageDescriptor(ImageDescriptor.createFromFile(SeamActionWizard.class, "SeamFormWizBan.png")); //$NON-NLS-1$
 	}
 
@@ -60,7 +60,7 @@
 	public static class SeamFormCreateOperation extends SeamBaseOperation {
 
 		public SeamFormCreateOperation() {
-			super(SeamUIMessages.SEAM_FORM_WIZARD_FORM_CREATING_OPERATION);
+			super(SeamCoreMessages.SEAM_FORM_WIZARD_FORM_CREATING_OPERATION);
 		}
 
 		/*
Index: src/org/jboss/tools/seam/ui/wizard/SeamGenerateEntitiesTablesWizardPage.java
===================================================================
--- src/org/jboss/tools/seam/ui/wizard/SeamGenerateEntitiesTablesWizardPage.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/wizard/SeamGenerateEntitiesTablesWizardPage.java	(working copy)
@@ -20,7 +20,7 @@
 import org.hibernate.eclipse.console.model.IReverseEngineeringDefinition;
 import org.hibernate.eclipse.console.model.ITableFilter;
 import org.hibernate.eclipse.console.model.impl.ReverseEngineeringDefinitionImpl;
-import org.jboss.tools.seam.ui.SeamUIMessages;
+import org.jboss.tools.seam.core.SeamCoreMessages;
 import org.jboss.tools.seam.ui.views.DBTableFilterView;
 
 /**
@@ -36,7 +36,7 @@
 	private IReverseEngineeringDefinition model;
 
 	public SeamGenerateEntitiesTablesWizardPage() {
-		super(pageName, SeamUIMessages.GENERATE_SEAM_ENTITIES_WIZARD_TITLE, null);
+		super(pageName, SeamCoreMessages.GENERATE_SEAM_ENTITIES_WIZARD_TITLE, null);
 		setMessage("Select Tables");												//$NON-NLS-1$
 	}
 
Index: src/org/jboss/tools/seam/ui/wizard/SeamActionWizardPage1.java
===================================================================
--- src/org/jboss/tools/seam/ui/wizard/SeamActionWizardPage1.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/wizard/SeamActionWizardPage1.java	(working copy)
@@ -11,7 +11,7 @@
 package org.jboss.tools.seam.ui.wizard;
 
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.jboss.tools.seam.ui.SeamUIMessages;
+import org.jboss.tools.seam.core.SeamCoreMessages;
 
 /**
  * @author eskimo
@@ -25,7 +25,7 @@
 	 * @param titleImage
 	 */
 	public SeamActionWizardPage1(IStructuredSelection is) {
-		super("seam.new.action.page1", SeamUIMessages.SEAM_ACTION_WIZARD_PAGE1_SEAM_ACTION, null, is); //$NON-NLS-1$
+		super("seam.new.action.page1", SeamCoreMessages.SEAM_ACTION_WIZARD_PAGE1_SEAM_ACTION, null, is); //$NON-NLS-1$
 		setMessage(getDefaultMessageText());
 	}
 
Index: src/org/jboss/tools/seam/ui/wizard/SelectJavaPackageAction.java
===================================================================
--- src/org/jboss/tools/seam/ui/wizard/SelectJavaPackageAction.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/wizard/SelectJavaPackageAction.java	(working copy)
@@ -27,8 +27,8 @@
 import org.jboss.tools.common.model.util.EclipseResourceUtil;
 import org.jboss.tools.common.ui.widget.editor.ButtonFieldEditor;
 import org.jboss.tools.seam.core.SeamProjectsSet;
+import org.jboss.tools.seam.core.SeamCoreMessages;
 import org.jboss.tools.seam.ui.SeamGuiPlugin;
-import org.jboss.tools.seam.ui.SeamUIMessages;
 
 /**
  * @author Alexey Kazakov
@@ -36,7 +36,7 @@
 public class SelectJavaPackageAction extends ButtonFieldEditor.ButtonPressedAction {
 
 	public SelectJavaPackageAction() {
-		super(SeamUIMessages.SELECT_SEAM_PROJECT_ACTION_BROWSE);
+		super(SeamCoreMessages.SELECT_SEAM_PROJECT_ACTION_BROWSE);
 	}
 
 	@Override
Index: src/org/jboss/tools/seam/ui/wizard/ShowProjectSettingsAction.java
===================================================================
--- src/org/jboss/tools/seam/ui/wizard/ShowProjectSettingsAction.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/wizard/ShowProjectSettingsAction.java	(working copy)
@@ -12,14 +12,14 @@
 import org.jboss.tools.common.ui.widget.editor.ButtonFieldEditor;
 import org.jboss.tools.common.ui.widget.editor.CompositeEditor;
 import org.jboss.tools.common.ui.widget.editor.IFieldEditor;
-import org.jboss.tools.seam.ui.SeamUIMessages;
+import org.jboss.tools.seam.core.SeamCoreMessages;
 
 public class ShowProjectSettingsAction extends ButtonFieldEditor.ButtonPressedAction implements PropertyChangeListener {
 	IFieldEditor editor;
 	IFieldEditor button;
 
 	public ShowProjectSettingsAction() {
-		super(SeamUIMessages.SHOW_PROJECT_SETTINGS_ACTION);
+		super(SeamCoreMessages.SHOW_PROJECT_SETTINGS_ACTION);
 	}
 	
 	public void setEditor(IFieldEditor editor) {
Index: src/org/jboss/tools/seam/ui/wizard/SeamBaseWizard.java
===================================================================
--- src/org/jboss/tools/seam/ui/wizard/SeamBaseWizard.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/wizard/SeamBaseWizard.java	(working copy)
@@ -32,8 +32,8 @@
 import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate;
 import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
 import org.jboss.tools.seam.core.SeamCorePlugin;
+import org.jboss.tools.seam.core.SeamCoreMessages;
 import org.jboss.tools.seam.ui.SeamGuiPlugin;
-import org.jboss.tools.seam.ui.SeamUIMessages;
 
 /**
  * @author eskimo
@@ -103,7 +103,7 @@
 	 */
 	public IUndoableOperation getOperation() {
 		if(operation!=null) return operation;
-		throw new IllegalStateException(SeamUIMessages.SEAM_BASE_WIZARD_OPERATION_IS_NOT_DEFINED_FOR_WIZARD);
+		throw new IllegalStateException(SeamCoreMessages.SEAM_BASE_WIZARD_OPERATION_IS_NOT_DEFINED_FOR_WIZARD);
 	}
 	
 	/**
Index: src/org/jboss/tools/seam/ui/wizard/SeamWizardFactory.java
===================================================================
--- src/org/jboss/tools/seam/ui/wizard/SeamWizardFactory.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/wizard/SeamWizardFactory.java	(working copy)
@@ -41,12 +41,12 @@
 import org.jboss.tools.common.ui.widget.editor.IFieldEditorFactory;
 import org.jboss.tools.common.ui.widget.editor.ITaggedFieldEditor;
 import org.jboss.tools.seam.core.SeamCorePlugin;
+import org.jboss.tools.seam.core.SeamCoreMessages;
 import org.jboss.tools.seam.core.project.facet.SeamRuntime;
 import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager;
 import org.jboss.tools.seam.core.project.facet.SeamVersion;
 import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties;
-import org.jboss.tools.seam.ui.SeamUIMessages;
-import org.jboss.tools.seam.ui.internal.project.facet.SeamValidatorFactory;
+import org.jboss.tools.seam.internal.core.project.facet.SeamValidatorFactory;
 import org.jboss.tools.seam.ui.widget.editor.SeamRuntimeListFieldEditor.SeamRuntimeNewWizard;
 
 /**
@@ -91,7 +91,7 @@
 	 */
 	public static IFieldEditor createSeamProjectSelectionFieldEditor(
 			String defaultSelection) {
-		return createSeamProjectSelectionFieldEditor(ISeamParameter.SEAM_PROJECT_NAME, SeamUIMessages.SEAM_WIZARD_FACTORY_SEAM_PROJECT, defaultSelection, false, true);
+		return createSeamProjectSelectionFieldEditor(ISeamParameter.SEAM_PROJECT_NAME, SeamCoreMessages.SEAM_WIZARD_FACTORY_SEAM_PROJECT, defaultSelection, false, true);
 	}
 
 	/**
@@ -99,7 +99,7 @@
 	 */
 	public static IFieldEditor createSeamLocalInterfaceNameFieldEditor() {
 		return IFieldEditorFactory.INSTANCE.createTextEditor(
-				ISeamParameter.SEAM_LOCAL_INTERFACE_NAME, SeamUIMessages.SEAM_WIZARD_FACTORY_LOCAL_INTERFACE_NAME, ""); //$NON-NLS-1$
+				ISeamParameter.SEAM_LOCAL_INTERFACE_NAME, SeamCoreMessages.SEAM_WIZARD_FACTORY_LOCAL_INTERFACE_NAME, ""); //$NON-NLS-1$
 	}
 
 	/**
@@ -107,7 +107,7 @@
 	 */
 	public static IFieldEditor createSeamBeanNameFieldEditor() {
 		return IFieldEditorFactory.INSTANCE.createTextEditor(
-				ISeamParameter.SEAM_BEAN_NAME, SeamUIMessages.SEAM_WIZARD_FACTORY_BEAN_NAME, ""); //$NON-NLS-1$
+				ISeamParameter.SEAM_BEAN_NAME, SeamCoreMessages.SEAM_WIZARD_FACTORY_BEAN_NAME, ""); //$NON-NLS-1$
 	}
 
 	/**
@@ -115,7 +115,7 @@
 	 */
 	public static IFieldEditor createSeamMethodNameFieldEditor() {
 		return IFieldEditorFactory.INSTANCE.createTextEditor(
-				ISeamParameter.SEAM_METHOD_NAME, SeamUIMessages.SEAM_WIZARD_FACTORY_METHOD_NAME, ""); //$NON-NLS-1$
+				ISeamParameter.SEAM_METHOD_NAME, SeamCoreMessages.SEAM_WIZARD_FACTORY_METHOD_NAME, ""); //$NON-NLS-1$
 	}
 
 	/**
@@ -123,7 +123,7 @@
 	 */
 	public static IFieldEditor createSeamPageNameFieldEditor() {
 		return IFieldEditorFactory.INSTANCE.createTextEditor(
-				ISeamParameter.SEAM_PAGE_NAME, SeamUIMessages.SEAM_WIZARD_FACTORY_PAGE_NAME, ""); //$NON-NLS-1$
+				ISeamParameter.SEAM_PAGE_NAME, SeamCoreMessages.SEAM_WIZARD_FACTORY_PAGE_NAME, ""); //$NON-NLS-1$
 	}
 	
 	/**
@@ -131,7 +131,7 @@
 	 */
 	public static IFieldEditor createSeamMasterPageNameFieldEditor() {
 		return IFieldEditorFactory.INSTANCE.createTextEditor(
-				ISeamParameter.SEAM_MASTER_PAGE_NAME, SeamUIMessages.SEAM_WIZARD_FACTORY_MASTER_PAGE_NAME, ""); //$NON-NLS-1$
+				ISeamParameter.SEAM_MASTER_PAGE_NAME, SeamCoreMessages.SEAM_WIZARD_FACTORY_MASTER_PAGE_NAME, ""); //$NON-NLS-1$
 	}
 
 	/**
@@ -154,7 +154,7 @@
 	 */
 	public static IFieldEditor createSeamJavaPackageSelectionFieldEditor(String defaultSelection) {
 		return IFieldEditorFactory.INSTANCE.createButtonFieldEditor(
-				ISeamParameter.SEAM_PACKAGE_NAME, SeamUIMessages.SEAM_WIZARD_FACTORY_PACKAGE_NAME, defaultSelection, 
+				ISeamParameter.SEAM_PACKAGE_NAME, SeamCoreMessages.SEAM_WIZARD_FACTORY_PACKAGE_NAME, defaultSelection, 
 				 new SelectJavaPackageAction(), SeamValidatorFactory.NO_ERRORS_VALIDATOR);
 	}
 
@@ -188,7 +188,7 @@
 		}
 		IFieldEditor jBossSeamRuntimeEditor = IFieldEditorFactory.INSTANCE
 		.createComboWithButton(ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,
-				SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_SEAM_RUNTIME, names, 
+				SeamCoreMessages.SEAM_INSTALL_WIZARD_PAGE_SEAM_RUNTIME, names, 
 				defaultValue, 
 				true, action, (IValidator)null);
 		return jBossSeamRuntimeEditor;
@@ -209,7 +209,7 @@
 		}
 		IFieldEditor connProfileSelEditor = IFieldEditorFactory.INSTANCE.createComboWithTwoButtons(
 				ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE,
-				SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_CONNECTION_PROFILE,
+				SeamCoreMessages.SEAM_INSTALL_WIZARD_PAGE_CONNECTION_PROFILE,
 				profiles,
 				defaultValue,
 				false, editAction,
@@ -280,7 +280,7 @@
 		 * @param validator
 		 */
 		public EditConnectionProfileAction(IValidator validator) {
-			super(SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_EDIT);
+			super(SeamCoreMessages.SEAM_INSTALL_WIZARD_PAGE_EDIT);
 			this.validator = validator;
 		}
 
@@ -327,7 +327,7 @@
 		private IFieldEditor connProfileSelEditor;
 
 		public NewConnectionProfileAction(IValidator validator) {
-			super(SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_NEW);
+			super(SeamCoreMessages.SEAM_INSTALL_WIZARD_PAGE_NEW);
 			this.validator = validator;
 		}
 
@@ -471,7 +471,7 @@
 	public static abstract class NewSeamRuntimeAction extends ButtonFieldEditor.ButtonPressedAction {
 
 		public NewSeamRuntimeAction() {
-			super(SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_ADD);
+			super(SeamCoreMessages.SEAM_INSTALL_WIZARD_PAGE_ADD);
 		}
 
 		abstract protected SeamVersion[] getSeamVersions();
@@ -551,7 +551,7 @@
 	 */
 	public static IFieldEditor createSeamComponentNameFieldEditor() {
 		return IFieldEditorFactory.INSTANCE.createTextEditor(
-				ISeamParameter.SEAM_COMPONENT_NAME, SeamUIMessages.SEAM_WIZARD_FACTORY_SEAM_COMPONENT_NAME, ""); //$NON-NLS-1$
+				ISeamParameter.SEAM_COMPONENT_NAME, SeamCoreMessages.SEAM_WIZARD_FACTORY_SEAM_COMPONENT_NAME, ""); //$NON-NLS-1$
 	}
 
 	/**
@@ -559,7 +559,7 @@
 	 */
 	public static IFieldEditor createSeamEntityClasNameFieldEditor() {
 		return IFieldEditorFactory.INSTANCE.createTextEditor(
-				ISeamParameter.SEAM_ENTITY_CLASS_NAME, SeamUIMessages.SEAM_WIZARD_FACTORY_SEAM_ENTITY_CLASS_NAME, ""); //$NON-NLS-1$
+				ISeamParameter.SEAM_ENTITY_CLASS_NAME, SeamCoreMessages.SEAM_WIZARD_FACTORY_SEAM_ENTITY_CLASS_NAME, ""); //$NON-NLS-1$
 	}
 
 	/**
@@ -582,7 +582,7 @@
 		}
 		IFieldEditor editor = IFieldEditorFactory.INSTANCE.createComboEditor(
 				ISeamParameter.HIBERNATE_CONFIGURATION_NAME, 
-				SeamUIMessages.GENERATE_SEAM_ENTITIES_WIZARD_HIBERNATE_CONFIGURATION_LABEL, 
+				SeamCoreMessages.GENERATE_SEAM_ENTITIES_WIZARD_HIBERNATE_CONFIGURATION_LABEL, 
 				configurationNames, defaultSelection);
 		return editor;
 	}
@@ -594,7 +594,7 @@
 	public static IFieldEditor createViewFolderFieldEditor(String defaultSelection) {
 		IFieldEditor viewDirEditor = IFieldEditorFactory.INSTANCE.createBrowseWorkspaceFolderEditor(
 				ISeamFacetDataModelProperties.WEB_CONTENTS_FOLDER,
-				SeamUIMessages.VIEW_FOLDER_FILED_EDITOR,
+				SeamCoreMessages.VIEW_FOLDER_FILED_EDITOR,
 				defaultSelection); 
 		return viewDirEditor;
 	}
Index: src/org/jboss/tools/seam/ui/wizard/SeamConversationWizard.java
===================================================================
--- src/org/jboss/tools/seam/ui/wizard/SeamConversationWizard.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/wizard/SeamConversationWizard.java	(working copy)
@@ -21,10 +21,10 @@
 import org.eclipse.ui.INewWizard;
 import org.eclipse.ui.PlatformUI;
 import org.jboss.tools.common.ui.widget.editor.INamedElement;
+import org.jboss.tools.seam.core.SeamCoreMessages;
 import org.jboss.tools.seam.core.SeamUtil;
 import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties;
 import org.jboss.tools.seam.ui.ISeamHelpContextIds;
-import org.jboss.tools.seam.ui.SeamUIMessages;
 
 public class SeamConversationWizard extends SeamBaseWizard implements INewWizard {
 	
@@ -35,7 +35,7 @@
 	
 	public SeamConversationWizard() {
 		super(CREATE_SEAM_CONVERSATION);
-		setWindowTitle(SeamUIMessages.SEAM_CONVERSATION_WIZARD_CREATE_NEW_CONVERSATION);
+		setWindowTitle(SeamCoreMessages.SEAM_CONVERSATION_WIZARD_CREATE_NEW_CONVERSATION);
 		setDefaultPageImageDescriptor(ImageDescriptor.createFromFile(SeamConversationWizard.class, "SeamWebProjectWizBan.png"));		
 	}
 
@@ -56,7 +56,7 @@
 		 * @param label
 		 */
 		public SeamConversationCreateOperation() {
-			super((SeamUIMessages.SEAM_CONVERSATION_WIZARD_ENTITY_CREATING_OPERATION));
+			super((SeamCoreMessages.SEAM_CONVERSATION_WIZARD_ENTITY_CREATING_OPERATION));
 		}
 
 		private List<FileMapping> actionMapping;
Index: src/org/jboss/tools/seam/ui/wizard/SeamGenerateEntitiesWizard.java
===================================================================
--- src/org/jboss/tools/seam/ui/wizard/SeamGenerateEntitiesWizard.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/wizard/SeamGenerateEntitiesWizard.java	(working copy)
@@ -47,12 +47,12 @@
 import org.jboss.tools.seam.core.ISeamProject;
 import org.jboss.tools.seam.core.SeamCorePlugin;
 import org.jboss.tools.seam.core.SeamProjectsSet;
+import org.jboss.tools.seam.core.SeamCoreMessages;
 import org.jboss.tools.seam.core.project.facet.SeamRuntime;
 import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager;
 import org.jboss.tools.seam.core.project.facet.SeamVersion;
 import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties;
 import org.jboss.tools.seam.ui.ISeamHelpContextIds;
-import org.jboss.tools.seam.ui.SeamUIMessages;
 
 /**
  * Seam Generate Entities Wizard.
@@ -70,7 +70,7 @@
 
 	public SeamGenerateEntitiesWizard() {
 		super(GENERATE_SEAM_ENTITIES);
-		setWindowTitle(SeamUIMessages.GENERATE_SEAM_ENTITIES_WIZARD_TITLE);
+		setWindowTitle(SeamCoreMessages.GENERATE_SEAM_ENTITIES_WIZARD_TITLE);
 		setDefaultPageImageDescriptor(ImageDescriptor.createFromFile(SeamGenerateEntitiesWizard.class, "SeamWebProjectWizBan.png"));	
 		addPage(page1);
 		addPage(page2);
@@ -81,7 +81,7 @@
 		return page1.isPageComplete();
 	}
 	
-	public static final IUndoableOperation GENERATE_SEAM_ENTITIES = new SeamBaseOperation(SeamUIMessages.SEAM_GENERATE_ENTITIES_WIZARD_ACTION_CREATING_OPERATION) {
+	public static final IUndoableOperation GENERATE_SEAM_ENTITIES = new SeamBaseOperation(SeamCoreMessages.SEAM_GENERATE_ENTITIES_WIZARD_ACTION_CREATING_OPERATION) {
 
 		/*
 		 * (non-Javadoc)
@@ -144,7 +144,7 @@
 				}
 				if(seamRt == null) {
 					throw new CoreException(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, 
-							NLS.bind(SeamUIMessages.SEAM_GENERATE_ENTITIES_WIZARD_CAN_NOT_FIND_SEAM_RUNTIME, project.getName())));
+							NLS.bind(SeamCoreMessages.SEAM_GENERATE_ENTITIES_WIZARD_CAN_NOT_FIND_SEAM_RUNTIME, project.getName())));
 				}
 				String seamTemplatesRoot = seamRt.getTemplatesDir();
 
@@ -208,7 +208,7 @@
 				hbmtemplateAttributes.put("template_name", "view/list.xhtml.ftl"); //$NON-NLS-1$ //$NON-NLS-2$
 				hbmtemplateAttributes.put("outputdir", seamProjectsSet.getViewsFolder().getFullPath().toString()); //$NON-NLS-1$
 				hbmtemplateAttributes.put("for_each", "entity");				 //$NON-NLS-1$ //$NON-NLS-2$
-				hbmtemplateAttributes.put("hibernatetool.util.toolclass",SeamUIMessages.SEAM_GENERATE_ENTITIES_WIZARD_54);	 //$NON-NLS-1$
+				hbmtemplateAttributes.put("hibernatetool.util.toolclass",SeamCoreMessages.SEAM_GENERATE_ENTITIES_WIZARD_54);	 //$NON-NLS-1$
 				wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + ".hbmtemplate1.properties", hbmtemplateAttributes); //$NON-NLS-1$
 
 //				<hbmtemplate filepattern="{class-name}.xhtml"
@@ -352,7 +352,7 @@
 
 				WebUtils.changeTimeStamp(project);
 			} catch (CoreException e) {
-				SeamCorePlugin.getDefault().showError(SeamUIMessages.SEAM_GENERATE_ENTITIES_WIZARD_CAN_NOT_GENERATE_SEAM_ENTITIES, e);
+				SeamCorePlugin.getDefault().showError(SeamCoreMessages.SEAM_GENERATE_ENTITIES_WIZARD_CAN_NOT_GENERATE_SEAM_ENTITIES, e);
 			}
 			return Status.OK_STATUS;
 		}
@@ -363,7 +363,7 @@
 		 */
 		@Override
 		public List<FileMapping> getFileMappings(Map<String, Object> vars) {
-//			throw new UnsupportedOperationException(SeamUIMessages.SEAM_GENERATE_ENTITIES_WIZARD_THIS_METHOD_IS_NOT_RELEVANT_IN_GENERATING_SEAM_ENTITIES);
+//			throw new UnsupportedOperationException(SeamCoreMessages.SEAM_GENERATE_ENTITIES_WIZARD_THIS_METHOD_IS_NOT_RELEVANT_IN_GENERATING_SEAM_ENTITIES);
 			// Return empty list; 
 			return new ArrayList<FileMapping>();
 		}
Index: src/org/jboss/tools/seam/ui/wizard/SeamEntityWizard.java
===================================================================
--- src/org/jboss/tools/seam/ui/wizard/SeamEntityWizard.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/wizard/SeamEntityWizard.java	(working copy)
@@ -22,9 +22,9 @@
 import org.eclipse.ui.PlatformUI;
 import org.jboss.tools.common.ui.widget.editor.INamedElement;
 import org.jboss.tools.seam.core.SeamProjectsSet;
+import org.jboss.tools.seam.core.SeamCoreMessages;
 import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties;
 import org.jboss.tools.seam.ui.ISeamHelpContextIds;
-import org.jboss.tools.seam.ui.SeamUIMessages;
 
 /**
  * @author eskimo
@@ -42,7 +42,7 @@
 	 */
 	public SeamEntityWizard() {
 		super(CREATE_SEAM_ENTITY);
-		setWindowTitle(SeamUIMessages.SEAM_ENTITY_WIZARD_NEW_SEAM_ENTITY);
+		setWindowTitle(SeamCoreMessages.SEAM_ENTITY_WIZARD_NEW_SEAM_ENTITY);
 		setDefaultPageImageDescriptor(ImageDescriptor.createFromFile(SeamEntityWizard.class, "SeamWebProjectWizBan.png"));
 	}
 
@@ -75,7 +75,7 @@
 			 * @param label
 			 */
 			public SeamEntityCreateOperation() {
-				super((SeamUIMessages.SEAM_ENTITY_WIZARD_ENTITY_CREATING_OPERATION));
+				super((SeamCoreMessages.SEAM_ENTITY_WIZARD_ENTITY_CREATING_OPERATION));
 			}
 
 			@Override
Index: src/org/jboss/tools/seam/ui/wizard/CreateSeamWebProjectAction.java
===================================================================
--- src/org/jboss/tools/seam/ui/wizard/CreateSeamWebProjectAction.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/wizard/CreateSeamWebProjectAction.java	(working copy)
@@ -20,13 +20,13 @@
 import org.jboss.tools.common.model.ui.ModelUIImages;
 import org.jboss.tools.common.model.ui.ModelUIPlugin;
 import org.jboss.tools.common.model.ui.util.ExtensionPointUtils;
+import org.jboss.tools.seam.core.SeamCoreMessages;
 import org.jboss.tools.seam.ui.SeamGuiPlugin;
-import org.jboss.tools.seam.ui.SeamUIMessages;
 
 public class CreateSeamWebProjectAction extends Action implements IWorkbenchWindowActionDelegate {
 	public CreateSeamWebProjectAction() {
-		super(SeamUIMessages.CREATE_SEAM_WEB_PROJECTACTION_CREATE_SEAM_PROJECT);
-		setToolTipText(SeamUIMessages.CREATE_SEAM_WEB_PROJECTACTION_CREATE_SEAM_PROJECT);
+		super(SeamCoreMessages.CREATE_SEAM_WEB_PROJECTACTION_CREATE_SEAM_PROJECT);
+		setToolTipText(SeamCoreMessages.CREATE_SEAM_WEB_PROJECTACTION_CREATE_SEAM_PROJECT);
 		ModelUIImages.setImageDescriptors(this, ModelUIImages.ACT_CREATE_PROJECT);
 	}
 
Index: src/org/jboss/tools/seam/ui/wizard/SeamProjectSelectionDialog.java
===================================================================
--- src/org/jboss/tools/seam/ui/wizard/SeamProjectSelectionDialog.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/wizard/SeamProjectSelectionDialog.java	(working copy)
@@ -34,8 +34,8 @@
 import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
 import org.jboss.tools.seam.core.ISeamProject;
 import org.jboss.tools.seam.core.SeamCorePlugin;
+import org.jboss.tools.seam.core.SeamCoreMessages;
 import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties;
-import org.jboss.tools.seam.ui.SeamUIMessages;
 
 /**
  * @author eskimo
@@ -52,8 +52,8 @@
 	public SeamProjectSelectionDialog(Shell parent, final boolean allowAllProjects) {
 		super(parent);
 		this.allowAllProjects = allowAllProjects;
-		setTitle(SeamUIMessages.SEAM_PROJECT_SELECTION_DIALOG_SEAM_WEB_PROJECT);
-		setMessage(SeamUIMessages.SEAM_PROJECT_SELECTION_DIALOG_SELECT_SEAM_WEB_PROJECT);
+		setTitle(SeamCoreMessages.SEAM_PROJECT_SELECTION_DIALOG_SEAM_WEB_PROJECT);
+		setMessage(SeamCoreMessages.SEAM_PROJECT_SELECTION_DIALOG_SELECT_SEAM_WEB_PROJECT);
 		setLabelProvider(new WorkbenchLabelProvider());
 		setInput(new Object());
 		setContentProvider(new IStructuredContentProvider() {
@@ -112,7 +112,7 @@
     	Composite parent = (Composite) super.createDialogArea(container);
     	if(!allowAllProjects) {
     		check = new Button(parent, SWT.CHECK);
-    		check.setText(SeamUIMessages.SEAM_PROJECT_SELECTION_DIALOG_SHOW_ALL_PROJECTS);
+    		check.setText(SeamCoreMessages.SEAM_PROJECT_SELECTION_DIALOG_SHOW_ALL_PROJECTS);
     		check.setSelection(false);
     		check.addSelectionListener(new SelectionListener() {
 				public void widgetDefaultSelected(SelectionEvent e) {
Index: src/org/jboss/tools/seam/ui/wizard/RenameComponentWizard.java
===================================================================
--- src/org/jboss/tools/seam/ui/wizard/RenameComponentWizard.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/wizard/RenameComponentWizard.java	(working copy)
@@ -33,9 +33,9 @@
 import org.jboss.tools.seam.core.ISeamComponent;
 import org.jboss.tools.seam.core.ISeamProject;
 import org.jboss.tools.seam.core.SeamCorePlugin;
+import org.jboss.tools.seam.core.SeamCoreMessages;
+import org.jboss.tools.seam.internal.core.project.facet.SeamValidatorFactory;
 import org.jboss.tools.seam.internal.core.refactoring.RenameComponentProcessor;
-import org.jboss.tools.seam.ui.SeamUIMessages;
-import org.jboss.tools.seam.ui.internal.project.facet.SeamValidatorFactory;
 
 /**
  * @author Alexey Kazakov, Daniel Azarov
@@ -80,7 +80,7 @@
 	        layout.numColumns = 2;
 	        
 	        String defaultName = component.getName();
-	        editor = IFieldEditorFactory.INSTANCE.createTextEditor(componentName, SeamUIMessages.SEAM_WIZARD_FACTORY_SEAM_COMPONENT_NAME, defaultName);
+	        editor = IFieldEditorFactory.INSTANCE.createTextEditor(componentName, SeamCoreMessages.SEAM_WIZARD_FACTORY_SEAM_COMPONENT_NAME, defaultName);
 	        editor.doFillIntoGrid(container);
 	        
 	        ((CompositeEditor)editor).addPropertyChangeListener(new PropertyChangeListener(){
@@ -95,7 +95,7 @@
 		protected final void validatePage() {
 			Map<String, IStatus> errors = SeamValidatorFactory.SEAM_COMPONENT_NAME_VALIDATOR.validate(editor.getValueAsString(), seamProject);
 			if(!errors.isEmpty()) {
-				setErrorMessage(NLS.bind(errors.get(IValidator.DEFAULT_ERROR).getMessage(),SeamUIMessages.SEAM_BASE_WIZARD_PAGE_SEAM_COMPONENTS));
+				setErrorMessage(NLS.bind(errors.get(IValidator.DEFAULT_ERROR).getMessage(),SeamCoreMessages.SEAM_BASE_WIZARD_PAGE_SEAM_COMPONENTS));
 				setPageComplete(false);
 				return;
 			}
Index: src/org/jboss/tools/seam/ui/wizard/SeamWizardCustomizationPage.java
===================================================================
--- src/org/jboss/tools/seam/ui/wizard/SeamWizardCustomizationPage.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/wizard/SeamWizardCustomizationPage.java	(working copy)
@@ -18,7 +18,7 @@
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.swt.widgets.Composite;
-import org.jboss.tools.seam.ui.internal.project.facet.SeamValidatorFactory;
+import org.jboss.tools.seam.internal.core.project.facet.SeamValidatorFactory;
 
 /**
  * @author Alexey Kazakov
Index: src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java
===================================================================
--- src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java	(working copy)
@@ -79,6 +79,7 @@
 import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
 import org.jboss.tools.jst.web.server.RegistrationHelper;
 import org.jboss.tools.seam.core.SeamCorePlugin;
+import org.jboss.tools.seam.core.SeamCoreMessages;
 import org.jboss.tools.seam.core.project.facet.SeamProjectPreferences;
 import org.jboss.tools.seam.core.project.facet.SeamRuntime;
 import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager;
@@ -90,7 +91,6 @@
 import org.jboss.tools.seam.internal.core.project.facet.SeamFacetProjectCreationDataModelProvider;
 import org.jboss.tools.seam.ui.ISeamHelpContextIds;
 import org.jboss.tools.seam.ui.SeamGuiPlugin;
-import org.jboss.tools.seam.ui.SeamUIMessages;
 import org.jboss.tools.seam.ui.internal.project.facet.SeamInstallWizardPage;
 
 /**
@@ -113,12 +113,12 @@
 
 	public SeamProjectWizard() {
 		super();
-		setWindowTitle(SeamUIMessages.SEAM_PROJECT_WIZARD_NEW_SEAM_PROJECT);
+		setWindowTitle(SeamCoreMessages.SEAM_PROJECT_WIZARD_NEW_SEAM_PROJECT);
 	}
 
 	public SeamProjectWizard(IDataModel model) {
 		super(model);
-		setWindowTitle(SeamUIMessages.SEAM_PROJECT_WIZARD_NEW_SEAM_PROJECT);
+		setWindowTitle(SeamCoreMessages.SEAM_PROJECT_WIZARD_NEW_SEAM_PROJECT);
 	}
 
 	protected IDataModel createDataModel() {
@@ -130,8 +130,8 @@
 		firstPage = new SeamWebProjectFirstPage(model, "first.page"); //$NON-NLS-1$
 
 		firstPage.setImageDescriptor(ImageDescriptor.createFromFile(SeamFormWizard.class, "SeamWebProjectWizBan.png"));  //$NON-NLS-1$
-		firstPage.setTitle(SeamUIMessages.SEAM_PROJECT_WIZARD_SEAM_WEB_PROJECT);
-		firstPage.setDescription(SeamUIMessages.SEAM_PROJECT_WIZARD_CREATE_STANDALONE_SEAM_WEB_PROJECT);
+		firstPage.setTitle(SeamCoreMessages.SEAM_PROJECT_WIZARD_SEAM_WEB_PROJECT);
+		firstPage.setDescription(SeamCoreMessages.SEAM_PROJECT_WIZARD_CREATE_STANDALONE_SEAM_WEB_PROJECT);
 		return firstPage;
 	}
 
@@ -189,7 +189,7 @@
 				}
 			}
 		}, IFacetedProjectEvent.Type.PROJECT_NAME_CHANGED);
-		Control control = findGroupByText(getShell(), SeamUIMessages.SEAM_PROJECT_WIZARD_EAR_MEMBERSHIP);
+		Control control = findGroupByText(getShell(), SeamCoreMessages.SEAM_PROJECT_WIZARD_EAR_MEMBERSHIP);
 		if (control != null)
 			control.setVisible(false);
 		firstPage.isPageComplete();
@@ -328,7 +328,7 @@
 	 */
 	@Override
 	public boolean performFinish() {
-		SeamInstallWizardPage page = (SeamInstallWizardPage)getPage(SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_SEAM_FACET);
+		SeamInstallWizardPage page = (SeamInstallWizardPage)getPage(SeamCoreMessages.SEAM_INSTALL_WIZARD_PAGE_SEAM_FACET);
 		page.finishPressed();
 		IDataModel model = page.getConfig();
 		model.setProperty(ISeamFacetDataModelProperties.CREATE_EAR_PROJECTS, Boolean.TRUE);		
@@ -360,7 +360,7 @@
     	super.performFinish(monitor);
 
 		IProject warProject = this.getFacetedProject().getProject();
-		SeamInstallWizardPage page = (SeamInstallWizardPage)getPage(SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_SEAM_FACET);
+		SeamInstallWizardPage page = (SeamInstallWizardPage)getPage(SeamCoreMessages.SEAM_INSTALL_WIZARD_PAGE_SEAM_FACET);
 		IDataModel model = page.getConfig();
 
 		boolean deployAsEar = ISeamFacetDataModelProperties.DEPLOY_AS_EAR.equals(model.getProperty(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS));
@@ -430,7 +430,7 @@
 				String[] driverJars = (String[]) model.getProperty(ISeamFacetDataModelProperties.JDBC_DRIVER_JAR_PATH);
 				if(driverJars!=null) {
 					String configFolder = jbs.getConfigDirectory();
-					if(model.getStringProperty(ISeamFacetDataModelProperties.SEAM_LIBRARY_PROVIDER).equals(SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_COPY_LIBRARIES)){
+					if(model.getStringProperty(ISeamFacetDataModelProperties.SEAM_LIBRARY_PROVIDER).equals(SeamCoreMessages.SEAM_INSTALL_WIZARD_PAGE_COPY_LIBRARIES)){
 						AntCopyUtils.copyFiles(driverJars, new File(configFolder, "lib"), false);
 					}
 				}
@@ -524,14 +524,14 @@
 
 		protected void createSeamServerTargetComposite(Composite parent) {
 	        Group group = new Group(parent, SWT.NONE);
-	        group.setText(SeamUIMessages.SEAM_TARGET_SERVER);
+	        group.setText(SeamCoreMessages.SEAM_TARGET_SERVER);
 	        group.setLayoutData(gdhfill());
 	        group.setLayout(new GridLayout(2, false));
 
 	        matchedServerTargetCombo = new Combo(group, SWT.BORDER | SWT.READ_ONLY);
 			matchedServerTargetCombo.setLayoutData(gdhfill());
 			Button newMatchedServerTargetButton = new Button(group, SWT.NONE);
-			newMatchedServerTargetButton.setText(SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_NEW);
+			newMatchedServerTargetButton.setText(SeamCoreMessages.SEAM_INSTALL_WIZARD_PAGE_NEW);
 			newMatchedServerTargetButton.addSelectionListener(new SelectionAdapter() {
 				public void widgetSelected(SelectionEvent e) {
 					if (!SeamWebProjectFirstPage.this.internalLaunchNewServerWizard(getShell(), model)) {
@@ -575,13 +575,13 @@
 	        	IProjectFacetVersion seamFacet = fProject.getProjectFacetVersion(pFacet);
 	        	if(seamFacet==null) {
 	        		if(pageComplete) {
-		        		this.setErrorMessage(SeamUIMessages.SEAM_PROJECT_WIZARD_PAGE1_SEAM_FACET_MUST_BE_SPECIFIED);
+		        		this.setErrorMessage(SeamCoreMessages.SEAM_PROJECT_WIZARD_PAGE1_SEAM_FACET_MUST_BE_SPECIFIED);
 		        		return false;
 	        		}
 	        	} else {
 	        		if(pageComplete) {
 	        			this.setErrorMessage(null);
-	        		} else if(SeamUIMessages.SEAM_PROJECT_WIZARD_PAGE1_SEAM_FACET_MUST_BE_SPECIFIED.equals(getErrorMessage())) {
+	        		} else if(SeamCoreMessages.SEAM_PROJECT_WIZARD_PAGE1_SEAM_FACET_MUST_BE_SPECIFIED.equals(getErrorMessage())) {
 	        			this.setErrorMessage(null);
 	        		}
 	        	}
Index: src/org/jboss/tools/seam/ui/wizard/RenameSeamContextVariableWizard.java
===================================================================
--- src/org/jboss/tools/seam/ui/wizard/RenameSeamContextVariableWizard.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/wizard/RenameSeamContextVariableWizard.java	(working copy)
@@ -32,10 +32,10 @@
 import org.jboss.tools.common.ui.widget.editor.IFieldEditorFactory;
 import org.jboss.tools.seam.core.ISeamProject;
 import org.jboss.tools.seam.core.SeamCorePlugin;
+import org.jboss.tools.seam.core.SeamCoreMessages;
+import org.jboss.tools.seam.internal.core.project.facet.SeamValidatorFactory;
 import org.jboss.tools.seam.internal.core.refactoring.RenameSeamContextVariableProcessor;
 import org.jboss.tools.seam.internal.core.refactoring.SeamRenameProcessor;
-import org.jboss.tools.seam.ui.SeamUIMessages;
-import org.jboss.tools.seam.ui.internal.project.facet.SeamValidatorFactory;
 
 /**
  * @author Daniel Azarov
@@ -77,7 +77,7 @@
 	        layout.numColumns = 2;
 	        
 	        String defaultName = processor.getOldName();
-	        editor = IFieldEditorFactory.INSTANCE.createTextEditor(componentName, SeamUIMessages.SEAM_WIZARD_FACTORY_SEAM_COMPONENT_NAME, defaultName);
+	        editor = IFieldEditorFactory.INSTANCE.createTextEditor(componentName, SeamCoreMessages.SEAM_WIZARD_FACTORY_SEAM_COMPONENT_NAME, defaultName);
 	        editor.doFillIntoGrid(container);
 	        
 	        ((CompositeEditor)editor).addPropertyChangeListener(new PropertyChangeListener(){
@@ -92,7 +92,7 @@
 		protected final void validatePage() {
 			Map<String, IStatus> errors = SeamValidatorFactory.SEAM_COMPONENT_NAME_VALIDATOR.validate(editor.getValueAsString(), seamProject);
 			if(!errors.isEmpty()) {
-				setErrorMessage(NLS.bind(errors.get(IValidator.DEFAULT_ERROR).getMessage(),SeamUIMessages.SEAM_BASE_WIZARD_PAGE_SEAM_COMPONENTS));
+				setErrorMessage(NLS.bind(errors.get(IValidator.DEFAULT_ERROR).getMessage(),SeamCoreMessages.SEAM_BASE_WIZARD_PAGE_SEAM_COMPONENTS));
 				setPageComplete(false);
 				return;
 			}
Index: src/org/jboss/tools/seam/ui/widget/editor/SeamRuntimeListFieldEditor.java
===================================================================
--- src/org/jboss/tools/seam/ui/widget/editor/SeamRuntimeListFieldEditor.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/widget/editor/SeamRuntimeListFieldEditor.java	(working copy)
@@ -64,13 +64,13 @@
 import org.jboss.tools.common.ui.widget.editor.IFieldEditorFactory;
 import org.jboss.tools.seam.core.ISeamProject;
 import org.jboss.tools.seam.core.SeamCorePlugin;
+import org.jboss.tools.seam.core.SeamCoreMessages;
 import org.jboss.tools.seam.core.SeamUtil;
 import org.jboss.tools.seam.core.project.facet.SeamRuntime;
 import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager;
 import org.jboss.tools.seam.core.project.facet.SeamVersion;
 import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties;
-import org.jboss.tools.seam.ui.SeamUIMessages;
-import org.jboss.tools.seam.ui.internal.project.facet.SeamValidatorFactory;
+import org.jboss.tools.seam.internal.core.project.facet.SeamValidatorFactory;
 import org.jboss.tools.seam.ui.wizard.SeamFormWizard;
 
 /**
@@ -243,15 +243,15 @@
 
 		TableColumn tc2 = new TableColumn(tableView.getTable(), SWT.LEFT);
 		tc2.setWidth(TC_NAME_WIDTH);
-		tc2.setText(SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_NAME);
+		tc2.setText(SeamCoreMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_NAME);
 
 		TableColumn tc3 = new TableColumn(tableView.getTable(), SWT.LEFT);
 		tc3.setWidth(TC_VERSION_WIDTH);
-		tc3.setText(SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_VERSION);
+		tc3.setText(SeamCoreMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_VERSION);
 
 		TableColumn tc4 = new TableColumn(tableView.getTable(), SWT.LEFT);
 		tc4.setWidth(TC_PATH_WIDTH);
-		tc4.setText(SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_PATH);
+		tc4.setText(SeamCoreMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_PATH);
 
 		tableView.setContentProvider(new IStructuredContentProvider() {
 
@@ -260,7 +260,7 @@
 					return ((List<SeamRuntime>) inputElement).toArray();
 				} else {
 					throw new IllegalArgumentException(
-							SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_INPUTELEMENT_MUST_BE_LIST);
+							SeamCoreMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_INPUTELEMENT_MUST_BE_LIST);
 				}
 			}
 
@@ -423,11 +423,11 @@
 		Assert
 				.isTrue(
 						parent instanceof Composite,
-						SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_PARENT_CONTROL_SHOULD_BE_COMPOSITE);
+						SeamCoreMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_PARENT_CONTROL_SHOULD_BE_COMPOSITE);
 		Assert
 				.isTrue(
 						((Composite) parent).getLayout() instanceof GridLayout,
-						SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_EDITOR_SUPPORTS_ONLY_GRID_LAYOUT);
+						SeamCoreMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_EDITOR_SUPPORTS_ONLY_GRID_LAYOUT);
 		Composite aComposite = (Composite) parent;
 		Control[] controls = (Control[]) getEditorControls(aComposite);
 		GridLayout gl = (GridLayout) ((Composite) parent).getLayout();
@@ -458,7 +458,7 @@
 		List<SeamRuntime> value = null;
 
 		IFieldEditor name = IFieldEditorFactory.INSTANCE.createTextEditor(
-				SRT_NAME, SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_NAME2,
+				SRT_NAME, SeamCoreMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_NAME2,
 				""); //$NON-NLS-1$ 
 
 		IFieldEditor version = null;
@@ -466,7 +466,7 @@
 		IFieldEditor homeDir = IFieldEditorFactory.INSTANCE
 				.createBrowseFolderEditor(
 						SRT_HOMEDIR,
-						SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_HOME_FOLDER,
+						SeamCoreMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_HOME_FOLDER,
 						""); //$NON-NLS-1$ 
 
 		SeamRuntime current = null;
@@ -495,11 +495,11 @@
 		public SeamRuntimeWizardPage(List<SeamRuntime> editedList,
 				List<SeamVersion> validSeamVersions) {
 			super(
-					SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_NEW_SEAM_RUNTIME);
+					SeamCoreMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_NEW_SEAM_RUNTIME);
 			if (validSeamVersions == null) {
 				this.version = IFieldEditorFactory.INSTANCE.createComboEditor(
 						SRT_VERSION,
-						SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_VERSION2,
+						SeamCoreMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_VERSION2,
 						Arrays.asList(new String[] {
 								SeamVersion.SEAM_1_2.toString(),
 								SeamVersion.SEAM_2_0.toString(),
@@ -516,14 +516,14 @@
 			} else {
 				this.version = IFieldEditorFactory.INSTANCE.createComboEditor(
 						SRT_VERSION,
-						SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_VERSION2,
+						SeamCoreMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_VERSION2,
 						validSeamVersions, SeamVersion.SEAM_1_2.toString(),
 						false);
 				this.validSeamVersions = validSeamVersions;
 			}
 
-			setMessage(SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_CREATE_A_SEAM_RUNTIME);
-			setTitle(SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_SEAM_RUNTIME);
+			setMessage(SeamCoreMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_CREATE_A_SEAM_RUNTIME);
+			setTitle(SeamCoreMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_SEAM_RUNTIME);
 			setImageDescriptor(ImageDescriptor.createFromFile(
 					SeamFormWizard.class, "SeamWebProjectWizBan.png")); //$NON-NLS-1$
 			value = editedList;
@@ -587,7 +587,7 @@
 						|| "".equals(name.getValueAsString().trim())) { //$NON-NLS-1$
 					String seamVersion = SeamUtil.getSeamVersionFromManifest(homeDir.getValueAsString());
 					if (seamVersion == null) {
-						setErrorMessage(SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_CANNOT_FIND_JBOSS_SEAM_JAR);
+						setErrorMessage(SeamCoreMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_CANNOT_FIND_JBOSS_SEAM_JAR);
 						setPageComplete(false);
 						return;
 					} else {
@@ -611,14 +611,14 @@
 
 			if (name.getValueAsString() == null || "".equals(//$NON-NLS-1$
 					name.getValueAsString().toString().trim())) {
-				setErrorMessage(SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_NAME_CANNOT_BE_EMPTY);
+				setErrorMessage(SeamCoreMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_NAME_CANNOT_BE_EMPTY);
 				setPageComplete(false);
 				return;
 			}
 
 			if (!name.getValueAsString().matches(
 					"[a-zA-Z_][a-zA-Z0-9_\\-\\. ]*")) { //$NON-NLS-1$
-				setErrorMessage(SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_RUNTIME_NAME_IS_NOT_CORRECT);
+				setErrorMessage(SeamCoreMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_RUNTIME_NAME_IS_NOT_CORRECT);
 				setPageComplete(false);
 				return;
 			}
@@ -627,7 +627,7 @@
 					continue;
 				}
 				if (rt.getName().equals(name.getValueAsString())) {
-					setErrorMessage(NLS.bind(SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_RUNTIME_ALREADY_EXISTS,
+					setErrorMessage(NLS.bind(SeamCoreMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_RUNTIME_ALREADY_EXISTS,
 							name.getValueAsString()));
 					setPageComplete(false);
 					return;
@@ -647,18 +647,18 @@
 
 			if (homeDir.getValueAsString() == null
 					|| "".equals(homeDir.getValueAsString().trim())) { //$NON-NLS-1$
-				setErrorMessage(SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_PATH_TO_SEAM_HOME_DIRECTORY_CANNOT_BE_EMPTY);
+				setErrorMessage(SeamCoreMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_PATH_TO_SEAM_HOME_DIRECTORY_CANNOT_BE_EMPTY);
 				setPageComplete(false);
 				return;
 			}
 
 			String seamVersion = SeamUtil.getSeamVersionFromManifest(homeDir.getValueAsString());
 			if (seamVersion == null) {
-				setErrorMessage(SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_CANNOT_FIND_JBOSS_SEAM_JAR);
+				setErrorMessage(SeamCoreMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_CANNOT_FIND_JBOSS_SEAM_JAR);
 				setPageComplete(false);
 				return;
 			} else if ("".equals(seamVersion)) { //$NON-NLS-1$
-				setMessage(SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_CANNOT_OBTAIN_SEAM_VERSION_NUMBER,
+				setMessage(SeamCoreMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_CANNOT_OBTAIN_SEAM_VERSION_NUMBER,
 						IMessageProvider.WARNING);
 				setPageComplete(true);
 				return;
@@ -666,10 +666,10 @@
 				String trimmedVersion = SeamUtil.trimSeamVersion(version.getValueAsString(), 1);
 				String trimmedSeamVersion = SeamUtil.trimSeamVersion(seamVersion, 1);
 				if(SeamVersion.findMatchingVersion(seamVersion)==null && SeamUtil.areSeamVersionsMatched(trimmedVersion, trimmedSeamVersion)) {
-					setMessage(NLS.bind(SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_THE_SELECTED_SEAM_APPEARS_TO_BE_OF_INCOMATIBLE_VERSION,
+					setMessage(NLS.bind(SeamCoreMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_THE_SELECTED_SEAM_APPEARS_TO_BE_OF_INCOMATIBLE_VERSION,
 							seamVersion), IMessageProvider.WARNING);
 				} else {
-					setErrorMessage(NLS.bind(SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_THE_SELECTED_SEAM_APPEARS_TO_BE_OF_INCOMATIBLE_VERSION,
+					setErrorMessage(NLS.bind(SeamCoreMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_THE_SELECTED_SEAM_APPEARS_TO_BE_OF_INCOMATIBLE_VERSION,
 						seamVersion));
 					setPageComplete(false);
 					return;
@@ -737,7 +737,7 @@
 		public SeamRuntimeNewWizard(List<SeamRuntime> exist,
 				List<SeamRuntime> added, List<SeamVersion> validSeamVersions) {
 			super();
-			setWindowTitle(SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_NEW_SEAM_RUNTIME);
+			setWindowTitle(SeamCoreMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_NEW_SEAM_RUNTIME);
 			page1 = new SeamRuntimeWizardPage(exist, validSeamVersions);
 			addPage(page1);
 			this.value = exist;
@@ -801,12 +801,12 @@
 				SeamRuntime source, List<SeamRuntime> added,
 				Map<SeamRuntime, SeamRuntime> changed) {
 			super();
-			setWindowTitle(SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_EDIT_SEAM_RUNTIME);
+			setWindowTitle(SeamCoreMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_EDIT_SEAM_RUNTIME);
 			page1 = new SeamRuntimeWizardPage(existing);
 			page1
-					.setMessage(SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_MODIFY_SEAM_RUNTIME);
+					.setMessage(SeamCoreMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_MODIFY_SEAM_RUNTIME);
 			page1
-					.setTitle(SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_EDIT_SEAM_RUNTIME);
+					.setTitle(SeamCoreMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_EDIT_SEAM_RUNTIME);
 			addPage(page1);
 			this.value = existing;
 			this.added = added;
@@ -1032,7 +1032,7 @@
 		 * Constructior create Add action with default name
 		 */
 		public AddAction() {
-			super(SeamUIMessages.SeamRuntimeListFieldEditor_ActionAdd);
+			super(SeamCoreMessages.SeamRuntimeListFieldEditor_ActionAdd);
 			// This action is always available
 			setEnabled(true);
 		}
@@ -1093,7 +1093,7 @@
 		 * @param text
 		 */
 		public EditAction() {
-			super(SeamUIMessages.SeamRuntimeListFieldEditor_ActionEdit);
+			super(SeamCoreMessages.SeamRuntimeListFieldEditor_ActionEdit);
 		}
 
 		/**
@@ -1151,7 +1151,7 @@
 		 * Create DeleteAction action with default name
 		 */
 		public RemoveAction() {
-			super(SeamUIMessages.SeamRuntimeListFieldEditor_ActionRemove);
+			super(SeamCoreMessages.SeamRuntimeListFieldEditor_ActionRemove);
 		}
 
 		@Override
@@ -1176,10 +1176,10 @@
 
 		private void removeRuntime(SeamRuntime r) {
 			boolean used = isRuntimeUsed(r.getName());
-			String title = SeamUIMessages.RUNTIME_DELETE_CONFIRM_TITLE;
+			String title = SeamCoreMessages.RUNTIME_DELETE_CONFIRM_TITLE;
 			String message = (used) ? NLS.bind(
-					SeamUIMessages.RUNTIME_DELETE_USED_CONFIRM, r.getName())
-					: NLS.bind(SeamUIMessages.RUNTIME_DELETE_NOT_USED_CONFIRM,
+					SeamCoreMessages.RUNTIME_DELETE_USED_CONFIRM, r.getName())
+					: NLS.bind(SeamCoreMessages.RUNTIME_DELETE_NOT_USED_CONFIRM,
 							r.getName());
 			boolean b = MessageDialog.openConfirm(tableView.getControl()
 					.getShell(), title, message);
Index: src/org/jboss/tools/seam/ui/handlers/OpenSeamComponentHandler.java
===================================================================
--- src/org/jboss/tools/seam/ui/handlers/OpenSeamComponentHandler.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/handlers/OpenSeamComponentHandler.java	(working copy)
@@ -20,9 +20,9 @@
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.dialogs.SelectionDialog;
 import org.jboss.tools.seam.core.ISeamComponentDeclaration;
+import org.jboss.tools.seam.core.SeamCoreMessages;
 import org.jboss.tools.seam.internal.core.SeamComponentDeclaration;
 import org.jboss.tools.seam.internal.core.SeamJavaComponentDeclaration;
-import org.jboss.tools.seam.ui.SeamUIMessages;
 import org.jboss.tools.seam.ui.wizard.OpenSeamComponentDialog;
 import org.jboss.tools.seam.ui.wizard.OpenSeamComponentDialog.SeamComponentWrapper;
 /**
@@ -37,8 +37,8 @@
 		
 		dialog= new OpenSeamComponentDialog(parent);
 		
-		dialog.setTitle(SeamUIMessages.OPEN_SEAM_COMPONENT_ACTION_ACTION_NAME);
-		dialog.setMessage(SeamUIMessages.OPEN_SEAM_COMPONENT_ACTION_MESSAGE);
+		dialog.setTitle(SeamCoreMessages.OPEN_SEAM_COMPONENT_ACTION_ACTION_NAME);
+		dialog.setMessage(SeamCoreMessages.OPEN_SEAM_COMPONENT_ACTION_MESSAGE);
 
 		int result= dialog.open();
 		if (result != IDialogConstants.OK_ID)
Index: src/org/jboss/tools/seam/ui/SeamUIMessages.java
===================================================================
--- src/org/jboss/tools/seam/ui/SeamUIMessages.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/SeamUIMessages.java	(working copy)
@@ -1,420 +0,0 @@
-package org.jboss.tools.seam.ui;
-
-import java.util.Locale;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.osgi.util.NLS;
-
-public class SeamUIMessages extends NLS {
-	private static final String BUNDLE_NAME = "org.jboss.tools.seam.ui.messages";//$NON-NLS-1$
-
-	private static ResourceBundle fResourceBundle; 
-
-	public static String ABSTRACT_SEAM_CONTENT_PROVIDER_SEAM_PROJECT_CHANGE_EVENT_OCCURS_BUT_NO_SORCE_OF_PROJECT_PROVIDED;
-
-	public static String CREATE_NEW_SEAM_PROJECT;
-
-	public static String CREATE_PROJECT_ACTION_UNABLE_TO_CREATE_WIZARD;
-
-	public static String CREATE_SEAM_WEB_PROJECTACTION_CREATE_SEAM_PROJECT;
-	public static String GENERATE_SEAM_ENTITIES_WIZARD_TITLE;
-	public static String GENERATE_SEAM_ENTITIES_WIZARD_PAGE_MESSAGE;
-	public static String GENERATE_SEAM_ENTITIES_WIZARD_HIBERNATE_CONFIGURATION_LABEL;
-	public static String GENERATE_SEAM_ENTITIES_WIZARD_HIBERNATE_CONFIGURATION_MESSAGE;
-	public static String GENERATE_SEAM_ENTITIES_WIZARD_HIBERNATE_CONFIGURATION_ERROR;
-	public static String GENERATE_SEAM_ENTITIES_WIZARD_GROUP_LABEL;
-	public static String GENERATE_SEAM_ENTITIES_WIZARD_REVERSE_ENGINEER_LABEL;
-	public static String GENERATE_SEAM_ENTITIES_WIZARD_EXISTING_ENTITIES_LABEL;
-
-	public static String OPEN_SEAM_COMPONENT_ACTION_ACTION_NAME;
-
-	public static String OPEN_SEAM_COMPONENT_ACTION_DESCRIPTION;
-
-	public static String OPEN_SEAM_COMPONENT_ACTION_MESSAGE;
-
-	public static String OPEN_SEAM_COMPONENT_ACTION_TOOL_TIP;
-
-	public static String OPEN_SEAM_COMPONENT_DIALOG_LOADING;
-
-	public static String OPEN_SEAM_COMPONENT_DIALOG_NAME;
-	
-	public static String OPEN_SEAM_COMPONENT_DIALOG_WAIT;
-
-	public static String SEAM_ACTION_WIZARD_ACTION_CREATING_OPERATION;
-
-	public static String SEAM_ACTION_WIZARD_NEW_SEAM_ACTION;
-
-	public static String SEAM_ACTION_WIZARD_PAGE1_SEAM_ACTION;
-
-	public static String SEAM_BASE_WIZARD_OPERATION_IS_NOT_DEFINED_FOR_WIZARD;
-
-	public static String SEAM_BASE_WIZARD_PAGE_LOCAL_CLASS_NAME;
-
-	public static String SEAM_BASE_WIZARD_PAGE_LOCAL_INTERFACE;
-
-	public static String SEAM_BASE_WIZARD_PAGE_POJO_CLASS_NAME;
-
-	public static String SEAM_BASE_WIZARD_PAGE_SEAM_COMPONENTS;
-
-	public static String SEAM_CONVERSATION_WIZARD_CREATE_NEW_CONVERSATION;
-
-	public static String SEAM_CONVERSATION_WIZARD_ENTITY_CREATING_OPERATION;
-
-	public static String SEAM_CONVERSATION_WIZARD_PAGE1_SEAM_CONVERSATION;
-
-	public static String SEAM_ENTITY_WIZARD_ENTITY_CREATING_OPERATION;
-
-	public static String SEAM_ENTITY_WIZARD_NEW_SEAM_ENTITY;
-
-	public static String SEAM_ENTITY_WIZARD_PAGE1_ENTITY_CLASS_NAME;
-
-	public static String SEAM_ENTITY_WIZARD_PAGE1_ENTITY_MASTER_PAGE;
-
-	public static String SEAM_ENTITY_WIZARD_PAGE1_PAGE;
-
-	public static String SEAM_FORM_WIZARD_FORM_CREATING_OPERATION;
-
-	public static String SEAM_FORM_WIZARD_NEW_SEAM_FORM;
-
-	public static String SEAM_FORM_WIZARD_PAGE1_SEAM_FORM;
-
-	public static String SEAM_GENERATE_ENTITIES_WIZARD_54;
-
-	public static String SEAM_GENERATE_ENTITIES_WIZARD_ACTION_CREATING_OPERATION;
-
-	public static String SEAM_GENERATE_ENTITIES_WIZARD_CAN_NOT_FIND_SEAM_RUNTIME;
-
-	public static String SEAM_GENERATE_ENTITIES_WIZARD_CAN_NOT_GENERATE_SEAM_ENTITIES;
-
-	public static String SEAM_INSTALL_WIZARD_PAGE_ADD;
-
-	public static String SEAM_INSTALL_WIZARD_PAGE_CANNOT_USE_SELECTED_DEPLOYMENT6;
-
-	public static String SEAM_INSTALL_WIZARD_PAGE_CODE_GENERATION;
-
-	public static String SEAM_INSTALL_WIZARD_PAGE_CONFIGURE_SEAM_FACET_SETTINGS;
-
-	public static String SEAM_INSTALL_WIZARD_PAGE_CONNECTION_PROFILE;
-
-	public static String SEAM_INSTALL_WIZARD_PAGE_DATABASE;
-
-	public static String SEAM_INSTALL_WIZARD_PAGE_DATABASE_CATALOG_NAME;
-
-	public static String SEAM_INSTALL_WIZARD_PAGE_DATABASE_SCHEMA_NAME;
-
-	public static String SEAM_INSTALL_WIZARD_PAGE_DATABASE_TYPE;
-
-	public static String SEAM_INSTALL_WIZARD_PAGE_DB_TABLES_ALREADY_EXISTS;
-
-	public static String SEAM_INSTALL_WIZARD_PAGE_DEPLOY_AS;
-	
-	public static String SEAM_INSTALL_WIZARD_PAGE_EJB_PROJECT_NAME;
-	
-	public static String SEAM_INSTALL_WIZARD_PAGE_EAR_PROJECT_NAME;
-	
-	public static String SEAM_INSTALL_WIZARD_PAGE_TEST_PROJECT_NAME;
-
-	public static String SEAM_INSTALL_WIZARD_PAGE_EDIT;
-
-	public static String SEAM_INSTALL_WIZARD_PAGE_ENTITY_BEAN_PACKAGE_NAME;
-	
-	public static String SEAM_INSTALL_WIZARD_PAGE_CREATE_TEST_PROJECT;
-
-	public static String SEAM_INSTALL_WIZARD_PAGE_GENERAL;
-
-	public static String SEAM_INSTALL_WIZARD_PAGE_NEW;
-
-	public static String SEAM_INSTALL_WIZARD_PAGE_PACKAGE_NAME_NOT_VALID;
-
-	public static String SEAM_INSTALL_WIZARD_PAGE_RECREATE_DATABASE_TABLES_AND_DATA_ON_DEPLOY;
-
-	public static String SEAM_INSTALL_WIZARD_PAGE_SEAM_FACET;
-
-	public static String SEAM_INSTALL_WIZARD_PAGE_SEAM_RUNTIME;
-
-	public static String SEAM_INSTALL_WIZARD_PAGE_SESSION_BEAN_PACKAGE_NAME;
-
-	public static String SEAM_INSTALL_WIZARD_PAGE_TEST_PACKAGE_NAME;
-	
-	public static String SEAM_INSTALL_WIZARD_PAGE_LIBRARIES;
-	
-	public static String SEAM_INSTALL_WIZARD_PAGE_COPY_LIBRARIES;
-	
-	public static String SEAM_INSTALL_WIZARD_PAGE_CONFIGURE_LATER;
-
-	public static String SEAM_OPEN_ACTION_OPEN;
-
-	public static String SEAM_PROJECT_LABEL_PROVIDER_SEAM_COMPONENTS;
-
-	public static String SEAM_PROJECT_SELECTION_DIALOG_SEAM_WEB_PROJECT;
-	
-	public static String SEAM_PROJECT_SELECTION_DIALOG_SHOW_ALL_PROJECTS;
-
-	public static String SEAM_PROJECT_SELECTION_DIALOG_SELECT_SEAM_WEB_PROJECT;
-
-	public static String SEAM_PROJECT_WIZARD_CREATE_STANDALONE_SEAM_WEB_PROJECT;
-
-	public static String SEAM_PROJECT_WIZARD_EAR_MEMBERSHIP;
-
-	public static String SEAM_PROJECT_WIZARD_NEW_SEAM_PROJECT;
-
-	public static String SEAM_PROJECT_WIZARD_PAGE1_SEAM_FACET_MUST_BE_SPECIFIED;
-
-	public static String SEAM_PROJECT_WIZARD_SEAM_WEB_PROJECT;
-
-	public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_CANNOT_FIND_JBOSS_SEAM_JAR;
-
-	public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_CANNOT_OBTAIN_SEAM_VERSION_NUMBER;
-
-	public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_CREATE_A_SEAM_RUNTIME;
-	
-	public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_MODIFY_SEAM_RUNTIME;
-
-	public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_EDITOR_SUPPORTS_ONLY_GRID_LAYOUT;
-
-	public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_HOME_FOLDER;
-
-	public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_INPUTELEMENT_MUST_BE_LIST;
-
-	public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_NAME;
-
-	public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_NAME_CANNOT_BE_EMPTY;
-
-	public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_NAME2;
-
-	public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_NEW_SEAM_RUNTIME;
-
-	public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_EDIT_SEAM_RUNTIME;
-
-	public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_PARENT_CONTROL_SHOULD_BE_COMPOSITE;
-
-	public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_PATH;
-
-	public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_PATH_TO_SEAM_HOME_DIRECTORY_CANNOT_BE_EMPTY;
-
-	public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_RUNTIME_ALREADY_EXISTS;
-
-	public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_RUNTIME_NAME_IS_NOT_CORRECT;
-
-	public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_SEAM_RUNTIME;
-
-	public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_THE_SELECTED_SEAM_APPEARS_TO_BE_OF_INCOMATIBLE_VERSION;
-
-	public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_VERSION;
-
-	public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_VERSION2;
-
-	public static String SEAM_UI_IMAGESBASE_URL_FOR_IMAGE_REGISTRY_CANNOT_BE_NULL;
-
-	public static String SEAM_UI_IMAGESIMAGE_NAME_CANNOT_BE_NULL;
-
-	public static String SEAM_VIEW_LAYOUT_ACTION_GROUP_FLAT;
-
-	public static String SEAM_VIEW_LAYOUT_ACTION_GROUP_HIERARCHICAL;
-
-	public static String SEAM_VIEW_LAYOUT_ACTION_GROUP_LABEL;
-
-	public static String SEAM_VIEW_LAYOUT_ACTION_GROUP_NODE;
-
-	public static String SEAM_VIEW_LAYOUT_ACTION_GROUP_SCOPE_PRESENTATION;
-
-	public static String SEAM_VIEW_LAYOUT_ACTION_GROUP_SEAM_PACKAGES;
-
-	public static String SEAM_WIZARD_FACTORY_BEAN_NAME;
-
-	public static String SEAM_WIZARD_FACTORY_LOCAL_INTERFACE_NAME;
-
-	public static String SEAM_WIZARD_FACTORY_MASTER_PAGE_NAME;
-
-	public static String SEAM_WIZARD_FACTORY_METHOD_NAME;
-
-	public static String SEAM_WIZARD_FACTORY_PAGE_NAME;
-
-	public static String SEAM_WIZARD_FACTORY_SEAM_COMPONENT_NAME;
-
-	public static String SEAM_WIZARD_FACTORY_PACKAGE_NAME;
-
-	public static String SEAM_WIZARD_FACTORY_SEAM_ENTITY_CLASS_NAME;
-
-	public static String SEAM_WIZARD_FACTORY_SEAM_PROJECT;
-
-	public static String SELECT_SEAM_PROJECT_ACTION_BROWSE;
-	
-	public static String SHOW_PROJECT_SETTINGS_ACTION;
-
-	public static String VALIDATOR_FACTORY_CANNOT_FIND_SEAM_RUNTIME;
-
-	public static String VALIDATOR_FACTORY_COMPONENT_NAME_IS_NOT_VALID;
-
-	public static String VALIDATOR_FACTORY_CONNECTION_PROFILE_IS_NOT_SELECTED;
-
-	public static String VALIDATOR_FACTORY_DRIVER_CLASS_PROPERTY_IS_EMPTY_FOR_SELECTED_CONNECTION_PROFILE;
-
-	public static String VALIDATOR_FACTORY_HOME_FOLDER_POINTS_TO_LOCATION_THAT_DOES_NOT_LOOK_LIKE_SEAM_HOME_FOLDER;
-
-	public static String VALIDATOR_FACTORY_JBOSS_AS_HOME_FOLDER_DOES_NOT_EXIST;
-
-	public static String VALIDATOR_FACTORY_JBOSS_AS_HOME_FOLDER_POINT_TO_LOCATION_THAT_DOES_NOT_LOOK_LIKE_JBOSS_AS_HOME_FOLDER;
-
-	public static String VALIDATOR_FACTORY_LOCAL_INTERFACE_NAME_IS_NOT_VALID;
-
-	public static String VALIDATOR_FACTORY_NAME_IS_NOT_VALID;
-	
-	public static String VALIDATOR_FACTORY_COMPONENT_ALREADY_EXISTS;
-
-	public static String VALIDATOR_FACTORY_PRJ_NOT_SELECTED;
-
-	public static String VALIDATOR_FACTORY_PROJECT_DOES_NOT_EXIST;
-
-	public static String VALIDATOR_FACTORY_SEAM_HOME_FOLDER_DOES_NOT_EXISTS;
-
-	public static String VALIDATOR_FACTORY_SEAM_RT_CANNOT_BE_FOUND;
-
-	public static String VALIDATOR_FACTORY_SEAM_RT_HOME_DIR_DOES_NOT_EXIST;
-
-	public static String VALIDATOR_FACTORY_SEAM_RT_HOME_DIR_IS_MISSING;
-
-	public static String VALIDATOR_FACTORY_SEAM_RT_NOT_CONFIGURED;
-
-	public static String VALIDATOR_FACTORY_SEAM_RT_RESOURCES_DIR_IS_MISSING;
-
-	public static String VALIDATOR_FACTORY_SEAM_RT_SOURCE_TEMPLATES_DIR_DOES_NOT_EXIST;
-
-	public static String VALIDATOR_FACTORY_SEAM_RT_SRC_DIR_IS_MISSING;
-
-	public static String VALIDATOR_FACTORY_SEAM_RT_TEMPLATES_DIR_DOES_NOT_EXIST;
-
-	public static String VALIDATOR_FACTORY_SEAM_RT_TEMPLATES_DIR_IS_MISSING;
-
-	public static String VALIDATOR_FACTORY_SEAM_RT_VIE_TEMPLATE_DIR_DOES_NOT_EXIST;
-
-	public static String VALIDATOR_FACTORY_SEAM_RT_VIEW_DIR_IS_MISSING;
-
-	public static String VALIDATOR_FACTORY_SEAM_RUNTIME_IS_NOT_SELECTED;
-
-	public static String VALIDATOR_FACTORY_SELECTED_PRJ_IS_CLOSED;
-
-	public static String VALIDATOR_FACTORY_SELECTED_PROJECT_IS_NOT_A_SEAM_WEB_PROJECT;
-	
-	public static String VALIDATOR_FACTORY_TEST_PROJECT_ALREADY_EXISTS;
-	
-	public static String VALIDATOR_FACTORY_TEST_PROJECT_CANNOT_BE_EMPTY;
-	
-	public static String VALIDATOR_FACTORY_EAR_PROJECT_ALREADY_EXISTS;
-	
-	public static String VALIDATOR_FACTORY_EAR_PROJECT_CANNOT_BE_EMPTY;
-	
-	public static String VALIDATOR_FACTORY_EJB_PROJECT_ALREADY_EXISTS;
-	
-	public static String VALIDATOR_FACTORY_EJB_PROJECT_CANNOT_BE_EMPTY;
-	
-	public static String VALIDATOR_INVALID_SETTINGS;
-
-	public static String SEAM_TARGET_SERVER;
-
-	public static String RUNTIME_DELETE_CONFIRM_TITLE;
-
-	public static String RUNTIME_DELETE_NOT_USED_CONFIRM;
-
-	public static String RUNTIME_DELETE_USED_CONFIRM;
-
-	public static String VIEW_FOLDER_FILED_EDITOR;
-	
-	public static String POJO_CLASS_ALREADY_EXISTS;
-	public static String ENTITY_CLASS_ALREADY_EXISTS;
-	public static String PAGE_ALREADY_EXISTS;
-	public static String MASTER_PAGE_ALREADY_EXISTS;
-	
-	public static String FIND_DECLARATIONS_ACTION_ACTION_NAME;
-	public static String FIND_DECLARATIONS_ACTION_DESCRIPTION;
-	public static String FIND_DECLARATIONS_ACTION_TOOL_TIP;
-
-	public static String FIND_REFERENCES_ACTION_ACTION_NAME;
-	public static String FIND_REFERENCES_ACTION_DESCRIPTION;
-	public static String FIND_REFERENCES_ACTION_TOOL_TIP;
-
-	public static String SeamSearchQuery_label;
-
-	public static String SeamSearchQuery_singularPatternWithLimitTo;
-	public static String SeamSearchQuery_pluralPatternWithLimitTo;
-
-	public static String SeamSearchScope_scope_empty;
-	public static String SeamSearchScope_scope_single;
-	public static String SeamSearchScope_scope_double;
-	public static String SeamSearchScope_scope_multiple;
-
-	public static String SeamSearchScope_scope_LimitToDeclarations;
-	public static String SeamSearchScope_scope_LimitToReferences;
-	public static String SeamSearchQuery_pluralPattern;
-	public static String SeamSearchQuery_singularLabel;
-
-	public static String SeamSearchVisitor_scanning;
-
-	public static String SeamSearch;
-	
-	public static String SeamQuickFixFindDeclarations;
-	public static String SeamQuickFixFindReferences;
-
-	public static String SeamRuntimeListFieldEditor_ActionAdd;
-
-	public static String SeamRuntimeListFieldEditor_ActionEdit;
-
-	public static String SeamRuntimeListFieldEditor_ActionRemove;
-	
-	public static String SEAM_REFACTOR;
-
-	public static String RENAME_SEAM_COMPONENT;
-	
-	public static String RENAME_SEAM_CONTEXT_VARIABLE;
-	
-	public static String FIND_USAGES_IN_EL;
-	
-	public static String SEAM_COMPONENT_RENAME_HANDLER_ERROR;
-	
-	public static String DELETE_NAME_ANNOTATION_MARKER_RESOLUTION_TITLE;
-
-	public static String DELETE_REMOVE_ANNOTATION_MARKER_RESOLUTION_TITLE;
-
-	public static String DELETE_DESTROY_ANNOTATION_MARKER_RESOLUTION_TITLE;
-	
-	public static String DELETE_CREATE_ANNOTATION_MARKER_RESOLUTION_TITLE;
-	
-	public static String DELETE_UNWRAP_ANNOTATION_MARKER_RESOLUTION_TITLE;
-
-	public static String DELETE_OBSERVER_ANNOTATION_MARKER_RESOLUTION_TITLE;
-	
-	public static String ADD_NAME_ANNOTATION_MARKER_RESOLUTION_TITLE;
-	
-	public static String RENAME_NAME_ANNOTATION_MARKER_RESOLUTION_TITLE;
-	
-	public static String ADD_ANNOTATED_REMOVE_METHOD_MARKER_RESOLUTION_TITLE;
-	
-	public static String ADD_ANNOTATED_DESTROY_METHOD_MARKER_RESOLUTION_TITLE;
-	
-	public static String CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE;
-	
-	public static String ADD_SETTER_MARKER_RESOLUTION_TITLE;
-	
-	public static String ADD_NEW_SEAM_RUNTIME_MARKER_RESOLUTION_TITLE;
-	
-	static {
-		// load message values from bundle file
-		NLS.initializeMessages(BUNDLE_NAME, SeamUIMessages.class);		
-	}
-	
-	private SeamUIMessages() {
-		// cannot create new instance of this class
-	}
-	
-	public static ResourceBundle getResourceBundle() {
-		try {
-			if (fResourceBundle == null)
-				fResourceBundle = ResourceBundle.getBundle(BUNDLE_NAME, Locale.getDefault());
-		}
-		catch (MissingResourceException x) {
-			fResourceBundle = null;
-		}
-		return fResourceBundle;
-	}
-}
\ No newline at end of file
Index: src/org/jboss/tools/seam/ui/actions/FindSeamDeclarationsAction.java
===================================================================
--- src/org/jboss/tools/seam/ui/actions/FindSeamDeclarationsAction.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/actions/FindSeamDeclarationsAction.java	(working copy)
@@ -11,7 +11,7 @@
 
 package org.jboss.tools.seam.ui.actions;
 
-import org.jboss.tools.seam.ui.SeamUIMessages;
+import org.jboss.tools.seam.core.SeamCoreMessages;
 import org.jboss.tools.seam.ui.search.SeamSearchScope;
 
 /**
@@ -25,9 +25,9 @@
 	 * Constructs the FindSeamDeclarationAction
 	 */
 	public FindSeamDeclarationsAction() {
-		setText(SeamUIMessages.FIND_DECLARATIONS_ACTION_ACTION_NAME);
-		setDescription(SeamUIMessages.FIND_DECLARATIONS_ACTION_DESCRIPTION);
-		setToolTipText(SeamUIMessages.FIND_DECLARATIONS_ACTION_TOOL_TIP);
+		setText(SeamCoreMessages.FIND_DECLARATIONS_ACTION_ACTION_NAME);
+		setDescription(SeamCoreMessages.FIND_DECLARATIONS_ACTION_DESCRIPTION);
+		setToolTipText(SeamCoreMessages.FIND_DECLARATIONS_ACTION_TOOL_TIP);
 	}
 
 	/**
Index: src/org/jboss/tools/seam/ui/actions/SeamFindQuickAssistProcessor.java
===================================================================
--- src/org/jboss/tools/seam/ui/actions/SeamFindQuickAssistProcessor.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/actions/SeamFindQuickAssistProcessor.java	(working copy)
@@ -36,9 +36,9 @@
 import org.jboss.tools.common.el.core.model.ELInvocationExpression;
 import org.jboss.tools.seam.core.ISeamProject;
 import org.jboss.tools.seam.core.SeamCorePlugin;
+import org.jboss.tools.seam.core.SeamCoreMessages;
 import org.jboss.tools.seam.internal.core.el.SeamELCompletionEngine;
 import org.jboss.tools.seam.ui.SeamGuiPlugin;
-import org.jboss.tools.seam.ui.SeamUIMessages;
 import org.jboss.tools.seam.ui.SeamUiImages;
 import org.jboss.tools.seam.ui.handlers.FindSeamDeclarationsHandler;
 import org.jboss.tools.seam.ui.handlers.FindSeamReferencesHandler;
@@ -138,7 +138,7 @@
 					contents, 
 					SeamUiImages.getImage("find_seam_declarations.gif"), 
 					Messages.format(
-							SeamUIMessages.SeamQuickFixFindDeclarations, 
+							SeamCoreMessages.SeamQuickFixFindDeclarations, 
 							new Object[] {searchString}),
 					context) {
 				public void apply(IDocument target) {
@@ -153,7 +153,7 @@
 					contents, 
 					SeamUiImages.getImage("find_seam_references.gif"), 
 					Messages.format(
-							SeamUIMessages.SeamQuickFixFindReferences, 
+							SeamCoreMessages.SeamQuickFixFindReferences, 
 							new Object[] {searchString}),
 					context) {
 				public void apply(IDocument target) {
Index: src/org/jboss/tools/seam/ui/actions/CreateProjectAction.java
===================================================================
--- src/org/jboss/tools/seam/ui/actions/CreateProjectAction.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/actions/CreateProjectAction.java	(working copy)
@@ -22,8 +22,8 @@
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.internal.ide.IIDEHelpContextIds;
 import org.jboss.tools.common.model.ui.util.ExtensionPointUtils;
+import org.jboss.tools.seam.core.SeamCoreMessages;
 import org.jboss.tools.seam.ui.SeamGuiPlugin;
-import org.jboss.tools.seam.ui.SeamUIMessages;
 import org.jboss.tools.seam.ui.SeamUiImages;
 
 /**
@@ -45,8 +45,8 @@
 	private static final int SIZING_WIZARD_HEIGHT = 500;
 
 	public CreateProjectAction() {
-		super(SeamUIMessages.CREATE_NEW_SEAM_PROJECT);
-		setToolTipText(SeamUIMessages.CREATE_NEW_SEAM_PROJECT);
+		super(SeamCoreMessages.CREATE_NEW_SEAM_PROJECT);
+		setToolTipText(SeamCoreMessages.CREATE_NEW_SEAM_PROJECT);
 		setImageDescriptor(SeamUiImages
 				.getImageDescriptor(SeamUiImages.SEAM_CREATE_PROJECT_ACTION));
 	}
@@ -72,7 +72,7 @@
 			SeamGuiPlugin
 					.getPluginLog()
 					.logError(
-							NLS.bind(SeamUIMessages.CREATE_PROJECT_ACTION_UNABLE_TO_CREATE_WIZARD,
+							NLS.bind(SeamCoreMessages.CREATE_PROJECT_ACTION_UNABLE_TO_CREATE_WIZARD,
 									SEAM_CREATE_PROJECT_WIZARD_ID));
 
 		}
Index: src/org/jboss/tools/seam/ui/actions/OpenSeamComponentAction.java
===================================================================
--- src/org/jboss/tools/seam/ui/actions/OpenSeamComponentAction.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/actions/OpenSeamComponentAction.java	(working copy)
@@ -26,9 +26,9 @@
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.dialogs.SelectionDialog;
 import org.jboss.tools.seam.core.ISeamComponentDeclaration;
+import org.jboss.tools.seam.core.SeamCoreMessages;
 import org.jboss.tools.seam.internal.core.SeamComponentDeclaration;
 import org.jboss.tools.seam.internal.core.SeamJavaComponentDeclaration;
-import org.jboss.tools.seam.ui.SeamUIMessages;
 import org.jboss.tools.seam.ui.wizard.OpenSeamComponentDialog;
 import org.jboss.tools.seam.ui.wizard.OpenSeamComponentDialog.SeamComponentWrapper;
 
@@ -40,9 +40,9 @@
 
 	public OpenSeamComponentAction() {
 		super();
-		setText(SeamUIMessages.OPEN_SEAM_COMPONENT_ACTION_ACTION_NAME);
-		setDescription(SeamUIMessages.OPEN_SEAM_COMPONENT_ACTION_DESCRIPTION);
-		setToolTipText(SeamUIMessages.OPEN_SEAM_COMPONENT_ACTION_TOOL_TIP);
+		setText(SeamCoreMessages.OPEN_SEAM_COMPONENT_ACTION_ACTION_NAME);
+		setDescription(SeamCoreMessages.OPEN_SEAM_COMPONENT_ACTION_DESCRIPTION);
+		setToolTipText(SeamCoreMessages.OPEN_SEAM_COMPONENT_ACTION_TOOL_TIP);
 	}
 
 	public void run() {
@@ -55,8 +55,8 @@
 		
 		dialog= new OpenSeamComponentDialog(parent);
 		
-		dialog.setTitle(SeamUIMessages.OPEN_SEAM_COMPONENT_ACTION_ACTION_NAME);
-		dialog.setMessage(SeamUIMessages.OPEN_SEAM_COMPONENT_ACTION_MESSAGE);
+		dialog.setTitle(SeamCoreMessages.OPEN_SEAM_COMPONENT_ACTION_ACTION_NAME);
+		dialog.setMessage(SeamCoreMessages.OPEN_SEAM_COMPONENT_ACTION_MESSAGE);
 
 		int result= dialog.open();
 		if (result != IDialogConstants.OK_ID)
Index: src/org/jboss/tools/seam/ui/actions/FindSeamReferencesAction.java
===================================================================
--- src/org/jboss/tools/seam/ui/actions/FindSeamReferencesAction.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/actions/FindSeamReferencesAction.java	(working copy)
@@ -11,7 +11,7 @@
 
 package org.jboss.tools.seam.ui.actions;
 
-import org.jboss.tools.seam.ui.SeamUIMessages;
+import org.jboss.tools.seam.core.SeamCoreMessages;
 import org.jboss.tools.seam.ui.search.SeamSearchScope;
 
 /**
@@ -25,9 +25,9 @@
 	 * Constructs the FindSeamReferencesAction
 	 */
 	public FindSeamReferencesAction() {
-		setText(SeamUIMessages.FIND_REFERENCES_ACTION_ACTION_NAME);
-		setDescription(SeamUIMessages.FIND_REFERENCES_ACTION_DESCRIPTION);
-		setToolTipText(SeamUIMessages.FIND_REFERENCES_ACTION_TOOL_TIP);
+		setText(SeamCoreMessages.FIND_REFERENCES_ACTION_ACTION_NAME);
+		setDescription(SeamCoreMessages.FIND_REFERENCES_ACTION_DESCRIPTION);
+		setToolTipText(SeamCoreMessages.FIND_REFERENCES_ACTION_TOOL_TIP);
 	}
 
 	/**
Index: src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java
===================================================================
--- src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/preferences/SeamSettingsPreferencePage.java	(working copy)
@@ -67,8 +67,8 @@
 import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager;
 import org.jboss.tools.seam.core.project.facet.SeamVersion;
 import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties;
+import org.jboss.tools.seam.internal.core.project.facet.SeamValidatorFactory;
 import org.jboss.tools.seam.ui.SeamGuiPlugin;
-import org.jboss.tools.seam.ui.internal.project.facet.SeamValidatorFactory;
 import org.jboss.tools.seam.ui.wizard.ISeamParameter;
 import org.jboss.tools.seam.ui.wizard.SeamWizardFactory;
 import org.jboss.tools.seam.ui.wizard.SeamWizardUtils;
Index: src/org/jboss/tools/seam/ui/refactoring/SeamRefactorContributionFactory.java
===================================================================
--- src/org/jboss/tools/seam/ui/refactoring/SeamRefactorContributionFactory.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/refactoring/SeamRefactorContributionFactory.java	(working copy)
@@ -73,11 +73,11 @@
 import org.jboss.tools.seam.core.ISeamJavaComponentDeclaration;
 import org.jboss.tools.seam.core.ISeamProject;
 import org.jboss.tools.seam.core.SeamCorePlugin;
+import org.jboss.tools.seam.core.SeamCoreMessages;
 import org.jboss.tools.seam.internal.core.refactoring.RenameComponentProcessor;
 import org.jboss.tools.seam.internal.core.refactoring.RenameComponentRefactoring;
 import org.jboss.tools.seam.internal.core.refactoring.RenameSeamContextVariableProcessor;
 import org.jboss.tools.seam.ui.SeamGuiPlugin;
-import org.jboss.tools.seam.ui.SeamUIMessages;
 import org.jboss.tools.seam.ui.wizard.RenameComponentWizard;
 import org.jboss.tools.seam.ui.wizard.RenameSeamContextVariableWizard;
 import org.w3c.dom.Node;
@@ -139,7 +139,7 @@
 			if(seamProject == null)
 				return;
 			
-			MenuManager mm = new MenuManager(SeamUIMessages.SEAM_REFACTOR);
+			MenuManager mm = new MenuManager(SeamCoreMessages.SEAM_REFACTOR);
 			mm.setVisible(true);
 			
 			boolean separatorIsAdded = false;
@@ -427,7 +427,7 @@
 		RenameComponentWizard wizard = new RenameComponentWizard(refactoring, component);
 		RefactoringWizardOpenOperation op = new RefactoringWizardOpenOperation(wizard);
 		try {
-			String titleForFailedChecks = SeamUIMessages.SEAM_COMPONENT_RENAME_HANDLER_ERROR;
+			String titleForFailedChecks = SeamCoreMessages.SEAM_COMPONENT_RENAME_HANDLER_ERROR;
 			op.run(activeShell, titleForFailedChecks);
 		} catch (final InterruptedException irex) {
 			// operation was canceled
@@ -444,7 +444,7 @@
 		RenameSeamContextVariableWizard wizard = new RenameSeamContextVariableWizard(refactoring, editorFile);
 		RefactoringWizardOpenOperation op = new RefactoringWizardOpenOperation(wizard);
 		try {
-			String titleForFailedChecks = SeamUIMessages.SEAM_COMPONENT_RENAME_HANDLER_ERROR;
+			String titleForFailedChecks = SeamCoreMessages.SEAM_COMPONENT_RENAME_HANDLER_ERROR;
 			op.run(activeShell, titleForFailedChecks);
 		} catch (final InterruptedException irex) {
 			// operation was canceled
@@ -455,7 +455,7 @@
 	
 	class RenameSeamComponentAction extends Action{
 		public RenameSeamComponentAction(){
-			super(SeamUIMessages.RENAME_SEAM_COMPONENT);
+			super(SeamCoreMessages.RENAME_SEAM_COMPONENT);
 		}
 
 		public void run(){
@@ -468,7 +468,7 @@
 	
 	class RenameSeamContextVariableAction extends Action{
 		public RenameSeamContextVariableAction(){
-			super(SeamUIMessages.RENAME_SEAM_CONTEXT_VARIABLE);
+			super(SeamCoreMessages.RENAME_SEAM_CONTEXT_VARIABLE);
 		}
 		public void run(){
 			saveAndBuild();
Index: src/org/jboss/tools/seam/ui/search/SeamSearchScope.java
===================================================================
--- src/org/jboss/tools/seam/ui/search/SeamSearchScope.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/search/SeamSearchScope.java	(working copy)
@@ -31,8 +31,8 @@
 import org.eclipse.search.ui.text.FileTextSearchScope;
 import org.jboss.tools.seam.core.ISeamProject;
 import org.jboss.tools.seam.core.SeamCorePlugin;
+import org.jboss.tools.seam.core.SeamCoreMessages;
 import org.jboss.tools.seam.ui.SeamGuiPlugin;
-import org.jboss.tools.seam.ui.SeamUIMessages;
 
 /**
  * Seam Search Scope object
@@ -95,15 +95,15 @@
 	private String getScopeDescription(IResource[] resources) {
 		String description;
 		if (resources.length == 0) {
-			description= SeamUIMessages.SeamSearchScope_scope_empty;
+			description= SeamCoreMessages.SeamSearchScope_scope_empty;
 		} else if (resources.length == 1) {
-			String label= SeamUIMessages.SeamSearchScope_scope_single;
+			String label= SeamCoreMessages.SeamSearchScope_scope_single;
 			description= Messages.format(label, resources[0].getName());
 		} else if (resources.length == 2) {
-			String label= SeamUIMessages.SeamSearchScope_scope_double;
+			String label= SeamCoreMessages.SeamSearchScope_scope_double;
 			description= Messages.format(label, new String[] { resources[0].getName(), resources[1].getName()});
 		} else {
-			String label= SeamUIMessages.SeamSearchScope_scope_multiple;
+			String label= SeamCoreMessages.SeamSearchScope_scope_multiple;
 			description= Messages.format(label, new String[] { resources[0].getName(), resources[1].getName()});
 		}
 		return description;
@@ -147,8 +147,8 @@
 	 */
 	public String getLimitToDescription() {
 		return SeamSearchEngine.isSearchForDeclarations(getLimitTo()) ?
-			SeamUIMessages.SeamSearchScope_scope_LimitToDeclarations : 
-			SeamUIMessages.SeamSearchScope_scope_LimitToReferences;
+			SeamCoreMessages.SeamSearchScope_scope_LimitToDeclarations : 
+			SeamCoreMessages.SeamSearchScope_scope_LimitToReferences;
 	}
 
 	/**
Index: src/org/jboss/tools/seam/ui/search/SeamSearchQuery.java
===================================================================
--- src/org/jboss/tools/seam/ui/search/SeamSearchQuery.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/search/SeamSearchQuery.java	(working copy)
@@ -36,8 +36,8 @@
 import org.jboss.tools.seam.core.ISeamDeclaration;
 import org.jboss.tools.seam.core.ISeamProject;
 import org.jboss.tools.seam.core.SeamCorePlugin;
+import org.jboss.tools.seam.core.SeamCoreMessages;
 import org.jboss.tools.seam.internal.core.el.SeamELCompletionEngine;
-import org.jboss.tools.seam.ui.SeamUIMessages;
 
 /**
  * Seam search query implementation
@@ -308,7 +308,7 @@
 	 */
 	public String getLabel() {
 		Object[] args= { fScope.getLimitToDescription() };
-		return Messages.format(SeamUIMessages.SeamSearchQuery_label, args);
+		return Messages.format(SeamCoreMessages.SeamSearchQuery_label, args);
 	}
 
 	/**
@@ -345,10 +345,10 @@
 				// search is limited to declarations only
 				if (nMatches == 1) {
 					Object[] args= { searchString, fScope.getDescription(), fScope.getLimitToDescription() };
-					return Messages.format(SeamUIMessages.SeamSearchQuery_singularPatternWithLimitTo, args);
+					return Messages.format(SeamCoreMessages.SeamSearchQuery_singularPatternWithLimitTo, args);
 				}
 				Object[] args= { searchString, new Integer(nMatches), fScope.getDescription(), fScope.getLimitToDescription() };
-				return Messages.format(SeamUIMessages.SeamSearchQuery_pluralPatternWithLimitTo, args);
+				return Messages.format(SeamCoreMessages.SeamSearchQuery_pluralPatternWithLimitTo, args);
 			}
 			if (SeamSearchEngine.isSearchForReferences(fScope.getLimitTo())) {
 				// text search
@@ -356,10 +356,10 @@
 					// search all file extensions
 					if (nMatches == 1) {
 						Object[] args= { searchString, fScope.getDescription(), fScope.getLimitToDescription() };
-						return Messages.format(SeamUIMessages.SeamSearchQuery_singularLabel, args);
+						return Messages.format(SeamCoreMessages.SeamSearchQuery_singularLabel, args);
 					}
 					Object[] args= { searchString, new Integer(nMatches), fScope.getDescription(), fScope.getLimitToDescription() };
-					return Messages.format(SeamUIMessages.SeamSearchQuery_pluralPattern, args); 
+					return Messages.format(SeamCoreMessages.SeamSearchQuery_pluralPattern, args); 
 				}
 			}
 		}
Index: src/org/jboss/tools/seam/ui/search/SeamSearchVisitor.java
===================================================================
--- src/org/jboss/tools/seam/ui/search/SeamSearchVisitor.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/search/SeamSearchVisitor.java	(working copy)
@@ -113,6 +113,7 @@
 import org.jboss.tools.seam.core.ISeamProject;
 import org.jboss.tools.seam.core.SeamCoreMessages;
 import org.jboss.tools.seam.core.SeamCorePlugin;
+import org.jboss.tools.seam.core.SeamCoreMessages;
 import org.jboss.tools.seam.internal.core.AbstractSeamDeclaration;
 import org.jboss.tools.seam.internal.core.SeamComponent;
 import org.jboss.tools.seam.internal.core.el.SeamELCompletionEngine;
@@ -121,7 +122,6 @@
 import org.jboss.tools.seam.internal.core.scanner.java.ResolvedAnnotation;
 import org.jboss.tools.seam.internal.core.scanner.java.SeamAnnotations;
 import org.jboss.tools.seam.ui.SeamGuiPlugin;
-import org.jboss.tools.seam.ui.SeamUIMessages;
 import org.jboss.tools.seam.ui.text.java.scanner.JavaAnnotationScanner;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -966,7 +966,7 @@
 				if (seamProject != null) {
 					String seamProjectName= seamProject.getProject().getName();
 					Object[] args= { seamProjectName, new Integer(fNumberOfScannedFiles), new Integer(fNumberOfFilesToScan)};
-					fProgressMonitor.subTask(Messages.format(SeamUIMessages.SeamSearchVisitor_scanning, args));
+					fProgressMonitor.subTask(Messages.format(SeamCoreMessages.SeamSearchVisitor_scanning, args));
 					int steps= fNumberOfScannedFiles - fLastNumberOfScannedFiles;
 					fProgressMonitor.worked(steps);
 					fLastNumberOfScannedFiles += steps;
Index: src/org/jboss/tools/seam/ui/search/SeamSearchEngine.java
===================================================================
--- src/org/jboss/tools/seam/ui/search/SeamSearchEngine.java	(revision 39311)
+++ src/org/jboss/tools/seam/ui/search/SeamSearchEngine.java	(working copy)
@@ -42,9 +42,9 @@
 import org.jboss.tools.seam.core.ISeamContextVariable;
 import org.jboss.tools.seam.core.ISeamProject;
 import org.jboss.tools.seam.core.SeamCorePlugin;
+import org.jboss.tools.seam.core.SeamCoreMessages;
 import org.jboss.tools.seam.internal.core.el.SeamELCompletionEngine;
 import org.jboss.tools.seam.ui.SeamGuiPlugin;
-import org.jboss.tools.seam.ui.SeamUIMessages;
 
 /**
  * A helper class used for search operations
@@ -373,7 +373,7 @@
 
         // constructor w/ java element
         public SeamJavaSearchJob(IJavaElement element, IJavaSearchScope scope, SearchRequestor requestor) {
-            super(SeamUIMessages.SeamSearch + element.getElementName());
+            super(SeamCoreMessages.SeamSearch + element.getElementName());
             this.fElement = element;
             this.fScope = scope;
             this.fRequestor = requestor;
@@ -381,7 +381,7 @@
 
         // constructor w/ search text
         public SeamJavaSearchJob(String searchText, IJavaSearchScope scope, int searchFor, int limitTo, int matchMode, boolean isCaseSensitive, SearchRequestor requestor) {
-            super(SeamUIMessages.SeamSearch + searchText);
+            super(SeamCoreMessages.SeamSearch + searchText);
             this.fSearchText = searchText;
             this.fScope = scope;
             this.fSearchFor = searchFor;
#P org.jboss.tools.seam.core
Index: src/org/jboss/tools/seam/core/SeamCoreMessages.java
===================================================================
--- src/org/jboss/tools/seam/core/SeamCoreMessages.java	(revision 39311)
+++ src/org/jboss/tools/seam/core/SeamCoreMessages.java	(working copy)
@@ -65,4 +65,392 @@
 	
 	public static String SEAM_RENAME_METHOD_PARTICIPANT_SETTER_WARNING;
 	public static String SEAM_RENAME_METHOD_PARTICIPANT_GETTER_WARNING;
+
+	public static String ABSTRACT_SEAM_CONTENT_PROVIDER_SEAM_PROJECT_CHANGE_EVENT_OCCURS_BUT_NO_SORCE_OF_PROJECT_PROVIDED;
+
+	public static String CREATE_NEW_SEAM_PROJECT;
+
+	public static String CREATE_PROJECT_ACTION_UNABLE_TO_CREATE_WIZARD;
+
+	public static String CREATE_SEAM_WEB_PROJECTACTION_CREATE_SEAM_PROJECT;
+	public static String GENERATE_SEAM_ENTITIES_WIZARD_TITLE;
+	public static String GENERATE_SEAM_ENTITIES_WIZARD_PAGE_MESSAGE;
+	public static String GENERATE_SEAM_ENTITIES_WIZARD_HIBERNATE_CONFIGURATION_LABEL;
+	public static String GENERATE_SEAM_ENTITIES_WIZARD_HIBERNATE_CONFIGURATION_MESSAGE;
+	public static String GENERATE_SEAM_ENTITIES_WIZARD_HIBERNATE_CONFIGURATION_ERROR;
+	public static String GENERATE_SEAM_ENTITIES_WIZARD_GROUP_LABEL;
+	public static String GENERATE_SEAM_ENTITIES_WIZARD_REVERSE_ENGINEER_LABEL;
+	public static String GENERATE_SEAM_ENTITIES_WIZARD_EXISTING_ENTITIES_LABEL;
+
+	public static String OPEN_SEAM_COMPONENT_ACTION_ACTION_NAME;
+
+	public static String OPEN_SEAM_COMPONENT_ACTION_DESCRIPTION;
+
+	public static String OPEN_SEAM_COMPONENT_ACTION_MESSAGE;
+
+	public static String OPEN_SEAM_COMPONENT_ACTION_TOOL_TIP;
+
+	public static String OPEN_SEAM_COMPONENT_DIALOG_LOADING;
+
+	public static String OPEN_SEAM_COMPONENT_DIALOG_NAME;
+	
+	public static String OPEN_SEAM_COMPONENT_DIALOG_WAIT;
+
+	public static String SEAM_ACTION_WIZARD_ACTION_CREATING_OPERATION;
+
+	public static String SEAM_ACTION_WIZARD_NEW_SEAM_ACTION;
+
+	public static String SEAM_ACTION_WIZARD_PAGE1_SEAM_ACTION;
+
+	public static String SEAM_BASE_WIZARD_OPERATION_IS_NOT_DEFINED_FOR_WIZARD;
+
+	public static String SEAM_BASE_WIZARD_PAGE_LOCAL_CLASS_NAME;
+
+	public static String SEAM_BASE_WIZARD_PAGE_LOCAL_INTERFACE;
+
+	public static String SEAM_BASE_WIZARD_PAGE_POJO_CLASS_NAME;
+
+	public static String SEAM_BASE_WIZARD_PAGE_SEAM_COMPONENTS;
+
+	public static String SEAM_CONVERSATION_WIZARD_CREATE_NEW_CONVERSATION;
+
+	public static String SEAM_CONVERSATION_WIZARD_ENTITY_CREATING_OPERATION;
+
+	public static String SEAM_CONVERSATION_WIZARD_PAGE1_SEAM_CONVERSATION;
+
+	public static String SEAM_ENTITY_WIZARD_ENTITY_CREATING_OPERATION;
+
+	public static String SEAM_ENTITY_WIZARD_NEW_SEAM_ENTITY;
+
+	public static String SEAM_ENTITY_WIZARD_PAGE1_ENTITY_CLASS_NAME;
+
+	public static String SEAM_ENTITY_WIZARD_PAGE1_ENTITY_MASTER_PAGE;
+
+	public static String SEAM_ENTITY_WIZARD_PAGE1_PAGE;
+
+	public static String SEAM_FORM_WIZARD_FORM_CREATING_OPERATION;
+
+	public static String SEAM_FORM_WIZARD_NEW_SEAM_FORM;
+
+	public static String SEAM_FORM_WIZARD_PAGE1_SEAM_FORM;
+
+	public static String SEAM_GENERATE_ENTITIES_WIZARD_54;
+
+	public static String SEAM_GENERATE_ENTITIES_WIZARD_ACTION_CREATING_OPERATION;
+
+	public static String SEAM_GENERATE_ENTITIES_WIZARD_CAN_NOT_FIND_SEAM_RUNTIME;
+
+	public static String SEAM_GENERATE_ENTITIES_WIZARD_CAN_NOT_GENERATE_SEAM_ENTITIES;
+
+	public static String SEAM_INSTALL_WIZARD_PAGE_ADD;
+
+	public static String SEAM_INSTALL_WIZARD_PAGE_CANNOT_USE_SELECTED_DEPLOYMENT6;
+
+	public static String SEAM_INSTALL_WIZARD_PAGE_CODE_GENERATION;
+
+	public static String SEAM_INSTALL_WIZARD_PAGE_CONFIGURE_SEAM_FACET_SETTINGS;
+
+	public static String SEAM_INSTALL_WIZARD_PAGE_CONNECTION_PROFILE;
+
+	public static String SEAM_INSTALL_WIZARD_PAGE_DATABASE;
+
+	public static String SEAM_INSTALL_WIZARD_PAGE_DATABASE_CATALOG_NAME;
+
+	public static String SEAM_INSTALL_WIZARD_PAGE_DATABASE_SCHEMA_NAME;
+
+	public static String SEAM_INSTALL_WIZARD_PAGE_DATABASE_TYPE;
+
+	public static String SEAM_INSTALL_WIZARD_PAGE_DB_TABLES_ALREADY_EXISTS;
+
+	public static String SEAM_INSTALL_WIZARD_PAGE_DEPLOY_AS;
+	
+	public static String SEAM_INSTALL_WIZARD_PAGE_EJB_PROJECT_NAME;
+	
+	public static String SEAM_INSTALL_WIZARD_PAGE_EAR_PROJECT_NAME;
+	
+	public static String SEAM_INSTALL_WIZARD_PAGE_TEST_PROJECT_NAME;
+
+	public static String SEAM_INSTALL_WIZARD_PAGE_EDIT;
+
+	public static String SEAM_INSTALL_WIZARD_PAGE_ENTITY_BEAN_PACKAGE_NAME;
+	
+	public static String SEAM_INSTALL_WIZARD_PAGE_CREATE_TEST_PROJECT;
+
+	public static String SEAM_INSTALL_WIZARD_PAGE_GENERAL;
+
+	public static String SEAM_INSTALL_WIZARD_PAGE_NEW;
+
+	public static String SEAM_INSTALL_WIZARD_PAGE_PACKAGE_NAME_NOT_VALID;
+
+	public static String SEAM_INSTALL_WIZARD_PAGE_RECREATE_DATABASE_TABLES_AND_DATA_ON_DEPLOY;
+
+	public static String SEAM_INSTALL_WIZARD_PAGE_SEAM_FACET;
+
+	public static String SEAM_INSTALL_WIZARD_PAGE_SEAM_RUNTIME;
+
+	public static String SEAM_INSTALL_WIZARD_PAGE_SESSION_BEAN_PACKAGE_NAME;
+
+	public static String SEAM_INSTALL_WIZARD_PAGE_TEST_PACKAGE_NAME;
+	
+	public static String SEAM_INSTALL_WIZARD_PAGE_LIBRARIES;
+	
+	public static String SEAM_INSTALL_WIZARD_PAGE_COPY_LIBRARIES;
+	
+	public static String SEAM_INSTALL_WIZARD_PAGE_CONFIGURE_LATER;
+
+	public static String SEAM_OPEN_ACTION_OPEN;
+
+	public static String SEAM_PROJECT_LABEL_PROVIDER_SEAM_COMPONENTS;
+
+	public static String SEAM_PROJECT_SELECTION_DIALOG_SEAM_WEB_PROJECT;
+	
+	public static String SEAM_PROJECT_SELECTION_DIALOG_SHOW_ALL_PROJECTS;
+
+	public static String SEAM_PROJECT_SELECTION_DIALOG_SELECT_SEAM_WEB_PROJECT;
+
+	public static String SEAM_PROJECT_WIZARD_CREATE_STANDALONE_SEAM_WEB_PROJECT;
+
+	public static String SEAM_PROJECT_WIZARD_EAR_MEMBERSHIP;
+
+	public static String SEAM_PROJECT_WIZARD_NEW_SEAM_PROJECT;
+
+	public static String SEAM_PROJECT_WIZARD_PAGE1_SEAM_FACET_MUST_BE_SPECIFIED;
+
+	public static String SEAM_PROJECT_WIZARD_SEAM_WEB_PROJECT;
+
+	public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_CANNOT_FIND_JBOSS_SEAM_JAR;
+
+	public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_CANNOT_OBTAIN_SEAM_VERSION_NUMBER;
+
+	public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_CREATE_A_SEAM_RUNTIME;
+	
+	public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_MODIFY_SEAM_RUNTIME;
+
+	public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_EDITOR_SUPPORTS_ONLY_GRID_LAYOUT;
+
+	public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_HOME_FOLDER;
+
+	public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_INPUTELEMENT_MUST_BE_LIST;
+
+	public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_NAME;
+
+	public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_NAME_CANNOT_BE_EMPTY;
+
+	public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_NAME2;
+
+	public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_NEW_SEAM_RUNTIME;
+
+	public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_EDIT_SEAM_RUNTIME;
+
+	public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_PARENT_CONTROL_SHOULD_BE_COMPOSITE;
+
+	public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_PATH;
+
+	public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_PATH_TO_SEAM_HOME_DIRECTORY_CANNOT_BE_EMPTY;
+
+	public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_RUNTIME_ALREADY_EXISTS;
+
+	public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_RUNTIME_NAME_IS_NOT_CORRECT;
+
+	public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_SEAM_RUNTIME;
+
+	public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_THE_SELECTED_SEAM_APPEARS_TO_BE_OF_INCOMATIBLE_VERSION;
+
+	public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_VERSION;
+
+	public static String SEAM_RUNTIME_LIST_FIELD_EDITOR_VERSION2;
+
+	public static String SEAM_UI_IMAGESBASE_URL_FOR_IMAGE_REGISTRY_CANNOT_BE_NULL;
+
+	public static String SEAM_UI_IMAGESIMAGE_NAME_CANNOT_BE_NULL;
+
+	public static String SEAM_VIEW_LAYOUT_ACTION_GROUP_FLAT;
+
+	public static String SEAM_VIEW_LAYOUT_ACTION_GROUP_HIERARCHICAL;
+
+	public static String SEAM_VIEW_LAYOUT_ACTION_GROUP_LABEL;
+
+	public static String SEAM_VIEW_LAYOUT_ACTION_GROUP_NODE;
+
+	public static String SEAM_VIEW_LAYOUT_ACTION_GROUP_SCOPE_PRESENTATION;
+
+	public static String SEAM_VIEW_LAYOUT_ACTION_GROUP_SEAM_PACKAGES;
+
+	public static String SEAM_WIZARD_FACTORY_BEAN_NAME;
+
+	public static String SEAM_WIZARD_FACTORY_LOCAL_INTERFACE_NAME;
+
+	public static String SEAM_WIZARD_FACTORY_MASTER_PAGE_NAME;
+
+	public static String SEAM_WIZARD_FACTORY_METHOD_NAME;
+
+	public static String SEAM_WIZARD_FACTORY_PAGE_NAME;
+
+	public static String SEAM_WIZARD_FACTORY_SEAM_COMPONENT_NAME;
+
+	public static String SEAM_WIZARD_FACTORY_PACKAGE_NAME;
+
+	public static String SEAM_WIZARD_FACTORY_SEAM_ENTITY_CLASS_NAME;
+
+	public static String SEAM_WIZARD_FACTORY_SEAM_PROJECT;
+
+	public static String SELECT_SEAM_PROJECT_ACTION_BROWSE;
+	
+	public static String SHOW_PROJECT_SETTINGS_ACTION;
+
+	public static String VALIDATOR_FACTORY_CANNOT_FIND_SEAM_RUNTIME;
+
+	public static String VALIDATOR_FACTORY_COMPONENT_NAME_IS_NOT_VALID;
+
+	public static String VALIDATOR_FACTORY_CONNECTION_PROFILE_IS_NOT_SELECTED;
+
+	public static String VALIDATOR_FACTORY_DRIVER_CLASS_PROPERTY_IS_EMPTY_FOR_SELECTED_CONNECTION_PROFILE;
+
+	public static String VALIDATOR_FACTORY_HOME_FOLDER_POINTS_TO_LOCATION_THAT_DOES_NOT_LOOK_LIKE_SEAM_HOME_FOLDER;
+
+	public static String VALIDATOR_FACTORY_JBOSS_AS_HOME_FOLDER_DOES_NOT_EXIST;
+
+	public static String VALIDATOR_FACTORY_JBOSS_AS_HOME_FOLDER_POINT_TO_LOCATION_THAT_DOES_NOT_LOOK_LIKE_JBOSS_AS_HOME_FOLDER;
+
+	public static String VALIDATOR_FACTORY_LOCAL_INTERFACE_NAME_IS_NOT_VALID;
+
+	public static String VALIDATOR_FACTORY_NAME_IS_NOT_VALID;
+	
+	public static String VALIDATOR_FACTORY_COMPONENT_ALREADY_EXISTS;
+
+	public static String VALIDATOR_FACTORY_PRJ_NOT_SELECTED;
+
+	public static String VALIDATOR_FACTORY_PROJECT_DOES_NOT_EXIST;
+
+	public static String VALIDATOR_FACTORY_SEAM_HOME_FOLDER_DOES_NOT_EXISTS;
+
+	public static String VALIDATOR_FACTORY_SEAM_RT_CANNOT_BE_FOUND;
+
+	public static String VALIDATOR_FACTORY_SEAM_RT_HOME_DIR_DOES_NOT_EXIST;
+
+	public static String VALIDATOR_FACTORY_SEAM_RT_HOME_DIR_IS_MISSING;
+
+	public static String VALIDATOR_FACTORY_SEAM_RT_NOT_CONFIGURED;
+
+	public static String VALIDATOR_FACTORY_SEAM_RT_RESOURCES_DIR_IS_MISSING;
+
+	public static String VALIDATOR_FACTORY_SEAM_RT_SOURCE_TEMPLATES_DIR_DOES_NOT_EXIST;
+
+	public static String VALIDATOR_FACTORY_SEAM_RT_SRC_DIR_IS_MISSING;
+
+	public static String VALIDATOR_FACTORY_SEAM_RT_TEMPLATES_DIR_DOES_NOT_EXIST;
+
+	public static String VALIDATOR_FACTORY_SEAM_RT_TEMPLATES_DIR_IS_MISSING;
+
+	public static String VALIDATOR_FACTORY_SEAM_RT_VIE_TEMPLATE_DIR_DOES_NOT_EXIST;
+
+	public static String VALIDATOR_FACTORY_SEAM_RT_VIEW_DIR_IS_MISSING;
+
+	public static String VALIDATOR_FACTORY_SEAM_RUNTIME_IS_NOT_SELECTED;
+
+	public static String VALIDATOR_FACTORY_SELECTED_PRJ_IS_CLOSED;
+
+	public static String VALIDATOR_FACTORY_SELECTED_PROJECT_IS_NOT_A_SEAM_WEB_PROJECT;
+	
+	public static String VALIDATOR_FACTORY_TEST_PROJECT_ALREADY_EXISTS;
+	
+	public static String VALIDATOR_FACTORY_TEST_PROJECT_CANNOT_BE_EMPTY;
+	
+	public static String VALIDATOR_FACTORY_EAR_PROJECT_ALREADY_EXISTS;
+	
+	public static String VALIDATOR_FACTORY_EAR_PROJECT_CANNOT_BE_EMPTY;
+	
+	public static String VALIDATOR_FACTORY_EJB_PROJECT_ALREADY_EXISTS;
+	
+	public static String VALIDATOR_FACTORY_EJB_PROJECT_CANNOT_BE_EMPTY;
+	
+	public static String VALIDATOR_INVALID_SETTINGS;
+
+	public static String SEAM_TARGET_SERVER;
+
+	public static String RUNTIME_DELETE_CONFIRM_TITLE;
+
+	public static String RUNTIME_DELETE_NOT_USED_CONFIRM;
+
+	public static String RUNTIME_DELETE_USED_CONFIRM;
+
+	public static String VIEW_FOLDER_FILED_EDITOR;
+	
+	public static String POJO_CLASS_ALREADY_EXISTS;
+	public static String ENTITY_CLASS_ALREADY_EXISTS;
+	public static String PAGE_ALREADY_EXISTS;
+	public static String MASTER_PAGE_ALREADY_EXISTS;
+	
+	public static String FIND_DECLARATIONS_ACTION_ACTION_NAME;
+	public static String FIND_DECLARATIONS_ACTION_DESCRIPTION;
+	public static String FIND_DECLARATIONS_ACTION_TOOL_TIP;
+
+	public static String FIND_REFERENCES_ACTION_ACTION_NAME;
+	public static String FIND_REFERENCES_ACTION_DESCRIPTION;
+	public static String FIND_REFERENCES_ACTION_TOOL_TIP;
+
+	public static String SeamSearchQuery_label;
+
+	public static String SeamSearchQuery_singularPatternWithLimitTo;
+	public static String SeamSearchQuery_pluralPatternWithLimitTo;
+
+	public static String SeamSearchScope_scope_empty;
+	public static String SeamSearchScope_scope_single;
+	public static String SeamSearchScope_scope_double;
+	public static String SeamSearchScope_scope_multiple;
+
+	public static String SeamSearchScope_scope_LimitToDeclarations;
+	public static String SeamSearchScope_scope_LimitToReferences;
+	public static String SeamSearchQuery_pluralPattern;
+	public static String SeamSearchQuery_singularLabel;
+
+	public static String SeamSearchVisitor_scanning;
+
+	public static String SeamSearch;
+	
+	public static String SeamQuickFixFindDeclarations;
+	public static String SeamQuickFixFindReferences;
+
+	public static String SeamRuntimeListFieldEditor_ActionAdd;
+
+	public static String SeamRuntimeListFieldEditor_ActionEdit;
+
+	public static String SeamRuntimeListFieldEditor_ActionRemove;
+	
+	public static String SEAM_REFACTOR;
+
+	public static String RENAME_SEAM_COMPONENT;
+	
+	public static String RENAME_SEAM_CONTEXT_VARIABLE;
+	
+	public static String FIND_USAGES_IN_EL;
+	
+	public static String SEAM_COMPONENT_RENAME_HANDLER_ERROR;
+	
+	public static String DELETE_NAME_ANNOTATION_MARKER_RESOLUTION_TITLE;
+
+	public static String DELETE_REMOVE_ANNOTATION_MARKER_RESOLUTION_TITLE;
+
+	public static String DELETE_DESTROY_ANNOTATION_MARKER_RESOLUTION_TITLE;
+	
+	public static String DELETE_CREATE_ANNOTATION_MARKER_RESOLUTION_TITLE;
+	
+	public static String DELETE_UNWRAP_ANNOTATION_MARKER_RESOLUTION_TITLE;
+
+	public static String DELETE_OBSERVER_ANNOTATION_MARKER_RESOLUTION_TITLE;
+	
+	public static String ADD_NAME_ANNOTATION_MARKER_RESOLUTION_TITLE;
+	
+	public static String RENAME_NAME_ANNOTATION_MARKER_RESOLUTION_TITLE;
+	
+	public static String ADD_ANNOTATED_REMOVE_METHOD_MARKER_RESOLUTION_TITLE;
+	
+	public static String ADD_ANNOTATED_DESTROY_METHOD_MARKER_RESOLUTION_TITLE;
+	
+	public static String CHANGE_SCOPETYPE_MARKER_RESOLUTION_TITLE;
+	
+	public static String ADD_SETTER_MARKER_RESOLUTION_TITLE;
+	
+	public static String ADD_NEW_SEAM_RUNTIME_MARKER_RESOLUTION_TITLE;
+
 }
\ No newline at end of file
Index: src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDataModelProvider.java
===================================================================
--- src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDataModelProvider.java	(revision 39311)
+++ src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDataModelProvider.java	(working copy)
@@ -12,10 +12,12 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Map;
 import java.util.Set;
 
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.wst.common.componentcore.datamodel.FacetInstallDataModelProvider;
 import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
@@ -207,6 +209,33 @@
 
 	/*
 	 * (non-Javadoc)
+	 * @see org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider#validate(java.lang.String)
+	 */
+	@Override
+    public IStatus validate(String name) {
+		IStatus status = OK_STATUS;
+		Map<String, IStatus> errors = null;
+		if(name.equals(SEAM_RUNTIME_NAME)) {
+			String seamRuntimeName = getStringProperty(SEAM_RUNTIME_NAME);
+			errors = SeamValidatorFactory.SEAM_RUNTIME_NAME_VALIDATOR.validate(seamRuntimeName, null);
+		} else if(name.equals(SEAM_CONNECTION_PROFILE)) {
+			String connectionName = getStringProperty(SEAM_CONNECTION_PROFILE);
+			errors = SeamValidatorFactory.CONNECTION_PROFILE_VALIDATOR.validate(connectionName, null);
+		} else if(name.equals(ENTITY_BEAN_PACKAGE_NAME)) {
+			String packageName = getStringProperty(ENTITY_BEAN_PACKAGE_NAME);
+			errors = SeamValidatorFactory.PACKAGE_NAME_VALIDATOR.validate(packageName, null);
+		} else if(name.equals(SESSION_BEAN_PACKAGE_NAME)) {
+			String packageName = getStringProperty(SESSION_BEAN_PACKAGE_NAME);
+			errors = SeamValidatorFactory.PACKAGE_NAME_VALIDATOR.validate(packageName, null);
+		}
+		if(errors!=null && !errors.isEmpty()) {
+			status = errors.values().iterator().next();
+		}
+    	return status;
+    }
+
+	/*
+	 * (non-Javadoc)
 	 * @see org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider#init()
 	 */
 	@Override
Index: src/org/jboss/tools/seam/internal/core/project/facet/SeamValidatorFactory.java
===================================================================
--- src/org/jboss/tools/seam/internal/core/project/facet/SeamValidatorFactory.java	(revision 39311)
+++ src/org/jboss/tools/seam/internal/core/project/facet/SeamValidatorFactory.java	(working copy)
@@ -8,7 +8,7 @@
  * Contributors:
  *     Red Hat, Inc. - initial API and implementation
  ******************************************************************************/
-package org.jboss.tools.seam.ui.internal.project.facet;
+package org.jboss.tools.seam.internal.core.project.facet;
 
 import java.io.File;
 import java.util.Map;
@@ -36,11 +36,10 @@
 import org.jboss.tools.common.ui.ValidatorFactory;
 import org.jboss.tools.seam.core.ISeamComponent;
 import org.jboss.tools.seam.core.ISeamProject;
+import org.jboss.tools.seam.core.SeamCoreMessages;
 import org.jboss.tools.seam.core.SeamCorePlugin;
 import org.jboss.tools.seam.core.project.facet.SeamRuntime;
 import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager;
-import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties;
-import org.jboss.tools.seam.ui.SeamUIMessages;
 
 /**
  * 
@@ -60,7 +59,7 @@
 			if (!errors.isEmpty()) {
 				errors = createErrorMap();
 				errors.put(ISeamFacetDataModelProperties.JBOSS_SEAM_HOME, new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID,
-					SeamUIMessages.VALIDATOR_FACTORY_SEAM_HOME_FOLDER_DOES_NOT_EXISTS));
+					SeamCoreMessages.VALIDATOR_FACTORY_SEAM_HOME_FOLDER_DOES_NOT_EXISTS));
 				return errors;
 			}
 			String version = (String) context;
@@ -72,7 +71,7 @@
 					errors = createErrorMap();
 					errors.put(ISeamFacetDataModelProperties.JBOSS_SEAM_HOME,
 							new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, 
-									SeamUIMessages.VALIDATOR_FACTORY_HOME_FOLDER_POINTS_TO_LOCATION_THAT_DOES_NOT_LOOK_LIKE_SEAM_HOME_FOLDER));
+									SeamCoreMessages.VALIDATOR_FACTORY_HOME_FOLDER_POINTS_TO_LOCATION_THAT_DOES_NOT_LOOK_LIKE_SEAM_HOME_FOLDER));
 				}
 			} else {
 				File seamJarFile = new File(value.toString(), "jboss-seam.jar"); //$NON-NLS-1$
@@ -80,7 +79,7 @@
 					errors = createErrorMap();
 					errors.put(ISeamFacetDataModelProperties.JBOSS_SEAM_HOME,
 							new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, 
-									SeamUIMessages.VALIDATOR_FACTORY_HOME_FOLDER_POINTS_TO_LOCATION_THAT_DOES_NOT_LOOK_LIKE_SEAM_HOME_FOLDER));
+									SeamCoreMessages.VALIDATOR_FACTORY_HOME_FOLDER_POINTS_TO_LOCATION_THAT_DOES_NOT_LOOK_LIKE_SEAM_HOME_FOLDER));
 				}
 			}
 
@@ -99,13 +98,13 @@
 				errors = createErrorMap();
 				errors.put(ISeamFacetDataModelProperties.JBOSS_AS_HOME,
 						new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID,
-								SeamUIMessages.VALIDATOR_FACTORY_JBOSS_AS_HOME_FOLDER_DOES_NOT_EXIST));
+								SeamCoreMessages.VALIDATOR_FACTORY_JBOSS_AS_HOME_FOLDER_DOES_NOT_EXIST));
 				return errors;
 			}
 			if (!new File(value.toString(), "bin/twiddle.jar").isFile()) { //$NON-NLS-1$
 				errors.put(ISeamFacetDataModelProperties.JBOSS_AS_HOME,
 					new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID,
-						SeamUIMessages.VALIDATOR_FACTORY_JBOSS_AS_HOME_FOLDER_POINT_TO_LOCATION_THAT_DOES_NOT_LOOK_LIKE_JBOSS_AS_HOME_FOLDER));
+						SeamCoreMessages.VALIDATOR_FACTORY_JBOSS_AS_HOME_FOLDER_POINT_TO_LOCATION_THAT_DOES_NOT_LOOK_LIKE_JBOSS_AS_HOME_FOLDER));
 			}
 			return errors;
 		}
@@ -124,7 +123,7 @@
 			IProblem[] problems = compilationUnit.getProblems();
 			if (problems.length > 0) {
 				return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID,
-					Messages.format(SeamUIMessages.VALIDATOR_FACTORY_COMPONENT_NAME_IS_NOT_VALID,
+					Messages.format(SeamCoreMessages.VALIDATOR_FACTORY_COMPONENT_NAME_IS_NOT_VALID,
 						problems[0].getMessage())));
 			}
 			return SeamValidatorFactory.NO_ERRORS;
@@ -167,18 +166,18 @@
 				ISeamProject seamProject = (ISeamProject)context;
 				ISeamComponent component = seamProject.getComponent(name);
 				if(component != null)
-					return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS.bind(SeamUIMessages.VALIDATOR_FACTORY_COMPONENT_ALREADY_EXISTS, name)));
+					return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS.bind(SeamCoreMessages.VALIDATOR_FACTORY_COMPONENT_ALREADY_EXISTS, name)));
 			}
 			
 			String[] segs = name.split("\\.");//$NON-NLS-1$
 			for(String segm : segs){
 				if(!segm.trim().equals(segm))
-					return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_NAME_IS_NOT_VALID));
+					return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamCoreMessages.VALIDATOR_FACTORY_NAME_IS_NOT_VALID));
 				
 				IStatus status = JavaConventions.validateClassFileName(segm
 						+ ".class", DEFAULT_SOURCE_LEVEL, DEFAULT_COMPLIANCE_LEVEL); //$NON-NLS-1$
 				if (!status.isOK())
-					return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_NAME_IS_NOT_VALID));
+					return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamCoreMessages.VALIDATOR_FACTORY_NAME_IS_NOT_VALID));
 			}
 			return NO_ERRORS;
 		}
@@ -204,7 +203,7 @@
 			IStatus status = JavaConventions.validateJavaTypeName(value.toString(),
 					getCompilerSourceLevel(jProject), getCompilerComplianceLevel(jProject));			
 			if (((IStatus.ERROR | IStatus.WARNING) & status.getSeverity()) != 0) {
-				return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_LOCAL_INTERFACE_NAME_IS_NOT_VALID
+				return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamCoreMessages.VALIDATOR_FACTORY_LOCAL_INTERFACE_NAME_IS_NOT_VALID
 						+ status.getMessage()));
 			}
 			return NO_ERRORS;
@@ -229,7 +228,7 @@
 			
 			if (status.getSeverity() == IStatus.ERROR){
 				return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID,
-						NLS.bind(SeamUIMessages.VALIDATOR_FACTORY_NAME_IS_NOT_VALID, targetName)));
+						NLS.bind(SeamCoreMessages.VALIDATOR_FACTORY_NAME_IS_NOT_VALID, targetName)));
 			}
 
 			return NO_ERRORS;
@@ -251,7 +250,7 @@
 			if ("".equals(value) //$NON-NLS-1$
 					|| !project.getLocation().isValidSegment(value.toString()))
 				return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID,
-						NLS.bind(SeamUIMessages.VALIDATOR_FACTORY_NAME_IS_NOT_VALID, targetName)));
+						NLS.bind(SeamCoreMessages.VALIDATOR_FACTORY_NAME_IS_NOT_VALID, targetName)));
 
 			return NO_ERRORS;
 		}
@@ -261,7 +260,7 @@
 		public Map<String, IStatus> validate(Object value, Object context) {
 
 			if (value == null || "".equals(value)) { //$NON-NLS-1$
-				return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_PRJ_NOT_SELECTED));
+				return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamCoreMessages.VALIDATOR_FACTORY_PRJ_NOT_SELECTED));
 			}
 			IResource project = ResourcesPlugin.getWorkspace().getRoot()
 					.findMember(value.toString());
@@ -269,7 +268,7 @@
 			if (project == null || !(project instanceof IProject)
 					|| !project.exists()) {
 				return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, 
-						NLS.bind(SeamUIMessages.VALIDATOR_FACTORY_PROJECT_DOES_NOT_EXIST,
+						NLS.bind(SeamCoreMessages.VALIDATOR_FACTORY_PROJECT_DOES_NOT_EXIST,
 						value)));
 			} else {
 				IProject selection = (IProject) project;
@@ -284,7 +283,7 @@
 							// .getProjectFacet("jst.web"))
 							|| ""	.equals(SeamCorePlugin.getSeamPreferences(selection).get(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS, ""))) { //$NON-NLS-1$
 						return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, 
-								NLS.bind(SeamUIMessages.VALIDATOR_FACTORY_SELECTED_PROJECT_IS_NOT_A_SEAM_WEB_PROJECT,
+								NLS.bind(SeamCoreMessages.VALIDATOR_FACTORY_SELECTED_PROJECT_IS_NOT_A_SEAM_WEB_PROJECT,
 								project.getName())));
 					} else {
 						// TODO validate project(s) structure
@@ -294,7 +293,7 @@
 					// name typed by hand
 					return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
 							.bind(
-									SeamUIMessages.VALIDATOR_FACTORY_SELECTED_PRJ_IS_CLOSED,
+									SeamCoreMessages.VALIDATOR_FACTORY_SELECTED_PRJ_IS_CLOSED,
 									project.getName())));
 				}
 			}
@@ -314,7 +313,7 @@
 			if (!allowEmptyConnection && (value == null || "".equals(value.toString().trim()))) { //$NON-NLS-1$
 				return createErrormessage(
 						ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE,
-						new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_CONNECTION_PROFILE_IS_NOT_SELECTED));
+						new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamCoreMessages.VALIDATOR_FACTORY_CONNECTION_PROFILE_IS_NOT_SELECTED));
 			} else {
 				IConnectionProfile connProfile = ProfileManager.getInstance()
 						.getProfileByName(value.toString());
@@ -326,7 +325,7 @@
 					return createErrormessage(
 							ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE,
 							new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, 
-									NLS.bind(SeamUIMessages.VALIDATOR_FACTORY_DRIVER_CLASS_PROPERTY_IS_EMPTY_FOR_SELECTED_CONNECTION_PROFILE,
+									NLS.bind(SeamCoreMessages.VALIDATOR_FACTORY_DRIVER_CLASS_PROPERTY_IS_EMPTY_FOR_SELECTED_CONNECTION_PROFILE,
 									value)));
 				}
 			}
@@ -345,7 +344,7 @@
 			if (value == null || "".equals(value.toString().trim())) { //$NON-NLS-1$
 				errors = createErrormessage(
 						ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,
-						new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_SEAM_RUNTIME_IS_NOT_SELECTED));
+						new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamCoreMessages.VALIDATOR_FACTORY_SEAM_RUNTIME_IS_NOT_SELECTED));
 			} else {
 				SeamRuntime rt = SeamRuntimeManager.getInstance()
 						.findRuntimeByName(value.toString());
@@ -354,42 +353,42 @@
 							ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,
 							new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
 									.bind(
-											SeamUIMessages.VALIDATOR_FACTORY_CANNOT_FIND_SEAM_RUNTIME,
+											SeamCoreMessages.VALIDATOR_FACTORY_CANNOT_FIND_SEAM_RUNTIME,
 											value)));
 				} else if (!new File(rt.getHomeDir()).exists()) {
 					errors = createErrormessage(
 							ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,
 							new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
 									.bind(
-											SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_HOME_DIR_IS_MISSING,
+											SeamCoreMessages.VALIDATOR_FACTORY_SEAM_RT_HOME_DIR_IS_MISSING,
 											value)));
 				} else if (!new File(rt.getSeamGenDir()).exists()) {
 					errors = createErrormessage(
 							ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,
 							new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
 									.bind(
-											SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_TEMPLATES_DIR_IS_MISSING,
+											SeamCoreMessages.VALIDATOR_FACTORY_SEAM_RT_TEMPLATES_DIR_IS_MISSING,
 											value)));
 				} else if (!new File(rt.getSrcTemplatesDir()).exists()) {
 					errors = createErrormessage(
 							ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,
 							new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
 									.bind(
-											SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_SRC_DIR_IS_MISSING,
+											SeamCoreMessages.VALIDATOR_FACTORY_SEAM_RT_SRC_DIR_IS_MISSING,
 											value)));
 				} else if (!new File(rt.getViewTemplatesDir()).exists()) {
 					errors = createErrormessage(
 							ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,
 							new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
 									.bind(
-											SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_VIEW_DIR_IS_MISSING,
+											SeamCoreMessages.VALIDATOR_FACTORY_SEAM_RT_VIEW_DIR_IS_MISSING,
 											value)));
 				} else if (!new File(rt.getResourceTemplatesDir()).exists()) {
 					errors = createErrormessage(
 							ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,
 							new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
 									.bind(
-											SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_RESOURCES_DIR_IS_MISSING,
+											SeamCoreMessages.VALIDATOR_FACTORY_SEAM_RT_RESOURCES_DIR_IS_MISSING,
 											value)));
 				}
 			}
@@ -403,34 +402,34 @@
 			Map<String, IStatus> errors = NO_ERRORS;
 
 			if (value == null || "".equals(value)) { //$NON-NLS-1$
-				errors = createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_NOT_CONFIGURED));
+				errors = createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamCoreMessages.VALIDATOR_FACTORY_SEAM_RT_NOT_CONFIGURED));
 			} else {
 				SeamRuntime rt = SeamRuntimeManager.getInstance()
 						.findRuntimeByName(value.toString());
 				if (rt == null) {
 					errors = createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
 							.bind(
-									SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_CANNOT_BE_FOUND,
+									SeamCoreMessages.VALIDATOR_FACTORY_SEAM_RT_CANNOT_BE_FOUND,
 									value)));
 				} else if (!new File(rt.getHomeDir()).exists()) {
 					errors = createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
 							.bind(
-									SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_HOME_DIR_DOES_NOT_EXIST,
+									SeamCoreMessages.VALIDATOR_FACTORY_SEAM_RT_HOME_DIR_DOES_NOT_EXIST,
 									value)));
 				} else if (!new File(rt.getSeamGenDir()).exists()) {
 					errors = createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
 							.bind(
-									SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_TEMPLATES_DIR_DOES_NOT_EXIST,
+									SeamCoreMessages.VALIDATOR_FACTORY_SEAM_RT_TEMPLATES_DIR_DOES_NOT_EXIST,
 									value)));
 				} else if (!new File(rt.getSrcTemplatesDir()).exists()) {
 					errors = createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
 							.bind(
-									SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_SOURCE_TEMPLATES_DIR_DOES_NOT_EXIST,
+									SeamCoreMessages.VALIDATOR_FACTORY_SEAM_RT_SOURCE_TEMPLATES_DIR_DOES_NOT_EXIST,
 									value)));
 				} else if (!new File(rt.getViewTemplatesDir()).exists()) {
 					errors = createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
 							.bind(
-									SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_VIE_TEMPLATE_DIR_DOES_NOT_EXIST,
+									SeamCoreMessages.VALIDATOR_FACTORY_SEAM_RT_VIE_TEMPLATE_DIR_DOES_NOT_EXIST,
 									value)));
 					// } else if(!new
 					// File(rt.getResourceTemplatesDir()).exists()) {
Index: META-INF/MANIFEST.MF
===================================================================
--- META-INF/MANIFEST.MF	(revision 39311)
+++ META-INF/MANIFEST.MF	(working copy)
@@ -38,7 +38,8 @@
  org.jboss.tools.jsf,
  org.eclipse.jem.util;bundle-version="2.1.2",
  org.eclipse.debug.core;bundle-version="3.7.0",
- org.jboss.tools.common.validation
+ org.jboss.tools.common.validation,
+ org.jboss.tools.common.ui
 Bundle-Version: 3.3.0.qualifier
 Export-Package: 
  org.jboss.tools.seam.core,
