diff options
| author | Build Agent <build@vaadin.com> | 2014-03-13 09:19:01 +0200 |
|---|---|---|
| committer | Build Agent <build@vaadin.com> | 2014-03-13 09:19:01 +0200 |
| commit | a382263fc891b6ddc3454e9c616b67be54355668 (patch) | |
| tree | 19080d088c065d944efb59bc752b974f91bad47a | |
| parent | 1159db580f350493ffcf6628c05924458881ebb2 (diff) | |
| parent | 94d33ad7c732f620c9e98502b896a65852479b7d (diff) | |
| download | vaadin-framework-a382263fc891b6ddc3454e9c616b67be54355668.tar.gz vaadin-framework-a382263fc891b6ddc3454e9c616b67be54355668.zip | |
Merge changes from origin/7.1
97622fd Added server launch wait to TB2 and TB3 test targets.
94d33ad Class AbstractTransactionalQuery should be public (#12285)
Change-Id: Iadb5ac2677399e13cab9212d0a56615cbb2aa674
| -rw-r--r-- | server/src/com/vaadin/data/util/sqlcontainer/query/AbstractTransactionalQuery.java | 2 | ||||
| -rw-r--r-- | uitest/build.xml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/query/AbstractTransactionalQuery.java b/server/src/com/vaadin/data/util/sqlcontainer/query/AbstractTransactionalQuery.java index 3264118732..f36b583e07 100644 --- a/server/src/com/vaadin/data/util/sqlcontainer/query/AbstractTransactionalQuery.java +++ b/server/src/com/vaadin/data/util/sqlcontainer/query/AbstractTransactionalQuery.java @@ -31,7 +31,7 @@ import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool; * @author Vaadin Ltd * @since 6.8.9 */ -abstract class AbstractTransactionalQuery implements Serializable { +public abstract class AbstractTransactionalQuery implements Serializable { private JDBCConnectionPool connectionPool; private transient Connection activeConnection; diff --git a/uitest/build.xml b/uitest/build.xml index b9bb5a4cbd..8479063ba0 100644 --- a/uitest/build.xml +++ b/uitest/build.xml @@ -212,6 +212,7 @@ <ant antfile="${uitest.dir}/vaadin-server.xml" inheritall="true" inheritrefs="true" target="deploy-and-start" /> </daemons> <sequential> + <ant antfile="${uitest.dir}/vaadin-server.xml" target="wait-for-startup" /> <ant antfile="${uitest.dir}/test.xml" target="tb2-tests" /> </sequential> </parallel> @@ -224,6 +225,7 @@ <ant antfile="${uitest.dir}/vaadin-server.xml" inheritall="true" inheritrefs="true" target="deploy-and-start" /> </daemons> <sequential> + <ant antfile="${uitest.dir}/vaadin-server.xml" target="wait-for-startup" /> <ant antfile="${uitest.dir}/tb3test.xml" target="run-all-tb3-tests" inheritall="true" /> </sequential> </parallel> |