JBoss Tools SVN: r33995 - trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-08-16 19:30:36 -0400 (Tue, 16 Aug 2011)
New Revision: 33995
Added:
trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/requirements.properties
Log:
requirements declaration for running from maven
Added: trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/requirements.properties
===================================================================
--- trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/requirements.properties (rev 0)
+++ trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/requirements.properties 2011-08-16 23:30:36 UTC (rev 33995)
@@ -0,0 +1 @@
+requirements=jbpm-3.1.4
\ No newline at end of file
Property changes on: trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/requirements.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years, 8 months
JBoss Tools SVN: r33994 - trunk/deltacloud/tests/org.jboss.tools.deltacloud.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-08-16 19:30:00 -0400 (Tue, 16 Aug 2011)
New Revision: 33994
Modified:
trunk/deltacloud/tests/org.jboss.tools.deltacloud.ui.bot.test/pom.xml
Log:
added missing ant-contrib dependency
Modified: trunk/deltacloud/tests/org.jboss.tools.deltacloud.ui.bot.test/pom.xml
===================================================================
--- trunk/deltacloud/tests/org.jboss.tools.deltacloud.ui.bot.test/pom.xml 2011-08-16 23:06:29 UTC (rev 33993)
+++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.ui.bot.test/pom.xml 2011-08-16 23:30:00 UTC (rev 33994)
@@ -16,7 +16,7 @@
<systemProperties>-Dswtbot.test.properties.file=./swtbot.properties</systemProperties>
</properties>
- <build>
+ <build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
@@ -24,7 +24,7 @@
<configuration>
<useUIThread>false</useUIThread>
<skip>${swtbot.test.skip}</skip>
- <dependencies>
+ <dependencies combine.children="append">
<dependency>
<type>p2-installable-unit</type>
<artifactId>org.jboss.tools.deltacloud.feature.feature.group</artifactId>
@@ -36,6 +36,19 @@
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>${maven.antrun.plugin.version}</version>
+ <dependencies>
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>1.0b3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
<executions>
<execution>
<id>default-swtbot-config</id>
14 years, 8 months
JBoss Tools SVN: r33993 - in trunk/jsf/tests/org.jboss.tools.jsf.test: projects/JSF2Web and 13 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-08-16 19:06:29 -0400 (Tue, 16 Aug 2011)
New Revision: 33993
Added:
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.classpath
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.project
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/.jsdtscope
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/org.eclipse.jdt.core.prefs
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/org.eclipse.wst.common.component
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/org.eclipse.wst.common.project.facet.core.xml
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/org.eclipse.wst.jsdt.ui.superType.container
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/org.eclipse.wst.jsdt.ui.superType.name
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/META-INF/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/META-INF/MANIFEST.MF
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/WEB-INF/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/WEB-INF/.faces-config.xml.jsfdia
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/WEB-INF/faces-config.complete
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/WEB-INF/faces-config.original
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/WEB-INF/faces-config.xml
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/WEB-INF/lib/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/WEB-INF/lib/jsf-api-2.0.3.jar
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/build/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/build/classes/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/build/classes/test/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/build/classes/test/beans/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/build/classes/test/beans/Bean1.class
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/build/classes/test/beans/Bean2.class
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/build/classes/test/beans/Bean3.class
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/build/classes/test/beans/inputname.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/src/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/src/test/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/src/test/beans/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/src/test/beans/Bean1.java
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/src/test/beans/Bean2.java
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/src/test/beans/Bean3.java
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/src/test/beans/inputname.xhtml
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSF2ModelTest.java
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java
Log:
JBIDE-8280
https://issues.jboss.org/browse/JBIDE-8280
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.classpath
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.classpath (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.classpath 2011-08-16 23:06:29 UTC (rev 33993)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+ <attributes>
+ <attribute name="owner.project.facets" value="java"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+ <classpathentry kind="output" path="build/classes"/>
+</classpath>
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.classpath
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.project
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.project (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.project 2011-08-16 23:06:29 UTC (rev 33993)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>JSF2Web</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.tools.jst.web.kb.kbbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+ <nature>org.jboss.tools.jst.web.kb.kbnature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.project
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/.jsdtscope
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/.jsdtscope (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/.jsdtscope 2011-08-16 23:06:29 UTC (rev 33993)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="WebContent"/>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+ <attributes>
+ <attribute name="hide" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+ <classpathentry kind="output" path=""/>
+</classpath>
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/org.eclipse.jdt.core.prefs 2011-08-16 23:06:29 UTC (rev 33993)
@@ -0,0 +1,8 @@
+#Mon Aug 15 14:39:16 PDT 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/org.eclipse.wst.common.component
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/org.eclipse.wst.common.component (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/org.eclipse.wst.common.component 2011-08-16 23:06:29 UTC (rev 33993)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="JSF2Web">
+ <wb-resource deploy-path="/" source-path="/WebContent"/>
+ <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
+ <property name="context-root" value="JSF2Web"/>
+ <property name="java-output-path" value="/JSF2Web/build/classes"/>
+ </wb-module>
+</project-modules>
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/org.eclipse.wst.common.project.facet.core.xml 2011-08-16 23:06:29 UTC (rev 33993)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <runtime name="JBoss 7.0 Runtime"/>
+ <fixed facet="wst.jsdt.web"/>
+ <fixed facet="jst.web"/>
+ <fixed facet="java"/>
+ <installed facet="java" version="1.6"/>
+ <installed facet="jst.web" version="3.0"/>
+ <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/org.eclipse.wst.common.project.facet.core.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/org.eclipse.wst.jsdt.ui.superType.container
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/org.eclipse.wst.jsdt.ui.superType.container 2011-08-16 23:06:29 UTC (rev 33993)
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/org.eclipse.wst.jsdt.ui.superType.name
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/.settings/org.eclipse.wst.jsdt.ui.superType.name 2011-08-16 23:06:29 UTC (rev 33993)
@@ -0,0 +1 @@
+Window
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/META-INF/MANIFEST.MF (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/META-INF/MANIFEST.MF 2011-08-16 23:06:29 UTC (rev 33993)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/META-INF/MANIFEST.MF
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/WEB-INF/.faces-config.xml.jsfdia
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/WEB-INF/.faces-config.xml.jsfdia (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/WEB-INF/.faces-config.xml.jsfdia 2011-08-16 23:06:29 UTC (rev 33993)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PROCESS model-entity="JSFProcess"/>
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/WEB-INF/faces-config.complete
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/WEB-INF/faces-config.complete (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/WEB-INF/faces-config.complete 2011-08-16 23:06:29 UTC (rev 33993)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faces-config metadata-complete="true" version="2.0"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"/>
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/WEB-INF/faces-config.original
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/WEB-INF/faces-config.original (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/WEB-INF/faces-config.original 2011-08-16 23:06:29 UTC (rev 33993)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faces-config version="2.0" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"/>
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/WEB-INF/faces-config.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/WEB-INF/faces-config.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/WEB-INF/faces-config.xml 2011-08-16 23:06:29 UTC (rev 33993)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faces-config version="2.0" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"/>
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/WEB-INF/faces-config.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/WEB-INF/lib/jsf-api-2.0.3.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/WebContent/WEB-INF/lib/jsf-api-2.0.3.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/build/classes/test/beans/Bean1.class
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/build/classes/test/beans/Bean1.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/build/classes/test/beans/Bean2.class
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/build/classes/test/beans/Bean2.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/build/classes/test/beans/Bean3.class
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/build/classes/test/beans/Bean3.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/build/classes/test/beans/inputname.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/build/classes/test/beans/inputname.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/build/classes/test/beans/inputname.xhtml 2011-08-16 23:06:29 UTC (rev 33993)
@@ -0,0 +1,11 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ >
+
+<f:loadBundle basename="demo.resources2" var="mmm"/>
+<h:outputText value="#{myb}"/>
+<h:outputText value="#{mybean1}"/>
+</html>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/src/test/beans/Bean1.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/src/test/beans/Bean1.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/src/test/beans/Bean1.java 2011-08-16 23:06:29 UTC (rev 33993)
@@ -0,0 +1,11 @@
+package test.beans;
+
+import javax.faces.bean.ManagedBean;
+
+@ManagedBean(name="mybean1")
+public class Bean1 {
+ public String getName() {
+ return "#{}";
+ }
+
+}
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/src/test/beans/Bean1.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/src/test/beans/Bean2.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/src/test/beans/Bean2.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/src/test/beans/Bean2.java 2011-08-16 23:06:29 UTC (rev 33993)
@@ -0,0 +1,8 @@
+package test.beans;
+
+import javax.faces.bean.ManagedBean;
+
+@ManagedBean(name="mybean2")
+public class Bean2 {
+
+}
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/src/test/beans/Bean2.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/src/test/beans/Bean3.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/src/test/beans/Bean3.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/src/test/beans/Bean3.java 2011-08-16 23:06:29 UTC (rev 33993)
@@ -0,0 +1,8 @@
+package test.beans;
+
+import javax.faces.bean.ManagedBean;
+
+@ManagedBean(name="mybean2")
+public class Bean3 {
+
+}
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/src/test/beans/Bean3.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/src/test/beans/inputname.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/src/test/beans/inputname.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2Web/src/test/beans/inputname.xhtml 2011-08-16 23:06:29 UTC (rev 33993)
@@ -0,0 +1,11 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ >
+
+<f:loadBundle basename="demo.resources2" var="mmm"/>
+<h:outputText value="#{myb}"/>
+<h:outputText value="#{mybean1}"/>
+</html>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSF2ModelTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSF2ModelTest.java 2011-08-16 23:05:05 UTC (rev 33992)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSF2ModelTest.java 2011-08-16 23:06:29 UTC (rev 33993)
@@ -10,30 +10,37 @@
******************************************************************************/
package org.jboss.tools.jsf.test;
+import java.util.List;
import java.util.Set;
import junit.framework.TestCase;
+import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.jboss.tools.common.el.core.model.ELInvocationExpression;
+import org.jboss.tools.common.el.core.parser.ELParser;
+import org.jboss.tools.common.el.core.parser.ELParserFactory;
+import org.jboss.tools.common.el.core.parser.ELParserUtil;
+import org.jboss.tools.jsf.jsf2.bean.el.JSF2ElResolver;
import org.jboss.tools.jsf.jsf2.bean.model.IJSF2ManagedBean;
import org.jboss.tools.jsf.jsf2.bean.model.IJSF2Project;
import org.jboss.tools.jsf.jsf2.bean.model.JSF2ProjectFactory;
-import org.jboss.tools.test.util.TestProjectProvider;
+import org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager;
+import org.jboss.tools.test.util.JobUtils;
+import org.jboss.tools.test.util.ResourcesUtils;
public class JSF2ModelTest extends TestCase {
- TestProjectProvider provider = null;
IProject project = null;
+ IProject webproject = null;
- public JSF2ModelTest() {}
-
- public void setUp() throws Exception {
- project = (IProject)ResourcesPlugin.getWorkspace().getRoot().findMember("JSF2Beans");
- if(project==null) {
- provider = new TestProjectProvider("org.jboss.tools.jsf.test", null, "JSF2Beans", false);
- project = provider.getProject();
- }
-
+ public JSF2ModelTest() {
+ project = ResourcesPlugin.getWorkspace().getRoot().getProject("JSF2Beans");
+ webproject = ResourcesPlugin.getWorkspace().getRoot().getProject("JSF2Web");
}
public void testModel() {
@@ -45,11 +52,62 @@
assertEquals(2, beans.size());
}
- protected void tearDown() throws Exception {
- if(provider != null) {
- provider.dispose();
- provider=null;
+ /**
+ * Modifies metadata-complete flag in /WEB-INF/faces-config.xml.
+ * Checks that the flag is loaded correctly into model.
+ * Checks that JSF2ElResolver takes into account that flag.
+ *
+ * @throws CoreException
+ */
+ public void testMetadataCompleteAndElResolver() throws CoreException {
+ IJSF2Project jsf2 = JSF2ProjectFactory.getJSF2Project(webproject, true);
+ assertNotNull(jsf2);
+
+ Set<IJSF2ManagedBean> beans = jsf2.getManagedBeans("mybean1");
+ assertEquals(1, beans.size());
+
+ IFile f = webproject.getFile("src/test/beans/inputname.xhtml");
+ assertTrue(f.exists());
+
+ JSF2ElResolver resolver = new JSF2ElResolver();
+ ELParser p = ELParserUtil.getJbossFactory().createParser();
+ ELInvocationExpression exp = (ELInvocationExpression)p.parse("#{myb}").getInstances().get(0).getExpression();
+
+ assertFalse(jsf2.isMetadataComplete());
+ List<IJSF2ManagedBean> bs = resolver.resolveVariables(f, exp, true, false, 5);
+ assertFalse(bs.isEmpty());
+
+ replaceFile(webproject, "WebContent/WEB-INF/faces-config.complete", "WebContent/WEB-INF/faces-config.xml");
+ assertTrue(jsf2.isMetadataComplete());
+ bs = resolver.resolveVariables(f, exp, true, false, 5);
+ assertTrue(bs.isEmpty());
+ beans = jsf2.getManagedBeans("mybean1");
+ assertTrue(beans.isEmpty());
+
+ replaceFile(webproject, "WebContent/WEB-INF/faces-config.original", "WebContent/WEB-INF/faces-config.xml");
+ assertFalse(jsf2.isMetadataComplete());
+ bs = resolver.resolveVariables(f, exp, true, false, 5);
+ assertFalse(bs.isEmpty());
+ beans = jsf2.getManagedBeans("mybean1");
+ assertEquals(1, beans.size());
+ }
+
+ public static void replaceFile(IProject project, String sourcePath, String targetPath) throws CoreException {
+ boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
+ try {
+ IFile target = project.getFile(new Path(targetPath));
+ IFile source = project.getFile(new Path(sourcePath));
+ assertTrue(source.exists());
+ ValidatorManager.setStatus(ValidatorManager.RUNNING);
+ if(!target.exists()) {
+ target.create(source.getContents(), true, new NullProgressMonitor());
+ } else {
+ target.setContents(source.getContents(), true, false, new NullProgressMonitor());
+ }
+ project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
+ } finally {
+ ResourcesUtils.setBuildAutomatically(saveAutoBuild);
+ JobUtils.waitForIdle();
}
}
-
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java 2011-08-16 23:05:05 UTC (rev 33992)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java 2011-08-16 23:06:29 UTC (rev 33993)
@@ -36,7 +36,15 @@
TestSuite suite = new TestSuite("Test model loading for JSF projects"); //$NON-NLS-1$
suite.addTestSuite(JSFTemplateTest.class);
suite.addTestSuite(JSFFacetOnExistingProjectTest.class);
- suite.addTestSuite(JSF2ModelTest.class);
+
+ TestSuite jsf2 = new TestSuite(JSF2ModelTest.class.getName());
+ jsf2.addTestSuite(JSF2ModelTest.class);
+ ProjectImportTestSetup testSetup = new ProjectImportTestSetup(jsf2,
+ "org.jboss.tools.jsf.test",
+ new String[]{"projects/JSF2Beans", "projects/JSF2Web"},
+ new String[]{"JSF2Beans", "JSF2Web"});
+ suite.addTest(testSetup);
+
TestSuite old = new TestSuite("Tests are using JSFKickStartOldFormat"); //$NON-NLS-1$
old.addTestSuite(JSFModelTest.class);
old.addTestSuite(ModelFormat_2_0_0_Test.class);
14 years, 8 months
JBoss Tools SVN: r33992 - in trunk/jsf/plugins/org.jboss.tools.jsf: src/org/jboss/tools/jsf/jsf2/bean/el and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-08-16 19:05:05 -0400 (Tue, 16 Aug 2011)
New Revision: 33992
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean/el/JSF2ElResolver.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean/model/impl/JSF2Project.java
Log:
JBIDE-8280
https://issues.jboss.org/browse/JBIDE-8280
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF 2011-08-16 22:49:54 UTC (rev 33991)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF 2011-08-16 23:05:05 UTC (rev 33992)
@@ -9,6 +9,7 @@
org.jboss.tools.jsf.el.refactoring,
org.jboss.tools.jsf.facelet.model,
org.jboss.tools.jsf.jsf2.bean.build,
+ org.jboss.tools.jsf.jsf2.bean.el,
org.jboss.tools.jsf.jsf2.bean.model,
org.jboss.tools.jsf.jsf2.model,
org.jboss.tools.jsf.jsf2.refactoring,
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean/el/JSF2ElResolver.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean/el/JSF2ElResolver.java 2011-08-16 22:49:54 UTC (rev 33991)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean/el/JSF2ElResolver.java 2011-08-16 23:05:05 UTC (rev 33992)
@@ -82,7 +82,7 @@
Set<IJSF2ManagedBean> resolvedBeans = null;
if (varName != null) {
IJSF2Project manager = JSF2ProjectFactory.getJSF2ProjectWithProgress(project);
- if (manager != null) {
+ if (manager != null && !manager.isMetadataComplete()) {
if(onlyEqualNames) {
resolvedBeans = manager.getManagedBeans(varName);
beans.addAll(resolvedBeans);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean/model/impl/JSF2Project.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean/model/impl/JSF2Project.java 2011-08-16 22:49:54 UTC (rev 33991)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean/model/impl/JSF2Project.java 2011-08-16 23:05:05 UTC (rev 33992)
@@ -89,9 +89,9 @@
@Override
public Set<IJSF2ManagedBean> getManagedBeans(String name) {
Set<IJSF2ManagedBean> result = new HashSet<IJSF2ManagedBean>();
- Set<IJSF2ManagedBean> beans = beansByName.get(name);
- if(beans != null) {
- synchronized(beans) {
+ synchronized(this) {
+ Set<IJSF2ManagedBean> beans = beansByName.get(name);
+ if(beans != null) {
result.addAll(beans);
}
}
@@ -175,10 +175,8 @@
}
}
- void addUsedProjectInternal(IJSF2Project project) {
- synchronized (dependsOn) {
- dependsOn.add((JSF2Project)project);
- }
+ synchronized void addUsedProjectInternal(IJSF2Project project) {
+ dependsOn.add((JSF2Project)project);
}
public void addDependentProject(IJSF2Project project) {
@@ -190,7 +188,7 @@
JSF2Project p = (JSF2Project)project;
if(!dependsOn.contains(p)) return;
p.usedBy.remove(this);
- synchronized (dependsOn) {
+ synchronized (this) {
dependsOn.remove(p);
}
}
@@ -284,6 +282,9 @@
}
public void update() {
+ FacesConfigDefinition fc = definitions.getFacesConfig();
+ isMetadataComplete = fc != null && fc.isMetadataComplete();
+
List<TypeDefinition> typeDefinitions = getAllTypeDefinitions();
List<IJSF2ManagedBean> beans = new ArrayList<IJSF2ManagedBean>();
for (TypeDefinition typeDefinition : typeDefinitions) {
@@ -294,57 +295,43 @@
}
}
- synchronized (beansByPath) {
+ synchronized (this) {
beansByPath.clear();
- }
- synchronized (beansByName) {
beansByName.clear();
- }
- synchronized (namedBeans) {
namedBeans.clear();
- }
- synchronized (allBeans) {
allBeans.clear();
}
-
- for (IJSF2ManagedBean bean: beans) {
- addBean(bean);
- }
-
- FacesConfigDefinition fc = definitions.getFacesConfig();
- isMetadataComplete = fc != null && fc.isMetadataComplete();
+ if(!isMetadataComplete) {
+ //No JSF2 beans in model when metadata is complete.
+ for (IJSF2ManagedBean bean: beans) {
+ addBean(bean);
+ }
+ }
+
}
public void addBean(IJSF2ManagedBean bean) {
String name = bean.getName();
if(name != null && name.length() > 0) {
- Set<IJSF2ManagedBean> bs = beansByName.get(name);
- if(bs == null) {
- bs = new HashSet<IJSF2ManagedBean>();
- synchronized (beansByName) {
+ synchronized (this) {
+ Set<IJSF2ManagedBean> bs = beansByName.get(name);
+ if(bs == null) {
+ bs = new HashSet<IJSF2ManagedBean>();
beansByName.put(name, bs);
}
- }
- synchronized (bs) {
bs.add(bean);
- }
- synchronized (namedBeans) {
namedBeans.add(bean);
}
}
IPath path = bean.getSourcePath();
- Set<IJSF2ManagedBean> bs = beansByPath.get(path);
- if(bs == null) {
- bs = new HashSet<IJSF2ManagedBean>();
- synchronized (beansByPath) {
+ synchronized (this) {
+ Set<IJSF2ManagedBean> bs = beansByPath.get(path);
+ if(bs == null) {
+ bs = new HashSet<IJSF2ManagedBean>();
beansByPath.put(path, bs);
}
- }
- synchronized (bs) {
bs.add(bean);
- }
- synchronized (allBeans) {
allBeans.add(bean);
}
}
14 years, 8 months
JBoss Tools SVN: r33991 - trunk/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-08-16 18:49:54 -0400 (Tue, 16 Aug 2011)
New Revision: 33991
Modified:
trunk/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test/pom.xml
Log:
added skip property to exclude ths test from execution on hudson
Modified: trunk/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test/pom.xml
===================================================================
--- trunk/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test/pom.xml 2011-08-16 22:48:44 UTC (rev 33990)
+++ trunk/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test/pom.xml 2011-08-16 22:49:54 UTC (rev 33991)
@@ -15,4 +15,17 @@
<emma.filter>org.jboss.tools.modeshape.rest.ui*</emma.filter>
<emma.instrument.bundles>org.jboss.tools.modeshape.rest</emma.instrument.bundles>
</properties>
+
+<build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <configuration>
+ <useUIThread>false</useUIThread>
+ <skip>${swtbot.test.skip}</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
14 years, 8 months
JBoss Tools SVN: r33990 - trunk/ws/tests/org.jboss.tools.ws.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-08-16 18:48:44 -0400 (Tue, 16 Aug 2011)
New Revision: 33990
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/pom.xml
Log:
added skip property to exclude ths test from execution on hudson
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/pom.xml
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/pom.xml 2011-08-16 22:46:23 UTC (rev 33989)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/pom.xml 2011-08-16 22:48:44 UTC (rev 33990)
@@ -11,4 +11,17 @@
<artifactId>org.jboss.tools.ws.ui.bot.test</artifactId>
<packaging>eclipse-test-plugin</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <configuration>
+ <useUIThread>false</useUIThread>
+ <skip>${swtbot.test.skip}</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
14 years, 8 months
JBoss Tools SVN: r33989 - trunk/esb/tests/org.jboss.tools.esb.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-08-16 18:46:23 -0400 (Tue, 16 Aug 2011)
New Revision: 33989
Modified:
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/pom.xml
Log:
added skip property to exclude ths test from execution on hudson
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/pom.xml
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/pom.xml 2011-08-16 22:45:00 UTC (rev 33988)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/pom.xml 2011-08-16 22:46:23 UTC (rev 33989)
@@ -11,4 +11,17 @@
<artifactId>org.jboss.tools.esb.ui.bot.test</artifactId>
<packaging>eclipse-test-plugin</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <configuration>
+ <useUIThread>false</useUIThread>
+ <skip>${swtbot.test.skip}</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
14 years, 8 months
JBoss Tools SVN: r33988 - trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-08-16 18:45:00 -0400 (Tue, 16 Aug 2011)
New Revision: 33988
Modified:
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/pom.xml
Log:
added skip property to exclude ths test from execution on hudson
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/pom.xml
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/pom.xml 2011-08-16 22:40:41 UTC (rev 33987)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/pom.xml 2011-08-16 22:45:00 UTC (rev 33988)
@@ -10,4 +10,17 @@
<artifactId>org.jboss.tools.bpel.ui.bot.test</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <configuration>
+ <useUIThread>false</useUIThread>
+ <skip>${swtbot.test.skip}</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
14 years, 8 months
JBoss Tools SVN: r33987 - trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-08-16 18:40:41 -0400 (Tue, 16 Aug 2011)
New Revision: 33987
Modified:
trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/pom.xml
Log:
fixed dependencies for test to let running the test from maven
Modified: trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/pom.xml
===================================================================
--- trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/pom.xml 2011-08-16 22:15:16 UTC (rev 33986)
+++ trunk/jbpm/tests/org.jboss.tools.jbpm.ui.bot.test/pom.xml 2011-08-16 22:40:41 UTC (rev 33987)
@@ -11,4 +11,69 @@
<artifactId>org.jboss.tools.jbpm.ui.bot.test</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
+
+ <properties>
+ <systemProperties>-Dswtbot.test.properties.file=./swtbot.properties</systemProperties>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <configuration>
+ <useUIThread>false</useUIThread>
+ <skip>${swtbot.test.skip}</skip>
+ <includes><include>**/JBPMAllTest.class</include></includes>
+ <dependencies combine.children="append">
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.jboss.tools.jbpm3.feature.feature.group</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ </dependencies>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>${maven.antrun.plugin.version}</version>
+ <dependencies>
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>1.0b3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>default-swtbot-config</id>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties" />
+ <if>
+ <not>
+ <isset property="jboss.tools.jre.6"/>
+ </not>
+ <then>
+ <property name="jboss.tools.jre.6" value="${java.home}" />
+ </then>
+ </if>
+ <echo file="swtbot.properties" append="false">JBPM=3.1.4,${requirement.build.root}/jbpm-3.1.4</echo>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
14 years, 8 months
JBoss Tools SVN: r33986 - trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-08-16 18:15:16 -0400 (Tue, 16 Aug 2011)
New Revision: 33986
Modified:
trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/pom.xml
Log:
added skip attribute to exclude swt bot test from test execution
Modified: trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/pom.xml
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/pom.xml 2011-08-16 22:12:19 UTC (rev 33985)
+++ trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/pom.xml 2011-08-16 22:15:16 UTC (rev 33986)
@@ -25,6 +25,7 @@
<artifactId>tycho-surefire-plugin</artifactId>
<configuration>
<useUIThread>false</useUIThread>
+ <skip>${swtbot.test.skip}</skip>
<product>org.eclipse.sdk.ide</product>
<dependencies>
<dependency>
14 years, 8 months