[jbosstools-commits] JBoss Tools SVN: r42872 - in branches/jbosstools-3.3.x/as/tests: org.jboss.ide.eclipse.as.ui.bot.test and 44 other directories.

jbosstools-commits at lists.jboss.org jbosstools-commits at lists.jboss.org
Tue Aug 7 04:40:17 EDT 2012


Author: mmalina
Date: 2012-08-07 04:40:14 -0400 (Tue, 07 Aug 2012)
New Revision: 42872

Added:
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/.classpath
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/.project
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/META-INF/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/META-INF/MANIFEST.MF
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/build.properties
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_AllTestsSuite.launch
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_EAPCompatibilitySuite.launch
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/as_portlets_prepare_workspace.launch
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/pom.xml
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/pom.xml
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.classpath
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.project
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/.jsdtscope
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.jdt.core.prefs
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.component
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.project.facet.core.xml
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.jsdt.ui.superType.container
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.jsdt.ui.superType.name
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/META-INF/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/META-INF/MANIFEST.MF
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/WEB-INF/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/WEB-INF/lib/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/index.jsp
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/build/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/build/classes/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/build/classes/org/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/build/classes/org/jboss/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/build/classes/org/jboss/tools/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/build/classes/org/jboss/tools/tests/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/build/classes/org/jboss/tools/tests/as/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/build/classes/org/jboss/tools/tests/as/HelloWorld.class
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/src/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/src/org/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/src/org/jboss/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/src/org/jboss/tools/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/src/org/jboss/tools/tests/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/src/org/jboss/tools/tests/as/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/src/org/jboss/tools/tests/as/HelloWorld.java
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/product/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/product/eap-6.properties
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-4.properties
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-5.properties
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-6.properties
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/project_config_files/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/project_config_files/eap-6.properties
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/Activator.java
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAPCompatibilitySuite.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/as4/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/CreateAS4Server.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/as4/DeployJSPProjectAS4Server.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/as4/OperateAS4Server.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/as4/UndeployJSPProjectAS4Server.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/as5/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/CreateAS5Server.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/as5/DeployJSPProjectAS5Server.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/as5/OperateAS5Server.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/as5/UndeployJSPProjectAS5Server.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/as6/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/CreateAS6Server.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/as6/DeployJSPProjectAS6Server.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/as6/OperateAS6Server.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/as6/UndeployJSPProjectAS6Server.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/as7/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/CreateAS7Server.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/as7/DeployJSPProjectAS7Server.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/as7/OperateAS7Server.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/as7/UndeployJSPProjectAS7Server.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/editor/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerEditor.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/editor/ServerLaunchConfiguration.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/template/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/CreateServerTemplate.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/template/DeleteServer.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/template/DeployJSPProjectTemplate.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/template/HotDeployJSPFile.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/template/OperateServerTemplate.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/template/UndeployJSPProjectTemplate.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/web/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/web/PageSourceMatcher.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/wizard/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/wizard/ImportProjectWizard.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/wizard/NewFileWizard.java
Removed:
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/META-INF/MANIFEST.MF
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_AllTestsSuite.launch
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_EAPCompatibilitySuite.launch
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/as_portlets_prepare_workspace.launch
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/pom.xml
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.classpath
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.project
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/.jsdtscope
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.jdt.core.prefs
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.component
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.project.facet.core.xml
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.jsdt.ui.superType.container
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.jsdt.ui.superType.name
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/META-INF/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/META-INF/MANIFEST.MF
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/WEB-INF/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/WEB-INF/lib/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/index.jsp
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/build/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/build/classes/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/build/classes/org/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/build/classes/org/jboss/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/build/classes/org/jboss/tools/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/build/classes/org/jboss/tools/tests/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/build/classes/org/jboss/tools/tests/as/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/build/classes/org/jboss/tools/tests/as/HelloWorld.class
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/src/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/src/org/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/src/org/jboss/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/src/org/jboss/tools/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/src/org/jboss/tools/tests/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/src/org/jboss/tools/tests/as/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/src/org/jboss/tools/tests/as/HelloWorld.java
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/product/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/product/eap-6.properties
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-4.properties
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-5.properties
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-6.properties
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/project_config_files/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/project_config_files/eap-6.properties
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/Activator.java
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAPCompatibilitySuite.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/as4/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/CreateAS4Server.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/as4/DeployJSPProjectAS4Server.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/as4/OperateAS4Server.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/as4/UndeployJSPProjectAS4Server.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/as5/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/CreateAS5Server.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/as5/DeployJSPProjectAS5Server.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/as5/OperateAS5Server.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/as5/UndeployJSPProjectAS5Server.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/as6/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/CreateAS6Server.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/as6/DeployJSPProjectAS6Server.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/as6/OperateAS6Server.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/as6/UndeployJSPProjectAS6Server.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/as7/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/CreateAS7Server.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/as7/DeployJSPProjectAS7Server.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/as7/OperateAS7Server.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/as7/UndeployJSPProjectAS7Server.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/editor/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerEditor.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/editor/ServerLaunchConfiguration.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/template/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/CreateServerTemplate.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/template/DeleteServer.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/template/DeployJSPProjectTemplate.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/template/HotDeployJSPFile.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/template/OperateServerTemplate.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/template/UndeployJSPProjectTemplate.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/web/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/web/PageSourceMatcher.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/wizard/
   branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/wizard/ImportProjectWizard.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/wizard/NewFileWizard.java
Log:
Merged AS bot tests from trunk to maintenance.


Property changes on: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test
___________________________________________________________________
Added: svn:ignore
   + bin
screenshots

