[jbosstools-commits] JBoss Tools SVN: r43292 - in trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test: as3 and 10 other directories.

Wed Aug 29 06:28:34 EDT 2012

Author: ljelinko
Date: 2012-08-29 06:28:33 -0400 (Wed, 29 Aug 2012)
New Revision: 43292

Added:
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/CreateAS40Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/DeployJSPProjectAS40Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/OperateAS40Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/UndeployJSPProjectAS40Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as42/
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as42/CreateAS42Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as42/DeployJSPProjectAS42Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as42/OperateAS42Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as42/UndeployJSPProjectAS42Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/CreateAS50Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/DeployJSPProjectAS50Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/OperateAS50Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/UndeployJSPProjectAS50Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as51/
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as51/CreateAS51Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as51/DeployJSPProjectAS51Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as51/OperateAS51Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as51/UndeployJSPProjectAS51Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as70/
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as70/CreateAS70Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as70/DeployJSPProjectAS70Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as70/OperateAS70Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as70/UndeployJSPProjectAS70Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as71/
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as71/CreateAS71Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as71/DeployJSPProjectAS71Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as71/OperateAS71Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as71/UndeployJSPProjectAS71Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/CreateEAP4Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/DeployJSPProjectEAP4Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/OperateEAP4Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/UndeployJSPProjectEAP4Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/CreateEAP5Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/DeployJSPProjectEAP5Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/OperateEAP5Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/UndeployJSPProjectEAP5Server.java
Removed:
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/CreateAS40Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/DeployJSPProjectAS40Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/OperateAS40Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/UndeployJSPProjectAS40Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as42/CreateAS42Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as42/DeployJSPProjectAS42Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as42/OperateAS42Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as42/UndeployJSPProjectAS42Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/CreateAS50Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/DeployJSPProjectAS50Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/OperateAS50Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/UndeployJSPProjectAS50Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as51/CreateAS51Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as51/DeployJSPProjectAS51Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as51/OperateAS51Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as51/UndeployJSPProjectAS51Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as70/CreateAS70Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as70/DeployJSPProjectAS70Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as70/OperateAS70Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as70/UndeployJSPProjectAS70Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as71/CreateAS71Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as71/DeployJSPProjectAS71Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as71/OperateAS71Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as71/UndeployJSPProjectAS71Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/CreateEAP4Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/DeployJSPProjectEAP4Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/OperateEAP4Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/UndeployJSPProjectEAP4Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/CreateEAP5Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/DeployJSPProjectEAP5Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/OperateEAP5Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/UndeployJSPProjectEAP5Server.java
Modified:
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as3/OperateAS3Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap6/CreateEAP6Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap6/DeployJSPProjectEAP6Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap6/OperateEAP6Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap6/UndeployJSPProjectEAP6Server.java
   trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/OperateServerTemplate.java
Log:
Merged as tests from 3.3 branch

Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as3/OperateAS3Server.java
===================================================================

--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as3/OperateAS3Server.java	2012-08-29 10:27:50 UTC (rev 43291)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as3/OperateAS3Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -16,6 +16,6 @@
 
 	@Override
 	public String getWelcomePageText() {
-		return "Manage this JBoss AS Instance";
+		return "JBoss Management";
 	}
 }

Deleted: trunk/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	2012-08-13 07:30:03 UTC (rev 42995)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/CreateAS40Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -1,44 +0,0 @@
-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
-*
-*/
- at Require(server=@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");
-		}
-	}
-}

Copied: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/CreateAS40Server.java (from rev 42995, 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)
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/CreateAS40Server.java	                        (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/CreateAS40Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -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
+*
+*/
+ at Require(server=@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");
+		}
+	}
+}

Deleted: trunk/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	2012-08-13 07:30:03 UTC (rev 42995)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/DeployJSPProjectAS40Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -1,21 +0,0 @@
-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
- *
- */
- at Require(server=@Server(type=ServerType.JbossAS, version="4.0", state=ServerState.Running))
-public class DeployJSPProjectAS40Server extends DeployJSPProjectTemplate {
-
-	@Override
-	protected String getConsoleMessage() {
-		return "deploy, ctxPath=/" + PROJECT_NAME;
-	}
-}

