May 2012 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r41152 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.

by jbosstools-commits＠lists.jboss.org

Author: xcoulon Date: 2012-05-18 09:35:37 -0400 (Fri, 18 May 2012) New Revision: 41152 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationSelectionDialog.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java Log: Fixed - JBIDE-11221 wizards: Order cartridges and application types alphabetically Applied Daniel's patch Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-05-18 13:21:32 UTC (rev 41151) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-05-18 13:35:37 UTC (rev 41152) @@ -12,6 +12,7 @@ import java.lang.reflect.InvocationTargetException; import java.net.SocketTimeoutException; +import java.util.Arrays; import java.util.Collection; import org.eclipse.core.databinding.DataBindingContext; @@ -54,7 +55,9 @@ import org.eclipse.jface.viewers.IElementComparer; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.TableViewerColumn; +import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerCell; +import org.eclipse.jface.viewers.ViewerSorter; import org.eclipse.jface.wizard.IWizard; import org.eclipse.jface.wizard.IWizardContainer; import org.eclipse.jface.wizard.WizardDialog; @@ -109,6 +112,7 @@ private Group newAppEmbeddableCartridgesGroup; private Button checkAllButton; private Button uncheckAllButton; + //private ModifyListener modifyListener; public ApplicationConfigurationWizardPage(IWizard wizard, OpenShiftExpressApplicationWizardModel wizardModel) { super("Setup OpenShift Application", @@ -244,7 +248,6 @@ .grab(true, true).align(SWT.FILL, SWT.FILL).applyTo(newAppConfigurationGroup); IObservableValue useExistingApplication = WidgetProperties.selection().observe(useExistingAppBtn); - useExistingApplication.addValueChangeListener( onUseExistingApplication( newAppConfigurationGroup, existingAppNameText, browseAppsButton)); @@ -279,7 +282,7 @@ .to(selectedCartridgeModelObservable) .converting(new CartridgeToStringConverter()) .in(dbc); - + final ISWTObservableValue useExistingAppBtnSelection = WidgetProperties.selection().observe(useExistingAppBtn); final NewApplicationNameValidator newApplicationNameValidator = new NewApplicationNameValidator(useExistingAppBtnSelection, applicationNameTextObservable); @@ -430,6 +433,16 @@ TableColumnLayout tableLayout = new TableColumnLayout(); tableContainer.setLayout(tableLayout); CheckboxTableViewer viewer = new CheckboxTableViewer(table); + viewer.setSorter(new ViewerSorter(){ + @Override + public int compare(Viewer viewer, Object e1, Object e2) { + if(e1 instanceof IEmbeddableCartridge && e2 instanceof IEmbeddableCartridge){ + return ((IEmbeddableCartridge)e1).getName().compareTo(((IEmbeddableCartridge)e2).getName()); + } + return super.compare(viewer, e1, e2); + } + }); + viewer.setComparer(new EqualityComparer()); viewer.setContentProvider(new ArrayContentProvider()); createTableColumn("Embeddable Cartridge", 1, new CellLabelProvider() { @@ -627,6 +640,10 @@ // reacting to model changes while wizard runnable is // run. We force another update dbc.updateModels(); + // sort + String[] items = newAppCartridgeCombo.getItems(); + Arrays.sort(items); + newAppCartridgeCombo.setItems(items); } }); } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationSelectionDialog.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationSelectionDialog.java 2012-05-18 13:21:32 UTC (rev 41151) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationSelectionDialog.java 2012-05-18 13:35:37 UTC (rev 41152) @@ -37,6 +37,7 @@ import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.TableViewerColumn; +import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerCell; import org.eclipse.jface.viewers.ViewerSorter; import org.eclipse.jface.wizard.IWizard; @@ -136,7 +137,18 @@ } } }), null); + + tableViewer.setSorter(new ViewerSorter(){ + @Override + public int compare(Viewer viewer, Object e1, Object e2) { + if(e1 instanceof IApplication && e2 instanceof IApplication){ + return ((IApplication)e1).getName().compareTo(((IApplication)e2).getName()); + } + return super.compare(viewer, e1, e2); + } + + }); /*Button refreshButton = new Button(dialogArea, SWT.PUSH); refreshButton.setText("R&efresh"); GridDataFactory.fillDefaults().align(SWT.RIGHT, SWT.TOP).grab(false, false).hint(80, SWT.DEFAULT) Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java 2012-05-18 13:21:32 UTC (rev 41151) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java 2012-05-18 13:35:37 UTC (rev 41152) @@ -35,7 +35,9 @@ import org.eclipse.jface.viewers.IElementComparer; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.TableViewerColumn; +import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerCell; +import org.eclipse.jface.viewers.ViewerSorter; import org.eclipse.jface.wizard.IWizard; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; @@ -110,7 +112,19 @@ CheckboxTableViewer viewer = new CheckboxTableViewer(table); viewer.setComparer(new EqualityComparer()); viewer.setContentProvider(new ArrayContentProvider()); + + viewer.setSorter(new ViewerSorter(){ + @Override + public int compare(Viewer viewer, Object e1, Object e2) { + if(e1 instanceof IEmbeddableCartridge && e2 instanceof IEmbeddableCartridge){ + return ((IEmbeddableCartridge)e1).getName().compareTo(((IEmbeddableCartridge)e2).getName()); + } + return super.compare(viewer, e1, e2); + } + + }); + createTableColumn("Embeddable Cartridge", 1, new CellLabelProvider() { @Override

12 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r41151 - in trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes: ui/wizards and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: bbrodt Date: 2012-05-18 09:21:32 -0400 (Fri, 18 May 2012) New Revision: 41151 Modified: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/JBTBPELPublisher.java trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/wizards/NewBPELProjectWizardPage1.java Log: https://issues.jboss.org/browse/JBIDE-9789 - for autopublish to work, incremental must be treated like full publish. Modified: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/JBTBPELPublisher.java =================================================================== --- trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/JBTBPELPublisher.java 2012-05-18 13:14:09 UTC (rev 41150) +++ trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/JBTBPELPublisher.java 2012-05-18 13:21:32 UTC (rev 41151) @@ -99,8 +99,9 @@ status = publish(module, delta, publishType, monitor); publishState = IServer.PUBLISH_STATE_NONE; } else if( publishType == INCREMENTAL_PUBLISH ) { - // Do nothing. This is intentional - publishState = IServer.PUBLISH_STATE_INCREMENTAL; + // Incremental is treated like Full Publish + status = publish(module, delta, publishType, monitor); + publishState = IServer.PUBLISH_STATE_NONE; } // https://issues.jboss.org/browse/JBDS-1573 // hack: display a warning dialog. Modified: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/wizards/NewBPELProjectWizardPage1.java =================================================================== --- trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/wizards/NewBPELProjectWizardPage1.java 2012-05-18 13:14:09 UTC (rev 41150) +++ trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/wizards/NewBPELProjectWizardPage1.java 2012-05-18 13:21:32 UTC (rev 41151) @@ -16,6 +16,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.PlatformUI; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; +import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; import org.eclipse.wst.web.ui.internal.wizards.DataModelFacetCreationWizardPage; import org.jboss.tools.bpel.runtimes.IBPELModuleFacetConstants; import org.jboss.tools.bpel.runtimes.IRuntimesUIConstants; @@ -52,6 +53,7 @@ createProjectGroup(top); createServerTargetComposite(top); // createPrimaryFacetComposite(top); + primaryProjectFacet = ProjectFacetsManager.getProjectFacet( getModuleFacetID() ); createPresetPanel(top); return top; }

12 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r41150 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action.

by jbosstools-commits＠lists.jboss.org

