#7178 Removed most demos from web.xml and portlet configuration files

svn changeset:20247/svn branch:6.7

diff --git a/WebContent/WEB-INF/liferay-display.xml b/WebContent/WEB-INF/liferay-display.xml
index ae893853d719acfc20e927088f04d3a2a59a0bbc..232cec07e1703f316dd2cefa2a069221aa182a41 100644 (file)
--- a/WebContent/WEB-INF/liferay-display.xml
+++ b/WebContent/WEB-INF/liferay-display.xml
@@ -4,7 +4,6 @@
 <display>
     <category name="Vaadin">
         <portlet id="PortletDemoPortlet" />
-        <portlet id="CalcPortlet" />
         <portlet id="Portlet Mode Example" />
         <portlet id="Portlet HTML Mode Example" />
         <portlet id="AddressBookPortlet" />

diff --git a/WebContent/WEB-INF/liferay-portlet.xml b/WebContent/WEB-INF/liferay-portlet.xml
index a2044a4c5c2b94ecabc26d9317680a6b0cd202df..2ed03113b6b402fe1f162098cdd6b3af0f83c9b7 100644 (file)
--- a/WebContent/WEB-INF/liferay-portlet.xml
+++ b/WebContent/WEB-INF/liferay-portlet.xml
@@ -7,11 +7,6 @@
         <instanceable>true</instanceable>       
         <ajaxable>false</ajaxable>
     </portlet>
-    <portlet>
-        <portlet-name>CalcPortlet</portlet-name>
-        <instanceable>true</instanceable>       
-        <ajaxable>false</ajaxable>
-    </portlet>
     <portlet>
         <portlet-name>Portlet Mode Example</portlet-name>
         <instanceable>true</instanceable>

diff --git a/WebContent/WEB-INF/portlet.xml b/WebContent/WEB-INF/portlet.xml
index ea184518f428aaf5e05ae12b2c8c4a7eda7485ff..49ed5921b185574a9d77ade69dd1a5ed039a8d96 100644 (file)
--- a/WebContent/WEB-INF/portlet.xml
+++ b/WebContent/WEB-INF/portlet.xml
@@ -40,41 +40,6 @@
                </security-role-ref>
        </portlet>
 
-       <portlet>
-               <portlet-name>CalcPortlet</portlet-name>
-               <display-name>Calc</display-name>
-               <portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet</portlet-class>
-               <init-param>
-                       <name>application</name>
-                       <value>Calc</value>
-               </init-param>
-               <init-param>
-                       <name>widgetset</name>
-                       <value>com.vaadin.portal.gwt.PortalDefaultWidgetSet</value>
-               </init-param>
-               <supports>
-                       <mime-type>text/html</mime-type>
-                       <portlet-mode>view</portlet-mode>
-               </supports>
-               <portlet-info>
-                       <title>Calc</title>
-                       <short-title>Calc</short-title>
-               </portlet-info>
-
-               <security-role-ref>
-                       <role-name>administrator</role-name>
-               </security-role-ref>
-               <security-role-ref>
-                       <role-name>guest</role-name>
-               </security-role-ref>
-               <security-role-ref>
-                       <role-name>power-user</role-name>
-               </security-role-ref>
-               <security-role-ref>
-                       <role-name>user</role-name>
-               </security-role-ref>
-       </portlet>
-
        <portlet>
                <portlet-name>Portlet Mode Example</portlet-name>
                <display-name>Portlet Mode Example</display-name>

diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index 41c4b963e5eb8270210a6538b21ad2673c354fde..0afec0507d950cbfc6b0e1962bcae4543c1447df 100644 (file)
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -42,14 +42,6 @@
        </servlet>\r
 \r
 \r
