April 2012 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r40231 - in trunk/vpe: tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dmaliarevich Date: 2012-04-17 05:42:20 -0400 (Tue, 17 Apr 2012) New Revision: 40231 Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/VpeToolbarTest.java Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java Log: https://issues.jboss.org/browse/JBIDE-11302 -- adding junit. Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2012-04-17 09:22:35 UTC (rev 40230) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2012-04-17 09:42:20 UTC (rev 40231) @@ -478,9 +478,9 @@ dlg.open(); } }; - externalizeStringsAction.setImageDescriptor(ImageDescriptor.createFromFile(MozillaEditor.class, - ICON_EXTERNALIZE_STRINGS)); - externalizeStringsAction.setToolTipText(JstUIMessages.EXTERNALIZE_STRINGS); + externalizeStringsAction.setImageDescriptor(ImageDescriptor.createFromFile( + MozillaEditor.class, ICON_EXTERNALIZE_STRINGS)); + externalizeStringsAction.setToolTipText(JstUIMessages.EXTERNALIZE_STRINGS_POPUP_MENU_TITLE); toolBarManager.add(externalizeStringsAction); /* Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java 2012-04-17 09:22:35 UTC (rev 40230) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java 2012-04-17 09:42:20 UTC (rev 40231) @@ -42,6 +42,7 @@ import org.jboss.tools.vpe.ui.bot.test.editor.preferences.ShowNonVisualTagsTest; import org.jboss.tools.vpe.ui.bot.test.editor.preferences.ShowResourceBundlesUsageasELexpressionsTest; import org.jboss.tools.vpe.ui.bot.test.editor.preferences.ShowSelectionTagBarTest; +import org.jboss.tools.vpe.ui.bot.test.editor.preferences.VpeToolbarTest; import org.jboss.tools.vpe.ui.bot.test.editor.selectionbar.SelectionBarTest; import org.jboss.tools.vpe.ui.bot.test.editor.tags.ActionParamTagTest; import org.jboss.tools.vpe.ui.bot.test.editor.tags.AjaxInvisibleTagsTest; @@ -212,7 +213,8 @@ SelectTagTest.class, RichFacesComponentTest.class, UnicodeCharacterDisplayingTest.class, - ExternalEditingTest.class + ExternalEditingTest.class, + VpeToolbarTest.class }) public class VPEAllBotTests extends SWTBotTestCase{ Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/VpeToolbarTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/VpeToolbarTest.java (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/VpeToolbarTest.java 2012-04-17 09:42:20 UTC (rev 40231) @@ -0,0 +1,88 @@ +/******************************************************************************* + * Copyright (c) 2007-2012 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.vpe.ui.bot.test.editor.preferences; + +import java.awt.event.KeyEvent; + +import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor; +import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotCheckBox; +import org.jboss.tools.ui.bot.ext.SWTBotExt; +import org.jboss.tools.ui.bot.ext.Timing; +import org.jboss.tools.ui.bot.ext.helper.KeyboardHelper; +import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase; + +public class VpeToolbarTest extends PreferencesTestCase { + + private SWTBotEclipseEditor jspEditor; + private SWTBotExt botExt = null; + + public VpeToolbarTest() { + super(); + botExt = new SWTBotExt(); + } + + public void testVpeToolbarVisibility_JBIDE11302() { + openPage(); + /* + * Select some text + */ + jspEditor = botExt.editorByTitle(VPEAutoTestCase.TEST_PAGE).toTextEditor(); + jspEditor.navigateTo(6, 28); + bot.sleep(Timing.time1S()); + /* + * Send key press event to fire VPE listeners + */ + KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_RIGHT); + bot.sleep(Timing.time1S()); + /* + * Check that tool items is available. + */ + try { + bot.toolbarToggleButtonWithTooltip(SCROLL_LOCK_TOOLTIP); + } catch (WidgetNotFoundException e) { + fail("Cannot find \""+ SCROLL_LOCK_TOOLTIP + "\" button on startup"); //$NON-NLS-1$ //$NON-NLS-2$ + } + try { + bot.toolbarButtonWithTooltip(I18N_BUTTON_TOOLTIP); + } catch (WidgetNotFoundException e) { + fail("Cannot find \""+ I18N_BUTTON_TOOLTIP + "\" button on startup"); //$NON-NLS-1$ //$NON-NLS-2$ + } + /* + * Change preferences. + */ + bot.toolbarButtonWithTooltip(PREF_TOOLTIP).click(); + bot.shell(PREF_FILTER_SHELL_TITLE).activate(); + SWTBotCheckBox chbShowVpeToolbar = bot.checkBox(SHOW_VISUAL_TOOLBAR_PREFS_CHECKBOX_NAME); + /* + * Toggle the selection + */ + if (!chbShowVpeToolbar.isChecked()) { + chbShowVpeToolbar.click(); + } + bot.button("OK").click(); //$NON-NLS-1$ + /* + * Check that tool items is available. + */ + bot.sleep(Timing.time1S()); + try { + bot.toolbarToggleButtonWithTooltip(SCROLL_LOCK_TOOLTIP); + } catch (WidgetNotFoundException e) { + fail("Cannot find \""+ SCROLL_LOCK_TOOLTIP + "\" button after VPE toolbar visibility has been changed"); //$NON-NLS-1$ //$NON-NLS-2$ + } + try { + bot.toolbarButtonWithTooltip(I18N_BUTTON_TOOLTIP1); + } catch (WidgetNotFoundException e) { + fail("Cannot find \""+ I18N_BUTTON_TOOLTIP1 + "\" button after VPE toolbar visibility has been changed"); //$NON-NLS-1$ //$NON-NLS-2$ + } + closePage(); + } +}

13 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r40230 - trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences.

by jbosstools-commits＠lists.jboss.org

Author: yradtsevich Date: 2012-04-17 05:22:35 -0400 (Tue, 17 Apr 2012) New Revision: 40230 Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/PreferencesTestCase.java Log: https://issues.jboss.org/browse/JBIDE-11302 -- adding junit. Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/PreferencesTestCase.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/PreferencesTestCase.java 2012-04-17 00:21:47 UTC (rev 40229) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/PreferencesTestCase.java 2012-04-17 09:22:35 UTC (rev 40230) @@ -38,7 +38,8 @@ protected static final String PREF_TOOLTIP = "Preferences"; //$NON-NLS-1$ protected static final String PREF_FILTER_SHELL_TITLE = "Preferences (Filtered)"; //$NON-NLS-1$ protected static final String SCROLL_LOCK_TOOLTIP = "Synchronize scrolling between source and visual panes"; //$NON-NLS-1$ - protected static final String I18N_BUTTON_TOOLTIP = "Externalize selected string...(" + //$NON-NLS-1$ + protected static final String I18N_BUTTON_TOOLTIP1 = "Externalize selected string..."; //$NON-NLS-1$ + protected static final String I18N_BUTTON_TOOLTIP = "Externalize selected string... (" + //$NON-NLS-1$ (SWTJBTExt.isRunningOnMacOs() ? "⌘7" : "Ctrl+7") + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ protected static final String SHOW_VISUAL_TOOLBAR_PREFS_CHECKBOX_NAME = "Show toolbar within the editor (otherwise in Eclipse's toolbar)"; //$NON-NLS-1$

