JBoss Tools SVN: r44087 - in trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test: src/org/jboss/ide/eclipse/as/ui/bot/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-09-27 06:38:53 -0400 (Thu, 27 Sep 2012)
New Revision: 44087
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/pom.xml
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/StableTestsSuite.java
Log:
Added AS 7.0 and 6 to stable suite
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/pom.xml
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/pom.xml 2012-09-27 09:40:05 UTC (rev 44086)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/pom.xml 2012-09-27 10:38:53 UTC (rev 44087)
@@ -201,8 +201,10 @@
</activation>
<properties>
<test.class>org.jboss.ide.eclipse.as.ui.bot.test.StableTestsSuite</test.class>
+ <jbosstools.test.jboss-as-6.x.home>${requirementsDirectory}/jboss-6.1.0.Final</jbosstools.test.jboss-as-6.x.home>
+ <jbosstools.test.jboss-as-7.0.home>${requirementsDirectory}/jboss-as-7.0.2.Final</jbosstools.test.jboss-as-7.0.home>
<jbosstools.test.jboss-as-7.1.home>${requirementsDirectory}/jboss-as-7.1.1.Final</jbosstools.test.jboss-as-7.1.home>
- <runtimesProperties>-Djbosstools.test.jboss-as-7.1.home=${jbosstools.test.jboss-as-7.1.home} -Dtest.configurations.dir=resources/config_files_templates/project</runtimesProperties>
+ <runtimesProperties>-Djbosstools.test.jboss-as-6.x.home=${jbosstools.test.jboss-as-6.x.home} -Djbosstools.test.jboss-as-7.0.home=${jbosstools.test.jboss-as-7.0.home} -Djbosstools.test.jboss-as-7.1.home=${jbosstools.test.jboss-as-7.1.home} -Dtest.configurations.dir=resources/config_files_templates/project</runtimesProperties>
</properties>
<build>
<plugins><plugin>
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/StableTestsSuite.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/StableTestsSuite.java 2012-09-27 09:40:05 UTC (rev 44086)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/StableTestsSuite.java 2012-09-27 10:38:53 UTC (rev 44087)
@@ -1,5 +1,17 @@
package org.jboss.ide.eclipse.as.ui.bot.test;
+import org.jboss.ide.eclipse.as.ui.bot.test.as6.CreateAS6Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as6.DeleteServerAS6Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as6.DeployJSPProjectAS6Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as6.HotDeployJSPFileAS6Server;
+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.as70.CreateAS70Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as70.DeleteServerAS70Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as70.DeployJSPProjectAS70Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as70.HotDeployJSPFileAS70Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as70.OperateAS70Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as70.UndeployJSPProjectAS70Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as71.CreateAS71Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as71.DeleteServerAS71Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as71.DeployJSPProjectAS71Server;
@@ -18,6 +30,20 @@
HotDeployJSPFileAS71Server.class,
UndeployJSPProjectAS71Server.class,
DeleteServerAS71Server.class,
+
+ CreateAS70Server.class,
+ OperateAS70Server.class,
+ DeployJSPProjectAS70Server.class,
+ HotDeployJSPFileAS70Server.class,
+ UndeployJSPProjectAS70Server.class,
+ DeleteServerAS70Server.class,
+
+ CreateAS6Server.class,
+ OperateAS6Server.class,
+ DeployJSPProjectAS6Server.class,
+ HotDeployJSPFileAS6Server.class,
+ UndeployJSPProjectAS6Server.class,
+ DeleteServerAS6Server.class,
})
public class StableTestsSuite {
12 years, 3 months
JBoss Tools SVN: r44084 - trunk/runtime/plugins/org.jboss.tools.runtime.ui.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-09-27 05:06:03 -0400 (Thu, 27 Sep 2012)
New Revision: 44084
Modified:
trunk/runtime/plugins/org.jboss.tools.runtime.ui/plugin.xml
Log:
JBIDE_12751 small cleanup
Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/plugin.xml
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.ui/plugin.xml 2012-09-27 09:02:45 UTC (rev 44083)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/plugin.xml 2012-09-27 09:06:03 UTC (rev 44084)
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.4"?>
<plugin>
- <extension-point id="downloadruntimes" name="downloadruntimes" schema="schema/downloadruntimes.exsd"/>
-
<extension
point="org.eclipse.ui.preferencePages">
<page
12 years, 3 months
JBoss Tools SVN: r44083 - in trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test: launchers and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-09-27 05:02:45 -0400 (Thu, 27 Sep 2012)
New Revision: 44083
Added:
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_StableTestsSuite_allConfigs.launch
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/StableTestsSuite.java
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/pom.xml
Log:
Created stable suite
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_StableTestsSuite_allConfigs.launch
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_StableTestsSuite_allConfigs.launch (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_StableTestsSuite_allConfigs.launch 2012-09-27 09:02:45 UTC (rev 44083)
@@ -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/StableTestsSuite.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.StableTestsSuite"/>
+<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="-Dtest.configurations.dir=${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>
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/pom.xml
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/pom.xml 2012-09-27 09:02:23 UTC (rev 44082)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/pom.xml 2012-09-27 09:02:45 UTC (rev 44083)
@@ -192,6 +192,41 @@
</profile>
<profile>
+ <id>projects-stable</id>
+ <activation>
+ <property>
+ <name>test.profile</name>
+ <value>projects-stable</value>
+ </property>
+ </activation>
+ <properties>
+ <test.class>org.jboss.ide.eclipse.as.ui.bot.test.StableTestsSuite</test.class>
+ <jbosstools.test.jboss-as-7.1.home>${requirementsDirectory}/jboss-as-7.1.1.Final</jbosstools.test.jboss-as-7.1.home>
+ <runtimesProperties>-Djbosstools.test.jboss-as-7.1.home=${jbosstools.test.jboss-as-7.1.home} -Dtest.configurations.dir=resources/config_files_templates/project</runtimesProperties>
+ </properties>
+ <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>http://download.jboss.org/jbossas/7.1/jboss-as-7.1.1.Final/jboss-as-7.1.1...</url>
+ <md5>175c92545454f4e7270821f4b8326c4e</md5>
+ <unpack>true</unpack>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin></plugins>
+ </build>
+ </profile>
+
+ <profile>
<id>eap5</id>
<activation>
<property>
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/StableTestsSuite.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/StableTestsSuite.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/StableTestsSuite.java 2012-09-27 09:02:45 UTC (rev 44083)
@@ -0,0 +1,24 @@
+package org.jboss.ide.eclipse.as.ui.bot.test;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.as71.CreateAS71Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as71.DeleteServerAS71Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as71.DeployJSPProjectAS71Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as71.HotDeployJSPFileAS71Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as71.OperateAS71Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as71.UndeployJSPProjectAS71Server;
+import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+(a)RunWith(RequirementAwareSuite.class)
+(a)Suite.SuiteClasses({
+ CreateAS71Server.class,
+ OperateAS71Server.class,
+ DeployJSPProjectAS71Server.class,
+ HotDeployJSPFileAS71Server.class,
+ UndeployJSPProjectAS71Server.class,
+ DeleteServerAS71Server.class,
+})
+public class StableTestsSuite {
+
+}
12 years, 3 months
JBoss Tools SVN: r44082 - in trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test: as3 and 11 other directories.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-09-27 05:02:23 -0400 (Thu, 27 Sep 2012)
New Revision: 44082
Added:
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as3/DeleteServerAS3Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as3/HotDeployJSPFileAS3Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/DeleteServerAS40Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/HotDeployJSPFileAS40Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as42/DeleteServerAS42Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as42/HotDeployJSPFileAS42Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/DeleteServerAS50Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/HotDeployJSPFileAS50Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as51/DeleteServerAS51Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as51/HotDeployJSPFileAS51Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/DeleteServerAS6Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/HotDeployJSPFileAS6Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as70/DeleteServerAS70Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as70/HotDeployJSPFileAS70Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as71/DeleteServerAS71Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as71/HotDeployJSPFileAS71Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/DeleteServerEAP4Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/HotDeployJSPFileEAP4Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/DeleteServerEAP5Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/HotDeployJSPFileEAP5Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap6/DeleteServerEAP6Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap6/HotDeployJSPFileEAP6Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeleteServerTemplate.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/HotDeployJSPFileTemplate.java
Removed:
trunk/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/HotDeployJSPFile.java
Modified:
trunk/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/EAP5CompatibilitySuite.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAP6CompatibilitySuite.java
Log:
Created own implementation of HotDeployment and Delete test for each server version
Modified: trunk/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-09-27 08:52:35 UTC (rev 44081)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java 2012-09-27 09:02:23 UTC (rev 44082)
@@ -1,51 +1,71 @@
package org.jboss.ide.eclipse.as.ui.bot.test;
import org.jboss.ide.eclipse.as.ui.bot.test.as3.CreateAS3Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as3.DeleteServerAS3Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as3.DeployJSPProjectAS3Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as3.HotDeployJSPFileAS3Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as3.OperateAS3Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as3.UndeployJSPProjectAS3Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as40.CreateAS40Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as40.DeleteServerAS40Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as40.DeployJSPProjectAS40Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as40.HotDeployJSPFileAS40Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as40.OperateAS40Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as40.UndeployJSPProjectAS40Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as42.CreateAS42Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as42.DeleteServerAS42Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as42.DeployJSPProjectAS42Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as42.HotDeployJSPFileAS42Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as42.OperateAS42Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as42.UndeployJSPProjectAS42Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as50.CreateAS50Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as50.DeleteServerAS50Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as50.DeployJSPProjectAS50Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as50.HotDeployJSPFileAS50Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as50.OperateAS50Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as50.UndeployJSPProjectAS50Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as51.CreateAS51Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as51.DeleteServerAS51Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as51.DeployJSPProjectAS51Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as51.HotDeployJSPFileAS51Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as51.OperateAS51Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as51.UndeployJSPProjectAS51Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as6.CreateAS6Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as6.DeleteServerAS6Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as6.DeployJSPProjectAS6Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as6.HotDeployJSPFileAS6Server;
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.as70.CreateAS70Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as70.DeleteServerAS70Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as70.DeployJSPProjectAS70Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as70.HotDeployJSPFileAS70Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as70.OperateAS70Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as70.UndeployJSPProjectAS70Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as71.CreateAS71Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as71.DeleteServerAS71Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as71.DeployJSPProjectAS71Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as71.HotDeployJSPFileAS71Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as71.OperateAS71Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as71.UndeployJSPProjectAS71Server;
import org.jboss.ide.eclipse.as.ui.bot.test.eap4.CreateEAP4Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.eap4.DeleteServerEAP4Server;
import org.jboss.ide.eclipse.as.ui.bot.test.eap4.DeployJSPProjectEAP4Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.eap4.HotDeployJSPFileEAP4Server;
import org.jboss.ide.eclipse.as.ui.bot.test.eap4.OperateEAP4Server;
import org.jboss.ide.eclipse.as.ui.bot.test.eap4.UndeployJSPProjectEAP4Server;
import org.jboss.ide.eclipse.as.ui.bot.test.eap5.CreateEAP5Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.eap5.DeleteServerEAP5Server;
import org.jboss.ide.eclipse.as.ui.bot.test.eap5.DeployJSPProjectEAP5Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.eap5.HotDeployJSPFileEAP5Server;
import org.jboss.ide.eclipse.as.ui.bot.test.eap5.OperateEAP5Server;
import org.jboss.ide.eclipse.as.ui.bot.test.eap5.UndeployJSPProjectEAP5Server;
import org.jboss.ide.eclipse.as.ui.bot.test.eap6.CreateEAP6Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.eap6.DeleteServerEAP6Server;
import org.jboss.ide.eclipse.as.ui.bot.test.eap6.DeployJSPProjectEAP6Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.eap6.HotDeployJSPFileEAP6Server;
import org.jboss.ide.eclipse.as.ui.bot.test.eap6.OperateEAP6Server;
import org.jboss.ide.eclipse.as.ui.bot.test.eap6.UndeployJSPProjectEAP6Server;
-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;
@@ -63,6 +83,7 @@
CreateAS42Server.class,
CreateAS40Server.class,
CreateAS3Server.class,
+
OperateEAP6Server.class,
OperateEAP5Server.class,
OperateEAP4Server.class,
@@ -74,6 +95,7 @@
OperateAS42Server.class,
OperateAS3Server.class,
OperateAS40Server.class,
+
DeployJSPProjectEAP6Server.class,
DeployJSPProjectEAP5Server.class,
DeployJSPProjectEAP4Server.class,
@@ -85,7 +107,19 @@
DeployJSPProjectAS42Server.class,
DeployJSPProjectAS3Server.class,
DeployJSPProjectAS40Server.class,
- HotDeployJSPFile.class,
+
+ HotDeployJSPFileEAP6Server.class,
+ HotDeployJSPFileEAP5Server.class,
+ HotDeployJSPFileEAP4Server.class,
+ HotDeployJSPFileAS71Server.class,
+ HotDeployJSPFileAS70Server.class,
+ HotDeployJSPFileAS6Server.class,
+ HotDeployJSPFileAS51Server.class,
+ HotDeployJSPFileAS50Server.class,
+ HotDeployJSPFileAS42Server.class,
+ HotDeployJSPFileAS40Server.class,
+ HotDeployJSPFileAS3Server.class,
+
UndeployJSPProjectEAP6Server.class,
UndeployJSPProjectEAP5Server.class,
UndeployJSPProjectEAP4Server.class,
@@ -97,7 +131,18 @@
UndeployJSPProjectAS42Server.class,
UndeployJSPProjectAS3Server.class,
UndeployJSPProjectAS40Server.class,
- DeleteServer.class
+
+ DeleteServerEAP6Server.class,
+ DeleteServerEAP5Server.class,
+ DeleteServerEAP4Server.class,
+ DeleteServerAS71Server.class,
+ DeleteServerAS70Server.class,
+ DeleteServerAS6Server.class,
+ DeleteServerAS51Server.class,
+ DeleteServerAS50Server.class,
+ DeleteServerAS42Server.class,
+ DeleteServerAS40Server.class,
+ DeleteServerAS3Server.class
})
public class AllTestsSuite {
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAP5CompatibilitySuite.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAP5CompatibilitySuite.java 2012-09-27 08:52:35 UTC (rev 44081)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAP5CompatibilitySuite.java 2012-09-27 09:02:23 UTC (rev 44082)
@@ -1,11 +1,11 @@
package org.jboss.ide.eclipse.as.ui.bot.test;
import org.jboss.ide.eclipse.as.ui.bot.test.eap5.CreateEAP5Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.eap5.DeleteServerEAP5Server;
import org.jboss.ide.eclipse.as.ui.bot.test.eap5.DeployJSPProjectEAP5Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.eap5.HotDeployJSPFileEAP5Server;
import org.jboss.ide.eclipse.as.ui.bot.test.eap5.OperateEAP5Server;
import org.jboss.ide.eclipse.as.ui.bot.test.eap5.UndeployJSPProjectEAP5Server;
-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;
@@ -15,9 +15,9 @@
CreateEAP5Server.class,
OperateEAP5Server.class,
DeployJSPProjectEAP5Server.class,
- HotDeployJSPFile.class,
+ HotDeployJSPFileEAP5Server.class,
UndeployJSPProjectEAP5Server.class,
- DeleteServer.class
+ DeleteServerEAP5Server.class
})
public class EAP5CompatibilitySuite {
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAP6CompatibilitySuite.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAP6CompatibilitySuite.java 2012-09-27 08:52:35 UTC (rev 44081)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAP6CompatibilitySuite.java 2012-09-27 09:02:23 UTC (rev 44082)
@@ -1,11 +1,11 @@
package org.jboss.ide.eclipse.as.ui.bot.test;
import org.jboss.ide.eclipse.as.ui.bot.test.eap6.CreateEAP6Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.eap6.DeleteServerEAP6Server;
import org.jboss.ide.eclipse.as.ui.bot.test.eap6.DeployJSPProjectEAP6Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.eap6.HotDeployJSPFileEAP6Server;
import org.jboss.ide.eclipse.as.ui.bot.test.eap6.OperateEAP6Server;
import org.jboss.ide.eclipse.as.ui.bot.test.eap6.UndeployJSPProjectEAP6Server;
-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;
@@ -15,9 +15,9 @@
CreateEAP6Server.class,
OperateEAP6Server.class,
DeployJSPProjectEAP6Server.class,
- HotDeployJSPFile.class,
+ HotDeployJSPFileEAP6Server.class,
UndeployJSPProjectEAP6Server.class,
- DeleteServer.class
+ DeleteServerEAP6Server.class
})
public class EAP6CompatibilitySuite {
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as3/DeleteServerAS3Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as3/DeleteServerAS3Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as3/DeleteServerAS3Server.java 2012-09-27 09:02:23 UTC (rev 44082)
@@ -0,0 +1,12 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as3;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.DeleteServerTemplate;
+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;
+
+@Require(server=(a)Server(type=ServerType.JbossAS, version="3.2", state=ServerState.Present))
+public class DeleteServerAS3Server extends DeleteServerTemplate {
+
+}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as3/HotDeployJSPFileAS3Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as3/HotDeployJSPFileAS3Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as3/HotDeployJSPFileAS3Server.java 2012-09-27 09:02:23 UTC (rev 44082)
@@ -0,0 +1,12 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as3;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.HotDeployJSPFileTemplate;
+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;
+
+@Require(server=(a)Server(type=ServerType.JbossAS, version="3.2", state=ServerState.Running), clearWorkspace=false, clearProjects=false)
+public class HotDeployJSPFileAS3Server extends HotDeployJSPFileTemplate{
+
+}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/DeleteServerAS40Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/DeleteServerAS40Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/DeleteServerAS40Server.java 2012-09-27 09:02:23 UTC (rev 44082)
@@ -0,0 +1,12 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as40;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.DeleteServerTemplate;
+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;
+
+@Require(server=(a)Server(type=ServerType.JbossAS, version="4.0", state=ServerState.Present))
+public class DeleteServerAS40Server extends DeleteServerTemplate {
+
+}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/HotDeployJSPFileAS40Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/HotDeployJSPFileAS40Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/HotDeployJSPFileAS40Server.java 2012-09-27 09:02:23 UTC (rev 44082)
@@ -0,0 +1,12 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as40;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.HotDeployJSPFileTemplate;
+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;
+
+@Require(server=(a)Server(type=ServerType.JbossAS, version="4.0", state=ServerState.Running), clearWorkspace=false, clearProjects=false)
+public class HotDeployJSPFileAS40Server extends HotDeployJSPFileTemplate {
+
+}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as42/DeleteServerAS42Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as42/DeleteServerAS42Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as42/DeleteServerAS42Server.java 2012-09-27 09:02:23 UTC (rev 44082)
@@ -0,0 +1,12 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as42;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.DeleteServerTemplate;
+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;
+
+@Require(server=(a)Server(type=ServerType.JbossAS, version="4.2", state=ServerState.Present))
+public class DeleteServerAS42Server extends DeleteServerTemplate {
+
+}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as42/HotDeployJSPFileAS42Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as42/HotDeployJSPFileAS42Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as42/HotDeployJSPFileAS42Server.java 2012-09-27 09:02:23 UTC (rev 44082)
@@ -0,0 +1,12 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as42;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.HotDeployJSPFileTemplate;
+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;
+
+@Require(server=(a)Server(type=ServerType.JbossAS, version="4.2", state=ServerState.Running), clearWorkspace=false, clearProjects=false)
+public class HotDeployJSPFileAS42Server extends HotDeployJSPFileTemplate {
+
+}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/DeleteServerAS50Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/DeleteServerAS50Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/DeleteServerAS50Server.java 2012-09-27 09:02:23 UTC (rev 44082)
@@ -0,0 +1,12 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as50;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.DeleteServerTemplate;
+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;
+
+@Require(server=(a)Server(type=ServerType.JbossAS, version="5.0", state=ServerState.Present))
+public class DeleteServerAS50Server extends DeleteServerTemplate {
+
+}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/HotDeployJSPFileAS50Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/HotDeployJSPFileAS50Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/HotDeployJSPFileAS50Server.java 2012-09-27 09:02:23 UTC (rev 44082)
@@ -0,0 +1,12 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as50;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.HotDeployJSPFileTemplate;
+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;
+
+@Require(server=(a)Server(type=ServerType.JbossAS, version="5.0", state=ServerState.Running), clearWorkspace=false, clearProjects=false)
+public class HotDeployJSPFileAS50Server extends HotDeployJSPFileTemplate {
+
+}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as51/DeleteServerAS51Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as51/DeleteServerAS51Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as51/DeleteServerAS51Server.java 2012-09-27 09:02:23 UTC (rev 44082)
@@ -0,0 +1,12 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as51;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.DeleteServerTemplate;
+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;
+
+@Require(server=(a)Server(type=ServerType.JbossAS, version="5.1", state=ServerState.Present))
+public class DeleteServerAS51Server extends DeleteServerTemplate {
+
+}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as51/HotDeployJSPFileAS51Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as51/HotDeployJSPFileAS51Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as51/HotDeployJSPFileAS51Server.java 2012-09-27 09:02:23 UTC (rev 44082)
@@ -0,0 +1,12 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as51;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.HotDeployJSPFileTemplate;
+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;
+
+@Require(server=(a)Server(type=ServerType.JbossAS, version="5.1", state=ServerState.Running), clearWorkspace=false, clearProjects=false)
+public class HotDeployJSPFileAS51Server extends HotDeployJSPFileTemplate {
+
+}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/DeleteServerAS6Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/DeleteServerAS6Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/DeleteServerAS6Server.java 2012-09-27 09:02:23 UTC (rev 44082)
@@ -0,0 +1,12 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as6;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.DeleteServerTemplate;
+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;
+
+@Require(server=(a)Server(type=ServerType.JbossAS, version="6.1", state=ServerState.Present))
+public class DeleteServerAS6Server extends DeleteServerTemplate {
+
+}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/HotDeployJSPFileAS6Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/HotDeployJSPFileAS6Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/HotDeployJSPFileAS6Server.java 2012-09-27 09:02:23 UTC (rev 44082)
@@ -0,0 +1,12 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as6;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.HotDeployJSPFileTemplate;
+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;
+
+@Require(server=(a)Server(type=ServerType.JbossAS, version="6.1", state=ServerState.Running), clearWorkspace=false, clearProjects=false)
+public class HotDeployJSPFileAS6Server extends HotDeployJSPFileTemplate {
+
+}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as70/DeleteServerAS70Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as70/DeleteServerAS70Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as70/DeleteServerAS70Server.java 2012-09-27 09:02:23 UTC (rev 44082)
@@ -0,0 +1,12 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as70;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.DeleteServerTemplate;
+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;
+
+@Require(server=(a)Server(type=ServerType.JbossAS, version="7.0", state=ServerState.Present))
+public class DeleteServerAS70Server extends DeleteServerTemplate {
+
+}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as70/HotDeployJSPFileAS70Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as70/HotDeployJSPFileAS70Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as70/HotDeployJSPFileAS70Server.java 2012-09-27 09:02:23 UTC (rev 44082)
@@ -0,0 +1,12 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as70;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.HotDeployJSPFileTemplate;
+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;
+
+@Require(server=(a)Server(type=ServerType.JbossAS, version="7.0", state=ServerState.Running), clearWorkspace=false, clearProjects=false)
+public class HotDeployJSPFileAS70Server extends HotDeployJSPFileTemplate {
+
+}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as71/DeleteServerAS71Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as71/DeleteServerAS71Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as71/DeleteServerAS71Server.java 2012-09-27 09:02:23 UTC (rev 44082)
@@ -0,0 +1,12 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as71;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.DeleteServerTemplate;
+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;
+
+@Require(server=(a)Server(type=ServerType.JbossAS, version="7.1", state=ServerState.Present))
+public class DeleteServerAS71Server extends DeleteServerTemplate {
+
+}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as71/HotDeployJSPFileAS71Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as71/HotDeployJSPFileAS71Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as71/HotDeployJSPFileAS71Server.java 2012-09-27 09:02:23 UTC (rev 44082)
@@ -0,0 +1,12 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as71;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.HotDeployJSPFileTemplate;
+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;
+
+@Require(server=(a)Server(type=ServerType.JbossAS, version="7.1", state=ServerState.Running), clearWorkspace=false, clearProjects=false)
+public class HotDeployJSPFileAS71Server extends HotDeployJSPFileTemplate {
+
+}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/DeleteServerEAP4Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/DeleteServerEAP4Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/DeleteServerEAP4Server.java 2012-09-27 09:02:23 UTC (rev 44082)
@@ -0,0 +1,12 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.eap4;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.DeleteServerTemplate;
+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;
+
+@Require(server=(a)Server(type=ServerType.EAP, version="4.3", state=ServerState.Present))
+public class DeleteServerEAP4Server extends DeleteServerTemplate {
+
+}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/HotDeployJSPFileEAP4Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/HotDeployJSPFileEAP4Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/HotDeployJSPFileEAP4Server.java 2012-09-27 09:02:23 UTC (rev 44082)
@@ -0,0 +1,12 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.eap4;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.HotDeployJSPFileTemplate;
+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;
+
+@Require(server=(a)Server(type=ServerType.EAP, version="4.3", state=ServerState.Running), clearWorkspace=false, clearProjects=false)
+public class HotDeployJSPFileEAP4Server extends HotDeployJSPFileTemplate {
+
+}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/DeleteServerEAP5Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/DeleteServerEAP5Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/DeleteServerEAP5Server.java 2012-09-27 09:02:23 UTC (rev 44082)
@@ -0,0 +1,12 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.eap5;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.DeleteServerTemplate;
+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;
+
+@Require(server=(a)Server(type=ServerType.EAP, version="5", state=ServerState.Present))
+public class DeleteServerEAP5Server extends DeleteServerTemplate {
+
+}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/HotDeployJSPFileEAP5Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/HotDeployJSPFileEAP5Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/HotDeployJSPFileEAP5Server.java 2012-09-27 09:02:23 UTC (rev 44082)
@@ -0,0 +1,12 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.eap5;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.HotDeployJSPFileTemplate;
+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;
+
+@Require(server=(a)Server(type=ServerType.EAP, version="5", state=ServerState.Running), clearWorkspace=false, clearProjects=false)
+public class HotDeployJSPFileEAP5Server extends HotDeployJSPFileTemplate {
+
+}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap6/DeleteServerEAP6Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap6/DeleteServerEAP6Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap6/DeleteServerEAP6Server.java 2012-09-27 09:02:23 UTC (rev 44082)
@@ -0,0 +1,12 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.eap6;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.DeleteServerTemplate;
+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;
+
+@Require(server=(a)Server(type=ServerType.EAP, version="6", state=ServerState.Present))
+public class DeleteServerEAP6Server extends DeleteServerTemplate {
+
+}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap6/HotDeployJSPFileEAP6Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap6/HotDeployJSPFileEAP6Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap6/HotDeployJSPFileEAP6Server.java 2012-09-27 09:02:23 UTC (rev 44082)
@@ -0,0 +1,12 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.eap6;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.HotDeployJSPFileTemplate;
+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;
+
+@Require(server=(a)Server(type=ServerType.EAP, version="6", state=ServerState.Running), clearWorkspace=false, clearProjects=false)
+public class HotDeployJSPFileEAP6Server extends HotDeployJSPFileTemplate {
+
+}
Deleted: trunk/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-09-27 08:52:35 UTC (rev 44081)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeleteServer.java 2012-09-27 09:02:23 UTC (rev 44082)
@@ -1,26 +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.config.Annotations.Require;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
-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
- *
- */
-@Require(server=@Server)
-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: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeleteServerTemplate.java (from rev 43318, trunk/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/DeleteServerTemplate.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeleteServerTemplate.java 2012-09-27 09:02:23 UTC (rev 44082)
@@ -0,0 +1,29 @@
+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.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+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.
+ *
+ * NOTE: It is marked as abstract so that concrete implementation can specify their own {@link Server}
+ * annotation
+ *
+ * @author Lucia Jelinkova
+ *
+ */
+@Require(server=@Server)
+public abstract class DeleteServerTemplate extends SWTTestExt {
+
+ private ServersView serversView = new ServersView();
+
+ @Test
+ public void deleteServer(){
+ serversView.deleteServer(configuredState.getServer().name);
+
+ assertFalse(serversView.serverExists(configuredState.getServer().name));
+ }
+}
Deleted: trunk/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-09-27 08:52:35 UTC (rev 44081)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/HotDeployJSPFile.java 2012-09-27 09:02:23 UTC (rev 44082)
@@ -1,39 +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.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.jboss.tools.ui.bot.ext.config.Annotations.Require;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
-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
- *
- */
-@Require(server=@Server, clearWorkspace=false, clearProjects=false)
-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(DeployJSPProjectTemplate.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/" + DeployJSPProjectTemplate.PROJECT_NAME + "/hot.jsp"));
- }
-}
Copied: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/HotDeployJSPFileTemplate.java (from rev 43318, trunk/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/HotDeployJSPFileTemplate.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/HotDeployJSPFileTemplate.java 2012-09-27 09:02:23 UTC (rev 44082)
@@ -0,0 +1,41 @@
+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.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.jboss.tools.ui.bot.ext.config.Annotations.Server;
+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>
+ *
+ * NOTE: It is marked as abstract so that concrete implementation can specify their own {@link Server}
+ * annotation
+ *
+ * @author Lucia Jelinkova
+ *
+ */
+public abstract class HotDeployJSPFileTemplate 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(DeployJSPProjectTemplate.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/" + DeployJSPProjectTemplate.PROJECT_NAME + "/hot.jsp"));
+ }
+}
12 years, 3 months
JBoss Tools SVN: r44080 - branches/jbosstools-4.0.0.Alpha2/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-09-27 04:25:18 -0400 (Thu, 27 Sep 2012)
New Revision: 44080
Modified:
branches/jbosstools-4.0.0.Alpha2/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsJavaApplicationValidatorDelegate.java
Log:
Fixed - JBIDE-12745 - Bad location for problem marker on JAX-RS Application
https://issues.jboss.org/browse/JBIDE-12745
Modified: branches/jbosstools-4.0.0.Alpha2/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsJavaApplicationValidatorDelegate.java
===================================================================
--- branches/jbosstools-4.0.0.Alpha2/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsJavaApplicationValidatorDelegate.java 2012-09-27 08:23:41 UTC (rev 44079)
+++ branches/jbosstools-4.0.0.Alpha2/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsJavaApplicationValidatorDelegate.java 2012-09-27 08:25:18 UTC (rev 44080)
@@ -49,7 +49,7 @@
if (!application.isOverriden() && applicationPathAnnotation == null) {
addProblem(JaxrsValidationMessages.JAVA_APPLICATION_MISSING_APPLICATION_PATH_ANNOTATION,
JaxrsPreferences.JAVA_APPLICATION_MISSING_APPLICATION_PATH_ANNOTATION, new String[0],
- appJavaElement.getSourceRange().getLength(), appJavaElement.getSourceRange().getOffset(),
+ appJavaElement.getNameRange().getLength(), appJavaElement.getNameRange().getOffset(),
application.getResource(),
JaxrsValidationQuickFixes.JAVA_APPLICATION_MISSING_APPLICATION_PATH_ANNOTATION_ID);
}
12 years, 3 months
JBoss Tools SVN: r44079 - branches/jbosstools-4.0.0.Alpha2/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-09-27 04:23:41 -0400 (Thu, 27 Sep 2012)
New Revision: 44079
Modified:
branches/jbosstools-4.0.0.Alpha2/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsValidationMessages.properties
Log:
Fixed - JBIDE-12736 - Parameter substitution in JAX-RS validation messages is broken
https://issues.jboss.org/browse/JBIDE-12736
Modified: branches/jbosstools-4.0.0.Alpha2/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsValidationMessages.properties
===================================================================
--- branches/jbosstools-4.0.0.Alpha2/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsValidationMessages.properties 2012-09-27 07:43:04 UTC (rev 44078)
+++ branches/jbosstools-4.0.0.Alpha2/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsValidationMessages.properties 2012-09-27 08:23:41 UTC (rev 44079)
@@ -1,20 +1,20 @@
-SEARCHING_RESOURCES=project '''{0}'''; searching resources for validation (JAX-RS Validator).
-VALIDATING_RESOURCE=project '''{0}'''; resource '''{1}''' (JAX-RS Validator)
-VALIDATING_PROJECT=project '''{0}''' (JAX-RS Validator)
+SEARCHING_RESOURCES=project ''{0}''; searching resources for validation (JAX-RS Validator).
+VALIDATING_RESOURCE=project ''{0}''; resource '''{1}''' (JAX-RS Validator)
+VALIDATING_PROJECT=project ''{0}'' (JAX-RS Validator)
APPLICATION_NO_OCCURRENCE_FOUND=No JAX-RS Activator is defined for the project.
APPLICATION_TOO_MANY_OCCURRENCES=Multiple JAX-RS Activators are defined for the project.
JAVA_APPLICATION_MISSING_APPLICATION_PATH_ANNOTATION=The Application Path should be configured with an @ApplicationPath annotation or in the web deployment descriptor.
-JAVA_APPLICATION_INVALID_TYPE_HIERARCHY=Type '''{0}''' should extend javax.ws.rs.core.Application.
+JAVA_APPLICATION_INVALID_TYPE_HIERARCHY=Type ''{0}'' should extend javax.ws.rs.core.Application.
HTTP_METHOD_MISSING_RETENTION_ANNOTATION=The HTTP Method should have a @Retention(RetentionPolicy.RUNTIME) annotation on its type.
HTTP_METHOD_INVALID_RETENTION_ANNOTATION_VALUE=The @Retention annotation value is not correct. It should be RetentionPolicy.RUNTIME
HTTP_METHOD_MISSING_TARGET_ANNOTATION=The HTTP Method should have a @Target(ElementType.METHOD) annotation on its type.
HTTP_METHOD_INVALID_TARGET_ANNOTATION_VALUE=The @Target annotation value is not correct. It should be ElementType.METHOD
-RESOURCE_METHOD_ILLEGAL_CONTEXT_ANNOTATION=@Context annotation is only allowed on method parameters of type '''{0}'''.
+RESOURCE_METHOD_ILLEGAL_CONTEXT_ANNOTATION=@Context annotation is only allowed on method parameters of type ''{0}''.
RESOURCE_METHOD_MORE_THAN_ONE_UNANNOTATED_PARAMETER=At most one method parameter may be declared without any JAX-RS annotation to map the incoming request entity body.
-RESOURCE_METHOD_UNBOUND_PATHPARAM_ANNOTATION_VALUE=@PathParam value '''{0}''' does not match any @Path annotation template parameters of the java method and the enclosing java type.
-RESOURCE_METHOD_UNBOUND_PATH_ANNOTATION_TEMPLATE_PARAMETER=The @Path template parameter '''{0}''' is not bound to any @Path template parameter.
-RESOURCE_METHOD_INVALID_PATHPARAM_ANNOTATION_VALUE=The @PathParam annotation value '''{0}''' should be alphanumeric.
-RESOURCE_METHOD_NO_PUBLIC_MODIFIER=The method '''{0}''' should be public.
+RESOURCE_METHOD_UNBOUND_PATHPARAM_ANNOTATION_VALUE=@PathParam value ''{0}'' does not match any @Path annotation template parameters of the java method and the enclosing java type.
+RESOURCE_METHOD_UNBOUND_PATH_ANNOTATION_TEMPLATE_PARAMETER=The @Path template parameter ''{0}'' is not bound to any @Path template parameter.
+RESOURCE_METHOD_INVALID_PATHPARAM_ANNOTATION_VALUE=The @PathParam annotation value ''{0}'' should be alphanumeric.
+RESOURCE_METHOD_NO_PUBLIC_MODIFIER=The method ''{0}'' should be public.
12 years, 3 months
JBoss Tools SVN: r44078 - in trunk/runtime/plugins: org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/download and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-09-27 03:43:04 -0400 (Thu, 27 Sep 2012)
New Revision: 44078
Modified:
trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/internal/RuntimeExtensionManager.java
trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/download/DownloadRuntimeViewerDialog.java
Log:
JBIDE-12582 to trunk
Modified: trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/internal/RuntimeExtensionManager.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/internal/RuntimeExtensionManager.java 2012-09-27 05:37:06 UTC (rev 44077)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/internal/RuntimeExtensionManager.java 2012-09-27 07:43:04 UTC (rev 44078)
@@ -284,11 +284,12 @@
Node node = runtimes.item(i);
if (node.getNodeType() == Node.ELEMENT_NODE) {
Element element = (Element) node;
- String id = element.getAttribute("id"); //$NON-NLS-1$
- String name = element.getAttribute("name"); //$NON-NLS-1$
- String version = element.getAttribute("version"); //$NON-NLS-1$
- String url = element.getAttribute("url"); //$NON-NLS-1$
- String disclaimer = element.getAttribute("disclaimer"); //$NON-NLS-1$
+ String id = element.getAttribute(ID);
+ String name = element.getAttribute(NAME);
+ String version = element.getAttribute(VERSION);
+ String url = element.getAttribute(URL);
+ String disclaimer = element.getAttribute(DISCLAIMER);
+ String licenseUrl = element.getAttribute(LICENSE_URL);
if (id == null || name == null || version == null || url == null) {
IStatus status = new Status(IStatus.WARNING,
RuntimeCoreActivator.PLUGIN_ID,
@@ -297,7 +298,8 @@
RuntimeCoreActivator.getDefault().getLog().log(status);
} else {
DownloadRuntime runtime = new DownloadRuntime(id, name, version, url);
- runtime.setDisclaimer("true".equals(disclaimer)); //$NON-NLS-1$
+ runtime.setLicenseURL(licenseUrl);
+ runtime.setDisclaimer(Boolean.parseBoolean(disclaimer));
map.put(id, runtime);
}
}
Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/download/DownloadRuntimeViewerDialog.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/download/DownloadRuntimeViewerDialog.java 2012-09-27 05:37:06 UTC (rev 44077)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/download/DownloadRuntimeViewerDialog.java 2012-09-27 07:43:04 UTC (rev 44078)
@@ -234,6 +234,8 @@
if( licenseApproved(downloadRuntime)) {
saveLocationDialog = new DownloadRuntimeDialog(getShell(), downloadRuntime);
saveLocationDialog.open();
+ } else {
+ return;
}
}
}
12 years, 3 months