#7178 Remove portlet configuration for Address Book

svn changeset:20300/svn branch:6.7

diff --git a/WebContent/WEB-INF/liferay-display.xml b/WebContent/WEB-INF/liferay-display.xml
index 9fe585e7dc68ae0c403bc9324c19f9d2db72e42c..12a8e4315b808652bdbc1945e9294b7050c2e66b 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="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 f246e0bc4c968ea4d84648be445184b36f72ae33..5a8d6fac8e3d557e23bc5f86d36d376301e34d58 100644 (file)
--- 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 18f7a1049087abe6981e244f2b5f35b4d5f442e7..0b059a69e91feef83d3612d3fe98115f7c77262b 100644 (file)
--- 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>