13 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r40229 - trunk/as/features/org.jboss.ide.eclipse.as.server.rse.integration.feature.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2012-04-16 20:21:47 -0400 (Mon, 16 Apr 2012) New Revision: 40229 Modified: trunk/as/features/org.jboss.ide.eclipse.as.server.rse.integration.feature/feature.xml Log: https://issues.jboss.org/browse/JBIDE-11537 JBoss AS Tools Features have the same name Modified: trunk/as/features/org.jboss.ide.eclipse.as.server.rse.integration.feature/feature.xml =================================================================== --- trunk/as/features/org.jboss.ide.eclipse.as.server.rse.integration.feature/feature.xml 2012-04-17 00:06:32 UTC (rev 40228) +++ trunk/as/features/org.jboss.ide.eclipse.as.server.rse.integration.feature/feature.xml 2012-04-17 00:21:47 UTC (rev 40229) @@ -23,49 +23,58 @@ Raleigh NC 27606 USA. </license> - <requires> - <import plugin="org.eclipse.core.runtime" version="3.7.0" match="greaterOrEqual"/> - <import plugin="org.jboss.ide.eclipse.as.wtp.core" version="1.0.0" match="greaterOrEqual"/> - <import plugin="org.eclipse.wst.server.core" version="1.1.302" match="greaterOrEqual"/> - <import plugin="org.eclipse.wst.common.project.facet.core" version="1.4.200" match="greaterOrEqual"/> - <import plugin="org.eclipse.core.resources" version="3.7.100" match="greaterOrEqual"/> - <import plugin="org.eclipse.wst.common.modulecore" version="1.2.100" match="greaterOrEqual"/> - <import plugin="org.eclipse.wst.common.emfworkbench.integration" version="1.2.100" match="greaterOrEqual"/> - <import plugin="org.eclipse.jem.util" version="2.1.2" match="greaterOrEqual"/> - <import plugin="org.eclipse.debug.core" version="3.7.0" match="greaterOrEqual"/> - <import plugin="org.eclipse.jdt.launching" version="3.6.0" match="greaterOrEqual"/> - <import plugin="org.eclipse.ui" version="3.7.0" match="greaterOrEqual"/> - <import plugin="org.eclipse.wst.server.ui" version="1.1.305" match="greaterOrEqual"/> - <import plugin="org.eclipse.debug.ui" version="3.7.0" match="greaterOrEqual"/> - <import plugin="org.eclipse.rse.core" version="3.1.200" match="greaterOrEqual"/> - <import plugin="org.eclipse.rse.subsystems.files.core" version="3.2.100" match="greaterOrEqual"/> - <import plugin="org.eclipse.rse.services" version="3.2.100" match="greaterOrEqual"/> - <import plugin="org.eclipse.rse.services.files.ftp" version="3.0.300" match="greaterOrEqual"/> - <import plugin="org.eclipse.rse.services.local" version="2.1.300" match="greaterOrEqual"/> - <import plugin="org.eclipse.rse.services.ssh" version="3.1.0" match="greaterOrEqual"/> - <import plugin="org.eclipse.rse.subsystems.shells.core" version="3.1.200" match="greaterOrEqual"/> - <import plugin="org.jboss.ide.eclipse.as.core"/> - <import plugin="org.jboss.ide.eclipse.archives.webtools"/> - <import plugin="org.eclipse.tm.terminal" version="3.1.0" match="greaterOrEqual"/> - <import plugin="org.jboss.ide.eclipse.as.ui"/> - <import plugin="org.eclipse.rse.files.ui" version="3.2.0" match="greaterOrEqual"/> - <import plugin="org.eclipse.rse.ui" version="3.2.0" match="greaterOrEqual"/> - <import plugin="org.eclipse.rse.subsystems.shells.local" version="2.1.300" match="greaterOrEqual"/> - <import plugin="org.eclipse.rse.subsystems.shells.ssh" version="2.1.300" match="greaterOrEqual"/> - <import plugin="org.eclipse.rse.subsystems.shells.telnet" version="1.2.200" match="greaterOrEqual"/> - <import plugin="org.eclipse.rse.connectorservice.local"/> - <import plugin="org.eclipse.rse.connectorservice.ssh"/> - <import plugin="org.eclipse.rse.processes.ui"/> - <import plugin="org.eclipse.rse.shells.ui"/> - <import plugin="org.eclipse.rse.subsystems.files.local"/> - <import plugin="org.eclipse.rse.subsystems.files.ssh"/> - <import plugin="org.eclipse.rse.subsystems.processes.core"/> - <import plugin="org.eclipse.rse.subsystems.processes.local"/> - <import plugin="org.eclipse.rse.subsystems.processes.shell.linux"/> - <import plugin="org.eclipse.rse.subsystems.terminals.core"/> - <import plugin="org.eclipse.rse.subsystems.terminals.ssh"/> - <import plugin="org.eclipse.rse.terminals.ui"/> - </requires> + <requires> + <import plugin="org.eclipse.core.runtime" version="3.7.0" match="greaterOrEqual" /> + <import plugin="org.jboss.ide.eclipse.as.wtp.core" version="1.0.0" match="greaterOrEqual" /> + <import plugin="org.eclipse.wst.server.core" version="1.1.302" match="greaterOrEqual" /> + <import plugin="org.eclipse.wst.common.project.facet.core" version="1.4.200" match="greaterOrEqual" /> + <import plugin="org.eclipse.core.resources" version="3.7.100" match="greaterOrEqual" /> + <import plugin="org.eclipse.wst.common.modulecore" version="1.2.100" match="greaterOrEqual" /> + <import plugin="org.eclipse.wst.common.emfworkbench.integration" version="1.2.100" match="greaterOrEqual" /> + <import plugin="org.eclipse.jem.util" version="2.1.2" match="greaterOrEqual" /> + <import plugin="org.eclipse.debug.core" version="3.7.0" match="greaterOrEqual" /> + <import plugin="org.eclipse.jdt.launching" version="3.6.0" match="greaterOrEqual" /> + <import plugin="org.eclipse.ui" version="3.7.0" match="greaterOrEqual" /> + <import plugin="org.eclipse.wst.server.ui" version="1.1.305" match="greaterOrEqual" /> + <import plugin="org.eclipse.debug.ui" version="3.7.0" match="greaterOrEqual" /> + <import plugin="org.eclipse.rse.core" version="3.1.200" match="greaterOrEqual" /> + <import plugin="org.eclipse.rse.subsystems.files.core" version="3.2.100" match="greaterOrEqual" /> + <import plugin="org.eclipse.rse.services" version="3.2.100" match="greaterOrEqual" /> + <import plugin="org.eclipse.rse.services.files.ftp" version="3.0.300" match="greaterOrEqual" /> + <import plugin="org.eclipse.rse.services.local" version="2.1.300" match="greaterOrEqual" /> + <import plugin="org.eclipse.rse.services.ssh" version="3.1.0" match="greaterOrEqual" /> + <import plugin="org.eclipse.rse.subsystems.shells.core" version="3.1.200" match="greaterOrEqual" /> + <import plugin="org.jboss.ide.eclipse.as.core" /> + <import plugin="org.jboss.ide.eclipse.archives.webtools" /> + <import plugin="org.eclipse.tm.terminal" version="3.1.0" match="greaterOrEqual" /> + <import plugin="org.jboss.ide.eclipse.as.ui" /> + <import plugin="org.eclipse.rse.files.ui" version="3.2.0" match="greaterOrEqual" /> + <import plugin="org.eclipse.rse.ui" version="3.2.0" match="greaterOrEqual" /> + <import plugin="org.eclipse.rse.subsystems.shells.local" version="2.1.300" match="greaterOrEqual" /> + <import plugin="org.eclipse.rse.subsystems.shells.ssh" version="2.1.300" match="greaterOrEqual" /> + <import plugin="org.eclipse.rse.subsystems.shells.telnet" version="1.2.200" match="greaterOrEqual" /> + +  + <import plugin="org.eclipse.rse.connectorservice.local"/> + <import plugin="org.eclipse.rse.connectorservice.ssh"/> + <import plugin="org.eclipse.rse.processes.ui"/> + <import plugin="org.eclipse.rse.shells.ui"/> + <import plugin="org.eclipse.rse.subsystems.files.local"/> + <import plugin="org.eclipse.rse.subsystems.files.ssh"/> + <import plugin="org.eclipse.rse.subsystems.processes.core"/> + <import plugin="org.eclipse.rse.subsystems.processes.local"/> + <import plugin="org.eclipse.rse.subsystems.processes.shell.linux"/> + <import plugin="org.eclipse.rse.subsystems.terminals.core"/> + <import plugin="org.eclipse.rse.subsystems.terminals.ssh"/> + <import plugin="org.eclipse.rse.terminals.ui"/> + </requires> <plugin id="org.jboss.ide.eclipse.as.rse.core"

