November 2011 - jbosstools-commits

JBoss Tools SVN: r36772 - in trunk/maven/plugins/org.jboss.tools.maven.project.examples: icons and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: fbricon Date: 2011-11-30 05:53:58 -0500 (Wed, 30 Nov 2011) New Revision: 36772 Added: trunk/maven/plugins/org.jboss.tools.maven.project.examples/icons/ trunk/maven/plugins/org.jboss.tools.maven.project.examples/icons/new_wiz.png Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/build.properties trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/MavenProjectExamplesActivator.java trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizard.java trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizardFirstPage.java trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizardPage.java Log: JBIDE-9776 : Fixed package selection in page 1 updating the groupId in page 2. The advanced section is displayed if specific maven profiles are set changed the wizard icon Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/build.properties =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.project.examples/build.properties 2011-11-30 10:37:54 UTC (rev 36771) +++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/build.properties 2011-11-30 10:53:58 UTC (rev 36772) @@ -8,4 +8,6 @@ about.ini,\ about.mappings,\ about.properties,\ - jboss_about.png + jboss_about.png,\ + icons/ +src.includes = src/ Added: trunk/maven/plugins/org.jboss.tools.maven.project.examples/icons/new_wiz.png =================================================================== (Binary files differ) Property changes on: trunk/maven/plugins/org.jboss.tools.maven.project.examples/icons/new_wiz.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/MavenProjectExamplesActivator.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/MavenProjectExamplesActivator.java 2011-11-30 10:37:54 UTC (rev 36771) +++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/MavenProjectExamplesActivator.java 2011-11-30 10:53:58 UTC (rev 36772) @@ -9,6 +9,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.resource.ImageRegistry; import org.eclipse.m2e.core.MavenPlugin; import org.eclipse.m2e.core.embedder.IMaven; import org.eclipse.m2e.core.project.MavenProjectInfo; @@ -102,4 +104,8 @@ } return projectName; } + + public static ImageDescriptor getNewWizardImageDescriptor() { + return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, "icons/new_wiz.png"); + } } Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizard.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizard.java 2011-11-30 10:37:54 UTC (rev 36771) +++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizard.java 2011-11-30 10:53:58 UTC (rev 36772) @@ -70,7 +70,7 @@ public ArchetypeExamplesWizard(File location, Project projectDescription) { super(); setWindowTitle("New JBoss project"); - setDefaultPageImageDescriptor(MavenImages.WIZ_NEW_PROJECT); + setDefaultPageImageDescriptor(MavenProjectExamplesActivator.getNewWizardImageDescriptor()); setNeedsProgressMonitor(true); this.projectDescription = projectDescription; } Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizardFirstPage.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizardFirstPage.java 2011-11-30 10:37:54 UTC (rev 36771) +++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizardFirstPage.java 2011-11-30 10:53:58 UTC (rev 36772) @@ -76,12 +76,15 @@ private ModifyListener projectNameModifyListener; private ModifyListener packageNameModifyListener; private ModifyListener propertyModifyListener; + private final Project projectDescription; public ArchetypeExamplesWizardFirstPage( ProjectImportConfiguration configuration, Project projectDescription, List<IWorkingSet> workingSet) { super(configuration, projectDescription.getShortDescription(),Messages.ArchetypeExamplesWizardFirstPage_Title, workingSet); + this.projectDescription = projectDescription; setPageComplete(false); + } @Override @@ -136,6 +139,11 @@ emptyLabel.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 3, 1)); + + /* + projectNameCombo.setText(projectDescription.getArchetypeModel().getArtifactId()); + packageCombo.setText(projectDescription.getArchetypeModel().getJavaPackage()); + */ } @Override Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizardPage.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizardPage.java 2011-11-30 10:37:54 UTC (rev 36771) +++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizardPage.java 2011-11-30 10:53:58 UTC (rev 36772) @@ -123,6 +123,8 @@ groupIdCombo.setText(groupId); versionCombo.setText(version); packageCombo.setText(javaPackage); + + resolverConfigurationComponent.setExpanded(!resolverConfigurationComponent.getResolverConfiguration().getActiveProfileList().isEmpty()); } @Override @@ -140,9 +142,6 @@ //TODO delete that code warningLink = new Composite(parent, SWT.NONE); -// Display display = Display.getCurrent(); -// Color color = display.getSystemColor(SWT.COLOR_BLUE); -// warningLink.setBackground(color); GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).span(3, 1) .applyTo(warningLink); GridLayoutFactory.fillDefaults().numColumns(2).applyTo(warningLink); @@ -166,7 +165,6 @@ } } }); - //link.setBackground(display.getSystemColor(SWT.COLOR_RED)); warningLink.setVisible(false); } @@ -284,7 +282,7 @@ if (!packageCombo.getText().equals(packageName)){ packageCombo.setText(packageName); } - if (groupIdCombo.getText().equals(packageName)){ + if (!groupIdCombo.getText().equals(packageName)){ groupIdCombo.setText(packageName); } }

12 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r36771 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types.

by jbosstools-commits＠lists.jboss.org

