JBoss Tools SVN: r41254 - in trunk/openshift/plugins: org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-05-22 09:30:42 -0400 (Tue, 22 May 2012)
New Revision: 41254
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-2.0.0-SNAPSHOT.jar
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/ApplicationPortForwardingAction.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/ApplicationPortForwardingWizard.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/ApplicationPortForwardingWizardModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/ApplicationPortForwardingWizardPage.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/OpenShiftSshSessionFactory.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java
Log:
Fixed - JBIDE-11810
OpenShift port forwarding exception without ssh key
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-2.0.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/ApplicationPortForwardingAction.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/ApplicationPortForwardingAction.java 2012-05-22 13:08:09 UTC (rev 41253)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/ApplicationPortForwardingAction.java 2012-05-22 13:30:42 UTC (rev 41254)
@@ -26,7 +26,6 @@
if( sel instanceof IApplication) {
IApplication application = (IApplication)sel;
try {
- //TitleD
ApplicationPortForwardingWizard wizard = new ApplicationPortForwardingWizard(application);
WizardDialog dialog = new ApplicationPortForwardingWizardDialog(Display.getCurrent().getActiveShell(), wizard);
dialog.setMinimumPageSize(700, 300);
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/ApplicationPortForwardingWizard.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/ApplicationPortForwardingWizard.java 2012-05-22 13:08:09 UTC (rev 41253)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/ApplicationPortForwardingWizard.java 2012-05-22 13:30:42 UTC (rev 41254)
@@ -38,8 +38,4 @@
addPage(new ApplicationPortForwardingWizardPage(wizardModel, this));
}
- public IApplication getApplication() {
- return wizardModel.getApplication();
- }
-
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/ApplicationPortForwardingWizardModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/ApplicationPortForwardingWizardModel.java 2012-05-22 13:08:09 UTC (rev 41253)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/ApplicationPortForwardingWizardModel.java 2012-05-22 13:30:42 UTC (rev 41254)
@@ -19,8 +19,11 @@
import org.eclipse.ui.console.MessageConsoleStream;
import org.jboss.tools.common.databinding.ObservablePojo;
import org.jboss.tools.openshift.express.internal.ui.console.ConsoleUtils;
+import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
+import org.jboss.tools.openshift.express.internal.ui.utils.OpenShiftSshSessionFactory;
import com.jcraft.jsch.JSchException;
+import com.jcraft.jsch.Session;
import com.openshift.client.IApplication;
import com.openshift.client.IApplicationPortForwarding;
import com.openshift.client.OpenShiftSSHOperationException;
@@ -203,4 +206,25 @@
}
}
+ /**
+ * @param monitor
+ * @throws OpenShiftSSHOperationException
+ * @throws JSchException
+ */
+ // TODO : move this method into the WizardModel ?
+ void verifyApplicationSSHSession() throws OpenShiftSSHOperationException {
+ final boolean hasSSHSession = getApplication().hasSSHSession();
+ if (!hasSSHSession) {
+ Logger.debug("Opening a new SSH Session for application '" + getApplication().getName() + "'");
+ try {
+ final Session session = OpenShiftSshSessionFactory.getInstance().createSession(
+ getApplication());
+ getApplication().setSSHSession(session);
+ } catch (JSchException e) {
+ throw new OpenShiftSSHOperationException(e, "Failed to open a new SSH session for application ''{0}''", getApplication().getName());
+
+ }
+ }
+ }
+
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/ApplicationPortForwardingWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/ApplicationPortForwardingWizardPage.java 2012-05-22 13:08:09 UTC (rev 41253)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/ApplicationPortForwardingWizardPage.java 2012-05-22 13:30:42 UTC (rev 41254)
@@ -33,11 +33,8 @@
import org.jboss.tools.common.ui.databinding.ValueBindingBuilder;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
-import org.jboss.tools.openshift.express.internal.ui.utils.OpenShiftSshSessionFactory;
import org.jboss.tools.openshift.express.internal.ui.wizard.AbstractOpenShiftWizardPage;
-import com.jcraft.jsch.JSchException;
-import com.jcraft.jsch.Session;
import com.openshift.client.IApplicationPortForwarding;
import com.openshift.client.OpenShiftSSHOperationException;
@@ -166,10 +163,10 @@
@Override
protected IStatus run(IProgressMonitor monitor) {
try {
- verifyApplicationSSHSession();
+ wizardModel.verifyApplicationSSHSession();
wizardModel.refreshForwardablePorts();
refreshViewerInput();
- } catch (Exception e) {
+ } catch (OpenShiftSSHOperationException e) {
Logger.error("Failed to refresh list of ports", e);
}
return Status.OK_STATUS;
@@ -191,10 +188,10 @@
@Override
protected IStatus run(IProgressMonitor monitor) {
try {
- verifyApplicationSSHSession();
+ wizardModel.verifyApplicationSSHSession();
wizardModel.startPortForwarding();
refreshViewerInput();
- } catch (Exception e) {
+ } catch (OpenShiftSSHOperationException e) {
return OpenShiftUIActivator.createErrorStatus("Failed to start port-forwarding.", e);
}
@@ -232,10 +229,10 @@
@Override
protected IStatus run(IProgressMonitor monitor) {
try {
- verifyApplicationSSHSession();
+ wizardModel.verifyApplicationSSHSession();
wizardModel.stopPortForwarding();
refreshViewerInput();
- } catch (Exception e) {
+ } catch (OpenShiftSSHOperationException e) {
return OpenShiftUIActivator.createErrorStatus("Failed to stop port-forwarding.", e);
}
return Status.OK_STATUS;
@@ -327,46 +324,34 @@
@Override
protected void onPageActivated(DataBindingContext dbc) {
try {
- WizardUtils.runInWizard(new Job("Retrieving application's forwardable ports...") {
+ IStatus status = WizardUtils.runInWizard(new Job("Retrieving application's forwardable ports...") {
@Override
protected IStatus run(IProgressMonitor monitor) {
try {
monitor.beginTask("Checking Application SSH session...", 1);
- verifyApplicationSSHSession();
+ wizardModel.verifyApplicationSSHSession();
monitor.worked(1);
monitor.beginTask("Retrieving ports...", 1);
wizardModel.loadForwardablePorts();
refreshViewerInput();
monitor.worked(1);
return Status.OK_STATUS;
- } catch (Exception e) {
+ } catch (OpenShiftSSHOperationException e) {
return OpenShiftUIActivator.createErrorStatus(
- "Could not load forwardable ports for application", e);
+ "Could not load forwardable ports for application ''{0}''", e, wizardModel.getApplication().getName());
}
}
}, getContainer(), getDataBindingContext());
+ if(!status.isOK()) {
+ getWizard().getContainer().getShell().close();
+ }
} catch (Exception e) {
// ignore
}
}
- /**
- * @param monitor
- * @throws JSchException
- */
- // TODO : move this method into the WizardModel ?
- private void verifyApplicationSSHSession() throws JSchException {
- final boolean hasSSHSession = wizardModel.getApplication().hasSSHSession();
- if (!hasSSHSession) {
- Logger.debug("Opening a new SSH Session for application '" + wizardModel.getApplication().getName() + "'");
- final Session session = OpenShiftSshSessionFactory.getInstance().createSession(
- wizardModel.getApplication());
- wizardModel.getApplication().setSSHSession(session);
- }
- }
-
private void refreshViewerInput() {
getShell().getDisplay().syncExec(new Runnable() {
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/OpenShiftSshSessionFactory.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/OpenShiftSshSessionFactory.java 2012-05-22 13:08:09 UTC (rev 41253)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/OpenShiftSshSessionFactory.java 2012-05-22 13:30:42 UTC (rev 41254)
@@ -38,6 +38,7 @@
* @author Xavier Coulon
*
*/
+@SuppressWarnings("restriction")
public class OpenShiftSshSessionFactory extends JschConfigSessionFactory {
private static OpenShiftSshSessionFactory INSTANCE = new OpenShiftSshSessionFactory();
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-22 13:08:09 UTC (rev 41253)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-05-22 13:30:42 UTC (rev 41254)
@@ -643,12 +643,23 @@
String[] items = newAppCartridgeCombo.getItems();
Arrays.sort(items);
newAppCartridgeCombo.setItems(items);
+ selectJBossAS7();
}
});
}
}.start();
}
}
+
+ private void selectJBossAS7(){
+ String[] items = newAppCartridgeCombo.getItems();
+ for(int index = 0; index < items.length; index++){
+ if("jbossas-7".equals(items[index])){
+ newAppCartridgeCombo.select(index);
+ }
+ }
+ }
+
@Override
protected void onPageWillGetActivated(Direction direction, PageChangingEvent event, DataBindingContext dbc) {
12 years, 7 months
- 1
- 0
JBoss Tools SVN: r41253 - trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/config.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2012-05-22 09:08:09 -0400 (Tue, 22 May 2012)
New Revision: 41253
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/config/devices.cfg
Log:
https://issues.jboss.org/browse/JBIDE-11896 : BrowserSim: pixel ratio problem
- added Galaxy Nexus device
- changed pixel ratio for Galaxy Tab 10.1
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/config/devices.cfg
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/config/devices.cfg 2012-05-22 12:35:33 UTC (rev 41252)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/config/devices.cfg 2012-05-22 13:08:09 UTC (rev 41253)
@@ -1,5 +1,5 @@
ConfigVersion=6
-SelectedDeviceIndex=2
+SelectedDeviceIndex=3
UseSkins=true
TruncateWindow=
Desktop (Default User-Agent) 1024 768 1
@@ -9,4 +9,5 @@
RIM BlackBerry Bold Touch 9900 640 480 1 Mozilla/5.0 (BlackBerry; U; BlackBerry 9900; en-US) AppleWebKit/534.1+ (KHTML, like Gecko) Version/6.0.0.246 Mobile Safari/534.1+ Android
Samsung Galaxy S 480 800 1.5 Mozilla/5.0 (Linux; U; Android 2.3.3; en-us; GT-I9000 Build/GINGERBREAD) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 Android
Samsung Galaxy S II 480 800 1.5 Mozilla/5.0 (Linux; U; Android 2.3; en-us; GT-I9100 Build/GRH78) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 Android
-Samsung Galaxy Tab 10.1 800 1280 1 Mozilla/5.0 (Linux; U; Android 3.0.1; en-us; GT-P7100 Build/HRI83) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 MobileSafari/534.13 Android
+Samsung Galaxy Nexus 720 1280 2 Mozilla/5.0 (Linux; U; Android 4.0.2; en-us; Galaxy Nexus Build/ICL53F) AppleWebKit/534.30 (KHTML like Gecko) Version/4.0 Mobile Safari/534.30 Android
+Samsung Galaxy Tab 10.1 800 1280 1.5 Mozilla/5.0 (Linux; U; Android 3.0.1; en-us; GT-P7100 Build/HRI83) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 MobileSafari/534.13 Android
12 years, 7 months
- 1
- 0
JBoss Tools SVN: r41252 - in trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test: detector and 11 other directories.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-05-22 08:35:33 -0400 (Tue, 22 May 2012)
New Revision: 41252
Added:
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/eap4/
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/eap5/
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/eap6/
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/epp4/
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/epp5/
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/ewp5/
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/jboss7/
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/soap5/
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/soap5/CheckSOAP5Seam.java
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/soap5/DetectSOAP5.java
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/soap5/OperateSOAP5.java
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/soap5/standalone/
Removed:
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/
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/detector/server/eap4/CheckEAP4Seam.java
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/eap4/DetectEAP4.java
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/eap4/OperateEAP4.java
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/eap5/CheckEAP5Seam.java
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/eap5/DetectEAP5.java
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/eap5/OperateEAP5.java
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/eap6/DetectEAP6.java
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/eap6/OperateEAP6.java
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/epp4/CheckEPP4Seam.java
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/epp4/DetectEPP4.java
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/epp4/OperateEPP4.java
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/epp5/CheckEPP5Seam.java
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/epp5/DetectEPP5.java
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/epp5/OperateEPP5.java
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/ewp5/CheckEWP5Seam.java
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/ewp5/DetectEWP5.java
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/ewp5/OperateEWP5.java
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/jboss7/DetectJBoss7.java
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/jboss7/OperateJBoss7.java
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/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/detector/server/soap5/standalone/OperateSOAPStandalone5.java
Log:
Renamed package
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-22 12:25:50 UTC (rev 41251)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/AllTestsSuite.java 2012-05-22 12:35:33 UTC (rev 41252)
@@ -4,30 +4,30 @@
import org.jboss.tools.runtime.as.ui.bot.test.detector.seam.seam22.DetectSeam22;
import org.jboss.tools.runtime.as.ui.bot.test.detector.seam.seam23.CheckSeam23;
import org.jboss.tools.runtime.as.ui.bot.test.detector.seam.seam23.DetectSeam23;
-import org.jboss.tools.runtime.as.ui.bot.test.server.eap4.CheckEAP4Seam;
-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.CheckEAP5Seam;
-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.CheckEPP4Seam;
-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.CheckEPP5Seam;
-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.CheckEWP5Seam;
-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.CheckSOAP5Seam;
-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.runtime.as.ui.bot.test.detector.server.eap4.CheckEAP4Seam;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.server.eap4.DetectEAP4;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.server.eap4.OperateEAP4;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.server.eap5.CheckEAP5Seam;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.server.eap5.DetectEAP5;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.server.eap5.OperateEAP5;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.server.eap6.DetectEAP6;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.server.eap6.OperateEAP6;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.server.epp4.CheckEPP4Seam;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.server.epp4.DetectEPP4;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.server.epp4.OperateEPP4;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.server.epp5.CheckEPP5Seam;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.server.epp5.DetectEPP5;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.server.epp5.OperateEPP5;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.server.ewp5.CheckEWP5Seam;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.server.ewp5.DetectEWP5;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.server.ewp5.OperateEWP5;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.server.jboss7.DetectJBoss7;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.server.jboss7.OperateJBoss7;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.server.soap5.CheckSOAP5Seam;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.server.soap5.DetectSOAP5;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.server.soap5.OperateSOAP5;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.server.soap5.standalone.DetectSOAPStandalone5;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.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/detector/server/eap4/CheckEAP4Seam.java
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap4/CheckEAP4Seam.java 2012-05-22 12:13:10 UTC (rev 41249)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/eap4/CheckEAP4Seam.java 2012-05-22 12:35:33 UTC (rev 41252)
@@ -1,4 +1,4 @@
-package org.jboss.tools.runtime.as.ui.bot.test.server.eap4;
+package org.jboss.tools.runtime.as.ui.bot.test.detector.server.eap4;
import org.jboss.tools.runtime.as.ui.bot.test.RuntimeProperties;
import org.jboss.tools.runtime.as.ui.bot.test.entity.Runtime;
Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/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-22 12:13:10 UTC (rev 41249)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/eap4/DetectEAP4.java 2012-05-22 12:35:33 UTC (rev 41252)
@@ -1,4 +1,4 @@
-package org.jboss.tools.runtime.as.ui.bot.test.server.eap4;
+package org.jboss.tools.runtime.as.ui.bot.test.detector.server.eap4;
import java.util.Arrays;
import java.util.List;
Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/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/eap4/OperateEAP4.java 2012-05-22 12:13:10 UTC (rev 41249)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/eap4/OperateEAP4.java 2012-05-22 12:35:33 UTC (rev 41252)
@@ -1,4 +1,4 @@
-package org.jboss.tools.runtime.as.ui.bot.test.server.eap4;
+package org.jboss.tools.runtime.as.ui.bot.test.detector.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/detector/server/eap5/CheckEAP5Seam.java
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap5/CheckEAP5Seam.java 2012-05-22 12:13:10 UTC (rev 41249)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/eap5/CheckEAP5Seam.java 2012-05-22 12:35:33 UTC (rev 41252)
@@ -1,4 +1,4 @@
-package org.jboss.tools.runtime.as.ui.bot.test.server.eap5;
+package org.jboss.tools.runtime.as.ui.bot.test.detector.server.eap5;
import org.jboss.tools.runtime.as.ui.bot.test.RuntimeProperties;
import org.jboss.tools.runtime.as.ui.bot.test.entity.Runtime;
Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/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-22 12:13:10 UTC (rev 41249)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/eap5/DetectEAP5.java 2012-05-22 12:35:33 UTC (rev 41252)
@@ -1,4 +1,4 @@
-package org.jboss.tools.runtime.as.ui.bot.test.server.eap5;
+package org.jboss.tools.runtime.as.ui.bot.test.detector.server.eap5;
import java.util.Arrays;
import java.util.List;
Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/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/eap5/OperateEAP5.java 2012-05-22 12:13:10 UTC (rev 41249)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/eap5/OperateEAP5.java 2012-05-22 12:35:33 UTC (rev 41252)
@@ -1,4 +1,4 @@
-package org.jboss.tools.runtime.as.ui.bot.test.server.eap5;
+package org.jboss.tools.runtime.as.ui.bot.test.detector.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/detector/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-22 12:13:10 UTC (rev 41249)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/eap6/DetectEAP6.java 2012-05-22 12:35:33 UTC (rev 41252)
@@ -1,4 +1,4 @@
-package org.jboss.tools.runtime.as.ui.bot.test.server.eap6;
+package org.jboss.tools.runtime.as.ui.bot.test.detector.server.eap6;
import java.util.Arrays;
import java.util.List;
Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/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/eap6/OperateEAP6.java 2012-05-22 12:13:10 UTC (rev 41249)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/eap6/OperateEAP6.java 2012-05-22 12:35:33 UTC (rev 41252)
@@ -1,4 +1,4 @@
-package org.jboss.tools.runtime.as.ui.bot.test.server.eap6;
+package org.jboss.tools.runtime.as.ui.bot.test.detector.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/detector/server/epp4/CheckEPP4Seam.java
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/epp4/CheckEPP4Seam.java 2012-05-22 12:13:10 UTC (rev 41249)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/epp4/CheckEPP4Seam.java 2012-05-22 12:35:33 UTC (rev 41252)
@@ -1,4 +1,4 @@
-package org.jboss.tools.runtime.as.ui.bot.test.server.epp4;
+package org.jboss.tools.runtime.as.ui.bot.test.detector.server.epp4;
import org.jboss.tools.runtime.as.ui.bot.test.RuntimeProperties;
import org.jboss.tools.runtime.as.ui.bot.test.entity.Runtime;
Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/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-22 12:13:10 UTC (rev 41249)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/epp4/DetectEPP4.java 2012-05-22 12:35:33 UTC (rev 41252)
@@ -1,4 +1,4 @@
-package org.jboss.tools.runtime.as.ui.bot.test.server.epp4;
+package org.jboss.tools.runtime.as.ui.bot.test.detector.server.epp4;
import java.util.Arrays;
import java.util.List;
Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/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/epp4/OperateEPP4.java 2012-05-22 12:13:10 UTC (rev 41249)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/epp4/OperateEPP4.java 2012-05-22 12:35:33 UTC (rev 41252)
@@ -1,4 +1,4 @@
-package org.jboss.tools.runtime.as.ui.bot.test.server.epp4;
+package org.jboss.tools.runtime.as.ui.bot.test.detector.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/detector/server/epp5/CheckEPP5Seam.java
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/epp5/CheckEPP5Seam.java 2012-05-22 12:13:10 UTC (rev 41249)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/epp5/CheckEPP5Seam.java 2012-05-22 12:35:33 UTC (rev 41252)
@@ -1,4 +1,4 @@
-package org.jboss.tools.runtime.as.ui.bot.test.server.epp5;
+package org.jboss.tools.runtime.as.ui.bot.test.detector.server.epp5;
import org.jboss.tools.runtime.as.ui.bot.test.RuntimeProperties;
import org.jboss.tools.runtime.as.ui.bot.test.entity.Runtime;
Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/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-22 12:13:10 UTC (rev 41249)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/epp5/DetectEPP5.java 2012-05-22 12:35:33 UTC (rev 41252)
@@ -1,4 +1,4 @@
-package org.jboss.tools.runtime.as.ui.bot.test.server.epp5;
+package org.jboss.tools.runtime.as.ui.bot.test.detector.server.epp5;
import java.util.Arrays;
import java.util.List;
Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/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/epp5/OperateEPP5.java 2012-05-22 12:13:10 UTC (rev 41249)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/epp5/OperateEPP5.java 2012-05-22 12:35:33 UTC (rev 41252)
@@ -1,4 +1,4 @@
-package org.jboss.tools.runtime.as.ui.bot.test.server.epp5;
+package org.jboss.tools.runtime.as.ui.bot.test.detector.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/detector/server/ewp5/CheckEWP5Seam.java
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/ewp5/CheckEWP5Seam.java 2012-05-22 12:13:10 UTC (rev 41249)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/ewp5/CheckEWP5Seam.java 2012-05-22 12:35:33 UTC (rev 41252)
@@ -1,4 +1,4 @@
-package org.jboss.tools.runtime.as.ui.bot.test.server.ewp5;
+package org.jboss.tools.runtime.as.ui.bot.test.detector.server.ewp5;
import org.jboss.tools.runtime.as.ui.bot.test.RuntimeProperties;
import org.jboss.tools.runtime.as.ui.bot.test.entity.Runtime;
Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/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-22 12:13:10 UTC (rev 41249)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/ewp5/DetectEWP5.java 2012-05-22 12:35:33 UTC (rev 41252)
@@ -1,4 +1,4 @@
-package org.jboss.tools.runtime.as.ui.bot.test.server.ewp5;
+package org.jboss.tools.runtime.as.ui.bot.test.detector.server.ewp5;
import java.util.Arrays;
import java.util.List;
Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/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/ewp5/OperateEWP5.java 2012-05-22 12:13:10 UTC (rev 41249)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/ewp5/OperateEWP5.java 2012-05-22 12:35:33 UTC (rev 41252)
@@ -1,4 +1,4 @@
-package org.jboss.tools.runtime.as.ui.bot.test.server.ewp5;
+package org.jboss.tools.runtime.as.ui.bot.test.detector.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/detector/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-22 12:13:10 UTC (rev 41249)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/jboss7/DetectJBoss7.java 2012-05-22 12:35:33 UTC (rev 41252)
@@ -1,4 +1,4 @@
-package org.jboss.tools.runtime.as.ui.bot.test.server.jboss7;
+package org.jboss.tools.runtime.as.ui.bot.test.detector.server.jboss7;
import java.util.Arrays;
import java.util.List;
Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/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/jboss7/OperateJBoss7.java 2012-05-22 12:13:10 UTC (rev 41249)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/jboss7/OperateJBoss7.java 2012-05-22 12:35:33 UTC (rev 41252)
@@ -1,4 +1,4 @@
-package org.jboss.tools.runtime.as.ui.bot.test.server.jboss7;
+package org.jboss.tools.runtime.as.ui.bot.test.detector.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/detector/server/soap5/CheckSOAP5Seam.java (from rev 41249, trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/soap5/CheckSOAP5Seam.java)
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/soap5/CheckSOAP5Seam.java (rev 0)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/soap5/CheckSOAP5Seam.java 2012-05-22 12:35:33 UTC (rev 41252)
@@ -0,0 +1,17 @@
+package org.jboss.tools.runtime.as.ui.bot.test.detector.server.soap5;
+
+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.CheckSeamRuntimeTemplate;
+
+public class CheckSOAP5Seam extends CheckSeamRuntimeTemplate {
+
+ @Override
+ protected Runtime getExpectedRuntime() {
+ Runtime server = new Runtime();
+ server.setName("Seam seam 2.2");
+ server.setVersion("2.2");
+ server.setLocation(RuntimeProperties.getInstance().getRuntimePath(DetectSOAP5.SERVER_ID) + "/seam");
+ return server;
+ }
+}
Copied: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/soap5/DetectSOAP5.java (from rev 41249, 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/detector/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/detector/server/soap5/DetectSOAP5.java 2012-05-22 12:35:33 UTC (rev 41252)
@@ -0,0 +1,35 @@
+package org.jboss.tools.runtime.as.ui.bot.test.detector.server.soap5;
+
+import java.util.Arrays;
+import java.util.List;
+
+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 DetectSOAP5 extends DetectRuntimeTemplate {
+
+ public static final String SERVER_ID = "jboss-soa-p-5";
+
+ @Override
+ protected String getPathID() {
+ return SERVER_ID;
+ }
+
+ @Override
+ protected List<Runtime> getExpectedRuntimes() {
+ Runtime server = new Runtime();
+ server.setName(SERVER_ID);
+ server.setVersion("5.2");
+ server.setType("SOA-P");
+ server.setLocation(RuntimeProperties.getInstance().getRuntimePath(SERVER_ID));
+
+ Runtime seam = new Runtime();
+ seam.setName("seam");
+ seam.setType("SEAM");
+ seam.setVersion("2.2.4.EAP5");
+ seam.setLocation(RuntimeProperties.getInstance().getRuntimePath(getPathID()) + "/seam");
+
+ return Arrays.asList(server, seam);
+ }
+}
Copied: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/soap5/OperateSOAP5.java (from rev 41249, 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/detector/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/detector/server/soap5/OperateSOAP5.java 2012-05-22 12:35:33 UTC (rev 41252)
@@ -0,0 +1,11 @@
+package org.jboss.tools.runtime.as.ui.bot.test.detector.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/detector/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-22 12:13:10 UTC (rev 41249)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/soap5/standalone/DetectSOAPStandalone5.java 2012-05-22 12:35:33 UTC (rev 41252)
@@ -1,4 +1,4 @@
-package org.jboss.tools.runtime.as.ui.bot.test.server.soap5.standalone;
+package org.jboss.tools.runtime.as.ui.bot.test.detector.server.soap5.standalone;
import java.util.Arrays;
import java.util.List;
Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/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/server/soap5/standalone/OperateSOAPStandalone5.java 2012-05-22 12:13:10 UTC (rev 41249)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/server/soap5/standalone/OperateSOAPStandalone5.java 2012-05-22 12:35:33 UTC (rev 41252)
@@ -1,4 +1,4 @@
-package org.jboss.tools.runtime.as.ui.bot.test.server.soap5.standalone;
+package org.jboss.tools.runtime.as.ui.bot.test.detector.server.soap5.standalone;
import org.jboss.tools.runtime.as.ui.bot.test.template.OperateServerTemplate;
12 years, 7 months
- 1
- 0
JBoss Tools SVN: r41251 - in trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test: detector and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-05-22 08:25:50 -0400 (Tue, 22 May 2012)
New Revision: 41251
Added:
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/seam/
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/seam/seam22/
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/seam/seam23/
Removed:
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/seam/
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/detector/seam/seam22/CheckSeam22.java
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/seam/seam22/DetectSeam22.java
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/seam/seam23/CheckSeam23.java
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/seam/seam23/DetectSeam23.java
Log:
Renamed package
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-22 12:24:26 UTC (rev 41250)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/AllTestsSuite.java 2012-05-22 12:25:50 UTC (rev 41251)
@@ -1,9 +1,9 @@
package org.jboss.tools.runtime.as.ui.bot.test;
-import org.jboss.tools.runtime.as.ui.bot.test.seam.seam22.CheckSeam22;
-import org.jboss.tools.runtime.as.ui.bot.test.seam.seam22.DetectSeam22;
-import org.jboss.tools.runtime.as.ui.bot.test.seam.seam23.CheckSeam23;
-import org.jboss.tools.runtime.as.ui.bot.test.seam.seam23.DetectSeam23;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.seam.seam22.CheckSeam22;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.seam.seam22.DetectSeam22;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.seam.seam23.CheckSeam23;
+import org.jboss.tools.runtime.as.ui.bot.test.detector.seam.seam23.DetectSeam23;
import org.jboss.tools.runtime.as.ui.bot.test.server.eap4.CheckEAP4Seam;
import org.jboss.tools.runtime.as.ui.bot.test.server.eap4.DetectEAP4;
import org.jboss.tools.runtime.as.ui.bot.test.server.eap4.OperateEAP4;
Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/seam/seam22/CheckSeam22.java
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/seam/seam22/CheckSeam22.java 2012-05-22 12:13:10 UTC (rev 41249)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/seam/seam22/CheckSeam22.java 2012-05-22 12:25:50 UTC (rev 41251)
@@ -1,4 +1,4 @@
-package org.jboss.tools.runtime.as.ui.bot.test.seam.seam22;
+package org.jboss.tools.runtime.as.ui.bot.test.detector.seam.seam22;
import org.jboss.tools.runtime.as.ui.bot.test.RuntimeProperties;
import org.jboss.tools.runtime.as.ui.bot.test.entity.Runtime;
Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/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 2012-05-22 12:13:10 UTC (rev 41249)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/seam/seam22/DetectSeam22.java 2012-05-22 12:25:50 UTC (rev 41251)
@@ -1,4 +1,4 @@
-package org.jboss.tools.runtime.as.ui.bot.test.seam.seam22;
+package org.jboss.tools.runtime.as.ui.bot.test.detector.seam.seam22;
import java.util.Arrays;
import java.util.List;
Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/seam/seam23/CheckSeam23.java
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/seam/seam23/CheckSeam23.java 2012-05-22 12:13:10 UTC (rev 41249)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/seam/seam23/CheckSeam23.java 2012-05-22 12:25:50 UTC (rev 41251)
@@ -1,4 +1,4 @@
-package org.jboss.tools.runtime.as.ui.bot.test.seam.seam23;
+package org.jboss.tools.runtime.as.ui.bot.test.detector.seam.seam23;
import org.jboss.tools.runtime.as.ui.bot.test.RuntimeProperties;
import org.jboss.tools.runtime.as.ui.bot.test.entity.Runtime;
Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/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 2012-05-22 12:13:10 UTC (rev 41249)
+++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/detector/seam/seam23/DetectSeam23.java 2012-05-22 12:25:50 UTC (rev 41251)
@@ -1,4 +1,4 @@
-package org.jboss.tools.runtime.as.ui.bot.test.seam.seam23;
+package org.jboss.tools.runtime.as.ui.bot.test.detector.seam.seam23;
import java.util.Arrays;
import java.util.List;
12 years, 7 months
- 1
- 0
JBoss Tools SVN: r41250 - trunk/download.jboss.org/jbosstools/examples.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-05-22 08:24:26 -0400 (Tue, 22 May 2012)
New Revision: 41250
Modified:
trunk/download.jboss.org/jbosstools/examples/project-examples-shared-3.3....
Log:
JBIDE-11930 - springmvc is inaccessible
Modified: trunk/download.jboss.org/jbosstools/examples/project-examples-shared-3.3....
===================================================================
--- trunk/download.jboss.org/jbosstools/examples/project-examples-shared-3.3.... 2012-05-22 12:13:10 UTC (rev 41249)
+++ trunk/download.jboss.org/jbosstools/examples/project-examples-shared-3.3.... 2012-05-22 12:24:26 UTC (rev 41250)
@@ -275,8 +275,9 @@
<archetypeGroupId>org.jboss.spring.archetypes</archetypeGroupId>
<archetypeArtifactId>spring-mvc-webapp</archetypeArtifactId>
<archetypeVersion>1.0.0.CR5</archetypeVersion>
+ <archetypeRepository>http://repository.jboss.org/nexus/content/repositories/releases/</archetypeRepository>
+ <!--
<archetypeRepository>https://repository.jboss.org/nexus/content/repositories/jboss_releases_st...</archetypeRepository>
- <!--
<archetypeRepository>http://repository.jboss.org/nexus/content/repositories/releases/</archetypeRepository>
-->
<groupId>org.jboss.tools.example</groupId>
12 years, 7 months
- 1
- 0
JBoss Tools SVN: r41249 - trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/util.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2012-05-22 08:13:10 -0400 (Tue, 22 May 2012)
New Revision: 41249
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/util/BrowserSimLauncher.java
Log:
https://issues.jboss.org/browse/JBIDE-11923 : BrowserSim cannot start on Ubuntu with Eclipse 3.7.2 installed by package manager
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/util/BrowserSimLauncher.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/util/BrowserSimLauncher.java 2012-05-22 12:04:53 UTC (rev 41248)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/src/org/jboss/tools/vpe/browsersim/eclipse/util/BrowserSimLauncher.java 2012-05-22 12:13:10 UTC (rev 41249)
@@ -15,12 +15,14 @@
import java.io.InputStreamReader;
import java.io.Reader;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.preferences.ConfigurationScope;
-import org.jboss.tools.vpe.browsersim.browser.PlatformUtil;
+import org.eclipse.osgi.framework.internal.core.BundleFragment;
+import org.eclipse.osgi.framework.internal.core.BundleHost;
import org.jboss.tools.vpe.browsersim.eclipse.Activator;
import org.jboss.tools.vpe.browsersim.eclipse.callbacks.BrowserSimCallback;
import org.jboss.tools.vpe.browsersim.eclipse.callbacks.OpenFileCallback;
@@ -30,17 +32,19 @@
/**
* @author "Yahor Radtsevich (yradtsevich)"
*/
+@SuppressWarnings("restriction")
public class BrowserSimLauncher {
public static final String BROWSERSIM_CLASS_NAME = "org.jboss.tools.vpe.browsersim.ui.BrowserSim"; //$NON-NLS-1$
- private static final BrowserSimCallback[] BROWSERSIM_CALLBACKS = { new ViewSourceCallback(), new OpenFileCallback() };
+ private static final BrowserSimCallback[] BROWSERSIM_CALLBACKS = { new ViewSourceCallback(), new OpenFileCallback() };
+ private static final String[] REQUIRED_PLUGINS = {
+ "org.jboss.tools.vpe.browsersim",
+ "org.jboss.tools.vpe.browsersim.browser",
+ "org.eclipse.swt"};
public static void launchBrowserSim(String initialUrl) {
- String pathSeparator = System.getProperty("path.separator"); //$NON-NLS-1$
try {
- String classPath = getBundleLocation("org.jboss.tools.vpe.browsersim") //$NON-NLS-1$
- + pathSeparator + getBundleLocation("org.jboss.tools.vpe.browsersim.browser") //$NON-NLS-1$
- + pathSeparator + getBundleLocation("org.eclipse.swt") //$NON-NLS-1$
- + pathSeparator + getBundleLocation("org.eclipse.swt." + PlatformUtil.CURRENT_PLATFORM); //$NON-NLS-1$
+
+ String classPath = getClassPathString();
String javaCommand = System.getProperty("java.home") + "/bin/java"; //$NON-NLS-1$ //$NON-NLS-2$
List<String> commandElements = new ArrayList<String>();
@@ -99,13 +103,47 @@
Activator.logError(e.getMessage(), e);
}
}
+
+ private static String getClassPathString() throws IOException {
+ List<Bundle> classPathBundles = new ArrayList<Bundle>();
+ for (String requiredPlugin : REQUIRED_PLUGINS) {
+ classPathBundles.addAll(getBundleAndFragments(requiredPlugin));
+ }
+
+ String pathSeparator = System.getProperty("path.separator"); //$NON-NLS-1$
+ StringBuilder classPath = new StringBuilder();
+ if (classPathBundles.size() > 0) {
+ for (int i = 0; i < classPathBundles.size() - 1; i++) {
+ classPath.append(getBundleLocation(classPathBundles.get(i)));
+ classPath.append(pathSeparator);
+ }
+ classPath.append(getBundleLocation(classPathBundles.get(classPathBundles.size() - 1)));
+ }
+
+ return classPath.toString();
+ }
- private static String getBundleLocation(String symbolicName) throws IOException {
+ private static List<Bundle> getBundleAndFragments(String symbolicName) throws IOException {
+ List<Bundle> bundles = new ArrayList<Bundle>();
Bundle bundle = Platform.getBundle(symbolicName);
+
if (bundle == null) {
throw new IOException("Cannot find bundle: " + symbolicName);
}
+ bundles.add(bundle);
+
+ if (bundle instanceof BundleHost) {
+ BundleFragment[] fragments = ((BundleHost) bundle).getFragments();
+ if (fragments != null) {
+ Collections.addAll(bundles, fragments);
+ }
+ }
+
+ return bundles;
+ }
+
+ private static String getBundleLocation(Bundle bundle) throws IOException {
try {
File bundleLocation = FileLocator.getBundleFile(bundle);
@@ -118,7 +156,7 @@
return bundleLocation.getCanonicalPath();
} catch (IOException e) {
- throw new IOException("Cannot resolve the path to bundle: " + symbolicName, e);
+ throw new IOException("Cannot resolve the path to bundle: " + bundle.getSymbolicName(), e);
}
}
}
12 years, 7 months
- 1
- 0
JBoss Tools SVN: r41248 - trunk/build/aggregate/soatests-site/tests/org.jboss.tools.drools.ui.bot.test/resources.
by jbosstools-commits＠lists.jboss.org
Author: jgargula
Date: 2012-05-22 08:04:53 -0400 (Tue, 22 May 2012)
New Revision: 41248
Modified:
trunk/build/aggregate/soatests-site/tests/org.jboss.tools.drools.ui.bot.test/resources/SWTBotTest.properties
Log:
Changed EAP version.
Modified: trunk/build/aggregate/soatests-site/tests/org.jboss.tools.drools.ui.bot.test/resources/SWTBotTest.properties
===================================================================
--- trunk/build/aggregate/soatests-site/tests/org.jboss.tools.drools.ui.bot.test/resources/SWTBotTest.properties 2012-05-22 11:44:59 UTC (rev 41247)
+++ trunk/build/aggregate/soatests-site/tests/org.jboss.tools.drools.ui.bot.test/resources/SWTBotTest.properties 2012-05-22 12:04:53 UTC (rev 41248)
@@ -7,4 +7,4 @@
# note : when server is type of SOA, version is version of SOA (not the bundled EAP)
# SERVER=EAP,5.0,1.6,/data/jboss/jboss-eap-5.0/jboss-as
#SERVER=EAP,4.3,1.6,${jbosstools.test.jboss-eap.home}
-SERVER=EAP,4.3,1.6,/home/jgargula/Programs/jboss-eap-5.1/jboss-as
+SERVER=EAP,5.1,1.6,/home/jgargula/Programs/jboss-eap-5.1/jboss-as
12 years, 7 months
- 1
- 0
JBoss Tools SVN: r41247 - trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2012-05-22 07:44:59 -0400 (Tue, 22 May 2012)
New Revision: 41247
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/pom.xml
Log:
Remove setting of property xulrunner.plugin.name.
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/pom.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/pom.xml 2012-05-22 11:34:47 UTC (rev 41246)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/pom.xml 2012-05-22 11:44:59 UTC (rev 41247)
@@ -14,8 +14,7 @@
<properties>
<jbosstools.test.jboss-as.home>${project.build.directory}/requirements/jboss-as-7.0.2.Final</jbosstools.test.jboss-as.home>
<org.jboss.tools.vpe.ui.bot.test.richfaces.ui.jar.location>${project.build.directory}/requirements/richfaces-4.2.1.Final/artifacts/ui/richfaces-components-ui-4.2.1.Final.jar</org.jboss.tools.vpe.ui.bot.test.richfaces.ui.jar.location>
- <xulrunner.plugin.name>org.mozilla.xulrunner.gtk.linux.x86_1.9.2.16b</xulrunner.plugin.name>
- <systemProperties>-Dswtbot.test.skip=false -Dtest.configurations.dir=resources/properties/ -Djbosstools.test.jboss-as.home=${jbosstools.test.jboss-as.home} -Dorg.eclipse.swt.browser.XULRunnerPath=${project.build.outputDirectory}/../work/plugins/${xulrunner.plugin.name}/xulrunner -Dorg.jboss.tools.vpe.ui.bot.test.richfaces.ui.jar.location=${org.jboss.tools.vpe.ui.bot.test.richfaces.ui.jar.location}</systemProperties>
+ <systemProperties>-Dswtbot.test.skip=false -Dtest.configurations.dir=resources/properties/ -Djbosstools.test.jboss-as.home=${jbosstools.test.jboss-as.home} -Dorg.jboss.tools.vpe.ui.bot.test.richfaces.ui.jar.location=${org.jboss.tools.vpe.ui.bot.test.richfaces.ui.jar.location}</systemProperties>
<test.suite.class>org.jboss.tools.vpe.ui.bot.test.VPEStableSubsetBotTests</test.suite.class>
</properties>
<build>
12 years, 7 months
- 1
- 0
JBoss Tools SVN: r41246 - in trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test: seam/seam22 and 11 other directories.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-05-22 07:34:47 -0400 (Tue, 22 May 2012)
New Revision: 41246
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/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/DetectSeam23.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
trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/template/DetectRuntimeTemplate.java
Log:
Added the possibility to specify more expected runtimes.
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-22 11:29:37 UTC (rev 41245)
+++ 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-22 11:34:47 UTC (rev 41246)
@@ -7,8 +7,10 @@
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.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
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.SWTEclipseExt;
import org.jboss.tools.ui.bot.ext.condition.TaskDuration;
public class SearchingForRuntimesDialog {
@@ -20,12 +22,12 @@
bot.waitUntil(new RuntimeSearchedFinished(bot), TaskDuration.LONG.getTimeout());
SWTBotTree tree = bot.tree();
- for (int i = 0; i < tree.rowCount(); i++){
+ for (SWTBotTreeItem treeItem : SWTEclipseExt.getAllTreeItemsRecursive(SWTBotFactory.getBot(), tree, true)) {
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));
+ runtime.setName(treeItem.cell(0));
+ runtime.setVersion(treeItem.cell(1));
+ runtime.setType(treeItem.cell(2));
+ runtime.setLocation(treeItem.cell(3));
runtimes.add(runtime);
}
return runtimes;
Modified: 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 2012-05-22 11:29:37 UTC (rev 41245)
+++ 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-22 11:34:47 UTC (rev 41246)
@@ -1,5 +1,8 @@
package org.jboss.tools.runtime.as.ui.bot.test.seam.seam22;
+import java.util.Arrays;
+import java.util.List;
+
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;
@@ -11,17 +14,17 @@
public static final String VERSION = "2.2.2.Final";
@Override
- protected String getServerRuntimeID() {
+ protected String getPathID() {
return SEAM_ID;
}
@Override
- protected Runtime getExpectedServerRuntime() {
- Runtime server = new Runtime();
- server.setName(getServerRuntimeID());
- server.setType("SEAM");
- server.setVersion(VERSION);
- server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getServerRuntimeID()));
- return server;
+ protected List<Runtime> getExpectedRuntimes() {
+ Runtime seam = new Runtime();
+ seam.setName(getPathID());
+ seam.setType("SEAM");
+ seam.setVersion(VERSION);
+ seam.setLocation(RuntimeProperties.getInstance().getRuntimePath(getPathID()));
+ return Arrays.asList(seam);
}
}
Modified: 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 2012-05-22 11:29:37 UTC (rev 41245)
+++ 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-22 11:34:47 UTC (rev 41246)
@@ -1,5 +1,8 @@
package org.jboss.tools.runtime.as.ui.bot.test.seam.seam23;
+import java.util.Arrays;
+import java.util.List;
+
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;
@@ -11,17 +14,17 @@
public static final String VERSION = "2.3.0.Beta1";
@Override
- protected String getServerRuntimeID() {
+ protected String getPathID() {
return SEAM_ID;
}
@Override
- protected Runtime getExpectedServerRuntime() {
- Runtime server = new Runtime();
- server.setName(getServerRuntimeID());
- server.setType("SEAM");
- server.setVersion(VERSION);
- server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getServerRuntimeID()));
- return server;
+ protected List<Runtime> getExpectedRuntimes() {
+ Runtime seam = new Runtime();
+ seam.setName(getPathID());
+ seam.setType("SEAM");
+ seam.setVersion(VERSION);
+ seam.setLocation(RuntimeProperties.getInstance().getRuntimePath(getPathID()));
+ return Arrays.asList(seam);
}
}
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-22 11:29:37 UTC (rev 41245)
+++ 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-22 11:34:47 UTC (rev 41246)
@@ -1,5 +1,8 @@
package org.jboss.tools.runtime.as.ui.bot.test.server.eap4;
+import java.util.Arrays;
+import java.util.List;
+
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;
@@ -9,17 +12,24 @@
public static final String SERVER_ID = "jboss-eap-4.3";
@Override
- protected String getServerRuntimeID() {
+ protected String getPathID() {
return SERVER_ID;
}
@Override
- protected Runtime getExpectedServerRuntime() {
+ protected List<Runtime> getExpectedRuntimes() {
Runtime server = new Runtime();
- server.setName(getServerRuntimeID());
+ server.setName(getPathID());
server.setType("EAP");
server.setVersion("4.3");
- server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getServerRuntimeID()));
- return server;
+ server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getPathID()));
+
+ Runtime seam = new Runtime();
+ seam.setName("seam2");
+ seam.setType("SEAM");
+ seam.setVersion("2.0.2-FP_SEC1");
+ seam.setLocation(RuntimeProperties.getInstance().getRuntimePath(getPathID()) + "/seam2");
+
+ return Arrays.asList(server, seam);
}
}
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-22 11:29:37 UTC (rev 41245)
+++ 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-22 11:34:47 UTC (rev 41246)
@@ -1,5 +1,8 @@
package org.jboss.tools.runtime.as.ui.bot.test.server.eap5;
+import java.util.Arrays;
+import java.util.List;
+
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;
@@ -9,17 +12,24 @@
public static final String SERVER_ID = "jboss-eap-5.1";
@Override
- protected String getServerRuntimeID() {
+ protected String getPathID() {
return SERVER_ID;
}
@Override
- protected Runtime getExpectedServerRuntime() {
+ protected List<Runtime> getExpectedRuntimes() {
Runtime server = new Runtime();
- server.setName(getServerRuntimeID());
+ server.setName(getPathID());
server.setType("EAP");
server.setVersion("5.1");
- server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getServerRuntimeID()));
- return server;
+ server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getPathID()));
+
+ Runtime seam = new Runtime();
+ seam.setName("seam");
+ seam.setType("SEAM");
+ seam.setVersion("2.2.5.EAP5");
+ seam.setLocation(RuntimeProperties.getInstance().getRuntimePath(getPathID()) + "/seam");
+
+ return Arrays.asList(server, seam);
}
}
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-22 11:29:37 UTC (rev 41245)
+++ 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-22 11:34:47 UTC (rev 41246)
@@ -1,5 +1,8 @@
package org.jboss.tools.runtime.as.ui.bot.test.server.eap6;
+import java.util.Arrays;
+import java.util.List;
+
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;
@@ -9,17 +12,17 @@
public static final String SERVER_ID = "jboss-eap-6.0";
@Override
- protected String getServerRuntimeID() {
+ protected String getPathID() {
return SERVER_ID;
}
@Override
- protected Runtime getExpectedServerRuntime() {
+ protected List<Runtime> getExpectedRuntimes() {
Runtime server = new Runtime();
- server.setName(getServerRuntimeID());
+ server.setName(getPathID());
server.setType("EAP");
server.setVersion("6.0");
- server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getServerRuntimeID()));
- return server;
+ server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getPathID()));
+ return Arrays.asList(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-22 11:29:37 UTC (rev 41245)
+++ 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-22 11:34:47 UTC (rev 41246)
@@ -1,5 +1,8 @@
package org.jboss.tools.runtime.as.ui.bot.test.server.epp4;
+import java.util.Arrays;
+import java.util.List;
+
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;
@@ -9,17 +12,24 @@
public static final String SERVER_ID = "jboss-epp-4.3";
@Override
- protected String getServerRuntimeID() {
+ protected String getPathID() {
return SERVER_ID;
}
@Override
- protected Runtime getExpectedServerRuntime() {
+ protected List<Runtime> getExpectedRuntimes() {
Runtime server = new Runtime();
- server.setName(getServerRuntimeID());
+ server.setName(getPathID());
server.setType("EPP");
server.setVersion("4.3");
- server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getServerRuntimeID()));
- return server;
+ server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getPathID()));
+
+ Runtime seam = new Runtime();
+ seam.setName("seam2");
+ seam.setType("SEAM");
+ seam.setVersion("2.0.2-FP_SEC1");
+ seam.setLocation(RuntimeProperties.getInstance().getRuntimePath(getPathID()) + "/seam2");
+
+ return Arrays.asList(server, seam);
}
}
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-22 11:29:37 UTC (rev 41245)
+++ 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-22 11:34:47 UTC (rev 41246)
@@ -1,5 +1,8 @@
package org.jboss.tools.runtime.as.ui.bot.test.server.epp5;
+import java.util.Arrays;
+import java.util.List;
+
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;
@@ -9,17 +12,24 @@
public static final String SERVER_ID = "jboss-epp-5.2";
@Override
- protected String getServerRuntimeID() {
+ protected String getPathID() {
return SERVER_ID;
}
@Override
- protected Runtime getExpectedServerRuntime() {
+ protected List<Runtime> getExpectedRuntimes() {
Runtime server = new Runtime();
- server.setName(getServerRuntimeID());
+ server.setName(getPathID());
server.setType("EPP");
server.setVersion("5.2");
- server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getServerRuntimeID()));
- return server;
+ server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getPathID()));
+
+ Runtime seam = new Runtime();
+ seam.setName("seam");
+ seam.setType("SEAM");
+ seam.setVersion("2.2.4.EAP5");
+ seam.setLocation(RuntimeProperties.getInstance().getRuntimePath(getPathID()) + "/seam");
+
+ return Arrays.asList(server, seam);
}
}
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-22 11:29:37 UTC (rev 41245)
+++ 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-22 11:34:47 UTC (rev 41246)
@@ -1,5 +1,8 @@
package org.jboss.tools.runtime.as.ui.bot.test.server.ewp5;
+import java.util.Arrays;
+import java.util.List;
+
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;
@@ -9,17 +12,24 @@
public static final String SERVER_ID = "jboss-ewp-5.1";
@Override
- protected String getServerRuntimeID() {
+ protected String getPathID() {
return SERVER_ID;
}
@Override
- protected Runtime getExpectedServerRuntime() {
+ protected List<Runtime> getExpectedRuntimes() {
Runtime server = new Runtime();
- server.setName(getServerRuntimeID());
+ server.setName(getPathID());
server.setType("EWP");
server.setVersion("5.1");
- server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getServerRuntimeID()));
- return server;
+ server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getPathID()));
+
+ Runtime seam = new Runtime();
+ seam.setName("seam");
+ seam.setType("SEAM");
+ seam.setVersion("2.2.5.EAP5");
+ seam.setLocation(RuntimeProperties.getInstance().getRuntimePath(getPathID()) + "/seam");
+
+ return Arrays.asList(server, seam);
}
}
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-22 11:29:37 UTC (rev 41245)
+++ 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-22 11:34:47 UTC (rev 41246)
@@ -1,5 +1,8 @@
package org.jboss.tools.runtime.as.ui.bot.test.server.jboss7;
+import java.util.Arrays;
+import java.util.List;
+
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;
@@ -9,17 +12,17 @@
public static final String SERVER_ID = "jboss-as-7.1.1.Final";
@Override
- protected String getServerRuntimeID() {
+ protected String getPathID() {
return SERVER_ID;
}
@Override
- protected Runtime getExpectedServerRuntime() {
+ protected List<Runtime> getExpectedRuntimes() {
Runtime expectedServer = new Runtime();
expectedServer.setName(SERVER_ID);
expectedServer.setVersion("7.1");
expectedServer.setType("AS");
expectedServer.setLocation(RuntimeProperties.getInstance().getRuntimePath(SERVER_ID));
- return expectedServer;
+ return Arrays.asList(expectedServer);
}
}
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-22 11:29:37 UTC (rev 41245)
+++ 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-22 11:34:47 UTC (rev 41246)
@@ -1,5 +1,8 @@
package org.jboss.tools.runtime.as.ui.bot.test.server.soap5;
+import java.util.Arrays;
+import java.util.List;
+
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;
@@ -9,17 +12,24 @@
public static final String SERVER_ID = "jboss-soa-p-5";
@Override
- protected String getServerRuntimeID() {
+ protected String getPathID() {
return SERVER_ID;
}
@Override
- protected Runtime getExpectedServerRuntime() {
- Runtime expectedServer = new Runtime();
- expectedServer.setName(SERVER_ID);
- expectedServer.setVersion("5.2");
- expectedServer.setType("SOA-P");
- expectedServer.setLocation(RuntimeProperties.getInstance().getRuntimePath(SERVER_ID));
- return expectedServer;
+ protected List<Runtime> getExpectedRuntimes() {
+ Runtime server = new Runtime();
+ server.setName(SERVER_ID);
+ server.setVersion("5.2");
+ server.setType("SOA-P");
+ server.setLocation(RuntimeProperties.getInstance().getRuntimePath(SERVER_ID));
+
+ Runtime seam = new Runtime();
+ seam.setName("seam");
+ seam.setType("SEAM");
+ seam.setVersion("2.2.4.EAP5");
+ seam.setLocation(RuntimeProperties.getInstance().getRuntimePath(getPathID()) + "/seam");
+
+ return Arrays.asList(server, seam);
}
}
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-22 11:29:37 UTC (rev 41245)
+++ 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-22 11:34:47 UTC (rev 41246)
@@ -1,5 +1,8 @@
package org.jboss.tools.runtime.as.ui.bot.test.server.soap5.standalone;
+import java.util.Arrays;
+import java.util.List;
+
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;
@@ -9,17 +12,17 @@
public static final String SERVER_ID = "jboss-soa-p-standalone-5";
@Override
- protected String getServerRuntimeID() {
+ protected String getPathID() {
return SERVER_ID;
}
@Override
- protected Runtime getExpectedServerRuntime() {
+ protected List<Runtime> getExpectedRuntimes() {
Runtime expectedServer = new Runtime();
expectedServer.setName(SERVER_ID);
expectedServer.setVersion("5.2");
expectedServer.setType("SOA-P-STD");
expectedServer.setLocation(RuntimeProperties.getInstance().getRuntimePath(SERVER_ID));
- return expectedServer;
+ return Arrays.asList(expectedServer);
}
}
Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/template/DetectRuntimeTemplate.java
===================================================================
--- 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-22 11:29:37 UTC (rev 41245)
+++ 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-22 11:34:47 UTC (rev 41246)
@@ -1,8 +1,11 @@
package org.jboss.tools.runtime.as.ui.bot.test.template;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasItem;
import static org.hamcrest.Matchers.is;
+import java.util.List;
+
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;
@@ -25,25 +28,29 @@
private SearchingForRuntimesDialog searchingForRuntimesDialog;
- protected abstract String getServerRuntimeID();
+ protected abstract String getPathID();
- protected abstract Runtime getExpectedServerRuntime();
+ protected abstract List<Runtime> getExpectedRuntimes();
@Test
public void detectRuntime(){
preferences = new RuntimeDetectionPreferencesDialog();
preferences.open();
- preferences.addPath(RuntimeProperties.getInstance().getRuntimePath(getServerRuntimeID()));
+ preferences.addPath(RuntimeProperties.getInstance().getRuntimePath(getPathID()));
searchingForRuntimesDialog = preferences.search();
- assertThat(searchingForRuntimesDialog.getRuntimes().size(), is(1));
- assertThat(searchingForRuntimesDialog.getRuntimes().get(0), new RuntimeMatcher(getExpectedServerRuntime()));
+ List<Runtime> runtimes = searchingForRuntimesDialog.getRuntimes();
+
+ assertThat(runtimes.size(), is(getExpectedRuntimes().size()));
+ for (Runtime runtime : getExpectedRuntimes()){
+ assertThat(runtimes, hasItem(new RuntimeMatcher(runtime)));
+ }
}
@After
public void closePreferences(){
searchingForRuntimesDialog.ok();
- preferences.removePath(RuntimeProperties.getInstance().getRuntimePath(getServerRuntimeID()));
+ preferences.removePath(RuntimeProperties.getInstance().getRuntimePath(getPathID()));
preferences.ok();
}
}
12 years, 7 months
- 1
- 0
JBoss Tools SVN: r41245 - in trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples: wizard and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-05-22 07:29:37 -0400 (Tue, 22 May 2012)
New Revision: 41245
Modified:
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/dialog/MarkerDialog.java
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/ProjectReadyWizard.java
Log:
JBIDE-11929 - Project examples freezes during quickfix dialog
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/dialog/MarkerDialog.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/dialog/MarkerDialog.java 2012-05-22 11:16:09 UTC (rev 41244)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/dialog/MarkerDialog.java 2012-05-22 11:29:37 UTC (rev 41245)
@@ -24,6 +24,7 @@
import org.eclipse.core.resources.IResourceChangeListener;
import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.resources.WorkspaceJob;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
@@ -222,19 +223,41 @@
try {
quickFixButton.setSelection(false);
openQuickFixWizard(selected);
- for (ProjectExample project : projects) {
- if (project.getIncludedProjects() == null) {
- buildProject(project.getName());
- } else {
- List<String> includedProjects = project.getIncludedProjects();
- for (String projectName:includedProjects) {
- buildProject(projectName);
+ WorkspaceJob job = new WorkspaceJob("Building workspace") {
+
+ @Override
+ public IStatus runInWorkspace(IProgressMonitor monitor)
+ throws CoreException {
+ for (ProjectExample project : projects) {
+ if (project.getIncludedProjects() == null) {
+ buildProject(project.getName(), monitor);
+ } else {
+ List<String> includedProjects = project.getIncludedProjects();
+ for (String projectName:includedProjects) {
+ buildProject(projectName, monitor);
+ if (monitor.isCanceled()) {
+ return Status.CANCEL_STATUS;
+ }
+ }
+ }
}
+ if (monitor.isCanceled()) {
+ return Status.CANCEL_STATUS;
+ }
+ ProjectExamplesActivator.waitForBuildAndValidation.schedule();
+ try {
+ ProjectExamplesActivator.waitForBuildAndValidation.join();
+ } catch (InterruptedException e) {
+ return Status.CANCEL_STATUS;
+ }
+ if (monitor.isCanceled()) {
+ return Status.CANCEL_STATUS;
+ }
+ return Status.OK_STATUS;
}
- }
- ProjectExamplesActivator.waitForBuildAndValidation
- .schedule();
- ProjectExamplesActivator.waitForBuildAndValidation.join();
+ };
+ job.setUser(true);
+ job.schedule();
} catch (Exception e) {
ProjectExamplesActivator.log(e);
} finally {
@@ -244,14 +267,10 @@
}
}
- private void buildProject(String projectName) throws CoreException {
- IProject eclipseProject = ResourcesPlugin
- .getWorkspace().getRoot().getProject(projectName);
- if (eclipseProject != null
- && eclipseProject.isOpen()) {
- eclipseProject.build(
- IncrementalProjectBuilder.FULL_BUILD,
- null);
+ private void buildProject(String projectName, IProgressMonitor monitor) throws CoreException {
+ IProject eclipseProject = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
+ if (eclipseProject != null && eclipseProject.isOpen()) {
+ eclipseProject.build(IncrementalProjectBuilder.FULL_BUILD, monitor);
}
}
@@ -272,10 +291,7 @@
IRunnableWithProgress resolutionsRunnable = new IRunnableWithProgress() {
public void run(IProgressMonitor monitor) {
- monitor
- .beginTask(
- MarkerMessages.resolveMarkerAction_computationManyAction,
- 100);
+ monitor.beginTask(MarkerMessages.resolveMarkerAction_computationManyAction, 100);
IMarker[] allMarkers = (IMarker[]) ProjectExamplesActivator
.getMarkers(projects).toArray(new IMarker[0]);
@@ -353,7 +369,7 @@
wizard
.setWindowTitle(MarkerMessages.resolveMarkerAction_dialogTitle);
WizardDialog dialog = new QuickFixWizardDialog(PlatformUI
- .getWorkbench().getActiveWorkbenchWindow().getShell(),
+ .getWorkbench().getModalDialogShellProvider().getShell(),
wizard);
dialog.open();
}
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/ProjectReadyWizard.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/ProjectReadyWizard.java 2012-05-22 11:16:09 UTC (rev 41244)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/ProjectReadyWizard.java 2012-05-22 11:29:37 UTC (rev 41245)
@@ -15,6 +15,7 @@
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.internal.ide.IDEInternalWorkbenchImages;
import org.jboss.tools.project.examples.Messages;
import org.jboss.tools.project.examples.ProjectExamplesActivator;
@@ -66,7 +67,7 @@
@Override
public void run() {
- Dialog dialog = new MarkerDialog(getShell(), projectExamples);
+ Dialog dialog = new MarkerDialog(PlatformUI.getWorkbench().getModalDialogShellProvider().getShell(), projectExamples);
dialog.open();
}
});
12 years, 7 months
- 1
- 0