13 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r40228 - in trunk/as/features: org.jboss.ide.eclipse.as.feature and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2012-04-16 20:06:32 -0400 (Mon, 16 Apr 2012) New Revision: 40228 Modified: trunk/as/features/org.jboss.ide.eclipse.as.archives.integration.feature/feature.xml trunk/as/features/org.jboss.ide.eclipse.as.feature/feature.xml trunk/as/features/org.jboss.ide.eclipse.as.jmx.integration.feature/feature.xml trunk/as/features/org.jboss.ide.eclipse.as.server.rse.integration.feature/feature.xml Log: https://issues.jboss.org/browse/JBIDE-11537 JBoss AS Tools Features have the same name Modified: trunk/as/features/org.jboss.ide.eclipse.as.archives.integration.feature/feature.xml =================================================================== --- trunk/as/features/org.jboss.ide.eclipse.as.archives.integration.feature/feature.xml 2012-04-16 23:57:36 UTC (rev 40227) +++ trunk/as/features/org.jboss.ide.eclipse.as.archives.integration.feature/feature.xml 2012-04-17 00:06:32 UTC (rev 40228) @@ -3,8 +3,7 @@ id="org.jboss.ide.eclipse.as.archives.integration.feature" label="%featureName" version="2.3.0.qualifier" - provider-name="%providerName" - plugin="org.jboss.ide.eclipse.as.ui"> + provider-name="%providerName"> <description url="http://www.jboss.org/tools"> %description @@ -24,6 +23,10 @@ Raleigh NC 27606 USA. </license> + <includes + id="org.jboss.ide.eclipse.as.serverAdapter.wtp.feature" + version="0.0.0"/> + <requires> <import plugin="org.eclipse.ui" version="3.7.0" match="greaterOrEqual"/> <import plugin="org.eclipse.core.runtime" version="3.7.0" match="greaterOrEqual"/> @@ -53,7 +56,6 @@ <import feature="org.jboss.ide.eclipse.archives.feature"/> </requires> - <includes id="org.jboss.ide.eclipse.as.serverAdapter.wtp.feature" version="0.0.0" /> <plugin id="org.jboss.ide.eclipse.archives.webtools" download-size="0" Modified: trunk/as/features/org.jboss.ide.eclipse.as.feature/feature.xml =================================================================== --- trunk/as/features/org.jboss.ide.eclipse.as.feature/feature.xml 2012-04-16 23:57:36 UTC (rev 40227) +++ trunk/as/features/org.jboss.ide.eclipse.as.feature/feature.xml 2012-04-17 00:06:32 UTC (rev 40228) @@ -3,8 +3,7 @@ id="org.jboss.ide.eclipse.as.feature" label="%featureName" version="2.3.0.qualifier" - provider-name="%providerName" - plugin="org.jboss.ide.eclipse.as.ui"> + provider-name="%providerName"> <description url="http://www.jboss.org/tools"> %description @@ -24,6 +23,22 @@ Raleigh NC 27606 USA. </license> + <includes + id="org.jboss.ide.eclipse.as.archives.integration.feature" + version="0.0.0"/> + + <includes + id="org.jboss.ide.eclipse.as.jmx.integration.feature" + version="0.0.0"/> + + <includes + id="org.jboss.ide.eclipse.as.server.rse.integration.feature" + version="0.0.0"/> + + <includes + id="org.jboss.ide.eclipse.as.serverAdapter.wtp.feature" + version="0.0.0"/> + <requires> <import plugin="org.eclipse.ui" version="3.7.0" match="greaterOrEqual"/> <import plugin="org.eclipse.core.runtime" version="3.7.0" match="greaterOrEqual"/> @@ -61,14 +76,9 @@ <import plugin="org.eclipse.jst.j2ee.ui" version="1.1.500" match="greaterOrEqual"/> <import plugin="org.eclipse.jst.common.frameworks" version="1.1.500" match="greaterOrEqual"/> <import feature="org.jboss.ide.eclipse.archives.feature"/> - <import feature="org.jboss.tools.jmx.feature"/> + <import feature="org.jboss.tools.jmx.feature"/> </requires> - <includes id="org.jboss.ide.eclipse.as.archives.integration.feature" version="0.0.0" /> - <includes id="org.jboss.ide.eclipse.as.jmx.integration.feature" version="0.0.0" /> - <includes id="org.jboss.ide.eclipse.as.server.rse.integration.feature" version="0.0.0" /> - <includes id="org.jboss.ide.eclipse.as.serverAdapter.wtp.feature" version="0.0.0" /> - <plugin id="org.jboss.ide.eclipse.as.ui.mbeans" download-size="0" Modified: trunk/as/features/org.jboss.ide.eclipse.as.jmx.integration.feature/feature.xml =================================================================== --- trunk/as/features/org.jboss.ide.eclipse.as.jmx.integration.feature/feature.xml 2012-04-16 23:57:36 UTC (rev 40227) +++ trunk/as/features/org.jboss.ide.eclipse.as.jmx.integration.feature/feature.xml 2012-04-17 00:06:32 UTC (rev 40228) @@ -1,15 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<feature id="org.jboss.ide.eclipse.as.jmx.integration.feature" label="%featureName" version="2.3.0.qualifier" provider-name="%providerName" plugin="org.jboss.ide.eclipse.as.ui"> +<feature + id="org.jboss.ide.eclipse.as.jmx.integration.feature" + label="%featureName" + version="2.3.0.qualifier" + provider-name="%providerName"> - <description url="http://www.jboss.org/tools"> + <description url="http://www.jboss.org/tools"> %description </description> - <copyright> + <copyright> %copyright </copyright> - <license url="license.html"> + <license url="license.html"> Red Hat, Inc. licenses these features and plugins to you under certain open source licenses (or aggregations of such licenses), which in a particular case may include the Eclipse Public License, @@ -19,40 +23,49 @@ Raleigh NC 27606 USA. </license> - <requires> - <import plugin="org.eclipse.core.runtime" version="3.7.0" match="greaterOrEqual" /> - <import plugin="org.jboss.ide.eclipse.as.wtp.core" version="1.0.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.wst.server.core" version="1.1.302" match="greaterOrEqual" /> - <import plugin="org.eclipse.wst.common.project.facet.core" version="1.4.200" match="greaterOrEqual" /> - <import plugin="org.eclipse.core.resources" version="3.7.100" match="greaterOrEqual" /> - <import plugin="org.eclipse.wst.common.modulecore" version="1.2.100" match="greaterOrEqual" /> - <import plugin="org.eclipse.wst.common.emfworkbench.integration" version="1.2.100" match="greaterOrEqual" /> - <import plugin="org.eclipse.jem.util" version="2.1.2" match="greaterOrEqual" /> - <import plugin="org.eclipse.debug.core" version="3.7.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.jdt.launching" version="3.6.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.ui" version="3.7.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.wst.server.ui" version="1.1.305" match="greaterOrEqual" /> - <import plugin="org.eclipse.debug.ui" version="3.7.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.core" version="3.1.200" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.subsystems.files.core" version="3.2.100" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.services" version="3.2.100" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.services.files.ftp" version="3.0.300" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.services.local" version="2.1.300" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.services.ssh" version="3.1.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.subsystems.shells.core" version="3.1.200" match="greaterOrEqual" /> - <import plugin="org.jboss.ide.eclipse.as.core" /> - <import plugin="org.jboss.ide.eclipse.archives.webtools" /> - <import plugin="org.eclipse.tm.terminal" version="3.1.0" match="greaterOrEqual" /> - <import plugin="org.jboss.ide.eclipse.as.ui" /> - <import plugin="org.eclipse.rse.files.ui" version="3.2.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.ui" version="3.2.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.subsystems.shells.dstore" version="2.1.300" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.subsystems.shells.local" version="2.1.300" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.subsystems.shells.ssh" version="2.1.300" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.subsystems.shells.telnet" version="1.2.200" match="greaterOrEqual" /> - <import feature="org.jboss.tools.jmx.feature"/> - </requires> - - <includes id="org.jboss.ide.eclipse.as.serverAdapter.wtp.feature" version="0.0.0" /> - <plugin id="org.jboss.ide.eclipse.as.jmx.integration" download-size="0" install-size="0" version="0.0.0" unpack="false" /> + <includes + id="org.jboss.ide.eclipse.as.serverAdapter.wtp.feature" + version="0.0.0"/> + + <requires> + <import plugin="org.eclipse.core.runtime" version="3.7.0" match="greaterOrEqual"/> + <import plugin="org.jboss.ide.eclipse.as.wtp.core" version="1.0.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.wst.server.core" version="1.1.302" match="greaterOrEqual"/> + <import plugin="org.eclipse.wst.common.project.facet.core" version="1.4.200" match="greaterOrEqual"/> + <import plugin="org.eclipse.core.resources" version="3.7.100" match="greaterOrEqual"/> + <import plugin="org.eclipse.wst.common.modulecore" version="1.2.100" match="greaterOrEqual"/> + <import plugin="org.eclipse.wst.common.emfworkbench.integration" version="1.2.100" match="greaterOrEqual"/> + <import plugin="org.eclipse.jem.util" version="2.1.2" match="greaterOrEqual"/> + <import plugin="org.eclipse.debug.core" version="3.7.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.jdt.launching" version="3.6.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.ui" version="3.7.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.wst.server.ui" version="1.1.305" match="greaterOrEqual"/> + <import plugin="org.eclipse.debug.ui" version="3.7.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.core" version="3.1.200" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.subsystems.files.core" version="3.2.100" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.services" version="3.2.100" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.services.files.ftp" version="3.0.300" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.services.local" version="2.1.300" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.services.ssh" version="3.1.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.subsystems.shells.core" version="3.1.200" match="greaterOrEqual"/> + <import plugin="org.jboss.ide.eclipse.as.core"/> + <import plugin="org.jboss.ide.eclipse.archives.webtools"/> + <import plugin="org.eclipse.tm.terminal" version="3.1.0" match="greaterOrEqual"/> + <import plugin="org.jboss.ide.eclipse.as.ui"/> + <import plugin="org.eclipse.rse.files.ui" version="3.2.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.ui" version="3.2.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.subsystems.shells.dstore" version="2.1.300" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.subsystems.shells.local" version="2.1.300" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.subsystems.shells.ssh" version="2.1.300" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.subsystems.shells.telnet" version="1.2.200" match="greaterOrEqual"/> + <import feature="org.jboss.tools.jmx.feature"/> + </requires> + + <plugin + id="org.jboss.ide.eclipse.as.jmx.integration" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + </feature> Modified: trunk/as/features/org.jboss.ide.eclipse.as.server.rse.integration.feature/feature.xml =================================================================== --- trunk/as/features/org.jboss.ide.eclipse.as.server.rse.integration.feature/feature.xml 2012-04-16 23:57:36 UTC (rev 40227) +++ trunk/as/features/org.jboss.ide.eclipse.as.server.rse.integration.feature/feature.xml 2012-04-17 00:06:32 UTC (rev 40228) @@ -1,15 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<feature id="org.jboss.ide.eclipse.as.server.rse.integration.feature" label="%featureName" version="2.3.0.qualifier" provider-name="%providerName" plugin="org.jboss.ide.eclipse.as.ui"> +<feature + id="org.jboss.ide.eclipse.as.server.rse.integration.feature" + label="%featureName" + version="2.3.0.qualifier" + provider-name="%providerName"> - <description url="http://www.jboss.org/tools"> + <description url="http://www.jboss.org/tools"> %description </description> - <copyright> + <copyright> %copyright </copyright> - <license url="license.html"> + <license url="license.html"> Red Hat, Inc. licenses these features and plugins to you under certain open source licenses (or aggregations of such licenses), which in a particular case may include the Eclipse Public License, @@ -19,59 +23,62 @@ Raleigh NC 27606 USA. </license> - <requires> - <import plugin="org.eclipse.core.runtime" version="3.7.0" match="greaterOrEqual" /> - <import plugin="org.jboss.ide.eclipse.as.wtp.core" version="1.0.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.wst.server.core" version="1.1.302" match="greaterOrEqual" /> - <import plugin="org.eclipse.wst.common.project.facet.core" version="1.4.200" match="greaterOrEqual" /> - <import plugin="org.eclipse.core.resources" version="3.7.100" match="greaterOrEqual" /> - <import plugin="org.eclipse.wst.common.modulecore" version="1.2.100" match="greaterOrEqual" /> - <import plugin="org.eclipse.wst.common.emfworkbench.integration" version="1.2.100" match="greaterOrEqual" /> - <import plugin="org.eclipse.jem.util" version="2.1.2" match="greaterOrEqual" /> - <import plugin="org.eclipse.debug.core" version="3.7.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.jdt.launching" version="3.6.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.ui" version="3.7.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.wst.server.ui" version="1.1.305" match="greaterOrEqual" /> - <import plugin="org.eclipse.debug.ui" version="3.7.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.core" version="3.1.200" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.subsystems.files.core" version="3.2.100" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.services" version="3.2.100" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.services.files.ftp" version="3.0.300" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.services.local" version="2.1.300" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.services.ssh" version="3.1.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.subsystems.shells.core" version="3.1.200" match="greaterOrEqual" /> - <import plugin="org.jboss.ide.eclipse.as.core" /> - <import plugin="org.jboss.ide.eclipse.archives.webtools" /> - <import plugin="org.eclipse.tm.terminal" version="3.1.0" match="greaterOrEqual" /> - <import plugin="org.jboss.ide.eclipse.as.ui" /> - <import plugin="org.eclipse.rse.files.ui" version="3.2.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.ui" version="3.2.0" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.subsystems.shells.local" version="2.1.300" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.subsystems.shells.ssh" version="2.1.300" match="greaterOrEqual" /> - <import plugin="org.eclipse.rse.subsystems.shells.telnet" version="1.2.200" match="greaterOrEqual" /> - -  - <import plugin="org.eclipse.rse.connectorservice.local"/> - <import plugin="org.eclipse.rse.connectorservice.ssh"/> - <import plugin="org.eclipse.rse.processes.ui"/> - <import plugin="org.eclipse.rse.shells.ui"/> - <import plugin="org.eclipse.rse.subsystems.files.local"/> - <import plugin="org.eclipse.rse.subsystems.files.ssh"/> - <import plugin="org.eclipse.rse.subsystems.processes.core"/> - <import plugin="org.eclipse.rse.subsystems.processes.local"/> - <import plugin="org.eclipse.rse.subsystems.processes.shell.linux"/> - <import plugin="org.eclipse.rse.subsystems.terminals.core"/> - <import plugin="org.eclipse.rse.subsystems.terminals.ssh"/> - <import plugin="org.eclipse.rse.terminals.ui"/> - </requires> + <requires> + <import plugin="org.eclipse.core.runtime" version="3.7.0" match="greaterOrEqual"/> + <import plugin="org.jboss.ide.eclipse.as.wtp.core" version="1.0.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.wst.server.core" version="1.1.302" match="greaterOrEqual"/> + <import plugin="org.eclipse.wst.common.project.facet.core" version="1.4.200" match="greaterOrEqual"/> + <import plugin="org.eclipse.core.resources" version="3.7.100" match="greaterOrEqual"/> + <import plugin="org.eclipse.wst.common.modulecore" version="1.2.100" match="greaterOrEqual"/> + <import plugin="org.eclipse.wst.common.emfworkbench.integration" version="1.2.100" match="greaterOrEqual"/> + <import plugin="org.eclipse.jem.util" version="2.1.2" match="greaterOrEqual"/> + <import plugin="org.eclipse.debug.core" version="3.7.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.jdt.launching" version="3.6.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.ui" version="3.7.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.wst.server.ui" version="1.1.305" match="greaterOrEqual"/> + <import plugin="org.eclipse.debug.ui" version="3.7.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.core" version="3.1.200" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.subsystems.files.core" version="3.2.100" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.services" version="3.2.100" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.services.files.ftp" version="3.0.300" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.services.local" version="2.1.300" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.services.ssh" version="3.1.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.subsystems.shells.core" version="3.1.200" match="greaterOrEqual"/> + <import plugin="org.jboss.ide.eclipse.as.core"/> + <import plugin="org.jboss.ide.eclipse.archives.webtools"/> + <import plugin="org.eclipse.tm.terminal" version="3.1.0" match="greaterOrEqual"/> + <import plugin="org.jboss.ide.eclipse.as.ui"/> + <import plugin="org.eclipse.rse.files.ui" version="3.2.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.ui" version="3.2.0" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.subsystems.shells.local" version="2.1.300" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.subsystems.shells.ssh" version="2.1.300" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.subsystems.shells.telnet" version="1.2.200" match="greaterOrEqual"/> + <import plugin="org.eclipse.rse.connectorservice.local"/> + <import plugin="org.eclipse.rse.connectorservice.ssh"/> + <import plugin="org.eclipse.rse.processes.ui"/> + <import plugin="org.eclipse.rse.shells.ui"/> + <import plugin="org.eclipse.rse.subsystems.files.local"/> + <import plugin="org.eclipse.rse.subsystems.files.ssh"/> + <import plugin="org.eclipse.rse.subsystems.processes.core"/> + <import plugin="org.eclipse.rse.subsystems.processes.local"/> + <import plugin="org.eclipse.rse.subsystems.processes.shell.linux"/> + <import plugin="org.eclipse.rse.subsystems.terminals.core"/> + <import plugin="org.eclipse.rse.subsystems.terminals.ssh"/> + <import plugin="org.eclipse.rse.terminals.ui"/> + </requires> - <plugin id="org.jboss.ide.eclipse.as.rse.core" download-size="0" install-size="0" version="0.0.0" unpack="false" /> - <plugin id="org.jboss.ide.eclipse.as.rse.ui" download-size="0" install-size="0" version="0.0.0" unpack="false" /> + <plugin + id="org.jboss.ide.eclipse.as.rse.core" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.ide.eclipse.as.rse.ui" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + </feature>

