summaryrefslogtreecommitdiffstats
path: root/WebContent/WEB-INF
diff options
context:
space:
mode:
authorJani Laakso <jani.laakso@itmill.com>2007-10-31 17:27:23 +0000
committerJani Laakso <jani.laakso@itmill.com>2007-10-31 17:27:23 +0000
commit115b85bec4a4de558fe902860741d1c7a9154e84 (patch)
tree566aa083c0d0cada16d9f0f42cc6bbb64ebb13a1 /WebContent/WEB-INF
parentdb7f59ef8970eecbc4c264849ace4bbaa2042e76 (diff)
downloadvaadin-framework-115b85bec4a4de558fe902860741d1c7a9154e84.tar.gz
vaadin-framework-115b85bec4a4de558fe902860741d1c7a9154e84.zip
Removed possibly conflicting JAR and replaced it with customized JAR.
svn changeset:2642/svn branch:trunk
Diffstat (limited to 'WebContent/WEB-INF')
-rw-r--r--WebContent/WEB-INF/web.xml16
1 files changed, 15 insertions, 1 deletions
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index 5d9601c1ec..f09d548507 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -11,7 +11,16 @@
IT Mill Toolkit examples
</description>
-
+<servlet>
+ <servlet-name>iWork</servlet-name>
+ <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+ <init-param>
+ <param-name>application</param-name>
+ <param-value>com.itmill.iwork.IWork</param-value>
+ </init-param>
+ </servlet>
+
+
<servlet>
<servlet-name>TestSplitPanel</servlet-name>
<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
@@ -257,6 +266,11 @@
</servlet>
+ <servlet-mapping>
+ <servlet-name>iWork</servlet-name>
+ <url-pattern>/iWork/*</url-pattern>
+ </servlet-mapping>
+
<servlet-mapping>
<servlet-name>TestSplitPanel</servlet-name>
<url-pattern>/TestSplitPanel/*</url-pattern>