summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouni Koivuviita <jouni.koivuviita@itmill.com>2009-05-28 12:47:41 +0000
committerJouni Koivuviita <jouni.koivuviita@itmill.com>2009-05-28 12:47:41 +0000
commit1c6c31640137776d48e344409f6f3e51e411c574 (patch)
treecc4a94f5949febfa33ae755c9d745b7099adbd2c
parentb9a1f5536a1ffa6fbfad17a81589d96af8f651a8 (diff)
downloadvaadin-framework-1c6c31640137776d48e344409f6f3e51e411c574.tar.gz
vaadin-framework-1c6c31640137776d48e344409f6f3e51e411c574.zip
Reindeer style name reference example added to web.xml and index.html.
svn changeset:8062/svn branch:6.0
-rw-r--r--WebContent/WEB-INF/web.xml14
-rw-r--r--WebContent/index.html1
-rw-r--r--build/package/WebContent/WEB-INF/web.xml14
3 files changed, 29 insertions, 0 deletions
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index 1737dd9e58..e1a96e7413 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -203,6 +203,15 @@
<param-value>com.vaadin.demo.coverflow.gwt.CoverflowWidgetSet</param-value>
</init-param>
</servlet>
+
+ <servlet>
+ <servlet-name>ReindeerThemeStyles</servlet-name>
+ <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
+ <init-param>
+ <param-name>application</param-name>
+ <param-value>com.vaadin.demo.themes.ReindeerThemeStyles</param-value>
+ </init-param>
+ </servlet>
<servlet>
<servlet-name>FeaturesApplication</servlet-name>
@@ -500,6 +509,11 @@
<servlet-name>AddressBook</servlet-name>
<url-pattern>/AddressBook/*</url-pattern>
</servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>ReindeerThemeStyles</servlet-name>
+ <url-pattern>/ReindeerTheme/*</url-pattern>
+ </servlet-mapping>
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
diff --git a/WebContent/index.html b/WebContent/index.html
index c4c5c1a41f..6ed7f2b3e6 100644
--- a/WebContent/index.html
+++ b/WebContent/index.html
@@ -47,6 +47,7 @@
<ul><li><a class="demoapp" href="Reservr">Reservr &ndash; reservation application</a> &nbsp; (<a href="docs/example-source/com/vaadin/demo/reservation">sources</a>)</li>
<li><a class="demoapp" href="VaadinTunesLayout/">VaadinTunes &ndash; advanced layout &amp; theme</a> &nbsp; (<a href="docs/example-source/com/vaadin/demo/VaadinTunesLayout.java.html">sources</a>)</li>
<li><a class="demoapp" href="Coverflow/">Coverflow &ndash; Flex integration</a> &nbsp; (<a href="docs/example-source/com/vaadin/demo/coverflow">sources</a>)</li>
+ <li><a class="demoapp" href="ReindeerTheme">Reindeer theme &ndash; see available styles</a></li>
</ul>
<h3>Code Examples</h3>
<ul>
diff --git a/build/package/WebContent/WEB-INF/web.xml b/build/package/WebContent/WEB-INF/web.xml
index cce9340dbc..7154a15fe5 100644
--- a/build/package/WebContent/WEB-INF/web.xml
+++ b/build/package/WebContent/WEB-INF/web.xml
@@ -201,6 +201,16 @@
</init-param>
</servlet>
+ <!-- ReindeerTheme demo -->
+ <servlet>
+ <servlet-name>ReindeerThemeStyles</servlet-name>
+ <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
+ <init-param>
+ <param-name>application</param-name>
+ <param-value>com.vaadin.demo.themes.ReindeerThemeStyles</param-value>
+ </init-param>
+ </servlet>
+
<!-- Servlet Mappings below - see servlets for comments -->
<servlet-mapping>
<servlet-name>PortletDemo</servlet-name>
@@ -262,6 +272,10 @@
<servlet-name>Coverflow</servlet-name>
<url-pattern>/Coverflow/*</url-pattern>
</servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>ReindeerThemeStyles</servlet-name>
+ <url-pattern>/ReindeerTheme/*</url-pattern>
+ </servlet-mapping>
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
<welcome-file>index.html</welcome-file>