13 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r40227 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2012-04-16 19:57:36 -0400 (Mon, 16 Apr 2012) New Revision: 40227 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreMessages.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/messages.properties Log: https://issues.jboss.org/browse/JBIDE-11544 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreMessages.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreMessages.java 2012-04-16 23:23:08 UTC (rev 40226) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreMessages.java 2012-04-16 23:57:36 UTC (rev 40227) @@ -28,8 +28,6 @@ public static String DATA_SOURCE_XML_DEPLOYER_SERVER_DID_NOT_SUPPORT_DEPLOY_OF_DATASOURCE; public static String DATA_SOURCE_XML_DEPLOYER_COULD_NOT_DEPLOY_DATASOURCE; public static String JAVA_SCANNER_CANNOT_GET_COMPILATION_UNIT_FOR; - public static String SEAM_EL_VALIDATOR_SETTER; - public static String SEAM_EL_VALIDATOR_GETTER; public static String LIBRARY_SCANNER_CANNOT_PROCESS_JAVA_CLASSES; public static String SEAM_VALIDATION_CONTEXT_LINKED_RESOURCE_PATH_MUST_NOT_BE_NULL; public static String SEAM_VALIDATION_CONTEXT_VARIABLE_NAME_MUST_NOT_BE_NULL; Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/messages.properties =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/messages.properties 2012-04-16 23:23:08 UTC (rev 40226) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/messages.properties 2012-04-16 23:57:36 UTC (rev 40227) @@ -11,8 +11,6 @@ DATA_SOURCE_XML_DEPLOYER_SERVER_DID_NOT_SUPPORT_DEPLOY_OF_DATASOURCE=Server did not support deploy of datasource. DATA_SOURCE_XML_DEPLOYER_COULD_NOT_DEPLOY_DATASOURCE=Could not deploy datasource JAVA_SCANNER_CANNOT_GET_COMPILATION_UNIT_FOR=Cannot get compilation unit for ''{0}'' -SEAM_EL_VALIDATOR_SETTER=Setter -SEAM_EL_VALIDATOR_GETTER=Getter LIBRARY_SCANNER_CANNOT_PROCESS_JAVA_CLASSES=Cannot process Java Classes SEAM_VALIDATION_CONTEXT_LINKED_RESOURCE_PATH_MUST_NOT_BE_NULL=Linked resource path must not be null\! SEAM_VALIDATION_CONTEXT_VARIABLE_NAME_MUST_NOT_BE_NULL=Variable name must not be null\!

