JBoss Tools SVN: r42969 - branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: mmalina
Date: 2012-08-10 05:10:47 -0400 (Fri, 10 Aug 2012)
New Revision: 42969
Modified:
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/pom.xml
Log:
Added a profile to run the eap5 compatibility tests
Modified: 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/pom.xml 2012-08-10 08:43:49 UTC (rev 42968)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/pom.xml 2012-08-10 09:10:47 UTC (rev 42969)
@@ -191,8 +191,43 @@
</build>
</profile>
-
<profile>
+ <id>eap5</id>
+ <activation>
+ <property>
+ <name>test.profile</name>
+ <value>eap5</value>
+ </property>
+ </activation>
+ <properties>
+ <test.class>org.jboss.ide.eclipse.as.ui.bot.test.EAP5CompatibilitySuite</test.class>
+ <jbosstools.test.jboss-eap-5.home>${requirementsDirectory}/jboss-eap-5.1</jbosstools.test.jboss-eap-5.home>
+ <jbosstools.test.jboss-eap-5.url></jbosstools.test.jboss-eap-5.url>
+ <jbosstools.test.jboss-eap-5.md5>6d652593f03b398a9b832760c71ae1ad</jbosstools.test.jboss-eap-5.md5>
+ <runtimesProperties>-Djbosstools.test.jboss-eap-5.home=${jbosstools.test.jboss-eap-5.home} -Dswtbot.test.properties.file=resources/config_files_templates/product/eap-5.properties</runtimesProperties>
+ </properties>
+ <build>
+ <plugins><plugin>
+ <groupId>com.googlecode.maven-download-plugin</groupId>
+ <artifactId>maven-download-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>install-eap-6</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <configuration>
+ <url>${jbosstools.test.jboss-eap-5.url}</url>
+ <md5>${jbosstools.test.jboss-eap-5.md5}</md5>
+ <unpack>true</unpack>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin></plugins>
+ </build>
+ </profile>
+ <profile>
<id>eap6</id>
<activation>
<property>
13 years, 8 months
JBoss Tools SVN: r42968 - branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap6.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-08-10 04:43:49 -0400 (Fri, 10 Aug 2012)
New Revision: 42968
Modified:
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap6/DeployJSPProjectEAP6Server.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/eap6/OperateEAP6Server.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/eap6/UndeployJSPProjectEAP6Server.java
Log:
Changed EAP6 version definition
Modified: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap6/DeployJSPProjectEAP6Server.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/eap6/DeployJSPProjectEAP6Server.java 2012-08-10 08:42:11 UTC (rev 42967)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap6/DeployJSPProjectEAP6Server.java 2012-08-10 08:43:49 UTC (rev 42968)
@@ -11,7 +11,7 @@
* @author Lucia Jelinkova
*
*/
-@Require(server=(a)Server(type=ServerType.EAP, state=ServerState.Running))
+@Require(server=(a)Server(type=ServerType.EAP, version="6", state=ServerState.Running))
public class DeployJSPProjectEAP6Server extends DeployJSPProjectTemplate {
@Override
Modified: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap6/OperateEAP6Server.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/eap6/OperateEAP6Server.java 2012-08-10 08:42:11 UTC (rev 42967)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap6/OperateEAP6Server.java 2012-08-10 08:43:49 UTC (rev 42968)
@@ -12,7 +12,7 @@
* @author Lucia Jelinkova
*
*/
-@Require(server=(a)Server(type=ServerType.EAP, state=ServerState.NotRunning))
+@Require(server=(a)Server(type=ServerType.EAP, version="6", state=ServerState.NotRunning))
public class OperateEAP6Server extends OperateServerTemplate {
@Override
Modified: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap6/UndeployJSPProjectEAP6Server.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/eap6/UndeployJSPProjectEAP6Server.java 2012-08-10 08:42:11 UTC (rev 42967)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap6/UndeployJSPProjectEAP6Server.java 2012-08-10 08:43:49 UTC (rev 42968)
@@ -12,7 +12,7 @@
* @author Lucia Jelinkova
*
*/
-@Require(server=(a)Server(type=ServerType.EAP, state=ServerState.Running), clearProjects=false, clearWorkspace=false)
+@Require(server=(a)Server(type=ServerType.EAP, version="6", state=ServerState.Running), clearProjects=false, clearWorkspace=false)
public class UndeployJSPProjectEAP6Server extends UndeployJSPProjectTemplate {
@Override
13 years, 8 months
JBoss Tools SVN: r42967 - branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap6.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-08-10 04:42:11 -0400 (Fri, 10 Aug 2012)
New Revision: 42967
Modified:
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap6/CreateEAP6Server.java
Log:
Changed EAP6 version definition
Modified: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap6/CreateEAP6Server.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/eap6/CreateEAP6Server.java 2012-08-10 08:07:12 UTC (rev 42966)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap6/CreateEAP6Server.java 2012-08-10 08:42:11 UTC (rev 42967)
@@ -19,7 +19,7 @@
* @author Lucia Jelinkova
*
*/
-@Require(server=(a)Server(type=ServerType.EAP, state=ServerState.Present))
+@Require(server=(a)Server(type=ServerType.EAP, version="6", state=ServerState.Present))
public class CreateEAP6Server extends CreateServerTemplate {
@Override
13 years, 8 months
JBoss Tools SVN: r42966 - branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/product.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-08-10 04:07:12 -0400 (Fri, 10 Aug 2012)
New Revision: 42966
Modified:
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/product/eap-6.properties
Log:
Changed EAP6 version definition
Modified: 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/product/eap-6.properties 2012-08-10 08:06:54 UTC (rev 42965)
+++ 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-10 08:07:12 UTC (rev 42966)
@@ -1 +1 @@
-SERVER=EAP,6.0,default,${jbosstools.test.jboss-eap-6.home}
+SERVER=EAP,6,default,${jbosstools.test.jboss-eap-6.home}
13 years, 8 months
JBoss Tools SVN: r42965 - in branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test: launchers/prepare_workspace and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-08-10 04:06:54 -0400 (Fri, 10 Aug 2012)
New Revision: 42965
Added:
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_EAP_5_CompatibilitySuite.launch
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_EAP_6_CompatibilitySuite.launch
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/product/eap-5.properties
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAP5CompatibilitySuite.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/CreateEAP5Server.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/DeployJSPProjectEAP5Server.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/OperateEAP5Server.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/UndeployJSPProjectEAP5Server.java
Removed:
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_EAPCompatibilitySuite.launch
Modified:
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/as_prepare_workspace.launch
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java
Log:
Added EAP5 tests
Deleted: 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/AS_EAPCompatibilitySuite.launch 2012-08-10 07:04:51 UTC (rev 42964)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_EAPCompatibilitySuite.launch 2012-08-10 08:06:54 UTC (rev 42965)
@@ -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:"Please choose a SWTBot configuration file":${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>
Added: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_EAP_5_CompatibilitySuite.launch
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_EAP_5_CompatibilitySuite.launch (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_EAP_5_CompatibilitySuite.launch 2012-08-10 08:06:54 UTC (rev 42965)
@@ -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/EAP5CompatibilitySuite.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.EAP5CompatibilitySuite"/>
+<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=${workspace_loc}/org.jboss.ide.eclipse.as.ui.bot.test/resources/generated_config_files/eap-5.properties -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>
Added: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_EAP_6_CompatibilitySuite.launch
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_EAP_6_CompatibilitySuite.launch (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_EAP_6_CompatibilitySuite.launch 2012-08-10 08:06:54 UTC (rev 42965)
@@ -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/EAP6CompatibilitySuite.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.EAP6CompatibilitySuite"/>
+<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=${workspace_loc}/org.jboss.ide.eclipse.as.ui.bot.test/resources/generated_config_files/eap-6.properties -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: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/as_prepare_workspace.launch
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/as_prepare_workspace.launch 2012-08-10 07:04:51 UTC (rev 42964)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/as_prepare_workspace.launch 2012-08-10 08:06:54 UTC (rev 42965)
@@ -6,9 +6,12 @@
<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}"/>
+<listEntry value="jbosstools.test.jboss-eap-6.home=${folder_prompt:EAP 6 installation directory}"/>
+<listEntry value="jbosstools.test.jboss-eap-5.home=${folder_prompt:EAP 5 installation directory}"/>
+<listEntry value="jbosstools.test.jboss-as-6.x.home=${folder_prompt:JBoss AS 6.x installation directory}"/>
+<listEntry value="jbosstools.test.jboss-as-5.1.home=${folder_prompt:JBoss AS 5.1 installation directory}"/>
+<listEntry value="jbosstools.test.jboss-as-4.2.home=${folder_prompt:JBoss AS 4.2 installation directory}"/>
+<listEntry value="jbosstools.test.jboss-as-3.2.home=${folder_prompt:JBoss AS 3.2 installation directory}"/>
</listAttribute>
<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
Added: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/product/eap-5.properties
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/product/eap-5.properties (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/product/eap-5.properties 2012-08-10 08:06:54 UTC (rev 42965)
@@ -0,0 +1 @@
+SERVER=EAP,5.1,default,${jbosstools.test.jboss-eap-5.home}
Modified: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java 2012-08-10 07:04:51 UTC (rev 42964)
+++ 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-10 08:06:54 UTC (rev 42965)
@@ -16,6 +16,10 @@
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.eap5.CreateEAP5Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.eap5.DeployJSPProjectEAP5Server;
+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.DeployJSPProjectEAP6Server;
import org.jboss.ide.eclipse.as.ui.bot.test.eap6.OperateEAP6Server;
@@ -28,23 +32,27 @@
@RunWith(RequirementAwareSuite.class)
@Suite.SuiteClasses({
- CreateEAP6Server.class,
+ CreateEAP6Server.class,
+ CreateEAP5Server.class,
CreateAS6Server.class,
CreateAS5Server.class,
CreateAS4Server.class,
CreateAS3Server.class,
OperateEAP6Server.class,
+ OperateEAP5Server.class,
OperateAS6Server.class,
OperateAS5Server.class,
OperateAS4Server.class,
OperateAS3Server.class,
DeployJSPProjectEAP6Server.class,
+ DeployJSPProjectEAP5Server.class,
DeployJSPProjectAS6Server.class,
DeployJSPProjectAS5Server.class,
DeployJSPProjectAS4Server.class,
DeployJSPProjectAS3Server.class,
HotDeployJSPFile.class,
UndeployJSPProjectEAP6Server.class,
+ UndeployJSPProjectEAP5Server.class,
UndeployJSPProjectAS6Server.class,
UndeployJSPProjectAS5Server.class,
UndeployJSPProjectAS4Server.class,
Added: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAP5CompatibilitySuite.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/EAP5CompatibilitySuite.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/EAP5CompatibilitySuite.java 2012-08-10 08:06:54 UTC (rev 42965)
@@ -0,0 +1,24 @@
+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.DeployJSPProjectEAP5Server;
+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;
+
+(a)RunWith(RequirementAwareSuite.class)
+(a)Suite.SuiteClasses({
+ CreateEAP5Server.class,
+ OperateEAP5Server.class,
+ DeployJSPProjectEAP5Server.class,
+ HotDeployJSPFile.class,
+ UndeployJSPProjectEAP5Server.class,
+ DeleteServer.class
+})
+public class EAP5CompatibilitySuite {
+
+}
Added: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/CreateEAP5Server.java
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/CreateEAP5Server.java (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/eap5/CreateEAP5Server.java 2012-08-10 08:06:54 UTC (rev 42965)
@@ -0,0 +1,44 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.eap5;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+
+import java.util.List;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.CreateServerTemplate;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+import org.jboss.tools.ui.bot.ext.entity.XMLConfiguration;
+
+/**
+*
+* @see CreateServerTemplate
+* @author Lucia Jelinkova
+*
+*/
+@Require(server=(a)Server(type=ServerType.EAP, version="5", state=ServerState.Present))
+public class CreateEAP5Server extends CreateServerTemplate {
+
+ @Override
+ protected void assertEditorPorts() {
+ assertThat("8080", is(editor.getWebPort()));
+ assertThat("1099", is(editor.getJNDIPort()));
+ }
+
+ @Override
+ protected void assertViewPorts(List<XMLConfiguration> configurations) {
+ for (XMLConfiguration config : configurations){
+ assertValueIsNumber(config);
+ }
+ }
+
+ private void assertValueIsNumber(XMLConfiguration config){
+ try {
+ Integer.parseInt(config.getValue());
+ } catch (NumberFormatException e){
+ fail(config + " does not a numeric value");
+ }
+ }
+}
Added: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/DeployJSPProjectEAP5Server.java
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/DeployJSPProjectEAP5Server.java (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/eap5/DeployJSPProjectEAP5Server.java 2012-08-10 08:06:54 UTC (rev 42965)
@@ -0,0 +1,21 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.eap5;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.DeployJSPProjectTemplate;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+
+/**
+ * @see DeployJSPProjectTemplate
+ * @author Lucia Jelinkova
+ *
+ */
+@Require(server=(a)Server(type=ServerType.EAP, version="5", state=ServerState.Running))
+public class DeployJSPProjectEAP5Server extends DeployJSPProjectTemplate {
+
+ @Override
+ protected String getConsoleMessage() {
+ return "deploy, ctxPath=/" + PROJECT_NAME;
+ }
+}
Added: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/OperateEAP5Server.java
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/OperateEAP5Server.java (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/eap5/OperateEAP5Server.java 2012-08-10 08:06:54 UTC (rev 42965)
@@ -0,0 +1,21 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.eap5;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.OperateServerTemplate;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+
+/**
+ * @see OperateServerTemplate
+ * @author Lucia Jelinkova
+ *
+ */
+@Require(server=(a)Server(type=ServerType.EAP, version="5", state=ServerState.NotRunning))
+public class OperateEAP5Server extends OperateServerTemplate {
+
+ @Override
+ public String getWelcomePageText() {
+ return "Manage this JBoss AS Instance";
+ }
+}
Added: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/UndeployJSPProjectEAP5Server.java
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap5/UndeployJSPProjectEAP5Server.java (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/eap5/UndeployJSPProjectEAP5Server.java 2012-08-10 08:06:54 UTC (rev 42965)
@@ -0,0 +1,22 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.eap5;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.DeployJSPProjectTemplate;
+import org.jboss.ide.eclipse.as.ui.bot.test.template.UndeployJSPProjectTemplate;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+
+/**
+ * @see UndeployJSPProjectTemplate
+ * @author Lucia Jelinkova
+ *
+ */
+@Require(server=(a)Server(type=ServerType.EAP, version="5", state=ServerState.Running), clearProjects=false, clearWorkspace=false)
+public class UndeployJSPProjectEAP5Server extends UndeployJSPProjectTemplate {
+
+ @Override
+ protected String getConsoleMessage() {
+ return "undeploy, ctxPath=/" + DeployJSPProjectTemplate.PROJECT_NAME;
+ }
+}
13 years, 8 months
JBoss Tools SVN: r42964 - branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-08-10 03:04:51 -0400 (Fri, 10 Aug 2012)
New Revision: 42964
Modified:
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-3.properties
Log:
Use default java
Modified: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-3.properties
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-3.properties 2012-08-10 02:14:26 UTC (rev 42963)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-3.properties 2012-08-10 07:04:51 UTC (rev 42964)
@@ -1,2 +1,2 @@
-SERVER=AS,3.2,1.5,${jbosstools.test.jboss-as-3.2.home}
+SERVER=AS,3.2,default,${jbosstools.test.jboss-as-3.2.home}
13 years, 8 months
JBoss Tools SVN: r42963 - trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests.
by jbosstools-commits＠lists.jboss.org
Author: ldimaggio
Date: 2012-08-09 22:14:26 -0400 (Thu, 09 Aug 2012)
New Revision: 42963
Modified:
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/Editing.java
Log:
Updated tests to function cleanly on Juno.
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/Editing.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/Editing.java 2012-08-10 02:13:02 UTC (rev 42962)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/Editing.java 2012-08-10 02:14:26 UTC (rev 42963)
@@ -63,11 +63,11 @@
public static void setupProject() {
SWTBot wiz = open.newObject(ActionItem.NewObject.ESBESBProject.LABEL);
wiz.textWithLabel(ESBESBProject.TEXT_PROJECT_NAME).setText(projectName);
- wiz.sleep(30000l);
+ wiz.sleep(TIME_5S);
wiz.button(IDELabel.Button.NEXT).click();
- wiz.sleep(30000l);
+ wiz.sleep(TIME_5S);
wiz.button(IDELabel.Button.NEXT).click();
- wiz.sleep(30000l);
+ wiz.sleep(TIME_5S);
open.finish(wiz);
}
@@ -81,14 +81,15 @@
packageExplorer.show().bot().tree().select(projectName);
SWTBot wiz = open.newObject(ESBESBFile.LABEL);
wiz.textWithLabel(ESBESBFile.TEXT_NAME).setText("another-esb-config");
- bot.sleep(30000l);
+ bot.sleep(TIME_5S);
open.finish(wiz);
+ bot.sleep(TIME_5S);
assertTrue(bot.editorByTitle("another-esb-config.xml") != null);
assertTrue("ESB Editor opened problems",
problems.getErrorsNode(bot) == null);
}
-// @Test
+ @Test
public void providers() {
List<String> providerList = getAvailableProviders();
String[] actionPath = new String[] { configFileFull, node_providers };
@@ -115,6 +116,8 @@
+ Arrays.toString(providerList.toArray()),
providerList.isEmpty());
collapseTree();
+ /* ldimaggi - August 2012 - added to make test run on Eclipse Juno */
+ getEditor().save();
}
@Test
@@ -131,6 +134,10 @@
log.info("Invoke " + m.getName());
ESBListener action = (ESBListener) m.invoke(null, new Object[]{});
action.setService(service);
+
+ /* ldimaggi - August 2012 - added to make test run on Eclipse Juno */
+ getEditor().save();
+
action.create(getEditor(), actionPath);
listenerList.remove(action.getMenuLabel());
} catch (Exception e) {
@@ -144,9 +151,13 @@
+ Arrays.toString(listenerList.toArray()),
listenerList.isEmpty());
collapseTree();
+ bot.sleep(TIME_5S);
+
+ /* ldimaggi - August 2012 - added to make test run on Eclipse Juno */
+ getEditor().save();
}
-// @Test
+ @Test
public void actions() {
String service = "bbb";
addService(service);
@@ -189,6 +200,7 @@
}
private SWTBotEditor getEditor() {
+ bot.sleep(TIME_5S);
return bot.editorByTitle(configFileFull);
}
@@ -360,8 +372,4 @@
}
-
-
-
-
}
13 years, 8 months
JBoss Tools SVN: r42962 - trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: ldimaggio
Date: 2012-08-09 22:13:02 -0400 (Thu, 09 Aug 2012)
New Revision: 42962
Modified:
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/META-INF/MANIFEST.MF
Log:
Added specific bundle versions to:
org.eclipse.core.resources;bundle-version="3.5.1",
org.jboss.tools.esb.ui;bundle-version="1.5.0",
org.jboss.tools.esb.project.ui;bundle-version="1.5.0",
org.jboss.tools.community.project.examples;bundle-version="1.4.0",
org.jboss.tools.project.examples;bundle-version="1.4.0"
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/META-INF/MANIFEST.MF 2012-08-09 23:44:45 UTC (rev 42961)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/META-INF/MANIFEST.MF 2012-08-10 02:13:02 UTC (rev 42962)
@@ -17,11 +17,11 @@
org.eclipse.ui.ide;bundle-version="3.5.1",
org.eclipse.ui.forms;bundle-version="3.4.1",
org.junit4;bundle-version="4.5.0",
- org.eclipse.core.resources,
- org.jboss.tools.esb.ui,
- org.jboss.tools.esb.project.ui,
- org.jboss.tools.community.project.examples,
- org.jboss.tools.project.examples
+ org.eclipse.core.resources;bundle-version="3.5.1",
+ org.jboss.tools.esb.ui;bundle-version="1.5.0",
+ org.jboss.tools.esb.project.ui;bundle-version="1.5.0",
+ org.jboss.tools.community.project.examples;bundle-version="1.4.0",
+ org.jboss.tools.project.examples;bundle-version="1.4.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Eclipse-RegisterBuddy: org.apache.log4j
13 years, 8 months
JBoss Tools SVN: r42961 - in trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common: editor and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-08-09 19:44:45 -0400 (Thu, 09 Aug 2012)
New Revision: 42961
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/core/resources/XModelObjectEditorInput.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/TextEditorSupport.java
Log:
JBIDE-12411
https://issues.jboss.org/browse/JBIDE-12410
When file systems in model are rebuilt, for example after web content path is replaced, editors that use xmodel object representing a file resource should check if the xmodel object is deleted from the model, and in this case find the new valid object.
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/core/resources/XModelObjectEditorInput.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/core/resources/XModelObjectEditorInput.java 2012-08-09 23:24:29 UTC (rev 42960)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/core/resources/XModelObjectEditorInput.java 2012-08-09 23:44:45 UTC (rev 42961)
@@ -47,6 +47,22 @@
this.object = object;
cache = new XModelObjectCache(object);
}
+
+ /**
+ * Returns true if XModelObject corresponding to the file is replaced.
+ *
+ * @return
+ */
+ public boolean updateXModelObject() {
+ IFile file = getFile();
+ XModelObject o = EclipseResourceUtil.createObjectForResource(file);
+ if(o != null && o != object) {
+ object = o;
+ cache = new XModelObjectCache(object);
+ return true;
+ }
+ return false;
+ }
private static XModelObject getMainObject(XModelObject object) {
if(object instanceof FileAnyAuxiliaryImpl) {
@@ -135,10 +151,7 @@
}
public IFile getFile() {
-// XModelObject o = getXModelObject();
-// if (o == null || o.getPath() == null)
- return super.getFile();
-// return getFileByObject(o);
+ return super.getFile();
}
public boolean isFileChanged() {
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java 2012-08-09 23:24:29 UTC (rev 42960)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java 2012-08-09 23:44:45 UTC (rev 42961)
@@ -12,13 +12,10 @@
import java.io.*;
import java.text.MessageFormat;
-import java.util.*;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.util.Properties;
import org.eclipse.core.resources.*;
import org.eclipse.core.runtime.*;
-import org.jboss.tools.common.CommonPlugin;
import org.jboss.tools.common.core.resources.XModelObjectEditorInput;
import org.jboss.tools.common.model.util.XModelTreeListenerSWTSync;
import org.jboss.tools.common.model.ui.outline.XModelObjectContentOutlineProvider;
@@ -53,6 +50,7 @@
import org.jboss.tools.common.model.event.XModelTreeListener;
import org.jboss.tools.common.model.filesystems.FileSystemsHelper;
import org.jboss.tools.common.model.filesystems.impl.FileAnyImpl;
+import org.jboss.tools.common.model.filesystems.impl.FileSystemImpl;
import org.jboss.tools.common.model.filesystems.impl.FolderImpl;
import org.jboss.tools.common.model.options.Preference;
import org.jboss.tools.common.model.options.PreferenceModelUtilities;
@@ -552,6 +550,33 @@
public void structureChanged(XModelTreeEvent event) {
if(lock2) return;
if(waitForMerge) return;
+
+ if((event.getModelObject() instanceof FileSystemImpl || event.getDetails() instanceof FileSystemImpl) &&
+ getFile() != null && getFile().exists() && getEditorInput() instanceof XModelObjectEditorInput) {
+ XModelObjectEditorInput ei = (XModelObjectEditorInput)getEditorInput();
+ if(ei.updateXModelObject()) {
+ lock2 = true;
+ try {
+ XModelObject o = ei.getXModelObject();
+
+ if(textEditor != null) textEditor.setObject(o);
+ object = o;
+ setInput(ei);
+
+ lastModifiedTimeStamp = (object == null || object.isModified()) ? -1 : object.getLastModificationTimeStamp();
+ cache = new XModelObjectCache(object);
+ outline.setCache(cache);
+ model = object.getModel();
+
+ updateTitle();
+ timeStamp = -1;
+ update0();
+ } finally {
+ lock2 = false;
+ }
+ }
+ }
+
if(needsUpdate()) {
Display.getDefault().syncExec(new U());
}
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/TextEditorSupport.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/TextEditorSupport.java 2012-08-09 23:24:29 UTC (rev 42960)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/TextEditorSupport.java 2012-08-09 23:44:45 UTC (rev 42961)
@@ -41,7 +41,7 @@
}
public void update() {
- if(lock > 0) return;
+ if(lock > 0 || modified) return;
if(!needsUpdate()) return;
lock++;
try {
@@ -85,7 +85,8 @@
lock++;
try {
FileAnyImpl f = (FileAnyImpl)getModelObject();
- if(f != null) f.edit(provider.getText());
+ if(f != null) f.edit(provider.getText());
+ timeStamp = f.getTimeStamp();
} catch (XModelException e) {
ModelUIPlugin.getPluginLog().logError(e);
} finally {
13 years, 8 months
JBoss Tools SVN: r42960 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-08-09 19:24:29 -0400 (Thu, 09 Aug 2012)
New Revision: 42960
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamResourceVisitor.java
Log:
JBIDE-12410
https://issues.jboss.org/browse/JBIDE-12410
Seam build should support multiple web content folders
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamResourceVisitor.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamResourceVisitor.java 2012-08-09 17:36:14 UTC (rev 42959)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamResourceVisitor.java 2012-08-09 23:24:29 UTC (rev 42960)
@@ -13,6 +13,7 @@
import java.util.ArrayList;
import java.util.List;
+import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
@@ -23,13 +24,13 @@
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.IJavaProject;
import org.jboss.tools.common.model.XModel;
-import org.jboss.tools.common.model.XModelObject;
-import org.jboss.tools.common.model.filesystems.FileSystemsHelper;
import org.jboss.tools.common.model.plugin.ModelPlugin;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
+import org.jboss.tools.jst.web.WebUtils;
import org.jboss.tools.jst.web.model.helpers.InnerModelHelper;
import org.jboss.tools.seam.core.SeamCorePlugin;
import org.jboss.tools.seam.internal.core.scanner.IFileScanner;
@@ -52,7 +53,7 @@
IPath[] outs = new IPath[0];
IPath[] srcs = new IPath[0];
- IPath webinf = null;
+ IPath[] webinfs = new IPath[0];
public SeamResourceVisitor(SeamProject p) {
this.p = p;
@@ -61,14 +62,16 @@
getJavaSourceRoots(p.getProject());
XModel model = InnerModelHelper.createXModel(p.getProject());
- if(model != null) {
- XModelObject wio = FileSystemsHelper.getWebInf(model);
- if(wio != null) {
- IResource wir = (IResource)wio.getAdapter(IResource.class);
- if(wir != null) {
- webinf = wir.getFullPath();
+ IContainer[] cs = WebUtils.getWebRootFolders(p.getProject());
+ List<IPath> ws = new ArrayList<IPath>();
+ if(model != null && cs.length > 0) {
+ for (IContainer c: cs) {
+ IFolder f = c.getFolder(new Path("WEB-INF"));
+ if(f.exists()) {
+ ws.add(f.getFullPath());
}
}
+ webinfs = ws.toArray(new IPath[0]);
}
}
}
@@ -199,7 +202,7 @@
return true;
}
}
- if(webinf != null) {
+ for (IPath webinf: webinfs) {
if(webinf.isPrefixOf(path) || path.isPrefixOf(webinf)) {
return true;
}
13 years, 8 months