December 2009 - jbosstools-commits

JBoss Tools SVN: r19208 - in trunk: jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: vpakan(a)redhat.com Date: 2009-12-11 09:24:22 -0500 (Fri, 11 Dec 2009) New Revision: 19208 Added: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/WidgetFinderHelper.java Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AddRemoveJSFCapabilitiesTest.java trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTUtilExt.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java Log: Changes to support SWTBot Tests running from Command Line. Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AddRemoveJSFCapabilitiesTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AddRemoveJSFCapabilitiesTest.java 2009-12-11 14:15:30 UTC (rev 19207) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AddRemoveJSFCapabilitiesTest.java 2009-12-11 14:24:22 UTC (rev 19208) @@ -11,22 +11,17 @@ package org.jboss.tools.jsf.ui.bot.test.smoke; -import static org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory.withRegex; - import java.io.File; - -import org.eclipse.swt.browser.Browser; import org.eclipse.swt.widgets.MenuItem; -import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor; import org.eclipse.swtbot.swt.finder.SWTBot; import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; -import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable; -import org.eclipse.swtbot.swt.finder.results.StringResult; import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.jboss.tools.jsf.ui.bot.test.JSFAutoTestCase; +import org.jboss.tools.ui.bot.ext.SWTUtilExt; import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper; +import org.jboss.tools.ui.bot.ext.helper.WidgetFinderHelper; import org.jboss.tools.ui.bot.ext.types.IDELabel; import org.jboss.tools.ui.bot.test.WidgetVariables; @@ -44,7 +39,6 @@ private static final String CLOSE_PROJECT_POPUP_MENU = "Clo&se Project"; private static final String OPEN_PROJECT_POPUP_MENU = "Op&en Project"; private static final String DELETE_PROJECT_POPUP_MENU = "Delete"; - private static final String IMPORT_PROJECT_POPUP_MENU = "Import Existing JSF Project..."; private static final String JBDS_REMOVE_JSF_CAPABILITIES_POPUP_MENU = "Remove Red Hat Capabilities"; private static final String JBT_REMOVE_JSF_CAPABILITIES_POPUP_MENU = "Remove JSF Capabilities"; @@ -74,164 +68,171 @@ * Import existing JSF Project to Workspace */ private void importJsfProject() { - - openWebProjects(); - - openWebProjects(); - SWTBot webProjects = bot.viewByTitle(WidgetVariables.WEB_PROJECTS).bot(); - SWTBotTree tree = webProjects.tree(); - ContextMenuHelper.prepareTreeItemForContextMenu(tree); - - new SWTBotMenu(ContextMenuHelper.getContextMenu(tree, - IMPORT_PROJECT_POPUP_MENU, false)).click(); - - bot.shell("Import JSF Project").activate(); - String[] parts = System.getProperty("eclipse.commands").split("\n"); - + int index = 0; - for (index = 0;parts.length > index + 1 && !parts[index].equals("-data");index+=2){ + for (index = 0;parts.length > index + 1 && !parts[index].equals("-data");index++){ // do nothing just go through } - + if (parts.length > index + 1){ String webXmlFileLocation = parts[index + 1] + File.separator - + JBT_TEST_PROJECT_NAME + File.separator - + "WebContent" + File.separator - + "WEB-INF" + File.separator - + "web.xml"; + + JBT_TEST_PROJECT_NAME + File.separator + + "WebContent" + File.separator + + "WEB-INF" + File.separator + + "web.xml"; + + bot.menu(IDELabel.Menu.FILE).menu(IDELabel.Menu.IMPORT).click(); + bot.shell(IDELabel.Shell.IMPORT).activate(); + SWTBotTree tree = bot.tree(); + delay(); + tree.expandNode("Other").select("JSF Project"); + bot.button("Next >").click(); + bot.shell(IDELabel.Shell.IMPORT_JSF_PROJECT).activate(); + bot.textWithLabel("web.xml Location*").setText(webXmlFileLocation); - } - else{ - throw new RuntimeException("eclipse.commands property doesn't contain -data option"); - } - bot.button(WidgetVariables.NEXT_BUTTON).click(); - // Specify Application Server for Deployment - bot.button(WidgetVariables.NEW_BUTTON, 1).click(); - bot.shell("New Server").activate(); - bot.tree().expandNode("JBoss Enterprise Middleware") - .select("JBoss Enterprise Application Platform 4.3"); - bot.button(WidgetVariables.FINISH_BUTTON).click(); - delay(); - // Finish Import - bot.button(WidgetVariables.FINISH_BUTTON).click(); - bot.shell("Warning").activate(); - bot.button(WidgetVariables.CONTINUE_BUTTON).click(); - - waitForBlockingJobsAcomplished(BUILDING_WS); - // Start Application Server - openServerView(); - SWTBot servers = bot.viewByTitle(WidgetVariables.SERVERS) - .bot(); - SWTBotTree serverTree = servers.tree(); - - ContextMenuHelper.prepareTreeItemForContextMenu(serverTree); - - new SWTBotMenu(ContextMenuHelper.getContextMenu(serverTree, - "Start", false)).click(); - waitForBlockingJobsAcomplished(45*1000L,STARTING_JBOSS_EAP_43_RUNTIME); - // Run it on server - openPackageExplorer(); - SWTBot packageExplorer = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER) + bot.button(WidgetVariables.NEXT_BUTTON).click(); + // Default Application Server is the one bundled with JBDS Installation + String asStartingJob = IDELabel.ServerJobName.STARTING_JBOSS_EAP; + String asStoppingJob = IDELabel.ServerJobName.STOPPING_JBOSS_EAP; + // Check if there is defined Application Server if not create one + boolean isServerDefined = false; + try{ + bot.label(IDELabel.ImportJSFProjectDialog.CHOICE_LIST_IS_EMPTY); + } catch (WidgetNotFoundException wnfe){ + isServerDefined = true; + } + if (!isServerDefined){ + // Specify Application Server for Deployment + bot.button(WidgetVariables.NEW_BUTTON, 1).click(); + bot.shell("New Server").activate(); + bot.tree().expandNode("JBoss Enterprise Middleware") + .select("JBoss Enterprise Application Platform 4.3"); + bot.button(WidgetVariables.FINISH_BUTTON).click(); + // Server Jobs has different labels now + asStartingJob = IDELabel.ServerJobName.STARTING_JBOSS_EAP_43_RUNTIME; + asStoppingJob = IDELabel.ServerJobName.STOPPING_JBOSS_EAP_43_RUNTIME; + } + delay(); + // Finish Import + bot.button(WidgetVariables.FINISH_BUTTON).click(); + bot.shell("Warning").activate(); + bot.button(WidgetVariables.CONTINUE_BUTTON).click(); + + waitForBlockingJobsAcomplished(BUILDING_WS); + // Start Application Server + openServerView(); + SWTBot servers = bot.viewByTitle(WidgetVariables.SERVERS) .bot(); - SWTBotTree packageExplorerTree = packageExplorer.tree(); + SWTBotTree serverTree = servers.tree(); + + ContextMenuHelper.prepareTreeItemForContextMenu(serverTree); + + new SWTBotMenu(ContextMenuHelper.getContextMenu(serverTree, + "Start", false)).click(); + waitForBlockingJobsAcomplished(45*1000L,asStartingJob); + // Run it on server + openPackageExplorer(); + SWTBot packageExplorer = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER) + .bot(); + SWTBotTree packageExplorerTree = packageExplorer.tree(); - packageExplorerTree.setFocus(); + packageExplorerTree.setFocus(); - SWTBotTreeItem packageExplorerTreeItem = packageExplorerTree - .getTreeItem(JBT_TEST_PROJECT_NAME); - packageExplorerTreeItem.select(); - packageExplorerTreeItem.click(); - // Search for Menu Item with Run on Server substring within label - final SWTBotMenu menuRunAs = bot.menu("Run").menu("Run As"); - bot.getDisplay().syncExec(new Runnable() { - public void run() { - int menuItemIndex = 0; - boolean isFound = false; - final MenuItem[] menuItems = menuRunAs.widget.getMenu().getItems(); - while (!isFound && menuItemIndex < menuItems.length){ - if (menuItems[menuItemIndex].getText().indexOf("Run on Server") > - 1){ - isFound = true; + SWTBotTreeItem packageExplorerTreeItem = packageExplorerTree + .getTreeItem(JBT_TEST_PROJECT_NAME); + packageExplorerTreeItem.select(); + packageExplorerTreeItem.click(); + // Search for Menu Item with Run on Server substring within label + final SWTBotMenu menuRunAs = bot.menu("Run").menu("Run As"); + bot.getDisplay().syncExec(new Runnable() { + public void run() { + int menuItemIndex = 0; + boolean isFound = false; + final MenuItem[] menuItems = menuRunAs.widget.getMenu().getItems(); + while (!isFound && menuItemIndex < menuItems.length){ + if (menuItems[menuItemIndex].getText().indexOf("Run on Server") > - 1){ + isFound = true; + } + else{ + menuItemIndex++; + } } + if (isFound){ + setMiRunOnServer(menuItems[menuItemIndex]); + } else{ - menuItemIndex++; + setMiRunOnServer(null); } } - if (isFound){ - setMiRunOnServer(menuItems[menuItemIndex]); - } - else{ - setMiRunOnServer(null); - } + }); + + if (getMiRunOnServer() != null){ + new SWTBotMenu(getMiRunOnServer()).click(); } - }); + else + { + throw new WidgetNotFoundException("Menu item with mnemonic Run on Server"); + } - if (getMiRunOnServer() != null){ - new SWTBotMenu(getMiRunOnServer()).click(); + bot.shell("Run On Server").activate(); + bot.button(WidgetVariables.FINISH_BUTTON).click(); + + waitForBlockingJobsAcomplished(10*1000L , BUILDING_WS); + waitForBlockingJobsAcomplished(10*1000L , UPDATING_INDEXES); + // Check Browser Content + String browserText = WidgetFinderHelper.browserInEditorText(bot, "Input User Name Page",true); + + assertTrue("Displayed HTML page has wrong content", + browserText.indexOf("<TITLE>Input User Name Page</TITLE>") > - 1); + // Stop Application Server and remove Application Server from Server View + openServerView(); + + ContextMenuHelper.prepareTreeItemForContextMenu(serverTree); + + new SWTBotMenu(ContextMenuHelper.getContextMenu(serverTree, + "Stop", false)).click(); + + waitForBlockingJobsAcomplished(10*1000L , asStoppingJob); + + new SWTBotMenu(ContextMenuHelper.getContextMenu(serverTree, + "Delete", false)).click(); + bot.shell("Delete Server").activate(); + bot.button(WidgetVariables.OK_BUTTON).click(); + + setException(null); } - else - { - throw new WidgetNotFoundException("Menu item with mnemonic Run on Server"); + else{ + throw new RuntimeException("eclipse.commands property doesn't contain -data option"); } - - bot.shell("Run On Server").activate(); - bot.button(WidgetVariables.FINISH_BUTTON).click(); - waitForBlockingJobsAcomplished(10*1000L , BUILDING_WS); - waitForBlockingJobsAcomplished(10*1000L , UPDATING_INDEXES); - // Check Browser Content - final SWTBotEditor editor = bot.editorByTitle("Input User Name Page"); - final Browser browser = ((Browser)editor.bot().widgets(withRegex("<HTML><HEAD>.*\n*.*")).get(0)); - final String browserText = UIThreadRunnable - .syncExec(new StringResult() { - public String run() { - return browser.getText(); - } - }); - assertTrue("Displayed HTML page has wrong content", - browserText.indexOf("<TITLE>Input User Name Page</TITLE>") > - 1); - editor.close(); - // Stop Application Server and remove Application Server from Server View - openServerView(); - ContextMenuHelper.prepareTreeItemForContextMenu(serverTree); - - new SWTBotMenu(ContextMenuHelper.getContextMenu(serverTree, - "Stop", false)).click(); - - waitForBlockingJobsAcomplished(10*1000L , STOPPING_JBOSS_EAP_43_RUNTIME); - - new SWTBotMenu(ContextMenuHelper.getContextMenu(serverTree, - "Delete", false)).click(); - bot.shell("Delete Server").activate(); - bot.button(WidgetVariables.OK_BUTTON).click(); - - setException(null); - } /** * Delete JSF Project from workspace */ private void deleteJsfProject() { + + removeJSFTestProjectFromServers(); openPackageExplorer(); + delay(); SWTBot packageExplorer = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER) .bot(); SWTBotTree tree = packageExplorer.tree(); + delay(); ContextMenuHelper.prepareTreeItemForContextMenu(tree, tree.getTreeItem(JBT_TEST_PROJECT_NAME)); - new SWTBotMenu(ContextMenuHelper.getContextMenu(tree, DELETE_PROJECT_POPUP_MENU, false)).click(); - bot.shell("Delete Resources").activate(); bot.button(WidgetVariables.OK_BUTTON).click(); - delay(); + new SWTUtilExt(bot).waitForNonIgnoredJobs(); } @@ -242,9 +243,10 @@ private void removeJSFCapabilities(boolean jbdsIsRunning) { openWebProjects(); - delay(); + removeJSFTestProjectFromServers(); + SWTBot webProjects = bot.viewByTitle(WidgetVariables.WEB_PROJECTS).bot(); SWTBotTree tree = webProjects.tree(); @@ -290,6 +292,7 @@ private void addJSFCapabilities() { openPackageExplorer(); + delay(); SWTBot packageExplorer = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER) .bot(); SWTBotTree tree = packageExplorer.tree(); @@ -344,6 +347,7 @@ private void closeOpenJsfProject() { openPackageExplorer(); + delay(); SWTBot packageExplorer = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER) .bot(); SWTBotTree tree = packageExplorer.tree(); @@ -359,6 +363,8 @@ new SWTBotMenu(ContextMenuHelper.getContextMenu(tree, OPEN_PROJECT_POPUP_MENU, false)).click(); + delay(); + } private void setMiRunOnServer(MenuItem menuItem){ @@ -368,5 +374,37 @@ private MenuItem getMiRunOnServer(){ return miRunOnServer; } + /** + * Remove JSF Test Project from all Servers + */ + private void removeJSFTestProjectFromServers(){ + + openServerView(); + delay(); + + SWTBot servers = bot.viewByTitle(WidgetVariables.SERVERS) + .bot(); + SWTBotTree serverTree = servers.tree(); + + // Expand All + for (SWTBotTreeItem serverTreeItem : serverTree.getAllItems()){ + serverTreeItem.expand(); + // if JSF Test Project is deployed to server remove it + int itemIndex = 0; + SWTBotTreeItem[] serverTreeItemChildren = serverTreeItem.getItems(); + while (itemIndex < serverTreeItemChildren.length + && !serverTreeItemChildren[itemIndex].getText().startsWith(JBT_TEST_PROJECT_NAME)){ + itemIndex++; + } + // Server Tree Item has Child with Text equal to JSF TEst Project + if (itemIndex < serverTreeItemChildren.length){ + ContextMenuHelper.prepareTreeItemForContextMenu(serverTree,serverTreeItemChildren[itemIndex]); + new SWTBotMenu(ContextMenuHelper.getContextMenu(serverTree, IDELabel.Menu.REMOVE, false)).click(); + bot.shell("Server").activate(); + bot.button(WidgetVariables.OK_BUTTON).click(); + } + } + delay(); + } } Modified: trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java 2009-12-11 14:15:30 UTC (rev 19207) +++ trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java 2009-12-11 14:24:22 UTC (rev 19208) @@ -22,8 +22,7 @@ protected static final String VISUAL_UPDATE = "Visual Editor View Update"; protected static final String VISUAL_REFRESH = "Visual Editor Refresh"; protected static final String UPDATING_INDEXES = "Updating indexes"; - protected static final String STARTING_JBOSS_EAP_43_RUNTIME = "Starting JBoss EAP 4.3 Runtime Serve"; - protected static final String STOPPING_JBOSS_EAP_43_RUNTIME = "Stoppig JBoss EAP 4.3 Runtime Server"; + private static Properties SWT_BOT_PROPERTIES; private volatile Throwable exception; public static final String PATH_TO_SWT_BOT_PROPERTIES = "SWTBot.properties"; Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTUtilExt.java =================================================================== --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTUtilExt.java 2009-12-11 14:15:30 UTC (rev 19207) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTUtilExt.java 2009-12-11 14:24:22 UTC (rev 19208) @@ -25,6 +25,7 @@ import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot; import org.eclipse.swtbot.swt.finder.utils.SWTUtils; import org.jboss.tools.ui.bot.ext.types.JobLists; import org.jboss.tools.ui.bot.ext.types.JobState; @@ -39,9 +40,9 @@ public class SWTUtilExt extends SWTUtils { private Logger log = Logger.getLogger(SWTUtilExt.class); - protected SWTBotExt bot; + protected SWTWorkbenchBot bot; - public SWTUtilExt(SWTBotExt bot) { + public SWTUtilExt(SWTWorkbenchBot bot) { this.bot = bot; } Added: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/WidgetFinderHelper.java =================================================================== --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/WidgetFinderHelper.java (rev 0) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/WidgetFinderHelper.java 2009-12-11 14:24:22 UTC (rev 19208) @@ -0,0 +1,69 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ + +package org.jboss.tools.ui.bot.ext.helper; + +import static org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory.widgetOfType; + +import org.eclipse.swt.browser.Browser; +import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot; +import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor; +import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable; +import org.eclipse.swtbot.swt.finder.results.StringResult; + +/** + * Helper to find widgets + * @author Vladimir Pakan + * + */ +public class WidgetFinderHelper { + /** + * Returns Browser contained in Editor with specified Title + * @param bot + * @param editorTitle + * @return + */ + public static Browser browserInEditor(SWTWorkbenchBot bot , String editorTitle){ + return browserInEditor(bot.editorByTitle(editorTitle)); + } + /** + * Returns Browser contained in specified Editor + * @param editor + * @return + */ + public static Browser browserInEditor(SWTBotEditor editor){ + return ((Browser)editor.bot().widgets(widgetOfType(Browser.class)).get(0)); + } + + public static final String browserInEditorText(SWTWorkbenchBot bot , String editorTitle , boolean closeEditor){ + + String browserText = null; + + SWTBotEditor editor = bot.editorByTitle(editorTitle); + + final Browser browser = browserInEditor(editor); + + browserText = UIThreadRunnable + .syncExec(new StringResult() { + public String run() { + return browser.getText(); + } + }); + + if (closeEditor){ + editor.close(); + } + + return browserText; + + } + +} Property changes on: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/WidgetFinderHelper.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java =================================================================== --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2009-12-11 14:15:30 UTC (rev 19207) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2009-12-11 14:24:22 UTC (rev 19208) @@ -40,6 +40,8 @@ public static final String ABOUT_JBOSS_DEVELOPER_STUDIO = "About JBoss Developer Studio"; public static final String HIBERNATE_CODE_GENERATION = "Hibernate Code Generation..."; public static final String HIBERNATE_CODE_GENERATION_CONF = "Hibernate Code Generation Configurations..."; + public static final String REMOVE = "Remove"; + public static final String IMPORT = "Import..."; public static final String RUN_AS = "Run As"; } @@ -69,6 +71,8 @@ public static final String NEW_JSP_FILE = "New JSP File"; public static final String PROPERTIES = "Properties"; public static final String NEW_XHTML_FILE = "New File XHTML"; + public static final String IMPORT_JSF_PROJECT = "Import JSF Project"; + public static final String IMPORT = "Import"; } public class EntityGroup { @@ -195,4 +199,36 @@ public static final String TEMPLATE_FACELET_FORM_XHTML = "FaceletForm.xhtml"; } + + public static final class ServerName { + + public static final String JBOSS_EAP_4_3_RUNTIME_SERVER = "JBoss EAP 4.3 Runtime Server"; + // Server with this Label is created during JBDS installation for bundled EAP + public static final String JBOSS_EAP = "jboss-eap"; + + } + + public static final class ServerRuntimeName { + + public static final String JBOSS_EAP_4_3 = "JBoss EAP 4.3 Runtime"; + // Server Runtime with this Label is created during JBDS installation for bundled EAP + public static final String JBOSS_EAP = "jboss-eap Runtime"; + + } + + public static final class ServerJobName { + + public static final String STARTING_JBOSS_EAP_43_RUNTIME = "Starting JBoss EAP 4.3 Runtime Serve"; + public static final String STOPPING_JBOSS_EAP_43_RUNTIME = "Stoppig JBoss EAP 4.3 Runtime Server"; + public static final String STARTING_JBOSS_EAP = "Starting jboss-eap"; + public static final String STOPPING_JBOSS_EAP = "Stopping jboss-eap"; + + } + + public static class ImportJSFProjectDialog { + + public static final String RUNTIME = "Runtime*"; + public static final String CHOICE_LIST_IS_EMPTY = "Choice list is empty."; + + } }

15 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r19207 - trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper.

by jbosstools-commits＠lists.jboss.org

Author: vpakan(a)redhat.com Date: 2009-12-11 09:15:30 -0500 (Fri, 11 Dec 2009) New Revision: 19207 Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ContextMenuHelper.java Log: Fix error when simulating Mouse Right Click on Empty Tree View. Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ContextMenuHelper.java =================================================================== --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ContextMenuHelper.java 2009-12-11 14:14:08 UTC (rev 19206) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ContextMenuHelper.java 2009-12-11 14:15:30 UTC (rev 19207) @@ -145,7 +145,11 @@ * @param tree */ public static void prepareTreeItemForContextMenu(SWTBotTree tree){ + tree.setFocus(); - tree.select(0); + if (tree.getAllItems().length > 0){ + tree.select(0); + } + } }

15 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r19206 - trunk/jst/tests/org.jboss.tools.ui.bot.ext/META-INF.

by jbosstools-commits＠lists.jboss.org

Author: vpakan(a)redhat.com Date: 2009-12-11 09:14:08 -0500 (Fri, 11 Dec 2009) New Revision: 19206 Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/META-INF/MANIFEST.MF Log: Added Bundle Vendor and Fixed Bundle Name. Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/META-INF/MANIFEST.MF 2009-12-11 14:06:18 UTC (rev 19205) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/META-INF/MANIFEST.MF 2009-12-11 14:14:08 UTC (rev 19206) @@ -25,4 +25,5 @@ org.jboss.tools.ui.bot.ext.helper, org.jboss.tools.ui.bot.ext.types, org.jboss.tools.ui.bot.ext.view +Bundle-Vendor: %providerName

15 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r19205 - in trunk: jst/tests/org.jboss.tools.jst.ui.bot.test/META-INF and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: vpakan(a)redhat.com Date: 2009-12-11 09:06:18 -0500 (Fri, 11 Dec 2009) New Revision: 19205 Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/META-INF/MANIFEST.MF trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/META-INF/MANIFEST.MF trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/META-INF/MANIFEST.MF trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/META-INF/MANIFEST.MF Log: Added Bundle Vendor and Fixed Bundle Name. Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/META-INF/MANIFEST.MF 2009-12-11 13:56:28 UTC (rev 19204) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/META-INF/MANIFEST.MF 2009-12-11 14:06:18 UTC (rev 19205) @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Auto +Bundle-Name: %pluginName Bundle-SymbolicName: org.jboss.tools.jsf.ui.bot.test Bundle-Version: 1.0.0.qualifier Bundle-Activator: org.jboss.tools.jsf.ui.bot.test.Activator @@ -21,3 +21,4 @@ org.jboss.tools.vpe.ui.bot.test Export-Package: org.jboss.tools.jsf.ui.bot.test, org.jboss.tools.jsf.ui.bot.test.cssdialog.jbide +Bundle-Vendor: %providerName Modified: trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/META-INF/MANIFEST.MF 2009-12-11 13:56:28 UTC (rev 19204) +++ trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/META-INF/MANIFEST.MF 2009-12-11 14:06:18 UTC (rev 19205) @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Test +Bundle-Name: %pluginName Bundle-SymbolicName: org.jboss.tools.jst.ui.bot.test;singleton:=true Bundle-Version: 1.0.0 Bundle-Activator: org.jboss.tools.ui.bot.test.Activator @@ -19,3 +19,4 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.jboss.tools.test, org.jboss.tools.ui.bot.test +Bundle-Vendor: %providerName Modified: trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/META-INF/MANIFEST.MF =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/META-INF/MANIFEST.MF 2009-12-11 13:56:28 UTC (rev 19204) +++ trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/META-INF/MANIFEST.MF 2009-12-11 14:06:18 UTC (rev 19205) @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: SWTBotTests +Bundle-Name: %pluginName Bundle-SymbolicName: org.jboss.tools.seam.ui.bot.test;singleton:=true Bundle-Version: 1.0.0.qualifier Bundle-Activator: org.jboss.tools.seam.ui.bot.test.Activator @@ -17,3 +17,4 @@ Eclipse-RegisterBuddy: org.apache.log4j Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-Vendor: %providerName Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/META-INF/MANIFEST.MF =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/META-INF/MANIFEST.MF 2009-12-11 13:56:28 UTC (rev 19204) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/META-INF/MANIFEST.MF 2009-12-11 14:06:18 UTC (rev 19205) @@ -1,9 +1,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: SWTBotTests +Bundle-Name: %pluginName Bundle-SymbolicName: org.jboss.tools.vpe.ui.bot.test Bundle-Version: 1.0.0 Bundle-Activator: org.jboss.tools.vpe.ui.bot.test.Activator +Bundle-Vendor: %providerName Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.jboss.tools.jst.ui.bot.test;bundle-version="1.0.0",

15 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r19204 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor.

by jbosstools-commits＠lists.jboss.org

Author: dmaliarevich Date: 2009-12-11 08:56:28 -0500 (Fri, 11 Dec 2009) New Revision: 19204 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java Log: https://jira.jboss.org/jira/browse/JBIDE-3996, VPE update delay time was restored. Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2009-12-11 13:02:38 UTC (rev 19203) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2009-12-11 13:56:28 UTC (rev 19204) @@ -358,7 +358,7 @@ elReferenceListListener.addChangeListener(this); // initialization of vpe update delay time - vpeUpdateDelayTime = 0; + vpeUpdateDelayTime = 400; // pageContext.fireTaglibsChanged(); @@ -564,7 +564,7 @@ } else { uiJob.cancel(); uiJob.schedule(getVpeUpdateDelayTime()); - setVpeUpdateDelayTime(0); + setVpeUpdateDelayTime(400); } return;

15 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r19203 - trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2009-12-11 08:02:38 -0500 (Fri, 11 Dec 2009) New Revision: 19203 Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/ELParserImpl.java Log: https://jira.jboss.org/jira/browse/JBIDE-5442 Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/ELParserImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/ELParserImpl.java 2009-12-11 12:40:14 UTC (rev 19202) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/ELParserImpl.java 2009-12-11 13:02:38 UTC (rev 19203) @@ -85,8 +85,14 @@ } ELInstanceImpl instance = new ELInstanceImpl(); instance.setFirstToken(current); - setNextToken(); - ELExpressionImpl expression = readExpression(); + ELExpressionImpl expression = null; +// setNextToken(); + if(lookUpNextToken(current) != null) { + setNextToken(); + expression = readExpression(); + } else { + current = current.getNextToken(); + } if(expression == null) { //create fake invocation expression expression = new ELPropertyInvocationImpl();

15 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r19202 - documentation/trunk/movies/Reverse_engineering_and_code_generation.

by jbosstools-commits＠lists.jboss.org

Author: smukhina Date: 2009-12-11 07:40:14 -0500 (Fri, 11 Dec 2009) New Revision: 19202 Modified: documentation/trunk/movies/Reverse_engineering_and_code_generation/Reverse_engineering_and_code_generation.wnk Log: JBDS-906- demo updated Modified: documentation/trunk/movies/Reverse_engineering_and_code_generation/Reverse_engineering_and_code_generation.wnk =================================================================== (Binary files differ)

15 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r19201 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core: impl and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2009-12-11 05:51:59 -0500 (Fri, 11 Dec 2009) New Revision: 19201 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/el/CdiElResolver.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java Log: https://jira.jboss.org/jira/browse/JBIDE-4943 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/el/CdiElResolver.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/el/CdiElResolver.java 2009-12-11 07:35:51 UTC (rev 19200) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/el/CdiElResolver.java 2009-12-11 10:51:59 UTC (rev 19201) @@ -101,6 +101,8 @@ beans.add(bean); } } + resolvedBeans.clear(); + resolvedBeans.addAll(beans); } } if (resolvedBeans != null && !resolvedBeans.isEmpty()) { Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2009-12-11 07:35:51 UTC (rev 19200) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2009-12-11 10:51:59 UTC (rev 19201) @@ -51,6 +51,7 @@ Map<IPath, Set<IBean>> beansByPath = new HashMap<IPath, Set<IBean>>(); Map<String, Set<IBean>> beansByName = new HashMap<String, Set<IBean>>(); + Set<IBean> namedBeans = new HashSet<IBean>(); public CDIProject() {} @@ -89,7 +90,9 @@ if(beans == null || beans.isEmpty()) { return result; } - result.addAll(beans); + synchronized (beans) { + result.addAll(beans); + } if(result.size() == 1 || !attemptToResolveAmbiguousNames) { return result; } @@ -306,8 +309,12 @@ } public void rebuildBeans() { - beansByPath.clear(); - beansByName.clear(); + synchronized (beansByPath) { + beansByPath.clear(); + } + synchronized (beansByName) { + beansByName.clear(); + } List<TypeDefinition> typeDefinitions = n.getDefinitions().getTypeDefinitions(); for (TypeDefinition typeDefinition : typeDefinitions) { ClassBean bean = null; @@ -333,17 +340,28 @@ Set<IBean> bs = beansByName.get(name); if(bs == null) { bs = new HashSet<IBean>(); - beansByName.put(name, bs); + synchronized (beansByName) { + beansByName.put(name, bs); + } } - bs.add(bean); + synchronized (bs) { + bs.add(bean); + } + synchronized (namedBeans) { + namedBeans.add(bean); + } } IPath path = bean.getSourcePath(); Set<IBean> bs = beansByPath.get(path); if(bs == null) { bs = new HashSet<IBean>(); - beansByPath.put(path, bs); + synchronized (beansByPath) { + beansByPath.put(path, bs); + } } - bs.add(bean); + synchronized (bs) { + bs.add(bean); + } } /* @@ -351,7 +369,11 @@ * @see org.jboss.tools.cdi.core.IBeanManager#getNamedBeans() */ public Set<IBean> getNamedBeans() { - // TODO - return new HashSet<IBean>(); + Set<IBean> result = new HashSet<IBean>(); + synchronized (namedBeans) { + result.addAll(namedBeans); + } + return result; } + } \ No newline at end of file

15 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r19200 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor.

by jbosstools-commits＠lists.jboss.org

Author: dmaliarevich Date: 2009-12-11 02:35:51 -0500 (Fri, 11 Dec 2009) New Revision: 19200 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java Log: https://jira.jboss.org/jira/browse/JBIDE-3996, VPE update delay time was reduced to 0 sec. The logic was left unchanged, so in the future it could be restored. Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2009-12-10 23:14:28 UTC (rev 19199) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2009-12-11 07:35:51 UTC (rev 19200) @@ -358,7 +358,7 @@ elReferenceListListener.addChangeListener(this); // initialization of vpe update delay time - vpeUpdateDelayTime = 400; + vpeUpdateDelayTime = 0; // pageContext.fireTaglibsChanged(); @@ -564,7 +564,7 @@ } else { uiJob.cancel(); uiJob.schedule(getVpeUpdateDelayTime()); - setVpeUpdateDelayTime(400); + setVpeUpdateDelayTime(0); } return;

15 years, 1 month

1
0
0 / 0

JBoss Tools SVN: r19199 - in trunk/maven/plugins: org.jboss.tools.maven.core/META-INF and 12 other directories.

by jbosstools-commits＠lists.jboss.org

Author: snjeza Date: 2009-12-10 18:14:28 -0500 (Thu, 10 Dec 2009) New Revision: 19199 Added: trunk/maven/plugins/org.jboss.tools.maven.core/plugin.properties trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/Messages.java trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/messages.properties trunk/maven/plugins/org.jboss.tools.maven.seam/plugin.properties trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/Messages.java trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/messages.properties trunk/maven/plugins/org.jboss.tools.maven.ui/plugin.properties trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Messages.java trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/messages.properties Modified: trunk/maven/plugins/org.jboss.tools.maven.core/META-INF/MANIFEST.MF trunk/maven/plugins/org.jboss.tools.maven.core/build.properties trunk/maven/plugins/org.jboss.tools.maven.core/plugin.xml trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/ProjectFacetsFactoryTester.java trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/project/facet/MavenFacetInstallDataModelProvider.java trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/project/facet/MavenFacetInstallDelegate.java trunk/maven/plugins/org.jboss.tools.maven.seam/META-INF/MANIFEST.MF trunk/maven/plugins/org.jboss.tools.maven.seam/build.properties trunk/maven/plugins/org.jboss.tools.maven.seam/plugin.xml trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/JSFProjectConfigurator.java trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/PortletProjectConfigurator.java trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/preferences/SeamConfiguratorPreferencePage.java trunk/maven/plugins/org.jboss.tools.maven.ui/META-INF/MANIFEST.MF trunk/maven/plugins/org.jboss.tools.maven.ui/build.properties trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/libprov/AutoResizeTableLayout.java trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/libprov/DependencyEditingSupport.java trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/libprov/ExclusionEditingSupport.java trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/libprov/MavenUserLibraryProviderInstallPanel.java trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/project/facet/MavenFacetInstallPage.java Log: https://jira.jboss.org/jira/browse/JBIDE-5439 Internationalize Maven feature and plugins Modified: trunk/maven/plugins/org.jboss.tools.maven.core/META-INF/MANIFEST.MF =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.core/META-INF/MANIFEST.MF 2009-12-10 21:02:27 UTC (rev 19198) +++ trunk/maven/plugins/org.jboss.tools.maven.core/META-INF/MANIFEST.MF 2009-12-10 23:14:28 UTC (rev 19199) @@ -1,8 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: JBoss Maven Core +Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.jboss.tools.maven.core; singleton:=true Bundle-Version: 1.0.0.qualifier +Bundle-Localization: plugin Bundle-Activator: org.jboss.tools.maven.core.MavenCoreActivator Require-Bundle: org.eclipse.core.runtime, org.eclipse.wst.common.project.facet.core;visibility:=reexport, @@ -24,7 +25,7 @@ org.eclipse.core.expressions Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Bundle-Vendor: JBoss by Red Hat +Bundle-Vendor: %Bundle-Vendor Export-Package: org.jboss.tools.maven.core, org.jboss.tools.maven.core.internal.project.facet, org.jboss.tools.maven.core.libprov Modified: trunk/maven/plugins/org.jboss.tools.maven.core/build.properties =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.core/build.properties 2009-12-10 21:02:27 UTC (rev 19198) +++ trunk/maven/plugins/org.jboss.tools.maven.core/build.properties 2009-12-10 23:14:28 UTC (rev 19199) @@ -3,4 +3,6 @@ bin.includes = META-INF/,\ .,\ plugin.xml,\ - poms/ + poms/,\ + OSGI-INF/l10n/bundle.properties,\ + plugin.properties Added: trunk/maven/plugins/org.jboss.tools.maven.core/plugin.properties =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.core/plugin.properties (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.core/plugin.properties 2009-12-10 23:14:28 UTC (rev 19199) @@ -0,0 +1,13 @@ +#Properties file for org.jboss.tools.maven.core +Bundle-Vendor = JBoss by Red Hat +Bundle-Name = JBoss Maven Core +JBoss_Maven_Integration=JBoss Maven Integration +Adds_support_for_Maven=Adds support for Maven. +Maven_library_provider=Maven library provider +Maven_JSF_1_2_Libraries=Maven JSF 1.2 Libraries +Maven_JSF_1_1_Libraries=Maven JSF 1.1 Libraries +Hibernate_3_3_2_Libraries=Hibernate 3.3.2 Libraries +Maven_Portlet_1_0_Libraries=Maven Portlet 1.0 Libraries +Maven_Portlet_2_0_Libraries=Maven Portlet 2.0 Libraries +Maven_Portletbridge_2_0_0_ALPHA_Libraries=Maven Portletbridge 2.0.0 ALPHA Libraries +Maven_Portletbridge_2_0_0_ALPHA_Libraries_with_Dependencies=Maven Portletbridge 2.0.0 ALPHA Libraries with Dependencies \ No newline at end of file Modified: trunk/maven/plugins/org.jboss.tools.maven.core/plugin.xml =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.core/plugin.xml 2009-12-10 21:02:27 UTC (rev 19198) +++ trunk/maven/plugins/org.jboss.tools.maven.core/plugin.xml 2009-12-10 23:14:28 UTC (rev 19199) @@ -5,9 +5,9 @@ <extension point="org.eclipse.wst.common.project.facet.core.facets"> <project-facet id="jboss.m2"> - <label>JBoss Maven Integration</label> + <label>%JBoss_Maven_Integration</label> <description> - Adds support for Maven. + %Adds_support_for_Maven </description> <default-version version="1.0"/> </project-facet> @@ -41,7 +41,7 @@ <extension point="org.eclipse.jst.common.project.facet.core.libraryProviders"> <provider id="maven-library-provider" abstract="true"> - <label>Maven library provider</label> + <label>%Maven_library_provider</label> <priority>500</priority> <action type="INSTALL"> <config class="org.jboss.tools.maven.core.libprov.MavenLibraryProviderInstallOperationConfig"/> @@ -67,7 +67,7 @@ <extension point="org.eclipse.jst.common.project.facet.core.libraryProviders"> <provider id="jsf12-maven-library-provider" extends="maven-library-provider"> - <label>Maven JSF 1.2 Libraries</label> + <label>%Maven_JSF_1_2_Libraries</label> <param name="template" value="platform:/plugin/org.jboss.tools.maven.core/poms/jsf-template12.xml"/> <enablement> <and> @@ -84,7 +84,7 @@ <extension point="org.eclipse.jst.common.project.facet.core.libraryProviders"> <provider id="jsf11-maven-library-provider" extends="maven-library-provider"> - <label>Maven JSF 1.1 Libraries</label> + <label>%Maven_JSF_1_1_Libraries</label> <param name="template" value="platform:/plugin/org.jboss.tools.maven.core/poms/jsf-template11.xml"/> <enablement> <and> @@ -101,7 +101,7 @@ <extension point="org.eclipse.jst.common.project.facet.core.libraryProviders"> <provider id="hibernate332-maven-library-provider" extends="maven-library-provider"> - <label>Hibernate 3.3.2 Libraries</label> + <label>%Hibernate_3_3_2_Libraries</label> <param name="template" value="platform:/plugin/org.jboss.tools.maven.core/poms/hibernate332-template.xml"/> <enablement> <and> @@ -121,7 +121,7 @@ <extension point="org.eclipse.jst.common.project.facet.core.libraryProviders"> <provider id="portlet10-maven-library-provider" extends="maven-library-provider"> - <label>Maven Portlet 1.0 Libraries</label> + <label>%Maven_Portlet_1_0_Libraries</label> <param name="template" value="platform:/plugin/org.jboss.tools.maven.core/poms/portlet-template10.xml"/> <enablement> <and> @@ -138,7 +138,7 @@ <extension point="org.eclipse.jst.common.project.facet.core.libraryProviders"> <provider id="portlet20-maven-library-provider" extends="maven-library-provider"> - <label>Maven Portlet 2.0 Libraries</label> + <label>%Maven_Portlet_2_0_Libraries</label> <param name="template" value="platform:/plugin/org.jboss.tools.maven.core/poms/portlet-template20.xml"/> <enablement> <and> @@ -155,7 +155,7 @@ <extension point="org.eclipse.jst.common.project.facet.core.libraryProviders"> <provider id="portletbridge200alpha-maven-library-provider" extends="maven-library-provider"> - <label>Maven Portletbridge 2.0.0 ALPHA Libraries</label> + <label>%Maven_Portletbridge_2_0_0_ALPHA_Libraries</label> <param name="template" value="platform:/plugin/org.jboss.tools.maven.core/poms/portletbridge-template200alpha.xml"/> <enablement> <and> @@ -171,7 +171,7 @@ </extension> <extension point="org.eclipse.jst.common.project.facet.core.libraryProviders"> <provider id="portletbridge200alphadep-maven-library-provider" extends="maven-library-provider"> - <label>Maven Portletbridge 2.0.0 ALPHA Libraries with Dependencies</label> + <label>%Maven_Portletbridge_2_0_0_ALPHA_Libraries_with_Dependencies</label> <param name="template" value="platform:/plugin/org.jboss.tools.maven.core/poms/portletbridge-template200alphadep.xml"/> <enablement> <and> Added: trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/Messages.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/Messages.java (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/Messages.java 2009-12-10 23:14:28 UTC (rev 19199) @@ -0,0 +1,15 @@ +package org.jboss.tools.maven.core; + +import org.eclipse.osgi.util.NLS; + +public class Messages extends NLS { + private static final String BUNDLE_NAME = "org.jboss.tools.maven.core.messages"; //$NON-NLS-1$ + public static String MavenFacetInstallDelegate_Internal_Error_creating_JBoss_Maven_Facet; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() { + } +} Modified: trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/ProjectFacetsFactoryTester.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/ProjectFacetsFactoryTester.java 2009-12-10 21:02:27 UTC (rev 19198) +++ trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/ProjectFacetsFactoryTester.java 2009-12-10 23:14:28 UTC (rev 19199) @@ -31,7 +31,7 @@ ProjectFacetVersion projectFacetVersion = (ProjectFacetVersion) object; facets.add(projectFacetVersion.getProjectFacet().getId()); } - StringTokenizer tokenizer = new StringTokenizer(requiredFacets,","); + StringTokenizer tokenizer = new StringTokenizer(requiredFacets,","); //$NON-NLS-1$ while (tokenizer.hasMoreTokens()) { String requiredFacet = tokenizer.nextToken().trim(); if (!facets.contains(requiredFacet)) { Modified: trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/project/facet/MavenFacetInstallDataModelProvider.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/project/facet/MavenFacetInstallDataModelProvider.java 2009-12-10 21:02:27 UTC (rev 19198) +++ trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/project/facet/MavenFacetInstallDataModelProvider.java 2009-12-10 23:14:28 UTC (rev 19199) @@ -14,6 +14,7 @@ import org.eclipse.wst.common.componentcore.datamodel.FacetInstallDataModelProvider; import org.jboss.tools.maven.core.IJBossMavenConstants; +import org.jboss.tools.maven.core.Messages; /** * @author snjeza @@ -31,22 +32,22 @@ return getDefaultProperty(FACET_PROJECT_NAME); } if (propertyName.equals(IJBossMavenConstants.GROUP_ID)) { - return "org.jboss.tools"; + return "org.jboss.tools"; //$NON-NLS-1$ } if (propertyName.equals(IJBossMavenConstants.VERSION)) { - return "0.0.1-SNAPSHOT"; + return "0.0.1-SNAPSHOT"; //$NON-NLS-1$ } if (propertyName.equals(IJBossMavenConstants.NAME)) { return getDefaultProperty(FACET_PROJECT_NAME); } if (propertyName.equals(IJBossMavenConstants.DESCRIPTION)) { - return ""; + return ""; //$NON-NLS-1$ } if (propertyName.equals(IJBossMavenConstants.PACKAGING)) { - return "war"; + return "war"; //$NON-NLS-1$ } if (propertyName.equals(IJBossMavenConstants.SEAM_MAVEN_VERSION)) { - return ""; + return ""; //$NON-NLS-1$ } if (propertyName.equals(IJBossMavenConstants.REMOVE_WTP_CLASSPATH_CONTAINERS)) { return Boolean.TRUE; Modified: trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/project/facet/MavenFacetInstallDelegate.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/project/facet/MavenFacetInstallDelegate.java 2009-12-10 21:02:27 UTC (rev 19198) +++ trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/project/facet/MavenFacetInstallDelegate.java 2009-12-10 23:14:28 UTC (rev 19199) @@ -30,6 +30,7 @@ import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; import org.jboss.tools.maven.core.MavenCoreActivator; import org.jboss.tools.maven.core.IJBossMavenConstants; +import org.jboss.tools.maven.core.Messages; import org.jboss.tools.maven.core.libprov.MavenLibraryProviderInstallOperation; import org.jboss.tools.maven.core.libprov.MavenLibraryProviderInstallOperationConfig; import org.maven.ide.eclipse.MavenPlugin; @@ -49,7 +50,7 @@ } else { throw new CoreException( MavenCoreActivator - .getStatus("Internal Error creating JBoss Maven Facet. Missing configuration")); + .getStatus(Messages.MavenFacetInstallDelegate_Internal_Error_creating_JBoss_Maven_Facet)); } IFile pom = project.getFile(IMavenConstants.POM_FILE_NAME); Added: trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/messages.properties =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/messages.properties (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/messages.properties 2009-12-10 23:14:28 UTC (rev 19199) @@ -0,0 +1 @@ +MavenFacetInstallDelegate_Internal_Error_creating_JBoss_Maven_Facet=Internal Error creating JBoss Maven Facet. Missing configuration Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/META-INF/MANIFEST.MF =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.seam/META-INF/MANIFEST.MF 2009-12-10 21:02:27 UTC (rev 19198) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/META-INF/MANIFEST.MF 2009-12-10 23:14:28 UTC (rev 19199) @@ -1,8 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Integration Seam projects with Maven +Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.jboss.tools.maven.seam;singleton:=true Bundle-Version: 1.0.0.qualifier +Bundle-Localization: plugin Bundle-Activator: org.jboss.tools.maven.seam.MavenSeamActivator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, @@ -18,4 +19,4 @@ org.eclipse.jst.jsf.core Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Bundle-Vendor: JBoss by Red Hat +Bundle-Vendor: %Bundle-Vendor Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/build.properties =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.seam/build.properties 2009-12-10 21:02:27 UTC (rev 19198) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/build.properties 2009-12-10 23:14:28 UTC (rev 19199) @@ -8,4 +8,6 @@ about.mappings,\ about.properties,\ jboss_about.png,\ - poms/ + poms/,\ + OSGI-INF/l10n/bundle.properties,\ + plugin.properties Added: trunk/maven/plugins/org.jboss.tools.maven.seam/plugin.properties =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.seam/plugin.properties (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/plugin.properties 2009-12-10 23:14:28 UTC (rev 19199) @@ -0,0 +1,7 @@ +#Properties file for org.jboss.tools.maven.seam +Bundle-Vendor = JBoss by Red Hat +Bundle-Name = Integration Seam projects with Maven +Seam_Project_configurator = Seam Project configurator +JSF_Project_configurator = JSF Project configurator +Portlet_Core_Project_configurator = Portlet Core Project configurator +JBoss_Maven_Integration = JBoss Maven Integration \ No newline at end of file Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/plugin.xml =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.seam/plugin.xml 2009-12-10 21:02:27 UTC (rev 19198) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/plugin.xml 2009-12-10 23:14:28 UTC (rev 19199) @@ -11,21 +11,21 @@ <configurator id="org.jboss.tools.maven.seam.configurator" class="org.jboss.tools.maven.seam.configurators.SeamProjectConfigurator" - name="Seam Project configurator" priority="200"/> + name="%Seam_Project_configurator" priority="200"/> </extension> <extension point="org.maven.ide.eclipse.projectConfigurators"> <configurator id="org.jboss.tools.maven.jsf.configurator" class="org.jboss.tools.maven.seam.configurators.JSFProjectConfigurator" - name="JSF Project configurator" priority="150"/> + name="%JSF_Project_configurator" priority="150"/> </extension> <extension point="org.maven.ide.eclipse.projectConfigurators"> <configurator id="org.jboss.tools.maven.portlet.configurator" class="org.jboss.tools.maven.seam.configurators.PortletProjectConfigurator" - name="Portlet Core Project configurator" priority="155"/> + name="%Portlet_Core_Project_configurator" priority="155"/> </extension> <extension @@ -34,7 +34,7 @@ category="org.jboss.tools.common.model.ui.MainPreferencePage" class="org.jboss.tools.maven.seam.preferences.SeamConfiguratorPreferencePage" id="org.jboss.tools.maven.seam.preferences.seamConfiguratorPreferencePage" - name="JBoss Maven Integration"/> + name="%JBoss_Maven_Integration"/> </extension> <extension Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java 2009-12-10 21:02:27 UTC (rev 19198) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java 2009-12-10 23:14:28 UTC (rev 19199) @@ -32,6 +32,7 @@ import org.eclipse.jst.common.project.facet.core.libprov.LibraryProviderFramework; import org.eclipse.jst.jsf.core.internal.project.facet.IJSFFacetInstallDataModelProperties; import org.eclipse.jst.jsf.core.internal.project.facet.JSFFacetInstallDataModelProvider; +import org.eclipse.osgi.util.NLS; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; @@ -60,17 +61,17 @@ */ public class MavenSeamActivator extends AbstractUIPlugin { - private static final String WAR_ARCHIVE_SUFFIX = ".war"; + private static final String WAR_ARCHIVE_SUFFIX = ".war"; //$NON-NLS-1$ - private static final String EJB_ARCHIVE_SUFFIX = ".jar"; + private static final String EJB_ARCHIVE_SUFFIX = ".jar"; //$NON-NLS-1$ - private static final String TEST_SUFFIX = "-test"; + private static final String TEST_SUFFIX = "-test"; //$NON-NLS-1$ - private static final String EJB_SUFFIX = "-ejb"; + private static final String EJB_SUFFIX = "-ejb"; //$NON-NLS-1$ - private static final String EAR_SUFFIX = "-ear"; + private static final String EAR_SUFFIX = "-ear"; //$NON-NLS-1$ - private static final String PARENT_SUFFIX = "-parent"; + private static final String PARENT_SUFFIX = "-parent"; //$NON-NLS-1$ // The plug-in ID public static final String PLUGIN_ID = "org.jboss.tools.maven.seam"; //$NON-NLS-1$ @@ -196,8 +197,8 @@ model.setArtifactId(testArtifactId); model.setVersion(m2FacetModel .getStringProperty(IJBossMavenConstants.VERSION)); - model.setName(m2FacetModel.getStringProperty(IJBossMavenConstants.NAME) + " - test"); - model.setPackaging("jar"); + model.setName(m2FacetModel.getStringProperty(IJBossMavenConstants.NAME) + " - test"); //$NON-NLS-1$ + model.setPackaging("jar"); //$NON-NLS-1$ model.setDescription(m2FacetModel .getStringProperty(IJBossMavenConstants.DESCRIPTION)); @@ -210,50 +211,50 @@ List dependencies = model.getDependencies(); Dependency dependency = new Dependency(); - dependency.setGroupId("org.jboss.seam.embedded"); - dependency.setArtifactId("hibernate-all"); + dependency.setGroupId("org.jboss.seam.embedded"); //$NON-NLS-1$ + dependency.setArtifactId("hibernate-all"); //$NON-NLS-1$ dependencies.add(dependency); dependency = new Dependency(); - dependency.setGroupId("org.jboss.seam.embedded"); - dependency.setArtifactId("jboss-embedded-all"); + dependency.setGroupId("org.jboss.seam.embedded"); //$NON-NLS-1$ + dependency.setArtifactId("jboss-embedded-all"); //$NON-NLS-1$ dependencies.add(dependency); dependency = new Dependency(); - dependency.setGroupId("org.jboss.seam.embedded"); - dependency.setArtifactId("thirdparty-all"); + dependency.setGroupId("org.jboss.seam.embedded"); //$NON-NLS-1$ + dependency.setArtifactId("thirdparty-all"); //$NON-NLS-1$ dependencies.add(dependency); dependency = getSeamDependency(); - dependency.setScope("test"); + dependency.setScope("test"); //$NON-NLS-1$ dependencies.add(dependency); dependency = getJSFApi(); - dependency.setScope("test"); + dependency.setScope("test"); //$NON-NLS-1$ dependencies.add(dependency); dependency = new Dependency(); - dependency.setGroupId("javax.activation"); - dependency.setArtifactId("activation"); + dependency.setGroupId("javax.activation"); //$NON-NLS-1$ + dependency.setArtifactId("activation"); //$NON-NLS-1$ dependencies.add(dependency); dependency = new Dependency(); - dependency.setGroupId("org.testng"); - dependency.setArtifactId("testng"); + dependency.setGroupId("org.testng"); //$NON-NLS-1$ + dependency.setArtifactId("testng"); //$NON-NLS-1$ // FIXME - dependency.setVersion("${testng.version}"); - dependency.setClassifier("jdk15"); - dependency.setScope("test"); + dependency.setVersion("${testng.version}"); //$NON-NLS-1$ + dependency.setClassifier("jdk15"); //$NON-NLS-1$ + dependency.setScope("test"); //$NON-NLS-1$ dependencies.add(dependency); dependency = new Dependency(); - dependency.setGroupId("org.slf4j"); - dependency.setArtifactId("slf4j-api"); + dependency.setGroupId("org.slf4j"); //$NON-NLS-1$ + dependency.setArtifactId("slf4j-api"); //$NON-NLS-1$ dependencies.add(dependency); dependency = new Dependency(); - dependency.setGroupId("org.slf4j"); - dependency.setArtifactId("slf4j-nop"); + dependency.setGroupId("org.slf4j"); //$NON-NLS-1$ + dependency.setArtifactId("slf4j-nop"); //$NON-NLS-1$ dependencies.add(dependency); Build build = new Build(); @@ -289,8 +290,8 @@ model.setArtifactId(earArtifactId); model.setVersion(m2FacetModel .getStringProperty(IJBossMavenConstants.VERSION)); - model.setName(m2FacetModel.getStringProperty(IJBossMavenConstants.NAME) + " - EAR"); - model.setPackaging("ear"); + model.setName(m2FacetModel.getStringProperty(IJBossMavenConstants.NAME) + " - EAR"); //$NON-NLS-1$ + model.setPackaging("ear"); //$NON-NLS-1$ model.setDescription(m2FacetModel .getStringProperty(IJBossMavenConstants.DESCRIPTION)); @@ -306,70 +307,70 @@ dependency.setGroupId(m2FacetModel.getStringProperty(IJBossMavenConstants.GROUP_ID)); dependency.setArtifactId(ejbProjectName); dependency.setVersion(m2FacetModel.getStringProperty(IJBossMavenConstants.VERSION)); - dependency.setType("ejb"); - dependency.setScope("runtime"); + dependency.setType("ejb"); //$NON-NLS-1$ + dependency.setScope("runtime"); //$NON-NLS-1$ dependencies.add(dependency); dependency = new Dependency(); dependency.setGroupId(m2FacetModel.getStringProperty(IJBossMavenConstants.GROUP_ID)); dependency.setArtifactId(webProjectName); dependency.setVersion(m2FacetModel.getStringProperty(IJBossMavenConstants.VERSION)); - dependency.setType("war"); - dependency.setScope("runtime"); + dependency.setType("war"); //$NON-NLS-1$ + dependency.setScope("runtime"); //$NON-NLS-1$ dependencies.add(dependency); dependency = getSeamDependency(); - dependency.setVersion("${seam.version}"); - dependency.setType("ejb"); - dependency.setScope("compile"); + dependency.setVersion("${seam.version}"); //$NON-NLS-1$ + dependency.setType("ejb"); //$NON-NLS-1$ + dependency.setScope("compile"); //$NON-NLS-1$ List exclusions = dependency.getExclusions(); Exclusion exclusion = new Exclusion(); - exclusion.setGroupId("javassist"); - exclusion.setArtifactId("javassist"); + exclusion.setGroupId("javassist"); //$NON-NLS-1$ + exclusion.setArtifactId("javassist"); //$NON-NLS-1$ exclusions.add(exclusion); exclusion = new Exclusion(); - exclusion.setGroupId("javax.el"); - exclusion.setArtifactId("el-api"); + exclusion.setGroupId("javax.el"); //$NON-NLS-1$ + exclusion.setArtifactId("el-api"); //$NON-NLS-1$ exclusions.add(exclusion); exclusion = new Exclusion(); - exclusion.setGroupId("dom4j"); - exclusion.setArtifactId("dom4j"); + exclusion.setGroupId("dom4j"); //$NON-NLS-1$ + exclusion.setArtifactId("dom4j"); //$NON-NLS-1$ exclusions.add(exclusion); exclusion = new Exclusion(); - exclusion.setGroupId("xstream"); - exclusion.setArtifactId("xstream"); + exclusion.setGroupId("xstream"); //$NON-NLS-1$ + exclusion.setArtifactId("xstream"); //$NON-NLS-1$ exclusions.add(exclusion); exclusion = new Exclusion(); - exclusion.setGroupId("xpp3"); - exclusion.setArtifactId("xpp3_min"); + exclusion.setGroupId("xpp3"); //$NON-NLS-1$ + exclusion.setArtifactId("xpp3_min"); //$NON-NLS-1$ exclusions.add(exclusion); dependencies.add(dependency); dependency = getRichFacesApi(); - dependency.setType("jar"); - dependency.setScope("compile"); + dependency.setType("jar"); //$NON-NLS-1$ + dependency.setScope("compile"); //$NON-NLS-1$ exclusions = dependency.getExclusions(); exclusion = new Exclusion(); - exclusion.setGroupId("commons-collections"); - exclusion.setArtifactId("commons-collections"); + exclusion.setGroupId("commons-collections"); //$NON-NLS-1$ + exclusion.setArtifactId("commons-collections"); //$NON-NLS-1$ exclusions.add(exclusion); exclusion = new Exclusion(); - exclusion.setGroupId("commons-logging"); - exclusion.setArtifactId("commons-logging"); + exclusion.setGroupId("commons-logging"); //$NON-NLS-1$ + exclusion.setArtifactId("commons-logging"); //$NON-NLS-1$ exclusions.add(exclusion); dependencies.add(dependency); dependency = new Dependency(); - dependency.setGroupId("org.drools"); - dependency.setArtifactId("drools-compiler"); - dependency.setType("jar"); - dependency.setScope("compile"); + dependency.setGroupId("org.drools"); //$NON-NLS-1$ + dependency.setArtifactId("drools-compiler"); //$NON-NLS-1$ + dependency.setType("jar"); //$NON-NLS-1$ + dependency.setScope("compile"); //$NON-NLS-1$ dependencies.add(dependency); dependency = new Dependency(); @@ -386,9 +387,9 @@ } } dependency.setGroupId(jbpmGroupId); - dependency.setArtifactId("jbpm-jpdl"); - dependency.setType("jar"); - dependency.setScope("compile"); + dependency.setArtifactId("jbpm-jpdl"); //$NON-NLS-1$ + dependency.setType("jar"); //$NON-NLS-1$ + dependency.setScope("compile"); //$NON-NLS-1$ dependencies.add(dependency); // dependency = new Dependency(); @@ -403,8 +404,8 @@ // dependencies.add(dependency); dependency = new Dependency(); - dependency.setGroupId("commons-digester"); - dependency.setArtifactId("commons-digester"); + dependency.setGroupId("commons-digester"); //$NON-NLS-1$ + dependency.setArtifactId("commons-digester"); //$NON-NLS-1$ dependencies.add(dependency); Build build = new Build(); @@ -415,7 +416,7 @@ if (sourceDirectory != null) { build.setSourceDirectory(sourceDirectory); } - build.setOutputDirectory("target/classes"); + build.setOutputDirectory("target/classes"); //$NON-NLS-1$ MavenCoreActivator.addMavenEarPlugin(build, project, m2FacetModel, true); model.setBuild(build); MavenCoreActivator.createMavenProject(earProjectName, null, model, true); @@ -455,8 +456,8 @@ model.setArtifactId(ejbArtifactId); model.setVersion(m2FacetModel .getStringProperty(IJBossMavenConstants.VERSION)); - model.setName(m2FacetModel.getStringProperty(IJBossMavenConstants.NAME) + " - EJB"); - model.setPackaging("ejb"); + model.setName(m2FacetModel.getStringProperty(IJBossMavenConstants.NAME) + " - EJB"); //$NON-NLS-1$ + model.setPackaging("ejb"); //$NON-NLS-1$ model.setDescription(m2FacetModel .getStringProperty(IJBossMavenConstants.DESCRIPTION)); @@ -469,24 +470,24 @@ List dependencies = model.getDependencies(); Dependency dependency = getSeamDependency(); - dependency.setScope("provided"); + dependency.setScope("provided"); //$NON-NLS-1$ dependencies.add(dependency); dependencies.add(getJSFApi()); dependencies.add(getRichFacesApi()); dependency = new Dependency(); - dependency.setGroupId("javax.ejb"); - dependency.setArtifactId("ejb-api"); + dependency.setGroupId("javax.ejb"); //$NON-NLS-1$ + dependency.setArtifactId("ejb-api"); //$NON-NLS-1$ dependencies.add(dependency); dependency = new Dependency(); - dependency.setGroupId("javax.annotation"); - dependency.setArtifactId("jsr250-api"); + dependency.setGroupId("javax.annotation"); //$NON-NLS-1$ + dependency.setArtifactId("jsr250-api"); //$NON-NLS-1$ dependencies.add(dependency); dependency = new Dependency(); - dependency.setGroupId("javax.persistence"); - dependency.setArtifactId("persistence-api"); + dependency.setGroupId("javax.persistence"); //$NON-NLS-1$ + dependency.setArtifactId("persistence-api"); //$NON-NLS-1$ dependencies.add(dependency); dependencies.add(getHibernateAnnotations()); @@ -535,125 +536,125 @@ modelManager.addDependency(pomFile,dependency); dependency = new Dependency(); - dependency.setGroupId("org.hibernate"); - dependency.setArtifactId("hibernate-entitymanager"); + dependency.setGroupId("org.hibernate"); //$NON-NLS-1$ + dependency.setArtifactId("hibernate-entitymanager"); //$NON-NLS-1$ modelManager.addDependency(pomFile,dependency); dependency = getSeamDependency(); if (!SeamFacetAbstractInstallDelegate .isWarConfiguration(seamFacetModel)) { - dependency.setScope("provided"); + dependency.setScope("provided"); //$NON-NLS-1$ } modelManager.addDependency(pomFile,dependency); dependency = new Dependency(); - dependency.setGroupId("org.jboss.seam"); - dependency.setArtifactId("jboss-seam-ui"); + dependency.setGroupId("org.jboss.seam"); //$NON-NLS-1$ + dependency.setArtifactId("jboss-seam-ui"); //$NON-NLS-1$ List<Exclusion> exclusions = dependency.getExclusions(); Exclusion exclusion = new Exclusion(); - exclusion.setGroupId("org.jboss.seam"); - exclusion.setArtifactId("jboss-seam"); + exclusion.setGroupId("org.jboss.seam"); //$NON-NLS-1$ + exclusion.setArtifactId("jboss-seam"); //$NON-NLS-1$ exclusions.add(exclusion); modelManager.addDependency(pomFile,dependency); dependency = new Dependency(); - dependency.setGroupId("org.jboss.seam"); - dependency.setArtifactId("jboss-seam-ioc"); + dependency.setGroupId("org.jboss.seam"); //$NON-NLS-1$ + dependency.setArtifactId("jboss-seam-ioc"); //$NON-NLS-1$ exclusions = dependency.getExclusions(); exclusion = new Exclusion(); - exclusion.setGroupId("org.jboss.seam"); - exclusion.setArtifactId("jboss-seam"); + exclusion.setGroupId("org.jboss.seam"); //$NON-NLS-1$ + exclusion.setArtifactId("jboss-seam"); //$NON-NLS-1$ exclusions.add(exclusion); modelManager.addDependency(pomFile,dependency); dependency = new Dependency(); - dependency.setGroupId("org.jboss.seam"); - dependency.setArtifactId("jboss-seam-debug"); + dependency.setGroupId("org.jboss.seam"); //$NON-NLS-1$ + dependency.setArtifactId("jboss-seam-debug"); //$NON-NLS-1$ // FIXME - dependency.setVersion("${seam.version}"); + dependency.setVersion("${seam.version}"); //$NON-NLS-1$ modelManager.addDependency(pomFile,dependency); dependency = new Dependency(); - dependency.setGroupId("org.jboss.seam"); - dependency.setArtifactId("jboss-seam-mail"); + dependency.setGroupId("org.jboss.seam"); //$NON-NLS-1$ + dependency.setArtifactId("jboss-seam-mail"); //$NON-NLS-1$ modelManager.addDependency(pomFile,dependency); dependency = new Dependency(); - dependency.setGroupId("org.jboss.seam"); - dependency.setArtifactId("jboss-seam-pdf"); + dependency.setGroupId("org.jboss.seam"); //$NON-NLS-1$ + dependency.setArtifactId("jboss-seam-pdf"); //$NON-NLS-1$ modelManager.addDependency(pomFile,dependency); dependency = new Dependency(); - dependency.setGroupId("org.jboss.seam"); - dependency.setArtifactId("jboss-seam-remoting"); + dependency.setGroupId("org.jboss.seam"); //$NON-NLS-1$ + dependency.setArtifactId("jboss-seam-remoting"); //$NON-NLS-1$ modelManager.addDependency(pomFile,dependency); if (FacetedProjectFramework.hasProjectFacet(webProject, ISeamFacetDataModelProperties.SEAM_FACET_ID, ISeamFacetDataModelProperties.SEAM_FACET_VERSION_21)) { dependency = new Dependency(); - dependency.setGroupId("org.jboss.seam"); - dependency.setArtifactId("jboss-seam-excel"); + dependency.setGroupId("org.jboss.seam"); //$NON-NLS-1$ + dependency.setArtifactId("jboss-seam-excel"); //$NON-NLS-1$ modelManager.addDependency(pomFile,dependency); } dependency = new Dependency(); - dependency.setGroupId("javax.servlet"); - dependency.setArtifactId("servlet-api"); + dependency.setGroupId("javax.servlet"); //$NON-NLS-1$ + dependency.setArtifactId("servlet-api"); //$NON-NLS-1$ modelManager.addDependency(pomFile,dependency); dependency = new Dependency(); - dependency.setGroupId("org.richfaces.ui"); - dependency.setArtifactId("richfaces-ui"); + dependency.setGroupId("org.richfaces.ui"); //$NON-NLS-1$ + dependency.setArtifactId("richfaces-ui"); //$NON-NLS-1$ modelManager.addDependency(pomFile,dependency); dependency = getRichFacesApi(); if (!SeamFacetAbstractInstallDelegate .isWarConfiguration(seamFacetModel)) { - dependency.setScope("provided"); + dependency.setScope("provided"); //$NON-NLS-1$ } modelManager.addDependency(pomFile,dependency); dependency = new Dependency(); - dependency.setGroupId("org.richfaces.framework"); - dependency.setArtifactId("richfaces-impl"); + dependency.setGroupId("org.richfaces.framework"); //$NON-NLS-1$ + dependency.setArtifactId("richfaces-impl"); //$NON-NLS-1$ modelManager.addDependency(pomFile,dependency); dependency = getJSFApi(); modelManager.addDependency(pomFile,dependency); dependency = new Dependency(); - dependency.setGroupId("javax.faces"); - dependency.setArtifactId("jsf-impl"); + dependency.setGroupId("javax.faces"); //$NON-NLS-1$ + dependency.setArtifactId("jsf-impl"); //$NON-NLS-1$ modelManager.addDependency(pomFile,dependency); dependency = new Dependency(); - dependency.setGroupId("javax.el"); - dependency.setArtifactId("el-api"); + dependency.setGroupId("javax.el"); //$NON-NLS-1$ + dependency.setArtifactId("el-api"); //$NON-NLS-1$ modelManager.addDependency(pomFile,dependency); if (SeamFacetAbstractInstallDelegate .isWarConfiguration(seamFacetModel)) { dependency = new Dependency(); - dependency.setGroupId("org.drools"); - dependency.setArtifactId("drools-compiler"); - dependency.setType("jar"); - dependency.setScope("compile"); + dependency.setGroupId("org.drools"); //$NON-NLS-1$ + dependency.setArtifactId("drools-compiler"); //$NON-NLS-1$ + dependency.setType("jar"); //$NON-NLS-1$ + dependency.setScope("compile"); //$NON-NLS-1$ modelManager.addDependency(pomFile,dependency); dependency = new Dependency(); - dependency.setGroupId("org.jbpm"); - dependency.setArtifactId("jbpm-jpdl"); - dependency.setType("jar"); - dependency.setScope("compile"); + dependency.setGroupId("org.jbpm"); //$NON-NLS-1$ + dependency.setArtifactId("jbpm-jpdl"); //$NON-NLS-1$ + dependency.setType("jar"); //$NON-NLS-1$ + dependency.setScope("compile"); //$NON-NLS-1$ modelManager.addDependency(pomFile,dependency); dependency = new Dependency(); - dependency.setGroupId("commons-digester"); - dependency.setArtifactId("commons-digester"); + dependency.setGroupId("commons-digester"); //$NON-NLS-1$ + dependency.setArtifactId("commons-digester"); //$NON-NLS-1$ modelManager.addDependency(pomFile,dependency); } @@ -665,8 +666,8 @@ dependency.setGroupId(m2FacetModel.getStringProperty(IJBossMavenConstants.GROUP_ID)); dependency.setArtifactId(ejbProjectName); dependency.setVersion(m2FacetModel.getStringProperty(IJBossMavenConstants.VERSION)); - dependency.setType("ejb"); - dependency.setScope("provided"); + dependency.setType("ejb"); //$NON-NLS-1$ + dependency.setScope("provided"); //$NON-NLS-1$ modelManager.addDependency(pomFile,dependency); } removeWTPContainers(m2FacetModel, webProject); @@ -689,7 +690,7 @@ IPath path = entry.getPath(); if (path != null) { String value = path.toString(); - if (value.startsWith("org.eclipse.jst")) { + if (value.startsWith("org.eclipse.jst")) { //$NON-NLS-1$ add = false; } } @@ -704,54 +705,54 @@ private Dependency getHibernateValidator() { Dependency dependency = new Dependency(); - dependency.setGroupId("org.hibernate"); - dependency.setArtifactId("hibernate-validator"); + dependency.setGroupId("org.hibernate"); //$NON-NLS-1$ + dependency.setArtifactId("hibernate-validator"); //$NON-NLS-1$ return dependency; } private Dependency getHibernateAnnotations() { Dependency dependency; dependency = new Dependency(); - dependency.setGroupId("org.hibernate"); - dependency.setArtifactId("hibernate-annotations"); + dependency.setGroupId("org.hibernate"); //$NON-NLS-1$ + dependency.setArtifactId("hibernate-annotations"); //$NON-NLS-1$ return dependency; } private Dependency getHibernateCommonAnnotations() { Dependency dependency; dependency = new Dependency(); - dependency.setGroupId("org.hibernate"); - dependency.setArtifactId("hibernate-commons-annotations"); + dependency.setGroupId("org.hibernate"); //$NON-NLS-1$ + dependency.setArtifactId("hibernate-commons-annotations"); //$NON-NLS-1$ return dependency; } private Dependency getRichFacesApi() { Dependency dependency; dependency = new Dependency(); - dependency.setGroupId("org.richfaces.framework"); - dependency.setArtifactId("richfaces-api"); + dependency.setGroupId("org.richfaces.framework"); //$NON-NLS-1$ + dependency.setArtifactId("richfaces-api"); //$NON-NLS-1$ return dependency; } private Dependency getJSFApi() { Dependency dependency; dependency = new Dependency(); - dependency.setGroupId("javax.faces"); - dependency.setArtifactId("jsf-api"); + dependency.setGroupId("javax.faces"); //$NON-NLS-1$ + dependency.setArtifactId("jsf-api"); //$NON-NLS-1$ return dependency; } private Dependency getSeamDependency() { Dependency dependency; dependency = new Dependency(); - dependency.setGroupId("org.jboss.seam"); - dependency.setArtifactId("jboss-seam"); + dependency.setGroupId("org.jboss.seam"); //$NON-NLS-1$ + dependency.setArtifactId("jboss-seam"); //$NON-NLS-1$ return dependency; } private void configureParentProject(IDataModel m2FacetModel, IDataModel seamFacetModel) { Bundle bundle = getDefault().getBundle(); - URL parentPomEntryURL = bundle.getEntry("/poms/parent-pom.xml"); + URL parentPomEntryURL = bundle.getEntry("/poms/parent-pom.xml"); //$NON-NLS-1$ InputStream inputStream = null; try { URL resolvedURL = FileLocator.resolve(parentPomEntryURL); @@ -763,11 +764,11 @@ String projectVersion = m2FacetModel.getStringProperty(IJBossMavenConstants.VERSION); String name = m2FacetModel.getStringProperty(IJBossMavenConstants.NAME); if (name != null && name.trim().length() > 0) { - model.setName(name + " - parent"); + model.setName(name + " - parent"); //$NON-NLS-1$ } String description= m2FacetModel.getStringProperty(IJBossMavenConstants.DESCRIPTION); if (description != null && description.trim().length() > 0) { - model.setDescription(description + " - parent"); + model.setDescription(description + " - parent"); //$NON-NLS-1$ } model.setVersion(projectVersion); @@ -775,7 +776,7 @@ properties.put(IJBossMavenConstants.PROJECT_VERSION, projectVersion); SeamRuntime seamRuntime = SeamRuntimeManager.getInstance().findRuntimeByName(seamFacetModel.getProperty(ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME).toString()); if(seamRuntime==null) { - getDefault().log("Can't get seam runtime " + seamFacetModel.getProperty(ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME).toString()); + getDefault().log(Messages.MavenSeamActivator_Cannot_get_seam_runtime + seamFacetModel.getProperty(ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME).toString()); } String seamVersion = m2FacetModel.getStringProperty(IJBossMavenConstants.SEAM_MAVEN_VERSION); if (seamVersion != null && seamVersion.trim().length() > 0) { @@ -786,48 +787,48 @@ if (seamHomeDir.exists()) { //String seamVersion = SeamUtil.getSeamVersionFromManifest(seamRuntime.getHomeDir()); //properties.put(IJBossMavenConstants.SEAM_VERSION, seamVersion); - File buildDir = new File(seamHomeDir,"build"); - File rootPom = new File(buildDir,"root.pom.xml"); + File buildDir = new File(seamHomeDir,"build"); //$NON-NLS-1$ + File rootPom = new File(buildDir,"root.pom.xml"); //$NON-NLS-1$ if (!rootPom.exists()) { - getDefault().log("The " + rootPom.getAbsolutePath() + " file doesn't exist."); + MavenSeamActivator.log(NLS.bind(Messages.MavenSeamActivator_The_file_does_not_exist, rootPom.getAbsolutePath())); } else { try { Model rootPomModel = modelManager.readMavenModel(rootPom); List<Dependency> seamDependencies = rootPomModel.getDependencyManagement().getDependencies(); - setArtifactVersion("jsf.version", properties, "javax.faces", "jsf-api", seamDependencies); - String richfacesVersion = setArtifactVersion("richfaces.version", properties, "org.richfaces.framework", "richfaces-impl", seamDependencies); + setArtifactVersion("jsf.version", properties, "javax.faces", "jsf-api", seamDependencies); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + String richfacesVersion = setArtifactVersion("richfaces.version", properties, "org.richfaces.framework", "richfaces-impl", seamDependencies); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ if (richfacesVersion == null) { Properties seamProperties = rootPomModel.getProperties(); - richfacesVersion = seamProperties.getProperty("version.richfaces"); + richfacesVersion = seamProperties.getProperty("version.richfaces"); //$NON-NLS-1$ if (richfacesVersion != null) { - properties.put("richfaces.version", richfacesVersion); + properties.put("richfaces.version", richfacesVersion); //$NON-NLS-1$ } } - setArtifactVersion("hibernate-validator.version", properties, "org.hibernate", "hibernate-validator", seamDependencies); - setArtifactVersion("hibernate-annotations.version", properties, "org.hibernate", "hibernate-annotations", seamDependencies); - setArtifactVersion("hibernate-entitymanager.version", properties, "org.hibernate", "hibernate-entitymanager", seamDependencies); + setArtifactVersion("hibernate-validator.version", properties, "org.hibernate", "hibernate-validator", seamDependencies); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + setArtifactVersion("hibernate-annotations.version", properties, "org.hibernate", "hibernate-annotations", seamDependencies); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + setArtifactVersion("hibernate-entitymanager.version", properties, "org.hibernate", "hibernate-entitymanager", seamDependencies); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //setArtifactVersion("testng.version", properties, "org.hibernate", "hibernate-entitymanager", seamDependencies); //if (seamVersion != null && "2.2".equals(seamVersion.subSequence(0, 3))) { // properties.put("testng.version", "5.9"); //} - setArtifactVersion("jboss.embedded.version", properties, "org.jboss.seam.embedded", "jboss-embedded-api", seamDependencies); - setArtifactVersion("slf4j.version", properties, "org.slf4j", "slf4j-api", seamDependencies); - setArtifactVersion("ejb.api.version", properties, "javax.ejb", "ejb-api", seamDependencies); - setArtifactVersion("jsr250-api.version", properties, "javax.annotation", "jsr250-api", seamDependencies); - setArtifactVersion("persistence-api.version", properties, "javax.persistence", "persistence-api", seamDependencies); - setArtifactVersion("servlet.version", properties, "javax.servlet", "servlet-api", seamDependencies); - setArtifactVersion("javax.el.version", properties, "javax.el", "el-api", seamDependencies); - String droolsVersion = setArtifactVersion("drools.version", properties, "org.drools", "drools-core", seamDependencies); + setArtifactVersion("jboss.embedded.version", properties, "org.jboss.seam.embedded", "jboss-embedded-api", seamDependencies); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + setArtifactVersion("slf4j.version", properties, "org.slf4j", "slf4j-api", seamDependencies); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + setArtifactVersion("ejb.api.version", properties, "javax.ejb", "ejb-api", seamDependencies); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + setArtifactVersion("jsr250-api.version", properties, "javax.annotation", "jsr250-api", seamDependencies); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + setArtifactVersion("persistence-api.version", properties, "javax.persistence", "persistence-api", seamDependencies); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + setArtifactVersion("servlet.version", properties, "javax.servlet", "servlet-api", seamDependencies); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + setArtifactVersion("javax.el.version", properties, "javax.el", "el-api", seamDependencies); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + String droolsVersion = setArtifactVersion("drools.version", properties, "org.drools", "drools-core", seamDependencies); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ if (droolsVersion == null) { Properties seamProperties = rootPomModel.getProperties(); - droolsVersion = seamProperties.getProperty("version.drools"); + droolsVersion = seamProperties.getProperty("version.drools"); //$NON-NLS-1$ if (droolsVersion != null) { - properties.put("drools.version", droolsVersion); + properties.put("drools.version", droolsVersion); //$NON-NLS-1$ } } - String jbpmVersion = setArtifactVersion("jbpm.version", properties, "org.jbpm", "jbpm-jpdl", seamDependencies); + String jbpmVersion = setArtifactVersion("jbpm.version", properties, "org.jbpm", "jbpm-jpdl", seamDependencies); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ if (jbpmVersion == null) { - setArtifactVersion("jbpm3.version", properties, "org.jbpm.jbpm3", "jbpm-jpdl", seamDependencies); + setArtifactVersion("jbpm3.version", properties, "org.jbpm.jbpm3", "jbpm-jpdl", seamDependencies); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } //setArtifactVersion("mvel.version", properties, "org.mvel", "mvel14", seamDependencies); @@ -841,15 +842,15 @@ } } } else { - getDefault().log("The " + seamHomePath + " folder doesn't exist."); + MavenSeamActivator.log(NLS.bind(Messages.MavenSeamActivator_The_folder_does_not_exist, seamHomePath)); } List<String> modules = model.getModules(); - modules.add("../" + artifactId); + modules.add("../" + artifactId); //$NON-NLS-1$ if (!SeamFacetAbstractInstallDelegate .isWarConfiguration(seamFacetModel)) { - modules.add("../" + ejbArtifactId); - modules.add("../" + earArtifactId); + modules.add("../" + ejbArtifactId); //$NON-NLS-1$ + modules.add("../" + earArtifactId); //$NON-NLS-1$ } webProjectName = seamFacetModel.getStringProperty(IFacetDataModelProperties.FACET_PROJECT_NAME); @@ -879,7 +880,7 @@ for (Dependency dependency:seamDependencies) { if (groupId.equals(dependency.getGroupId()) && artifactId.equals(dependency.getArtifactId())) { String version = dependency.getVersion(); - if (version != null && !version.startsWith("${")) { + if (version != null && !version.startsWith("${")) { //$NON-NLS-1$ properties.put(property, version); return version; } Added: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/Messages.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/Messages.java (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/Messages.java 2009-12-10 23:14:28 UTC (rev 19199) @@ -0,0 +1,26 @@ +package org.jboss.tools.maven.seam; + +import org.eclipse.osgi.util.NLS; + +public class Messages extends NLS { + private static final String BUNDLE_NAME = "org.jboss.tools.maven.seam.messages"; //$NON-NLS-1$ + public static String JSFProjectConfigurator_The_project_does_not_contain_the_Web_Module_facet; + public static String MavenSeamActivator_Cannot_get_seam_runtime; + public static String MavenSeamActivator_The_file_does_not_exist; + public static String MavenSeamActivator_The_folder_does_not_exist; + public static String PortletProjectConfigurator_The_project_does_not_contain_the_Web_Module_facet; + public static String SeamConfiguratorPreferencePage_Configure_JBoss_JSF_Portlet_facet; + public static String SeamConfiguratorPreferencePage_Configure_JBoss_Portlet_Core_facet; + public static String SeamConfiguratorPreferencePage_Configure_JBoss_Seam_Portlet_facet; + public static String SeamConfiguratorPreferencePage_Configure_JSF_facet; + public static String SeamConfiguratorPreferencePage_Configure_Seam_Artifacts; + public static String SeamConfiguratorPreferencePage_Configure_Seam_Runtime; + public static String SeamConfiguratorPreferencePage_Configure_Seam_when_importing_Maven_projects; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() { + } +} Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/JSFProjectConfigurator.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/JSFProjectConfigurator.java 2009-12-10 21:02:27 UTC (rev 19198) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/JSFProjectConfigurator.java 2009-12-10 23:14:28 UTC (rev 19199) @@ -19,6 +19,7 @@ import org.jboss.tools.maven.core.IJBossMavenConstants; import org.jboss.tools.maven.core.internal.project.facet.MavenFacetInstallDataModelProvider; import org.jboss.tools.maven.seam.MavenSeamActivator; +import org.jboss.tools.maven.seam.Messages; import org.jboss.tools.seam.internal.core.project.facet.SeamFacetInstallDataModelProvider; import org.maven.ide.eclipse.project.IMavenProjectFacade; import org.maven.ide.eclipse.project.MavenProjectChangedEvent; @@ -107,7 +108,7 @@ private void installWarFacets(IFacetedProject fproj, String jsfVersion,IProgressMonitor monitor) throws CoreException { if (!fproj.hasProjectFacet(dynamicWebFacet)) { - MavenSeamActivator.log("The project doesn't contain the Web Module facet."); + MavenSeamActivator.log(Messages.JSFProjectConfigurator_The_project_does_not_contain_the_Web_Module_facet); } installJSFFacet(fproj, jsfVersion, monitor); installM2Facet(fproj, monitor); Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/PortletProjectConfigurator.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/PortletProjectConfigurator.java 2009-12-10 21:02:27 UTC (rev 19198) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/PortletProjectConfigurator.java 2009-12-10 23:14:28 UTC (rev 19199) @@ -17,6 +17,7 @@ import org.jboss.tools.maven.core.IJBossMavenConstants; import org.jboss.tools.maven.core.internal.project.facet.MavenFacetInstallDataModelProvider; import org.jboss.tools.maven.seam.MavenSeamActivator; +import org.jboss.tools.maven.seam.Messages; import org.jboss.tools.portlet.core.IPortletConstants; import org.jboss.tools.portlet.core.internal.project.facet.JSFPortletFacetInstallDataModelProvider; import org.jboss.tools.portlet.core.internal.project.facet.PortletFacetInstallDataModelProvider; @@ -114,7 +115,7 @@ private void installWarFacets(IFacetedProject fproj, String portletVersion, String jsfportletVersion, IProgressMonitor monitor) throws CoreException { if (!fproj.hasProjectFacet(dynamicWebFacet)) { - MavenSeamActivator.log("The project doesn't contain the Web Module facet."); + MavenSeamActivator.log(Messages.PortletProjectConfigurator_The_project_does_not_contain_the_Web_Module_facet); } installM2Facet(fproj, monitor); installPortletFacet(fproj, portletVersion, jsfportletVersion, monitor); Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java 2009-12-10 21:02:27 UTC (rev 19198) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java 2009-12-10 23:14:28 UTC (rev 19199) @@ -46,6 +46,7 @@ import org.jboss.tools.maven.core.IJBossMavenConstants; import org.jboss.tools.maven.core.internal.project.facet.MavenFacetInstallDataModelProvider; import org.jboss.tools.maven.seam.MavenSeamActivator; +import org.jboss.tools.maven.seam.Messages; import org.jboss.tools.seam.core.ISeamProject; import org.jboss.tools.seam.core.SeamCorePlugin; import org.jboss.tools.seam.core.SeamUtil; @@ -607,7 +608,7 @@ if (object instanceof Module) { Module module = (Module) object; String uri = module.getUri(); - if (uri != null && (uri.startsWith("mvel14") || uri.startsWith("mvel2"))) { + if (uri != null && (uri.startsWith("mvel14") || uri.startsWith("mvel2"))) { //$NON-NLS-1$ //$NON-NLS-2$ iterator.remove(); } } Added: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/messages.properties =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/messages.properties (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/messages.properties 2009-12-10 23:14:28 UTC (rev 19199) @@ -0,0 +1,12 @@ +JSFProjectConfigurator_The_project_does_not_contain_the_Web_Module_facet=The project doesn't contain the Web Module facet. +MavenSeamActivator_Cannot_get_seam_runtime=Can't get seam runtime. +MavenSeamActivator_The_file_does_not_exist=The {0} file doesn't exist. +MavenSeamActivator_The_folder_does_not_exist=The {0} folder doesn't exist. +PortletProjectConfigurator_The_project_does_not_contain_the_Web_Module_facet=The project doesn't contain the Web Module facet. +SeamConfiguratorPreferencePage_Configure_JBoss_JSF_Portlet_facet=Configure JBoss JSF Portlet facet when importing Maven projects +SeamConfiguratorPreferencePage_Configure_JBoss_Portlet_Core_facet=Configure JBoss Portlet Core facet when importing Maven projects +SeamConfiguratorPreferencePage_Configure_JBoss_Seam_Portlet_facet=Configure JBoss Seam Portlet facet when importing Maven projects +SeamConfiguratorPreferencePage_Configure_JSF_facet=Configure JSF facet when importing Maven projects +SeamConfiguratorPreferencePage_Configure_Seam_Artifacts=Configure Seam Artifacts (view folder, model source folder, package ...) +SeamConfiguratorPreferencePage_Configure_Seam_Runtime=Configure Seam Runtime +SeamConfiguratorPreferencePage_Configure_Seam_when_importing_Maven_projects=Configure Seam when importing Maven projects Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/preferences/SeamConfiguratorPreferencePage.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/preferences/SeamConfiguratorPreferencePage.java 2009-12-10 21:02:27 UTC (rev 19198) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/preferences/SeamConfiguratorPreferencePage.java 2009-12-10 23:14:28 UTC (rev 19199) @@ -12,6 +12,7 @@ import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; import org.jboss.tools.maven.seam.MavenSeamActivator; +import org.jboss.tools.maven.seam.Messages; public class SeamConfiguratorPreferencePage extends PreferencePage implements IWorkbenchPreferencePage { @@ -34,19 +35,19 @@ composite.setLayout(layout); configureSeamButton = new Button(composite,SWT.CHECK); - configureSeamButton.setText("Configure Seam when importing Maven projects"); + configureSeamButton.setText(Messages.SeamConfiguratorPreferencePage_Configure_Seam_when_importing_Maven_projects); IPreferenceStore store = MavenSeamActivator.getDefault().getPreferenceStore(); boolean configureSeam = store.getBoolean(MavenSeamActivator.CONFIGURE_SEAM); configureSeamButton.setSelection(configureSeam); configureSeamRuntimeButton = new Button(composite,SWT.CHECK); - configureSeamRuntimeButton.setText("Configure Seam Runtime"); + configureSeamRuntimeButton.setText(Messages.SeamConfiguratorPreferencePage_Configure_Seam_Runtime); boolean configureSeamRuntime = store.getBoolean(MavenSeamActivator.CONFIGURE_SEAM_RUNTIME); configureSeamRuntimeButton.setSelection(configureSeamRuntime); configureSeamRuntimeButton.setEnabled(configureSeam); configureSeamArtifactsButton = new Button(composite,SWT.CHECK); - configureSeamArtifactsButton.setText("Configure Seam Artifacts (view folder, model source folder, package ...)"); + configureSeamArtifactsButton.setText(Messages.SeamConfiguratorPreferencePage_Configure_Seam_Artifacts); boolean configureSeamArtifacts = store.getBoolean(MavenSeamActivator.CONFIGURE_SEAM_ARTIFACTS); configureSeamArtifactsButton.setSelection(configureSeamArtifacts); configureSeamArtifactsButton.setEnabled(configureSeam); @@ -62,22 +63,22 @@ }); configureJSFButton = new Button(composite,SWT.CHECK); - configureJSFButton.setText("Configure JSF facet when importing Maven projects"); + configureJSFButton.setText(Messages.SeamConfiguratorPreferencePage_Configure_JSF_facet); boolean configureJSF = store.getBoolean(MavenSeamActivator.CONFIGURE_JSF); configureJSFButton.setSelection(configureJSF); configurePortletButton = new Button(composite,SWT.CHECK); - configurePortletButton.setText("Configure JBoss Portlet Core facet when importing Maven projects"); + configurePortletButton.setText(Messages.SeamConfiguratorPreferencePage_Configure_JBoss_Portlet_Core_facet); boolean configurePortlet = store.getBoolean(MavenSeamActivator.CONFIGURE_PORTLET); configurePortletButton.setSelection(configurePortlet); configureJSFPortletButton = new Button(composite,SWT.CHECK); - configureJSFPortletButton.setText("Configure JBoss JSF Portlet facet when importing Maven projects"); + configureJSFPortletButton.setText(Messages.SeamConfiguratorPreferencePage_Configure_JBoss_JSF_Portlet_facet); boolean configureJSFPortlet = store.getBoolean(MavenSeamActivator.CONFIGURE_JSFPORTLET); configureJSFPortletButton.setSelection(configureJSFPortlet); configureSeamPortletButton = new Button(composite,SWT.CHECK); - configureSeamPortletButton.setText("Configure JBoss Seam Portlet facet when importing Maven projects"); + configureSeamPortletButton.setText(Messages.SeamConfiguratorPreferencePage_Configure_JBoss_Seam_Portlet_facet); boolean configureSeamPortlet = store.getBoolean(MavenSeamActivator.CONFIGURE_SEAMPORTLET); configureJSFPortletButton.setSelection(configureSeamPortlet); Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.ui/META-INF/MANIFEST.MF 2009-12-10 21:02:27 UTC (rev 19198) +++ trunk/maven/plugins/org.jboss.tools.maven.ui/META-INF/MANIFEST.MF 2009-12-10 23:14:28 UTC (rev 19199) @@ -1,8 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: JBoss Maven Integration +Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.jboss.tools.maven.ui; singleton:=true Bundle-Version: 1.0.0.qualifier +Bundle-Localization: plugin Bundle-Activator: org.jboss.tools.maven.ui.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, @@ -13,4 +14,4 @@ org.jboss.tools.maven.core Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Bundle-Vendor: JBoss by Red Hat +Bundle-Vendor: %Bundle-Vendor Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/build.properties =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.ui/build.properties 2009-12-10 21:02:27 UTC (rev 19198) +++ trunk/maven/plugins/org.jboss.tools.maven.ui/build.properties 2009-12-10 23:14:28 UTC (rev 19199) @@ -7,4 +7,5 @@ about.properties,\ about.mappings,\ about.ini,\ - about.html + about.html,\ + plugin.properties Added: trunk/maven/plugins/org.jboss.tools.maven.ui/plugin.properties =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.ui/plugin.properties (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.ui/plugin.properties 2009-12-10 23:14:28 UTC (rev 19199) @@ -0,0 +1,3 @@ + +Bundle-Vendor = JBoss by Red Hat +Bundle-Name = JBoss Maven Integration \ No newline at end of file Added: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Messages.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Messages.java (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Messages.java 2009-12-10 23:14:28 UTC (rev 19199) @@ -0,0 +1,42 @@ +package org.jboss.tools.maven.ui; + +import org.eclipse.osgi.util.NLS; + +public class Messages extends NLS { + private static final String BUNDLE_NAME = "org.jboss.tools.maven.ui.messages"; //$NON-NLS-1$ + public static String AutoResizeTableLayout_Unknown_column_layout_data; + public static String MavenFacetInstallPage_Add_M2_capabilities_to_this_Web_Project; + public static String MavenFacetInstallPage_Artifact_Id; + public static String MavenFacetInstallPage_Description; + public static String MavenFacetInstallPage_Group_Id; + public static String MavenFacetInstallPage_JBoss_M2_capabilities; + public static String MavenFacetInstallPage_Name; + public static String MavenFacetInstallPage_Packaging; + public static String MavenFacetInstallPage_Remove_WTP_Classpath_containers; + public static String MavenFacetInstallPage_Seam_Maven_version; + public static String MavenFacetInstallPage_The_artifactId_field_is_required; + public static String MavenFacetInstallPage_The_groupId_field_is_required; + public static String MavenFacetInstallPage_The_packaging_field_is_required; + public static String MavenFacetInstallPage_The_version_field_is_required; + public static String MavenFacetInstallPage_Version; + public static String MavenUserLibraryProviderInstallPanel_Add; + public static String MavenUserLibraryProviderInstallPanel_Are_you_sure_you_want_to_remove_the_artifact; + public static String MavenUserLibraryProviderInstallPanel_ArtifactId; + public static String MavenUserLibraryProviderInstallPanel_Dependencies; + public static String MavenUserLibraryProviderInstallPanel_Exclusions; + public static String MavenUserLibraryProviderInstallPanel_GroupId; + public static String MavenUserLibraryProviderInstallPanel_Remove; + public static String MavenUserLibraryProviderInstallPanel_Remove_dependency; + public static String MavenUserLibraryProviderInstallPanel_Remove_exclusion; + public static String MavenUserLibraryProviderInstallPanel_Restore_Defaults; + public static String MavenUserLibraryProviderInstallPanel_Scope; + public static String MavenUserLibraryProviderInstallPanel_Type; + public static String MavenUserLibraryProviderInstallPanel_Version; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() { + } +} Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/libprov/AutoResizeTableLayout.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/libprov/AutoResizeTableLayout.java 2009-12-10 21:02:27 UTC (rev 19198) +++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/libprov/AutoResizeTableLayout.java 2009-12-10 23:14:28 UTC (rev 19199) @@ -32,6 +32,7 @@ import org.eclipse.swt.events.ControlListener; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; +import org.jboss.tools.maven.ui.Messages; public class AutoResizeTableLayout extends TableLayout implements ControlListener { @@ -92,7 +93,7 @@ int weight = cw.weight; totalWeight += weight; } else { - throw new IllegalStateException("Unknown column layout data"); + throw new IllegalStateException(Messages.AutoResizeTableLayout_Unknown_column_layout_data); } } Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/libprov/DependencyEditingSupport.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/libprov/DependencyEditingSupport.java 2009-12-10 21:02:27 UTC (rev 19198) +++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/libprov/DependencyEditingSupport.java 2009-12-10 23:14:28 UTC (rev 19199) @@ -1,5 +1,6 @@ package org.jboss.tools.maven.ui.internal.libprov; +import org.jboss.tools.maven.ui.Messages; import org.maven.ide.components.pom.Dependency; import org.eclipse.jface.viewers.CellEditor; import org.eclipse.jface.viewers.ColumnViewer; @@ -10,8 +11,8 @@ public class DependencyEditingSupport extends EditingSupport { - private static String[] scopes = {"","provided", "compile", "test", "runtime", "system","import"}; - private static String[] types = {"","jar","war","rar","ear","par","ejb","ejb3","ejb-client","test-jar","java-source","javadoc","maven-plugin","pom"}; + private static String[] scopes = {"","provided", "compile", "test", "runtime", "system","import"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ + private static String[] types = {"","jar","war","rar","ear","par","ejb","ejb3","ejb-client","test-jar","java-source","javadoc","maven-plugin","pom"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$ //$NON-NLS-13$ //$NON-NLS-14$ private CellEditor editor; private int column; @@ -54,19 +55,19 @@ case 0: value = dependency.getGroupId(); if (value == null) { - value = ""; + value = ""; //$NON-NLS-1$ } return value; case 1: value = dependency.getArtifactId(); if (value == null) { - value = ""; + value = ""; //$NON-NLS-1$ } return value; case 2: value = dependency.getVersion(); if (value == null) { - value = ""; + value = ""; //$NON-NLS-1$ } return value; case 3: Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/libprov/ExclusionEditingSupport.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/libprov/ExclusionEditingSupport.java 2009-12-10 21:02:27 UTC (rev 19198) +++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/libprov/ExclusionEditingSupport.java 2009-12-10 23:14:28 UTC (rev 19199) @@ -5,6 +5,7 @@ import org.eclipse.jface.viewers.EditingSupport; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.TextCellEditor; +import org.jboss.tools.maven.ui.Messages; import org.maven.ide.components.pom.Exclusion; public class ExclusionEditingSupport extends EditingSupport { @@ -36,13 +37,13 @@ case 0: value = exclusion.getGroupId(); if (value == null) { - value = ""; + value = ""; //$NON-NLS-1$ } return value; case 1: value = exclusion.getArtifactId(); if (value == null) { - value = ""; + value = ""; //$NON-NLS-1$ } return value; } Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/libprov/MavenUserLibraryProviderInstallPanel.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/libprov/MavenUserLibraryProviderInstallPanel.java 2009-12-10 21:02:27 UTC (rev 19198) +++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/libprov/MavenUserLibraryProviderInstallPanel.java 2009-12-10 23:14:28 UTC (rev 19199) @@ -26,6 +26,7 @@ import org.eclipse.jface.viewers.Viewer; import org.eclipse.jst.common.project.facet.core.libprov.ILibraryProvider; import org.eclipse.jst.common.project.facet.ui.libprov.LibraryProviderOperationPanel; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.events.DisposeEvent; import org.eclipse.swt.events.DisposeListener; @@ -41,6 +42,7 @@ import org.eclipse.swt.widgets.Table; import org.jboss.tools.maven.core.MavenCoreActivator; import org.jboss.tools.maven.core.libprov.MavenLibraryProviderInstallOperationConfig; +import org.jboss.tools.maven.ui.Messages; import org.maven.ide.components.pom.Dependency; import org.maven.ide.components.pom.Exclusion; import org.maven.ide.components.pom.Model; @@ -119,7 +121,7 @@ composite.setLayoutData(new GridData(GridData.FILL_BOTH)); Label dependencyLabel = new Label(composite, SWT.NONE); - dependencyLabel.setText("Dependencies:"); + dependencyLabel.setText(Messages.MavenUserLibraryProviderInstallPanel_Dependencies); GridData gd = new GridData(GridData.FILL_BOTH); gd.horizontalSpan=2; dependencyLabel.setLayoutData(gd); @@ -142,7 +144,7 @@ }); Label exclusionLabel = new Label(composite, SWT.NONE); - exclusionLabel.setText("Exclusions:"); + exclusionLabel.setText(Messages.MavenUserLibraryProviderInstallPanel_Exclusions); gd = new GridData(GridData.FILL_BOTH); gd.horizontalSpan=2; exclusionLabel.setLayoutData(gd); @@ -170,7 +172,7 @@ table.setLinesVisible(true); table.setFont(parent.getFont()); - String[] columnHeaders = {"GroupId","ArtifactId"}; + String[] columnHeaders = {Messages.MavenUserLibraryProviderInstallPanel_GroupId,Messages.MavenUserLibraryProviderInstallPanel_ArtifactId}; for (int i = 0; i < columnHeaders.length; i++) { TableViewerColumn column = new TableViewerColumn(exclusionViewer, SWT.NONE); @@ -206,7 +208,7 @@ table.setLinesVisible(true); table.setFont(parent.getFont()); - String[] columnHeaders = {"GroupId","ArtifactId","Version","Scope","Type"}; + String[] columnHeaders = {Messages.MavenUserLibraryProviderInstallPanel_GroupId,Messages.MavenUserLibraryProviderInstallPanel_ArtifactId,Messages.MavenUserLibraryProviderInstallPanel_Version,Messages.MavenUserLibraryProviderInstallPanel_Scope,Messages.MavenUserLibraryProviderInstallPanel_Type}; for (int i = 0; i < columnHeaders.length; i++) { TableViewerColumn column = new TableViewerColumn(dependencyViewer, SWT.NONE); @@ -236,7 +238,7 @@ Button addButton = new Button(buttonComposite, SWT.PUSH); addButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - addButton.setText("Add"); + addButton.setText(Messages.MavenUserLibraryProviderInstallPanel_Add); addButton.addSelectionListener(new SelectionListener(){ public void widgetDefaultSelected(SelectionEvent e) { @@ -245,8 +247,8 @@ public void widgetSelected(SelectionEvent e) { Dependency dependency = PomFactory.eINSTANCE.createDependency(); - dependency.setGroupId("?"); - dependency.setArtifactId("?"); + dependency.setGroupId("?"); //$NON-NLS-1$ + dependency.setArtifactId("?"); //$NON-NLS-1$ dependencies.add(dependency); dependencyViewer.refresh(); } @@ -255,7 +257,7 @@ final Button removeButton = new Button(buttonComposite, SWT.PUSH); removeButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - removeButton.setText("Remove"); + removeButton.setText(Messages.MavenUserLibraryProviderInstallPanel_Remove); removeButton.setEnabled(false); removeButton.addSelectionListener(new SelectionListener(){ @@ -267,7 +269,7 @@ Object object = selection.getFirstElement(); if (object instanceof Dependency) { Dependency dependency = (Dependency) object; - boolean ok = MessageDialog.openQuestion(getShell(), "Remove dependency", "Are you sure you want to remove the '" + dependency.getGroupId() + ":" + dependency.getArtifactId() + "' artifact?"); + boolean ok = MessageDialog.openQuestion(getShell(), Messages.MavenUserLibraryProviderInstallPanel_Remove_dependency, NLS.bind(Messages.MavenUserLibraryProviderInstallPanel_Are_you_sure_you_want_to_remove_the_artifact, dependency.getGroupId(), dependency.getArtifactId())); if (ok) { dependencies.remove(object); dependencyViewer.refresh(); @@ -283,7 +285,7 @@ final Button restoreDefaults = new Button(buttonComposite, SWT.PUSH); restoreDefaults.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - restoreDefaults.setText("Restore Defaults"); + restoreDefaults.setText(Messages.MavenUserLibraryProviderInstallPanel_Restore_Defaults); restoreDefaults.addSelectionListener(new SelectionListener(){ @@ -351,7 +353,7 @@ Button addButton = new Button(buttonComposite, SWT.PUSH); addButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - addButton.setText("Add"); + addButton.setText(Messages.MavenUserLibraryProviderInstallPanel_Add); addButton.addSelectionListener(new SelectionListener(){ public void widgetDefaultSelected(SelectionEvent e) { @@ -360,8 +362,8 @@ public void widgetSelected(SelectionEvent e) { Exclusion exclusion = PomFactory.eINSTANCE.createExclusion(); - exclusion.setGroupId("?"); - exclusion.setArtifactId("?"); + exclusion.setGroupId("?"); //$NON-NLS-1$ + exclusion.setArtifactId("?"); //$NON-NLS-1$ if (exclusions == null) { ISelection sel = dependencyViewer.getSelection(); if (sel instanceof IStructuredSelection) { @@ -383,7 +385,7 @@ final Button removeButton = new Button(buttonComposite, SWT.PUSH); removeButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - removeButton.setText("Remove"); + removeButton.setText(Messages.MavenUserLibraryProviderInstallPanel_Remove); removeButton.setEnabled(false); removeButton.addSelectionListener(new SelectionListener(){ @@ -395,7 +397,7 @@ Object object = selection.getFirstElement(); if (object instanceof Exclusion) { Exclusion exclusion = (Exclusion) object; - boolean ok = MessageDialog.openQuestion(getShell(), "Remove exclusion", "Are you sure you want to remove the '" + exclusion.getGroupId() + ":" + exclusion.getArtifactId() + "' artifact?"); + boolean ok = MessageDialog.openQuestion(getShell(), Messages.MavenUserLibraryProviderInstallPanel_Remove_exclusion, NLS.bind(Messages.MavenUserLibraryProviderInstallPanel_Are_you_sure_you_want_to_remove_the_artifact, exclusion.getGroupId(), exclusion.getArtifactId())); if (ok && exclusions != null) { exclusions.remove(object); } Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/project/facet/MavenFacetInstallPage.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/project/facet/MavenFacetInstallPage.java 2009-12-10 21:02:27 UTC (rev 19198) +++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/project/facet/MavenFacetInstallPage.java 2009-12-10 23:14:28 UTC (rev 19199) @@ -34,6 +34,7 @@ import org.eclipse.wst.common.project.facet.ui.IWizardContext; import org.jboss.tools.maven.core.IJBossMavenConstants; import org.jboss.tools.maven.ui.Activator; +import org.jboss.tools.maven.ui.Messages; import org.maven.ide.eclipse.MavenPlugin; import org.maven.ide.eclipse.core.IMavenConstants; import org.maven.ide.eclipse.embedder.MavenModelManager; @@ -53,8 +54,8 @@ public MavenFacetInstallPage() { super(DataModelFactory.createDataModel(new AbstractDataModelProvider() { }), "jboss.m2.facet.install.page"); //$NON-NLS-1$ - setTitle("JBoss M2 capabilities"); - setDescription("Add M2 capabilities to this Web Project"); + setTitle(Messages.MavenFacetInstallPage_JBoss_M2_capabilities); + setDescription(Messages.MavenFacetInstallPage_Add_M2_capabilities_to_this_Web_Project); } @@ -100,16 +101,16 @@ } - groupId = createField(composite,"Group Id:",IJBossMavenConstants.GROUP_ID); - artifactId = createField(composite, "Artifact Id:", IJBossMavenConstants.ARTIFACT_ID); + groupId = createField(composite,Messages.MavenFacetInstallPage_Group_Id,IJBossMavenConstants.GROUP_ID); + artifactId = createField(composite, Messages.MavenFacetInstallPage_Artifact_Id, IJBossMavenConstants.ARTIFACT_ID); if (!mavenProjectExists) { artifactId.setText(projectName); } - version = createField(composite, "Version:", IJBossMavenConstants.VERSION); + version = createField(composite, Messages.MavenFacetInstallPage_Version, IJBossMavenConstants.VERSION); Label packagingLabel = new Label(composite, SWT.NONE); - packagingLabel.setText("Packaging:"); + packagingLabel.setText(Messages.MavenFacetInstallPage_Packaging); packaging = new Combo(composite, SWT.READ_ONLY); gd = new GridData(GridData.FILL_HORIZONTAL); packaging.setLayoutData(gd); @@ -136,12 +137,12 @@ } synchHelper.synchCombo(packaging, IJBossMavenConstants.PACKAGING, null); - name = createField(composite, "Name:", IJBossMavenConstants.NAME); + name = createField(composite, Messages.MavenFacetInstallPage_Name, IJBossMavenConstants.NAME); name.setText(projectName); - description = createField(composite, "Description", IJBossMavenConstants.DESCRIPTION); + description = createField(composite, Messages.MavenFacetInstallPage_Description, IJBossMavenConstants.DESCRIPTION); if (!mavenProjectExists && fpwc.hasProjectFacet(SEAM_FACET)) { - Text seamVersion = createField(composite, "Seam Maven version:", IJBossMavenConstants.SEAM_MAVEN_VERSION); + Text seamVersion = createField(composite, Messages.MavenFacetInstallPage_Seam_Maven_version, IJBossMavenConstants.SEAM_MAVEN_VERSION); IProjectFacetVersion seamFacetVersion = fpwc.getProjectFacetVersion(SEAM_FACET); if ("2.0".equals(seamFacetVersion.getVersionString())) { //$NON-NLS-1$ seamVersion.setText("2.0.2.SP1"); //$NON-NLS-1$ @@ -151,7 +152,7 @@ seamVersion.setText("2.2.0.GA"); //$NON-NLS-1$ } Button removeWTPContainers = new Button(composite,SWT.CHECK); - removeWTPContainers.setText("Remove WTP Classpath containers"); + removeWTPContainers.setText(Messages.MavenFacetInstallPage_Remove_WTP_Classpath_containers); synchHelper.synchCheckbox(removeWTPContainers, IJBossMavenConstants.REMOVE_WTP_CLASSPATH_CONTAINERS, null); // FIXME add the Validate button } @@ -179,13 +180,13 @@ protected void validatePage() { setErrorMessage(null); if (groupId.getText().trim().length() <= 0) { - setErrorMessage("The groupId field is required."); + setErrorMessage(Messages.MavenFacetInstallPage_The_groupId_field_is_required); } else if (artifactId.getText().trim().length() <= 0) { - setErrorMessage("The artifactId field is required."); + setErrorMessage(Messages.MavenFacetInstallPage_The_artifactId_field_is_required); } else if (version.getText().trim().length() <= 0) { - setErrorMessage("The version field is required."); + setErrorMessage(Messages.MavenFacetInstallPage_The_version_field_is_required); } else if (packaging.getText().trim().length() <= 0) { - setErrorMessage("The packaging field is required."); + setErrorMessage(Messages.MavenFacetInstallPage_The_packaging_field_is_required); } } Added: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/messages.properties =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/messages.properties (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/messages.properties 2009-12-10 23:14:28 UTC (rev 19199) @@ -0,0 +1,28 @@ +AutoResizeTableLayout_Unknown_column_layout_data=Unknown column layout data +MavenFacetInstallPage_Add_M2_capabilities_to_this_Web_Project=Add M2 capabilities to this Web Project +MavenFacetInstallPage_Artifact_Id=Artifact Id: +MavenFacetInstallPage_Description=Description +MavenFacetInstallPage_Group_Id=Group Id: +MavenFacetInstallPage_JBoss_M2_capabilities=JBoss M2 capabilities +MavenFacetInstallPage_Name=Name: +MavenFacetInstallPage_Packaging=Packaging: +MavenFacetInstallPage_Remove_WTP_Classpath_containers=Remove WTP Classpath containers +MavenFacetInstallPage_Seam_Maven_version=Seam Maven version: +MavenFacetInstallPage_The_artifactId_field_is_required=The artifactId field is required. +MavenFacetInstallPage_The_groupId_field_is_required=The groupId field is required. +MavenFacetInstallPage_The_packaging_field_is_required=The packaging field is required. +MavenFacetInstallPage_The_version_field_is_required=The version field is required. +MavenFacetInstallPage_Version=Version: +MavenUserLibraryProviderInstallPanel_Add=Add +MavenUserLibraryProviderInstallPanel_Are_you_sure_you_want_to_remove_the_artifact=Are you sure you want to remove the \'{0}\:{1} artifact? +MavenUserLibraryProviderInstallPanel_ArtifactId=ArtifactId +MavenUserLibraryProviderInstallPanel_Dependencies=Dependencies: +MavenUserLibraryProviderInstallPanel_Exclusions=Exclusions: +MavenUserLibraryProviderInstallPanel_GroupId=GroupId +MavenUserLibraryProviderInstallPanel_Remove=Remove +MavenUserLibraryProviderInstallPanel_Remove_dependency=Remove dependency +MavenUserLibraryProviderInstallPanel_Remove_exclusion=Remove exclusion +MavenUserLibraryProviderInstallPanel_Restore_Defaults=Restore Defaults +MavenUserLibraryProviderInstallPanel_Scope=Scope +MavenUserLibraryProviderInstallPanel_Type=Type +MavenUserLibraryProviderInstallPanel_Version=Version

15 years, 1 month

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits December 2009