summaryrefslogtreecommitdiffstats
path: root/uitest
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2012-09-04 00:33:58 +0300
committerArtur Signell <artur@vaadin.com>2012-09-09 11:23:10 +0300
commite722b038d48f19201637267fbc58e0471405ec83 (patch)
tree9895c5ad45581ee7db30e94c3efeedeabfa84e0c /uitest
parent1d6f0611a8dc7478caf2126ccd191d4284259cba (diff)
downloadvaadin-framework-e722b038d48f19201637267fbc58e0471405ec83.tar.gz
vaadin-framework-e722b038d48f19201637267fbc58e0471405ec83.zip
Client-compiled-cache artifact (#9299)
Diffstat (limited to 'uitest')
-rw-r--r--uitest/build.xml1
-rw-r--r--uitest/ivy.xml10
2 files changed, 7 insertions, 4 deletions
diff --git a/uitest/build.xml b/uitest/build.xml
index 8a5fe71b35..9090df7dcc 100644
--- a/uitest/build.xml
+++ b/uitest/build.xml
@@ -66,6 +66,7 @@
</copy>
<war destfile="${result.war}" duplicate="fail" index="true">
+ <manifest><attribute name="Class-Path" value="WEB-INF/classes"/></manifest>
<fileset refid="common.files.for.all.jars" />
<fileset dir="${WebContent.dir}">
<include name="statictestfiles/**" />
diff --git a/uitest/ivy.xml b/uitest/ivy.xml
index 583e09c76b..b243dfd8ec 100644
--- a/uitest/ivy.xml
+++ b/uitest/ivy.xml
@@ -16,21 +16,23 @@
<dependencies defaultconf="build" defaultconfmapping="build,ide->default">
<!-- API DEPENDENCIES -->
<dependency org="javax.portlet" name="portlet-api"
- rev="2.0" conf="ide -> default" />
+ rev="2.0" conf="build,ide -> default" />
<dependency org="javax.validation" name="validation-api"
- rev="1.0.0.GA" conf="ide -> default" />
+ rev="1.0.0.GA" conf="build,ide -> default" />
<!--Servlet API version 2.5 -->
<dependency org="javax.servlet" name="servlet-api"
- rev="2.5" conf="ide -> default" />
+ rev="2.5" conf="build,ide -> default" />
<!-- Google App Engine -->
<dependency org="com.google.appengine" name="appengine-api-1.0-sdk"
- rev="1.2.1" conf="ide -> default" />
+ rev="1.2.1" conf="build,ide -> default" />
<!-- LIBRARY DEPENDENCIES (compile time) -->
<!-- Project modules -->
<dependency org="com.vaadin" name="vaadin-server"
rev="${vaadin.version}" conf="build->build"></dependency>
+ <dependency org="com.vaadin" name="vaadin-client"
+ rev="${vaadin.version}" conf="build->build"></dependency>
<dependency org="com.vaadin" name="vaadin-client-compiled"
rev="${vaadin.version}" conf="build->build"></dependency>
<dependency org="com.vaadin" name="vaadin-themes-compiled"