Copied: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/DeployJSPProjectAS40Server.java (from rev 42995, 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)
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/DeployJSPProjectAS40Server.java	                        (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/DeployJSPProjectAS40Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -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
+ *
+ */
+ at Require(server=@Server(type=ServerType.JbossAS, version="4.0", state=ServerState.Running))
+public class DeployJSPProjectAS40Server extends DeployJSPProjectTemplate {
+
+	@Override
+	protected String getConsoleMessage() {
+		return "deploy, ctxPath=/" + PROJECT_NAME;
+	}
+}

Deleted: trunk/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	2012-08-13 07:30:03 UTC (rev 42995)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/OperateAS40Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -1,21 +0,0 @@
-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
- *
- */
- at Require(server=@Server(type=ServerType.JbossAS, version="4.0", state=ServerState.NotRunning))
-public class OperateAS40Server extends OperateServerTemplate {
-
-	@Override
-	public String getWelcomePageText() {
-		return "JBoss Management";
-	}
-}

Copied: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/OperateAS40Server.java (from rev 42995, 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)
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/OperateAS40Server.java	                        (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/OperateAS40Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -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
+ *
+ */
+ at Require(server=@Server(type=ServerType.JbossAS, version="4.0", state=ServerState.NotRunning))
+public class OperateAS40Server extends OperateServerTemplate {
+
+	@Override
+	public String getWelcomePageText() {
+		return "JBoss Management";
+	}
+}

Deleted: trunk/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	2012-08-13 07:30:03 UTC (rev 42995)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/UndeployJSPProjectAS40Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -1,22 +0,0 @@
-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
- *
- */
- at Require(server=@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;
-	}
-}

Copied: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/UndeployJSPProjectAS40Server.java (from rev 42995, 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)
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/UndeployJSPProjectAS40Server.java	                        (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/UndeployJSPProjectAS40Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -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
+ *
+ */
+ at Require(server=@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;
+	}
+}

Deleted: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as42/CreateAS42Server.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/as42/CreateAS42Server.java	2012-08-13 07:30:03 UTC (rev 42995)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as42/CreateAS42Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -1,44 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as42;
-
-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
-*
-*/
- at Require(server=@Server(type=ServerType.JbossAS, version="4.2", state=ServerState.Present))
-public class CreateAS42Server 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");
-		}
-	}
-}

Copied: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as42/CreateAS42Server.java (from rev 42995, branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as42/CreateAS42Server.java)
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as42/CreateAS42Server.java	                        (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as42/CreateAS42Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -0,0 +1,44 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as42;
+
+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
+*
+*/
+ at Require(server=@Server(type=ServerType.JbossAS, version="4.2", state=ServerState.Present))
+public class CreateAS42Server 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");
+		}
+	}
+}

Deleted: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as42/DeployJSPProjectAS42Server.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/as42/DeployJSPProjectAS42Server.java	2012-08-13 07:30:03 UTC (rev 42995)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as42/DeployJSPProjectAS42Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -1,21 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as42;
-
-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
- *
- */
- at Require(server=@Server(type=ServerType.JbossAS, version="4.2", state=ServerState.Running))
-public class DeployJSPProjectAS42Server extends DeployJSPProjectTemplate {
-
-	@Override
-	protected String getConsoleMessage() {
-		return "deploy, ctxPath=/" + PROJECT_NAME;
-	}
-}

Copied: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as42/DeployJSPProjectAS42Server.java (from rev 42995, branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as42/DeployJSPProjectAS42Server.java)
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as42/DeployJSPProjectAS42Server.java	                        (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as42/DeployJSPProjectAS42Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -0,0 +1,21 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as42;
+
+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
+ *
+ */
+ at Require(server=@Server(type=ServerType.JbossAS, version="4.2", state=ServerState.Running))
+public class DeployJSPProjectAS42Server extends DeployJSPProjectTemplate {
+
+	@Override
+	protected String getConsoleMessage() {
+		return "deploy, ctxPath=/" + PROJECT_NAME;
+	}
+}

Deleted: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as42/OperateAS42Server.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/as42/OperateAS42Server.java	2012-08-13 07:30:03 UTC (rev 42995)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as42/OperateAS42Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -1,21 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as42;
-
-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
- *
- */
- at Require(server=@Server(type=ServerType.JbossAS, version="4.2", state=ServerState.NotRunning))
-public class OperateAS42Server extends OperateServerTemplate {
-
-	@Override
-	public String getWelcomePageText() {
-		return "JBoss Management";
-	}
-}

Copied: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as42/OperateAS42Server.java (from rev 42995, branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as42/OperateAS42Server.java)
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as42/OperateAS42Server.java	                        (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as42/OperateAS42Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -0,0 +1,21 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as42;
+
+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
+ *
+ */
+ at Require(server=@Server(type=ServerType.JbossAS, version="4.2", state=ServerState.NotRunning))
+public class OperateAS42Server extends OperateServerTemplate {
+
+	@Override
+	public String getWelcomePageText() {
+		return "JBoss Management";
+	}
+}

Deleted: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as42/UndeployJSPProjectAS42Server.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/as42/UndeployJSPProjectAS42Server.java	2012-08-13 07:30:03 UTC (rev 42995)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as42/UndeployJSPProjectAS42Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -1,22 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as42;
-
-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
- *
- */
- at Require(server=@Server(type=ServerType.JbossAS, version="4.2", state=ServerState.Running), clearProjects=false, clearWorkspace=false)
-public class UndeployJSPProjectAS42Server extends UndeployJSPProjectTemplate {
-
-	@Override
-	protected String getConsoleMessage() {
-		return "undeploy, ctxPath=/" + DeployJSPProjectTemplate.PROJECT_NAME;
-	}
-}

Copied: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as42/UndeployJSPProjectAS42Server.java (from rev 42995, branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as42/UndeployJSPProjectAS42Server.java)
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as42/UndeployJSPProjectAS42Server.java	                        (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as42/UndeployJSPProjectAS42Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -0,0 +1,22 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as42;
+
+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
+ *
+ */
+ at Require(server=@Server(type=ServerType.JbossAS, version="4.2", state=ServerState.Running), clearProjects=false, clearWorkspace=false)
+public class UndeployJSPProjectAS42Server extends UndeployJSPProjectTemplate {
+
+	@Override
+	protected String getConsoleMessage() {
+		return "undeploy, ctxPath=/" + DeployJSPProjectTemplate.PROJECT_NAME;
+	}
+}

Deleted: trunk/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	2012-08-13 07:30:03 UTC (rev 42995)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/CreateAS50Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -1,44 +0,0 @@
-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
-*
-*/
- at Require(server=@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");
-		}
-	}
-}

Copied: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/CreateAS50Server.java (from rev 42995, 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)
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/CreateAS50Server.java	                        (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/CreateAS50Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -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
+*
+*/
+ at Require(server=@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");
+		}
+	}
+}