Author: xcoulon Date: 2012-05-18 09:14:09 -0400 (Fri, 18 May 2012) New Revision: 41150 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateApplicationAction.java Log: Fixed - JBIDE-11890 OpenShift Explorer: NPE when launching "New OpenShift Application" Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateApplicationAction.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateApplicationAction.java 2012-05-18 12:52:10 UTC (rev 41149) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateApplicationAction.java 2012-05-18 13:14:09 UTC (rev 41150) @@ -12,9 +12,12 @@ import java.net.SocketTimeoutException; +import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ITreeSelection; +import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.navigator.CommonViewer; import org.jboss.tools.openshift.express.internal.core.console.UserDelegate; import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; @@ -22,6 +25,7 @@ import org.jboss.tools.openshift.express.internal.ui.wizard.NewOpenShiftExpressApplicationWizard; import org.jboss.tools.openshift.express.internal.ui.wizard.OpenShiftExpressApplicationWizard; +import com.openshift.client.IDomain; import com.openshift.client.OpenShiftException; /** @@ -53,18 +57,29 @@ } } - /* - * (non-Javadoc) - * @see org.eclipse.jface.action.Action#isEnabled() + @Override + public void selectionChanged(SelectionChangedEvent event) { + super.selectionChanged(event); + enableWhenDomainExists(); + } + + @Override + public void setSelection(ISelection selection) { + super.setSelection(selection); + enableWhenDomainExists(); + } + + /** + * Enables the current action if the selected User has a default domain. Otherwise, the action is disabled. */ - @Override - public boolean isEnabled() { + private void enableWhenDomainExists() { if (selection != null && selection instanceof ITreeSelection) { Object sel = ((ITreeSelection) selection).getFirstElement(); if (sel instanceof UserDelegate) { UserDelegate user = (UserDelegate) sel; try { - return user.getDefaultDomain() != null; + final IDomain defaultDomain = user.getDefaultDomain(); + setEnabled(defaultDomain != null); } catch (SocketTimeoutException e) { Logger.error("Failed to check if selected user has a domain", e); } catch (OpenShiftException e) { @@ -72,7 +87,7 @@ } } } - return false; } + }

12 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r41149 - in trunk/requirements: jbossesb-4.11 and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: ldimaggio Date: 2012-05-18 08:52:10 -0400 (Fri, 18 May 2012) New Revision: 41149 Added: trunk/requirements/jbossesb-4.11/ trunk/requirements/jbossesb-4.11/build.properties Log: Added requirements/jbossesb-4.11 Added: trunk/requirements/jbossesb-4.11/build.properties =================================================================== --- trunk/requirements/jbossesb-4.11/build.properties (rev 0) +++ trunk/requirements/jbossesb-4.11/build.properties 2012-05-18 12:52:10 UTC (rev 41149) @@ -0,0 +1,5 @@ +jbossesb411.build.uri=http://download.jboss.org/jbossesb/4.11/binary +build.uri=${jbossesb411.build.uri} +build.archive.root=jbossesb-4.11 +build.archive=${build.archive.root}.zip +md5=506bb7f42777cf0e524ccc37336aa137

12 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r41148 - in trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test: resources/template and 4 other directories.

by jbosstools-commits＠lists.jboss.org

Author: ljelinko Date: 2012-05-18 07:42:57 -0400 (Fri, 18 May 2012) New Revision: 41148 Added: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/seam/ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/seam/seam22/ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/seam/seam22/DetectSeam22.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/seam/seam23/ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/seam/seam23/DetectSeam23.java Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/launchers/prepare_workspace/RT_prepare_workspace.launch trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/resources/template/runtimes.properties trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/AllTestsSuite.java Log: Added Seam 2.2 and 2.3 detection test Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/launchers/prepare_workspace/RT_prepare_workspace.launch =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/launchers/prepare_workspace/RT_prepare_workspace.launch 2012-05-18 11:30:59 UTC (rev 41147) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/launchers/prepare_workspace/RT_prepare_workspace.launch 2012-05-18 11:42:57 UTC (rev 41148) @@ -15,6 +15,8 @@ <listEntry value="jboss-ewp-5=${folder_prompt:EWP 5 installation folder}"/> <listEntry value="jboss-soa-p-5=${folder_prompt:SOA-P 5 installation folder}"/> <listEntry value="jboss-soa-p-standalone-5=${folder_prompt:SOA-P-STANDALONE 5 installation folder}"/> +<listEntry value="jboss-seam-2.2=${folder_prompt:Seam 2.2 installation folder}"/> +<listEntry value="jboss-seam-2.3=${folder_prompt:Seam 2.3 installation folder}"/> </listAttribute> <stringAttribute key="M2_RUNTIME" value="/home/ljelinko/programs/apache-maven-3.0.3"/> <booleanAttribute key="M2_SKIP_TESTS" value="false"/> Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/resources/template/runtimes.properties =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/resources/template/runtimes.properties 2012-05-18 11:30:59 UTC (rev 41147) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/resources/template/runtimes.properties 2012-05-18 11:42:57 UTC (rev 41148) @@ -6,4 +6,6 @@ jboss-epp-4.3=${jboss-epp-4} jboss-ewp-5.1=${jboss-ewp-5} jboss-soa-p-5=${jboss-soa-p-5} -jboss-soa-p-standalone-5=${jboss-soa-p-standalone-5} \ No newline at end of file +jboss-soa-p-standalone-5=${jboss-soa-p-standalone-5} +jboss-seam-2.2.2.Final=${jboss-seam-2.2} +jboss-seam-2.3.0.Beta1=${jboss-seam-2.3} \ No newline at end of file Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/AllTestsSuite.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/AllTestsSuite.java 2012-05-18 11:30:59 UTC (rev 41147) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/AllTestsSuite.java 2012-05-18 11:42:57 UTC (rev 41148) @@ -1,5 +1,7 @@ package org.jboss.tools.runtime.as.ui.bot.test; +import org.jboss.tools.runtime.as.ui.bot.test.seam.seam22.DetectSeam22; +import org.jboss.tools.runtime.as.ui.bot.test.seam.seam23.DetectSeam23; import org.jboss.tools.runtime.as.ui.bot.test.server.eap4.DetectEAP4; import org.jboss.tools.runtime.as.ui.bot.test.server.eap4.OperateEAP4; import org.jboss.tools.runtime.as.ui.bot.test.server.eap5.DetectEAP5; @@ -41,7 +43,9 @@ DetectSOAP5.class, OperateSOAP5.class, DetectSOAPStandalone5.class, - OperateSOAPStandalone5.class + OperateSOAPStandalone5.class, + DetectSeam22.class, + DetectSeam23.class }) public class AllTestsSuite { Added: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/seam/seam22/DetectSeam22.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/seam/seam22/DetectSeam22.java (rev 0) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/seam/seam22/DetectSeam22.java 2012-05-18 11:42:57 UTC (rev 41148) @@ -0,0 +1,25 @@ +package org.jboss.tools.runtime.as.ui.bot.test.seam.seam22; + +import org.jboss.tools.runtime.as.ui.bot.test.RuntimeProperties; +import org.jboss.tools.runtime.as.ui.bot.test.entity.Runtime; +import org.jboss.tools.runtime.as.ui.bot.test.template.DetectRuntimeTemplate; + +public class DetectSeam22 extends DetectRuntimeTemplate { + + public static final String SEAM_ID = "jboss-seam-2.2.2.Final"; + + @Override + protected String getRuntimeID() { + return SEAM_ID; + } + + @Override + protected Runtime getExpectedRuntime() { + Runtime server = new Runtime(); + server.setName(getRuntimeID()); + server.setType("SEAM"); + server.setVersion("2.2.2.Final"); + server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getRuntimeID())); + return server; + } +} Added: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/seam/seam23/DetectSeam23.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/seam/seam23/DetectSeam23.java (rev 0) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/seam/seam23/DetectSeam23.java 2012-05-18 11:42:57 UTC (rev 41148) @@ -0,0 +1,25 @@ +package org.jboss.tools.runtime.as.ui.bot.test.seam.seam23; + +import org.jboss.tools.runtime.as.ui.bot.test.RuntimeProperties; +import org.jboss.tools.runtime.as.ui.bot.test.entity.Runtime; +import org.jboss.tools.runtime.as.ui.bot.test.template.DetectRuntimeTemplate; + +public class DetectSeam23 extends DetectRuntimeTemplate { + + public static final String SEAM_ID = "jboss-seam-2.3.0.Beta1"; + + @Override + protected String getRuntimeID() { + return SEAM_ID; + } + + @Override + protected Runtime getExpectedRuntime() { + Runtime server = new Runtime(); + server.setName(getRuntimeID()); + server.setType("SEAM"); + server.setVersion("2.3.0.Beta1"); + server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getRuntimeID())); + return server; + } +}