-       <servlet>\r
-               <servlet-name>DemoTestBench</servlet-name>\r
-               <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>\r
-               <init-param>\r
-                       <param-name>application</param-name>\r
-                       <param-value>com.vaadin.demo.testbench.TestBench</param-value>\r
-               </init-param>\r
-       </servlet>\r
        <servlet>\r
                <servlet-name>TestForNativeWindowing</servlet-name>\r
                <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>\r
@@ -68,15 +60,6 @@
                </init-param>\r
        </servlet>\r
 \r
-       <servlet>\r
-               <servlet-name>FeatureBrowser</servlet-name>\r
-               <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>\r
-               <init-param>\r
-                       <param-name>application</param-name>\r
-                       <param-value>com.vaadin.demo.featurebrowser.FeatureBrowser</param-value>\r
-               </init-param>\r
-       </servlet>\r
-\r
        <servlet>\r
                <servlet-name>AddressBook</servlet-name>\r
                <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>\r
@@ -114,51 +97,6 @@
                </init-param>\r
        </servlet>\r
 \r
-       <servlet>\r
-               <servlet-name>CustomLayoutDemo</servlet-name>\r
-               <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>\r
-               <init-param>\r
-                       <param-name>application</param-name>\r
-                       <param-value>com.vaadin.tests.CustomLayoutDemo</param-value>\r
-               </init-param>\r
-       </servlet>\r
-\r
-       <servlet>\r
-               <servlet-name>LayoutDemo</servlet-name>\r
-               <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>\r
-               <init-param>\r
-                       <param-name>application</param-name>\r
-                       <param-value>com.vaadin.tests.LayoutDemo</param-value>\r
-               </init-param>\r
-       </servlet>\r
-\r
-       <servlet>\r
-               <servlet-name>VaadinTunesLayout</servlet-name>\r
-               <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>\r
-               <init-param>\r
-                       <param-name>application</param-name>\r
-                       <param-value>com.vaadin.demo.VaadinTunesLayout</param-value>\r
-               </init-param>\r
-       </servlet>\r
-\r
-       <servlet>\r
-               <servlet-name>ReindeerThemeStyles</servlet-name>\r
-               <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>\r
-               <init-param>\r
-                       <param-name>application</param-name>\r
-                       <param-value>com.vaadin.demo.themes.ReindeerThemeStyles</param-value>\r
-               </init-param>\r
-       </servlet>\r
-\r
-       <servlet>\r
-               <servlet-name>RunoTheme</servlet-name>\r
-               <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>\r
-               <init-param>\r
-                       <param-name>application</param-name>\r
-                       <param-value>com.vaadin.demo.themes.RunoTheme</param-value>\r
-               </init-param>\r
-       </servlet>\r
-\r
        <servlet>\r
                <servlet-name>Parameters</servlet-name>\r
                <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>\r
@@ -177,32 +115,6 @@
                </init-param>\r
        </servlet>\r
 \r
-       <servlet>\r
-               <servlet-name>TreeFilesystemContainer</servlet-name>\r
-               <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>\r
-               <init-param>\r
-                       <param-name>application</param-name>\r
-                       <param-value>com.vaadin.tests.TreeFilesystemContainer</param-value>\r
-               </init-param>\r
-               <!-- Set this property if demo cannot access context base directory because \r
-                       of Application Server or Servlet Container security constraints -->\r
-               <!-- <init-param> <param-name>sampleDirectory</param-name> <param-value>/mySampleDirectory</param-value> \r
-                       </init-param> -->\r
-       </servlet>\r
-\r
-       <servlet>\r
-               <servlet-name>TreeFilesystem</servlet-name>\r
-               <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>\r
-               <init-param>\r
-                       <param-name>application</param-name>\r
-                       <param-value>com.vaadin.tests.TreeFilesystem</param-value>\r
-               </init-param>\r
-               <!-- Set this property if demo cannot access context base directory because \r
-                       of Application Server or Servlet Container security constraints -->\r
-               <!-- <init-param> <param-name>sampleDirectory</param-name> <param-value>/mySampleDirectory</param-value> \r
-                       </init-param> -->\r
-       </servlet>\r
-\r
        <servlet>\r
                <servlet-name>ModalWindow</servlet-name>\r
                <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>\r