Deleted: trunk/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	2012-08-13 07:30:03 UTC (rev 42995)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/DeployJSPProjectAS50Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -1,21 +0,0 @@
-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
- *
- */
- at Require(server=@Server(type=ServerType.JbossAS, version="5.0", state=ServerState.Running))
-public class DeployJSPProjectAS50Server extends DeployJSPProjectTemplate {
-
-	@Override
-	protected String getConsoleMessage() {
-		return "deploy, ctxPath=/" + PROJECT_NAME;
-	}
-}

Copied: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/DeployJSPProjectAS50Server.java (from rev 42995, 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)
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/DeployJSPProjectAS50Server.java	                        (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/DeployJSPProjectAS50Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -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
+ *
+ */
+ at Require(server=@Server(type=ServerType.JbossAS, version="5.0", state=ServerState.Running))
+public class DeployJSPProjectAS50Server extends DeployJSPProjectTemplate {
+
+	@Override
+	protected String getConsoleMessage() {
+		return "deploy, ctxPath=/" + PROJECT_NAME;
+	}
+}

Deleted: trunk/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	2012-08-13 07:30:03 UTC (rev 42995)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/OperateAS50Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -1,21 +0,0 @@
-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
- *
- */
- at Require(server=@Server(type=ServerType.JbossAS, version="5.0", state=ServerState.NotRunning))
-public class OperateAS50Server extends OperateServerTemplate {
-
-	@Override
-	public String getWelcomePageText() {
-			return "JBoss Management";
-	}
-}

Copied: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/OperateAS50Server.java (from rev 42995, 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)
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/OperateAS50Server.java	                        (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/OperateAS50Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -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
+ *
+ */
+ at Require(server=@Server(type=ServerType.JbossAS, version="5.0", state=ServerState.NotRunning))
+public class OperateAS50Server extends OperateServerTemplate {
+
+	@Override
+	public String getWelcomePageText() {
+			return "JBoss Management";
+	}
+}

Deleted: trunk/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	2012-08-13 07:30:03 UTC (rev 42995)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/UndeployJSPProjectAS50Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -1,22 +0,0 @@
-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
- *
- */
- at Require(server=@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;
-	}
-}

Copied: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/UndeployJSPProjectAS50Server.java (from rev 42995, 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)
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/UndeployJSPProjectAS50Server.java	                        (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/UndeployJSPProjectAS50Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -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
+ *
+ */
+ at Require(server=@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;
+	}
+}

Deleted: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as51/CreateAS51Server.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/as51/CreateAS51Server.java	2012-08-13 07:30:03 UTC (rev 42995)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as51/CreateAS51Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -1,44 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as51;
-
-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
-*
-*/
- at Require(server=@Server(type=ServerType.JbossAS, version="5.1", state=ServerState.Present))
-public class CreateAS51Server 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");
-		}
-	}
-}

Copied: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as51/CreateAS51Server.java (from rev 42995, branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as51/CreateAS51Server.java)
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as51/CreateAS51Server.java	                        (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as51/CreateAS51Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -0,0 +1,44 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as51;
+
+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
+*
+*/
+ at Require(server=@Server(type=ServerType.JbossAS, version="5.1", state=ServerState.Present))
+public class CreateAS51Server 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");
+		}
+	}
+}

Deleted: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as51/DeployJSPProjectAS51Server.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/as51/DeployJSPProjectAS51Server.java	2012-08-13 07:30:03 UTC (rev 42995)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as51/DeployJSPProjectAS51Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -1,21 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as51;
-
-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
- *
- */
- at Require(server=@Server(type=ServerType.JbossAS, version="5.1", state=ServerState.Running))
-public class DeployJSPProjectAS51Server extends DeployJSPProjectTemplate {
-
-	@Override
-	protected String getConsoleMessage() {
-		return "deploy, ctxPath=/" + PROJECT_NAME;
-	}
-}

