From 9c670b95c2535fce7f559aa17cecdc8e61c3912b Mon Sep 17 00:00:00 2001
From: Henri Sara <henri.sara@itmill.com>
Date: Thu, 11 Aug 2011 12:15:00 +0000
Subject: [PATCH] #7178 Remove portlet configuration for Address Book

svn changeset:20300/svn branch:6.7
---
 WebContent/WEB-INF/liferay-display.xml |  1 -
 WebContent/WEB-INF/liferay-portlet.xml |  5 ----
 WebContent/WEB-INF/portlet.xml         | 39 --------------------------
 3 files changed, 45 deletions(-)

diff --git a/WebContent/WEB-INF/liferay-display.xml b/WebContent/WEB-INF/liferay-display.xml
index 9fe585e7dc..12a8e4315b 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="JSR286TestPortlet" />
-        <portlet id="AddressBookPortlet" />
         <portlet id="Vaadin Liferay Theme Portlet"/>
     </category>
 </display>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/liferay-portlet.xml b/WebContent/WEB-INF/liferay-portlet.xml
index f246e0bc4c..5a8d6fac8e 100644
--- a/WebContent/WEB-INF/liferay-portlet.xml
+++ b/WebContent/WEB-INF/liferay-portlet.xml
@@ -7,11 +7,6 @@
         <instanceable>false</instanceable>       
         <ajaxable>false</ajaxable>
     </portlet>
-    <portlet>
-        <portlet-name>AddressBookPortlet</portlet-name>
-        <instanceable>true</instanceable>       
-        <ajaxable>false</ajaxable>
-    </portlet>      
     <portlet>
         <portlet-name>Vaadin Liferay Theme Portlet</portlet-name>
         <instanceable>false</instanceable>
diff --git a/WebContent/WEB-INF/portlet.xml b/WebContent/WEB-INF/portlet.xml
index 18f7a10490..0b059a69e9 100644
--- a/WebContent/WEB-INF/portlet.xml
+++ b/WebContent/WEB-INF/portlet.xml
@@ -40,45 +40,6 @@
 		</security-role-ref>
 	</portlet>
 
-	<portlet>
-		<portlet-name>AddressBookPortlet</portlet-name>
-		<display-name>Address Book</display-name>
-		<portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet2</portlet-class>
-		<init-param>
-			<name>application</name>
-			<value>com.vaadin.demo.tutorial.addressbook.AddressBookApplication</value>
-		</init-param>
-		<init-param>
-			<name>widgetset</name>
-			<value>com.vaadin.portal.gwt.PortalDefaultWidgetSet</value>
-		</init-param>
-		<init-param>
-			<name>style</name>
-			<value>height:650px</value>
-		</init-param>
-		<supports>
-			<mime-type>text/html</mime-type>
-			<portlet-mode>view</portlet-mode>
-		</supports>
-		<portlet-info>
-			<title>Address Book</title>
-			<short-title>Address Book</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>Vaadin Liferay Theme Portlet</portlet-name>
         <display-name>Vaadin Liferay Theme</display-name>