@@ -212,37 +124,6 @@
                </init-param>\r
        </servlet>\r
 \r
-       <servlet>\r
-               <servlet-name>HelloWorld</servlet-name>\r
-               <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>\r
-               <init-param>\r
-                       <param-name>application</param-name>\r
-                       <param-value>com.vaadin.demo.HelloWorld</param-value>\r
-               </init-param>\r
-       </servlet>\r
-\r
-       <servlet>\r
-               <servlet-name>Calc</servlet-name>\r
-               <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>\r
-               <init-param>\r
-                       <param-name>application</param-name>\r
-                       <param-value>com.vaadin.demo.Calc</param-value>\r
-               </init-param>\r
-       </servlet>\r
-\r
-       <servlet>\r
-               <servlet-name>ColorPickerApplication</servlet-name>\r
-               <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>\r
-               <init-param>\r
-                       <param-name>application</param-name>\r
-                       <param-value>com.vaadin.demo.colorpicker.ColorPickerApplication</param-value>\r
-               </init-param>\r
-               <init-param>\r
-                       <param-name>widgetset</param-name>\r
-                       <param-value>com.vaadin.demo.colorpicker.gwt.ColorPickerWidgetSet</param-value>\r
-               </init-param>\r
-       </servlet>\r
-\r
        <servlet>\r
                <servlet-name>GAESyncTest</servlet-name>\r
                <servlet-class>com.vaadin.terminal.gwt.server.GAEApplicationServlet</servlet-class>\r