Copied: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as51/DeployJSPProjectAS51Server.java (from rev 42995, branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as51/DeployJSPProjectAS51Server.java)
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as51/DeployJSPProjectAS51Server.java	                        (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as51/DeployJSPProjectAS51Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -0,0 +1,21 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as51;
+
+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
+ *
+ */
+ at Require(server=@Server(type=ServerType.JbossAS, version="5.1", state=ServerState.Running))
+public class DeployJSPProjectAS51Server extends DeployJSPProjectTemplate {
+
+	@Override
+	protected String getConsoleMessage() {
+		return "deploy, ctxPath=/" + PROJECT_NAME;
+	}
+}

Deleted: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as51/OperateAS51Server.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/as51/OperateAS51Server.java	2012-08-13 07:30:03 UTC (rev 42995)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as51/OperateAS51Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -1,21 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as51;
-
-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
- *
- */
- at Require(server=@Server(type=ServerType.JbossAS, version="5.1", state=ServerState.NotRunning))
-public class OperateAS51Server extends OperateServerTemplate {
-
-	@Override
-	public String getWelcomePageText() {
-		return "Manage this JBoss AS Instance";
-	}
-}

Copied: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as51/OperateAS51Server.java (from rev 42995, branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as51/OperateAS51Server.java)
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as51/OperateAS51Server.java	                        (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as51/OperateAS51Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -0,0 +1,21 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as51;
+
+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
+ *
+ */
+ at Require(server=@Server(type=ServerType.JbossAS, version="5.1", state=ServerState.NotRunning))
+public class OperateAS51Server extends OperateServerTemplate {
+
+	@Override
+	public String getWelcomePageText() {
+		return "Manage this JBoss AS Instance";
+	}
+}

Deleted: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as51/UndeployJSPProjectAS51Server.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/as51/UndeployJSPProjectAS51Server.java	2012-08-13 07:30:03 UTC (rev 42995)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as51/UndeployJSPProjectAS51Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -1,22 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as51;
-
-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
- *
- */
- at Require(server=@Server(type=ServerType.JbossAS, version="5.1", state=ServerState.Running), clearProjects=false, clearWorkspace=false)
-public class UndeployJSPProjectAS51Server extends UndeployJSPProjectTemplate {
-
-	@Override
-	protected String getConsoleMessage() {
-		return "undeploy, ctxPath=/" + DeployJSPProjectTemplate.PROJECT_NAME;
-	}
-}

Copied: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as51/UndeployJSPProjectAS51Server.java (from rev 42995, branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as51/UndeployJSPProjectAS51Server.java)
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as51/UndeployJSPProjectAS51Server.java	                        (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as51/UndeployJSPProjectAS51Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -0,0 +1,22 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as51;
+
+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
+ *
+ */
+ at Require(server=@Server(type=ServerType.JbossAS, version="5.1", state=ServerState.Running), clearProjects=false, clearWorkspace=false)
+public class UndeployJSPProjectAS51Server extends UndeployJSPProjectTemplate {
+
+	@Override
+	protected String getConsoleMessage() {
+		return "undeploy, ctxPath=/" + DeployJSPProjectTemplate.PROJECT_NAME;
+	}
+}

Deleted: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as70/CreateAS70Server.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/as70/CreateAS70Server.java	2012-08-13 07:30:03 UTC (rev 42995)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as70/CreateAS70Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -1,36 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as70;
-
-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.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
- *
- */
- at Require(server=@Server(type=ServerType.JbossAS, version="7.0", state=ServerState.Present))
-public class CreateAS70Server extends CreateServerTemplate {
-
-	@Override
-	protected void assertEditorPorts() {
-		assertThat("8080", is(editor.getWebPort()));
-		assertThat("9999", is(editor.getManagementPort()));		
-	}
-
-	@Override
-	protected void assertViewPorts(List<XMLConfiguration> configurations) {
-		assertThat(configurations, hasItem(new XMLConfiguration("JBoss Management", "9999")));
-		assertThat(configurations, hasItem(new XMLConfiguration("JBoss Web", "8080")));		
-	}
-}

Copied: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as70/CreateAS70Server.java (from rev 42995, branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as70/CreateAS70Server.java)
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as70/CreateAS70Server.java	                        (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as70/CreateAS70Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -0,0 +1,36 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as70;
+
+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.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
+ *
+ */
+ at Require(server=@Server(type=ServerType.JbossAS, version="7.0", state=ServerState.Present))
+public class CreateAS70Server extends CreateServerTemplate {
+
+	@Override
+	protected void assertEditorPorts() {
+		assertThat("8080", is(editor.getWebPort()));
+		assertThat("9999", is(editor.getManagementPort()));		
+	}
+
+	@Override
+	protected void assertViewPorts(List<XMLConfiguration> configurations) {
+		assertThat(configurations, hasItem(new XMLConfiguration("JBoss Management", "9999")));
+		assertThat(configurations, hasItem(new XMLConfiguration("JBoss Web", "8080")));		
+	}
+}

Deleted: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as70/DeployJSPProjectAS70Server.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/as70/DeployJSPProjectAS70Server.java	2012-08-13 07:30:03 UTC (rev 42995)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as70/DeployJSPProjectAS70Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -1,21 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as70;
-
-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
- *
- */
- at Require(server=@Server(type=ServerType.JbossAS, version="7.0", state=ServerState.Running))
-public class DeployJSPProjectAS70Server extends DeployJSPProjectTemplate {
-
-	@Override
-	protected String getConsoleMessage() {
-		return "registering web context: /" + PROJECT_NAME;
-	}
-}

Copied: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as70/DeployJSPProjectAS70Server.java (from rev 42995, branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as70/DeployJSPProjectAS70Server.java)
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as70/DeployJSPProjectAS70Server.java	                        (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as70/DeployJSPProjectAS70Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -0,0 +1,21 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as70;
+
+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
+ *
+ */
+ at Require(server=@Server(type=ServerType.JbossAS, version="7.0", state=ServerState.Running))
+public class DeployJSPProjectAS70Server extends DeployJSPProjectTemplate {
+
+	@Override
+	protected String getConsoleMessage() {
+		return "registering web context: /" + PROJECT_NAME;
+	}
+}

Deleted: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as70/OperateAS70Server.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/as70/OperateAS70Server.java	2012-08-13 07:30:03 UTC (rev 42995)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as70/OperateAS70Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -1,22 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as70;
-
-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
- *
- */
- at Require(server=@Server(type=ServerType.JbossAS, version="7.0", state=ServerState.NotRunning))
-public class OperateAS70Server extends OperateServerTemplate {
-
-	@Override
-	public String getWelcomePageText() {
-		return "Welcome to AS 7";
-	}
-}

Copied: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as70/OperateAS70Server.java (from rev 42995, branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as70/OperateAS70Server.java)
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as70/OperateAS70Server.java	                        (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as70/OperateAS70Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -0,0 +1,22 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as70;
+
+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
+ *
+ */
+ at Require(server=@Server(type=ServerType.JbossAS, version="7.0", state=ServerState.NotRunning))
+public class OperateAS70Server extends OperateServerTemplate {
+
+	@Override
+	public String getWelcomePageText() {
+		return "Welcome to AS 7";
+	}
+}

Deleted: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as70/UndeployJSPProjectAS70Server.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/as70/UndeployJSPProjectAS70Server.java	2012-08-13 07:30:03 UTC (rev 42995)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as70/UndeployJSPProjectAS70Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -1,22 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as70;
-
-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
- *
- */
- at Require(server=@Server(type=ServerType.JbossAS, version="7.0", state=ServerState.Running), clearProjects=false, clearWorkspace=false)
-public class UndeployJSPProjectAS70Server extends UndeployJSPProjectTemplate {
-
-	@Override
-	protected String getConsoleMessage() {
-		return "Undeployed \"" + DeployJSPProjectTemplate.PROJECT_NAME + ".war\"";
-	}
-}

Copied: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as70/UndeployJSPProjectAS70Server.java (from rev 42995, branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as70/UndeployJSPProjectAS70Server.java)
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as70/UndeployJSPProjectAS70Server.java	                        (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as70/UndeployJSPProjectAS70Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -0,0 +1,22 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as70;
+
+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
+ *
+ */
+ at Require(server=@Server(type=ServerType.JbossAS, version="7.0", state=ServerState.Running), clearProjects=false, clearWorkspace=false)
+public class UndeployJSPProjectAS70Server extends UndeployJSPProjectTemplate {
+
+	@Override
+	protected String getConsoleMessage() {
+		return "Undeployed \"" + DeployJSPProjectTemplate.PROJECT_NAME + ".war\"";
+	}
+}

Deleted: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as71/CreateAS71Server.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/as71/CreateAS71Server.java	2012-08-13 07:30:03 UTC (rev 42995)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as71/CreateAS71Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -1,36 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as71;
-
-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.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
- *
- */
- at Require(server=@Server(type=ServerType.JbossAS, version="7.1", state=ServerState.Present))
-public class CreateAS71Server extends CreateServerTemplate {
-
-	@Override
-	protected void assertEditorPorts() {
-		assertThat("8080", is(editor.getWebPort()));
-		assertThat("9999", is(editor.getManagementPort()));		
-	}
-
-	@Override
-	protected void assertViewPorts(List<XMLConfiguration> configurations) {
-		assertThat(configurations, hasItem(new XMLConfiguration("JBoss Management", "${jboss.management.native.port:9999}")));
-		assertThat(configurations, hasItem(new XMLConfiguration("JBoss Web", "8080")));		
-	}
-}

Copied: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as71/CreateAS71Server.java (from rev 42995, branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as71/CreateAS71Server.java)
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as71/CreateAS71Server.java	                        (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as71/CreateAS71Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -0,0 +1,36 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as71;
+
+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.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
+ *
+ */
+ at Require(server=@Server(type=ServerType.JbossAS, version="7.1", state=ServerState.Present))
+public class CreateAS71Server extends CreateServerTemplate {
+
+	@Override
+	protected void assertEditorPorts() {
+		assertThat("8080", is(editor.getWebPort()));
+		assertThat("9999", is(editor.getManagementPort()));		
+	}
+
+	@Override
+	protected void assertViewPorts(List<XMLConfiguration> configurations) {
+		assertThat(configurations, hasItem(new XMLConfiguration("JBoss Management", "${jboss.management.native.port:9999}")));
+		assertThat(configurations, hasItem(new XMLConfiguration("JBoss Web", "8080")));		
+	}
+}

Deleted: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as71/DeployJSPProjectAS71Server.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/as71/DeployJSPProjectAS71Server.java	2012-08-13 07:30:03 UTC (rev 42995)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as71/DeployJSPProjectAS71Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -1,21 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as71;
-
-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
- *
- */
- at Require(server=@Server(type=ServerType.JbossAS, version="7.1", state=ServerState.Running))
-public class DeployJSPProjectAS71Server extends DeployJSPProjectTemplate {
-
-	@Override
-	protected String getConsoleMessage() {
-		return "Registering web context: /" + PROJECT_NAME;
-	}
-}

Copied: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as71/DeployJSPProjectAS71Server.java (from rev 42995, branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as71/DeployJSPProjectAS71Server.java)
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as71/DeployJSPProjectAS71Server.java	                        (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as71/DeployJSPProjectAS71Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -0,0 +1,21 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as71;
+
+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
+ *
+ */
+ at Require(server=@Server(type=ServerType.JbossAS, version="7.1", state=ServerState.Running))
+public class DeployJSPProjectAS71Server extends DeployJSPProjectTemplate {
+
+	@Override
+	protected String getConsoleMessage() {
+		return "Registering web context: /" + PROJECT_NAME;
+	}
+}

Deleted: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as71/OperateAS71Server.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/as71/OperateAS71Server.java	2012-08-13 07:30:03 UTC (rev 42995)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as71/OperateAS71Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -1,22 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as71;
-
-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
- *
- */
- at Require(server=@Server(type=ServerType.JbossAS, version="7.1", state=ServerState.NotRunning))
-public class OperateAS71Server extends OperateServerTemplate {
-
-	@Override
-	public String getWelcomePageText() {
-		return "Welcome to AS 7";
-	}
-}

Copied: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as71/OperateAS71Server.java (from rev 42995, branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as71/OperateAS71Server.java)
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as71/OperateAS71Server.java	                        (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as71/OperateAS71Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -0,0 +1,22 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as71;
+
+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
+ *
+ */
+ at Require(server=@Server(type=ServerType.JbossAS, version="7.1", state=ServerState.NotRunning))
+public class OperateAS71Server extends OperateServerTemplate {
+
+	@Override
+	public String getWelcomePageText() {
+		return "Welcome to AS 7";
+	}
+}

Deleted: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as71/UndeployJSPProjectAS71Server.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/as71/UndeployJSPProjectAS71Server.java	2012-08-13 07:30:03 UTC (rev 42995)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as71/UndeployJSPProjectAS71Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -1,22 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as71;
-
-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
- *
- */
- at Require(server=@Server(type=ServerType.JbossAS, version="7.1", state=ServerState.Running), clearProjects=false, clearWorkspace=false)
-public class UndeployJSPProjectAS71Server extends UndeployJSPProjectTemplate {
-
-	@Override
-	protected String getConsoleMessage() {
-		return "Undeployed \"" + DeployJSPProjectTemplate.PROJECT_NAME + ".war\"";
-	}
-}

Copied: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as71/UndeployJSPProjectAS71Server.java (from rev 42995, branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as71/UndeployJSPProjectAS71Server.java)
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as71/UndeployJSPProjectAS71Server.java	                        (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as71/UndeployJSPProjectAS71Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -0,0 +1,22 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as71;
+
+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
+ *
+ */
+ at Require(server=@Server(type=ServerType.JbossAS, version="7.1", state=ServerState.Running), clearProjects=false, clearWorkspace=false)
+public class UndeployJSPProjectAS71Server extends UndeployJSPProjectTemplate {
+
+	@Override
+	protected String getConsoleMessage() {
+		return "Undeployed \"" + DeployJSPProjectTemplate.PROJECT_NAME + ".war\"";
+	}
+}

Deleted: trunk/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	2012-08-13 07:30:03 UTC (rev 42995)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/CreateEAP4Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -1,44 +0,0 @@
-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
-*
-*/
- at Require(server=@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");
-		}
-	}
-}

Copied: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/CreateEAP4Server.java (from rev 42995, 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)
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/CreateEAP4Server.java	                        (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/CreateEAP4Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -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
+*
+*/
+ at Require(server=@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");
+		}
+	}
+}

Deleted: trunk/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	2012-08-13 07:30:03 UTC (rev 42995)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/DeployJSPProjectEAP4Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -1,21 +0,0 @@
-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
- *
- */
- at Require(server=@Server(type=ServerType.EAP, version="4.3", state=ServerState.Running))
-public class DeployJSPProjectEAP4Server extends DeployJSPProjectTemplate {
-
-	@Override
-	protected String getConsoleMessage() {
-		return "deploy, ctxPath=/" + PROJECT_NAME;
-	}
-}

Copied: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/DeployJSPProjectEAP4Server.java (from rev 42995, 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)
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/DeployJSPProjectEAP4Server.java	                        (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/DeployJSPProjectEAP4Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -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
+ *
+ */
+ at Require(server=@Server(type=ServerType.EAP, version="4.3", state=ServerState.Running))
+public class DeployJSPProjectEAP4Server extends DeployJSPProjectTemplate {
+
+	@Override
+	protected String getConsoleMessage() {
+		return "deploy, ctxPath=/" + PROJECT_NAME;
+	}
+}

Deleted: trunk/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	2012-08-13 07:30:03 UTC (rev 42995)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/OperateEAP4Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -1,21 +0,0 @@
-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
- *
- */
- at Require(server=@Server(type=ServerType.EAP, version="4.3", state=ServerState.NotRunning))
-public class OperateEAP4Server extends OperateServerTemplate {
-
-	@Override
-	public String getWelcomePageText() {
-		return "JBoss Management";
-	}
-}

Copied: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/OperateEAP4Server.java (from rev 42995, 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)
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/OperateEAP4Server.java	                        (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/OperateEAP4Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -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
+ *
+ */
+ at Require(server=@Server(type=ServerType.EAP, version="4.3", state=ServerState.NotRunning))
+public class OperateEAP4Server extends OperateServerTemplate {
+
+	@Override
+	public String getWelcomePageText() {
+		return "JBoss Management";
+	}
+}

Deleted: trunk/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	2012-08-13 07:30:03 UTC (rev 42995)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/UndeployJSPProjectEAP4Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -1,22 +0,0 @@
-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
- *
- */
- at Require(server=@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;
-	}
-}

Copied: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/UndeployJSPProjectEAP4Server.java (from rev 42995, 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)
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/UndeployJSPProjectEAP4Server.java	                        (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/UndeployJSPProjectEAP4Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -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
+ *
+ */
+ at Require(server=@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;
+	}
+}

Deleted: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/CreateEAP5Server.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/eap5/CreateEAP5Server.java	2012-08-13 07:30:03 UTC (rev 42995)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/CreateEAP5Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -1,44 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.eap5;
-
-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
-*
-*/
- at Require(server=@Server(type=ServerType.EAP, version="5", state=ServerState.Present))
-public class CreateEAP5Server 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");
-		}
-	}
-}

Copied: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/CreateEAP5Server.java (from rev 42995, branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/CreateEAP5Server.java)
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/CreateEAP5Server.java	                        (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/CreateEAP5Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -0,0 +1,44 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.eap5;
+
+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
+*
+*/
+ at Require(server=@Server(type=ServerType.EAP, version="5", state=ServerState.Present))
+public class CreateEAP5Server 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");
+		}
+	}
+}

Deleted: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/DeployJSPProjectEAP5Server.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/eap5/DeployJSPProjectEAP5Server.java	2012-08-13 07:30:03 UTC (rev 42995)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/DeployJSPProjectEAP5Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -1,21 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.eap5;
-
-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
- *
- */
- at Require(server=@Server(type=ServerType.EAP, version="5", state=ServerState.Running))
-public class DeployJSPProjectEAP5Server extends DeployJSPProjectTemplate {
-
-	@Override
-	protected String getConsoleMessage() {
-		return "deploy, ctxPath=/" + PROJECT_NAME;
-	}
-}

Copied: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/DeployJSPProjectEAP5Server.java (from rev 42995, branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/DeployJSPProjectEAP5Server.java)
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/DeployJSPProjectEAP5Server.java	                        (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/DeployJSPProjectEAP5Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -0,0 +1,21 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.eap5;
+
+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
+ *
+ */
+ at Require(server=@Server(type=ServerType.EAP, version="5", state=ServerState.Running))
+public class DeployJSPProjectEAP5Server extends DeployJSPProjectTemplate {
+
+	@Override
+	protected String getConsoleMessage() {
+		return "deploy, ctxPath=/" + PROJECT_NAME;
+	}
+}

Deleted: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/OperateEAP5Server.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/eap5/OperateEAP5Server.java	2012-08-13 07:30:03 UTC (rev 42995)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/OperateEAP5Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -1,21 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.eap5;
-
-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
- *
- */
- at Require(server=@Server(type=ServerType.EAP, version="5", state=ServerState.NotRunning))
-public class OperateEAP5Server extends OperateServerTemplate {
-
-	@Override
-	public String getWelcomePageText() {
-		return "Manage this JBoss EAP Instance";
-	}
-}

Copied: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/OperateEAP5Server.java (from rev 42995, branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/OperateEAP5Server.java)
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/OperateEAP5Server.java	                        (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/OperateEAP5Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -0,0 +1,21 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.eap5;
+
+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
+ *
+ */
+ at Require(server=@Server(type=ServerType.EAP, version="5", state=ServerState.NotRunning))
+public class OperateEAP5Server extends OperateServerTemplate {
+
+	@Override
+	public String getWelcomePageText() {
+		return "Manage this JBoss EAP Instance";
+	}
+}

Deleted: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/UndeployJSPProjectEAP5Server.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/eap5/UndeployJSPProjectEAP5Server.java	2012-08-13 07:30:03 UTC (rev 42995)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/UndeployJSPProjectEAP5Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -1,22 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.eap5;
-
-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
- *
- */
- at Require(server=@Server(type=ServerType.EAP, version="5", state=ServerState.Running), clearProjects=false, clearWorkspace=false)
-public class UndeployJSPProjectEAP5Server extends UndeployJSPProjectTemplate {
-
-	@Override
-	protected String getConsoleMessage() {
-		return "undeploy, ctxPath=/" + DeployJSPProjectTemplate.PROJECT_NAME;
-	}
-}

Copied: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/UndeployJSPProjectEAP5Server.java (from rev 42995, branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/UndeployJSPProjectEAP5Server.java)
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/UndeployJSPProjectEAP5Server.java	                        (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/UndeployJSPProjectEAP5Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -0,0 +1,22 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.eap5;
+
+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
+ *
+ */
+ at Require(server=@Server(type=ServerType.EAP, version="5", state=ServerState.Running), clearProjects=false, clearWorkspace=false)
+public class UndeployJSPProjectEAP5Server extends UndeployJSPProjectTemplate {
+
+	@Override
+	protected String getConsoleMessage() {
+		return "undeploy, ctxPath=/" + DeployJSPProjectTemplate.PROJECT_NAME;
+	}
+}

Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap6/CreateEAP6Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap6/CreateEAP6Server.java	2012-08-29 10:27:50 UTC (rev 43291)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap6/CreateEAP6Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -19,7 +19,7 @@
  * @author Lucia Jelinkova
  *
  */
- at Require(server=@Server(type=ServerType.EAP, state=ServerState.Present))
+ at Require(server=@Server(type=ServerType.EAP, version="6", state=ServerState.Present))
 public class CreateEAP6Server extends CreateServerTemplate {
 
 	@Override

Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap6/DeployJSPProjectEAP6Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap6/DeployJSPProjectEAP6Server.java	2012-08-29 10:27:50 UTC (rev 43291)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap6/DeployJSPProjectEAP6Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -11,7 +11,7 @@
  * @author Lucia Jelinkova
  *
  */
- at Require(server=@Server(type=ServerType.EAP, state=ServerState.Running))
+ at Require(server=@Server(type=ServerType.EAP, version="6", state=ServerState.Running))
 public class DeployJSPProjectEAP6Server extends DeployJSPProjectTemplate {
 
 	@Override

Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap6/OperateEAP6Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap6/OperateEAP6Server.java	2012-08-29 10:27:50 UTC (rev 43291)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap6/OperateEAP6Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -12,7 +12,7 @@
  * @author Lucia Jelinkova
  *
  */
- at Require(server=@Server(type=ServerType.EAP, state=ServerState.NotRunning))
+ at Require(server=@Server(type=ServerType.EAP, version="6", state=ServerState.NotRunning))
 public class OperateEAP6Server extends OperateServerTemplate {
 
 	@Override

Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap6/UndeployJSPProjectEAP6Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap6/UndeployJSPProjectEAP6Server.java	2012-08-29 10:27:50 UTC (rev 43291)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap6/UndeployJSPProjectEAP6Server.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -12,7 +12,7 @@
  * @author Lucia Jelinkova
  *
  */
- at Require(server=@Server(type=ServerType.EAP, state=ServerState.Running), clearProjects=false, clearWorkspace=false)
+ at Require(server=@Server(type=ServerType.EAP, version="6", state=ServerState.Running), clearProjects=false, clearWorkspace=false)
 public class UndeployJSPProjectEAP6Server extends UndeployJSPProjectTemplate {
 
 	@Override

Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/OperateServerTemplate.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/OperateServerTemplate.java	2012-08-29 10:27:50 UTC (rev 43291)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/OperateServerTemplate.java	2012-08-29 10:28:33 UTC (rev 43292)
@@ -4,6 +4,7 @@
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
 
+import org.jboss.ide.eclipse.as.ui.bot.test.web.PageSourceMatcher;
 import org.jboss.tools.ui.bot.ext.SWTTestExt;
 import org.jboss.tools.ui.bot.ext.matcher.console.ConsoleOutputMatcher;
 import org.jboss.tools.ui.bot.ext.view.ServersView;
@@ -71,6 +72,7 @@
 	}
 	
 	private void assertWebPageContains(String string) {
-		serversView.openWebPage(configuredState.getServer().name);		
+		serversView.openWebPage(configuredState.getServer().name);
+		assertThat(string, new PageSourceMatcher());
 	}
 }