13 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r40226 - in trunk: jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2012-04-16 19:23:08 -0400 (Mon, 16 Apr 2012) New Revision: 40226 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/AS71JMXClassLoaderRepository.java trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBoss71ServerConnection.java trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnection.java trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/Messages.java trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/Messages.properties trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/MBeanExplorerContentProvider.java trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/MBeanExplorerLabelProvider.java Log: /JBIDE-11064 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/AS71JMXClassLoaderRepository.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/AS71JMXClassLoaderRepository.java 2012-04-16 23:16:22 UTC (rev 40225) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/AS71JMXClassLoaderRepository.java 2012-04-16 23:23:08 UTC (rev 40226) @@ -37,9 +37,11 @@ IPath p2 = root.append(IJBossRuntimeResourceConstants.BIN) .append(IJBossRuntimeResourceConstants.CLIENT); String[] children = p2.toFile().list(); - for( int i = 0; i < children.length; i++ ) { - if( children[i].endsWith(".jar") && children[i].startsWith("jboss-client")) - return p2.append(children[i]); + if( children != null ) { + for( int i = 0; i < children.length; i++ ) { + if( children[i].endsWith(".jar") && children[i].startsWith("jboss-client")) + return p2.append(children[i]); + } } return null; } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBoss71ServerConnection.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBoss71ServerConnection.java 2012-04-16 23:16:22 UTC (rev 40225) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBoss71ServerConnection.java 2012-04-16 23:23:08 UTC (rev 40226) @@ -47,16 +47,12 @@ else { port = ((IManagementPortProvider)sd).getManagementPort(); } - try { - String url = "service:jmx:remoting-jmx://" + s.getHost() + ":" + port; - Map<String, String[]> environment = new HashMap<String, String[]>(); - JMXConnector connector = JMXConnectorFactory.connect(new JMXServiceURL(url), environment); - MBeanServerConnection connection = connector.getMBeanServerConnection(); - return connection; - } catch(Exception e ) { - e.printStackTrace(); - return null; - } + + String url = "service:jmx:remoting-jmx://" + s.getHost() + ":" + port; + Map<String, String[]> environment = new HashMap<String, String[]>(); + JMXConnector connector = JMXConnectorFactory.connect(new JMXServiceURL(url), environment); + MBeanServerConnection connection = connector.getMBeanServerConnection(); + return connection; } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnection.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnection.java 2012-04-16 23:16:22 UTC (rev 40225) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnection.java 2012-04-16 23:23:08 UTC (rev 40226) @@ -27,6 +27,7 @@ import org.eclipse.wst.server.core.IServerListener; import org.eclipse.wst.server.core.ServerEvent; import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; +import org.jboss.ide.eclipse.as.core.extensions.events.ServerLogger; import org.jboss.ide.eclipse.as.core.server.IDeployableServer; import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants; import org.jboss.ide.eclipse.as.core.util.ServerConverter; @@ -202,6 +203,8 @@ ((AbstractJBossJMXConnectionProvider)getProvider()).fireChanged(JBossServerConnection.this); } } catch( Exception jmxe ) { + IStatus status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Error connecting to jmx for server "+server.getName(), jmxe); + ServerLogger.getDefault().log(server, status); // I thought i was connected but I'm not. if( isConnected ) { isConnected = false; Modified: trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/Messages.java =================================================================== --- trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/Messages.java 2012-04-16 23:16:22 UTC (rev 40225) +++ trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/Messages.java 2012-04-16 23:23:08 UTC (rev 40226) @@ -87,6 +87,7 @@ public static String TypeInAFilter; public static String LoadingJMXNodes; public static String Loading; + public static String ErrorLoading; public static String UpdatingSelectionJob; public static String JMXUIImageDescriptorNotFound; Modified: trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/Messages.properties =================================================================== --- trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/Messages.properties 2012-04-16 23:16:22 UTC (rev 40225) +++ trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/Messages.properties 2012-04-16 23:23:08 UTC (rev 40226) @@ -75,6 +75,7 @@ TypeInAFilter=Type in a filter LoadingJMXNodes=Loading JMX Nodes Loading=Loading... +ErrorLoading=Error loading JMX Nodes UpdatingSelectionJob=Updating selection job JMXUIImageDescriptorNotFound=Unable to load image {0} from plugin {1} \ No newline at end of file Modified: trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/MBeanExplorerContentProvider.java =================================================================== --- trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/MBeanExplorerContentProvider.java 2012-04-16 23:16:22 UTC (rev 40225) +++ trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/MBeanExplorerContentProvider.java 2012-04-16 23:23:08 UTC (rev 40226) @@ -27,6 +27,7 @@ import org.jboss.tools.jmx.core.IConnectionProviderListener; import org.jboss.tools.jmx.core.IConnectionWrapper; import org.jboss.tools.jmx.core.MBeanFeatureInfoWrapper; +import org.jboss.tools.jmx.core.tree.ErrorRoot; import org.jboss.tools.jmx.core.tree.Node; import org.jboss.tools.jmx.core.tree.ObjectNameNode; import org.jboss.tools.jmx.core.tree.Root; @@ -86,6 +87,9 @@ ObjectNameNode node = (ObjectNameNode) parent; return node.getMbeanInfoWrapper().getMBeanFeatureInfos(); } + if( parent instanceof ErrorRoot ) { + return new Object[0]; + } if (parent instanceof Node) { Node node = (Node) parent; return node.getChildren(); Modified: trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/MBeanExplorerLabelProvider.java =================================================================== --- trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/MBeanExplorerLabelProvider.java 2012-04-16 23:16:22 UTC (rev 40225) +++ trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/MBeanExplorerLabelProvider.java 2012-04-16 23:23:08 UTC (rev 40226) @@ -26,6 +26,7 @@ import org.jboss.tools.jmx.core.MBeanInfoWrapper; import org.jboss.tools.jmx.core.MBeanOperationInfoWrapper; import org.jboss.tools.jmx.core.tree.DomainNode; +import org.jboss.tools.jmx.core.tree.ErrorRoot; import org.jboss.tools.jmx.core.tree.ObjectNameNode; import org.jboss.tools.jmx.core.tree.PropertyNode; import org.jboss.tools.jmx.ui.Messages; @@ -75,6 +76,9 @@ if( obj instanceof DelayProxy ) { return Messages.Loading; } + if( obj instanceof ErrorRoot ) { + return Messages.ErrorLoading; + } if (obj instanceof DomainNode) { DomainNode node = (DomainNode) obj; @@ -122,7 +126,10 @@ if( obj instanceof DelayProxy ) { return null; } - + if( obj instanceof ErrorRoot ) { + return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_ERROR_TSK); + } + if (obj instanceof DomainNode) { return JMXImages.get(JMXImages.IMG_OBJS_LIBRARY); }

13 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r40225 - in trunk/documentation/guides/MigrationGuide/en-US: images and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: irooskov(a)redhat.com Date: 2012-04-16 19:16:22 -0400 (Mon, 16 Apr 2012) New Revision: 40225 Modified: trunk/documentation/guides/MigrationGuide/en-US/Book_Info.xml trunk/documentation/guides/MigrationGuide/en-US/Migration_Guide.ent trunk/documentation/guides/MigrationGuide/en-US/Revision_History.xml trunk/documentation/guides/MigrationGuide/en-US/images/switchworkspace.png trunk/documentation/guides/MigrationGuide/en-US/introduction.xml trunk/documentation/guides/MigrationGuide/en-US/issues.xml trunk/documentation/guides/MigrationGuide/en-US/master.xml trunk/documentation/guides/MigrationGuide/en-US/migration.xml Log: updated for JBDS 5 Modified: trunk/documentation/guides/MigrationGuide/en-US/Book_Info.xml =================================================================== --- trunk/documentation/guides/MigrationGuide/en-US/Book_Info.xml 2012-04-16 22:34:27 UTC (rev 40224) +++ trunk/documentation/guides/MigrationGuide/en-US/Book_Info.xml 2012-04-16 23:16:22 UTC (rev 40225) @@ -3,10 +3,10 @@ ]> <bookinfo> <title>Migration Guide</title> - <subtitle>JBoss Developer Studio 3.0x to 4.0.</subtitle> + <subtitle>JBoss Developer Studio 4.x to 5.0.</subtitle> <productname>JBoss Developer Studio</productname> - <productnumber>4.1</productnumber> - <edition>4.1.0</edition> + <productnumber>5.0</productnumber> + <edition>5.0.0</edition> <pubsnumber>1</pubsnumber> <abstract> <para>The JBoss Developer Studio Migration Guide explains how to migrate from the previous version of the JBoss Developer Studio to the latest version.</para> Modified: trunk/documentation/guides/MigrationGuide/en-US/Migration_Guide.ent =================================================================== --- trunk/documentation/guides/MigrationGuide/en-US/Migration_Guide.ent 2012-04-16 22:34:27 UTC (rev 40224) +++ trunk/documentation/guides/MigrationGuide/en-US/Migration_Guide.ent 2012-04-16 23:16:22 UTC (rev 40225) @@ -4,4 +4,4 @@ <!ENTITY HOLDER "Red Hat"> <!ENTITY BZPRODUCT "JBoss Developer Studio"> <!ENTITY BZCOMPONENT "Migration Guide"> -<!ENTITY BZURL "<ulink url='https://bugzilla.redhat.com/enter_bug.cgi?product=JBoss&percnt;20Develope...'>http://bugzilla.redhat.com/</ulink>"> +<!ENTITY BZURL "<ulink url='https://bugzilla.redhat.com/enter_bug.cgi?product=JBoss&percnt;20Develope...'>http://bugzilla.redhat.com/</ulink>"> Modified: trunk/documentation/guides/MigrationGuide/en-US/Revision_History.xml =================================================================== --- trunk/documentation/guides/MigrationGuide/en-US/Revision_History.xml 2012-04-16 22:34:27 UTC (rev 40224) +++ trunk/documentation/guides/MigrationGuide/en-US/Revision_History.xml 2012-04-16 23:16:22 UTC (rev 40225) @@ -6,36 +6,8 @@ <simpara> <revhistory> <revision> - <revnumber>1-2</revnumber> - <date>Wed Jan 12 2011</date> - <author> - <firstname>Matthew</firstname> - <surname>Casperson</surname> - <email>mcaspers(a)redhat.com</email> - </author> - <revdescription> - <simplelist> - <member>Rewrote documentation for JBDS 3.0x to 4.0 update procedure</member> - </simplelist> - </revdescription> - </revision> - <revision> - <revnumber>1-1</revnumber> - <date>Wed Jun 09 2010</date> - <author> - <firstname>JBoss Tools</firstname> - <surname>Documentation Team</surname> - <email>irooskov(a)redhat.com</email> - </author> - <revdescription> - <simplelist> - <member>General updates</member> - </simplelist> - </revdescription> - </revision> - <revision> <revnumber>1-0</revnumber> - <date>Fri Nov 20 2009</date> + <date>Tue Apr 17 2012</date> <author> <firstname>Isaac</firstname> <surname>Rooskov</surname> @@ -43,7 +15,7 @@ </author> <revdescription> <simplelist> - <member>Initial creation of book by publican</member> + <member>Initial creation of book</member> </simplelist> </revdescription> </revision> Modified: trunk/documentation/guides/MigrationGuide/en-US/images/switchworkspace.png =================================================================== (Binary files differ) Modified: trunk/documentation/guides/MigrationGuide/en-US/introduction.xml =================================================================== --- trunk/documentation/guides/MigrationGuide/en-US/introduction.xml 2012-04-16 22:34:27 UTC (rev 40224) +++ trunk/documentation/guides/MigrationGuide/en-US/introduction.xml 2012-04-16 23:16:22 UTC (rev 40225) @@ -11,7 +11,7 @@ <title>Introduction </title> <para> - This document is intended to help you to easily migrate from <property>JBoss Developer Studio</property> 3.0x to 4.0. It also describes some common issues that can occur in the migration process, along with their solutions. + This document is intended to help you to easily migrate from <property>JBoss Developer Studio</property> 4.x to 5.0. It also describes some common issues that can occur in the migration process, along with their solutions. </para> <section> Modified: trunk/documentation/guides/MigrationGuide/en-US/issues.xml =================================================================== --- trunk/documentation/guides/MigrationGuide/en-US/issues.xml 2012-04-16 22:34:27 UTC (rev 40224) +++ trunk/documentation/guides/MigrationGuide/en-US/issues.xml 2012-04-16 23:16:22 UTC (rev 40225) @@ -53,13 +53,13 @@ XulRunner 1.9.1.2 is supported on Windows 32-bit and 64bit, Linux 32-bit and 64-bit and Max OSZ Cocoa 32-bit. The JBoss Developer Studio distribution for Mac OSX Cocoa 64-bit does not include the Visual Page Editor. </para> </section> - <section> + </chapter> Modified: trunk/documentation/guides/MigrationGuide/en-US/master.xml =================================================================== --- trunk/documentation/guides/MigrationGuide/en-US/master.xml 2012-04-16 22:34:27 UTC (rev 40224) +++ trunk/documentation/guides/MigrationGuide/en-US/master.xml 2012-04-16 23:16:22 UTC (rev 40225) @@ -11,15 +11,15 @@ <book> <bookinfo> - <title>JBoss Developer Studio 2.1 to 3.0 Migration Guide</title> + <title>JBoss Developer Studio 4.x to 5.0 Migration Guide</title> <copyright> - <year>2010</year> + <year>2012</year> <holder>JBoss by Red Hat</holder> </copyright> <releaseinfo> -Version: 3.0.0.GA +Version: 3.3.0.GA </releaseinfo> </bookinfo> Modified: trunk/documentation/guides/MigrationGuide/en-US/migration.xml =================================================================== --- trunk/documentation/guides/MigrationGuide/en-US/migration.xml 2012-04-16 22:34:27 UTC (rev 40224) +++ trunk/documentation/guides/MigrationGuide/en-US/migration.xml 2012-04-16 23:16:22 UTC (rev 40225) @@ -15,25 +15,25 @@ <section id="sect-eclipse-versions"> <title>JBoss Developer Studio Eclipse Versions</title> <para> - JBoss Developer Studio (JBDS) 3.0x is based on Eclipse 3.5, while JBDS 4.0 is based on Eclipse 3.6. This prevents a direct upgrade from JBDS 3.0x to 4.0. + JBoss Developer Studio (JBDS) 4.0x is based on Eclipse 3.6, while JBDS 5.0 is based on Eclipse 3.7. This prevents a direct upgrade from JBDS 4.0x to 5.0. </para> <para> - Workspaces created with JBDS 3.0x can generally be opened in JBDS 4.0, however this is not guaranteed be the case. Always backup your existing workspaces (see <xref linkend="sect-backup-workspace"/> for more information) before attempting to use them with JBDS 4.0. + Workspaces created with JBDS 4.0x can generally be opened in JBDS 5.0, however this is not guaranteed. Always backup your existing workspaces (see <xref linkend="sect-backup-workspace"/> for more information) before attempting to use them with JBDS 5.0. </para> - <note> +  </section> <section id="sect-backup-workspace"> <title>Back Up Existing Workspaces</title> <para> - It is recommended that existing workspaces created with JBDS 3.0x are backed up before attempting use them with JBDS 4.0. This can be done by copying the workspace directory to a backup location, or compressing it as an archive. + It is recommended that existing workspaces created with JBDS 4.0x are backed up before attempting use them with JBDS 5.0. This can be done by copying the workspace directory to a backup location, or compressing it as an archive. </para> <para>To find the location of your workspace directory select <menuchoice><guimenuitem>File</guimenuitem> <guimenuitem>Switch Workspace</guimenuitem></menuchoice>. The resulting list will show you the location of previously used workspaces.

