diff options
| author | Henri Sara <henri.sara@itmill.com> | 2011-09-30 12:10:45 +0000 |
|---|---|---|
| committer | Henri Sara <henri.sara@itmill.com> | 2011-09-30 12:10:45 +0000 |
| commit | 4794b6bf53db9b57b74fdb6e200b260ee20373b3 (patch) | |
| tree | e004b3a694f6f083fe1fba26db3e07e166c0e6bd /WebContent/WEB-INF | |
| parent | ead7a79bc2cfdd9887f01937e0ca82db71c6ea69 (diff) | |
| download | vaadin-framework-4794b6bf53db9b57b74fdb6e200b260ee20373b3.tar.gz vaadin-framework-4794b6bf53db9b57b74fdb6e200b260ee20373b3.zip | |
Merged changes from 6.6 (#7692)
svn changeset:21470/svn branch:6.7
Diffstat (limited to 'WebContent/WEB-INF')
| -rw-r--r-- | WebContent/WEB-INF/web.xml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml index b5cd3fa1c8..b83979acc6 100644 --- a/WebContent/WEB-INF/web.xml +++ b/WebContent/WEB-INF/web.xml @@ -49,6 +49,11 @@ <url-pattern>/integration/*</url-pattern>
</servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>IntegrationTest</servlet-name>
+ <url-pattern>/VAADIN/*</url-pattern>
+ </servlet-mapping>
+
<welcome-file-list>
<welcome-file>index.html</welcome-file>
</welcome-file-list>
|