Author: jjankovi Date: 2011-11-30 05:37:54 -0500 (Wed, 30 Nov 2011) New Revision: 36771 Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java Log: New IDELabel menu for CDIRefactor added 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 2011-11-30 10:36:38 UTC (rev 36770) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2011-11-30 10:37:54 UTC (rev 36771) @@ -85,6 +85,7 @@ public static final String CLOSE_ALL = "Close All"; public static final String SAVE_AS_TEMPLATE = "Save As Template..."; public static final String AUTO_LAYOUT = "Auto Layout"; + public static final String CDI_REFACTOR = "CDI Refactor"; } public class Button {

12 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r36770 - in trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test: jsf and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: jjankovi Date: 2011-11-30 05:36:38 -0500 (Wed, 30 Nov 2011) New Revision: 36770 Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/jsf/AnnotationException.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/CollectionsUtil.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/CDIRefactorWizard.java Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/jsf/JSFTestBase.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/jsf/NamedRefactoringTest.java Log: CDI named annotation refactoring test added Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2011-11-30 10:11:11 UTC (rev 36769) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2011-11-30 10:36:38 UTC (rev 36770) @@ -10,23 +10,8 @@ ******************************************************************************/ package org.jboss.tools.cdi.bot.test; -import org.jboss.tools.cdi.bot.test.beansxml.BeansXMLCompletionTest; -import org.jboss.tools.cdi.bot.test.beansxml.BeansXMLValidationTest; -import org.jboss.tools.cdi.bot.test.editor.BeansEditorTest; -import org.jboss.tools.cdi.bot.test.openon.FindObserverForEventTest; -import org.jboss.tools.cdi.bot.test.openon.OpenOnTest; -import org.jboss.tools.cdi.bot.test.quickfix.BeanValidationQuickFixTest; -import org.jboss.tools.cdi.bot.test.quickfix.DecoratorValidationQuickFixTest; -import org.jboss.tools.cdi.bot.test.quickfix.IBindingValidationQuickFixTest; -import org.jboss.tools.cdi.bot.test.quickfix.InterceptorValidationQuickFixTest; -import org.jboss.tools.cdi.bot.test.quickfix.QualifierValidationQuickFixTest; -import org.jboss.tools.cdi.bot.test.quickfix.ScopeValidationQuickFixTest; -import org.jboss.tools.cdi.bot.test.quickfix.StereotypeValidationQuickFixTest; -import org.jboss.tools.cdi.bot.test.seam3.Seam3Test; +import org.jboss.tools.cdi.bot.test.jsf.NamedRefactoringTest; import org.jboss.tools.cdi.bot.test.uiutils.SWTEclipseCDIExtUtil; -import org.jboss.tools.cdi.bot.test.wizard.ConfigurationPresetTest; -import org.jboss.tools.cdi.bot.test.wizard.FacetTest; -import org.jboss.tools.cdi.bot.test.wizard.WizardTest; import org.jboss.tools.ui.bot.ext.RequirementAwareSuite; import org.jboss.tools.ui.bot.ext.types.ViewType; import org.junit.BeforeClass; @@ -49,7 +34,7 @@ * JAVA=1.6,/space/java/sdk/jdk1.6.0_22 * * - * Suite duration: aprox. 24min + * Suite duration: aprox. 25min * * @author Lukas Jungmann * @author Jaroslav Jankovic @@ -57,23 +42,23 @@ @RunWith(RequirementAwareSuite.class) @SuiteClasses({ // PerspectiveTest.class, - ConfigurationPresetTest.class, - FacetTest.class, - WizardTest.class, - BeansEditorTest.class, -// NamedRefactoringTest.class, - BeansXMLValidationTest.class, - BeansXMLCompletionTest.class, - StereotypeValidationQuickFixTest.class, - QualifierValidationQuickFixTest.class, - ScopeValidationQuickFixTest.class, - BeanValidationQuickFixTest.class, - InterceptorValidationQuickFixTest.class, - DecoratorValidationQuickFixTest.class, - IBindingValidationQuickFixTest.class, - OpenOnTest.class, - FindObserverForEventTest.class, - Seam3Test.class +// ConfigurationPresetTest.class, +// FacetTest.class, +// WizardTest.class, +// BeansEditorTest.class, + NamedRefactoringTest.class, +// BeansXMLValidationTest.class, +// BeansXMLCompletionTest.class, +// StereotypeValidationQuickFixTest.class, +// QualifierValidationQuickFixTest.class, +// ScopeValidationQuickFixTest.class, +// BeanValidationQuickFixTest.class, +// InterceptorValidationQuickFixTest.class, +// DecoratorValidationQuickFixTest.class, +// IBindingValidationQuickFixTest.class, +// OpenOnTest.class, +// FindObserverForEventTest.class, +// Seam3Test.class }) public class CDIAllBotTests extends CDITestBase { Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/jsf/AnnotationException.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/jsf/AnnotationException.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/jsf/AnnotationException.java 2011-11-30 10:36:38 UTC (rev 36770) @@ -0,0 +1,16 @@ +package org.jboss.tools.cdi.bot.test.jsf; + +public class AnnotationException extends Exception { + + private static final long serialVersionUID = 1L; + + public AnnotationException() { + + } + + public AnnotationException(String msg) { + super(msg); + + } + +} Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/jsf/JSFTestBase.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/jsf/JSFTestBase.java 2011-11-30 10:11:11 UTC (rev 36769) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/jsf/JSFTestBase.java 2011-11-30 10:36:38 UTC (rev 36770) @@ -11,6 +11,8 @@ package org.jboss.tools.cdi.bot.test.jsf; +import java.util.ArrayList; +import java.util.List; import java.util.logging.Logger; import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; @@ -19,9 +21,12 @@ import org.jboss.tools.cdi.bot.test.annotations.JSFTemplate; import org.jboss.tools.cdi.bot.test.uiutils.actions.NewJSFProjectWizard; import org.jboss.tools.cdi.bot.test.uiutils.actions.NewXHTMLFileWizard; +import org.jboss.tools.cdi.bot.test.uiutils.wizards.CDIRefactorWizard; import org.jboss.tools.cdi.bot.test.uiutils.wizards.XHTMLDialogWizard; import org.jboss.tools.ui.bot.ext.SWTJBTExt; import org.jboss.tools.ui.bot.ext.Timing; +import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper; +import org.jboss.tools.ui.bot.ext.types.IDELabel; import org.junit.Before; public class JSFTestBase extends CDITestBase { @@ -49,6 +54,10 @@ } + /** + * + * @param pageName + */ protected void createXHTMLPage(String pageName) { XHTMLDialogWizard xhtmlWizard = new NewXHTMLFileWizard().run(); xhtmlWizard.setName(pageName).finish(); @@ -57,19 +66,109 @@ setEd(bot.activeEditor().toTextEditor()); } - protected void contextMenuForTextInEditor(final String text, + /** + * + * @param className + * @throws AnnotationException + */ + protected void openContextMenuForCDIRefactor(String className) throws AnnotationException { + String text = getNamedAnnotationForClass(className); + if (text == null) { + throw new AnnotationException("There is no Named " + + "annotation in class:" + className); + } + String renameContextMenuText = "Rename '" + + parseNamedAnnotation(className, text) + + "' Named Bean "; + openContextMenuForTextInEditor(text, + IDELabel.Menu.CDI_REFACTOR, renameContextMenuText); + bot.sleep(Timing.time3S()); + } + + /** + * + * @param className + * @return + */ + private String getNamedAnnotationForClass(String className) { + try { + bot.editorByTitle(className + ".java"); + } catch (WidgetNotFoundException exc) { + projectExplorer.openFile(getProjectName(), "Java Resources", "JavaSource", + getPackageName(), className); + } + + setEd(bot.activeEditor().toTextEditor()); + for (String line : getEd().getLines()) { + if (line.contains("@Named") && + !line.contains("//") && !line.contains("*")) { + return line; + } + } + return null; + } + + /** + * + * @param className + * @param text + * @return + */ + private String parseNamedAnnotation(String className, String text) { + if (!text.contains("\"")) { + return className.substring(0,1).toLowerCase() + className.substring(1); + } else { + return text.split("\"")[1]; + } + + } + + /** + * + * @param text + * @param menu + */ + protected void openContextMenuForTextInEditor(final String text, final String... menu) { assert menu.length > 0; SWTJBTExt.selectTextInSourcePane(bot, getEd().getTitle(), text, 0, text.length()); - bot.sleep(Timing.time2S()); + + ContextMenuHelper.clickContextMenu(getEd(), menu); - getEd().toTextEditor().contextMenu(menu[0]); - bot.sleep(Timing.time3S()); - util.waitForNonIgnoredJobs(); - } - + + /** + * + * @param className + * @param newNamed + * @return + */ + protected List<String> changeNamedAnnotation(String className, String newNamed) { + List<String> affectedFiles = new ArrayList<String>(); + try { + openContextMenuForCDIRefactor(className); + + CDIRefactorWizard cdiRefactorWizard = new CDIRefactorWizard(); + cdiRefactorWizard = cdiRefactorWizard.setName(newNamed); + cdiRefactorWizard = cdiRefactorWizard.next(); + affectedFiles = cdiRefactorWizard.getAffectedFiles(); + cdiRefactorWizard.finish(); + } catch (AnnotationException exc) { + LOGGER.info("There is no named annotation in tested class"); + fail(exc.getMessage()); + } catch (WidgetNotFoundException exc) { + bot.activeShell().bot().button("Close").click(); + } + return affectedFiles; + } + + /** + * + * @param projectName + * @param env + * @param template + */ private void createJSFProjectWithCDISupport(String projectName, JSFEnvironment env, JSFTemplate template) { @@ -78,6 +177,12 @@ } + /** + * + * @param projectName + * @param env + * @param template + */ private void createJSFProject(String projectName, JSFEnvironment env, JSFTemplate template) { new NewJSFProjectWizard().run(). Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/jsf/NamedRefactoringTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/jsf/NamedRefactoringTest.java 2011-11-30 10:11:11 UTC (rev 36769) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/jsf/NamedRefactoringTest.java 2011-11-30 10:36:38 UTC (rev 36770) @@ -11,8 +11,12 @@ package org.jboss.tools.cdi.bot.test.jsf; +import java.util.Arrays; +import java.util.Collection; + import org.jboss.tools.cdi.bot.test.CDIAllBotTests; import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType; +import org.jboss.tools.cdi.bot.test.uiutils.CollectionsUtil; import org.jboss.tools.ui.bot.ext.RequirementAwareSuite; import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; @@ -27,14 +31,16 @@ * @author Jaroslav Jankovic * */ - @Require(clearProjects = true, perspective = "Java EE", - server = @Server(state = ServerState.NotRunning, - version = "6.0", operator = ">=")) + server = @Server(state = ServerState.NotRunning, + version = "6.0", operator = ">=")) @RunWith(RequirementAwareSuite.class) @SuiteClasses({ CDIAllBotTests.class }) public class NamedRefactoringTest extends JSFTestBase { + private static final String MANAGED_BEAN = "ManagedBean"; + private static final String INDEX_XHTML= "index.xhtml"; + @Override public String getProjectName() { return "CDIRefactoring"; @@ -43,7 +49,7 @@ @Test public void testNamedAnnotationRefactor() { - wizard.createCDIComponent(CDIWizardType.BEAN, "ManagedBean", getPackageName(), null); + wizard.createCDIComponent(CDIWizardType.BEAN, MANAGED_BEAN, getPackageName(), null); editResourceUtil.replaceClassContentByResource(NamedRefactoringTest.class. getResourceAsStream("/resources/jsf/ManagedBean.java.cdi"), false); @@ -51,10 +57,30 @@ editResourceUtil.replaceClassContentByResource(NamedRefactoringTest.class. getResourceAsStream("/resources/jsf/index.xhtml.cdi"), false); - bot.editorByTitle("ManagedBean.java").show(); + bot.editorByTitle(MANAGED_BEAN + ".java").show(); setEd(bot.activeEditor().toTextEditor()); - contextMenuForTextInEditor("@Named(\"bean\")", "Open With", "Other..."); + + String newNamed = "bean2"; + Collection<String> affectedFiles = changeNamedAnnotation(MANAGED_BEAN, newNamed); + Collection<String> expectedAffectedFiles = Arrays.asList( + MANAGED_BEAN + ".java", INDEX_XHTML); + + for (String affectedFile : affectedFiles) { + bot.editorByTitle(affectedFile).save(); + } + + assertEquals(expectedAffectedFiles.size(), affectedFiles.size()); + assertTrue(CollectionsUtil.compareTwoCollectionsEquality( + expectedAffectedFiles, affectedFiles)); + assertTrue(bot.editorByTitle(MANAGED_BEAN + ".java").toTextEditor().getText(). + contains("@Named(\"" + newNamed + "\"")); + + assertTrue(bot.editorByTitle(INDEX_XHTML).toTextEditor().getText(). + contains("#{" + newNamed + ".submit()}")); + } + + } Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/CollectionsUtil.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/CollectionsUtil.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/CollectionsUtil.java 2011-11-30 10:36:38 UTC (rev 36770) @@ -0,0 +1,42 @@ +/******************************************************************************* + * Copyright (c) 2010 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.bot.test.uiutils; + +import java.util.Collection; + +public class CollectionsUtil { + + private CollectionsUtil() { + throw new AssertionError(); + } + + /** + * + * @param expectedAffectedFiles + * @param affectedFiles + * @return + */ + public static boolean compareTwoCollectionsEquality( + Collection<String> expectedAffectedFiles, + Collection<String> affectedFiles) { + int counter = 0; + for (String f1 : affectedFiles) { + for (String f2 : expectedAffectedFiles) { + if (f1.equals(f2)) { + counter++; + } + } + } + return expectedAffectedFiles.size() == counter; + } + +} Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/CDIRefactorWizard.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/CDIRefactorWizard.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/CDIRefactorWizard.java 2011-11-30 10:36:38 UTC (rev 36770) @@ -0,0 +1,44 @@ +package org.jboss.tools.cdi.bot.test.uiutils.wizards; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.swtbot.swt.finder.SWTBot; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; + +public class CDIRefactorWizard extends Wizard{ + + private List<String> affectedFiles; + + public CDIRefactorWizard() { + super(new SWTBot().activeShell().widget); + assert ("Refactoring").equals(getText()); + affectedFiles = new ArrayList<String>(); + } + + public CDIRefactorWizard setName(String name) { + setText("@Named Bean Name", name); + return this; + } + + public CDIRefactorWizard next() { + clickButton("Next >"); + return this; + } + + /** + * Method gets all files which will be affected by CDI refactoring + * @return + */ + public List<String> getAffectedFiles() { + String temp = null; + for (SWTBotTreeItem ti : bot().tree().getTreeItem("Rename @Named Bean").getItems()) { + temp = ti.getText().split("-")[0]; + affectedFiles.add(temp.substring(0, temp.length() - 1)); + } + return affectedFiles; + } + + + +}

12 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r36769 - in trunk/as/plugins/org.jboss.ide.eclipse.as.ui: jbossui/org/jboss/ide/eclipse/as/ui and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2011-11-30 05:11:11 -0500 (Wed, 30 Nov 2011) New Revision: 36769 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWebManagementActionProvider.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWelcomePageActionProvider.java Removed: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/OpenManagementConsoleActionProvider.java Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml Log: [JBIDE-6828] added "Welcome (Root) Page" action. Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java 2011-11-30 09:28:11 UTC (rev 36768) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java 2011-11-30 10:11:11 UTC (rev 36769) @@ -124,6 +124,10 @@ public static void log(String message, Exception e) { IStatus status = new Status(IStatus.ERROR, JBossServerUIPlugin.PLUGIN_ID, message, e); + log(status); + } + + public static void log(IStatus status) { JBossServerUIPlugin.getDefault().getLog().log(status); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2011-11-30 09:28:11 UTC (rev 36768) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2011-11-30 10:11:11 UTC (rev 36769) @@ -219,12 +219,14 @@ public static String EditorLocalDeployment; public static String EditorRefreshViewer; - public static String ExploreUtils_Action_Text; public static String ExploreUtils_Description; - public static String OpenWebManagementConsole_Action_Text; - + public static String ShowInWebManagementConsole_Action_Text; + public static String ShowInWelcomePage_Action_Text; + public static String ShowInAction_Error; + public static String ShowInAction_Error_Title; + public static String Configure; public static String ConfigureRuntimeMarkerResolution_Description; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2011-11-30 09:28:11 UTC (rev 36768) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2011-11-30 10:11:11 UTC (rev 36769) @@ -196,7 +196,12 @@ ExploreUtils_Action_Text=Explore ExploreUtils_Description=Explore deploy directory -OpenWebManagementConsole_Action_Text=Web Management Console + +ShowInWebManagementConsole_Action_Text=Web Management Console +ShowInWelcomePage_Action_Text=Welcome (Root) Page +ShowInAction_Error="Could not show \"{0}\"" +ShowInAction_Error_Title="Error" + Configure=Configure... ConfigureRuntimeMarkerResolution_Description=Configure Targeted Runtimes ConvertNodeToXPathDialog_DisplayString=Add to XPaths Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/OpenManagementConsoleActionProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/OpenManagementConsoleActionProvider.java 2011-11-30 09:28:11 UTC (rev 36768) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/OpenManagementConsoleActionProvider.java 2011-11-30 10:11:11 UTC (rev 36769) @@ -1,76 +0,0 @@ -package org.jboss.ide.eclipse.as.ui.views.server.extensions; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.jface.action.IContributionItem; -import org.eclipse.jface.action.IMenuManager; -import org.eclipse.jface.action.MenuManager; -import org.eclipse.jface.viewers.ISelectionProvider; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.ui.navigator.CommonActionProvider; -import org.eclipse.ui.navigator.ICommonActionExtensionSite; -import org.eclipse.ui.navigator.ICommonViewerWorkbenchSite; -import org.eclipse.wst.server.core.IServer; -import org.eclipse.wst.server.ui.internal.view.servers.AbstractServerAction; -import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; -import org.jboss.ide.eclipse.as.core.util.ServerUtil; -import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin; -import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages; -import org.jboss.ide.eclipse.as.ui.Messages; -import org.jboss.tools.common.ui.BrowserUtil; - -import com.ibm.icu.text.MessageFormat; - -public class OpenManagementConsoleActionProvider extends CommonActionProvider { - - private static final String CONSOLE_URL_PATTERN = "http://{0}:{1}/console"; - - private ICommonActionExtensionSite actionSite; - private OpenWebManagementConsoleAction openWebManagementConsoleAction; - - public void init(ICommonActionExtensionSite site) { - super.init(site); - this.actionSite = site; - createActions(site); - } - - protected void createActions(ICommonActionExtensionSite site) { - ICommonViewerWorkbenchSite commonViewerWorkbenchSite = - CommonActionProviderUtils.getCommonViewerWorkbenchSite(site); - if (commonViewerWorkbenchSite != null) { - openWebManagementConsoleAction = - new OpenWebManagementConsoleAction(commonViewerWorkbenchSite.getSelectionProvider()); - } - } - - public void fillContextMenu(IMenuManager menu) { - CommonActionProviderUtils.addToShowInQuickSubMenu(openWebManagementConsoleAction, menu, actionSite); - } - - private static class OpenWebManagementConsoleAction extends AbstractServerAction { - public OpenWebManagementConsoleAction(ISelectionProvider sp) { - super(sp, Messages.OpenWebManagementConsole_Action_Text); - setImageDescriptor(JBossServerUISharedImages.getImageDescriptor(JBossServerUISharedImages.CONSOLE)); - } - - public boolean accept(IServer server) { - return (ServerUtil.isJBoss7(server) - && server.getServerState() == IServer.STATE_STARTED); - } - - public void perform(IServer server) { - JBossServer jbossServer; - try { - jbossServer = ServerUtil.checkedGetServerAdapter(server, JBossServer.class); - String host = jbossServer.getHost(); - int webPort = jbossServer.getJBossWebPort(); - String consoleUrl = MessageFormat.format(CONSOLE_URL_PATTERN, host, String.valueOf(webPort)); - BrowserUtil.checkedCreateInternalBrowser( - consoleUrl, server.getName(), JBossServerUIPlugin.PLUGIN_ID, JBossServerUIPlugin.getDefault() - .getLog()); - } catch (CoreException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - } -} Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWebManagementActionProvider.java (from rev 36768, trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/OpenManagementConsoleActionProvider.java) =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWebManagementActionProvider.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWebManagementActionProvider.java 2011-11-30 10:11:11 UTC (rev 36769) @@ -0,0 +1,82 @@ +package org.jboss.ide.eclipse.as.ui.views.server.extensions; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.jface.action.IMenuManager; +import org.eclipse.jface.dialogs.ErrorDialog; +import org.eclipse.jface.viewers.ISelectionProvider; +import org.eclipse.osgi.util.NLS; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.navigator.CommonActionProvider; +import org.eclipse.ui.navigator.ICommonActionExtensionSite; +import org.eclipse.ui.navigator.ICommonViewerWorkbenchSite; +import org.eclipse.wst.server.core.IServer; +import org.eclipse.wst.server.ui.internal.view.servers.AbstractServerAction; +import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; +import org.jboss.ide.eclipse.as.core.util.ServerUtil; +import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin; +import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages; +import org.jboss.ide.eclipse.as.ui.Messages; +import org.jboss.tools.common.ui.BrowserUtil; + +import com.ibm.icu.text.MessageFormat; + +public class ShowInWebManagementActionProvider extends CommonActionProvider { + + private static final String CONSOLE_URL_PATTERN = "http://{0}:{1}/console"; + + private ICommonActionExtensionSite actionSite; + private OpenWebManagementConsoleAction openWebManagementConsoleAction; + + public void init(ICommonActionExtensionSite site) { + super.init(site); + this.actionSite = site; + createActions(site); + } + + protected void createActions(ICommonActionExtensionSite site) { + ICommonViewerWorkbenchSite commonViewerWorkbenchSite = + CommonActionProviderUtils.getCommonViewerWorkbenchSite(site); + if (commonViewerWorkbenchSite != null) { + openWebManagementConsoleAction = + new OpenWebManagementConsoleAction(commonViewerWorkbenchSite.getSelectionProvider()); + } + } + + public void fillContextMenu(IMenuManager menu) { + CommonActionProviderUtils.addToShowInQuickSubMenu(openWebManagementConsoleAction, menu, actionSite); + } + + private static class OpenWebManagementConsoleAction extends AbstractServerAction { + public OpenWebManagementConsoleAction(ISelectionProvider sp) { + super(sp, Messages.ShowInWebManagementConsole_Action_Text); + setImageDescriptor(JBossServerUISharedImages.getImageDescriptor(JBossServerUISharedImages.CONSOLE)); + } + + public boolean accept(IServer server) { + return (ServerUtil.isJBoss7(server) + && server.getServerState() == IServer.STATE_STARTED); + } + + public void perform(IServer server) { + JBossServer jbossServer; + try { + jbossServer = ServerUtil.checkedGetServerAdapter(server, JBossServer.class); + String host = jbossServer.getHost(); + int webPort = jbossServer.getJBossWebPort(); + String consoleUrl = MessageFormat.format(CONSOLE_URL_PATTERN, host, String.valueOf(webPort)); + BrowserUtil.checkedCreateInternalBrowser( + consoleUrl, server.getName(), JBossServerUIPlugin.PLUGIN_ID, JBossServerUIPlugin.getDefault() + .getLog()); + } catch (CoreException e) { + IStatus status = new Status(IStatus.ERROR, JBossServerUIPlugin.PLUGIN_ID, e.getMessage(), e); + JBossServerUIPlugin.log(status); + ErrorDialog.openError( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell() + , Messages.ShowInAction_Error_Title + , NLS.bind(Messages.ShowInAction_Error, Messages.ShowInWebManagementConsole_Action_Text), status); + } + } + } +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWebManagementActionProvider.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWelcomePageActionProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWelcomePageActionProvider.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWelcomePageActionProvider.java 2011-11-30 10:11:11 UTC (rev 36769) @@ -0,0 +1,79 @@ +package org.jboss.ide.eclipse.as.ui.views.server.extensions; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.jface.action.IMenuManager; +import org.eclipse.jface.dialogs.ErrorDialog; +import org.eclipse.jface.viewers.ISelectionProvider; +import org.eclipse.osgi.util.NLS; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.navigator.CommonActionProvider; +import org.eclipse.ui.navigator.ICommonActionExtensionSite; +import org.eclipse.ui.navigator.ICommonViewerWorkbenchSite; +import org.eclipse.wst.server.core.IServer; +import org.eclipse.wst.server.ui.internal.view.servers.AbstractServerAction; +import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; +import org.jboss.ide.eclipse.as.core.util.ServerUtil; +import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin; +import org.jboss.ide.eclipse.as.ui.Messages; +import org.jboss.tools.common.ui.BrowserUtil; + +import com.ibm.icu.text.MessageFormat; + +public class ShowInWelcomePageActionProvider extends CommonActionProvider { + + private static final String WELCOME_PAGE_URL_PATTERN = "http://{0}:{1}/"; //$NON-NLS-1$ + + private ICommonActionExtensionSite actionSite; + private OpenWelcomePageAction openWelcomePageAction; + + public void init(ICommonActionExtensionSite site) { + super.init(site); + this.actionSite = site; + createActions(site); + } + + protected void createActions(ICommonActionExtensionSite site) { + ICommonViewerWorkbenchSite commonViewerWorkbenchSite = + CommonActionProviderUtils.getCommonViewerWorkbenchSite(site); + if (commonViewerWorkbenchSite != null) { + openWelcomePageAction = + new OpenWelcomePageAction(commonViewerWorkbenchSite.getSelectionProvider()); + } + } + + public void fillContextMenu(IMenuManager menu) { + CommonActionProviderUtils.addToShowInQuickSubMenu(openWelcomePageAction, menu, actionSite); + } + + private static class OpenWelcomePageAction extends AbstractServerAction { + public OpenWelcomePageAction(ISelectionProvider sp) { + super(sp, Messages.ShowInWelcomePage_Action_Text); + } + + public boolean accept(IServer server) { + return (ServerUtil.isJBoss7(server) + && server.getServerState() == IServer.STATE_STARTED); + } + + public void perform(IServer server) { + try { + JBossServer jbossServer = ServerUtil.checkedGetServerAdapter(server, JBossServer.class); + String host = jbossServer.getHost(); + int webPort = jbossServer.getJBossWebPort(); + String consoleUrl = MessageFormat.format(WELCOME_PAGE_URL_PATTERN, host, String.valueOf(webPort)); + BrowserUtil.checkedCreateInternalBrowser( + consoleUrl, server.getName(), JBossServerUIPlugin.PLUGIN_ID, JBossServerUIPlugin.getDefault() + .getLog()); + } catch (CoreException e) { + IStatus status = new Status(IStatus.ERROR, JBossServerUIPlugin.PLUGIN_ID, e.getMessage(), e); + JBossServerUIPlugin.log(status); + ErrorDialog.openError( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell() + , Messages.ShowInAction_Error_Title + , NLS.bind(Messages.ShowInAction_Error, Messages.ShowInWelcomePage_Action_Text), status); + } + } + } +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWelcomePageActionProvider.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2011-11-30 09:28:11 UTC (rev 36768) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2011-11-30 10:11:11 UTC (rev 36769) @@ -375,17 +375,23 @@ </enablement> </actionProvider> <actionProvider - class="org.jboss.ide.eclipse.as.ui.views.server.extensions.OpenManagementConsoleActionProvider" + class="org.jboss.ide.eclipse.as.ui.views.server.extensions.ShowInWebManagementActionProvider" id="org.jboss.ide.eclipse.as.ui.extensions.managementConsole"> <enablement> - <instanceof value="org.eclipse.wst.server.core.IServer"> </instanceof> </enablement> </actionProvider> + <actionProvider + class="org.jboss.ide.eclipse.as.ui.views.server.extensions.ShowInWelcomePageActionProvider" + id="org.jboss.ide.eclipse.as.ui.extensions.welcomePage"> + <enablement> + <instanceof + value="org.eclipse.wst.server.core.IServer"> + </instanceof> + </enablement> + </actionProvider> </extension> @@ -408,9 +414,11 @@ <actionExtension pattern="org.jboss.ide.eclipse.as.ui.extensions.serverLog"/> <actionExtension + pattern="org.jboss.tools.as.wst.server.ui.ServersView.ExploreActionProvider"/> + <actionExtension pattern="org.jboss.ide.eclipse.as.ui.extensions.managementConsole"/> <actionExtension - pattern="org.jboss.tools.as.wst.server.ui.ServersView.ExploreActionProvider"/> + pattern="org.jboss.ide.eclipse.as.ui.extensions.welcomePage"/> </includes> </viewerActionBinding> </extension>

12 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r36768 - in trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui: views/server/extensions and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2011-11-30 04:28:11 -0500 (Wed, 30 Nov 2011) New Revision: 36768 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/CommonActionProviderUtils.java Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/OpenManagementConsoleActionProvider.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ServerLogActionProvider.java Log: [JBIDE-6828] renamed "Open Management Console" to "Web Management Console", moved duplicate code in ServerLogActionProvider & OpenManagementConsole to CommonActionProviderUtils. Made sure "Web Management Console" is only enabled if the server is started Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2011-11-30 08:33:48 UTC (rev 36767) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2011-11-30 09:28:11 UTC (rev 36768) @@ -223,8 +223,7 @@ public static String ExploreUtils_Action_Text; public static String ExploreUtils_Description; - public static String OpenManagementConsole_Action_Text; - public static String OpenConsole_Action_Description; + public static String OpenWebManagementConsole_Action_Text; public static String Configure; public static String ConfigureRuntimeMarkerResolution_Description; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2011-11-30 08:33:48 UTC (rev 36767) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2011-11-30 09:28:11 UTC (rev 36768) @@ -196,7 +196,7 @@ ExploreUtils_Action_Text=Explore ExploreUtils_Description=Explore deploy directory -OpenManagementConsole_Action_Text=Open Management Console +OpenWebManagementConsole_Action_Text=Web Management Console Configure=Configure... ConfigureRuntimeMarkerResolution_Description=Configure Targeted Runtimes ConvertNodeToXPathDialog_DisplayString=Add to XPaths Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/CommonActionProviderUtils.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/CommonActionProviderUtils.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/CommonActionProviderUtils.java 2011-11-30 09:28:11 UTC (rev 36768) @@ -0,0 +1,115 @@ +/******************************************************************************* + * Copyright (c) 2011 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.ide.eclipse.as.ui.views.server.extensions; + +import org.eclipse.jface.action.IAction; +import org.eclipse.jface.action.IContributionItem; +import org.eclipse.jface.action.IMenuManager; +import org.eclipse.jface.action.MenuManager; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.ISelectionProvider; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.viewers.StructuredViewer; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.IWorkbenchPart; +import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.navigator.CommonViewer; +import org.eclipse.ui.navigator.ICommonActionExtensionSite; +import org.eclipse.ui.navigator.ICommonViewerSite; +import org.eclipse.ui.navigator.ICommonViewerWorkbenchSite; +import org.eclipse.wst.server.core.IServer; + +/** + * @author André Dietisheim + */ +public class CommonActionProviderUtils { + + private static final String SHOW_IN_QUICK_MENU_ID = "org.eclipse.ui.navigate.showInQuickMenu"; //$NON-NLS-1$ + + public static ICommonViewerWorkbenchSite getCommonViewerWorkbenchSite(ICommonActionExtensionSite actionExtensionSite) { + ICommonViewerWorkbenchSite wsSite = null; + ICommonViewerSite viewSite = actionExtensionSite.getViewSite(); + if( viewSite instanceof ICommonViewerWorkbenchSite ) { + StructuredViewer v = actionExtensionSite.getStructuredViewer(); + if( v instanceof CommonViewer ) { + wsSite = (ICommonViewerWorkbenchSite) viewSite; + } + } + return wsSite; + } + + public static IStructuredSelection getSelection(ICommonActionExtensionSite actionExtensionSite) { + IStructuredSelection structuredSelection = null; + ICommonViewerWorkbenchSite workbenchSite = getCommonViewerWorkbenchSite(actionExtensionSite); + if (workbenchSite != null) { + ISelectionProvider selectionProvider = workbenchSite.getSelectionProvider(); + if (selectionProvider != null) { + ISelection selection = selectionProvider.getSelection(); + if (selection instanceof IStructuredSelection) { + structuredSelection = (IStructuredSelection) selection; + } + } + } + return structuredSelection; + } + + public static boolean isServerSelected(IStructuredSelection selection) { + return selection != null + && selection.getFirstElement() instanceof IServer; + } + + public static IContributionItem getShowInQuickMenu(IMenuManager menuManager) { + IContributionItem item = null; + if (menuManager != null) { + item = menuManager.find(SHOW_IN_QUICK_MENU_ID); + } + return item; + } + + public static void addToShowInQuickSubMenu(IAction action, IMenuManager menu, ICommonActionExtensionSite actionSite) { + IStructuredSelection selection = CommonActionProviderUtils.getSelection(actionSite); + IContributionItem menuItem = CommonActionProviderUtils.getShowInQuickMenu(menu); + if (menuItem instanceof MenuManager + && CommonActionProviderUtils.isServerSelected(selection) + && action != null) { + ((MenuManager) menuItem).add(action); + } + + } + + public static IWorkbenchPart getWorkbenchPart(String id) { + IWorkbenchPart part = null; + IWorkbenchPage page = getActiveWorkbenchPage(); + if (page != null) { + part = page.findView(id); + } + return part; + } + + public static IWorkbenchPage getActiveWorkbenchPage() { + IWorkbenchPage page = null; + IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); + if (window != null) { + page = window.getActivePage(); + } + return page; + } + + public static IWorkbenchPart showView(String partId) throws PartInitException { + IWorkbenchPart part = CommonActionProviderUtils.getWorkbenchPart(partId); + if (part == null) { + part = CommonActionProviderUtils.getActiveWorkbenchPage().showView(partId); + } + return part; + } +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/CommonActionProviderUtils.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/OpenManagementConsoleActionProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/OpenManagementConsoleActionProvider.java 2011-11-30 08:33:48 UTC (rev 36767) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/OpenManagementConsoleActionProvider.java 2011-11-30 09:28:11 UTC (rev 36768) @@ -6,11 +6,8 @@ import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.StructuredViewer; import org.eclipse.ui.navigator.CommonActionProvider; -import org.eclipse.ui.navigator.CommonViewer; import org.eclipse.ui.navigator.ICommonActionExtensionSite; -import org.eclipse.ui.navigator.ICommonViewerSite; import org.eclipse.ui.navigator.ICommonViewerWorkbenchSite; import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.ui.internal.view.servers.AbstractServerAction; @@ -26,58 +23,40 @@ public class OpenManagementConsoleActionProvider extends CommonActionProvider { private static final String CONSOLE_URL_PATTERN = "http://{0}:{1}/console"; - + private ICommonActionExtensionSite actionSite; - private OpenManagementConsoleAction openManagementConsoleAction; - public OpenManagementConsoleActionProvider() { - super(); - } - + private OpenWebManagementConsoleAction openWebManagementConsoleAction; + public void init(ICommonActionExtensionSite site) { super.init(site); this.actionSite = site; createActions(site); } - protected void createActions(ICommonActionExtensionSite aSite) { - ICommonViewerSite viewSite = aSite.getViewSite(); - if( viewSite instanceof ICommonViewerWorkbenchSite ) { - StructuredViewer v = aSite.getStructuredViewer(); - if( v instanceof CommonViewer ) { - ICommonViewerWorkbenchSite wsSite = (ICommonViewerWorkbenchSite)viewSite; - openManagementConsoleAction = new OpenManagementConsoleAction(wsSite.getSelectionProvider()); - } + protected void createActions(ICommonActionExtensionSite site) { + ICommonViewerWorkbenchSite commonViewerWorkbenchSite = + CommonActionProviderUtils.getCommonViewerWorkbenchSite(site); + if (commonViewerWorkbenchSite != null) { + openWebManagementConsoleAction = + new OpenWebManagementConsoleAction(commonViewerWorkbenchSite.getSelectionProvider()); } } public void fillContextMenu(IMenuManager menu) { - ICommonViewerSite site = actionSite.getViewSite(); - IStructuredSelection selection = null; - if (site instanceof ICommonViewerWorkbenchSite) { - ICommonViewerWorkbenchSite wsSite = (ICommonViewerWorkbenchSite) site; - selection = (IStructuredSelection) wsSite.getSelectionProvider() - .getSelection(); - } - IContributionItem menuItem = menu.find("org.eclipse.ui.navigate.showInQuickMenu"); //$NON-NLS-1$ - if( menuItem != null && selection != null && selection.toArray().length == 1 ) { - if( selection.getFirstElement() instanceof IServer ) { - if( menu instanceof MenuManager ) { - ((MenuManager)menuItem).add(openManagementConsoleAction); - } - } - } + CommonActionProviderUtils.addToShowInQuickSubMenu(openWebManagementConsoleAction, menu, actionSite); } - - private static class OpenManagementConsoleAction extends AbstractServerAction { - public OpenManagementConsoleAction(ISelectionProvider sp) { - super(sp, Messages.OpenManagementConsole_Action_Text); + + private static class OpenWebManagementConsoleAction extends AbstractServerAction { + public OpenWebManagementConsoleAction(ISelectionProvider sp) { + super(sp, Messages.OpenWebManagementConsole_Action_Text); setImageDescriptor(JBossServerUISharedImages.getImageDescriptor(JBossServerUISharedImages.CONSOLE)); } public boolean accept(IServer server) { - return (ServerUtil.isJBoss7(server)); + return (ServerUtil.isJBoss7(server) + && server.getServerState() == IServer.STATE_STARTED); } - + public void perform(IServer server) { JBossServer jbossServer; try { @@ -86,7 +65,8 @@ int webPort = jbossServer.getJBossWebPort(); String consoleUrl = MessageFormat.format(CONSOLE_URL_PATTERN, host, String.valueOf(webPort)); BrowserUtil.checkedCreateInternalBrowser( - consoleUrl, server.getName(), JBossServerUIPlugin.PLUGIN_ID, JBossServerUIPlugin.getDefault().getLog()); + consoleUrl, server.getName(), JBossServerUIPlugin.PLUGIN_ID, JBossServerUIPlugin.getDefault() + .getLog()); } catch (CoreException e) { // TODO Auto-generated catch block e.printStackTrace(); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ServerLogActionProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ServerLogActionProvider.java 2011-11-30 08:33:48 UTC (rev 36767) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ServerLogActionProvider.java 2011-11-30 09:28:11 UTC (rev 36768) @@ -1,36 +1,30 @@ package org.jboss.ide.eclipse.as.ui.views.server.extensions; import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.jface.action.IContributionItem; import org.eclipse.jface.action.IMenuManager; -import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.viewers.ISelectionProvider; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.StructuredViewer; -import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchPart; -import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.navigator.CommonActionProvider; -import org.eclipse.ui.navigator.CommonViewer; import org.eclipse.ui.navigator.ICommonActionExtensionSite; -import org.eclipse.ui.navigator.ICommonViewerSite; import org.eclipse.ui.navigator.ICommonViewerWorkbenchSite; import org.eclipse.ui.views.IViewDescriptor; import org.eclipse.ui.views.IViewRegistry; import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.ui.internal.view.servers.AbstractServerAction; import org.jboss.ide.eclipse.as.core.server.IDeployableServer; +import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin; import org.jboss.ide.eclipse.as.ui.views.ServerLogView; public class ServerLogActionProvider extends CommonActionProvider { private ICommonActionExtensionSite actionSite; private ShowInServerLogAction showInServerLogAction; + public ServerLogActionProvider() { super(); } - + public void init(ICommonActionExtensionSite aSite) { super.init(aSite); this.actionSite = aSite; @@ -38,38 +32,21 @@ } protected void createActions(ICommonActionExtensionSite aSite) { - ICommonViewerSite site = aSite.getViewSite(); - if( site instanceof ICommonViewerWorkbenchSite ) { - StructuredViewer v = aSite.getStructuredViewer(); - if( v instanceof CommonViewer ) { - ICommonViewerWorkbenchSite wsSite = (ICommonViewerWorkbenchSite)site; - showInServerLogAction = new ShowInServerLogAction(wsSite.getSelectionProvider()); - } + ICommonViewerWorkbenchSite commonViewerWorkbenchSite = + CommonActionProviderUtils.getCommonViewerWorkbenchSite(aSite); + if (commonViewerWorkbenchSite != null) { + showInServerLogAction = new ShowInServerLogAction(commonViewerWorkbenchSite.getSelectionProvider()); } } public void fillContextMenu(IMenuManager menu) { - ICommonViewerSite site = actionSite.getViewSite(); - IStructuredSelection selection = null; - if (site instanceof ICommonViewerWorkbenchSite) { - ICommonViewerWorkbenchSite wsSite = (ICommonViewerWorkbenchSite) site; - selection = (IStructuredSelection) wsSite.getSelectionProvider() - .getSelection(); - } - IContributionItem quick = menu.find("org.eclipse.ui.navigate.showInQuickMenu"); //$NON-NLS-1$ - if( quick != null && selection != null && selection.toArray().length == 1 ) { - if( selection.getFirstElement() instanceof IServer ) { - if( menu instanceof MenuManager ) { - ((MenuManager)quick).add(showInServerLogAction); - } - } - } + CommonActionProviderUtils.addToShowInQuickSubMenu(showInServerLogAction, menu, actionSite); } - + public class ShowInServerLogAction extends AbstractServerAction { public ShowInServerLogAction(ISelectionProvider sp) { super(sp, null); - + IViewRegistry reg = PlatformUI.getWorkbench().getViewRegistry(); IViewDescriptor desc = reg.find(ServerLogView.VIEW_ID); setText(desc.getLabel()); @@ -77,30 +54,22 @@ } public boolean accept(IServer server) { - return (server.getServerType() != null && - server.loadAdapter(IDeployableServer.class, new NullProgressMonitor()) != null); + return (server.getServerType() != null && server.loadAdapter(IDeployableServer.class, + new NullProgressMonitor()) != null); } public void perform(IServer server) { - IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow() ; - if (window != null) { - IWorkbenchPage page = window.getActivePage(); - if (page != null) { - IWorkbenchPart part = page.findView(ServerLogView.VIEW_ID); - if (part == null) { - try { - part = page.showView(ServerLogView.VIEW_ID); - } catch (PartInitException e) { - } - } - if (part != null) { - ServerLogView view = (ServerLogView) part.getAdapter(ServerLogView.class); - if (view != null) { - view.setFocus(); - view.setServer(server); - } + try { + IWorkbenchPart part = CommonActionProviderUtils.showView(ServerLogView.VIEW_ID); + if (part != null) { + ServerLogView view = (ServerLogView) part.getAdapter(ServerLogView.class); + if (view != null) { + view.setFocus(); + view.setServer(server); } } + } catch (PartInitException e) { + JBossServerUIPlugin.log("could not show view " + ServerLogView.VIEW_ID, e); } } }

12 years, 4 months

1
0
0 / 0

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

by jbosstools-commits＠lists.jboss.org

Author: vpakan(a)redhat.com Date: 2011-11-30 03:33:48 -0500 (Wed, 30 Nov 2011) New Revision: 36767 Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java Log: Test if project already exist when creating JSF/JSF2/Facelets project. Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2011-11-30 08:03:24 UTC (rev 36766) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2011-11-30 08:33:48 UTC (rev 36767) @@ -118,34 +118,14 @@ public void setUp() throws Exception { super.setUp(); clearWorkbench(); - SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER) - .bot(); - SWTBotTree tree = innerBot.tree(); /* * Test JSF project */ - try { - tree.getTreeItem(JBT_TEST_PROJECT_NAME); - } catch (WidgetNotFoundException e) { - createJSFProject(JBT_TEST_PROJECT_NAME); - } + createJSFProject(JBT_TEST_PROJECT_NAME); /* * Test Facelets project */ - try { - tree.getTreeItem(FACELETS_TEST_PROJECT_NAME); - } catch (WidgetNotFoundException e) { - createFaceletsProject(FACELETS_TEST_PROJECT_NAME); - } - /* - * Test JSF2 project - */ - try { - tree.getTreeItem(JSF2_TEST_PROJECT_NAME); - } catch (WidgetNotFoundException e) { - // FIXME uncomment - //createJSF2Project(JSF2_TEST_PROJECT_NAME); - } + createFaceletsProject(FACELETS_TEST_PROJECT_NAME); } /** @@ -169,14 +149,20 @@ * - name of created project */ protected void createJSFProject(String jsfProjectName) { - SWTBot wiz = open.newObject(JBossToolsWebJSFJSFProject.LABEL); - wiz.textWithLabel("Project Name*").setText(jsfProjectName); //$NON-NLS-1$ - wiz.comboBoxWithLabel("Template*").setSelection("JSFKickStartWithoutLibs"); //$NON-NLS-1$ //$NON-NLS-2$ - wiz.button("Next >").click(); //$NON-NLS-1$ - wiz.comboBoxWithLabel("Runtime:*").setSelection(SWTTestExt.configuredState.getServer().name); //$NON-NLS-1$ //$NON-NLS-2$ - open.finish(wiz); - waitForBlockingJobsAcomplished(60 * 1000L, BUILDING_WS); - setException(null); + SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); + SWTBotTree innerTree = innerBot.tree(); + try { + innerTree.getTreeItem(jsfProjectName); + } catch (WidgetNotFoundException wnfe) { + SWTBot wiz = open.newObject(JBossToolsWebJSFJSFProject.LABEL); + wiz.textWithLabel("Project Name*").setText(jsfProjectName); //$NON-NLS-1$ + wiz.comboBoxWithLabel("Template*").setSelection("JSFKickStartWithoutLibs"); //$NON-NLS-1$ //$NON-NLS-2$ + wiz.button("Next >").click(); //$NON-NLS-1$ + wiz.comboBoxWithLabel("Runtime:*").setSelection(SWTTestExt.configuredState.getServer().name); //$NON-NLS-1$ //$NON-NLS-2$ + open.finish(wiz); + waitForBlockingJobsAcomplished(60 * 1000L, BUILDING_WS); + setException(null); + } } /** @@ -186,29 +172,35 @@ * - name of created project */ protected void createFaceletsProject(String faceletsProjectName) { - bot.menu("File").menu("New").menu("Other...").click(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - bot.shell("New").activate(); //$NON-NLS-1$ - SWTBotTree tree = bot.tree(); - delay(); - tree.expandNode("JBoss Tools Web").expandNode("JSF").select("JSF Project"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - bot.button("Next >").click(); //$NON-NLS-1$ - bot.textWithLabel("Project Name*").setText(faceletsProjectName); //$NON-NLS-1$ - bot.comboBoxWithLabel("JSF Environment*").setSelection("JSF 1.2 with Facelets"); //$NON-NLS-1$ //$NON-NLS-2$ - bot.comboBoxWithLabel("Template*").setSelection("FaceletsKickStartWithoutLibs"); //$NON-NLS-1$ //$NON-NLS-2$ - bot.button("Next >").click(); //$NON-NLS-1$ + SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); + SWTBotTree innerTree = innerBot.tree(); + try { + innerTree.getTreeItem(faceletsProjectName); + } catch (WidgetNotFoundException wnfe) { + bot.menu("File").menu("New").menu("Other...").click(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + bot.shell("New").activate(); //$NON-NLS-1$ + SWTBotTree tree = bot.tree(); + delay(); + tree.expandNode("JBoss Tools Web").expandNode("JSF").select("JSF Project"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + bot.button("Next >").click(); //$NON-NLS-1$ + bot.textWithLabel("Project Name*").setText(faceletsProjectName); //$NON-NLS-1$ + bot.comboBoxWithLabel("JSF Environment*").setSelection("JSF 1.2 with Facelets"); //$NON-NLS-1$ //$NON-NLS-2$ + bot.comboBoxWithLabel("Template*").setSelection("FaceletsKickStartWithoutLibs"); //$NON-NLS-1$ //$NON-NLS-2$ + bot.button("Next >").click(); //$NON-NLS-1$ - bot.comboBoxWithLabel("Runtime:*").setSelection(SWTTestExt.configuredState.getServer().name); //$NON-NLS-1$ //$NON-NLS-2$ - delay(); - bot.button("Finish").click(); //$NON-NLS-1$ - try { - bot.button("Yes").click(); //$NON-NLS-1$ - openErrorLog(); - openPackageExplorer(); - } catch (WidgetNotFoundException e) { - } + bot.comboBoxWithLabel("Runtime:*").setSelection(SWTTestExt.configuredState.getServer().name); //$NON-NLS-1$ //$NON-NLS-2$ + delay(); + bot.button("Finish").click(); //$NON-NLS-1$ + try { + bot.button("Yes").click(); //$NON-NLS-1$ + openErrorLog(); + openPackageExplorer(); + } catch (WidgetNotFoundException e) { + } - waitForBlockingJobsAcomplished(60 * 1000L, BUILDING_WS); - setException(null); + waitForBlockingJobsAcomplished(60 * 1000L, BUILDING_WS); + setException(null); + } } /** @@ -628,7 +620,7 @@ SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); SWTBotTree tree = innerBot.tree(); try { - tree.getTreeItem(JSF2_TEST_PROJECT_NAME); + tree.getTreeItem(jsf2ProjectName); } catch (WidgetNotFoundException wnfe) { SWTBot wiz = open .newObject(ActionItem.NewObject.JBossToolsWebJSFJSFProject.LABEL);

12 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r36766 - in trunk/as/tests: org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2011-11-30 03:03:24 -0500 (Wed, 30 Nov 2011) New Revision: 36766 Modified: trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/META-INF/MANIFEST.MF trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/AS7ManagerIntegrationTest.java trunk/as/tests/org.jboss.ide.eclipse.as.test/META-INF/MANIFEST.MF Log: AS test suite compilation error Modified: trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/META-INF/MANIFEST.MF =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/META-INF/MANIFEST.MF 2011-11-30 06:45:22 UTC (rev 36765) +++ trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/META-INF/MANIFEST.MF 2011-11-30 08:03:24 UTC (rev 36766) @@ -8,7 +8,8 @@ org.jboss.ide.eclipse.as.management.as7;bundle-version="[2.2.0,3.0.0)", org.junit;bundle-version="[4.8.1,5.0.0)", org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)", - org.hamcrest;bundle-version="[1.1.0,2.0.0)" + org.hamcrest;bundle-version="[1.1.0,2.0.0)", + org.jboss.ide.eclipse.as.test Bundle-ClassPath: ., wars/ Bundle-ActivationPolicy: lazy Modified: trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/AS7ManagerIntegrationTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/AS7ManagerIntegrationTest.java 2011-11-30 06:45:22 UTC (rev 36765) +++ trunk/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/src/org/jboss/ide/eclipse/as/internal/management/as7/tests/AS7ManagerIntegrationTest.java 2011-11-30 08:03:24 UTC (rev 36766) @@ -28,6 +28,7 @@ import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7ServerState; import org.jboss.ide.eclipse.as.internal.management.as7.AS7Manager; import org.jboss.ide.eclipse.as.internal.management.as7.tests.utils.AS7ManagerTestUtils; +import org.jboss.ide.eclipse.as.test.server.JBossManagerTest.MockAS7ManagementDetails; import org.junit.After; import org.junit.Before; import org.junit.Ignore; @@ -46,7 +47,8 @@ assertTrue("There is no server at " + AS7ManagerTestUtils.LOCALHOST + " that listens on port " + AS7Manager.MGMT_PORT, AS7ManagerTestUtils.isListening(AS7ManagerTestUtils.LOCALHOST, AS7Manager.MGMT_PORT)); - this.manager = new AS7Manager(AS7ManagerTestUtils.LOCALHOST, AS7Manager.MGMT_PORT); + this.manager = new AS7Manager( new MockAS7ManagementDetails( + AS7ManagerTestUtils.LOCALHOST, AS7Manager.MGMT_PORT)); } @After Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/META-INF/MANIFEST.MF =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/META-INF/MANIFEST.MF 2011-11-30 06:45:22 UTC (rev 36765) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/META-INF/MANIFEST.MF 2011-11-30 08:03:24 UTC (rev 36766) @@ -49,6 +49,7 @@ Export-Package: org.jboss.ide.eclipse.as.test, org.jboss.ide.eclipse.as.test.classpath, org.jboss.ide.eclipse.as.test.defects, + org.jboss.ide.eclipse.as.test.launch, org.jboss.ide.eclipse.as.test.projectcreation, org.jboss.ide.eclipse.as.test.publishing, org.jboss.ide.eclipse.as.test.publishing.v2,

12 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r36765 - trunk/as/docs/reference/en-US.

by jbosstools-commits＠lists.jboss.org

Author: irooskov(a)redhat.com Date: 2011-11-30 01:45:22 -0500 (Wed, 30 Nov 2011) New Revision: 36765 Modified: trunk/as/docs/reference/en-US/Book_Info.xml Log: updated for brew Modified: trunk/as/docs/reference/en-US/Book_Info.xml =================================================================== --- trunk/as/docs/reference/en-US/Book_Info.xml 2011-11-30 06:37:04 UTC (rev 36764) +++ trunk/as/docs/reference/en-US/Book_Info.xml 2011-11-30 06:45:22 UTC (rev 36765) @@ -7,7 +7,7 @@ <productname>JBoss Developer Studio</productname> <productnumber>5.0</productnumber> <edition>5.0.0</edition> - <pubsnumber>4</pubsnumber> + <pubsnumber>5</pubsnumber> <abstract> <para>The JBoss Server Manager Reference Guide explains how to use the JBoss Server Manager to configure, start, stop the server, to know deployment and archiving processes.</para> </abstract>

12 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r36764 - in trunk/as: plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal and 7 other directories.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2011-11-30 01:37:04 -0500 (Wed, 30 Nov 2011) New Revision: 36764 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IProvideCredentials.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossStartLaunchConfiguration.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/AS7ManagementDetails.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/PollThreadUtils.java trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/AS7Manager.java trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/src/org/jboss/ide/eclipse/as/internal/management/as71/AS71Manager.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/JBossManagerTest.java Log: JBIDE-10224 - Code cleanup as per max's suggestions, added javadoc, fixed remaining issue of unnecessary credentialing during startup, fixed innacurate text in credentialing dialog, removed some deprecated methods Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IProvideCredentials.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IProvideCredentials.java 2011-11-30 06:34:49 UTC (rev 36763) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IProvideCredentials.java 2011-11-30 06:37:04 UTC (rev 36764) @@ -25,6 +25,8 @@ /** * Handles the fetching / requesting and subsequent delivery of these credentials + * This method is performed asynchronously, with a Properties object + * eventually being delivered to "inNeed" via inNeed.provideCredentials(etc) * * @param inNeed the object requiring access to the credentials * @param requiredProperties a list of required properties Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java 2011-11-30 06:34:49 UTC (rev 36763) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java 2011-11-30 06:37:04 UTC (rev 36764) @@ -49,22 +49,10 @@ private boolean expectedState, abort, stateStartedOrStopped; private IServerStatePoller poller; private String abortMessage; - @Deprecated - private DelegatingServerBehavior behavior; private String pollerId; private IPollResultListener listener; private IServer server; - @Deprecated - public PollThread(boolean expectedState, IServerStatePoller poller, DelegatingServerBehavior behavior) { - super(getThreadName(behavior.getServer())); - this.expectedState = expectedState; - this.behavior = behavior; - this.server = behavior.getServer(); - this.poller = poller; - this.abort = false; - } - public PollThread(boolean expectedState, IServerStatePoller poller, IPollResultListener listener, IServer server) { super(getThreadName(server)); this.expectedState = expectedState; @@ -96,11 +84,10 @@ } public void run() { - // Poller not found + // Poller not found. Abort if (poller == null) { alertEventLogStarting(); alertPollerNotFound(); -// alertBehavior(!expectedState); alertListener(!expectedState); return; } @@ -130,7 +117,6 @@ poller.cancel(IServerStatePoller.CANCEL); poller.cleanup(); alertEventLogPollerException(e); -// alertBehavior(!expectedState); alertListener(!expectedState); return; } catch (RequiresInfoException rie) { @@ -148,64 +134,73 @@ ServerLogger.getDefault().log(server, s); } - // we stopped. Did we abort? if (stateStartedOrStopped) { - int state = server.getServerState(); - boolean success = false; - if (expectedState == IServerStatePoller.SERVER_UP) - success = state == IServer.STATE_STARTED; - else - success = state == IServer.STATE_STOPPED; - - poller.cancel(success ? IServerStatePoller.SUCCESS - : IServerStatePoller.FAILED); - poller.cleanup(); + // we stopped. Did we abort? + handleUncertainTermination(); } else if (abort) { + // Definite abort poller.cleanup(); alertEventLogAbort(); + } else if (done) { + // the poller has an answer + handlePollerHasAnswer(); } else { - boolean currentState = !expectedState; - boolean finalAlert = true; - if (done) { - // the poller has an answer - try { - currentState = poller.getState(); - poller.cleanup(); - alertListener(currentState); - if (finalAlert) { - alertEventLog(currentState); - } - } catch (PollingException pe) { - // abort and put the message in event log - poller.cancel(IServerStatePoller.CANCEL); - poller.cleanup(); - alertEventLogPollerException(pe); - alertListener(!expectedState); - return; - } catch (RequiresInfoException rie) { - // You don't have an answer... liar! - } - } else { - // we timed out. get response from preferences - poller.cancel(IServerStatePoller.TIMEOUT_REACHED); - int behavior = poller.getTimeoutBehavior(); - poller.cleanup(); - alertEventLogTimeout(); - if (behavior != IServerStatePoller.TIMEOUT_BEHAVIOR_IGNORE) { - // xnor; - // if behavior is to succeed and we're expected to go up, - // we're up - // if behavior is to fail and we're expecting to be down, - // we're up (failed to shutdown) - // all other cases, we're down. - currentState = (expectedState == (behavior == IServerStatePoller.TIMEOUT_BEHAVIOR_SUCCEED)); -// alertBehavior(currentState); - alertListener(currentState); - } + // we timed out. get response from preferences + handleTimeoutTermination(); + } + } + + private void handlePollerHasAnswer() { + boolean finalAlert = true; + try { + boolean currentState = poller.getState(); + poller.cleanup(); + alertListener(currentState); + if (finalAlert) { + alertEventLog(currentState); } + } catch (PollingException pe) { + // Poller's answer was exception: abort and put the message in event log + poller.cancel(IServerStatePoller.CANCEL); + poller.cleanup(); + alertEventLogPollerException(pe); + alertListener(!expectedState); + return; + } catch (RequiresInfoException rie) { + // You don't have an answer... liar! } } + + private void handleTimeoutTermination() { + poller.cancel(IServerStatePoller.TIMEOUT_REACHED); + int behavior = poller.getTimeoutBehavior(); + poller.cleanup(); + alertEventLogTimeout(); + if (behavior != IServerStatePoller.TIMEOUT_BEHAVIOR_IGNORE) { + // xnor; + // if behavior is to succeed and we're expected to go up, + // we're up + // if behavior is to fail and we're expecting to be down, + // we're up (failed to shutdown) + // all other cases, we're down. + boolean currentState = (expectedState == (behavior == IServerStatePoller.TIMEOUT_BEHAVIOR_SUCCEED)); + alertListener(currentState); + } + } + + private void handleUncertainTermination() { + int state = server.getServerState(); + boolean success = false; + if (expectedState == IServerStatePoller.SERVER_UP) + success = state == IServer.STATE_STARTED; + else + success = state == IServer.STATE_STOPPED; + poller.cancel(success ? IServerStatePoller.SUCCESS + : IServerStatePoller.FAILED); + poller.cleanup(); + } + private boolean timeoutReached(long startTime, int maxWait) { return System.currentTimeMillis() >= (startTime + maxWait); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossStartLaunchConfiguration.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossStartLaunchConfiguration.java 2011-11-30 06:34:49 UTC (rev 36763) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossStartLaunchConfiguration.java 2011-11-30 06:37:04 UTC (rev 36764) @@ -112,7 +112,6 @@ } Trace.trace(Trace.STRING_FINEST, "There is no handler available to prompt the user. The server will be set to started automatically. "); //$NON-NLS-1$ // force server to started mode - jbsBehavior.setServerStarting(); jbsBehavior.setServerStarted(); return false; } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/AS7ManagementDetails.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/AS7ManagementDetails.java 2011-11-30 06:34:49 UTC (rev 36763) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/AS7ManagementDetails.java 2011-11-30 06:37:04 UTC (rev 36764) @@ -12,38 +12,25 @@ import java.util.ArrayList; import java.util.Arrays; -import java.util.List; import java.util.Properties; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.wst.server.core.IServer; -import org.jboss.ide.eclipse.as.core.ExtensionManager; -import org.jboss.ide.eclipse.as.core.server.INeedCredentials; -import org.jboss.ide.eclipse.as.core.server.IProvideCredentials; import org.jboss.ide.eclipse.as.core.server.IServerProvider; import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7Server; +import org.jboss.ide.eclipse.as.core.util.PollThreadUtils; public class AS7ManagementDetails implements IServerProvider { private IServer server; - private String hardHost = null; - private int hardPort = -1; public AS7ManagementDetails(IServer server) { this.server = server; } - public AS7ManagementDetails(String host, int port) { - this.hardHost = host; - this.hardPort = port; - } - public String getHost() { - return hardHost == null ? server.getHost() : hardHost; + return server.getHost(); } public int getManagementPort() { - if( hardPort != -1 ) - return hardPort; - JBoss7Server jbossServer = (JBoss7Server) server.loadAdapter(JBoss7Server.class, new NullProgressMonitor()); if( jbossServer != null ) return jbossServer.getManagementPort(); @@ -61,47 +48,19 @@ public String[] handleCallbacks(String[] prompts) throws UnsupportedOperationException { ArrayList<String> requiredProperties = new ArrayList<String>(); requiredProperties.addAll(Arrays.asList(prompts)); - IProvideCredentials handler = ExtensionManager - .getDefault().getFirstCredentialProvider(this, requiredProperties); - if( handler == null ) - throw new UnsupportedOperationException(); - final Properties[] returnedProps = new Properties[1]; - final Boolean[] gotProps = new Boolean[1]; - returnedProps[0] = null; - gotProps[0] = false; - - INeedCredentials needs = new INeedCredentials() { - public IServer getServer() { - return AS7ManagementDetails.this.getServer(); - } - public List<String> getRequiredProperties() { - // ignore - return null; - } - public void provideCredentials(Properties credentials) { - returnedProps[0] = credentials; - gotProps[0] = true; - } - }; - handler.handle(needs, requiredProperties); + Properties props = PollThreadUtils.requestCredentialsSynchronous(this, requiredProperties); - while( !gotProps[0]) { - try { - Thread.sleep(100); - } catch(InterruptedException ie) { - // ignore - } - } - - if( returnedProps[0] == null ) - return new String[0]; + if( props == null ) + return null; + // Fit the returned properties in the same order as the request prompts String[] rets = new String[prompts.length]; for( int i = 0; i < rets.length; i++ ) { - rets[i] = (String)returnedProps[0].get(prompts[i]); + rets[i] = (String)props.get(prompts[i]); } return rets; } + public IServer getServer() { return server; } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/PollThreadUtils.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/PollThreadUtils.java 2011-11-30 06:34:49 UTC (rev 36763) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/PollThreadUtils.java 2011-11-30 06:37:04 UTC (rev 36764) @@ -10,15 +10,21 @@ ******************************************************************************/ package org.jboss.ide.eclipse.as.core.util; +import java.util.List; +import java.util.Properties; + import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.as.core.ExtensionManager; +import org.jboss.ide.eclipse.as.core.server.INeedCredentials; +import org.jboss.ide.eclipse.as.core.server.IProvideCredentials; +import org.jboss.ide.eclipse.as.core.server.IServerProvider; import org.jboss.ide.eclipse.as.core.server.IServerStatePoller; -import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior; import org.jboss.ide.eclipse.as.core.server.internal.IPollResultListener; import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; import org.jboss.ide.eclipse.as.core.server.internal.PollThread; import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper; import org.jboss.ide.eclipse.as.core.server.internal.ServerStatePollerType; +import org.jboss.ide.eclipse.as.core.server.v7.management.AS7ManagementDetails; /** * @author Rob Stryker @@ -62,19 +68,6 @@ * Returns the poller for the given poller id. * * @param pollerId the id of the poller to use - * @param expectedState - * @param server - * @return - */ - @Deprecated - public static IServerStatePoller getPoller(String pollerId, boolean expectedState, IServer server) { - return getPoller(pollerId); - } - - /** - * Returns the poller for the given poller id. - * - * @param pollerId the id of the poller to use * @return the poller for the given id */ public static IServerStatePoller getPoller(String pollerId) { @@ -112,43 +105,9 @@ } } - /** - * Stops the given poll thread and creates a new poll thread for the given - * expected state and server behavior. - * - * @param expectedState the state to wait for - * @param pollThread the poll thread to stop - * @param behaviour the server behavior to use. - * @return - * @return the new poll thread - */ - @Deprecated - public static PollThread pollServer(final boolean expectedState, PollThread currentPollThread, DelegatingServerBehavior behaviour) { - IServerStatePoller poller = PollThreadUtils.getPoller(expectedState, behaviour.getServer()); - return pollServer(expectedState, poller, currentPollThread, behaviour); - } /** * Stops the given poll thread and creates a new poll thread for the given - * expected state, poller and server behavior. - * - * @param expectedState the state to wait for - * @param poller the poller to use to wait for the expected state - * @param pollThread the poll thread to stop - * @param behaviour the server behavior to use. - * @return the new poll thread - */ - @Deprecated - public static PollThread pollServer(boolean expectedState, IServerStatePoller poller, PollThread currentPollThread, - DelegatingServerBehavior behaviour) { - stopPolling(currentPollThread); - PollThread newPollThread = new PollThread(expectedState, poller, behaviour); - newPollThread.start(); - return newPollThread; - } - - /** - * Stops the given poll thread and creates a new poll thread for the given * expected state, poller, result listener and server. * * @param expectedState the state to wait for @@ -164,5 +123,67 @@ newPollThread.start(); return newPollThread; } + + /** + * The credential provider is alerted that credentials are needed. + * The response may come at any time. + * + * @param requester + * @param requiredProps + */ + public static void requestCredentialsAsynch(INeedCredentials requester, List<String> requiredProps) { + IProvideCredentials provider = ExtensionManager.getDefault() + .getFirstCredentialProvider(requester, requiredProps); + provider.handle(requester, requiredProps); + } + + /** + * The credential provider is alerted that credentials are needed. + * The thread is then delayed until some result is provided. + * + * @param requester + * @param requiredProps + * @return + */ + public static Properties requestCredentialsSynchronous(final IServerProvider requester, List<String> requiredProps) { + IProvideCredentials provider = ExtensionManager.getDefault() + .getFirstCredentialProvider(requester, requiredProps); + final Properties[] returnedProps = new Properties[1]; + final Boolean[] gotProps = new Boolean[1]; + returnedProps[0] = null; + gotProps[0] = false; + + /* + * This dummy requirer will set variables when the credentials finally arrive. + * Then this synchronous method can finish. + */ + + INeedCredentials dummyRequirer = new INeedCredentials() { + public IServer getServer() { + return requester.getServer(); + } + public List<String> getRequiredProperties() { + // ignore + return null; + } + public void provideCredentials(Properties credentials) { + returnedProps[0] = credentials; + // necessary to have a gotProps since a cancelation on the UI may + // set null as the returned properties + gotProps[0] = true; + } + }; + + provider.handle(dummyRequirer, requiredProps); + + while( !gotProps[0]) { + try { + Thread.sleep(100); + } catch(InterruptedException ie) { + // ignore + } + } + return returnedProps[0]; + } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/AS7Manager.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/AS7Manager.java 2011-11-30 06:34:49 UTC (rev 36763) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/AS7Manager.java 2011-11-30 06:37:04 UTC (rev 36764) @@ -60,15 +60,6 @@ private ServerDeploymentManager manager; private AS7ManagementDetails details; - @Deprecated - public AS7Manager(String host) throws UnknownHostException { - this(new AS7ManagementDetails(host, MGMT_PORT)); - } - - public AS7Manager(String host, int port) throws UnknownHostException { - this(new AS7ManagementDetails(host, port)); - } - public AS7Manager(AS7ManagementDetails details) throws UnknownHostException { this.details = details; this.client = ModelControllerClient.Factory.create(details.getHost(), details.getManagementPort()); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/src/org/jboss/ide/eclipse/as/internal/management/as71/AS71Manager.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/src/org/jboss/ide/eclipse/as/internal/management/as71/AS71Manager.java 2011-11-30 06:34:49 UTC (rev 36763) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as71/src/org/jboss/ide/eclipse/as/internal/management/as71/AS71Manager.java 2011-11-30 06:37:04 UTC (rev 36764) @@ -67,11 +67,6 @@ private ModelControllerClient client; private ServerDeploymentManager manager; private AS7ManagementDetails details; - - @Deprecated - public AS71Manager(String host) throws UnknownHostException { - this(new AS7ManagementDetails(host, MGMT_PORT)); - } public AS71Manager(AS7ManagementDetails details) throws UnknownHostException { this.details = details; @@ -108,8 +103,10 @@ } String[] results = details.handleCallbacks(new String[] { name.getPrompt(), pass.getPrompt()}); - name.setName(results[0]); - pass.setPassword(results[1].toCharArray()); + if( results != null && results.length >= 2 ) { + name.setName(results[0]); + pass.setPassword(results[1].toCharArray()); + } } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2011-11-30 06:34:49 UTC (rev 36763) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2011-11-30 06:37:04 UTC (rev 36764) @@ -56,7 +56,7 @@ sswf_Title=Create a new Local Deployer Server sswf_BaseName=Local Deployer -credentials_warning=Your server is responding to JMX inquiries with a Security Exception.\nYou can try entering new credentials below, or you can double-click\non your server and verify that the host, JNDI port, username, and password are accurate.\nYou can also click "ignore" below to begin working with your server,\nbut deploying to and stopping the server may not function properly. +credentials_warning=Your server is responding to management inquiries with a Security Exception.\nYou can enter new credentials below, or you can double-click on your server\nand verify that the host, relevant ports, username, and password are accurate.\nYou can also click "ignore" below to begin working with your server,\nbut deploying to, and stopping, the server may not function properly. credentials_save=Save these credentials? #Server View (server and categories, properties) Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/JBossManagerTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/JBossManagerTest.java 2011-11-30 06:34:49 UTC (rev 36763) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/JBossManagerTest.java 2011-11-30 06:37:04 UTC (rev 36764) @@ -61,7 +61,7 @@ managerProxy.open(); IJBoss7ManagerService manager = managerProxy.getService(); assertNotNull(manager); - manager.getDeploymentState(new AS7ManagementDetails("fake", 4242), "fake"); + manager.getDeploymentState(new MockAS7ManagementDetails("fake", 4242), "fake"); } private void registerFakeASService(String version) { @@ -115,4 +115,24 @@ public void init() throws Exception { } } + + public static class MockAS7ManagementDetails extends AS7ManagementDetails { + private String host; + private int port; + public MockAS7ManagementDetails(String host, int port) { + super(null); + this.host = host; + this.port = port; + } + public String getHost() { + return host; + } + + public int getManagementPort() { + return port; + } + public String[] handleCallbacks(String[] prompts) throws UnsupportedOperationException { + return new String[]{}; + } + } }

12 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r36763 - trunk/as/docs/reference/en-US.

by jbosstools-commits＠lists.jboss.org

Author: irooskov(a)redhat.com Date: 2011-11-30 01:34:49 -0500 (Wed, 30 Nov 2011) New Revision: 36763 Modified: trunk/as/docs/reference/en-US/runtimes_servers.xml Log: updated to correct build errors Modified: trunk/as/docs/reference/en-US/runtimes_servers.xml =================================================================== --- trunk/as/docs/reference/en-US/runtimes_servers.xml 2011-11-30 06:32:28 UTC (rev 36762) +++ trunk/as/docs/reference/en-US/runtimes_servers.xml 2011-11-30 06:34:49 UTC (rev 36763) @@ -237,7 +237,7 @@ </para> </important> <para> - Clicking on the <guibutton>Download</guibutton> button will display a new screen of available runtimes that can be downloaded. Highlight the server you wish to download and install, and click the <guibutton>OK</guibuton> button. + Clicking on the <guibutton>Download</guibutton> button will display a new screen of available runtimes that can be downloaded. Highlight the server you wish to download and install, and click the <guibutton>OK</guibutton> button. </para> <figure> <title>JBoss Runtime search results</title> @@ -248,7 +248,7 @@ </mediaobject> </figure> <para> - A new dialog will appear asking you to specify an <guilabel>Install folder</guilabel> and <guilabel>Download folder</guilabel>; the option to <guilabel>Delete archive after installing</guilabel> is checked by default. Once you have specified the two paths above, click the <guibuton>OK</guibutton> button and the server will begin downloading. + A new dialog will appear asking you to specify an <guilabel>Install folder</guilabel> and <guilabel>Download folder</guilabel>; the option to <guilabel>Delete archive after installing</guilabel> is checked by default. Once you have specified the two paths above, click the <guibutton>OK</guibutton> button and the server will begin downloading. </para> <figure> <title>JBoss Runtime search results</title>

12 years, 4 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits November 2011