12 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r41147 - trunk/documentation/whatsnew/vpe.

by jbosstools-commits＠lists.jboss.org

Author: yradtsevich Date: 2012-05-18 07:30:59 -0400 (Fri, 18 May 2012) New Revision: 41147 Modified: trunk/documentation/whatsnew/vpe/vpe-news-3.3.0.Beta3.html Log: https://issues.jboss.org/browse/TOOLSDOC-277 : New and noteworthy for VPE JBT 3.3.0. has wrong content Modified: trunk/documentation/whatsnew/vpe/vpe-news-3.3.0.Beta3.html =================================================================== --- trunk/documentation/whatsnew/vpe/vpe-news-3.3.0.Beta3.html 2012-05-18 09:35:09 UTC (rev 41146) +++ trunk/documentation/whatsnew/vpe/vpe-news-3.3.0.Beta3.html 2012-05-18 11:30:59 UTC (rev 41147) @@ -88,7 +88,7 @@ </td> <td valign="top"> - Now phones may be rotated by a right mouse click on one of the four corners. + Now phones may be rotated by a left mouse click on one of the four corners. <img src="images/3.3.0.Beta3/browsersim-rotate.png" width="376px" height="711px">

12 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r41146 - in trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-tooling: 3.3.0.Beta2 and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: dpalmer Date: 2012-05-18 05:35:09 -0400 (Fri, 18 May 2012) New Revision: 41146 Added: trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin... trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin... trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin... Log: Configured composite site for soatools Beta2 Added: trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin... =================================================================== --- trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin... (rev 0) +++ trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin... 2012-05-18 09:35:09 UTC (rev 41146) @@ -0,0 +1,28 @@ +<?xml version='1.0' encoding='UTF-8'?> +<?compositeArtifactRepository version='1.0.0'?> +<repository name='JBoss Tools - SOA Tooling - Staging Repository' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'> +<properties size='2'> +<property name='p2.compressed' value='true'/> + +<property name='p2.timestamp' value='1331922270000'/> +</properties> +<children size='10'> + + + +<child location='../../../../staging/soatools-3.3.0_Beta2.component--bpel/all/repo/'/> +<child location='../../../../staging/soatools-3.3.0_Beta2.component--droolsjbpm/all/repo/'/> +<child location='../../../../staging/soatools-3.3.0_Beta2.component--esb/all/repo/'/> +<child location='../../../../staging/soatools-3.3.0_Beta2.component--flow/all/repo/'/> +<child location='../../../../staging/soatools-3.3.0_Beta2.component--jbpm/all/repo/'/> +<child location='../../../../staging/soatools-3.3.0_Beta2.component--modeshape/all/repo/'/> +<child location='../../../../staging/soatools-3.3.0_Beta2.component--runtime-soa/all/repo/'/> +<child location='../../../../staging/soatools-3.3.0_Beta2.component--teiid-designer/all/repo/'/> +<child location='http://download.jboss.org/savara/releases/updates/2.0.x/' /> +<child location='../../../../staging/SwitchYard-Tools/eclipse/'/> + +</children> +</repository> Added: trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin... =================================================================== --- trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin... (rev 0) +++ trunk/download.jboss.org/jbosstools/builds/staging/_composite_/soa-toolin... 2012-05-18 09:35:09 UTC (rev 41146) @@ -0,0 +1,28 @@ +<?xml version='1.0' encoding='UTF-8'?> +<?compositeMetadataRepository version='1.0.0'?> +<repository name='JBoss Tools - SOA Tooling - Staging Repository' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'> +<properties size='2'> +<property name='p2.compressed' value='true'/> + +<property name='p2.timestamp' value='1331922270000'/> +</properties> +<children size='10'> + + + +<child location='../../../../staging/soatools-3.3.0_Beta2.component--bpel/all/repo/'/> +<child location='../../../../staging/soatools-3.3.0_Beta2.component--droolsjbpm/all/repo/'/> +<child location='../../../../staging/soatools-3.3.0_Beta2.component--esb/all/repo/'/> +<child location='../../../../staging/soatools-3.3.0_Beta2.component--flow/all/repo/'/> +<child location='../../../../staging/soatools-3.3.0_Beta2.component--jbpm/all/repo/'/> +<child location='../../../../staging/soatools-3.3.0_Beta2.component--modeshape/all/repo/'/> +<child location='../../../../staging/soatools-3.3.0_Beta2.component--runtime-soa/all/repo/'/> +<child location='../../../../staging/soatools-3.3.0_Beta2.component--teiid-designer/all/repo/'/> +<child location='http://download.jboss.org/savara/releases/updates/2.0.x/' /> +<child location='../../../../staging/SwitchYard-Tools/eclipse/'/> + +</children> +</repository>

12 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r41145 - in trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test: entity and 11 other directories.

by jbosstools-commits＠lists.jboss.org

