summaryrefslogtreecommitdiffstats
path: root/WebContent/WEB-INF
diff options
context:
space:
mode:
authorMarc Englund <marc.englund@itmill.com>2008-10-27 09:48:49 +0000
committerMarc Englund <marc.englund@itmill.com>2008-10-27 09:48:49 +0000
commit1dd5a6192e08abfb054eecd4bea6455d111182db (patch)
tree481715cf2fb860c18ac7ab89d61eb244dbadc039 /WebContent/WEB-INF
parent0b17ecb78bf722bb357e1ce2c5c3ec02febd9e40 (diff)
downloadvaadin-framework-1dd5a6192e08abfb054eecd4bea6455d111182db.tar.gz
vaadin-framework-1dd5a6192e08abfb054eecd4bea6455d111182db.zip
Sampler servlet added to /sampler/*
svn changeset:5728/svn branch:trunk
Diffstat (limited to 'WebContent/WEB-INF')
-rw-r--r--WebContent/WEB-INF/web.xml19
1 files changed, 17 insertions, 2 deletions
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index 00e14bc487..82aefdc931 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -103,7 +103,7 @@
</init-param>
</servlet>
-<servlet>
+ <servlet>
<servlet-name>FeatureBrowser</servlet-name>
<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
<init-param>
@@ -112,6 +112,15 @@
</init-param>
</servlet>
+ <servlet>
+ <servlet-name>Sampler</servlet-name>
+ <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
+ <init-param>
+ <param-name>application</param-name>
+ <param-value>com.itmill.toolkit.demo.sampler.SamplerApplication</param-value>
+ </init-param>
+ </servlet>
+
<servlet>
<servlet-name>TestBench</servlet-name>
<servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
@@ -523,11 +532,17 @@
<!-- portlet -->
</servlet-mapping>
- <servlet-mapping>
+ <servlet-mapping>
<servlet-name>FeatureBrowser</servlet-name>
<url-pattern>/FeatureBrowser/*</url-pattern>
<!-- portlet style=height:650px -->
</servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Sampler</servlet-name>
+ <url-pattern>/sampler/*</url-pattern>
+ <!-- portlet style=height:650px -->
+ </servlet-mapping>
<servlet-mapping>
<servlet-name>FeaturesApplication</servlet-name>