Added: svn:mergeinfo
   + /trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test:41809-42871

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/.classpath (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/.classpath)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/.classpath	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/.classpath	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="resources"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/.project (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/.project)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/.project	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/.project	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.jboss.ide.eclipse.as.ui.bot.test</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/META-INF/MANIFEST.MF	2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/META-INF/MANIFEST.MF	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Bot tests for AS component
-Bundle-SymbolicName: org.jboss.ide.eclipse.as.ui.bot.test;singleton:=true
-Bundle-Version: 2.4.0.qualifier
-Bundle-Activator: org.jboss.ide.eclipse.as.ui.bot.test.Activator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.swtbot.eclipse.core;bundle-version="2.0.0",
- org.eclipse.swtbot.eclipse.finder;bundle-version="2.0.0",
- org.eclipse.swtbot.swt.finder;bundle-version="2.0.0",
- org.apache.log4j;bundle-version="1.2.13",
- org.junit4;bundle-version="4.8.1",
- org.jboss.tools.ui.bot.ext;bundle-version="1.0.0",
- org.hamcrest;bundle-version="1.1.0",
- org.eclipse.ui.forms;bundle-version="3.5.0"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Bundle-Vendor: JBoss by Red Hat

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/META-INF/MANIFEST.MF (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/META-INF/MANIFEST.MF)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/META-INF/MANIFEST.MF	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/META-INF/MANIFEST.MF	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,19 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Bot tests for AS component
+Bundle-SymbolicName: org.jboss.ide.eclipse.as.ui.bot.test;singleton:=true
+Bundle-Version: 2.3.1.qualifier
+Bundle-Activator: org.jboss.ide.eclipse.as.ui.bot.test.Activator
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.swtbot.eclipse.core;bundle-version="2.0.0",
+ org.eclipse.swtbot.eclipse.finder;bundle-version="2.0.0",
+ org.eclipse.swtbot.swt.finder;bundle-version="2.0.0",
+ org.apache.log4j;bundle-version="1.2.13",
+ org.junit4;bundle-version="4.8.1",
+ org.jboss.tools.ui.bot.ext;bundle-version="1.0.0",
+ org.hamcrest;bundle-version="1.1.0",
+ org.eclipse.ui.forms;bundle-version="3.5.0"
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-Vendor: JBoss by Red Hat

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/build.properties (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/build.properties)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/build.properties	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/build.properties	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,5 @@
+source.. = src/,\
+           resources/
+output.. = bin/
+bin.includes = META-INF/,\
+               .

Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_AllTestsSuite.launch
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_AllTestsSuite.launch	2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_AllTestsSuite.launch	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.swtbot.eclipse.ui.launcher.JunitLaunchConfig">
-<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="true"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<mapAttribute key="org.eclipse.debug.core.environmentVariables">
-<mapEntry key="DISPLAY" value=":${string_prompt:display number:0}"/>
-</mapAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.ide.eclipse.as.ui.bot.test.AllTestsSuite"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.ide.eclipse.as.ui.bot.test"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dswtbot.test.properties.file=${file_prompt:&quot;Please choose a SWTBot configuration file&quot;:${workspace_loc}/org.jboss.ide.eclipse.as.ui.bot.test/resources/generated_config_files}  -Xmx1024m -XX:MaxPermSize=256m"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="false"/>
-<booleanAttribute key="useProduct" value="true"/>
-</launchConfiguration>

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_AllTestsSuite.launch (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_AllTestsSuite.launch)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_AllTestsSuite.launch	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_AllTestsSuite.launch	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.swtbot.eclipse.ui.launcher.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<mapAttribute key="org.eclipse.debug.core.environmentVariables">
+<mapEntry key="DISPLAY" value=":${string_prompt:display number:0}"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.ide.eclipse.as.ui.bot.test.AllTestsSuite"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.ide.eclipse.as.ui.bot.test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dswtbot.test.properties.file=${file_prompt:&quot;Please choose a SWTBot configuration file&quot;:${workspace_loc}/org.jboss.ide.eclipse.as.ui.bot.test/resources/generated_config_files}  -Xmx1024m -XX:MaxPermSize=256m"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.platform.ide"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>

Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_EAPCompatibilitySuite.launch
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_EAPCompatibilitySuite.launch	2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_EAPCompatibilitySuite.launch	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.swtbot.eclipse.ui.launcher.JunitLaunchConfig">
-<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="true"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAPCompatibilitySuite.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<mapAttribute key="org.eclipse.debug.core.environmentVariables">
-<mapEntry key="DISPLAY" value=":${string_prompt:display number:0}"/>
-</mapAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.ide.eclipse.as.ui.bot.test.EAPCompatibilitySuite"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.ide.eclipse.as.ui.bot.test"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dswtbot.test.properties.file=${file_prompt:&quot;Please choose a SWTBot configuration file&quot;:${workspace_loc}/org.jboss.ide.eclipse.as.ui.bot.test/resources/generated_config_files}  -Xmx1024m -XX:MaxPermSize=256m"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="false"/>
-<booleanAttribute key="useProduct" value="true"/>
-</launchConfiguration>

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_EAPCompatibilitySuite.launch (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_EAPCompatibilitySuite.launch)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_EAPCompatibilitySuite.launch	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_EAPCompatibilitySuite.launch	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.swtbot.eclipse.ui.launcher.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAPCompatibilitySuite.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<mapAttribute key="org.eclipse.debug.core.environmentVariables">
+<mapEntry key="DISPLAY" value=":${string_prompt:display number:0}"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.ide.eclipse.as.ui.bot.test.EAPCompatibilitySuite"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.ide.eclipse.as.ui.bot.test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dswtbot.test.properties.file=${file_prompt:&quot;Please choose a SWTBot configuration file&quot;:${workspace_loc}/org.jboss.ide.eclipse.as.ui.bot.test/resources/generated_config_files}  -Xmx1024m -XX:MaxPermSize=256m"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.platform.ide"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>

Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/as_portlets_prepare_workspace.launch
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/as_portlets_prepare_workspace.launch	2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/as_portlets_prepare_workspace.launch	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
-<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
-<stringAttribute key="M2_GOALS" value="clean process-resources"/>
-<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
-<booleanAttribute key="M2_OFFLINE" value="false"/>
-<stringAttribute key="M2_PROFILES" value=""/>
-<listAttribute key="M2_PROPERTIES">
-<listEntry value="eap-6.0=${folder_prompt:EAP 6.0 installation directory}"/>
-<listEntry value="jboss-as-5.1=${folder_prompt:JBoss AS 5.1 installation directory}"/>
-<listEntry value="jboss-as-6.1=${folder_prompt:JBoss AS 6.1 installation directory}"/>
-</listAttribute>
-<stringAttribute key="M2_RUNTIME" value="/home/ljelinko/programs/apache-maven-3.0.3"/>
-<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
-<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
-<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace}"/>
-</launchConfiguration>

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/as_portlets_prepare_workspace.launch (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/as_portlets_prepare_workspace.launch)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/as_portlets_prepare_workspace.launch	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/as_portlets_prepare_workspace.launch	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
+<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
+<stringAttribute key="M2_GOALS" value="clean process-resources"/>
+<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
+<booleanAttribute key="M2_OFFLINE" value="false"/>
+<stringAttribute key="M2_PROFILES" value=""/>
+<listAttribute key="M2_PROPERTIES">
+<listEntry value="eap-6.0=${folder_prompt:EAP 6.0 installation directory}"/>
+<listEntry value="jboss-as-5.1=${folder_prompt:JBoss AS 5.1 installation directory}"/>
+<listEntry value="jboss-as-6.1=${folder_prompt:JBoss AS 6.1 installation directory}"/>
+</listAttribute>
+<stringAttribute key="M2_RUNTIME" value="/home/ljelinko/programs/apache-maven-3.0.3"/>
+<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
+<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
+<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace}"/>
+</launchConfiguration>

Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/pom.xml
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/pom.xml	2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/pom.xml	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	
-	<groupId>org.jboss.ide.eclipse.as.ui.bot.test</groupId>
-	<artifactId>prepare.workspace</artifactId>
-	<version>0.0.0-SNAPSHOT</version>
-	<modelVersion>4.0.0</modelVersion> 
-
-	<build>
-		<resources>
-			<resource>
-				<directory>../../resources/config_files_templates/product</directory>
-				<filtering>true</filtering>
-			</resource>
-			<resource>
-				<directory>../../resources/config_files_templates/project</directory>
-				<filtering>true</filtering>
-			</resource>
-		</resources>
-		
-		<outputDirectory>../../resources/generated_config_files</outputDirectory>
-	</build>	
-</project>
\ No newline at end of file

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/pom.xml (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/pom.xml)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/pom.xml	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/pom.xml	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	
+	<groupId>org.jboss.ide.eclipse.as.ui.bot.test</groupId>
+	<artifactId>prepare.workspace</artifactId>
+	<version>0.0.0-SNAPSHOT</version>
+	<modelVersion>4.0.0</modelVersion> 
+
+	<build>
+		<resources>
+			<resource>
+				<directory>../../resources/config_files_templates/product</directory>
+				<filtering>true</filtering>
+			</resource>
+			<resource>
+				<directory>../../resources/config_files_templates/project</directory>
+				<filtering>true</filtering>
+			</resource>
+		</resources>
+		
+		<outputDirectory>../../resources/generated_config_files</outputDirectory>
+	</build>	
+</project>
\ No newline at end of file

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/pom.xml (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/pom.xml)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/pom.xml	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/pom.xml	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.jboss.tools.as</groupId>
+		<artifactId>tests</artifactId>
+		<version>2.3.1-SNAPSHOT</version>
+	</parent>
+	<groupId>org.jboss.tools.as.tests</groupId>
+	<artifactId>org.jboss.ide.eclipse.as.ui.bot.test</artifactId>
+
+	<packaging>eclipse-test-plugin</packaging>
+
+	<properties>
+		<jbosstools.test.jboss-as-7.1.home>${requirementsDirectory}/jboss-as-7.1.1.Final</jbosstools.test.jboss-as-7.1.home>
+		<jbosstools.test.jboss-as-7.1.url>http://download.jboss.org/jbossas/7.1/jboss-as-7.1.1.Final/jboss-as-7.1.1.Final.zip</jbosstools.test.jboss-as-7.1.url>
+		<jbosstools.test.jboss-as-7.1.md5>175c92545454f4e7270821f4b8326c4e</jbosstools.test.jboss-as-7.1.md5>
+		<configurations.dir>resources/project_config_files</configurations.dir>
+		<additionalSystemProperties></additionalSystemProperties>
+		<systemProperties>${additionalSystemProperties} -Djbosstools.test.jboss-as-7.1.home=${jbosstools.test.jboss-as-7.1.home} -Dtest.configurations.dir=${configurations.dir}  -Dorg.eclipse.swtbot.screenshots.dir=${project.build.directory}/screenshots</systemProperties>
+		<test.class>org.jboss.ide.eclipse.as.ui.bot.test.AllTestsSuite</test.class>
+		
+	</properties>
+
+	<profiles>
+		<profile>
+			<id>debug</id>
+			<properties>
+				<additionalSystemProperties>-Xdebug -Xrunjdwp:transport=dt_socket,address=8001,server=y,suspend=y </additionalSystemProperties>
+			</properties>
+		</profile>
+		<profile>
+			<id>osx</id>
+			<activation>
+				<property>
+					<name>java.vendor.url</name>
+					<value>http://www.apple.com/</value>
+				</property>
+			</activation>
+			<properties>
+				<!-- THE FOLLOWING LINE MUST NOT BE BROKEN BY AUTOFORMATTING -->
+				<platformSystemProperties> -d32 -Dosgi.arch=x86 -XstartOnFirstThread -Dorg.eclipse.swtbot.keyboard.layout=MAC_EN_US</platformSystemProperties>
+			</properties>
+		</profile>
+	</profiles>
+	
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>com.googlecode.maven-download-plugin</groupId>
+				<artifactId>maven-download-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>install-as-7.1.1</id>
+						<phase>pre-integration-test</phase>
+						<goals>
+							<goal>wget</goal>
+						</goals>
+						<configuration>
+							<url>${jbosstools.test.jboss-as-7.1.url}</url>
+							<md5>${jbosstools.test.jboss-as-7.1.md5}</md5>
+							<unpack>true</unpack>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
+				<configuration>
+					<useUIThread>false</useUIThread>
+					<surefire.timeout>7200</surefire.timeout>
+					<forkedProcessTimeoutInSeconds>7200</forkedProcessTimeoutInSeconds>
+					<testSuite>org.jboss.ide.eclipse.as.ui.bot.test</testSuite>
+					<testClass>${test.class}</testClass>
+					<skip>${swtbot.test.skip}</skip>
+					<dependencies combine.children="append">
+						<dependency>
+							<type>p2-installable-unit</type>
+							<artifactId>org.jboss.ide.eclipse.as.feature.feature.group</artifactId>
+							<version>0.0.0</version>
+						</dependency>
+					</dependencies>
+				</configuration>
+			</plugin>
+			
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>target-platform-configuration</artifactId>
+				<version>${tychoVersion}</version>
+				<configuration>
+					<resolver>p2</resolver>
+					<ignoreTychoRepositories>true</ignoreTychoRepositories>
+					<environments>
+						<environment>
+							<os>macosx</os>
+							<ws>cocoa</ws>
+							<arch>x86</arch>
+						</environment>
+						<environment>
+							<os>macosx</os>
+							<ws>cocoa</ws>
+							<arch>x86_64</arch>
+						</environment>
+						<environment>
+							<os>win32</os>
+							<ws>win32</ws>
+							<arch>x86</arch>
+						</environment>
+						<environment>
+							<os>win32</os>
+							<ws>win32</ws>
+							<arch>x86_64</arch>
+						</environment>
+						<environment>
+							<os>linux</os>
+							<ws>gtk</ws>
+							<arch>x86</arch>
+						</environment>
+						<environment>
+							<os>linux</os>
+							<ws>gtk</ws>
+							<arch>x86_64</arch>
+						</environment>
+					</environments>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>

Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.classpath
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.classpath	2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.classpath	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
-		<attributes>
-			<attribute name="owner.project.facets" value="java"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="build/classes"/>
-</classpath>

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.classpath (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.classpath)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.classpath	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.classpath	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
+		<attributes>
+			<attribute name="owner.project.facets" value="java"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="build/classes"/>
+</classpath>

Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.project
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.project	2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.project	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>jsp-project</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
-	</natures>
-</projectDescription>

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.project (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.project)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.project	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.project	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>jsp-project</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+	</natures>
+</projectDescription>

Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/.jsdtscope
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/.jsdtscope	2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/.jsdtscope	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="WebContent"/>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
-		<attributes>
-			<attribute name="hide" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
-	<classpathentry kind="output" path=""/>
-</classpath>

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/.jsdtscope (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/.jsdtscope)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/.jsdtscope	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/.jsdtscope	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="WebContent"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+		<attributes>
+			<attribute name="hide" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+	<classpathentry kind="output" path=""/>
+</classpath>

Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.jdt.core.prefs	2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.jdt.core.prefs	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.jdt.core.prefs (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.jdt.core.prefs)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.jdt.core.prefs	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.jdt.core.prefs	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6

Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.component
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.component	2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.component	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="jsp-project">
-        <wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
-        <property name="context-root" value="jsp-project"/>
-        <property name="java-output-path" value="/jsp-project/build/classes"/>
-    </wb-module>
-</project-modules>

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.component (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.component)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.component	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.component	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="jsp-project">
+        <wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
+        <property name="context-root" value="jsp-project"/>
+        <property name="java-output-path" value="/jsp-project/build/classes"/>
+    </wb-module>
+</project-modules>

Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.project.facet.core.xml	2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.project.facet.core.xml	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <fixed facet="jst.web"/>
-  <fixed facet="java"/>
-  <fixed facet="wst.jsdt.web"/>
-  <installed facet="java" version="1.6"/>
-  <installed facet="wst.jsdt.web" version="1.0"/>
-  <installed facet="jst.web" version="2.5"/>
-</faceted-project>

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.project.facet.core.xml (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.project.facet.core.xml)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.project.facet.core.xml	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.project.facet.core.xml	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <fixed facet="jst.web"/>
+  <fixed facet="java"/>
+  <fixed facet="wst.jsdt.web"/>
+  <installed facet="java" version="1.6"/>
+  <installed facet="wst.jsdt.web" version="1.0"/>
+  <installed facet="jst.web" version="2.5"/>
+</faceted-project>

Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.jsdt.ui.superType.container
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.jsdt.ui.superType.container	2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.jsdt.ui.superType.container	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1 +0,0 @@
-org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.jsdt.ui.superType.container (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.jsdt.ui.superType.container)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.jsdt.ui.superType.container	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.jsdt.ui.superType.container	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file

Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.jsdt.ui.superType.name
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.jsdt.ui.superType.name	2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.jsdt.ui.superType.name	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1 +0,0 @@
-Window
\ No newline at end of file

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.jsdt.ui.superType.name (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.jsdt.ui.superType.name)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.jsdt.ui.superType.name	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.jsdt.ui.superType.name	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1 @@
+Window
\ No newline at end of file

Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/META-INF/MANIFEST.MF	2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/META-INF/MANIFEST.MF	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/META-INF/MANIFEST.MF (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/META-INF/MANIFEST.MF)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/META-INF/MANIFEST.MF	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/META-INF/MANIFEST.MF	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path: 
+

Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/index.jsp
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/index.jsp	2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/index.jsp	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,6 +0,0 @@
-<%@ page  language="java" import="org.jboss.tools.tests.as.*" errorPage="" %>
-<html>
-<body>
-	<%=HelloWorld.sayHello()%>
-</body>
-</html>
\ No newline at end of file

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/index.jsp (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/index.jsp)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/index.jsp	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/index.jsp	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,6 @@
+<%@ page  language="java" import="org.jboss.tools.tests.as.*" errorPage="" %>
+<html>
+<body>
+	<%=HelloWorld.sayHello()%>
+</body>
+</html>
\ No newline at end of file

Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/build/classes/org/jboss/tools/tests/as/HelloWorld.class
===================================================================
(Binary files differ)

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/build/classes/org/jboss/tools/tests/as/HelloWorld.class (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/build/classes/org/jboss/tools/tests/as/HelloWorld.class)
===================================================================
(Binary files differ)

Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/src/org/jboss/tools/tests/as/HelloWorld.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/src/org/jboss/tools/tests/as/HelloWorld.java	2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/src/org/jboss/tools/tests/as/HelloWorld.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,8 +0,0 @@
-package org.jboss.tools.tests.as;
-
-public class HelloWorld {
-
-	public static String sayHello(){
-		return "Hello tests!";
-	}
-}

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/src/org/jboss/tools/tests/as/HelloWorld.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/src/org/jboss/tools/tests/as/HelloWorld.java)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/src/org/jboss/tools/tests/as/HelloWorld.java	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/src/org/jboss/tools/tests/as/HelloWorld.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,8 @@
+package org.jboss.tools.tests.as;
+
+public class HelloWorld {
+
+	public static String sayHello(){
+		return "Hello tests!";
+	}
+}