13 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r40224 - trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test.

by jbosstools-commits＠lists.jboss.org

Author: vrubezhny Date: 2012-04-16 18:34:27 -0400 (Mon, 16 Apr 2012) New Revision: 40224 Added: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CAELApplyMethodProposalTest.java Log: JBIDE-11492 When inserting methods with parameters, CA sets cursor incorrectly JUnit Test draft is added Added: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CAELApplyMethodProposalTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CAELApplyMethodProposalTest.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CAELApplyMethodProposalTest.java 2012-04-16 22:34:27 UTC (rev 40224) @@ -0,0 +1,128 @@ +/******************************************************************************* + * Copyright (c) 2012 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.cdi.ui.test; + +import java.util.List; + +import junit.framework.TestCase; + +import org.eclipse.core.resources.IProject; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.contentassist.ICompletionProposal; +import org.eclipse.swt.graphics.Point; +import org.jboss.tools.cdi.core.test.tck.TCKTest; +import org.jboss.tools.common.base.test.contentassist.CATestUtil; +import org.jboss.tools.jst.jsp.contentassist.AutoContentAssistantProposal; +import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase; +import org.jboss.tools.test.util.JobUtils; + +/** + * @author Victor V. Rubezhny + */ +public class CAELApplyMethodProposalTest extends TestCase { + + private IProject project; + private ContentAssistantTestCase caTest = new ContentAssistantTestCase(); + private static final String PAGE_NAME = "WebContent/ABCProducer.xhtml"; + private static final String[] EL_TO_FIND = { "#{abc.substring(1).substr", + "#{abc.substring(1).by" }; + private static final String[] PROPOSALS_TO_APPLY = { "substring(", "bytes" }; + private static final String CURSOR_SIGNATURE = "<The cursor point>"; + + public void setUp() { + project = TCKTest.findTestProject(); + try { + IProject tckProject = TCKTest + .importPreparedProject("/ca_with_methods/"); + } catch (Exception e) { + // Ignore all the exceptions in setUp()/tearDown() methods + } + caTest.setProject(project); + } + + /* + * The test case for JBIDE-11492 + */ + public void _testELApplyMethodProposal() { + + caTest.openEditor(PAGE_NAME); + try { + + assertNotNull("Text Viewer not found", caTest.getViewer()); + IDocument document = caTest.getViewer().getDocument(); + assertNotNull("Can't obtain a test Document.", document); + + for (int i = 0; i < EL_TO_FIND.length; i++) { + String elToFind = EL_TO_FIND[i]; + String proposalToApply = PROPOSALS_TO_APPLY[i]; + + String documentContent = document.get(); + int start = (documentContent == null ? -1 : documentContent + .indexOf(elToFind)); + assertFalse("Required text '" + elToFind + + "' not found in document", (start == -1)); + int offsetToTest = start + elToFind.length(); + + JobUtils.waitForIdle(); + + List<ICompletionProposal> res = CATestUtil.collectProposals( + caTest.getContentAssistant(), caTest.getViewer(), + offsetToTest); + + assertTrue("Content Assistant returned no proposals", + (res != null && res.size() > 0)); + + boolean bPropoosalToApplyFound = false; + for (ICompletionProposal p : res) { + if (!(p instanceof AutoContentAssistantProposal)) + continue; + AutoContentAssistantProposal proposal = (AutoContentAssistantProposal) p; + String proposalString = proposal.getDisplayString(); + + if (proposalString.startsWith(proposalToApply)) { + bPropoosalToApplyFound = true; + proposal.apply(document); + break; + } + } + assertTrue("The proposal to apply not found.", + bPropoosalToApplyFound); + + try { + JobUtils.waitForIdle(); + } catch (Exception e) { + e.printStackTrace(); + assertTrue("Waiting for the jobs to complete has failed.", + false); + } + + Point s = caTest.getViewer().getSelectedRange(); + assertNotNull("Selection can't be obtained from the editor!", s); + + String documentUpdatedContent = document.get(); + String testUpdatedContent = documentUpdatedContent.substring(0, + s.x) + + CURSOR_SIGNATURE + + documentUpdatedContent.substring(s.x); + String testString = elToFind.substring(0, + elToFind.lastIndexOf('.') + 1) + + proposalToApply + CURSOR_SIGNATURE; + assertTrue( + "The proposal replacement is failed.", + testUpdatedContent.substring(start, + s.x + CURSOR_SIGNATURE.length()).equals( + testString)); + } + } finally { + caTest.closeEditor(); + } + } +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CAELApplyMethodProposalTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain

13 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r40223 - in trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck: ca_with_methods and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: vrubezhny Date: 2012-04-16 18:34:03 -0400 (Mon, 16 Apr 2012) New Revision: 40223 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/ca_with_methods/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/ca_with_methods/ABCProducer.xhtml trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/ca_with_methods/demo/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/ca_with_methods/demo/ABCProducer.java Log: JBIDE-11492 When inserting methods with parameters, CA sets cursor incorrectly JUnit Test draft is added Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/ca_with_methods/ABCProducer.xhtml =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/ca_with_methods/ABCProducer.xhtml (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/ca_with_methods/ABCProducer.xhtml 2012-04-16 22:34:03 UTC (rev 40223) @@ -0,0 +1,12 @@ +<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html"> + + <ui:define name="body"> + <h:outputText value="#{abc.substring(1).substr}"/> + #{abc.substring(1).by} + </ui:define> +</ui:composition> \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/ca_with_methods/ABCProducer.xhtml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/ca_with_methods/demo/ABCProducer.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/ca_with_methods/demo/ABCProducer.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/ca_with_methods/demo/ABCProducer.java 2012-04-16 22:34:03 UTC (rev 40223) @@ -0,0 +1,14 @@ +package demo; + +import javax.enterprise.inject.Produces; +import javax.inject.Named; + +public class ABCProducer { + @Produces + @Named("abc") + String s; + + public ABCProducer() { + } + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/ca_with_methods/demo/ABCProducer.java ___________________________________________________________________ Added: svn:mime-type + text/plain

13 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r40222 - in trunk: tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: vpakan(a)redhat.com Date: 2012-04-16 17:20:04 -0400 (Mon, 16 Apr 2012) New Revision: 40222 Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/OpenOnTest.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java Log: Added OpenOn test for opening css file referenced via <h:outputStyleSheet> tag. Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/OpenOnTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/OpenOnTest.java 2012-04-16 21:07:27 UTC (rev 40221) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/OpenOnTest.java 2012-04-16 21:20:04 UTC (rev 40222) @@ -10,10 +10,15 @@ ******************************************************************************/ package org.jboss.tools.jsf.ui.bot.test.smoke; +import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor; import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.jboss.tools.jsf.ui.bot.test.JSFAutoTestCase; +import org.jboss.tools.ui.bot.ext.SWTBotExt; +import org.jboss.tools.ui.bot.ext.SWTEclipseExt; import org.jboss.tools.ui.bot.ext.SWTTestExt; +import org.jboss.tools.ui.bot.ext.gen.ActionItem; import org.jboss.tools.ui.bot.ext.helper.OpenOnHelper; import org.jboss.tools.ui.bot.ext.parts.SWTBotEditorExt; import org.jboss.tools.ui.bot.ext.types.IDELabel; @@ -193,5 +198,73 @@ 0, 0, expectedOpenedFileName); compositeComponentEditor.close(); } - + /** + * Test Open On functionality for CSS file linked via <h:outputStyleSheet> + */ + public void testOpenOnForHOutputStyleSheet() { + createJSF2Project(JSF2_TEST_PROJECT_NAME); + // create css file + SWTBotExt botExt = new SWTBotExt(); + SWTBotTreeItem tiNode = SWTEclipseExt.selectPathInPackageExplorer(botExt, + JSF2_TEST_PROJECT_NAME, + "WebContent", + "resources"); + if (tiNode == null){ + open.newObject(ActionItem.NewObject.GeneralFolder.LABEL); + bot.shell(IDELabel.Shell.NEW_FOLDER).activate(); //$NON-NLS-1$ + bot.textWithLabel(IDELabel.NewFolderDialog.FOLDER_NAME).setText("resources"); //$NON-NLS-1$ + bot.button(IDELabel.Button.FINISH).click(); + } + tiNode = SWTEclipseExt.selectPathInPackageExplorer(botExt, + JSF2_TEST_PROJECT_NAME, + "WebContent", + "resources", + "css"); + if (tiNode == null){ + open.newObject(ActionItem.NewObject.GeneralFolder.LABEL); + bot.shell(IDELabel.Shell.NEW_FOLDER).activate(); //$NON-NLS-1$ + bot.textWithLabel(IDELabel.NewFolderDialog.FOLDER_NAME).setText("css"); //$NON-NLS-1$ + bot.button(IDELabel.Button.FINISH).click(); + } + final String cssFileName = "OpenOnTest.css"; + tiNode = SWTEclipseExt.selectPathInPackageExplorer(botExt, + JSF2_TEST_PROJECT_NAME, + "WebContent", + "resources", + "css", + cssFileName); + if (tiNode == null){ + open.newObject(ActionItem.NewObject.WebCSS.LABEL); + bot.shell(IDELabel.Shell.NEW_CSS_FILE).activate(); + bot.textWithLabel(IDELabel.NewCSSWizard.FILE_NAME).setText(cssFileName); + bot.button(IDELabel.Button.FINISH).click(); + } + eclipse.closeAllEditors(); + // create test page + final String testPageName = "OpenOnHOutpuStyle.xhtml"; + createXhtmlPage(testPageName, JSF2_TEST_PROJECT_NAME,"WebContent","pages"); + openPage(testPageName,JSF2_TEST_PROJECT_NAME); + SWTBotEclipseEditor xhtmlEditor = bot.editorByTitle(testPageName).toTextEditor(); + xhtmlEditor.setText("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n" + + "<html xmlns=\"http://www.w3.org/1999/xhtml\"\n" + + " xmlns:ui=\"http://java.sun.com/jsf/facelets\"\n" + + " xmlns:h=\"http://java.sun.com/jsf/html\">\n" + + " <ui:composition>\n" + + " <h:outputStylesheet library=\"css\" name=\"" + cssFileName + "\"/>" + + " </ui:composition>\n" + + "</html>"); + xhtmlEditor.save(); + // check OpenOn + SWTBotEditor cssEditor = OpenOnHelper.checkOpenOnFileIsOpened( + SWTTestExt.bot, + testPageName, + cssFileName, + 2, + 0, + 0, + cssFileName); + cssEditor.close(); + xhtmlEditor.close(); + + } } \ No newline at end of file Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java 2012-04-16 21:07:27 UTC (rev 40221) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java 2012-04-16 21:20:04 UTC (rev 40222) @@ -1757,5 +1757,29 @@ bot.menu(IDELabel.Menu.RUN).menu(IDELabel.Menu.TOGGLE_BREAKPOINT).click(); } } + /** + * Select path exist in Package Explorer. Last existing node from path is selected + * @param bot + * @param fullPath + * @return SWTBotTreeItem of last node within path or null if path doesn't exist + */ + public static SWTBotTreeItem selectPathInPackageExplorer(SWTBotExt bot, String... path) { + if (bot == null || path == null) { + throw new NullPointerException(); + } + SWTBot innerBot = SWTEclipseExt.showView(bot, ViewType.PACKAGE_EXPLORER); + SWTBotTreeItem tiNode = null; + try { + tiNode = innerBot.tree().expandNode(path[0]); + tiNode.select(); + for (int index = 1 ; index < path.length ; index++){ + tiNode = tiNode.expandNode(path[index]); + tiNode.select(); + } + } catch (WidgetNotFoundException wnfe){ + tiNode = null; + } + return tiNode; + } } \ No newline at end of file Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2012-04-16 21:07:27 UTC (rev 40221) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2012-04-16 21:20:04 UTC (rev 40222) @@ -220,7 +220,8 @@ public static final String JBOSS_TOOLS_USAGE = "JBoss Tools Usage"; public static final String SUBCLIPSE_USAGE = "Subclipse Usage"; public static final String PROGRESS_INFORMATION = "Progress Information"; - public static final String REMEMBER_MY_DECISION = "Remember my decision"; + public static final String REMEMBER_MY_DECISION = "Remember my decision"; + public static final String NEW_FOLDER = "New Folder"; } public class EntityGroup { @@ -880,4 +881,9 @@ } + public static final class NewFolderDialog { + + public static final String FOLDER_NAME = "Folder name:"; + + } }

13 years, 8 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits April 2012