JBoss Tools SVN: r42997 - branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-08-13 03:41:27 -0400 (Mon, 13 Aug 2012)
New Revision: 42997
Modified:
branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7Server.java
Log:
JBIDE-12100 to maintenance
Modified: branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7Server.java
===================================================================
--- branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7Server.java 2012-08-13 07:40:37 UTC (rev 42996)
+++ branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7Server.java 2012-08-13 07:41:27 UTC (rev 42997)
@@ -38,11 +38,7 @@
setAttribute(IJBossToolingConstants.WEB_PORT, IJBossToolingConstants.JBOSS_WEB_DEFAULT_PORT);
setUsername(null);
setPassword(null);
- // In an emergency, we can switch pollers for EAP
- if( isEAP(getServer()))
- setAttribute(IJBossToolingConstants.STARTUP_POLLER_KEY, WebPortPoller.WEB_POLLER_ID);
- else
- setAttribute(IJBossToolingConstants.STARTUP_POLLER_KEY, JBoss7ManagerServicePoller.POLLER_ID);
+ setAttribute(IJBossToolingConstants.STARTUP_POLLER_KEY, JBoss7ManagerServicePoller.POLLER_ID);
}
public boolean hasJMXProvider() {
return getExtendedProperties().getJMXProviderType() != ServerExtendedProperties.JMX_NULL_PROVIDER;
12 years, 5 months
JBoss Tools SVN: r42996 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-08-13 03:40:37 -0400 (Mon, 13 Aug 2012)
New Revision: 42996
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7Server.java
Log:
JBIDE-12100 trunk
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7Server.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7Server.java 2012-08-13 07:30:03 UTC (rev 42995)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7Server.java 2012-08-13 07:40:37 UTC (rev 42996)
@@ -38,11 +38,7 @@
setAttribute(IJBossToolingConstants.WEB_PORT, IJBossToolingConstants.JBOSS_WEB_DEFAULT_PORT);
setUsername(null);
setPassword(null);
- // In an emergency, we can switch pollers for EAP
- if( isEAP(getServer()))
- setAttribute(IJBossToolingConstants.STARTUP_POLLER_KEY, WebPortPoller.WEB_POLLER_ID);
- else
- setAttribute(IJBossToolingConstants.STARTUP_POLLER_KEY, JBoss7ManagerServicePoller.POLLER_ID);
+ setAttribute(IJBossToolingConstants.STARTUP_POLLER_KEY, JBoss7ManagerServicePoller.POLLER_ID);
}
public boolean hasJMXProvider() {
return getExtendedProperties().getJMXProviderType() != ServerExtendedProperties.JMX_NULL_PROVIDER;
12 years, 5 months
JBoss Tools SVN: r42995 - in branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test: resources/config_files_templates/product and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-08-13 03:30:03 -0400 (Mon, 13 Aug 2012)
New Revision: 42995
Added:
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/product/eap-4.properties
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-4.0.properties
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-5.0.properties
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/CreateAS40Server.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/DeployJSPProjectAS40Server.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/OperateAS40Server.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/UndeployJSPProjectAS40Server.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/CreateAS50Server.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/DeployJSPProjectAS50Server.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/OperateAS50Server.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/UndeployJSPProjectAS50Server.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/CreateEAP4Server.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/DeployJSPProjectEAP4Server.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/OperateEAP4Server.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/UndeployJSPProjectEAP4Server.java
Modified:
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/as_prepare_workspace.launch
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java
Log:
Added tests for EAP 4 and AS 5.0 and AS 4.0
Modified: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/as_prepare_workspace.launch
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/as_prepare_workspace.launch 2012-08-13 07:29:10 UTC (rev 42994)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/as_prepare_workspace.launch 2012-08-13 07:30:03 UTC (rev 42995)
@@ -8,11 +8,14 @@
<listAttribute key="M2_PROPERTIES">
<listEntry value="jbosstools.test.jboss-eap-6.home=${folder_prompt:EAP 6 installation directory}"/>
<listEntry value="jbosstools.test.jboss-eap-5.home=${folder_prompt:EAP 5 installation directory}"/>
+<listEntry value="jbosstools.test.jboss-eap-4.home=${folder_prompt:EAP 4 installation directory}"/>
<listEntry value="jbosstools.test.jboss-as-7.1.home=${folder_prompt:JBoss AS 7.1 installation directory}"/>
<listEntry value="jbosstools.test.jboss-as-7.0.home=${folder_prompt:JBoss AS 7.0 installation directory}"/>
<listEntry value="jbosstools.test.jboss-as-6.x.home=${folder_prompt:JBoss AS 6.x installation directory}"/>
<listEntry value="jbosstools.test.jboss-as-5.1.home=${folder_prompt:JBoss AS 5.1 installation directory}"/>
+<listEntry value="jbosstools.test.jboss-as-5.0.home=${folder_prompt:JBoss AS 5.0 installation directory}"/>
<listEntry value="jbosstools.test.jboss-as-4.2.home=${folder_prompt:JBoss AS 4.2 installation directory}"/>
+<listEntry value="jbosstools.test.jboss-as-4.0.home=${folder_prompt:JBoss AS 4.0 installation directory}"/>
<listEntry value="jbosstools.test.jboss-as-3.2.home=${folder_prompt:JBoss AS 3.2 installation directory}"/>
</listAttribute>
<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
Added: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/product/eap-4.properties
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/product/eap-4.properties (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/product/eap-4.properties 2012-08-13 07:30:03 UTC (rev 42995)
@@ -0,0 +1 @@
+SERVER=EAP,4.3,default,${jbosstools.test.jboss-eap-4.home}
Added: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-4.0.properties
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-4.0.properties (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-4.0.properties 2012-08-13 07:30:03 UTC (rev 42995)
@@ -0,0 +1 @@
+SERVER=AS,4.0,default,${jbosstools.test.jboss-as-4.0.home}
Added: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-5.0.properties
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-5.0.properties (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-5.0.properties 2012-08-13 07:30:03 UTC (rev 42995)
@@ -0,0 +1 @@
+SERVER=AS,5.0,default,${jbosstools.test.jboss-as-5.0.home}
Modified: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java 2012-08-13 07:29:10 UTC (rev 42994)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java 2012-08-13 07:30:03 UTC (rev 42995)
@@ -4,10 +4,18 @@
import org.jboss.ide.eclipse.as.ui.bot.test.as3.DeployJSPProjectAS3Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as3.OperateAS3Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as3.UndeployJSPProjectAS3Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as40.CreateAS40Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as40.DeployJSPProjectAS40Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as40.OperateAS40Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as40.UndeployJSPProjectAS40Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as42.CreateAS42Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as42.DeployJSPProjectAS42Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as42.OperateAS42Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as42.UndeployJSPProjectAS42Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as50.CreateAS50Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as50.DeployJSPProjectAS50Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as50.OperateAS50Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as50.UndeployJSPProjectAS50Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as51.CreateAS51Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as51.DeployJSPProjectAS51Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as51.OperateAS51Server;
@@ -24,6 +32,10 @@
import org.jboss.ide.eclipse.as.ui.bot.test.as71.DeployJSPProjectAS71Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as71.OperateAS71Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as71.UndeployJSPProjectAS71Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.eap4.CreateEAP4Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.eap4.DeployJSPProjectEAP4Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.eap4.OperateEAP4Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.eap4.UndeployJSPProjectEAP4Server;
import org.jboss.ide.eclipse.as.ui.bot.test.eap5.CreateEAP5Server;
import org.jboss.ide.eclipse.as.ui.bot.test.eap5.DeployJSPProjectEAP5Server;
import org.jboss.ide.eclipse.as.ui.bot.test.eap5.OperateEAP5Server;
@@ -42,37 +54,49 @@
@Suite.SuiteClasses({
CreateEAP6Server.class,
CreateEAP5Server.class,
+ CreateEAP4Server.class,
CreateAS71Server.class,
CreateAS70Server.class,
CreateAS6Server.class,
CreateAS51Server.class,
+ CreateAS50Server.class,
CreateAS42Server.class,
+ CreateAS40Server.class,
CreateAS3Server.class,
OperateEAP6Server.class,
OperateEAP5Server.class,
+ OperateEAP4Server.class,
OperateAS71Server.class,
OperateAS70Server.class,
OperateAS6Server.class,
OperateAS51Server.class,
+ OperateAS50Server.class,
OperateAS42Server.class,
OperateAS3Server.class,
+ OperateAS40Server.class,
DeployJSPProjectEAP6Server.class,
DeployJSPProjectEAP5Server.class,
+ DeployJSPProjectEAP4Server.class,
DeployJSPProjectAS71Server.class,
DeployJSPProjectAS70Server.class,
DeployJSPProjectAS6Server.class,
DeployJSPProjectAS51Server.class,
+ DeployJSPProjectAS50Server.class,
DeployJSPProjectAS42Server.class,
DeployJSPProjectAS3Server.class,
+ DeployJSPProjectAS40Server.class,
HotDeployJSPFile.class,
UndeployJSPProjectEAP6Server.class,
UndeployJSPProjectEAP5Server.class,
+ UndeployJSPProjectEAP4Server.class,
UndeployJSPProjectAS71Server.class,
UndeployJSPProjectAS70Server.class,
UndeployJSPProjectAS6Server.class,
UndeployJSPProjectAS51Server.class,
+ UndeployJSPProjectAS50Server.class,
UndeployJSPProjectAS42Server.class,
UndeployJSPProjectAS3Server.class,
+ UndeployJSPProjectAS40Server.class,
DeleteServer.class
})
public class AllTestsSuite {
Added: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/CreateAS40Server.java
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/CreateAS40Server.java (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/CreateAS40Server.java 2012-08-13 07:30:03 UTC (rev 42995)
@@ -0,0 +1,44 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as40;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+
+import java.util.List;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.CreateServerTemplate;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+import org.jboss.tools.ui.bot.ext.entity.XMLConfiguration;
+
+/**
+*
+* @see CreateServerTemplate
+* @author Lucia Jelinkova
+*
+*/
+@Require(server=(a)Server(type=ServerType.JbossAS, version="4.0", state=ServerState.Present))
+public class CreateAS40Server extends CreateServerTemplate {
+
+ @Override
+ protected void assertEditorPorts() {
+ assertThat("8080", is(editor.getWebPort()));
+ assertThat("1099", is(editor.getJNDIPort()));
+ }
+
+ @Override
+ protected void assertViewPorts(List<XMLConfiguration> configurations) {
+ for (XMLConfiguration config : configurations){
+ assertValueIsNumber(config);
+ }
+ }
+
+ private void assertValueIsNumber(XMLConfiguration config){
+ try {
+ Integer.parseInt(config.getValue());
+ } catch (NumberFormatException e){
+ fail(config + " does not a numeric value");
+ }
+ }
+}
Added: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/DeployJSPProjectAS40Server.java
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/DeployJSPProjectAS40Server.java (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/DeployJSPProjectAS40Server.java 2012-08-13 07:30:03 UTC (rev 42995)
@@ -0,0 +1,21 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as40;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.DeployJSPProjectTemplate;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+
+/**
+ * @see DeployJSPProjectTemplate
+ * @author Lucia Jelinkova
+ *
+ */
+@Require(server=(a)Server(type=ServerType.JbossAS, version="4.0", state=ServerState.Running))
+public class DeployJSPProjectAS40Server extends DeployJSPProjectTemplate {
+
+ @Override
+ protected String getConsoleMessage() {
+ return "deploy, ctxPath=/" + PROJECT_NAME;
+ }
+}
Added: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/OperateAS40Server.java
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/OperateAS40Server.java (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/OperateAS40Server.java 2012-08-13 07:30:03 UTC (rev 42995)
@@ -0,0 +1,21 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as40;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.OperateServerTemplate;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+
+/**
+ * @see OperateServerTemplate
+ * @author Lucia Jelinkova
+ *
+ */
+@Require(server=(a)Server(type=ServerType.JbossAS, version="4.0", state=ServerState.NotRunning))
+public class OperateAS40Server extends OperateServerTemplate {
+
+ @Override
+ public String getWelcomePageText() {
+ return "JBoss Management";
+ }
+}
Added: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/UndeployJSPProjectAS40Server.java
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/UndeployJSPProjectAS40Server.java (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/UndeployJSPProjectAS40Server.java 2012-08-13 07:30:03 UTC (rev 42995)
@@ -0,0 +1,22 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as40;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.DeployJSPProjectTemplate;
+import org.jboss.ide.eclipse.as.ui.bot.test.template.UndeployJSPProjectTemplate;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+
+/**
+ * @see UndeployJSPProjectTemplate
+ * @author Lucia Jelinkova
+ *
+ */
+@Require(server=(a)Server(type=ServerType.JbossAS, version="4.0", state=ServerState.Running), clearProjects=false, clearWorkspace=false)
+public class UndeployJSPProjectAS40Server extends UndeployJSPProjectTemplate {
+
+ @Override
+ protected String getConsoleMessage() {
+ return "undeploy, ctxPath=/" + DeployJSPProjectTemplate.PROJECT_NAME;
+ }
+}
Added: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/CreateAS50Server.java
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/CreateAS50Server.java (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/CreateAS50Server.java 2012-08-13 07:30:03 UTC (rev 42995)
@@ -0,0 +1,44 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as50;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+
+import java.util.List;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.CreateServerTemplate;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+import org.jboss.tools.ui.bot.ext.entity.XMLConfiguration;
+
+/**
+*
+* @see CreateServerTemplate
+* @author Lucia Jelinkova
+*
+*/
+@Require(server=(a)Server(type=ServerType.JbossAS, version="5.0", state=ServerState.Present))
+public class CreateAS50Server extends CreateServerTemplate {
+
+ @Override
+ protected void assertEditorPorts() {
+ assertThat("8080", is(editor.getWebPort()));
+ assertThat("1099", is(editor.getJNDIPort()));
+ }
+
+ @Override
+ protected void assertViewPorts(List<XMLConfiguration> configurations) {
+ for (XMLConfiguration config : configurations){
+ assertValueIsNumber(config);
+ }
+ }
+
+ private void assertValueIsNumber(XMLConfiguration config){
+ try {
+ Integer.parseInt(config.getValue());
+ } catch (NumberFormatException e){
+ fail(config + " does not a numeric value");
+ }
+ }
+}
Added: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/DeployJSPProjectAS50Server.java
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/DeployJSPProjectAS50Server.java (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/DeployJSPProjectAS50Server.java 2012-08-13 07:30:03 UTC (rev 42995)
@@ -0,0 +1,21 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as50;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.DeployJSPProjectTemplate;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+
+/**
+ * @see DeployJSPProjectTemplate
+ * @author Lucia Jelinkova
+ *
+ */
+@Require(server=(a)Server(type=ServerType.JbossAS, version="5.0", state=ServerState.Running))
+public class DeployJSPProjectAS50Server extends DeployJSPProjectTemplate {
+
+ @Override
+ protected String getConsoleMessage() {
+ return "deploy, ctxPath=/" + PROJECT_NAME;
+ }
+}
Added: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/OperateAS50Server.java
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/OperateAS50Server.java (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/OperateAS50Server.java 2012-08-13 07:30:03 UTC (rev 42995)
@@ -0,0 +1,21 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as50;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.OperateServerTemplate;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+
+/**
+ * @see OperateServerTemplate
+ * @author Lucia Jelinkova
+ *
+ */
+@Require(server=(a)Server(type=ServerType.JbossAS, version="5.0", state=ServerState.NotRunning))
+public class OperateAS50Server extends OperateServerTemplate {
+
+ @Override
+ public String getWelcomePageText() {
+ return "JBoss Management";
+ }
+}
Added: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/UndeployJSPProjectAS50Server.java
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/UndeployJSPProjectAS50Server.java (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/UndeployJSPProjectAS50Server.java 2012-08-13 07:30:03 UTC (rev 42995)
@@ -0,0 +1,22 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as50;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.DeployJSPProjectTemplate;
+import org.jboss.ide.eclipse.as.ui.bot.test.template.UndeployJSPProjectTemplate;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+
+/**
+ * @see UndeployJSPProjectTemplate
+ * @author Lucia Jelinkova
+ *
+ */
+@Require(server=(a)Server(type=ServerType.JbossAS, version="5.0", state=ServerState.Running), clearProjects=false, clearWorkspace=false)
+public class UndeployJSPProjectAS50Server extends UndeployJSPProjectTemplate {
+
+ @Override
+ protected String getConsoleMessage() {
+ return "undeploy, ctxPath=/" + DeployJSPProjectTemplate.PROJECT_NAME;
+ }
+}
Added: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/CreateEAP4Server.java
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/CreateEAP4Server.java (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/CreateEAP4Server.java 2012-08-13 07:30:03 UTC (rev 42995)
@@ -0,0 +1,44 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.eap4;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+
+import java.util.List;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.CreateServerTemplate;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+import org.jboss.tools.ui.bot.ext.entity.XMLConfiguration;
+
+/**
+*
+* @see CreateServerTemplate
+* @author Lucia Jelinkova
+*
+*/
+@Require(server=(a)Server(type=ServerType.EAP, version="4.3", state=ServerState.Present))
+public class CreateEAP4Server extends CreateServerTemplate {
+
+ @Override
+ protected void assertEditorPorts() {
+ assertThat("8080", is(editor.getWebPort()));
+ assertThat("1099", is(editor.getJNDIPort()));
+ }
+
+ @Override
+ protected void assertViewPorts(List<XMLConfiguration> configurations) {
+ for (XMLConfiguration config : configurations){
+ assertValueIsNumber(config);
+ }
+ }
+
+ private void assertValueIsNumber(XMLConfiguration config){
+ try {
+ Integer.parseInt(config.getValue());
+ } catch (NumberFormatException e){
+ fail(config + " does not a numeric value");
+ }
+ }
+}
Added: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/DeployJSPProjectEAP4Server.java
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/DeployJSPProjectEAP4Server.java (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/DeployJSPProjectEAP4Server.java 2012-08-13 07:30:03 UTC (rev 42995)
@@ -0,0 +1,21 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.eap4;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.DeployJSPProjectTemplate;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+
+/**
+ * @see DeployJSPProjectTemplate
+ * @author Lucia Jelinkova
+ *
+ */
+@Require(server=(a)Server(type=ServerType.EAP, version="4.3", state=ServerState.Running))
+public class DeployJSPProjectEAP4Server extends DeployJSPProjectTemplate {
+
+ @Override
+ protected String getConsoleMessage() {
+ return "deploy, ctxPath=/" + PROJECT_NAME;
+ }
+}
Added: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/OperateEAP4Server.java
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/OperateEAP4Server.java (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/OperateEAP4Server.java 2012-08-13 07:30:03 UTC (rev 42995)
@@ -0,0 +1,21 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.eap4;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.OperateServerTemplate;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+
+/**
+ * @see OperateServerTemplate
+ * @author Lucia Jelinkova
+ *
+ */
+@Require(server=(a)Server(type=ServerType.EAP, version="4.3", state=ServerState.NotRunning))
+public class OperateEAP4Server extends OperateServerTemplate {
+
+ @Override
+ public String getWelcomePageText() {
+ return "JBoss Management";
+ }
+}
Added: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/UndeployJSPProjectEAP4Server.java
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/UndeployJSPProjectEAP4Server.java (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/UndeployJSPProjectEAP4Server.java 2012-08-13 07:30:03 UTC (rev 42995)
@@ -0,0 +1,22 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.eap4;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.DeployJSPProjectTemplate;
+import org.jboss.ide.eclipse.as.ui.bot.test.template.UndeployJSPProjectTemplate;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+
+/**
+ * @see UndeployJSPProjectTemplate
+ * @author Lucia Jelinkova
+ *
+ */
+@Require(server=(a)Server(type=ServerType.EAP, version="4.3", state=ServerState.Running), clearProjects=false, clearWorkspace=false)
+public class UndeployJSPProjectEAP4Server extends UndeployJSPProjectTemplate {
+
+ @Override
+ protected String getConsoleMessage() {
+ return "undeploy, ctxPath=/" + DeployJSPProjectTemplate.PROJECT_NAME;
+ }
+}
12 years, 5 months
JBoss Tools SVN: r42994 - branches/jbosstools-3.3.x/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-08-13 03:29:10 -0400 (Mon, 13 Aug 2012)
New Revision: 42994
Modified:
branches/jbosstools-3.3.x/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view/ServersView.java
Log:
Enhanced methods for retrieving server status and publish state
Modified: branches/jbosstools-3.3.x/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view/ServersView.java
===================================================================
--- branches/jbosstools-3.3.x/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view/ServersView.java 2012-08-13 07:28:11 UTC (rev 42993)
+++ branches/jbosstools-3.3.x/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view/ServersView.java 2012-08-13 07:29:10 UTC (rev 42994)
@@ -224,19 +224,27 @@
SWTBotTreeItem server = findServerByName(bot.tree(), serverName);
String label = server.getText();
+ log.debug("Server label is: " + label);
int startIndex = label.indexOf('[') + 1;
int endIndex = label.indexOf(',');
+ if (endIndex < 0){
+ endIndex = label.indexOf(']');
+ }
return label.substring(startIndex, endIndex);
}
-
+
public String getServerPublishStatus(String serverName){
SWTBot bot = show().bot();
SWTBotTreeItem server = findServerByName(bot.tree(), serverName);
String label = server.getText();
- int startIndex = label.indexOf(',') + 2;
+ log.info("Server label is: " + label);
+ int startIndex = label.indexOf(',');
+ if (startIndex < 0){
+ throw new IllegalStateException("Label " + label + " does not contains server publish status information");
+ }
int endIndex = label.indexOf(']');
- return label.substring(startIndex, endIndex);
+ return label.substring(startIndex + 2, endIndex);
}
public boolean containsProject(String serverName, String project){
12 years, 5 months
JBoss Tools SVN: r42993 - branches/jbosstools-3.3.x/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-08-13 03:28:11 -0400 (Mon, 13 Aug 2012)
New Revision: 42993
Modified:
branches/jbosstools-3.3.x/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/AddServer.java
Log:
Added 4.0 runtime
Modified: branches/jbosstools-3.3.x/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/AddServer.java
===================================================================
--- branches/jbosstools-3.3.x/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/AddServer.java 2012-08-13 07:14:11 UTC (rev 42992)
+++ branches/jbosstools-3.3.x/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/AddServer.java 2012-08-13 07:28:11 UTC (rev 42993)
@@ -5,6 +5,7 @@
import org.jboss.tools.ui.bot.ext.SWTTestExt;
import org.jboss.tools.ui.bot.ext.config.TestConfigurator;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.Server.JBossCommunityJBossAS32;
+import org.jboss.tools.ui.bot.ext.gen.ActionItem.Server.JBossCommunityJBossAS40;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.Server.JBossCommunityJBossAS42;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.Server.JBossCommunityJBossAS50;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.Server.JBossCommunityJBossAS51;
@@ -15,6 +16,7 @@
import org.jboss.tools.ui.bot.ext.gen.ActionItem.Server.JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform5x;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.Server.JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform6x;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.ServerRuntime.JBossCommunityJBoss32Runtime;
+import org.jboss.tools.ui.bot.ext.gen.ActionItem.ServerRuntime.JBossCommunityJBoss40Runtime;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.ServerRuntime.JBossCommunityJBoss42Runtime;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.ServerRuntime.JBossCommunityJBoss50Runtime;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.ServerRuntime.JBossCommunityJBoss51Runtime;
@@ -154,6 +156,9 @@
if ("3.2".equals(version)) {
return new ServerInfo(JBossCommunityJBoss32Runtime.LABEL,JBossCommunityJBossAS32.LABEL);
}
+ if ("4.0".equals(version)) {
+ return new ServerInfo(JBossCommunityJBoss40Runtime.LABEL,JBossCommunityJBossAS40.LABEL);
+ }
if ("4.2".equals(version)) {
return new ServerInfo(JBossCommunityJBoss42Runtime.LABEL,JBossCommunityJBossAS42.LABEL);
}
12 years, 5 months
JBoss Tools SVN: r42992 - trunk/ws/tests/org.jboss.tools.ws.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-08-13 03:14:11 -0400 (Mon, 13 Aug 2012)
New Revision: 42992
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/pom.xml
Log:
environment configuration and debug profile added into pom.xml
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/pom.xml
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/pom.xml 2012-08-13 07:13:20 UTC (rev 42991)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/pom.xml 2012-08-13 07:14:11 UTC (rev 42992)
@@ -14,19 +14,17 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <!-- debug option -->
- <!-- <systemProperties>-Xdebug -Xrunjdwp:transport=dt_socket,address=8001,server=y,suspend=y
- -Dswtbot.test.properties.file=${project.basedir}/properties/config_files/swtbot.properties</systemProperties> -->
- <systemProperties>-Dswtbot.test.properties.file=${project.basedir}/properties/swtbot.properties</systemProperties>
-
-
- <!-- need to manually set path to swtbot.test.properties with property -->
- <!-- <systemProperties>-Xdebug -Xrunjdwp:transport=dt_socket,address=8001,server=y,suspend=y
- -Dswtbot.test.properties.file=${swtbot.properties}</systemProperties> -->
- <!-- <systemProperties>-Dswtbot.test.properties.file=${swtbot.properties}</systemProperties> -->
-
+ <additionalSystemProperties></additionalSystemProperties>
+ <systemProperties>${additionalSystemProperties} -Dswtbot.test.properties.file=${project.basedir}/properties/swtbot.properties</systemProperties>
</properties>
-
+ <profiles>
+ <profile>
+ <id>debug</id>
+ <properties>
+ <additionalSystemProperties>-Xdebug -Xrunjdwp:transport=dt_socket,address=8001,server=y,suspend=y</additionalSystemProperties>
+ </properties>
+ </profile>
+ </profiles>
<build>
<plugins>
<plugin>
@@ -76,24 +74,55 @@
<artifactId>org.jboss.tools.ws.jaxrs.feature.feature.group</artifactId>
<version>0.0.0</version>
</dependency>
- <!-- workaround until JIRA fixed -->
<dependency>
<type>p2-installable-unit</type>
<artifactId>org.jboss.ide.eclipse.as.feature.feature.group</artifactId>
<version>0.0.0</version>
</dependency>
- <!-- end of workaround -->
- <!-- <dependency> <type>p2-installable-unit</type> <artifactId>org.eclipse.jst.enterprise_ui.feature.feature.group</artifactId>
- <version>0.0.0</version> </dependency> <dependency> <type>p2-installable-unit</type>
- <artifactId>org.eclipse.jst.web_ui.feature.feature.group</artifactId> <version>0.0.0</version>
- </dependency> <dependency> <type>p2-installable-unit</type> <artifactId>org.eclipse.wst.web_ui.feature.feature.group</artifactId>
- <version>0.0.0</version> </dependency> <dependency> <type>p2-installable-unit</type>
- <artifactId>org.eclipse.wst.ws_ui.feature.feature.group</artifactId> <version>0.0.0</version>
- </dependency> <dependency> <type>p2-installable-unit</type> <artifactId>org.eclipse.wst.xml_ui.feature.feature.group</artifactId>
- <version>0.0.0</version> </dependency> -->
</dependencies>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tychoVersion}</version>
+ <configuration>
+ <resolver>p2</resolver>
+ <ignoreTychoRepositories>true</ignoreTychoRepositories>
+ <environments>
+ <environment>
+ <os>macosx</os>
+ <ws>cocoa</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>macosx</os>
+ <ws>cocoa</ws>
+ <arch>x86_64</arch>
+ </environment>
+ <environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86_64</arch>
+ </environment>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86_64</arch>
+ </environment>
+ </environments>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
12 years, 5 months
JBoss Tools SVN: r42991 - trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-08-13 03:13:20 -0400 (Mon, 13 Aug 2012)
New Revision: 42991
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/pom.xml
Log:
environment configuration and debug profile added into pom.xml
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/pom.xml
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/pom.xml 2012-08-13 07:12:39 UTC (rev 42990)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/pom.xml 2012-08-13 07:13:20 UTC (rev 42991)
@@ -11,12 +11,17 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <!-- debug option -->
- <!-- <systemProperties>-Xdebug -Xrunjdwp:transport=dt_socket,address=8001,server=y,suspend=y -Dswtbot.test.properties.file=${project.basedir}/properties/swtbot.properties</systemProperties> -->
-
- <systemProperties> -Dswtbot.test.properties.file=${project.basedir}/properties/swtbot.properties</systemProperties>
+ <additionalSystemProperties></additionalSystemProperties>
+ <systemProperties>${additionalSystemProperties} -Dswtbot.test.properties.file=${project.basedir}/properties/swtbot.properties</systemProperties>
</properties>
-
+ <profiles>
+ <profile>
+ <id>debug</id>
+ <properties>
+ <additionalSystemProperties>-Xdebug -Xrunjdwp:transport=dt_socket,address=8001,server=y,suspend=y</additionalSystemProperties>
+ </properties>
+ </profile>
+ </profiles>
<build>
<plugins>
<plugin>
@@ -78,6 +83,47 @@
</dependencies>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tychoVersion}</version>
+ <configuration>
+ <resolver>p2</resolver>
+ <ignoreTychoRepositories>true</ignoreTychoRepositories>
+ <environments>
+ <environment>
+ <os>macosx</os>
+ <ws>cocoa</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>macosx</os>
+ <ws>cocoa</ws>
+ <arch>x86_64</arch>
+ </environment>
+ <environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86_64</arch>
+ </environment>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86_64</arch>
+ </environment>
+ </environments>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
12 years, 5 months
JBoss Tools SVN: r42990 - trunk/archives/tests/org.jboss.tools.archives.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-08-13 03:12:39 -0400 (Mon, 13 Aug 2012)
New Revision: 42990
Modified:
trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/pom.xml
Log:
environment configuration added into pom.xml
Modified: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/pom.xml
===================================================================
--- trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/pom.xml 2012-08-13 07:06:10 UTC (rev 42989)
+++ trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/pom.xml 2012-08-13 07:12:39 UTC (rev 42990)
@@ -77,6 +77,47 @@
</dependencies>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tychoVersion}</version>
+ <configuration>
+ <resolver>p2</resolver>
+ <ignoreTychoRepositories>true</ignoreTychoRepositories>
+ <environments>
+ <environment>
+ <os>macosx</os>
+ <ws>cocoa</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>macosx</os>
+ <ws>cocoa</ws>
+ <arch>x86_64</arch>
+ </environment>
+ <environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86_64</arch>
+ </environment>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86_64</arch>
+ </environment>
+ </environments>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
12 years, 5 months
JBoss Tools SVN: r42989 - trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-08-13 03:06:10 -0400 (Mon, 13 Aug 2012)
New Revision: 42989
Modified:
trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/VariousProjectsArchiving.java
Log:
workaround for JBIDE-11878
Modified: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/VariousProjectsArchiving.java
===================================================================
--- trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/VariousProjectsArchiving.java 2012-08-13 06:52:04 UTC (rev 42988)
+++ trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/VariousProjectsArchiving.java 2012-08-13 07:06:10 UTC (rev 42989)
@@ -54,6 +54,9 @@
/* create archive */
view.createNewJarArchive(project).finish();
+ /* workaround JBIDE-11878 */
+ view = viewForProject(project);
+
/* test if archive was created and no error was thrown*/
assertItemExistsInView(view,
project, project + ".jar [/" + project + "]");
@@ -75,6 +78,9 @@
/* create archive */
view.createNewJarArchive(project).finish();
+ /* workaround JBIDE-11878 */
+ view = viewForProject(project);
+
/* test if archive was created and no error was thrown*/
assertItemExistsInView(view,
project, project + ".jar [/" + project + "]");
12 years, 5 months