diff options
| author | Henri Sara <henri.sara@itmill.com> | 2011-10-03 06:39:35 +0000 |
|---|---|---|
| committer | Henri Sara <henri.sara@itmill.com> | 2011-10-03 06:39:35 +0000 |
| commit | 146322a6decf5bc37700e7b57a0f59163faf6294 (patch) | |
| tree | ed102c165456ea45c46c0bb8515b5aa41e44dc0a /build | |
| parent | e69daa1270137d3dbeaf783c295ec32a3b0f099c (diff) | |
| download | vaadin-framework-146322a6decf5bc37700e7b57a0f59163faf6294.tar.gz vaadin-framework-146322a6decf5bc37700e7b57a0f59163faf6294.zip | |
Manually merged [21485]: do not exclude static resources from WAR as needed by portal integration tests
svn changeset:21486/svn branch:6.7
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/build/build.xml b/build/build.xml index dd7635f0a5..5999381f87 100644 --- a/build/build.xml +++ b/build/build.xml @@ -195,12 +195,14 @@ <war warfile="${result-path}/${test-war-filename}"> <fileset dir="${output-dir}/WebContent"> <!-- Already in JAR --> + <!-- Not excluded because used from WAR by portal integration tests <exclude name="VAADIN/themes/base/**/*" /> <exclude name="VAADIN/themes/chameleon/**/*" /> <exclude name="VAADIN/themes/liferay/**/*" /> <exclude name="VAADIN/themes/reindeer/**/*" /> <exclude name="VAADIN/themes/runo/**/*" /> <exclude name="VAADIN/widgetsets/com.vaadin.terminal.gwt.DefaultWidgetSet/**/*" /> + --> <!-- Not needed for testing --> <exclude name="docs/**/*" /> |