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

svn changeset:20247/svn branch:6.7

4 files changed, 0 insertions, 221 deletions

diff --git a/WebContent/WEB-INF/liferay-display.xml b/WebContent/WEB-INF/liferay-display.xml
index ae893853d7..232cec07e1 100644
--- 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 a2044a4c5c..2ed03113b6 100644
--- a/WebContent/WEB-INF/liferay-portlet.xml
+++ b/WebContent/WEB-INF/liferay-portlet.xml
@@ -8,11 +8,6 @@
         <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>
         <ajaxable>false</ajaxable>
diff --git a/WebContent/WEB-INF/portlet.xml b/WebContent/WEB-INF/portlet.xml
index ea184518f4..49ed5921b1 100644
--- a/WebContent/WEB-INF/portlet.xml
+++ b/WebContent/WEB-INF/portlet.xml
@@ -41,41 +41,6 @@
 	</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>
 		<portlet-class>com.vaadin.demo.portlet.PortletModePortlet</portlet-class>
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index 41c4b963e5..0afec0507d 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -43,14 +43,6 @@
 

 

 	<servlet>

-		<servlet-name>DemoTestBench</servlet-name>

-		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>

-		<init-param>

-			<param-name>application</param-name>

-			<param-value>com.vaadin.demo.testbench.TestBench</param-value>

-		</init-param>

-	</servlet>

-	<servlet>

 		<servlet-name>TestForNativeWindowing</servlet-name>

 		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>

 		<init-param>

@@ -69,15 +61,6 @@
 	</servlet>

 

 	<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>

-

-	<servlet>

 		<servlet-name>AddressBook</servlet-name>

 		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>

 		<init-param>

@@ -115,51 +98,6 @@
 	</servlet>

 

 	<servlet>

-		<servlet-name>CustomLayoutDemo</servlet-name>

-		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>

-		<init-param>

-			<param-name>application</param-name>

-			<param-value>com.vaadin.tests.CustomLayoutDemo</param-value>

-		</init-param>

-	</servlet>

-

-	<servlet>

-		<servlet-name>LayoutDemo</servlet-name>

-		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>

-		<init-param>

-			<param-name>application</param-name>

-			<param-value>com.vaadin.tests.LayoutDemo</param-value>

-		</init-param>

-	</servlet>

-

-	<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>

-

-	<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>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>

 		<servlet-name>Parameters</servlet-name>

 		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>

 		<init-param>

@@ -178,32 +116,6 @@
 	</servlet>

 

 	<servlet>

-		<servlet-name>TreeFilesystemContainer</servlet-name>

-		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>

-		<init-param>

-			<param-name>application</param-name>

-			<param-value>com.vaadin.tests.TreeFilesystemContainer</param-value>

-		</init-param>

-		<!-- Set this property if demo cannot access context base directory because 

-			of Application Server or Servlet Container security constraints -->

-		<!-- <init-param> <param-name>sampleDirectory</param-name> <param-value>/mySampleDirectory</param-value> 

-			</init-param> -->

-	</servlet>

-

-	<servlet>

-		<servlet-name>TreeFilesystem</servlet-name>

-		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>

-		<init-param>

-			<param-name>application</param-name>

-			<param-value>com.vaadin.tests.TreeFilesystem</param-value>

-		</init-param>

-		<!-- Set this property if demo cannot access context base directory because 

-			of Application Server or Servlet Container security constraints -->

-		<!-- <init-param> <param-name>sampleDirectory</param-name> <param-value>/mySampleDirectory</param-value> 

-			</init-param> -->

-	</servlet>

-

-	<servlet>

 		<servlet-name>ModalWindow</servlet-name>

 		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>

 		<init-param>

@@ -213,37 +125,6 @@
 	</servlet>

 

 	<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>

-	</servlet>

-

-	<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>

-	</servlet>

-

-	<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>

-

-	<servlet>

 		<servlet-name>GAESyncTest</servlet-name>

 		<servlet-class>com.vaadin.terminal.gwt.server.GAEApplicationServlet</servlet-class>

 		<init-param>

@@ -258,10 +139,6 @@
 	</servlet-mapping>

 

 	<servlet-mapping>

-		<servlet-name>DemoTestBench</servlet-name>

-		<url-pattern>/DemoTestBench/*</url-pattern>

-	</servlet-mapping>

-	<servlet-mapping>

 		<servlet-name>TestForNativeWindowing</servlet-name>

 		<url-pattern>/TestForNativeWindowing/*</url-pattern>

 	</servlet-mapping>

@@ -292,26 +169,6 @@
 	</servlet-mapping>

 

 	<servlet-mapping>

-		<servlet-name>CustomLayoutDemo</servlet-name>

-		<url-pattern>/CustomLayoutDemo/*</url-pattern>

-	</servlet-mapping>

-

-	<servlet-mapping>

-		<servlet-name>LayoutDemo</servlet-name>

-		<url-pattern>/LayoutDemo/*</url-pattern>

-	</servlet-mapping>

-

-	<servlet-mapping>

-		<servlet-name>VaadinTunesLayout</servlet-name>

-		<url-pattern>/VaadinTunesLayout/*</url-pattern>

-	</servlet-mapping>

-

-	<servlet-mapping>

-		<servlet-name>FeatureBrowser</servlet-name>

-		<url-pattern>/FeatureBrowser/*</url-pattern>

-	</servlet-mapping>

-

-	<servlet-mapping>

 		<servlet-name>Parameters</servlet-name>

 		<url-pattern>/Parameters/*</url-pattern>

 	</servlet-mapping>

@@ -322,36 +179,11 @@
 	</servlet-mapping>

 

 	<servlet-mapping>

-		<servlet-name>TreeFilesystemContainer</servlet-name>

-		<url-pattern>/TreeFilesystemContainer/*</url-pattern>

-	</servlet-mapping>

-

-	<servlet-mapping>

-		<servlet-name>TreeFilesystem</servlet-name>

-		<url-pattern>/TreeFilesystem/*</url-pattern>

-	</servlet-mapping>

-

-	<servlet-mapping>

 		<servlet-name>ModalWindow</servlet-name>

 		<url-pattern>/ModalWindow/*</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>PortletDemo</servlet-name>

 		<url-pattern>/PortletDemo/*</url-pattern>

 	</servlet-mapping>

@@ -366,20 +198,8 @@
 		<url-pattern>/AddressBook/*</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>