Author: akazakov Date: 2011-12-05 18:03:28 -0500 (Mon, 05 Dec 2011) New Revision: 36973 Modified: trunk/central/plugins/org.jboss.tools.central/plugin.xml trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/seam-palette.xml trunk/seam/features/org.jboss.tools.seam.feature/feature.properties trunk/seam/plugins/org.jboss.tools.seam.core/about.properties trunk/seam/plugins/org.jboss.tools.seam.core/plugin.properties trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml trunk/seam/plugins/org.jboss.tools.seam.pages.xml/plugin.properties trunk/seam/plugins/org.jboss.tools.seam.text.ext/plugin.properties trunk/seam/plugins/org.jboss.tools.seam.ui.pages/plugin.properties trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.properties trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties Log: https://issues.jboss.org/browse/JBIDE-10314 Back out "Seam 2" changes, reverting to just "Seam" Modified: trunk/central/plugins/org.jboss.tools.central/plugin.xml =================================================================== --- trunk/central/plugins/org.jboss.tools.central/plugin.xml 2011-12-05 22:48:07 UTC (rev 36972) +++ trunk/central/plugins/org.jboss.tools.central/plugin.xml 2011-12-05 23:03:28 UTC (rev 36973) @@ -138,7 +138,7 @@ <command defaultHandler="org.jboss.tools.central.actions.JBossSeamRuntimePreferencesHandler" - name="JBoss Seam 2 Runtime Preferences" + name="JBoss Seam Runtime Preferences" id="org.jboss.tools.seam.runtime.preferences"> </command> Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/seam-palette.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/seam-palette.xml 2011-12-05 22:48:07 UTC (rev 36972) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/seam-palette.xml 2011-12-05 23:03:28 UTC (rev 36973) @@ -4,7 +4,7 @@ <PageTabHTML DESCRIPTION="" EDITOR_TYPE="" HIDDEN="no" NAME="JBoss" NATURE_TYPE="" SCOPE="project" TABTYPE="HTML" model-entity="SharablePageTabHTML"> - <GroupHTML HIDDEN="no" ICON="" NAME="Seam 2" PREFIX="s" + <GroupHTML HIDDEN="no" ICON="" NAME="Seam" PREFIX="s" SCOPE="project" URI="http://jboss.com/products/seam/taglib" add_taglib="true" library-version="" model-entity="SharableGroupHTML"> <MacroHTML Modified: trunk/seam/features/org.jboss.tools.seam.feature/feature.properties =================================================================== --- trunk/seam/features/org.jboss.tools.seam.feature/feature.properties 2011-12-05 22:48:07 UTC (rev 36972) +++ trunk/seam/features/org.jboss.tools.seam.feature/feature.properties 2011-12-05 23:03:28 UTC (rev 36973) @@ -15,7 +15,7 @@ # This file should be translated. # "featureName" property - name of the feature -featureName=Seam 2 Tools +featureName=Seam Tools # "providerName" property - name of the company that provides the feature providerName=JBoss by Red Hat Modified: trunk/seam/plugins/org.jboss.tools.seam.core/about.properties =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/about.properties 2011-12-05 22:48:07 UTC (rev 36972) +++ trunk/seam/plugins/org.jboss.tools.seam.core/about.properties 2011-12-05 23:03:28 UTC (rev 36973) @@ -1,4 +1,4 @@ -blurb=Seam 2 Tools for Eclipse\n\ +blurb=Seam Tools for Eclipse\n\ \n\ Version: {featureVersion}\n\ \n\ Modified: trunk/seam/plugins/org.jboss.tools.seam.core/plugin.properties =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/plugin.properties 2011-12-05 22:48:07 UTC (rev 36972) +++ trunk/seam/plugins/org.jboss.tools.seam.core/plugin.properties 2011-12-05 23:03:28 UTC (rev 36973) @@ -1,11 +1,11 @@ providerName=JBoss by Red Hat -pluginName=Seam 2 Core +pluginName=Seam Core Bundle-Vendor.0 = JBoss by Red Hat -Bundle-Name.0 = Seam 2 Tools +Bundle-Name.0 = Seam Tools KBProblemName=Seam Problem -KB_REQUIRED_FOR_SEAM=Seam 2 -SeamCoreValidator=Seam 2 Core Validator -SeamELValidationDelegate=Seam 2 EL Validator \ No newline at end of file +KB_REQUIRED_FOR_SEAM=Seam +SeamCoreValidator=Seam Core Validator +SeamELValidationDelegate=Seam EL Validator \ No newline at end of file Modified: trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml 2011-12-05 22:48:07 UTC (rev 36972) +++ trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml 2011-12-05 23:03:28 UTC (rev 36973) @@ -15,7 +15,7 @@ </extension> <extension id="seamnature" - name="Seam 2 Project Nature" + name="Seam Project Nature" point="org.eclipse.core.resources.natures"> <runtime> <run @@ -39,10 +39,10 @@ <project-facet id="jst.seam"> <label> - Seam 2 + Seam </label> <description> - Enables the project to work with JBoss Seam 2 + Enables the project to work with JBoss Seam </description> </project-facet> <project-facet-version Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/plugin.properties =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/plugin.properties 2011-12-05 22:48:07 UTC (rev 36972) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/plugin.properties 2011-12-05 23:03:28 UTC (rev 36973) @@ -1,2 +1,2 @@ providerName=JBoss by Red Hat -pluginName=JBoss Tools Seam 2 Pages XML +pluginName=JBoss Tools Seam Pages XML Modified: trunk/seam/plugins/org.jboss.tools.seam.text.ext/plugin.properties =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.text.ext/plugin.properties 2011-12-05 22:48:07 UTC (rev 36972) +++ trunk/seam/plugins/org.jboss.tools.seam.text.ext/plugin.properties 2011-12-05 23:03:28 UTC (rev 36973) @@ -1,3 +1,3 @@ providerName=JBoss by Red Hat SeamELInJavaStringHyperlinkDetector=Seam EL in Java String -Bundle-Name.0 = Seam 2 Text Editors Extensions \ No newline at end of file +Bundle-Name.0 = Seam Text Editors Extensions \ No newline at end of file Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.properties =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.properties 2011-12-05 22:48:07 UTC (rev 36972) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.properties 2011-12-05 23:03:28 UTC (rev 36973) @@ -1,15 +1,15 @@ # Menus searchMenu.label= Se&arch PreferencePage_Validator=Validator -PreferencePage_Seam=Seam 2 -PreferencePage_SeamValidator=Seam 2 Validator -PreferencePage_SeamSettings=Seam 2 Settings -ViewCategory_Seam=Seam 2 -ViewName_SeamComponents=Seam 2 Components -ConfigureMenu_AddSeamSupport=Add Seam 2 support... -ConfigureMenu_RemoveSeamSupport=Remove Seam 2 support... -perspective.name=Seam 2 +PreferencePage_Seam=Seam +PreferencePage_SeamValidator=Seam Validator +PreferencePage_SeamSettings=Seam Settings +ViewCategory_Seam=Seam +ViewName_SeamComponents=Seam Components +ConfigureMenu_AddSeamSupport=Add Seam support... +ConfigureMenu_RemoveSeamSupport=Remove Seam support... +perspective.name=Seam Bundle-Vendor.0 = JBoss by Red Hat -Bundle-Name.0 = Seam 2 GUI Tools -NavigatorContent_SeamComponents=Seam 2 Components +Bundle-Name.0 = Seam GUI Tools +NavigatorContent_SeamComponents=Seam Components Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2011-12-05 22:48:07 UTC (rev 36972) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2011-12-05 23:03:28 UTC (rev 36973) @@ -11,7 +11,7 @@ <extension point="org.eclipse.ui.newWizards"> <category - name="Seam 2" + name="Seam" id="org.jboss.tools.seam.ui"> </category> <wizard @@ -20,11 +20,11 @@ finalPerspective="org.jboss.tools.seam.ui.SeamPerspective" icon="$nl$/icons/view/seam_project_new.gif" id="org.jboss.tools.seam.ui.wizards.SeamProjectWizard" - name="Seam 2 Web Project" + name="Seam Web Project" preferredPerspectives="org.jboss.tools.seam.ui.SeamPerspective, org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" project="true"> <description> - Create a Seam 2 Web Project + Create a Seam Web Project </description> <selection class="org.eclipse.core.resources.IResource"> @@ -35,9 +35,9 @@ class="org.jboss.tools.seam.ui.wizard.SeamActionWizard" icon="$nl$/icons/seam16.png" id="org.jboss.tools.seam.ui.wizard.SeamActionWizard" - name="Seam 2 Action"> + name="Seam Action"> <description> - Create a Seam 2 Action + Create a Seam Action </description> <selection class="org.eclipse.core.resources.IResource"> @@ -48,9 +48,9 @@ class="org.jboss.tools.seam.ui.wizard.SeamFormWizard" icon="$nl$/icons/seam16.png" id="org.jboss.tools.seam.ui.wizard.SeamFormWizard" - name="Seam 2 Form"> + name="Seam Form"> <description> - Create a Seam 2 Form + Create a Seam Form </description> <selection class="org.eclipse.core.resources.IResource"> @@ -61,9 +61,9 @@ class="org.jboss.tools.seam.ui.wizard.SeamConversationWizard" icon="$nl$/icons/seam16.png" id="org.jboss.tools.seam.ui.wizard.SeamConversationWizard" - name="Seam 2 Conversation"> + name="Seam Conversation"> <description> - Create a Seam 2 Conversation + Create a Seam Conversation </description> <selection class="org.eclipse.core.resources.IResource"> @@ -75,9 +75,9 @@ class="org.jboss.tools.seam.ui.wizard.SeamEntityWizard" icon="$nl$/icons/seam16.png" id="org.jboss.tools.seam.ui.wizard.SeamEntityWizard" - name="Seam 2 Entity"> + name="Seam Entity"> <description> - Create a Seam 2 Entity + Create a Seam Entity </description> <selection class="org.eclipse.core.resources.IResource"> @@ -762,8 +762,8 @@ id="openComponent" mnemonic="Z" icon="$nl$/icons/open_seam_component.gif" - label="Open Seam 2 Component" - tooltip="Open Seam 2 Component" > + label="Open Seam Component" + tooltip="Open Seam Component" > </command> </menuContribution> <menuContribution @@ -775,8 +775,8 @@ id="openComponent" mnemonic="Z" icon="$nl$/icons/open_seam_component.gif" - label="Open Seam 2 Component" - tooltip="Open Seam 2 Component" > + label="Open Seam Component" + tooltip="Open Seam Component" > </command> </toolbar> </menuContribution> @@ -798,16 +798,16 @@ id="findReferences" mnemonic="G" icon="$nl$/icons/find_seam_references.gif" - label="Find Seam 2 References" - tooltip="Find Seam 2 References" > + label="Find Seam References" + tooltip="Find Seam References" > </command> <command commandId="org.jboss.tools.seam.ui.find.declarations" id="findDeclarations" mnemonic="G" icon="$nl$/icons/open_seam_component.gif" - label="Find Seam 2 Declarations" - tooltip="Find Seam 2 Declarations" > + label="Find Seam Declarations" + tooltip="Find Seam Declarations" > </command> <separator name="fileSearchContextMenuActionsGroup"/> <!-- to be used by clients --> Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties 2011-12-05 22:48:07 UTC (rev 36972) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties 2011-12-05 23:03:28 UTC (rev 36973) @@ -1,4 +1,4 @@ -CREATE_NEW_SEAM_PROJECT = Create New Seam 2 Project +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: @@ -7,12 +7,12 @@ 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 2 Facet Settings +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 2 Web Project -SEAM_INSTALL_WIZARD_PAGE_SEAM_RUNTIME=Seam 2 Runtime: +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: @@ -28,9 +28,9 @@ 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 2 Web Projects +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 2 Components +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 @@ -58,10 +58,10 @@ 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 2 Facet +SEAM_INSTALL_WIZARD_PAGE_SEAM_FACET=Seam Facet SEAM_VIEW_LAYOUT_ACTION_GROUP_LABEL=Label -SEAM_PROJECT_WIZARD_NEW_SEAM_PROJECT=New Seam 2 Project -SEAM_PROJECT_WIZARD_SEAM_WEB_PROJECT=Seam 2 Web Project +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 @@ -85,7 +85,7 @@ 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 2 Form +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... @@ -93,15 +93,15 @@ 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 2 Action -SEAM_ACTION_WIZARD_NEW_SEAM_ACTION=New Seam 2 Action +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 2 Entity +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 2 Project +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 @@ -163,7 +163,7 @@ FIND_REFERENCES_ACTION_DESCRIPTION=Find Seam References FIND_REFERENCES_ACTION_TOOL_TIP=Find Seam References VIEW_FOLDER_FILED_EDITOR=View Folder: -SeamSearchQuery_label=Seam 2 {0} Search +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 @@ -179,7 +179,7 @@ # 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 2 Search - " +SeamSearch="Seam Search - " SeamQuickFixFindDeclarations=Find Seam declarations for ''{0}'' SeamQuickFixFindReferences=Find Seam references for ''{0}'' SeamRuntimeListFieldEditor_ActionAdd=&Add @@ -189,9 +189,9 @@ 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 2 Refactor -RENAME_SEAM_COMPONENT = Rename Seam 2 Component -RENAME_SEAM_CONTEXT_VARIABLE = Rename Seam 2 Context Variable +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 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/plugin.properties =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/plugin.properties 2011-12-05 22:48:07 UTC (rev 36972) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/plugin.properties 2011-12-05 23:03:28 UTC (rev 36973) @@ -1,3 +1,3 @@ providerName=JBoss by Red Hat -pluginName=Seam 2 Pages XML +pluginName=Seam Pages XML PreferencePage_SeamPagesDiagram=Seam Pages Diagram