Property changes on: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources
___________________________________________________________________
Added: svn:ignore
   + generated_config_files


Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/product/eap-6.properties
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/product/eap-6.properties	2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/product/eap-6.properties	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1 +0,0 @@
-SERVER=EAP,6.0,default,${eap-6.0}

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/product/eap-6.properties (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/product/eap-6.properties)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/product/eap-6.properties	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/product/eap-6.properties	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1 @@
+SERVER=EAP,6.0,default,${eap-6.0}

Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-4.properties
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-4.properties	2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-4.properties	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1 +0,0 @@
-SERVER=AS,4.2,default,${jboss-as-4.2}

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-4.properties (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-4.properties)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-4.properties	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-4.properties	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1 @@
+SERVER=AS,4.2,default,${jboss-as-4.2}

Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-5.properties
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-5.properties	2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-5.properties	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1 +0,0 @@
-SERVER=AS,5.1,default,${jboss-as-5.1}

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-5.properties (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-5.properties)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-5.properties	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-5.properties	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1 @@
+SERVER=AS,5.1,default,${jboss-as-5.1}

Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-6.properties
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-6.properties	2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-6.properties	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1 +0,0 @@
-SERVER=AS,6.1,default,${jboss-as-6.1}

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-6.properties (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-6.properties)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-6.properties	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-6.properties	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1 @@
+SERVER=AS,6.1,default,${jboss-as-6.1}

Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/project_config_files/eap-6.properties
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/project_config_files/eap-6.properties	2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/project_config_files/eap-6.properties	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1 +0,0 @@
-SERVER=EAP,6.0,default,${jbosstools.test.jboss-as-7.1.home}

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/project_config_files/eap-6.properties (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/project_config_files/eap-6.properties)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/project_config_files/eap-6.properties	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/project_config_files/eap-6.properties	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1 @@
+SERVER=EAP,6.0,default,${jbosstools.test.jboss-as-7.1.home}

Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/Activator.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/Activator.java	2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/Activator.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,32 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-public class Activator implements BundleActivator {
-
-	public static final String PLUGIN_ID = "org.jboss.ide.eclipse.as.ui.bot.test";
-	
-	private static BundleContext context;
-
-	static BundleContext getContext() {
-		return context;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext bundleContext) throws Exception {
-		Activator.context = bundleContext;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext bundleContext) throws Exception {
-		Activator.context = null;
-	}
-
-}

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/Activator.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/Activator.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/Activator.java	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/Activator.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,32 @@
+package org.jboss.ide.eclipse.as.ui.bot.test;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+public class Activator implements BundleActivator {
+
+	public static final String PLUGIN_ID = "org.jboss.ide.eclipse.as.ui.bot.test";
+	
+	private static BundleContext context;
+
+	static BundleContext getContext() {
+		return context;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
+	 */
+	public void start(BundleContext bundleContext) throws Exception {
+		Activator.context = bundleContext;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
+	 */
+	public void stop(BundleContext bundleContext) throws Exception {
+		Activator.context = null;
+	}
+
+}

Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java	2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,48 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test;
-
-import org.jboss.ide.eclipse.as.ui.bot.test.as4.CreateAS4Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.as4.DeployJSPProjectAS4Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.as4.OperateAS4Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.as4.UndeployJSPProjectAS4Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.as5.CreateAS5Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.as5.DeployJSPProjectAS5Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.as5.OperateAS5Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.as5.UndeployJSPProjectAS5Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.as6.CreateAS6Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.as6.DeployJSPProjectAS6Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.as6.OperateAS6Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.as6.UndeployJSPProjectAS6Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.as7.CreateAS7Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.as7.DeployJSPProjectAS7Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.as7.OperateAS7Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.as7.UndeployJSPProjectAS7Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.template.DeleteServer;
-import org.jboss.ide.eclipse.as.ui.bot.test.template.HotDeployJSPFile;
-import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
- at RunWith(RequirementAwareSuite.class)
- at Suite.SuiteClasses({
-		CreateAS7Server.class, 
-		CreateAS6Server.class,
-		CreateAS5Server.class,
-		CreateAS4Server.class,
-		OperateAS7Server.class,
-		OperateAS6Server.class,
-		OperateAS5Server.class,
-		OperateAS4Server.class,
-		DeployJSPProjectAS7Server.class,
-		DeployJSPProjectAS6Server.class,
-		DeployJSPProjectAS5Server.class,
-		DeployJSPProjectAS4Server.class,
-		HotDeployJSPFile.class,
-		UndeployJSPProjectAS7Server.class,
-		UndeployJSPProjectAS6Server.class,
-		UndeployJSPProjectAS5Server.class,
-		UndeployJSPProjectAS4Server.class,
-		DeleteServer.class
-})
-public class AllTestsSuite {
-
-}

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,48 @@
+package org.jboss.ide.eclipse.as.ui.bot.test;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.as4.CreateAS4Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as4.DeployJSPProjectAS4Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as4.OperateAS4Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as4.UndeployJSPProjectAS4Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as5.CreateAS5Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as5.DeployJSPProjectAS5Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as5.OperateAS5Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as5.UndeployJSPProjectAS5Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as6.CreateAS6Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as6.DeployJSPProjectAS6Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as6.OperateAS6Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as6.UndeployJSPProjectAS6Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as7.CreateAS7Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as7.DeployJSPProjectAS7Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as7.OperateAS7Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as7.UndeployJSPProjectAS7Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.template.DeleteServer;
+import org.jboss.ide.eclipse.as.ui.bot.test.template.HotDeployJSPFile;
+import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+ at RunWith(RequirementAwareSuite.class)
+ at Suite.SuiteClasses({
+		CreateAS7Server.class, 
+		CreateAS6Server.class,
+		CreateAS5Server.class,
+		CreateAS4Server.class,
+		OperateAS7Server.class,
+		OperateAS6Server.class,
+		OperateAS5Server.class,
+		OperateAS4Server.class,
+		DeployJSPProjectAS7Server.class,
+		DeployJSPProjectAS6Server.class,
+		DeployJSPProjectAS5Server.class,
+		DeployJSPProjectAS4Server.class,
+		HotDeployJSPFile.class,
+		UndeployJSPProjectAS7Server.class,
+		UndeployJSPProjectAS6Server.class,
+		UndeployJSPProjectAS5Server.class,
+		UndeployJSPProjectAS4Server.class,
+		DeleteServer.class
+})
+public class AllTestsSuite {
+
+}

Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAPCompatibilitySuite.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAPCompatibilitySuite.java	2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAPCompatibilitySuite.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,24 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test;
-
-import org.jboss.ide.eclipse.as.ui.bot.test.as7.CreateAS7Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.as7.DeployJSPProjectAS7Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.as7.OperateAS7Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.as7.UndeployJSPProjectAS7Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.template.DeleteServer;
-import org.jboss.ide.eclipse.as.ui.bot.test.template.HotDeployJSPFile;
-import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
- at RunWith(RequirementAwareSuite.class)
- at Suite.SuiteClasses({
-		CreateAS7Server.class, 
-		OperateAS7Server.class,
-		DeployJSPProjectAS7Server.class,
-		HotDeployJSPFile.class,
-		UndeployJSPProjectAS7Server.class,
-		DeleteServer.class
-})
-public class EAPCompatibilitySuite {
-
-}

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAPCompatibilitySuite.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAPCompatibilitySuite.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/EAPCompatibilitySuite.java	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAPCompatibilitySuite.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,24 @@
+package org.jboss.ide.eclipse.as.ui.bot.test;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.as7.CreateAS7Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as7.DeployJSPProjectAS7Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as7.OperateAS7Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as7.UndeployJSPProjectAS7Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.template.DeleteServer;
+import org.jboss.ide.eclipse.as.ui.bot.test.template.HotDeployJSPFile;
+import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+ at RunWith(RequirementAwareSuite.class)
+ at Suite.SuiteClasses({
+		CreateAS7Server.class, 
+		OperateAS7Server.class,
+		DeployJSPProjectAS7Server.class,
+		HotDeployJSPFile.class,
+		UndeployJSPProjectAS7Server.class,
+		DeleteServer.class
+})
+public class EAPCompatibilitySuite {
+
+}

Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/CreateAS4Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/CreateAS4Server.java	2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/CreateAS4Server.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,44 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as4;
-
-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 CreateAS4Server 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: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/CreateAS4Server.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/CreateAS4Server.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/as4/CreateAS4Server.java	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/CreateAS4Server.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,44 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as4;
+
+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 CreateAS4Server 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: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/DeployJSPProjectAS4Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/DeployJSPProjectAS4Server.java	2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/DeployJSPProjectAS4Server.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,21 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as4;
-
-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 DeployJSPProjectAS4Server extends DeployJSPProjectTemplate {
-
-	@Override
-	protected String getConsoleMessage() {
-		return "deploy, ctxPath=/" + PROJECT_NAME;
-	}
-}

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/DeployJSPProjectAS4Server.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/DeployJSPProjectAS4Server.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/as4/DeployJSPProjectAS4Server.java	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/DeployJSPProjectAS4Server.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,21 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as4;
+
+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 DeployJSPProjectAS4Server extends DeployJSPProjectTemplate {
+
+	@Override
+	protected String getConsoleMessage() {
+		return "deploy, ctxPath=/" + PROJECT_NAME;
+	}
+}

Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/OperateAS4Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/OperateAS4Server.java	2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/OperateAS4Server.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,21 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as4;
-
-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 OperateAS4Server extends OperateServerTemplate {
-
-	@Override
-	public String getWelcomePageText() {
-		return "Manage this JBoss AS Instance";
-	}
-}

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/OperateAS4Server.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/OperateAS4Server.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/as4/OperateAS4Server.java	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/OperateAS4Server.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,21 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as4;
+
+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 OperateAS4Server extends OperateServerTemplate {
+
+	@Override
+	public String getWelcomePageText() {
+		return "Manage this JBoss AS Instance";
+	}
+}

Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/UndeployJSPProjectAS4Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/UndeployJSPProjectAS4Server.java	2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/UndeployJSPProjectAS4Server.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,22 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as4;
-
-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 UndeployJSPProjectAS4Server extends UndeployJSPProjectTemplate {
-
-	@Override
-	protected String getConsoleMessage() {
-		return "undeploy, ctxPath=/" + DeployJSPProjectTemplate.PROJECT_NAME;
-	}
-}

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/UndeployJSPProjectAS4Server.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/UndeployJSPProjectAS4Server.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/as4/UndeployJSPProjectAS4Server.java	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/UndeployJSPProjectAS4Server.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,22 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as4;
+
+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 UndeployJSPProjectAS4Server extends UndeployJSPProjectTemplate {
+
+	@Override
+	protected String getConsoleMessage() {
+		return "undeploy, ctxPath=/" + DeployJSPProjectTemplate.PROJECT_NAME;
+	}
+}

Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/CreateAS5Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/CreateAS5Server.java	2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/CreateAS5Server.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,44 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as5;
-
-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 CreateAS5Server 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: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/CreateAS5Server.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/CreateAS5Server.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/as5/CreateAS5Server.java	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/CreateAS5Server.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,44 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as5;
+
+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 CreateAS5Server 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: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/DeployJSPProjectAS5Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/DeployJSPProjectAS5Server.java	2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/DeployJSPProjectAS5Server.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,21 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as5;
-
-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 DeployJSPProjectAS5Server extends DeployJSPProjectTemplate {
-
-	@Override
-	protected String getConsoleMessage() {
-		return "deploy, ctxPath=/" + PROJECT_NAME;
-	}
-}

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/DeployJSPProjectAS5Server.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/DeployJSPProjectAS5Server.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/as5/DeployJSPProjectAS5Server.java	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/DeployJSPProjectAS5Server.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,21 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as5;
+
+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 DeployJSPProjectAS5Server extends DeployJSPProjectTemplate {
+
+	@Override
+	protected String getConsoleMessage() {
+		return "deploy, ctxPath=/" + PROJECT_NAME;
+	}
+}

Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/OperateAS5Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/OperateAS5Server.java	2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/OperateAS5Server.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,21 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as5;
-
-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 OperateAS5Server extends OperateServerTemplate {
-
-	@Override
-	public String getWelcomePageText() {
-		return "Manage this JBoss AS Instance";
-	}
-}

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/OperateAS5Server.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/OperateAS5Server.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/as5/OperateAS5Server.java	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/OperateAS5Server.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,21 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as5;
+
+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 OperateAS5Server extends OperateServerTemplate {
+
+	@Override
+	public String getWelcomePageText() {
+		return "Manage this JBoss AS Instance";
+	}
+}

Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/UndeployJSPProjectAS5Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/UndeployJSPProjectAS5Server.java	2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/UndeployJSPProjectAS5Server.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,22 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as5;
-
-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 UndeployJSPProjectAS5Server extends UndeployJSPProjectTemplate {
-
-	@Override
-	protected String getConsoleMessage() {
-		return "undeploy, ctxPath=/" + DeployJSPProjectTemplate.PROJECT_NAME;
-	}
-}

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/UndeployJSPProjectAS5Server.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/UndeployJSPProjectAS5Server.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/as5/UndeployJSPProjectAS5Server.java	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/UndeployJSPProjectAS5Server.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,22 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as5;
+
+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 UndeployJSPProjectAS5Server extends UndeployJSPProjectTemplate {
+
+	@Override
+	protected String getConsoleMessage() {
+		return "undeploy, ctxPath=/" + DeployJSPProjectTemplate.PROJECT_NAME;
+	}
+}

Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/CreateAS6Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/CreateAS6Server.java	2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/CreateAS6Server.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,45 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as6;
-
-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="6.1", state=ServerState.Present))
-public class CreateAS6Server extends CreateServerTemplate {
-
-	@Override
-	protected void assertEditorPorts() {
-		assertThat("8080", is(editor.getWebPort()));
-		assertThat("1099", is(editor.getJNDIPort()));		
-		assertThat("1090", is(editor.getJMXPort()));
-	}
-
-	@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: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/CreateAS6Server.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/CreateAS6Server.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/as6/CreateAS6Server.java	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/CreateAS6Server.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,45 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as6;
+
+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="6.1", state=ServerState.Present))
+public class CreateAS6Server extends CreateServerTemplate {
+
+	@Override
+	protected void assertEditorPorts() {
+		assertThat("8080", is(editor.getWebPort()));
+		assertThat("1099", is(editor.getJNDIPort()));		
+		assertThat("1090", is(editor.getJMXPort()));
+	}
+
+	@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: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/DeployJSPProjectAS6Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/DeployJSPProjectAS6Server.java	2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/DeployJSPProjectAS6Server.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,21 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as6;
-
-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="6.1", state=ServerState.Running))
-public class DeployJSPProjectAS6Server extends DeployJSPProjectTemplate {
-
-	@Override
-	protected String getConsoleMessage() {
-		return "deploy, ctxPath=/" + PROJECT_NAME;
-	}
-}

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/DeployJSPProjectAS6Server.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/DeployJSPProjectAS6Server.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/as6/DeployJSPProjectAS6Server.java	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/DeployJSPProjectAS6Server.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,21 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as6;
+
+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="6.1", state=ServerState.Running))
+public class DeployJSPProjectAS6Server extends DeployJSPProjectTemplate {
+
+	@Override
+	protected String getConsoleMessage() {
+		return "deploy, ctxPath=/" + PROJECT_NAME;
+	}
+}

Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/OperateAS6Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/OperateAS6Server.java	2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/OperateAS6Server.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,21 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as6;
-
-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="6.1", state=ServerState.NotRunning))
-public class OperateAS6Server extends OperateServerTemplate {
-
-	@Override
-	public String getWelcomePageText() {
-		return "Manage this JBoss AS Instance";
-	}
-}

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/OperateAS6Server.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/OperateAS6Server.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/as6/OperateAS6Server.java	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/OperateAS6Server.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,21 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as6;
+
+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="6.1", state=ServerState.NotRunning))
+public class OperateAS6Server extends OperateServerTemplate {
+
+	@Override
+	public String getWelcomePageText() {
+		return "Manage this JBoss AS Instance";
+	}
+}

Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/UndeployJSPProjectAS6Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/UndeployJSPProjectAS6Server.java	2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/UndeployJSPProjectAS6Server.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,22 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as6;
-
-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="6.1", state=ServerState.Running), clearProjects=false, clearWorkspace=false)
-public class UndeployJSPProjectAS6Server extends UndeployJSPProjectTemplate {
-
-	@Override
-	protected String getConsoleMessage() {
-		return "undeploy, ctxPath=/" + DeployJSPProjectTemplate.PROJECT_NAME;
-	}
-}

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/UndeployJSPProjectAS6Server.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/UndeployJSPProjectAS6Server.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/as6/UndeployJSPProjectAS6Server.java	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/UndeployJSPProjectAS6Server.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,22 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as6;
+
+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="6.1", state=ServerState.Running), clearProjects=false, clearWorkspace=false)
+public class UndeployJSPProjectAS6Server extends UndeployJSPProjectTemplate {
+
+	@Override
+	protected String getConsoleMessage() {
+		return "undeploy, ctxPath=/" + DeployJSPProjectTemplate.PROJECT_NAME;
+	}
+}

Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/CreateAS7Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/CreateAS7Server.java	2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/CreateAS7Server.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,36 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as7;
-
-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.EAP, state=ServerState.Present))
-public class CreateAS7Server 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: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/CreateAS7Server.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/CreateAS7Server.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/as7/CreateAS7Server.java	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/CreateAS7Server.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,36 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as7;
+
+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.EAP, state=ServerState.Present))
+public class CreateAS7Server 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: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeployJSPProjectAS7Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeployJSPProjectAS7Server.java	2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeployJSPProjectAS7Server.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,21 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as7;
-
-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, state=ServerState.Running))
-public class DeployJSPProjectAS7Server extends DeployJSPProjectTemplate {
-
-	@Override
-	protected String getConsoleMessage() {
-		return "Registering web context: /" + PROJECT_NAME;
-	}
-}

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeployJSPProjectAS7Server.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeployJSPProjectAS7Server.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/as7/DeployJSPProjectAS7Server.java	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeployJSPProjectAS7Server.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,21 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as7;
+
+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, state=ServerState.Running))
+public class DeployJSPProjectAS7Server extends DeployJSPProjectTemplate {
+
+	@Override
+	protected String getConsoleMessage() {
+		return "Registering web context: /" + PROJECT_NAME;
+	}
+}

Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/OperateAS7Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/OperateAS7Server.java	2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/OperateAS7Server.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,22 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as7;
-
-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, state=ServerState.NotRunning))
-public class OperateAS7Server extends OperateServerTemplate {
-
-	@Override
-	public String getWelcomePageText() {
-		return "Welcome to EAP 6";
-	}
-}

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/OperateAS7Server.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/OperateAS7Server.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/as7/OperateAS7Server.java	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/OperateAS7Server.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,22 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as7;
+
+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, state=ServerState.NotRunning))
+public class OperateAS7Server extends OperateServerTemplate {
+
+	@Override
+	public String getWelcomePageText() {
+		return "Welcome to EAP 6";
+	}
+}

Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/UndeployJSPProjectAS7Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/UndeployJSPProjectAS7Server.java	2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/UndeployJSPProjectAS7Server.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,22 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as7;
-
-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, state=ServerState.Running), clearProjects=false, clearWorkspace=false)
-public class UndeployJSPProjectAS7Server extends UndeployJSPProjectTemplate {
-
-	@Override
-	protected String getConsoleMessage() {
-		return "Undeployed \"" + DeployJSPProjectTemplate.PROJECT_NAME + ".war\"";
-	}
-}

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/UndeployJSPProjectAS7Server.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/UndeployJSPProjectAS7Server.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/as7/UndeployJSPProjectAS7Server.java	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/UndeployJSPProjectAS7Server.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,22 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as7;
+
+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, state=ServerState.Running), clearProjects=false, clearWorkspace=false)
+public class UndeployJSPProjectAS7Server extends UndeployJSPProjectTemplate {
+
+	@Override
+	protected String getConsoleMessage() {
+		return "Undeployed \"" + DeployJSPProjectTemplate.PROJECT_NAME + ".war\"";
+	}
+}

Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerEditor.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerEditor.java	2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerEditor.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,42 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.editor;
-
-import org.jboss.tools.ui.bot.ext.SWTBotFactory;
-import org.jboss.tools.ui.bot.ext.view.ServersView;
-
-public class ServerEditor {
-
-	private ServersView serversView = new ServersView();
-	
-	private String name;
-	
-	public ServerEditor(String name) {
-		super();
-		this.name = name;
-	}
-
-	public void open(){
-		serversView.openServerEditor(name);
-	}
-	
-	public ServerLaunchConfiguration openLaunchConfiguration(){
-		SWTBotFactory.getBot().hyperlink("Open launch configuration").click();
-		SWTBotFactory.getBot().shell("Edit Configuration").activate();
-		return new ServerLaunchConfiguration();
-	}
-	
-	public String getWebPort(){
-		return SWTBotFactory.getBot().textWithLabel("Web").getText();
-	}
-	
-	public String getJNDIPort(){
-		return SWTBotFactory.getBot().textWithLabel("JNDI").getText();
-	}
-	
-	public String getJMXPort(){
-		return SWTBotFactory.getBot().textWithLabel("JMX RMI").getText();
-	}
-	
-	public String getManagementPort(){
-		return SWTBotFactory.getBot().textWithLabel("Management").getText();
-	}
-}

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerEditor.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerEditor.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/editor/ServerEditor.java	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerEditor.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,42 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.editor;
+
+import org.jboss.tools.ui.bot.ext.SWTBotFactory;
+import org.jboss.tools.ui.bot.ext.view.ServersView;
+
+public class ServerEditor {
+
+	private ServersView serversView = new ServersView();
+	
+	private String name;
+	
+	public ServerEditor(String name) {
+		super();
+		this.name = name;
+	}
+
+	public void open(){
+		serversView.openServerEditor(name);
+	}
+	
+	public ServerLaunchConfiguration openLaunchConfiguration(){
+		SWTBotFactory.getBot().hyperlink("Open launch configuration").click();
+		SWTBotFactory.getBot().shell("Edit Configuration").activate();
+		return new ServerLaunchConfiguration();
+	}
+	
+	public String getWebPort(){
+		return SWTBotFactory.getBot().textWithLabel("Web").getText();
+	}
+	
+	public String getJNDIPort(){
+		return SWTBotFactory.getBot().textWithLabel("JNDI").getText();
+	}
+	
+	public String getJMXPort(){
+		return SWTBotFactory.getBot().textWithLabel("JMX RMI").getText();
+	}
+	
+	public String getManagementPort(){
+		return SWTBotFactory.getBot().textWithLabel("Management").getText();
+	}
+}

Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerLaunchConfiguration.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerLaunchConfiguration.java	2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerLaunchConfiguration.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,14 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.editor;
-
-import org.jboss.tools.ui.bot.ext.SWTBotFactory;
-
-public class ServerLaunchConfiguration {
-
-	public String getProgramArguments(){
-		return SWTBotFactory.getBot().textInGroup("Program arguments:").getText();
-	}
-	
-	public String getVMArguments(){
-		return SWTBotFactory.getBot().textInGroup("VM arguments:").getText();
-	}
-}

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerLaunchConfiguration.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerLaunchConfiguration.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/editor/ServerLaunchConfiguration.java	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerLaunchConfiguration.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,14 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.editor;
+
+import org.jboss.tools.ui.bot.ext.SWTBotFactory;
+
+public class ServerLaunchConfiguration {
+
+	public String getProgramArguments(){
+		return SWTBotFactory.getBot().textInGroup("Program arguments:").getText();
+	}
+	
+	public String getVMArguments(){
+		return SWTBotFactory.getBot().textInGroup("VM arguments:").getText();
+	}
+}

Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/CreateServerTemplate.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/CreateServerTemplate.java	2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/CreateServerTemplate.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,36 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.template;
-
-import java.util.List;
-
-import org.jboss.ide.eclipse.as.ui.bot.test.editor.ServerEditor;
-import org.jboss.tools.ui.bot.ext.SWTTestExt;
-import org.jboss.tools.ui.bot.ext.entity.XMLConfiguration;
-import org.jboss.tools.ui.bot.ext.view.ServersView;
-import org.junit.Test;
-
-/**
- * Creates server and checks its ports (in both the server view and server editor)
- * 
- * @author Lucia Jelinkova
- *
- */
-public abstract class CreateServerTemplate extends SWTTestExt {
-
-	protected ServerEditor editor;
-	
-	protected abstract void assertEditorPorts();
-	
-	protected abstract void assertViewPorts(List<XMLConfiguration> configurations);
-	
-	@Test
-	public void createServer(){
-		editor = new ServerEditor(configuredState.getServer().name);
-		editor.open();
-		
-		assertEditorPorts();
-		
-		ServersView view = new ServersView();
-		List<XMLConfiguration> configurations = view.getXMLConfiguration(configuredState.getServer().name, "Ports");
-		assertViewPorts(configurations);
-	}
-}

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/CreateServerTemplate.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/CreateServerTemplate.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/template/CreateServerTemplate.java	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/CreateServerTemplate.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,36 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.template;
+
+import java.util.List;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.editor.ServerEditor;
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.entity.XMLConfiguration;
+import org.jboss.tools.ui.bot.ext.view.ServersView;
+import org.junit.Test;
+
+/**
+ * Creates server and checks its ports (in both the server view and server editor)
+ * 
+ * @author Lucia Jelinkova
+ *
+ */
+public abstract class CreateServerTemplate extends SWTTestExt {
+
+	protected ServerEditor editor;
+	
+	protected abstract void assertEditorPorts();
+	
+	protected abstract void assertViewPorts(List<XMLConfiguration> configurations);
+	
+	@Test
+	public void createServer(){
+		editor = new ServerEditor(configuredState.getServer().name);
+		editor.open();
+		
+		assertEditorPorts();
+		
+		ServersView view = new ServersView();
+		List<XMLConfiguration> configurations = view.getXMLConfiguration(configuredState.getServer().name, "Ports");
+		assertViewPorts(configurations);
+	}
+}

Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeleteServer.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeleteServer.java	2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeleteServer.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,23 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.template;
-
-import org.jboss.tools.ui.bot.ext.SWTTestExt;
-import org.jboss.tools.ui.bot.ext.view.ServersView;
-import org.junit.Test;
-
-/**
- * Deletes the server and checks that it is not present on the server's view. 
- * 
- * @author Lucia Jelinkova
- *
- */
-public class DeleteServer extends SWTTestExt {
-
-	private ServersView serversView = new ServersView();
-	
-	@Test
-	public void deleteServer(){
-		serversView.deleteServer(configuredState.getServer().name);
-
-		assertFalse(serversView.serverExists(configuredState.getServer().name));
-	}
-}

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeleteServer.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeleteServer.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/template/DeleteServer.java	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeleteServer.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,23 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.template;
+
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.view.ServersView;
+import org.junit.Test;
+
+/**
+ * Deletes the server and checks that it is not present on the server's view. 
+ * 
+ * @author Lucia Jelinkova
+ *
+ */
+public class DeleteServer extends SWTTestExt {
+
+	private ServersView serversView = new ServersView();
+	
+	@Test
+	public void deleteServer(){
+		serversView.deleteServer(configuredState.getServer().name);
+
+		assertFalse(serversView.serverExists(configuredState.getServer().name));
+	}
+}

Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeployJSPProjectTemplate.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeployJSPProjectTemplate.java	2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeployJSPProjectTemplate.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,61 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.template;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.not;
-
-import org.jboss.ide.eclipse.as.ui.bot.test.Activator;
-import org.jboss.ide.eclipse.as.ui.bot.test.web.PageSourceMatcher;
-import org.jboss.ide.eclipse.as.ui.bot.test.wizard.ImportProjectWizard;
-import org.jboss.tools.ui.bot.ext.SWTTestExt;
-import org.jboss.tools.ui.bot.ext.SWTUtilExt;
-import org.jboss.tools.ui.bot.ext.condition.NonSystemJobRunsCondition;
-import org.jboss.tools.ui.bot.ext.condition.TaskDuration;
-import org.jboss.tools.ui.bot.ext.matcher.console.ConsoleOutputMatcher;
-import org.jboss.tools.ui.bot.ext.view.ServersView;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Imports pre-prepared JSP project and adds it into the server. Checks:
- * 
- * <ul>
- * 	<li>the console output</li>
- * 	<li>server's label</li>
- * 	<li>project is listed under the server</li>
- * 	<li>the index.jsp of the project</li>
- * </ul>
- * @author Lucia Jelinkova
- *
- */
-public abstract class DeployJSPProjectTemplate extends SWTTestExt {
-
-	public static final String PROJECT_NAME = "jsp-project";
-
-	protected abstract String getConsoleMessage();
-
-	@Before
-	public void importProject(){
-		ImportProjectWizard wizard = new ImportProjectWizard();
-		wizard.setCopyProjectsIntoWorkspace(true);
-		wizard.setProjectPath(SWTUtilExt.getPathToFileWithinPlugin(Activator.PLUGIN_ID, "projects"));
-		wizard.setProjectNames(PROJECT_NAME);
-		wizard.execute();
-	}
-
-	@Test
-	public void deployProject(){
-		ServersView serversView = new ServersView();
-		serversView.addProjectToServer(PROJECT_NAME, configuredState.getServer().name);
-
-		// web
-		serversView.openWebPage(configuredState.getServer().name, PROJECT_NAME);
-		assertThat("Hello tests!", new PageSourceMatcher());
-		// console
-		assertThat(getConsoleMessage(), new ConsoleOutputMatcher(TaskDuration.NORMAL));
-		assertThat("Exception:", not(new ConsoleOutputMatcher()));
-		// view
-		assertTrue("Server contains project", serversView.containsProject(configuredState.getServer().name, PROJECT_NAME));
-		assertEquals("Started", serversView.getServerStatus(configuredState.getServer().name));
-		assertEquals("Synchronized", serversView.getServerPublishStatus(configuredState.getServer().name));
-	}
-}

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeployJSPProjectTemplate.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeployJSPProjectTemplate.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/template/DeployJSPProjectTemplate.java	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeployJSPProjectTemplate.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,61 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.template;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.not;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.Activator;
+import org.jboss.ide.eclipse.as.ui.bot.test.web.PageSourceMatcher;
+import org.jboss.ide.eclipse.as.ui.bot.test.wizard.ImportProjectWizard;
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.SWTUtilExt;
+import org.jboss.tools.ui.bot.ext.condition.NonSystemJobRunsCondition;
+import org.jboss.tools.ui.bot.ext.condition.TaskDuration;
+import org.jboss.tools.ui.bot.ext.matcher.console.ConsoleOutputMatcher;
+import org.jboss.tools.ui.bot.ext.view.ServersView;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Imports pre-prepared JSP project and adds it into the server. Checks:
+ * 
+ * <ul>
+ * 	<li>the console output</li>
+ * 	<li>server's label</li>
+ * 	<li>project is listed under the server</li>
+ * 	<li>the index.jsp of the project</li>
+ * </ul>
+ * @author Lucia Jelinkova
+ *
+ */
+public abstract class DeployJSPProjectTemplate extends SWTTestExt {
+
+	public static final String PROJECT_NAME = "jsp-project";
+
+	protected abstract String getConsoleMessage();
+
+	@Before
+	public void importProject(){
+		ImportProjectWizard wizard = new ImportProjectWizard();
+		wizard.setCopyProjectsIntoWorkspace(true);
+		wizard.setProjectPath(SWTUtilExt.getPathToFileWithinPlugin(Activator.PLUGIN_ID, "projects"));
+		wizard.setProjectNames(PROJECT_NAME);
+		wizard.execute();
+	}
+
+	@Test
+	public void deployProject(){
+		ServersView serversView = new ServersView();
+		serversView.addProjectToServer(PROJECT_NAME, configuredState.getServer().name);
+
+		// web
+		serversView.openWebPage(configuredState.getServer().name, PROJECT_NAME);
+		assertThat("Hello tests!", new PageSourceMatcher());
+		// console
+		assertThat(getConsoleMessage(), new ConsoleOutputMatcher(TaskDuration.NORMAL));
+		assertThat("Exception:", not(new ConsoleOutputMatcher()));
+		// view
+		assertTrue("Server contains project", serversView.containsProject(configuredState.getServer().name, PROJECT_NAME));
+		assertEquals("Started", serversView.getServerStatus(configuredState.getServer().name));
+		assertEquals("Synchronized", serversView.getServerPublishStatus(configuredState.getServer().name));
+	}
+}

Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/HotDeployJSPFile.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/HotDeployJSPFile.java	2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/HotDeployJSPFile.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,37 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.template;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-
-import org.jboss.ide.eclipse.as.ui.bot.test.as7.DeployJSPProjectAS7Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.web.PageSourceMatcher;
-import org.jboss.ide.eclipse.as.ui.bot.test.wizard.NewFileWizard;
-import org.jboss.tools.ui.bot.ext.SWTBotFactory;
-import org.jboss.tools.ui.bot.ext.SWTTestExt;
-import org.junit.Test;
-
-/**
- * Adds a new jsp file into the jsp project and checks it is hot deployed:
- * <ul>
- * 	<li>loads the new page in the web browser </li>
- * </ul>
- * @author Lucia Jelinkova
- *
- */
-public class HotDeployJSPFile extends SWTTestExt {
-
-	public static final String JSP_CONTENT = 
-				"<%@ page language=\"java\" contentType=\"text/html; charset=UTF-8\" pageEncoding=\"UTF-8\"%> \n" + 
-				"<html> <body> Hot deployment </body> </html>";
-	
-	@Test
-	public void hotDeployment(){
-		NewFileWizard wizard = new NewFileWizard();
-		wizard.setPath(DeployJSPProjectAS7Server.PROJECT_NAME, "WebContent");
-		wizard.setFileName("hot.jsp");
-		wizard.setText(JSP_CONTENT);
-		wizard.execute();
-		
-		SWTBotFactory.getBot().sleep(5000);
-		assertThat("Hot deployment", new PageSourceMatcher("http://localhost:8080/" + DeployJSPProjectAS7Server.PROJECT_NAME + "/hot.jsp"));
-	}
-}

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/HotDeployJSPFile.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/HotDeployJSPFile.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/template/HotDeployJSPFile.java	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/HotDeployJSPFile.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,37 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.template;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.as7.DeployJSPProjectAS7Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.web.PageSourceMatcher;
+import org.jboss.ide.eclipse.as.ui.bot.test.wizard.NewFileWizard;
+import org.jboss.tools.ui.bot.ext.SWTBotFactory;
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.junit.Test;
+
+/**
+ * Adds a new jsp file into the jsp project and checks it is hot deployed:
+ * <ul>
+ * 	<li>loads the new page in the web browser </li>
+ * </ul>
+ * @author Lucia Jelinkova
+ *
+ */
+public class HotDeployJSPFile extends SWTTestExt {
+
+	public static final String JSP_CONTENT = 
+				"<%@ page language=\"java\" contentType=\"text/html; charset=UTF-8\" pageEncoding=\"UTF-8\"%> \n" + 
+				"<html> <body> Hot deployment </body> </html>";
+	
+	@Test
+	public void hotDeployment(){
+		NewFileWizard wizard = new NewFileWizard();
+		wizard.setPath(DeployJSPProjectAS7Server.PROJECT_NAME, "WebContent");
+		wizard.setFileName("hot.jsp");
+		wizard.setText(JSP_CONTENT);
+		wizard.execute();
+		
+		SWTBotFactory.getBot().sleep(5000);
+		assertThat("Hot deployment", new PageSourceMatcher("http://localhost:8080/" + DeployJSPProjectAS7Server.PROJECT_NAME + "/hot.jsp"));
+	}
+}

