From: Jani Laakso <jani.laakso@itmill.com>
Date: Wed, 31 Oct 2007 17:27:23 +0000 (+0000)
Subject: Removed possibly conflicting JAR and replaced it with customized JAR.
X-Git-Tag: 6.7.0.beta1~5736
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=115b85bec4a4de558fe902860741d1c7a9154e84;p=vaadin-framework.git

Removed possibly conflicting JAR and replaced it with customized JAR.

svn changeset:2642/svn branch:trunk
---

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>