Author: ljelinko Date: 2012-05-18 05:32:48 -0400 (Fri, 18 May 2012) New Revision: 41145 Added: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/entity/Runtime.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/matcher/RuntimeMatcher.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/template/DetectRuntimeTemplate.java Removed: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/entity/Server.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/matcher/ServerMatcher.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/template/DetectServerTemplate.java Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/SearchingForRuntimesDialog.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap4/DetectEAP4.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap5/DetectEAP5.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap6/DetectEAP6.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/epp4/DetectEPP4.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/epp5/DetectEPP5.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/ewp5/DetectEWP5.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/jboss7/DetectJBoss7.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/soap5/DetectSOAP5.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/soap5/standalone/DetectSOAPStandalone5.java Log: Renamed *Server* to *Runtime* Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/SearchingForRuntimesDialog.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/SearchingForRuntimesDialog.java 2012-05-18 09:01:04 UTC (rev 41144) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/dialog/preferences/SearchingForRuntimesDialog.java 2012-05-18 09:32:48 UTC (rev 41145) @@ -7,30 +7,28 @@ import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; import org.eclipse.swtbot.swt.finder.waits.ICondition; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; -import org.jboss.tools.runtime.as.ui.bot.test.entity.Server; +import org.jboss.tools.runtime.as.ui.bot.test.entity.Runtime; import org.jboss.tools.ui.bot.ext.SWTBotFactory; import org.jboss.tools.ui.bot.ext.condition.TaskDuration; -import org.jboss.tools.ui.bot.ext.logging.WidgetsLogger; public class SearchingForRuntimesDialog { - public List<Server> getServers(){ - List<Server> servers = new ArrayList<Server>(); + public List<Runtime> getRuntimes(){ + List<Runtime> runtimes = new ArrayList<Runtime>(); - WidgetsLogger.log(); SWTBot bot = SWTBotFactory.getBot().shell("Searching for runtimes...").bot(); bot.waitUntil(new RuntimeSearchedFinished(bot), TaskDuration.LONG.getTimeout()); SWTBotTree tree = bot.tree(); for (int i = 0; i < tree.rowCount(); i++){ - Server server = new Server(); - server.setName(tree.cell(i, 0)); - server.setVersion(tree.cell(i, 1)); - server.setType(tree.cell(i, 2)); - server.setLocation(tree.cell(i, 3)); - servers.add(server); + Runtime runtime = new Runtime(); + runtime.setName(tree.cell(i, 0)); + runtime.setVersion(tree.cell(i, 1)); + runtime.setType(tree.cell(i, 2)); + runtime.setLocation(tree.cell(i, 3)); + runtimes.add(runtime); } - return servers; + return runtimes; } public void ok(){ Copied: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/entity/Runtime.java (from rev 40326, trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/entity/Server.java) =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/entity/Runtime.java (rev 0) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/entity/Runtime.java 2012-05-18 09:32:48 UTC (rev 41145) @@ -0,0 +1,94 @@ +package org.jboss.tools.runtime.as.ui.bot.test.entity; + +public class Runtime { + + private String name; + + private String version; + + private String type; + + private String location; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getLocation() { + return location; + } + + public void setLocation(String location) { + this.location = location; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + + ((location == null) ? 0 : location.hashCode()); + result = prime * result + ((name == null) ? 0 : name.hashCode()); + result = prime * result + ((type == null) ? 0 : type.hashCode()); + result = prime * result + ((version == null) ? 0 : version.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + Runtime other = (Runtime) obj; + if (location == null) { + if (other.location != null) + return false; + } else if (!location.equals(other.location)) + return false; + if (name == null) { + if (other.name != null) + return false; + } else if (!name.equals(other.name)) + return false; + if (type == null) { + if (other.type != null) + return false; + } else if (!type.equals(other.type)) + return false; + if (version == null) { + if (other.version != null) + return false; + } else if (!version.equals(other.version)) + return false; + return true; + } + + @Override + public String toString() { + return "Runtime [name=" + name + ", version=" + version + ", type=" + + type + ", location=" + location + "]"; + } +} \ No newline at end of file Deleted: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/entity/Server.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/entity/Server.java 2012-05-18 09:01:04 UTC (rev 41144) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/entity/Server.java 2012-05-18 09:32:48 UTC (rev 41145) @@ -1,94 +0,0 @@ -package org.jboss.tools.runtime.as.ui.bot.test.entity; - -public class Server { - - String name; - - String version; - - String type; - - String location; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getVersion() { - return version; - } - - public void setVersion(String version) { - this.version = version; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getLocation() { - return location; - } - - public void setLocation(String location) { - this.location = location; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result - + ((location == null) ? 0 : location.hashCode()); - result = prime * result + ((name == null) ? 0 : name.hashCode()); - result = prime * result + ((type == null) ? 0 : type.hashCode()); - result = prime * result + ((version == null) ? 0 : version.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - Server other = (Server) obj; - if (location == null) { - if (other.location != null) - return false; - } else if (!location.equals(other.location)) - return false; - if (name == null) { - if (other.name != null) - return false; - } else if (!name.equals(other.name)) - return false; - if (type == null) { - if (other.type != null) - return false; - } else if (!type.equals(other.type)) - return false; - if (version == null) { - if (other.version != null) - return false; - } else if (!version.equals(other.version)) - return false; - return true; - } - - @Override - public String toString() { - return "Server [name=" + name + ", version=" + version + ", type=" - + type + ", location=" + location + "]"; - } -} \ No newline at end of file Copied: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/matcher/RuntimeMatcher.java (from rev 40326, trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/matcher/ServerMatcher.java) =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/matcher/RuntimeMatcher.java (rev 0) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/matcher/RuntimeMatcher.java 2012-05-18 09:32:48 UTC (rev 41145) @@ -0,0 +1,24 @@ +package org.jboss.tools.runtime.as.ui.bot.test.matcher; + +import org.hamcrest.Description; +import org.hamcrest.TypeSafeMatcher; +import org.jboss.tools.runtime.as.ui.bot.test.entity.Runtime; + +public class RuntimeMatcher extends TypeSafeMatcher<Runtime>{ + + private Runtime expected; + + public RuntimeMatcher(Runtime expected) { + this.expected = expected; + } + + @Override + public boolean matchesSafely(Runtime item) { + return expected.equals(item); + } + + @Override + public void describeTo(Description description) { + description.appendValue(expected); + } +} Deleted: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/matcher/ServerMatcher.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/matcher/ServerMatcher.java 2012-05-18 09:01:04 UTC (rev 41144) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/matcher/ServerMatcher.java 2012-05-18 09:32:48 UTC (rev 41145) @@ -1,24 +0,0 @@ -package org.jboss.tools.runtime.as.ui.bot.test.matcher; - -import org.hamcrest.Description; -import org.hamcrest.TypeSafeMatcher; -import org.jboss.tools.runtime.as.ui.bot.test.entity.Server; - -public class ServerMatcher extends TypeSafeMatcher<Server>{ - - private Server expected; - - public ServerMatcher(Server expected) { - this.expected = expected; - } - - @Override - public boolean matchesSafely(Server item) { - return expected.equals(item); - } - - @Override - public void describeTo(Description description) { - description.appendValue(expected); - } -} Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap4/DetectEAP4.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap4/DetectEAP4.java 2012-05-18 09:01:04 UTC (rev 41144) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap4/DetectEAP4.java 2012-05-18 09:32:48 UTC (rev 41145) @@ -1,25 +1,25 @@ package org.jboss.tools.runtime.as.ui.bot.test.server.eap4; import org.jboss.tools.runtime.as.ui.bot.test.RuntimeProperties; -import org.jboss.tools.runtime.as.ui.bot.test.entity.Server; -import org.jboss.tools.runtime.as.ui.bot.test.template.DetectServerTemplate; +import org.jboss.tools.runtime.as.ui.bot.test.entity.Runtime; +import org.jboss.tools.runtime.as.ui.bot.test.template.DetectRuntimeTemplate; -public class DetectEAP4 extends DetectServerTemplate { +public class DetectEAP4 extends DetectRuntimeTemplate { public static final String SERVER_ID = "jboss-eap-4.3"; @Override - protected String getServerID() { + protected String getRuntimeID() { return SERVER_ID; } @Override - protected Server getExpectedServer() { - Server server = new Server(); - server.setName(getServerID()); + protected Runtime getExpectedRuntime() { + Runtime server = new Runtime(); + server.setName(getRuntimeID()); server.setType("EAP"); server.setVersion("4.3"); - server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getServerID())); + server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getRuntimeID())); return server; } } Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap5/DetectEAP5.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap5/DetectEAP5.java 2012-05-18 09:01:04 UTC (rev 41144) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap5/DetectEAP5.java 2012-05-18 09:32:48 UTC (rev 41145) @@ -1,25 +1,25 @@ package org.jboss.tools.runtime.as.ui.bot.test.server.eap5; import org.jboss.tools.runtime.as.ui.bot.test.RuntimeProperties; -import org.jboss.tools.runtime.as.ui.bot.test.entity.Server; -import org.jboss.tools.runtime.as.ui.bot.test.template.DetectServerTemplate; +import org.jboss.tools.runtime.as.ui.bot.test.entity.Runtime; +import org.jboss.tools.runtime.as.ui.bot.test.template.DetectRuntimeTemplate; -public class DetectEAP5 extends DetectServerTemplate { +public class DetectEAP5 extends DetectRuntimeTemplate { public static final String SERVER_ID = "jboss-eap-5.1"; @Override - protected String getServerID() { + protected String getRuntimeID() { return SERVER_ID; } @Override - protected Server getExpectedServer() { - Server server = new Server(); - server.setName(getServerID()); + protected Runtime getExpectedRuntime() { + Runtime server = new Runtime(); + server.setName(getRuntimeID()); server.setType("EAP"); server.setVersion("5.1"); - server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getServerID())); + server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getRuntimeID())); return server; } } Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap6/DetectEAP6.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap6/DetectEAP6.java 2012-05-18 09:01:04 UTC (rev 41144) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap6/DetectEAP6.java 2012-05-18 09:32:48 UTC (rev 41145) @@ -1,25 +1,25 @@ package org.jboss.tools.runtime.as.ui.bot.test.server.eap6; import org.jboss.tools.runtime.as.ui.bot.test.RuntimeProperties; -import org.jboss.tools.runtime.as.ui.bot.test.entity.Server; -import org.jboss.tools.runtime.as.ui.bot.test.template.DetectServerTemplate; +import org.jboss.tools.runtime.as.ui.bot.test.entity.Runtime; +import org.jboss.tools.runtime.as.ui.bot.test.template.DetectRuntimeTemplate; -public class DetectEAP6 extends DetectServerTemplate { +public class DetectEAP6 extends DetectRuntimeTemplate { public static final String SERVER_ID = "jboss-eap-6.0"; @Override - protected String getServerID() { + protected String getRuntimeID() { return SERVER_ID; } @Override - protected Server getExpectedServer() { - Server server = new Server(); - server.setName(getServerID()); + protected Runtime getExpectedRuntime() { + Runtime server = new Runtime(); + server.setName(getRuntimeID()); server.setType("EAP"); server.setVersion("6.0"); - server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getServerID())); + server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getRuntimeID())); return server; } } Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/epp4/DetectEPP4.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/epp4/DetectEPP4.java 2012-05-18 09:01:04 UTC (rev 41144) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/epp4/DetectEPP4.java 2012-05-18 09:32:48 UTC (rev 41145) @@ -1,25 +1,25 @@ package org.jboss.tools.runtime.as.ui.bot.test.server.epp4; import org.jboss.tools.runtime.as.ui.bot.test.RuntimeProperties; -import org.jboss.tools.runtime.as.ui.bot.test.entity.Server; -import org.jboss.tools.runtime.as.ui.bot.test.template.DetectServerTemplate; +import org.jboss.tools.runtime.as.ui.bot.test.entity.Runtime; +import org.jboss.tools.runtime.as.ui.bot.test.template.DetectRuntimeTemplate; -public class DetectEPP4 extends DetectServerTemplate { +public class DetectEPP4 extends DetectRuntimeTemplate { public static final String SERVER_ID = "jboss-epp-4.3"; @Override - protected String getServerID() { + protected String getRuntimeID() { return SERVER_ID; } @Override - protected Server getExpectedServer() { - Server server = new Server(); - server.setName(getServerID()); + protected Runtime getExpectedRuntime() { + Runtime server = new Runtime(); + server.setName(getRuntimeID()); server.setType("EPP"); server.setVersion("4.3"); - server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getServerID())); + server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getRuntimeID())); return server; } } Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/epp5/DetectEPP5.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/epp5/DetectEPP5.java 2012-05-18 09:01:04 UTC (rev 41144) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/epp5/DetectEPP5.java 2012-05-18 09:32:48 UTC (rev 41145) @@ -1,25 +1,25 @@ package org.jboss.tools.runtime.as.ui.bot.test.server.epp5; import org.jboss.tools.runtime.as.ui.bot.test.RuntimeProperties; -import org.jboss.tools.runtime.as.ui.bot.test.entity.Server; -import org.jboss.tools.runtime.as.ui.bot.test.template.DetectServerTemplate; +import org.jboss.tools.runtime.as.ui.bot.test.entity.Runtime; +import org.jboss.tools.runtime.as.ui.bot.test.template.DetectRuntimeTemplate; -public class DetectEPP5 extends DetectServerTemplate { +public class DetectEPP5 extends DetectRuntimeTemplate { public static final String SERVER_ID = "jboss-epp-5.2"; @Override - protected String getServerID() { + protected String getRuntimeID() { return SERVER_ID; } @Override - protected Server getExpectedServer() { - Server server = new Server(); - server.setName(getServerID()); + protected Runtime getExpectedRuntime() { + Runtime server = new Runtime(); + server.setName(getRuntimeID()); server.setType("EPP"); server.setVersion("5.2"); - server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getServerID())); + server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getRuntimeID())); return server; } } Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/ewp5/DetectEWP5.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/ewp5/DetectEWP5.java 2012-05-18 09:01:04 UTC (rev 41144) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/ewp5/DetectEWP5.java 2012-05-18 09:32:48 UTC (rev 41145) @@ -1,25 +1,25 @@ package org.jboss.tools.runtime.as.ui.bot.test.server.ewp5; import org.jboss.tools.runtime.as.ui.bot.test.RuntimeProperties; -import org.jboss.tools.runtime.as.ui.bot.test.entity.Server; -import org.jboss.tools.runtime.as.ui.bot.test.template.DetectServerTemplate; +import org.jboss.tools.runtime.as.ui.bot.test.entity.Runtime; +import org.jboss.tools.runtime.as.ui.bot.test.template.DetectRuntimeTemplate; -public class DetectEWP5 extends DetectServerTemplate { +public class DetectEWP5 extends DetectRuntimeTemplate { public static final String SERVER_ID = "jboss-ewp-5.1"; @Override - protected String getServerID() { + protected String getRuntimeID() { return SERVER_ID; } @Override - protected Server getExpectedServer() { - Server server = new Server(); - server.setName(getServerID()); + protected Runtime getExpectedRuntime() { + Runtime server = new Runtime(); + server.setName(getRuntimeID()); server.setType("EWP"); server.setVersion("5.1"); - server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getServerID())); + server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getRuntimeID())); return server; } } Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/jboss7/DetectJBoss7.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/jboss7/DetectJBoss7.java 2012-05-18 09:01:04 UTC (rev 41144) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/jboss7/DetectJBoss7.java 2012-05-18 09:32:48 UTC (rev 41145) @@ -1,21 +1,21 @@ package org.jboss.tools.runtime.as.ui.bot.test.server.jboss7; import org.jboss.tools.runtime.as.ui.bot.test.RuntimeProperties; -import org.jboss.tools.runtime.as.ui.bot.test.entity.Server; -import org.jboss.tools.runtime.as.ui.bot.test.template.DetectServerTemplate; +import org.jboss.tools.runtime.as.ui.bot.test.entity.Runtime; +import org.jboss.tools.runtime.as.ui.bot.test.template.DetectRuntimeTemplate; -public class DetectJBoss7 extends DetectServerTemplate { +public class DetectJBoss7 extends DetectRuntimeTemplate { public static final String SERVER_ID = "jboss-as-7.1.1.Final"; @Override - protected String getServerID() { + protected String getRuntimeID() { return SERVER_ID; } @Override - protected Server getExpectedServer() { - Server expectedServer = new Server(); + protected Runtime getExpectedRuntime() { + Runtime expectedServer = new Runtime(); expectedServer.setName(SERVER_ID); expectedServer.setVersion("7.1"); expectedServer.setType("AS"); Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/soap5/DetectSOAP5.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/soap5/DetectSOAP5.java 2012-05-18 09:01:04 UTC (rev 41144) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/soap5/DetectSOAP5.java 2012-05-18 09:32:48 UTC (rev 41145) @@ -1,21 +1,21 @@ package org.jboss.tools.runtime.as.ui.bot.test.server.soap5; import org.jboss.tools.runtime.as.ui.bot.test.RuntimeProperties; -import org.jboss.tools.runtime.as.ui.bot.test.entity.Server; -import org.jboss.tools.runtime.as.ui.bot.test.template.DetectServerTemplate; +import org.jboss.tools.runtime.as.ui.bot.test.entity.Runtime; +import org.jboss.tools.runtime.as.ui.bot.test.template.DetectRuntimeTemplate; -public class DetectSOAP5 extends DetectServerTemplate { +public class DetectSOAP5 extends DetectRuntimeTemplate { public static final String SERVER_ID = "jboss-soa-p-5"; @Override - protected String getServerID() { + protected String getRuntimeID() { return SERVER_ID; } @Override - protected Server getExpectedServer() { - Server expectedServer = new Server(); + protected Runtime getExpectedRuntime() { + Runtime expectedServer = new Runtime(); expectedServer.setName(SERVER_ID); expectedServer.setVersion("5.2"); expectedServer.setType("SOA-P"); Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/soap5/standalone/DetectSOAPStandalone5.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/soap5/standalone/DetectSOAPStandalone5.java 2012-05-18 09:01:04 UTC (rev 41144) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/soap5/standalone/DetectSOAPStandalone5.java 2012-05-18 09:32:48 UTC (rev 41145) @@ -1,21 +1,21 @@ package org.jboss.tools.runtime.as.ui.bot.test.server.soap5.standalone; import org.jboss.tools.runtime.as.ui.bot.test.RuntimeProperties; -import org.jboss.tools.runtime.as.ui.bot.test.entity.Server; -import org.jboss.tools.runtime.as.ui.bot.test.template.DetectServerTemplate; +import org.jboss.tools.runtime.as.ui.bot.test.entity.Runtime; +import org.jboss.tools.runtime.as.ui.bot.test.template.DetectRuntimeTemplate; -public class DetectSOAPStandalone5 extends DetectServerTemplate { +public class DetectSOAPStandalone5 extends DetectRuntimeTemplate { public static final String SERVER_ID = "jboss-soa-p-standalone-5"; @Override - protected String getServerID() { + protected String getRuntimeID() { return SERVER_ID; } @Override - protected Server getExpectedServer() { - Server expectedServer = new Server(); + protected Runtime getExpectedRuntime() { + Runtime expectedServer = new Runtime(); expectedServer.setName(SERVER_ID); expectedServer.setVersion("5.2"); expectedServer.setType("SOA-P-STD"); Copied: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/template/DetectRuntimeTemplate.java (from rev 41142, trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/template/DetectServerTemplate.java) =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/template/DetectRuntimeTemplate.java (rev 0) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/template/DetectRuntimeTemplate.java 2012-05-18 09:32:48 UTC (rev 41145) @@ -0,0 +1,49 @@ +package org.jboss.tools.runtime.as.ui.bot.test.template; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; + +import org.jboss.tools.runtime.as.ui.bot.test.RuntimeProperties; +import org.jboss.tools.runtime.as.ui.bot.test.dialog.preferences.RuntimeDetectionPreferencesDialog; +import org.jboss.tools.runtime.as.ui.bot.test.dialog.preferences.SearchingForRuntimesDialog; +import org.jboss.tools.runtime.as.ui.bot.test.entity.Runtime; +import org.jboss.tools.runtime.as.ui.bot.test.matcher.RuntimeMatcher; +import org.jboss.tools.ui.bot.ext.SWTTestExt; +import org.junit.After; +import org.junit.Test; + +/** + * Common scenario for runtime detection tests. It adds the runtime's installation + * folder to the runtime detection and checks if it is correctly recognized and created. + * + * @author Lucia Jelinkova + * + */ +public abstract class DetectRuntimeTemplate extends SWTTestExt { + + private RuntimeDetectionPreferencesDialog preferences; + + private SearchingForRuntimesDialog searchingForRuntimesDialog; + + protected abstract String getRuntimeID(); + + protected abstract Runtime getExpectedRuntime(); + + @Test + public void detectRuntime(){ + preferences = new RuntimeDetectionPreferencesDialog(); + preferences.open(); + preferences.addPath(RuntimeProperties.getInstance().getRuntimePath(getRuntimeID())); + searchingForRuntimesDialog = preferences.search(); + + assertThat(searchingForRuntimesDialog.getRuntimes().size(), is(1)); + assertThat(searchingForRuntimesDialog.getRuntimes().get(0), new RuntimeMatcher(getExpectedRuntime())); + } + + @After + public void closePreferences(){ + searchingForRuntimesDialog.ok(); + preferences.removePath(RuntimeProperties.getInstance().getRuntimePath(getRuntimeID())); + preferences.ok(); + } +} Deleted: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/template/DetectServerTemplate.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/template/DetectServerTemplate.java 2012-05-18 09:01:04 UTC (rev 41144) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/template/DetectServerTemplate.java 2012-05-18 09:32:48 UTC (rev 41145) @@ -1,49 +0,0 @@ -package org.jboss.tools.runtime.as.ui.bot.test.template; - -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.is; - -import org.jboss.tools.runtime.as.ui.bot.test.RuntimeProperties; -import org.jboss.tools.runtime.as.ui.bot.test.dialog.preferences.RuntimeDetectionPreferencesDialog; -import org.jboss.tools.runtime.as.ui.bot.test.dialog.preferences.SearchingForRuntimesDialog; -import org.jboss.tools.runtime.as.ui.bot.test.entity.Server; -import org.jboss.tools.runtime.as.ui.bot.test.matcher.ServerMatcher; -import org.jboss.tools.ui.bot.ext.SWTTestExt; -import org.junit.After; -import org.junit.Test; - -/** - * Common scenario for server detection tests. It adds the server's installation - * folder to the runtime detection and checks if it is correctly recognized and created. - * - * @author Lucia Jelinkova - * - */ -public abstract class DetectServerTemplate extends SWTTestExt { - - private RuntimeDetectionPreferencesDialog preferences; - - private SearchingForRuntimesDialog searchingForRuntimesDialog; - - protected abstract String getServerID(); - - protected abstract Server getExpectedServer(); - - @Test - public void detectServer(){ - preferences = new RuntimeDetectionPreferencesDialog(); - preferences.open(); - preferences.addPath(RuntimeProperties.getInstance().getRuntimePath(getServerID())); - searchingForRuntimesDialog = preferences.search(); - - assertThat(searchingForRuntimesDialog.getServers().size(), is(1)); - assertThat(searchingForRuntimesDialog.getServers().get(0), new ServerMatcher(getExpectedServer())); - } - - @After - public void closePreferences(){ - searchingForRuntimesDialog.ok(); - preferences.removePath(RuntimeProperties.getInstance().getRuntimePath(getServerID())); - preferences.ok(); - } -}

12 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r41144 - branches.

by jbosstools-commits＠lists.jboss.org

Author: dpalmer Date: 2012-05-18 05:01:04 -0400 (Fri, 18 May 2012) New Revision: 41144 Added: branches/soatools-3.3.0.Beta2/ Log: Cutting branch for soatools 3.3.0.Beta2

12 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r41143 - in trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test: server and 9 other directories.

by jbosstools-commits＠lists.jboss.org

Author: ljelinko Date: 2012-05-18 04:12:33 -0400 (Fri, 18 May 2012) New Revision: 41143 Added: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap4/ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap5/ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap6/ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/epp4/ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/epp5/ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/ewp5/ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/jboss7/ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/soap5/ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/soap5/DetectSOAP5.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/soap5/OperateSOAP5.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/soap5/standalone/ Removed: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/eap4/ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/eap5/ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/eap6/ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/epp4/ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/epp5/ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/ewp5/ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/jboss7/ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/soap5/ Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/AllTestsSuite.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap4/DetectEAP4.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap4/OperateEAP4.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap5/DetectEAP5.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap5/OperateEAP5.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap6/DetectEAP6.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap6/OperateEAP6.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/epp4/DetectEPP4.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/epp4/OperateEPP4.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/epp5/DetectEPP5.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/epp5/OperateEPP5.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/ewp5/DetectEWP5.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/ewp5/OperateEWP5.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/jboss7/DetectJBoss7.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/jboss7/OperateJBoss7.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/soap5/standalone/DetectSOAPStandalone5.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/soap5/standalone/OperateSOAPStandalone5.java Log: Renamed packages. Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/AllTestsSuite.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/AllTestsSuite.java 2012-05-18 07:44:52 UTC (rev 41142) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/AllTestsSuite.java 2012-05-18 08:12:33 UTC (rev 41143) @@ -1,23 +1,23 @@ package org.jboss.tools.runtime.as.ui.bot.test; -import org.jboss.tools.runtime.as.ui.bot.test.eap4.DetectEAP4; -import org.jboss.tools.runtime.as.ui.bot.test.eap4.OperateEAP4; -import org.jboss.tools.runtime.as.ui.bot.test.eap5.DetectEAP5; -import org.jboss.tools.runtime.as.ui.bot.test.eap5.OperateEAP5; -import org.jboss.tools.runtime.as.ui.bot.test.eap6.DetectEAP6; -import org.jboss.tools.runtime.as.ui.bot.test.eap6.OperateEAP6; -import org.jboss.tools.runtime.as.ui.bot.test.epp4.DetectEPP4; -import org.jboss.tools.runtime.as.ui.bot.test.epp4.OperateEPP4; -import org.jboss.tools.runtime.as.ui.bot.test.epp5.DetectEPP5; -import org.jboss.tools.runtime.as.ui.bot.test.epp5.OperateEPP5; -import org.jboss.tools.runtime.as.ui.bot.test.ewp5.DetectEWP5; -import org.jboss.tools.runtime.as.ui.bot.test.ewp5.OperateEWP5; -import org.jboss.tools.runtime.as.ui.bot.test.jboss7.DetectJBoss7; -import org.jboss.tools.runtime.as.ui.bot.test.jboss7.OperateJBoss7; -import org.jboss.tools.runtime.as.ui.bot.test.soap5.DetectSOAP5; -import org.jboss.tools.runtime.as.ui.bot.test.soap5.OperateSOAP5; -import org.jboss.tools.runtime.as.ui.bot.test.soap5.standalone.DetectSOAPStandalone5; -import org.jboss.tools.runtime.as.ui.bot.test.soap5.standalone.OperateSOAPStandalone5; +import org.jboss.tools.runtime.as.ui.bot.test.server.eap4.DetectEAP4; +import org.jboss.tools.runtime.as.ui.bot.test.server.eap4.OperateEAP4; +import org.jboss.tools.runtime.as.ui.bot.test.server.eap5.DetectEAP5; +import org.jboss.tools.runtime.as.ui.bot.test.server.eap5.OperateEAP5; +import org.jboss.tools.runtime.as.ui.bot.test.server.eap6.DetectEAP6; +import org.jboss.tools.runtime.as.ui.bot.test.server.eap6.OperateEAP6; +import org.jboss.tools.runtime.as.ui.bot.test.server.epp4.DetectEPP4; +import org.jboss.tools.runtime.as.ui.bot.test.server.epp4.OperateEPP4; +import org.jboss.tools.runtime.as.ui.bot.test.server.epp5.DetectEPP5; +import org.jboss.tools.runtime.as.ui.bot.test.server.epp5.OperateEPP5; +import org.jboss.tools.runtime.as.ui.bot.test.server.ewp5.DetectEWP5; +import org.jboss.tools.runtime.as.ui.bot.test.server.ewp5.OperateEWP5; +import org.jboss.tools.runtime.as.ui.bot.test.server.jboss7.DetectJBoss7; +import org.jboss.tools.runtime.as.ui.bot.test.server.jboss7.OperateJBoss7; +import org.jboss.tools.runtime.as.ui.bot.test.server.soap5.DetectSOAP5; +import org.jboss.tools.runtime.as.ui.bot.test.server.soap5.OperateSOAP5; +import org.jboss.tools.runtime.as.ui.bot.test.server.soap5.standalone.DetectSOAPStandalone5; +import org.jboss.tools.runtime.as.ui.bot.test.server.soap5.standalone.OperateSOAPStandalone5; import org.jboss.tools.ui.bot.ext.RequirementAwareSuite; import org.junit.runner.RunWith; import org.junit.runners.Suite; Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap4/DetectEAP4.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/eap4/DetectEAP4.java 2012-05-17 11:37:44 UTC (rev 41109) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap4/DetectEAP4.java 2012-05-18 08:12:33 UTC (rev 41143) @@ -1,4 +1,4 @@ -package org.jboss.tools.runtime.as.ui.bot.test.eap4; +package org.jboss.tools.runtime.as.ui.bot.test.server.eap4; import org.jboss.tools.runtime.as.ui.bot.test.RuntimeProperties; import org.jboss.tools.runtime.as.ui.bot.test.entity.Server; Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap4/OperateEAP4.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/eap4/OperateEAP4.java 2012-05-17 11:37:44 UTC (rev 41109) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap4/OperateEAP4.java 2012-05-18 08:12:33 UTC (rev 41143) @@ -1,4 +1,4 @@ -package org.jboss.tools.runtime.as.ui.bot.test.eap4; +package org.jboss.tools.runtime.as.ui.bot.test.server.eap4; import org.jboss.tools.runtime.as.ui.bot.test.template.OperateServerTemplate; Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap5/DetectEAP5.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/eap5/DetectEAP5.java 2012-05-17 11:37:44 UTC (rev 41109) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap5/DetectEAP5.java 2012-05-18 08:12:33 UTC (rev 41143) @@ -1,4 +1,4 @@ -package org.jboss.tools.runtime.as.ui.bot.test.eap5; +package org.jboss.tools.runtime.as.ui.bot.test.server.eap5; import org.jboss.tools.runtime.as.ui.bot.test.RuntimeProperties; import org.jboss.tools.runtime.as.ui.bot.test.entity.Server; Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap5/OperateEAP5.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/eap5/OperateEAP5.java 2012-05-17 11:37:44 UTC (rev 41109) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap5/OperateEAP5.java 2012-05-18 08:12:33 UTC (rev 41143) @@ -1,4 +1,4 @@ -package org.jboss.tools.runtime.as.ui.bot.test.eap5; +package org.jboss.tools.runtime.as.ui.bot.test.server.eap5; import org.jboss.tools.runtime.as.ui.bot.test.template.OperateServerTemplate; Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap6/DetectEAP6.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/eap6/DetectEAP6.java 2012-05-17 11:37:44 UTC (rev 41109) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap6/DetectEAP6.java 2012-05-18 08:12:33 UTC (rev 41143) @@ -1,4 +1,4 @@ -package org.jboss.tools.runtime.as.ui.bot.test.eap6; +package org.jboss.tools.runtime.as.ui.bot.test.server.eap6; import org.jboss.tools.runtime.as.ui.bot.test.RuntimeProperties; import org.jboss.tools.runtime.as.ui.bot.test.entity.Server; Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap6/OperateEAP6.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/eap6/OperateEAP6.java 2012-05-17 11:37:44 UTC (rev 41109) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap6/OperateEAP6.java 2012-05-18 08:12:33 UTC (rev 41143) @@ -1,4 +1,4 @@ -package org.jboss.tools.runtime.as.ui.bot.test.eap6; +package org.jboss.tools.runtime.as.ui.bot.test.server.eap6; import org.jboss.tools.runtime.as.ui.bot.test.template.OperateServerTemplate; Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/epp4/DetectEPP4.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/epp4/DetectEPP4.java 2012-05-17 11:37:44 UTC (rev 41109) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/epp4/DetectEPP4.java 2012-05-18 08:12:33 UTC (rev 41143) @@ -1,4 +1,4 @@ -package org.jboss.tools.runtime.as.ui.bot.test.epp4; +package org.jboss.tools.runtime.as.ui.bot.test.server.epp4; import org.jboss.tools.runtime.as.ui.bot.test.RuntimeProperties; import org.jboss.tools.runtime.as.ui.bot.test.entity.Server; Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/epp4/OperateEPP4.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/epp4/OperateEPP4.java 2012-05-17 11:37:44 UTC (rev 41109) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/epp4/OperateEPP4.java 2012-05-18 08:12:33 UTC (rev 41143) @@ -1,4 +1,4 @@ -package org.jboss.tools.runtime.as.ui.bot.test.epp4; +package org.jboss.tools.runtime.as.ui.bot.test.server.epp4; import org.jboss.tools.runtime.as.ui.bot.test.template.OperateServerTemplate; Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/epp5/DetectEPP5.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/epp5/DetectEPP5.java 2012-05-17 11:37:44 UTC (rev 41109) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/epp5/DetectEPP5.java 2012-05-18 08:12:33 UTC (rev 41143) @@ -1,4 +1,4 @@ -package org.jboss.tools.runtime.as.ui.bot.test.epp5; +package org.jboss.tools.runtime.as.ui.bot.test.server.epp5; import org.jboss.tools.runtime.as.ui.bot.test.RuntimeProperties; import org.jboss.tools.runtime.as.ui.bot.test.entity.Server; Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/epp5/OperateEPP5.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/epp5/OperateEPP5.java 2012-05-17 11:37:44 UTC (rev 41109) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/epp5/OperateEPP5.java 2012-05-18 08:12:33 UTC (rev 41143) @@ -1,4 +1,4 @@ -package org.jboss.tools.runtime.as.ui.bot.test.epp5; +package org.jboss.tools.runtime.as.ui.bot.test.server.epp5; import org.jboss.tools.runtime.as.ui.bot.test.template.OperateServerTemplate; Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/ewp5/DetectEWP5.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/ewp5/DetectEWP5.java 2012-05-17 11:37:44 UTC (rev 41109) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/ewp5/DetectEWP5.java 2012-05-18 08:12:33 UTC (rev 41143) @@ -1,4 +1,4 @@ -package org.jboss.tools.runtime.as.ui.bot.test.ewp5; +package org.jboss.tools.runtime.as.ui.bot.test.server.ewp5; import org.jboss.tools.runtime.as.ui.bot.test.RuntimeProperties; import org.jboss.tools.runtime.as.ui.bot.test.entity.Server; Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/ewp5/OperateEWP5.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/ewp5/OperateEWP5.java 2012-05-17 11:37:44 UTC (rev 41109) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/ewp5/OperateEWP5.java 2012-05-18 08:12:33 UTC (rev 41143) @@ -1,4 +1,4 @@ -package org.jboss.tools.runtime.as.ui.bot.test.ewp5; +package org.jboss.tools.runtime.as.ui.bot.test.server.ewp5; import org.jboss.tools.runtime.as.ui.bot.test.template.OperateServerTemplate; Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/jboss7/DetectJBoss7.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/jboss7/DetectJBoss7.java 2012-05-17 12:34:10 UTC (rev 41111) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/jboss7/DetectJBoss7.java 2012-05-18 08:12:33 UTC (rev 41143) @@ -1,4 +1,4 @@ -package org.jboss.tools.runtime.as.ui.bot.test.jboss7; +package org.jboss.tools.runtime.as.ui.bot.test.server.jboss7; import org.jboss.tools.runtime.as.ui.bot.test.RuntimeProperties; import org.jboss.tools.runtime.as.ui.bot.test.entity.Server; Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/jboss7/OperateJBoss7.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/jboss7/OperateJBoss7.java 2012-05-17 12:34:10 UTC (rev 41111) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/jboss7/OperateJBoss7.java 2012-05-18 08:12:33 UTC (rev 41143) @@ -1,4 +1,4 @@ -package org.jboss.tools.runtime.as.ui.bot.test.jboss7; +package org.jboss.tools.runtime.as.ui.bot.test.server.jboss7; import org.jboss.tools.runtime.as.ui.bot.test.template.OperateServerTemplate; Copied: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/soap5/DetectSOAP5.java (from rev 41141, trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/soap5/DetectSOAP5.java) =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/soap5/DetectSOAP5.java (rev 0) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/soap5/DetectSOAP5.java 2012-05-18 08:12:33 UTC (rev 41143) @@ -0,0 +1,25 @@ +package org.jboss.tools.runtime.as.ui.bot.test.server.soap5; + +import org.jboss.tools.runtime.as.ui.bot.test.RuntimeProperties; +import org.jboss.tools.runtime.as.ui.bot.test.entity.Server; +import org.jboss.tools.runtime.as.ui.bot.test.template.DetectServerTemplate; + +public class DetectSOAP5 extends DetectServerTemplate { + + public static final String SERVER_ID = "jboss-soa-p-5"; + + @Override + protected String getServerID() { + return SERVER_ID; + } + + @Override + protected Server getExpectedServer() { + Server expectedServer = new Server(); + expectedServer.setName(SERVER_ID); + expectedServer.setVersion("5.2"); + expectedServer.setType("SOA-P"); + expectedServer.setLocation(RuntimeProperties.getInstance().getRuntimePath(SERVER_ID)); + return expectedServer; + } +} Copied: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/soap5/OperateSOAP5.java (from rev 41141, trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/soap5/OperateSOAP5.java) =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/soap5/OperateSOAP5.java (rev 0) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/soap5/OperateSOAP5.java 2012-05-18 08:12:33 UTC (rev 41143) @@ -0,0 +1,11 @@ +package org.jboss.tools.runtime.as.ui.bot.test.server.soap5; + +import org.jboss.tools.runtime.as.ui.bot.test.template.OperateServerTemplate; + +public class OperateSOAP5 extends OperateServerTemplate { + + @Override + protected String getServerName() { + return DetectSOAP5.SERVER_ID; + } +} Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/soap5/standalone/DetectSOAPStandalone5.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/soap5/standalone/DetectSOAPStandalone5.java 2012-05-18 07:44:16 UTC (rev 41141) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/soap5/standalone/DetectSOAPStandalone5.java 2012-05-18 08:12:33 UTC (rev 41143) @@ -1,4 +1,4 @@ -package org.jboss.tools.runtime.as.ui.bot.test.soap5.standalone; +package org.jboss.tools.runtime.as.ui.bot.test.server.soap5.standalone; import org.jboss.tools.runtime.as.ui.bot.test.RuntimeProperties; import org.jboss.tools.runtime.as.ui.bot.test.entity.Server; Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/soap5/standalone/OperateSOAPStandalone5.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/soap5/standalone/OperateSOAPStandalone5.java 2012-05-18 07:44:16 UTC (rev 41141) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/soap5/standalone/OperateSOAPStandalone5.java 2012-05-18 08:12:33 UTC (rev 41143) @@ -1,4 +1,4 @@ -package org.jboss.tools.runtime.as.ui.bot.test.soap5.standalone; +package org.jboss.tools.runtime.as.ui.bot.test.server.soap5.standalone; import org.jboss.tools.runtime.as.ui.bot.test.template.OperateServerTemplate;

12 years, 8 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits May 2012