@@ -257,10 +138,6 @@
                <url-pattern>/run/*</url-pattern>\r
        </servlet-mapping>\r
 \r
-       <servlet-mapping>\r
-               <servlet-name>DemoTestBench</servlet-name>\r
-               <url-pattern>/DemoTestBench/*</url-pattern>\r
-       </servlet-mapping>\r
        <servlet-mapping>\r
                <servlet-name>TestForNativeWindowing</servlet-name>\r
                <url-pattern>/TestForNativeWindowing/*</url-pattern>\r
@@ -291,26 +168,6 @@
                <url-pattern>/t/*</url-pattern>\r
        </servlet-mapping>\r
 \r
-       <servlet-mapping>\r
-               <servlet-name>CustomLayoutDemo</servlet-name>\r
-               <url-pattern>/CustomLayoutDemo/*</url-pattern>\r
-       </servlet-mapping>\r
-\r
-       <servlet-mapping>\r
-               <servlet-name>LayoutDemo</servlet-name>\r
-               <url-pattern>/LayoutDemo/*</url-pattern>\r
-       </servlet-mapping>\r
-\r
-       <servlet-mapping>\r
-               <servlet-name>VaadinTunesLayout</servlet-name>\r
-               <url-pattern>/VaadinTunesLayout/*</url-pattern>\r
-       </servlet-mapping>\r
-\r
-       <servlet-mapping>\r
-               <servlet-name>FeatureBrowser</servlet-name>\r
-               <url-pattern>/FeatureBrowser/*</url-pattern>\r
-       </servlet-mapping>\r
-\r
        <servlet-mapping>\r
                <servlet-name>Parameters</servlet-name>\r
                <url-pattern>/Parameters/*</url-pattern>\r
@@ -321,36 +178,11 @@
                <url-pattern>/UpgradingSample/*</url-pattern>\r
        </servlet-mapping>\r
 \r
-       <servlet-mapping>\r
-               <servlet-name>TreeFilesystemContainer</servlet-name>\r
-               <url-pattern>/TreeFilesystemContainer/*</url-pattern>\r
-       </servlet-mapping>\r
-\r
-       <servlet-mapping>\r
-               <servlet-name>TreeFilesystem</servlet-name>\r
-               <url-pattern>/TreeFilesystem/*</url-pattern>\r
-       </servlet-mapping>\r
-\r
        <servlet-mapping>\r
                <servlet-name>ModalWindow</servlet-name>\r
                <url-pattern>/ModalWindow/*</url-pattern>\r
        </servlet-mapping>\r
 \r
-       <servlet-mapping>\r
-               <servlet-name>HelloWorld</servlet-name>\r
-               <url-pattern>/HelloWorld/*</url-pattern>\r
-       </servlet-mapping>\r
-\r
-       <servlet-mapping>\r
-               <servlet-name>Calc</servlet-name>\r
-               <url-pattern>/Calc/*</url-pattern>\r
-       </servlet-mapping>\r
-\r
-       <servlet-mapping>\r
-               <servlet-name>ColorPickerApplication</servlet-name>\r
-               <url-pattern>/colorpicker/*</url-pattern>\r
-       </servlet-mapping>\r
-\r
        <servlet-mapping>\r
                <servlet-name>PortletDemo</servlet-name>\r
                <url-pattern>/PortletDemo/*</url-pattern>\r
@@ -366,20 +198,8 @@
                <url-pattern>/AddressBook/*</url-pattern>\r
        </servlet-mapping>\r
 \r
-       <servlet-mapping>\r
-               <servlet-name>ReindeerThemeStyles</servlet-name>\r
-               <url-pattern>/ReindeerTheme/*</url-pattern>\r
-       </servlet-mapping>\r
-\r
-       <servlet-mapping>\r
-               <servlet-name>RunoTheme</servlet-name>\r
-               <url-pattern>/RunoTheme/*</url-pattern>\r
-       </servlet-mapping>\r
-\r
        <welcome-file-list>\r
-               <welcome-file>index.jsp</welcome-file>\r
                <welcome-file>index.html</welcome-file>\r
-               <welcome-file>index.htm</welcome-file>\r
        </welcome-file-list>\r
 \r
 </web-app>\r

diff --git a/build/package/WebContent/WEB-INF/web.xml b/build/package/WebContent/WEB-INF/web.xml
index 2824ca57ffd83d42a09e5caba6c48cb8c1744a98..ecc4f0fcff93569b9c1162ad7205603f5bfc74ac 100644 (file)
--- a/build/package/WebContent/WEB-INF/web.xml
+++ b/build/package/WebContent/WEB-INF/web.xml
@@ -30,16 +30,6 @@
                <servlet-class>com.vaadin.terminal.gwt.server.ApplicationRunnerServlet</servlet-class>
        </servlet>
 
-       <!--  Feature Browser demo application -->
-       <servlet>
-               <servlet-name>FeatureBrowser</servlet-name>
-               <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
-               <init-param>
-                       <param-name>application</param-name>
-                       <param-value>com.vaadin.demo.featurebrowser.FeatureBrowser</param-value>
-               </init-param>
-       </servlet>
-
        <!--  AddressBook demo application -->
        <servlet>
                <servlet-name>AddressBook</servlet-name>
@@ -50,59 +40,6 @@
                </init-param>
        </servlet>
 
-       <!-- Hello world demo application -->
-       <servlet>
-               <servlet-name>HelloWorld</servlet-name>
-               <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
-               <init-param>
-                       <param-name>application</param-name>
-                       <param-value>com.vaadin.demo.HelloWorld</param-value>
-               </init-param>
-               <!--
-                       As an example, we will use an optimized widget set. See
-                       OptimizedWidgetSet.gwt.xml
-               -->
-               <init-param>
-                       <param-name>widgetset</param-name>
-                       <param-value>com.vaadin.demo.gwt.OptimizedWidgetSet</param-value>
-               </init-param>
-       </servlet>
-
-       <!-- Calculator demo application -->
-       <servlet>
-               <servlet-name>Calc</servlet-name>
-               <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
-               <init-param>
-                       <param-name>application</param-name>
-                       <param-value>com.vaadin.demo.Calc</param-value>
-               </init-param>
-               <init-param>
-               <!--
-                       As an example, we will use an optimized widget set. See
-                       OptimizedWidgetSet.gwt.xml
-               -->
-                       <param-name>widgetset</param-name>
-                       <param-value>com.vaadin.demo.gwt.OptimizedWidgetSet</param-value>
-               </init-param>
-       </servlet>
-
-       <!--
-               Color Picker demo application that demonstrates creation of custom
-               widgets
-       -->
-       <servlet>
-               <servlet-name>ColorPickerApplication</servlet-name>
-               <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
-               <init-param>
-                       <param-name>application</param-name>
-                       <param-value>com.vaadin.demo.colorpicker.ColorPickerApplication</param-value>
-               </init-param>
-               <init-param>
-                       <param-name>widgetset</param-name>
-                       <param-value>com.vaadin.demo.colorpicker.gwt.ColorPickerWidgetSet</param-value>
-               </init-param>
-       </servlet>
-
        <!-- Portlet demo application -->
        <servlet>
                <servlet-name>PortletDemo</servlet-name>
@@ -113,36 +50,6 @@
                </init-param>
        </servlet>
 
-       <!--  Layout demo (VaadinTunes) -->
-       <servlet>
-               <servlet-name>VaadinTunesLayout</servlet-name>
-               <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
-               <init-param>
-                       <param-name>application</param-name>
-                       <param-value>com.vaadin.demo.VaadinTunesLayout</param-value>
-               </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>
-       
-       <!-- RunoTheme demo -->
-       <servlet>
-               <servlet-name>RunoTheme</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.RunoTheme</param-value>
-               </init-param>
-       </servlet>
-
        <!-- Servlet Mappings below - see servlets for comments -->
        <servlet-mapping>
                <servlet-name>PortletDemo</servlet-name>
@@ -152,41 +59,12 @@
                <servlet-name>VaadinApplicationRunner</servlet-name>
                <url-pattern>/run/*</url-pattern>
        </servlet-mapping>
-       <servlet-mapping>
-               <servlet-name>FeatureBrowser</servlet-name>
-               <url-pattern>/FeatureBrowser/*</url-pattern>
-       </servlet-mapping>
        <servlet-mapping>
                <servlet-name>AddressBook</servlet-name>
                <url-pattern>/AddressBook/*</url-pattern>
        </servlet-mapping>
-       <servlet-mapping>
-               <servlet-name>HelloWorld</servlet-name>
-               <url-pattern>/HelloWorld/*</url-pattern>
-       </servlet-mapping>
-       <servlet-mapping>
-               <servlet-name>Calc</servlet-name>
-               <url-pattern>/Calc/*</url-pattern>
-       </servlet-mapping>
-       <servlet-mapping>
-               <servlet-name>ColorPickerApplication</servlet-name>
-               <url-pattern>/colorpicker/*</url-pattern>
-       </servlet-mapping>
-       <servlet-mapping>
-               <servlet-name>VaadinTunesLayout</servlet-name>
-               <url-pattern>/VaadinTunesLayout/*</url-pattern>
-       </servlet-mapping>
-       <servlet-mapping>
-               <servlet-name>ReindeerThemeStyles</servlet-name>
-               <url-pattern>/ReindeerTheme/*</url-pattern>
-       </servlet-mapping>
-       <servlet-mapping>
-               <servlet-name>RunoTheme</servlet-name>
-               <url-pattern>/RunoTheme/*</url-pattern>
-       </servlet-mapping>
+
        <welcome-file-list>
-               <welcome-file>index.jsp</welcome-file>
                <welcome-file>index.html</welcome-file>
-               <welcome-file>index.htm</welcome-file>
        </welcome-file-list>
 </web-app>
\ No newline at end of file