Deleted: branches/jbosstools-3.3.x/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-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/OperateServerTemplate.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,76 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.template;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.not;
-
-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;
-import org.junit.Test;
-
-/**
- * Starts, restarts and stops the server and checks:
- * <ul>
- * 	<li>the console output</li>
- * 	<li>server's label</li>
- * 	<li>welcome page is available (if the result state is started)</li>
- * </ul>
- * @author Lucia Jelinkova
- *
- */
-public abstract class OperateServerTemplate extends SWTTestExt {
-
-	protected ServersView serversView = new ServersView();
-
-	public abstract String getWelcomePageText();
-	
-	protected String getServerName(){
-		return configuredState.getServer().name;
-	}
-
-	@Test
-	public void operateServer(){
-		startServer();
-		restartServer();
-		stopServer();
-	}
-	
-	public void startServer(){
-		serversView.startServer(getServerName());
-		serversView.openWebPage(configuredState.getServer().name);
-		
-		assertNoException("Starting server");
-		assertServerState("Starting server", "Started");
-		assertWebPageContains(getWelcomePageText());
-	}
-
-	public void restartServer(){
-		serversView.restartServer(getServerName());
-		serversView.openWebPage(configuredState.getServer().name);
-		
-		assertNoException("Restarting server");
-		assertServerState("Restarting server", "Started");
-		assertWebPageContains(getWelcomePageText());
-	}
-
-	public void stopServer(){
-		serversView.stopServer(getServerName());
-		serversView.openWebPage(configuredState.getServer().name);
-		
-		assertNoException("Stopping server");
-		assertServerState("Stopping server", "Stopped");
-	}
-
-	protected void assertNoException(String message) {
-		assertThat(message, "Exception:", not(new ConsoleOutputMatcher()));
-	}
-
-	protected void assertServerState(String message, String state) {
-		assertThat(message, serversView.getServerStatus(getServerName()), is(state));
-	}
-	
-	private void assertWebPageContains(String string) {
-		serversView.openWebPage(configuredState.getServer().name);		
-	}
-}

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/OperateServerTemplate.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/OperateServerTemplate.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/template/OperateServerTemplate.java	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/OperateServerTemplate.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,76 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.template;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
+
+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;
+import org.junit.Test;
+
+/**
+ * Starts, restarts and stops the server and checks:
+ * <ul>
+ * 	<li>the console output</li>
+ * 	<li>server's label</li>
+ * 	<li>welcome page is available (if the result state is started)</li>
+ * </ul>
+ * @author Lucia Jelinkova
+ *
+ */
+public abstract class OperateServerTemplate extends SWTTestExt {
+
+	protected ServersView serversView = new ServersView();
+
+	public abstract String getWelcomePageText();
+	
+	protected String getServerName(){
+		return configuredState.getServer().name;
+	}
+
+	@Test
+	public void operateServer(){
+		startServer();
+		restartServer();
+		stopServer();
+	}
+	
+	public void startServer(){
+		serversView.startServer(getServerName());
+		serversView.openWebPage(configuredState.getServer().name);
+		
+		assertNoException("Starting server");
+		assertServerState("Starting server", "Started");
+		assertWebPageContains(getWelcomePageText());
+	}
+
+	public void restartServer(){
+		serversView.restartServer(getServerName());
+		serversView.openWebPage(configuredState.getServer().name);
+		
+		assertNoException("Restarting server");
+		assertServerState("Restarting server", "Started");
+		assertWebPageContains(getWelcomePageText());
+	}
+
+	public void stopServer(){
+		serversView.stopServer(getServerName());
+		serversView.openWebPage(configuredState.getServer().name);
+		
+		assertNoException("Stopping server");
+		assertServerState("Stopping server", "Stopped");
+	}
+
+	protected void assertNoException(String message) {
+		assertThat(message, "Exception:", not(new ConsoleOutputMatcher()));
+	}
+
+	protected void assertServerState(String message, String state) {
+		assertThat(message, serversView.getServerStatus(getServerName()), is(state));
+	}
+	
+	private void assertWebPageContains(String string) {
+		serversView.openWebPage(configuredState.getServer().name);		
+	}
+}

Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/UndeployJSPProjectTemplate.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/UndeployJSPProjectTemplate.java	2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/UndeployJSPProjectTemplate.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,43 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.template;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.not;
-
-import org.jboss.ide.eclipse.as.ui.bot.test.as7.DeployJSPProjectAS7Server;
-import org.jboss.tools.ui.bot.ext.SWTTestExt;
-import org.jboss.tools.ui.bot.ext.condition.TaskDuration;
-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.matcher.console.ConsoleOutputMatcher;
-import org.jboss.tools.ui.bot.ext.view.ServersView;
-import org.junit.Test;
-
-/**
- * Removes JSP project from server. Checks:
- * 
- * <ul>
- * 	<li>the console output</li>
- * 	<li>server's label</li>
- * 	<li>project is not listed under the server</li>
- * </ul>
- * @author Lucia Jelinkova
- *
- */
-public abstract class UndeployJSPProjectTemplate extends SWTTestExt {
-
-	protected abstract String getConsoleMessage();
-	@Test
-	public void undeployProject(){
-		ServersView serversView = new ServersView();
-		serversView.removeProjectFromServer(DeployJSPProjectTemplate.PROJECT_NAME, configuredState.getServer().name);
-		
-		// console
-		assertThat(getConsoleMessage(), new ConsoleOutputMatcher(TaskDuration.NORMAL));
-		assertThat("Exception:", not(new ConsoleOutputMatcher()));
-		// view
-		assertFalse("Server contains project", serversView.containsProject(configuredState.getServer().name, DeployJSPProjectAS7Server.PROJECT_NAME));	
-		assertEquals("Started", serversView.getServerStatus(configuredState.getServer().name));
-		assertEquals("Synchronized", serversView.getServerPublishStatus(configuredState.getServer().name));
-	}
-}

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/UndeployJSPProjectTemplate.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/UndeployJSPProjectTemplate.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/template/UndeployJSPProjectTemplate.java	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/UndeployJSPProjectTemplate.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,43 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.template;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.not;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.as7.DeployJSPProjectAS7Server;
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.condition.TaskDuration;
+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.matcher.console.ConsoleOutputMatcher;
+import org.jboss.tools.ui.bot.ext.view.ServersView;
+import org.junit.Test;
+
+/**
+ * Removes JSP project from server. Checks:
+ * 
+ * <ul>
+ * 	<li>the console output</li>
+ * 	<li>server's label</li>
+ * 	<li>project is not listed under the server</li>
+ * </ul>
+ * @author Lucia Jelinkova
+ *
+ */
+public abstract class UndeployJSPProjectTemplate extends SWTTestExt {
+
+	protected abstract String getConsoleMessage();
+	@Test
+	public void undeployProject(){
+		ServersView serversView = new ServersView();
+		serversView.removeProjectFromServer(DeployJSPProjectTemplate.PROJECT_NAME, configuredState.getServer().name);
+		
+		// console
+		assertThat(getConsoleMessage(), new ConsoleOutputMatcher(TaskDuration.NORMAL));
+		assertThat("Exception:", not(new ConsoleOutputMatcher()));
+		// view
+		assertFalse("Server contains project", serversView.containsProject(configuredState.getServer().name, DeployJSPProjectAS7Server.PROJECT_NAME));	
+		assertEquals("Started", serversView.getServerStatus(configuredState.getServer().name));
+		assertEquals("Synchronized", serversView.getServerPublishStatus(configuredState.getServer().name));
+	}
+}

Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/web/PageSourceMatcher.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/web/PageSourceMatcher.java	2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/web/PageSourceMatcher.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,42 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.web;
-
-import org.hamcrest.Description;
-import org.hamcrest.TypeSafeMatcher;
-import org.jboss.tools.ui.bot.ext.SWTBotFactory;
-import org.jboss.tools.ui.bot.ext.parts.SWTBotBrowserExt;
-
-public class PageSourceMatcher extends TypeSafeMatcher<String> {
-
-	private String pageText;
-
-	private String url;
-	
-	public PageSourceMatcher() {
-		super();
-	}
-
-	public PageSourceMatcher(String url) {
-		this();
-		this.url = url;
-	}
-	
-	@Override
-	public boolean matchesSafely(String item) {
-		SWTBotBrowserExt browser = SWTBotFactory.getBot().browserExt();
-		if (url != null){
-			browser.loadUrlToBrowser(url, SWTBotFactory.getBot());
-		}
-		
-		pageText = browser.getText();
-		if ("".equals(item)){
-			return pageText.equals(item);
-		}
-		return pageText.contains(item);
-	}
-
-	@Override
-	public void describeTo(Description description) {
-		description.appendText("is on the page, but there was instead: ");
-		description.appendValue(pageText);
-	}
-}

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/web/PageSourceMatcher.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/web/PageSourceMatcher.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/web/PageSourceMatcher.java	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/web/PageSourceMatcher.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,42 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.web;
+
+import org.hamcrest.Description;
+import org.hamcrest.TypeSafeMatcher;
+import org.jboss.tools.ui.bot.ext.SWTBotFactory;
+import org.jboss.tools.ui.bot.ext.parts.SWTBotBrowserExt;
+
+public class PageSourceMatcher extends TypeSafeMatcher<String> {
+
+	private String pageText;
+
+	private String url;
+	
+	public PageSourceMatcher() {
+		super();
+	}
+
+	public PageSourceMatcher(String url) {
+		this();
+		this.url = url;
+	}
+	
+	@Override
+	public boolean matchesSafely(String item) {
+		SWTBotBrowserExt browser = SWTBotFactory.getBot().browserExt();
+		if (url != null){
+			browser.loadUrlToBrowser(url, SWTBotFactory.getBot());
+		}
+		
+		pageText = browser.getText();
+		if ("".equals(item)){
+			return pageText.equals(item);
+		}
+		return pageText.contains(item);
+	}
+
+	@Override
+	public void describeTo(Description description) {
+		description.appendText("is on the page, but there was instead: ");
+		description.appendValue(pageText);
+	}
+}

Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/wizard/ImportProjectWizard.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/wizard/ImportProjectWizard.java	2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/wizard/ImportProjectWizard.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,111 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.wizard;
-
-import org.eclipse.swtbot.swt.finder.SWTBot;
-import org.eclipse.swtbot.swt.finder.keyboard.KeyboardFactory;
-import org.eclipse.swtbot.swt.finder.keyboard.Keystrokes;
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
-import org.jboss.tools.ui.bot.ext.SWTBotFactory;
-import org.jboss.tools.ui.bot.ext.gen.ActionItem;
-import org.jboss.tools.ui.bot.ext.wizards.SWTBotImportWizard;
-
-public class ImportProjectWizard {
-
-	private SWTBotImportWizard wizard = new SWTBotImportWizard();
-	
-	private String[] projectNames;
-
-	private String projectPath;
-
-	private String zipFilePath;
-
-	private boolean copyProjectsIntoWorkspace;
-	
-	public void execute(){
-		wizard.open(ActionItem.Import.GeneralExistingProjectsintoWorkspace.LABEL.getName(), ActionItem.Import.GeneralExistingProjectsintoWorkspace.LABEL.getGroupPath().get(0));
-		loadProjects();
-		selectProjects();
-		wizard.finishWithWait();
-	}
-	
-	private void loadProjects() {
-		if (projectPath != null && zipFilePath != null){
-			throw new IllegalArgumentException("You have to choose between folder and ZIP path");
-		}
-
-		if (projectPath != null){
-			loadProjectsFromFolder();
-			return;
-		}
-
-		if (zipFilePath != null){
-			loadProjectsFromZIP();
-			return;
-		}
-
-		throw new IllegalArgumentException("You have to provide either folder or ZIP path");
-	}
-
-	private void loadProjectsFromFolder() {
-		getBot().text(0).setText(projectPath);
-		KeyboardFactory.getAWTKeyboard().pressShortcut(Keystrokes.TAB);
-	}
-
-	private void loadProjectsFromZIP() {
-		getBot().radio("Select archive file:").click();
-		getBot().text(1).setText(zipFilePath);
-		KeyboardFactory.getAWTKeyboard().pressShortcut(Keystrokes.TAB);
-	}
-
-	private void selectProjects() {
-		selectCopyProjectsIntoWorkspace();
-		getBot().button("Deselect All").click();
-		SWTBotTree projectsTree = getBot().treeWithLabel("Projects:");
-		for (String projectName : projectNames){
-			SWTBotTreeItem  projectItem = projectsTree.getTreeItem(getProjectLabel(projectName));
-			projectItem.check();
-		}
-	}
-
-	private void selectCopyProjectsIntoWorkspace() {
-		if (isFileSystem()){
-			if (copyProjectsIntoWorkspace){
-				getBot().checkBox("Copy projects into workspace").select();
-			} else {
-				getBot().checkBox("Copy projects into workspace").deselect();
-			}
-		}
-	}
-
-	private String getProjectLabel(String project){
-		if (isFileSystem()){
-			return project + " (" + projectPath + "/" + project + ")";
-		} else {
-			return project + " (" + project + ")";
-		}
-	}
-
-	private boolean isFileSystem(){
-		return projectPath != null;
-	}
-
-	public void setProjectNames(String... projectNames) {
-		this.projectNames = projectNames;
-	}
-
-	public void setProjectPath(String projectPath) {
-		this.projectPath = projectPath;
-	}
-
-	public void setZipFilePath(String zipFilePath) {
-		this.zipFilePath = zipFilePath;
-	}
-
-	public void setCopyProjectsIntoWorkspace(boolean copyProjectsIntoWorkspace) {
-		this.copyProjectsIntoWorkspace = copyProjectsIntoWorkspace;
-	}
-	
-	private SWTBot getBot(){
-		return SWTBotFactory.getBot();
-	}
-}

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/wizard/ImportProjectWizard.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/wizard/ImportProjectWizard.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/wizard/ImportProjectWizard.java	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/wizard/ImportProjectWizard.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,111 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.wizard;
+
+import org.eclipse.swtbot.swt.finder.SWTBot;
+import org.eclipse.swtbot.swt.finder.keyboard.KeyboardFactory;
+import org.eclipse.swtbot.swt.finder.keyboard.Keystrokes;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
+import org.jboss.tools.ui.bot.ext.SWTBotFactory;
+import org.jboss.tools.ui.bot.ext.gen.ActionItem;
+import org.jboss.tools.ui.bot.ext.wizards.SWTBotImportWizard;
+
+public class ImportProjectWizard {
+
+	private SWTBotImportWizard wizard = new SWTBotImportWizard();
+	
+	private String[] projectNames;
+
+	private String projectPath;
+
+	private String zipFilePath;
+
+	private boolean copyProjectsIntoWorkspace;
+	
+	public void execute(){
+		wizard.open(ActionItem.Import.GeneralExistingProjectsintoWorkspace.LABEL.getName(), ActionItem.Import.GeneralExistingProjectsintoWorkspace.LABEL.getGroupPath().get(0));
+		loadProjects();
+		selectProjects();
+		wizard.finishWithWait();
+	}
+	
+	private void loadProjects() {
+		if (projectPath != null && zipFilePath != null){
+			throw new IllegalArgumentException("You have to choose between folder and ZIP path");
+		}
+
+		if (projectPath != null){
+			loadProjectsFromFolder();
+			return;
+		}
+
+		if (zipFilePath != null){
+			loadProjectsFromZIP();
+			return;
+		}
+
+		throw new IllegalArgumentException("You have to provide either folder or ZIP path");
+	}
+
+	private void loadProjectsFromFolder() {
+		getBot().text(0).setText(projectPath);
+		KeyboardFactory.getAWTKeyboard().pressShortcut(Keystrokes.TAB);
+	}
+
+	private void loadProjectsFromZIP() {
+		getBot().radio("Select archive file:").click();
+		getBot().text(1).setText(zipFilePath);
+		KeyboardFactory.getAWTKeyboard().pressShortcut(Keystrokes.TAB);
+	}
+
+	private void selectProjects() {
+		selectCopyProjectsIntoWorkspace();
+		getBot().button("Deselect All").click();
+		SWTBotTree projectsTree = getBot().treeWithLabel("Projects:");
+		for (String projectName : projectNames){
+			SWTBotTreeItem  projectItem = projectsTree.getTreeItem(getProjectLabel(projectName));
+			projectItem.check();
+		}
+	}
+
+	private void selectCopyProjectsIntoWorkspace() {
+		if (isFileSystem()){
+			if (copyProjectsIntoWorkspace){
+				getBot().checkBox("Copy projects into workspace").select();
+			} else {
+				getBot().checkBox("Copy projects into workspace").deselect();
+			}
+		}
+	}
+
+	private String getProjectLabel(String project){
+		if (isFileSystem()){
+			return project + " (" + projectPath + "/" + project + ")";
+		} else {
+			return project + " (" + project + ")";
+		}
+	}
+
+	private boolean isFileSystem(){
+		return projectPath != null;
+	}
+
+	public void setProjectNames(String... projectNames) {
+		this.projectNames = projectNames;
+	}
+
+	public void setProjectPath(String projectPath) {
+		this.projectPath = projectPath;
+	}
+
+	public void setZipFilePath(String zipFilePath) {
+		this.zipFilePath = zipFilePath;
+	}
+
+	public void setCopyProjectsIntoWorkspace(boolean copyProjectsIntoWorkspace) {
+		this.copyProjectsIntoWorkspace = copyProjectsIntoWorkspace;
+	}
+	
+	private SWTBot getBot(){
+		return SWTBotFactory.getBot();
+	}
+}

Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/wizard/NewFileWizard.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/wizard/NewFileWizard.java	2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/wizard/NewFileWizard.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,43 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.wizard;
-
-import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
-import org.jboss.tools.ui.bot.ext.SWTBotFactory;
-import org.jboss.tools.ui.bot.ext.SWTEclipseExt;
-import org.jboss.tools.ui.bot.ext.gen.ActionItem;
-import org.jboss.tools.ui.bot.ext.wizards.SWTBotNewObjectWizard;
-
-public class NewFileWizard {
-
-	private SWTBotNewObjectWizard wizard = new SWTBotNewObjectWizard();
-	
-	private String[] path;
-	
-	private String fileName;
-	
-	private String text;
-	
-	public void execute(){
-		wizard.open(ActionItem.NewObject.GeneralFile.LABEL.getName(), ActionItem.NewObject.GeneralFile.LABEL.getGroupPath().get(0));
-		SWTEclipseExt.selectTreeLocation(SWTBotFactory.getBot(), path);
-		SWTBotFactory.getBot().textWithLabel("File name:").setText(fileName);
-		wizard.finishWithWait();
-		
-		if (text != null){
-			SWTBotEditor editor = SWTBotFactory.getBot().editorByTitle(fileName);
-			editor.toTextEditor().setText(text);
-			editor.saveAndClose();
-		}
-	}
-	
-	public void setPath(String... path) {
-		this.path = path;
-	}
-	
-	public void setFileName(String fileName) {
-		this.fileName = fileName;
-	}
-	
-	public void setText(String text) {
-		this.text = text;
-	}
-}

Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/wizard/NewFileWizard.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/wizard/NewFileWizard.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/wizard/NewFileWizard.java	                        (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/wizard/NewFileWizard.java	2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,43 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.wizard;
+
+import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
+import org.jboss.tools.ui.bot.ext.SWTBotFactory;
+import org.jboss.tools.ui.bot.ext.SWTEclipseExt;
+import org.jboss.tools.ui.bot.ext.gen.ActionItem;
+import org.jboss.tools.ui.bot.ext.wizards.SWTBotNewObjectWizard;
+
+public class NewFileWizard {
+
+	private SWTBotNewObjectWizard wizard = new SWTBotNewObjectWizard();
+	
+	private String[] path;
+	
+	private String fileName;
+	
+	private String text;
+	
+	public void execute(){
+		wizard.open(ActionItem.NewObject.GeneralFile.LABEL.getName(), ActionItem.NewObject.GeneralFile.LABEL.getGroupPath().get(0));
+		SWTEclipseExt.selectTreeLocation(SWTBotFactory.getBot(), path);
+		SWTBotFactory.getBot().textWithLabel("File name:").setText(fileName);
+		wizard.finishWithWait();
+		
+		if (text != null){
+			SWTBotEditor editor = SWTBotFactory.getBot().editorByTitle(fileName);
+			editor.toTextEditor().setText(text);
+			editor.saveAndClose();
+		}
+	}
+	
+	public void setPath(String... path) {
+		this.path = path;
+	}
+	
+	public void setFileName(String fileName) {
+		this.fileName = fileName;
+	}
+	
+	public void setText(String text) {
+		this.text = text;
+	}
+}



More information about the jbosstools-commits mailing list