portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r475464 [1/2] - in /portals/jetspeed-2/trunk/applications: demo/src/webapp/WEB-INF/portlet.xml rss/src/webapp/WEB-INF/portlet.xml
Date Wed, 15 Nov 2006 22:16:35 GMT
Author: taylor
Date: Wed Nov 15 14:16:34 2006
New Revision: 475464

URL: http://svn.apache.org/viewvc?view=rev&rev=475464
Log:
* added descriptions and display names for all portlets (this was a really boring task!)
* made all portlet.xml files complaint with the portlet api xsd (jeez team!)
* add icons for all portlets
* keywords, categorization

Modified:
    portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/portlet.xml
    portals/jetspeed-2/trunk/applications/rss/src/webapp/WEB-INF/portlet.xml

Modified: portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/portlet.xml?view=diff&rev=475464&r1=475463&r2=475464
==============================================================================
--- portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/portlet.xml (original)
+++ portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/portlet.xml Wed Nov 15 14:16:34 2006
@@ -6,7 +6,7 @@
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-    http://www.apache.org/licenses/LICENSE-2.0
+http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,504 +14,594 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<portlet-app id="demo" version="1.0">
-
-  <custom-window-state>
-    <!--  the custom "popup" window state is mapped to the Jetspeed-2 solo" window state in jetspeed-portlet.xml --> 
-    <window-state>popup</window-state>
-    <description>a Custom Popup State</description> 
-  </custom-window-state>
-  <custom-portlet-mode>
-    <portlet-mode>print</portlet-mode>
-    <description>a Custom Print Mode</description> 
-  </custom-portlet-mode>
-
-<portlet id="HelloPortlet">
-    <init-param>
-      <description>test init param</description>
-      <name>hello</name>
-      <value>Hello Portlet</value>
-     </init-param>
-    <portlet-name>HelloPortlet</portlet-name>
-    <display-name>HelloWorld Portlet Wrapper</display-name>
-    <description>This is the hello world of portlets, it doesn't do much</description>
-    <portlet-class>org.apache.jetspeed.portlet.helloworld.HelloWorld</portlet-class>
-    <expiration-cache>-1</expiration-cache>
-    <supports>
-      <mime-type>text/html</mime-type>
-      <portlet-mode>EDIT</portlet-mode>
-      <portlet-mode>VIEW</portlet-mode>
-      <portlet-mode>HELP</portlet-mode>
-    </supports>
-    <supported-locale>en</supported-locale>
-    <supported-locale>ja</supported-locale>
-    <resource-bundle>org.apache.jetspeed.portlet.helloworld.resources.HelloWorldResources</resource-bundle>
-    <portlet-info>
-      <title>HelloWorldTitle</title>
-      <short-title>This is the short title</short-title>
-      <keywords>demo,tutorial,learn</keywords>
-    </portlet-info>
-  </portlet>
-  
-  <portlet>
-    <description>Bookmark Portlet</description>
-    <portlet-name>BookmarkPortlet</portlet-name>
-    <display-name>Bookmark Portlet</display-name>
-    <portlet-class>org.apache.portals.applications.desktop.BookmarkPortlet</portlet-class>
-    <init-param>
-		<name>ViewPage</name>
-			<value>/WEB-INF/view/bookmark-view.jsp</value>
-     </init-param>   
-    <init-param>
-		<name>EditPage</name>
-			<value>/WEB-INF/view/bookmark-edit.jsp</value>
-     </init-param>   
-    <init-param>
-		<name>HelpPage</name>
-			<value>/WEB-INF/view/bookmark-help.jsp</value>
-     </init-param>   
-    <expiration-cache>0</expiration-cache>            
-    <supports>
-      <mime-type>text/html</mime-type>                
-      <portlet-mode>VIEW</portlet-mode>                
-      <portlet-mode>EDIT</portlet-mode>                
-      <portlet-mode>HELP</portlet-mode>                
-    </supports>                                
-    <supported-locale>en</supported-locale>                
-    <supported-locale>de</supported-locale>            
-    <supported-locale>ja</supported-locale>            
-    <resource-bundle>org.apache.portals.applications.desktop.resources.Bookmark</resource-bundle>            
-    <portlet-info>
-      <title>Bookmarks</title>
-      <keywords>tools,bookmark</keywords>
-    </portlet-info>      
-    <portlet-preferences>
-      <preference>                            
-        <name>Jetspeed-2 Site</name>                    
-        <value>http://portals.apache.org/jetspeed-2/</value>    
-      </preference>                               		
-      <preference>                            
-        <name>Bluesunrise Site</name>
-        <value>http://www.bluesunrise.com/</value>    
-      </preference>                               
-      <preference>                            
-        <name>Apache Home</name>                    
-        <value>http://www.apache.org/</value>    
-      </preference>                               	  
-    </portlet-preferences>        
-  </portlet>
-	  
-  <portlet>
-    <description>Bookmark Portlet for XHTML Basic</description>
-    <portlet-name>BookmarkPortletForXHTMLBasic</portlet-name>
-    <display-name>Bookmark Portlet for XHTML Basic</display-name>
-    <portlet-class>org.apache.portals.applications.desktop.BookmarkPortlet</portlet-class>
-    <init-param>
-		<name>ViewPage</name>
-			<value>/WEB-INF/view/bookmark-view-xhtmlbasic.jsp</value>
-     </init-param>   
-    <init-param>
-		<name>EditPage</name>
-			<value>/WEB-INF/view/bookmark-edit-xhtmlbasic.jsp</value>
-     </init-param>   
-    <init-param>
-		<name>HelpPage</name>
-			<value>/WEB-INF/view/bookmark-help-xhtmlbasic.jsp</value>
-     </init-param>   
-    <expiration-cache>0</expiration-cache>            
-    <supports>
-      <mime-type>text/html</mime-type>                
-      <portlet-mode>VIEW</portlet-mode>                
-      <portlet-mode>EDIT</portlet-mode>                
-      <portlet-mode>HELP</portlet-mode>                
-    </supports>                                
-    <supported-locale>en</supported-locale>                
-    <supported-locale>de</supported-locale>            
-    <supported-locale>ja</supported-locale>            
-    <resource-bundle>org.apache.portals.applications.desktop.resources.Bookmark</resource-bundle>            
-    <portlet-info>
-      <title>Bookmarks</title>
-      <keywords>tools,bookmark</keywords>
-    </portlet-info>            
-    <portlet-preferences>
-      <preference>                            
-        <name>Jetspeed-2 Site</name>                    
-        <value>http://portals.apache.org/jetspeed-2/</value>    
-      </preference>                               		
-      <preference>                            
-        <name>Bluesunrise Site</name>                    
-        <value>http://www.bluesunrise.com/</value>    
-      </preference>                               
-      <preference>                            
-        <name>Apache Home</name>                    
-        <value>http://www.apache.org/</value>    
-      </preference>                               	  
-    </portlet-preferences>        
-  </portlet>
-
-  <portlet id="PreferencePortlet">
-    <portlet-name>PreferencePortlet</portlet-name>
-    <display-name>PreferencePortlet</display-name>
-    <portlet-class>org.apache.jetspeed.demo.preferences.PreferencePortlet</portlet-class>
-    <expiration-cache>-1</expiration-cache>
-    <supports>
-      <mime-type>text/html</mime-type>
-      <portlet-mode>VIEW</portlet-mode>
-    </supports>
-    <supported-locale>en</supported-locale>
-    <supported-locale>ja</supported-locale>
-    <resource-bundle>org.apache.jetspeed.demo.preferences.resources.PreferenceResources</resource-bundle>
-    <portlet-info>
-      <title>Preference Test</title>
-      <short-title>Preference Test</short-title>
-      <keywords>demo,tutorial,programming,preference</keywords>
-    </portlet-info>
-    <portlet-preferences>
-       <preference>
-         <name>pref1</name>
-         <value>Hello</value>
-         <value>Hello2</value>
-        </preference>
-    </portlet-preferences>
-  </portlet>
-
-  <portlet id="DisplayRequestPortlet">
-    <init-param>
-      <name>HelpPage</name>
-      <value>/WEB-INF/demo/simple/DisplayRequestHelp.jsp</value>
-    </init-param>
-    <init-param>
-      <name>ViewPage</name>
-      <value>/WEB-INF/demo/simple/DisplayRequest.jsp</value>
-    </init-param>
-    <portlet-name>DisplayRequestPortlet</portlet-name>
-    <display-name>DisplayRequest Portlet Wrapper</display-name>
-    <portlet-class>org.apache.portals.bridges.common.GenericServletPortlet</portlet-class>
-    <expiration-cache>-1</expiration-cache>
-    <supports>
-      <mime-type>text/html</mime-type>
-      <portlet-mode>VIEW</portlet-mode>
-      <portlet-mode>HELP</portlet-mode>
-    </supports>
-    <supported-locale>en</supported-locale>
-    <supported-locale>ja</supported-locale>
-    <resource-bundle>org.apache.jetspeed.demo.simple.resources.DisplayRequestResources</resource-bundle>
-    <portlet-info>
-      <title>Portlet Request Information</title>
-      <short-title>Request Info</short-title>
-      <keywords>demo,tutorial,programming,request</keywords>        
-    </portlet-info>
-  </portlet>
-
-  <portlet id="PickANumberPortlet">
-    <init-param>
-      <name>ViewPage</name>
-      <value>/WEB-INF/demo/simple/PickANumber.jsp</value>
-    </init-param>    
-    <init-param>
-      <name>HelpPage</name>
-      <value>/WEB-INF/demo/simple/PickANumberHelp.jsp</value>
-    </init-param>          
-    <init-param>
-      <name>EditPage</name>
-      <value>/WEB-INF/demo/simple/PickANumberEdit.jsp</value>
-    </init-param>              
-    <portlet-name>PickANumberPortlet</portlet-name>
-    <display-name>Pick a number game</display-name>
-    <portlet-class>org.apache.jetspeed.demo.simple.PickANumberPortlet</portlet-class>
-    <expiration-cache>-1</expiration-cache>
-    <supports>
-      <mime-type>text/html</mime-type>
-      <portlet-mode>VIEW</portlet-mode>
-      <portlet-mode>HELP</portlet-mode>
-      <portlet-mode>EDIT</portlet-mode>
-      <!--  support custom print mode --> 
-      <portlet-mode>print</portlet-mode>
-    </supports>
-    <supported-locale>en</supported-locale>
-    <supported-locale>fr</supported-locale>
-    <supported-locale>ja</supported-locale>
-    <resource-bundle>org.apache.jetspeed.demo.simple.resources.PickANumberResources</resource-bundle>
-    <portlet-info>
-      <title>Pick a Number</title>
-      <keywords>fun,game,pick</keywords>        
-    </portlet-info>
-    <portlet-preferences>
-       <preference>
-         <name>TopRange</name>
-         <value>100</value>
-        </preference>
-    </portlet-preferences>    
-  </portlet>
-
-  <portlet id="AttributeScopePortlet">
-    <init-param>
-      <name>HelpPage</name>
-      <value>/WEB-INF/demo/simple/AttributeScopeHelp.jsp</value>
-    </init-param>
-    <init-param>
-      <name>ViewPage</name>
-      <value>/WEB-INF/demo/simple/AttributeScope.jsp</value>
-    </init-param>
-    <portlet-name>AttributeScopePortlet</portlet-name>
-    <display-name>Attribute Scope Demo</display-name>
-    <portlet-class>org.apache.jetspeed.demo.simple.AttributeScopeServlet</portlet-class>
-    <expiration-cache>-1</expiration-cache>
-    <supports>
-      <mime-type>text/html</mime-type>
-      <portlet-mode>VIEW</portlet-mode>
-      <portlet-mode>HELP</portlet-mode>
-    </supports>
-    <supported-locale>en</supported-locale>
-    <supported-locale>ja</supported-locale>
-    <resource-bundle>org.apache.jetspeed.demo.simple.resources.AttributeScopeResources</resource-bundle>
-    <portlet-info>
-      <title>Attribute Scope Demo</title>
-      <short-title>Attributes</short-title>  
-      <keywords>demo,tutorial,programming,attribute,scope</keywords>        
-    </portlet-info>
-  </portlet>
-
-  <portlet id="CustomerList">
-    <init-param>
-      <name>ViewPage</name>
-      <value>/WEB-INF/demo/customerInfo/Page1.jsp</value>
-    </init-param>
-    <init-param>    
-    <name>EditPage</name>
-      <value>/WEB-INF/demo/customerInfo/Page1Edit.jsp</value>
-    </init-param>    
-    <portlet-name>CustomerList</portlet-name>
-    <display-name>Customer List</display-name>
-    <portlet-class>org.apache.jetspeed.demo.customerInfo.CustomerPortlet</portlet-class>
-    <expiration-cache>-1</expiration-cache>
-    <supports>
-      <mime-type>text/html</mime-type>
-      <portlet-mode>VIEW</portlet-mode>
-      <portlet-mode>EDIT</portlet-mode>      
-    </supports>
-    <supported-locale>en</supported-locale>
-    <supported-locale>ja</supported-locale>
-    <resource-bundle>org.apache.jetspeed.demo.customerInfo.resources.CustomerListResources</resource-bundle>
-    <portlet-info>
-      <title>Customer List</title>
-      <short-title>List</short-title>
-      <keywords>demo,tutorial,programming,customer</keywords>        
-    </portlet-info>
-  </portlet>
-
-  <portlet id="CustomerInfo">
-    <init-param>
-    <name>ViewPage</name>
-      <value>/WEB-INF/demo/customerInfo/Page2.jsp</value>
-    </init-param>
-    <init-param>        
-      <name>EditPage</name>
-      <value>/WEB-INF/demo/customerInfo/Page2Edit.jsp</value>
-    </init-param>        
-    <portlet-name>CustomerInfo</portlet-name>
-    <display-name>Customer Information</display-name>
-    <portlet-class>org.apache.jetspeed.demo.customerInfo.CustomerPortlet</portlet-class>
-    <expiration-cache>-1</expiration-cache>
-    <supports>
-      <mime-type>text/html</mime-type>
-      <portlet-mode>VIEW</portlet-mode>
-      <portlet-mode>EDIT</portlet-mode>            
-    </supports>
-    <supported-locale>en</supported-locale>
-    <supported-locale>ja</supported-locale>
-    <resource-bundle>org.apache.jetspeed.demo.customerInfo.resources.CustomerInfoResources</resource-bundle>
-    <portlet-info>
-      <title>Customer Information</title>
-      <short-title>Info</short-title>
-      <keywords>demo,tutorial,programming,customer</keywords>                
-    </portlet-info>
-  </portlet>
-
-  <portlet id="CustomerDetail">
-    <init-param>
-      <name>ViewPage</name>
-      <value>/WEB-INF/demo/customerInfo/Page3.jsp</value>
-    </init-param>
-    <init-param>        
-      <name>EditPage</name>
-      <value>/WEB-INF/demo/customerInfo/Page3Edit.jsp</value>
-    </init-param>        
-    <portlet-name>CustomerDetail</portlet-name>
-    <display-name>Customer Detail</display-name>
-    <portlet-class>org.apache.jetspeed.demo.customerInfo.CustomerPortlet</portlet-class>
-    <expiration-cache>-1</expiration-cache>
-    <supports>
-      <mime-type>text/html</mime-type>
-      <portlet-mode>VIEW</portlet-mode>
-      <portlet-mode>EDIT</portlet-mode>            
-    </supports>
-    <supported-locale>en</supported-locale>
-    <supported-locale>ja</supported-locale>
-    <resource-bundle>org.apache.jetspeed.demo.customerInfo.resources.CustomerDetailResources</resource-bundle>
-    <portlet-info>
-      <title>Customer Detail</title>
-      <short-title>Detail</short-title>
-      <keywords>demo,tutorial,programming,customer</keywords>                
-    </portlet-info>
-  </portlet>
-
-  <portlet id="RoleSecurityTest">
-    <init-param>
-    <name>ViewPage</name>
-      <value>/WEB-INF/demo/security/roles.jsp</value>
-    </init-param>
-    <init-param>
-    <name>EditPage</name>
-      <value>/WEB-INF/demo/security/roles.jsp</value>
-    </init-param>
-    <init-param>
-    <name>HelpPage</name>
-      <value>/WEB-INF/demo/security/help.html</value>
-    </init-param>
-    <portlet-name>RoleSecurityTest</portlet-name>
-    <display-name>Role Security Test</display-name>
-    <portlet-class>org.apache.portals.bridges.common.GenericServletPortlet</portlet-class>
-    <expiration-cache>-1</expiration-cache>
-    <supports>
-      <mime-type>text/html</mime-type>
-      <portlet-mode>VIEW</portlet-mode>
-      <portlet-mode>HELP</portlet-mode>
-    </supports>
-    <resource-bundle>org.apache.jetspeed.demo.security.resources.RoleResources</resource-bundle>
-    <supported-locale>en</supported-locale>
-    <supported-locale>ja</supported-locale>
-    <portlet-info>
-      <title>Role Security Test</title>
-      <short-title>Role Test</short-title>
-      <keywords>demo,tutorial,programming,role,security</keywords>                
-    </portlet-info>
-    <security-role-ref>
-      <role-name>Administrator</role-name>
-      <role-link>admin</role-link>
-    </security-role-ref>
-    <security-role-ref>
-      <role-name>Manager</role-name>
-      <role-link>manager</role-link>
-    </security-role-ref>
-    <security-role-ref>
-      <role-name>User</role-name>
-      <role-link>user</role-link>
-    </security-role-ref>
-  </portlet>
-  
-  <portlet id="UserInfoTest">
-    <init-param>
-    <name>ViewPage</name>
-      <value>/WEB-INF/demo/userinfo/userinfo.jsp</value>
-    </init-param>
-    <init-param>
-    <name>EditPage</name>
-      <value>/WEB-INF/demo/userinfo/userinfo.jsp</value>
-    </init-param>
-    <init-param>
-    <name>HelpPage</name>
-      <value>/WEB-INF/demo/userinfo/help.html</value>
-    </init-param>
-    <portlet-name>UserInfoTest</portlet-name>
-    <display-name>User Info Test</display-name>
-    <portlet-class>org.apache.portals.bridges.common.GenericServletPortlet</portlet-class>
-    <expiration-cache>-1</expiration-cache>
-    <supports>
-      <mime-type>text/html</mime-type>
-      <portlet-mode>VIEW</portlet-mode>
-      <portlet-mode>HELP</portlet-mode>
-    </supports>
-    <supported-locale>en</supported-locale>
-    <supported-locale>ja</supported-locale>
-    <resource-bundle>org.apache.jetspeed.demo.userinfo.resources.UserInfoResources</resource-bundle>
-    <portlet-info>
-      <title>User Info Test</title>
-      <short-title>User Test</short-title>
-      <keywords>demo,tutorial,programming,user,attributes,info</keywords>                        
-    </portlet-info>
-  </portlet>
-
+<portlet-app id="demo"
+    xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" version="1.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd">
+    
+    <portlet id="HelloPortlet">
+        <description>This is the hello world of portlets, it doesn't do much</description>
+        <portlet-name>HelloPortlet</portlet-name>
+        <display-name>Hello World</display-name>
+        <portlet-class>org.apache.jetspeed.portlet.helloworld.HelloWorld</portlet-class>
+        <init-param>
+            <description>test init param</description>
+            <name>hello</name>
+            <value>Hello Portlet</value>
+        </init-param>
+        <init-param>
+            <name>portlet-icon</name>
+            <value>faces-glasses.png</value>
+        </init-param>
+        <expiration-cache>-1</expiration-cache>
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>EDIT</portlet-mode>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>HELP</portlet-mode>
+        </supports>
+        <supported-locale>en</supported-locale>
+        <supported-locale>ja</supported-locale>
+        <resource-bundle>org.apache.jetspeed.portlet.helloworld.resources.HelloWorldResources</resource-bundle>
+        <portlet-info>
+            <title>Hello World</title>
+            <short-title>Hello</short-title>
+            <keywords>demo,tutorial,learn,hello</keywords>
+        </portlet-info>
+    </portlet>
+    
+    <portlet>
+        <description>The Bookmark Portlet stores links, also known as bookmarks, to any
+            website for quick access to your favorite websites.</description>
+        <portlet-name>BookmarkPortlet</portlet-name>
+        <display-name>Bookmark Portlet</display-name>
+        <portlet-class>
+            org.apache.portals.applications.desktop.BookmarkPortlet</portlet-class>
+        <init-param>
+            <name>ViewPage</name>
+            <value>/WEB-INF/view/bookmark-view.jsp</value>
+        </init-param>
+        <init-param>
+            <name>EditPage</name>
+            <value>/WEB-INF/view/bookmark-edit.jsp</value>
+        </init-param>
+        <init-param>
+            <name>HelpPage</name>
+            <value>/WEB-INF/view/bookmark-help.jsp</value>
+        </init-param>
+        <init-param>
+            <name>portlet-icon</name>
+            <value>bookmark-new.png</value>
+        </init-param>
+        <expiration-cache>0</expiration-cache>
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>EDIT</portlet-mode>
+            <portlet-mode>HELP</portlet-mode>
+        </supports>
+        <supported-locale>en</supported-locale>
+        <supported-locale>de</supported-locale>
+        <supported-locale>ja</supported-locale>
+        <resource-bundle>
+            org.apache.portals.applications.desktop.resources.Bookmark</resource-bundle>
+        <portlet-info>
+            <title>Bookmarks</title>
+            <keywords>tools,bookmark,link</keywords>
+        </portlet-info>
+        <portlet-preferences>
+            <preference>
+                <name>Jetspeed-2 Site</name>
+                <value>http://portals.apache.org/jetspeed-2/</value>
+            </preference>
+            <preference>
+                <name>Bluesunrise Site</name>
+                <value>http://www.bluesunrise.com/</value>
+            </preference>
+            <preference>
+                <name>Apache Home</name>
+                <value>http://www.apache.org/</value>
+            </preference>
+        </portlet-preferences>
+    </portlet>
+    
+    <portlet>
+        <description>The Bookmark Portlet for XHTML Basic stores links, also known as
+            bookmarks, to any website for quick access to your favorite
+            websites.</description>
+        <portlet-name>BookmarkPortletForXHTMLBasic</portlet-name>
+        <display-name>Bookmark Portlet for XHTML Basic</display-name>
+        <portlet-class>
+            org.apache.portals.applications.desktop.BookmarkPortlet</portlet-class>
+        <init-param>
+            <name>ViewPage</name>
+            <value>/WEB-INF/view/bookmark-view-xhtmlbasic.jsp</value>
+        </init-param>
+        <init-param>
+            <name>EditPage</name>
+            <value>/WEB-INF/view/bookmark-edit-xhtmlbasic.jsp</value>
+        </init-param>
+        <init-param>
+            <name>HelpPage</name>
+            <value>/WEB-INF/view/bookmark-help-xhtmlbasic.jsp</value>
+        </init-param>
+        <init-param>
+            <name>portlet-icon</name>
+            <value>bookmark-new.png</value>
+        </init-param>
+        <expiration-cache>0</expiration-cache>
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>EDIT</portlet-mode>
+            <portlet-mode>HELP</portlet-mode>
+        </supports>
+        <supported-locale>en</supported-locale>
+        <supported-locale>de</supported-locale>
+        <supported-locale>ja</supported-locale>
+        <resource-bundle>
+            org.apache.portals.applications.desktop.resources.Bookmark</resource-bundle>
+        <portlet-info>
+            <title>Bookmarks(X)</title>
+            <keywords>tools,bookmark,link,XHTML</keywords>
+        </portlet-info>
+        <portlet-preferences>
+            <preference>
+                <name>Jetspeed-2 Site</name>
+                <value>http://portals.apache.org/jetspeed-2/</value>
+            </preference>
+            <preference>
+                <name>Bluesunrise Site</name>
+                <value>http://www.bluesunrise.com/</value>
+            </preference>
+            <preference>
+                <name>Apache Home</name>
+                <value>http://www.apache.org/</value>
+            </preference>
+        </portlet-preferences>
+    </portlet>
+    
+    <portlet id="PreferencePortlet">
+        <description>A simple programming tutorial portlet for learning how to develop
+            with the Java Portlet API and Portlet Preferences</description>
+        <portlet-name>PreferencePortlet</portlet-name>
+        <display-name>Preferences Tutorial</display-name>
+        <portlet-class>
+            org.apache.jetspeed.demo.preferences.PreferencePortlet</portlet-class>
+        <init-param>
+            <name>portlet-icon</name>
+            <value>preferences-desktop.png</value>
+        </init-param>
+        <expiration-cache>-1</expiration-cache>
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+        </supports>
+        <supported-locale>en</supported-locale>
+        <supported-locale>ja</supported-locale>
+        <resource-bundle>
+            org.apache.jetspeed.demo.preferences.resources.PreferenceResources</resource-bundle>
+        <portlet-info>
+            <title>Preference Tutorial</title>
+            <short-title>Preferences</short-title>
+            <keywords>demo,tutorial,learning,programming,preference</keywords>
+        </portlet-info>
+        <portlet-preferences>
+            <preference>
+                <name>pref1</name>
+                <value>Hello</value>
+                <value>Hello2</value>
+            </preference>
+        </portlet-preferences>
+    </portlet>
+    
+    <portlet id="DisplayRequestPortlet">
+        <description>This portlets is useful for debugging HTTP Request information
+            including request headers, attributes, request parameters, and
+            cookies.</description>
+        <portlet-name>DisplayRequestPortlet</portlet-name>
+        <display-name>HTTP Request Information</display-name>
+        <portlet-class>
+            org.apache.portals.bridges.common.GenericServletPortlet</portlet-class>
+        <init-param>
+            <name>HelpPage</name>
+            <value>/WEB-INF/demo/simple/DisplayRequestHelp.jsp</value>
+        </init-param>
+        <init-param>
+            <name>ViewPage</name>
+            <value>/WEB-INF/demo/simple/DisplayRequest.jsp</value>
+        </init-param>
+        <init-param>
+            <name>portlet-icon</name>
+            <value>internet-web-browser.png</value>
+        </init-param>
+        <expiration-cache>-1</expiration-cache>
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>HELP</portlet-mode>
+        </supports>
+        <supported-locale>en</supported-locale>
+        <supported-locale>ja</supported-locale>
+        <resource-bundle>
+            org.apache.jetspeed.demo.simple.resources.DisplayRequestResources</resource-bundle>
+        <portlet-info>
+            <title>HTTP Request Information</title>
+            <short-title>HTTP Request</short-title>
+            <keywords>
+                debug,http,headers,tutorial,programming,request,tools</keywords>
+        </portlet-info>
+    </portlet>
+    
+    <portlet id="PickANumberPortlet">
+        <description>This portlet runs the popular 'Pick A Number' guessing game. The goal is to guess, in the least number of guesses, a number between [1..{Range}]</description>
+        <portlet-name>PickANumberPortlet</portlet-name>
+        <display-name>Pick a number game</display-name>
+        <portlet-class>
+            org.apache.jetspeed.demo.simple.PickANumberPortlet</portlet-class>
+        <init-param>
+            <name>ViewPage</name>
+            <value>/WEB-INF/demo/simple/PickANumber.jsp</value>
+        </init-param>
+        <init-param>
+            <name>HelpPage</name>
+            <value>/WEB-INF/demo/simple/PickANumberHelp.jsp</value>
+        </init-param>
+        <init-param>
+            <name>EditPage</name>
+            <value>/WEB-INF/demo/simple/PickANumberEdit.jsp</value>
+        </init-param>
+        <init-param>
+            <name>portlet-icon</name>
+            <value>applications-games.png</value>
+        </init-param>
+        <expiration-cache>-1</expiration-cache>
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>HELP</portlet-mode>
+            <portlet-mode>EDIT</portlet-mode>
+            <!--  support custom print mode -->
+            <portlet-mode>print</portlet-mode>
+        </supports>
+        <supported-locale>en</supported-locale>
+        <supported-locale>fr</supported-locale>
+        <supported-locale>ja</supported-locale>
+        <resource-bundle>
+            org.apache.jetspeed.demo.simple.resources.PickANumberResources</resource-bundle>
+        <portlet-info>
+            <title>Pick a Number</title>
+            <keywords>fun,game,pick</keywords>
+        </portlet-info>
+        <portlet-preferences>
+            <preference>
+                <name>TopRange</name>
+                <value>100</value>
+            </preference>
+        </portlet-preferences>
+    </portlet>
+    
+    <portlet id="AttributeScopePortlet">
+        <description>This portlet is useful for debugging Portlet Session attributes, as
+            well servlet request attributes, by both Application and Portlet
+            scope.</description>
+        <portlet-name>AttributeScopePortlet</portlet-name>
+        <display-name>Session Attribute Scope Tutorial</display-name>
+        <portlet-class>
+            org.apache.jetspeed.demo.simple.AttributeScopeServlet</portlet-class>
+        <init-param>
+            <name>HelpPage</name>
+            <value>/WEB-INF/demo/simple/AttributeScopeHelp.jsp</value>
+        </init-param>
+        <init-param>
+            <name>ViewPage</name>
+            <value>/WEB-INF/demo/simple/AttributeScope.jsp</value>
+        </init-param>
+        <init-param>
+            <name>portlet-icon</name>
+            <value>preferences-system-windows.png</value>
+        </init-param>
+        <expiration-cache>-1</expiration-cache>
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>HELP</portlet-mode>
+        </supports>
+        <supported-locale>en</supported-locale>
+        <supported-locale>ja</supported-locale>
+        <resource-bundle>
+            org.apache.jetspeed.demo.simple.resources.AttributeScopeResources</resource-bundle>
+        <portlet-info>
+            <title>Session Attribute Scope</title>
+            <short-title>Attributes</short-title>
+            <keywords>
+                demo,session,tutorial,programming,attribute,scope</keywords>
+        </portlet-info>
+    </portlet>
+    
+    <portlet id="CustomerList">
+        <description>Custom List is a part of a simple tutorial for inter-portlet
+            communication using the portlet session. Use with Customer Detail and Customer
+            Info portlets</description>
+        <portlet-name>CustomerList</portlet-name>
+        <display-name>Customer List</display-name>
+        <portlet-class>
+            org.apache.jetspeed.demo.customerInfo.CustomerPortlet</portlet-class>
+        <init-param>
+            <name>ViewPage</name>
+            <value>/WEB-INF/demo/customerInfo/Page1.jsp</value>
+        </init-param>
+        <init-param>
+            <name>EditPage</name>
+            <value>/WEB-INF/demo/customerInfo/Page1Edit.jsp</value>
+        </init-param>
+        <init-param>
+            <name>portlet-icon</name>
+            <value>x-office-spreadsheet.png</value>
+        </init-param>
+        <expiration-cache>-1</expiration-cache>
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>EDIT</portlet-mode>
+        </supports>
+        <supported-locale>en</supported-locale>
+        <supported-locale>ja</supported-locale>
+        <resource-bundle>
+            org.apache.jetspeed.demo.customerInfo.resources.CustomerListResources</resource-bundle>
+        <portlet-info>
+            <title>Customer List</title>
+            <short-title>List</short-title>
+            <keywords>demo,tutorial,programming,customer,session</keywords>
+        </portlet-info>
+    </portlet>
+    
+    <portlet id="CustomerInfo">
+        <description>Custom Info is a part of a simple tutorial for inter-portlet
+            communication using the portlet session. Use with Customer List and Customer
+            Info portlets.</description>
+        <portlet-name>CustomerInfo</portlet-name>
+        <display-name>Customer Information</display-name>
+        <portlet-class>
+            org.apache.jetspeed.demo.customerInfo.CustomerPortlet</portlet-class>
+        <init-param>
+            <name>ViewPage</name>
+            <value>/WEB-INF/demo/customerInfo/Page2.jsp</value>
+        </init-param>
+        <init-param>
+            <name>EditPage</name>
+            <value>/WEB-INF/demo/customerInfo/Page2Edit.jsp</value>
+        </init-param>
+        <init-param>
+            <name>portlet-icon</name>
+            <value>x-office-spreadsheet.png</value>
+        </init-param>
+        <expiration-cache>-1</expiration-cache>
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>EDIT</portlet-mode>
+        </supports>
+        <supported-locale>en</supported-locale>
+        <supported-locale>ja</supported-locale>
+        <resource-bundle>
+            org.apache.jetspeed.demo.customerInfo.resources.CustomerInfoResources</resource-bundle>
+        <portlet-info>
+            <title>Customer Information</title>
+            <short-title>Info</short-title>
+            <keywords>demo,tutorial,programming,customer</keywords>
+        </portlet-info>
+    </portlet>
+    
+    <portlet id="CustomerDetail">
+        <description>Custom Detail is a part of a simple tutorial for inter-portlet
+            communication using the portlet session. Use with Customer Detail and Customer
+            List portlets.</description>
+        <portlet-name>CustomerDetail</portlet-name>
+        <display-name>Customer Detail</display-name>
+        <portlet-class>
+            org.apache.jetspeed.demo.customerInfo.CustomerPortlet</portlet-class>
+        <init-param>
+            <name>ViewPage</name>
+            <value>/WEB-INF/demo/customerInfo/Page3.jsp</value>
+        </init-param>
+        <init-param>
+            <name>EditPage</name>
+            <value>/WEB-INF/demo/customerInfo/Page3Edit.jsp</value>
+        </init-param>
+        <init-param>
+            <name>portlet-icon</name>
+            <value>x-office-spreadsheet.png</value>
+        </init-param>
+        <expiration-cache>-1</expiration-cache>
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>EDIT</portlet-mode>
+        </supports>
+        <supported-locale>en</supported-locale>
+        <supported-locale>ja</supported-locale>
+        <resource-bundle>
+            org.apache.jetspeed.demo.customerInfo.resources.CustomerDetailResources</resource-bundle>
+        <portlet-info>
+            <title>Customer Detail</title>
+            <short-title>Detail</short-title>
+            <keywords>demo,tutorial,programming,customer</keywords>
+        </portlet-info>
+    </portlet>
+    
+    <portlet id="RoleSecurityTest">
+        <description>Tutorial portlet for learning how to use the isUserInRole Portlet API
+            on the RenderRequest.</description>
+        <portlet-name>RoleSecurityTest</portlet-name>
+        <display-name>Role Security Tutorial</display-name>
+        <portlet-class>
+            org.apache.portals.bridges.common.GenericServletPortlet</portlet-class>
+        <init-param>
+            <name>ViewPage</name>
+            <value>/WEB-INF/demo/security/roles.jsp</value>
+        </init-param>
+        <init-param>
+            <name>EditPage</name>
+            <value>/WEB-INF/demo/security/roles.jsp</value>
+        </init-param>
+        <init-param>
+            <name>HelpPage</name>
+            <value>/WEB-INF/demo/security/help.html</value>
+        </init-param>
+        <init-param>
+            <name>portlet-icon</name>
+            <value>preferences-system.png</value>
+        </init-param>
+        <expiration-cache>-1</expiration-cache>
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>HELP</portlet-mode>
+        </supports>
+        <supported-locale>en</supported-locale>
+        <supported-locale>ja</supported-locale>
+        <resource-bundle>
+            org.apache.jetspeed.demo.security.resources.RoleResources</resource-bundle>
+        <portlet-info>
+            <title>Role Security Test</title>
+            <short-title>Role Test</short-title>
+            <keywords>demo,tutorial,programming,role,security</keywords>
+        </portlet-info>
+        <security-role-ref>
+            <role-name>Administrator</role-name>
+            <role-link>admin</role-link>
+        </security-role-ref>
+        <security-role-ref>
+            <role-name>Manager</role-name>
+            <role-link>manager</role-link>
+        </security-role-ref>
+        <security-role-ref>
+            <role-name>User</role-name>
+            <role-link>user</role-link>
+        </security-role-ref>
+    </portlet>
+    
+    <portlet id="UserInfoTest">
+        <description>Tutorial portlet for learning how to use the Portlet API User
+            Information(Attributes) on the RenderRequest:
+            renderRequest.getAttribute(PortletRequest.USER_INFO)</description>
+        <portlet-name>UserInfoTest</portlet-name>
+        <display-name>User Information Tutorial</display-name>
+        <portlet-class>
+            org.apache.portals.bridges.common.GenericServletPortlet</portlet-class>
+        <init-param>
+            <name>ViewPage</name>
+            <value>/WEB-INF/demo/userinfo/userinfo.jsp</value>
+        </init-param>
+        <init-param>
+            <name>EditPage</name>
+            <value>/WEB-INF/demo/userinfo/userinfo.jsp</value>
+        </init-param>
+        <init-param>
+            <name>HelpPage</name>
+            <value>/WEB-INF/demo/userinfo/help.html</value>
+        </init-param>
+        <init-param>
+            <name>portlet-icon</name>
+            <value>system-users.png</value>
+        </init-param>
+        <expiration-cache>-1</expiration-cache>
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>HELP</portlet-mode>
+        </supports>
+        <supported-locale>en</supported-locale>
+        <supported-locale>ja</supported-locale>
+        <resource-bundle>
+            org.apache.jetspeed.demo.userinfo.resources.UserInfoResources</resource-bundle>
+        <portlet-info>
+            <title>User Information</title>
+            <short-title>User</short-title>
+            <keywords>demo,tutorial,programming,user,attributes,info</keywords>
+        </portlet-info>
+    </portlet>
+    
     <portlet id="tmtt-main">
+        <description>Places an HTML IFrame inside a portlet for easily hosting other web application within a portlet. Sizes of both normal and maximized modes are configurable in edit mode.</description>
         <portlet-name>IFramePortlet</portlet-name>
         <display-name>IFrame Portlet</display-name>
-        <description>
-            Prototype of the IFRAME portlet
-        </description>
-		<init-param>
-		<name>EditPage</name>
-		  <value>/WEB-INF/view/edit-prefs.vm</value>
-		</init-param>
-		<init-param>
-		<name>HelpPage</name>
-		  <value>/WEB-INF/view/iframe-help.html</value>
-		</init-param>
-    <portlet-class>org.apache.jetspeed.portlet.IFrameGenericPortlet</portlet-class>
-    <expiration-cache>-1</expiration-cache>
-    <supports>
-      <mime-type>text/html</mime-type>
-      <portlet-mode>EDIT</portlet-mode>
-      <portlet-mode>VIEW</portlet-mode>
-      <portlet-mode>HELP</portlet-mode>
-    </supports>
-    <portlet-info>
-      <title>IFrame</title>
-      <short-title>IFrame</short-title>
-      <keywords>tool,iframe,web,frame</keywords>                        
-    </portlet-info>        
-    <portlet-preferences>
-      <preference>
-        <name>SRC</name>
-		<value>http://portals.apache.org</value>
-      </preference>
-<!-- Don't specify a HEIGHT if you want a normal filled out layout
-     because percentage values result in the content not to be displayed on IE6.
-     Specific values are ok though. 
-    -->        
-            <preference>
-				<name>HEIGHT</name>
-				<value>300</value>
-			</preference>
-			<preference>
-				<name>WIDTH</name>
-				<value>100%</value>
-			</preference>
-			<preference>
-				<name>MAX-HEIGHT</name>
-				<value>800</value>
-			</preference>
-			<preference>
-				<name>MAX-WIDTH</name>
-				<value>100%</value>        
-      </preference>
-      <preference>
-        <name>SCROLLING</name>
-        <value>AUTO</value>
-			</preference>
-        </portlet-preferences>
-        <supported-locale>en</supported-locale>
+        <portlet-class>org.apache.jetspeed.portlet.IFrameGenericPortlet</portlet-class>        
+        <init-param>
+            <name>EditPage</name>
+            <value>/WEB-INF/view/edit-prefs.vm</value>
+        </init-param>
+        <init-param>
+            <name>HelpPage</name>
+            <value>/WEB-INF/view/iframe-help.html</value>
+        </init-param>
+        <init-param>
+            <name>portlet-icon</name>
+            <value>applications-internet.png</value>
+        </init-param>        
+        <expiration-cache>-1</expiration-cache>
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>EDIT</portlet-mode>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>HELP</portlet-mode>
+        </supports>
+        <supported-locale>en</supported-locale>        
         <portlet-info>
-            <title>IFrame Prototype Portlet</title>
+            <title>IFrame</title>
             <short-title>IFrame</short-title>
-            <keywords>iframe,frame</keywords>
+            <keywords>tool,iframe,web,frame,content,host</keywords>
         </portlet-info>
+        <portlet-preferences>
+            <preference>
+                <name>SRC</name>
+                <value>http://portals.apache.org</value>
+            </preference>
+            <!-- Don't specify a HEIGHT if you want a normal filled out layout
+            because percentage values result in the content not to be displayed on IE6.
+            Specific values are ok though. 
+            -->
+            <preference>
+                <name>HEIGHT</name>
+                <value>300</value>
+            </preference>
+            <preference>
+                <name>WIDTH</name>
+                <value>100%</value>
+            </preference>
+            <preference>
+                <name>MAX-HEIGHT</name>
+                <value>800</value>
+            </preference>
+            <preference>
+                <name>MAX-WIDTH</name>
+                <value>100%</value>
+            </preference>
+            <preference>
+                <name>SCROLLING</name>
+                <value>AUTO</value>
+            </preference>
+        </portlet-preferences>
     </portlet>
-
+    
     <portlet id="SSOIFrame">
+        <description>Places an HTML IFrame inside a portlet for easily hosting other web application within a portlet. Sizes of both normal and maximized modes are configurable in edit mode. Additional Single-Signon Support to automatically log on this portlet to other web sites.</description>        
         <portlet-name>SSOIFramePortlet</portlet-name>
         <display-name>SSO IFrame Portlet</display-name>
-        <description>
-            Example of using the SSO IFRAME portlet
-        </description>
-		<init-param>
-		  <name>EditPage</name>
-		  <value>/WEB-INF/view/sso-edit-prefs.vm</value>
-		</init-param>
-		<init-param>
-		  <name>HelpPage</name>
-		  <value>/WEB-INF/view/iframe-help.html</value>
-		</init-param>
-        <portlet-class>org.apache.jetspeed.portlet.SSOIFramePortlet</portlet-class>
+        <portlet-class>org.apache.jetspeed.portlet.SSOIFramePortlet</portlet-class>        
+        <init-param>
+            <name>EditPage</name>
+            <value>/WEB-INF/view/sso-edit-prefs.vm</value>
+        </init-param>
+        <init-param>
+            <name>HelpPage</name>
+            <value>/WEB-INF/view/iframe-help.html</value>
+        </init-param>
+        <init-param>
+            <name>portlet-icon</name>
+            <value>system-software-update.png</value>
+        </init-param>                
         <expiration-cache>-1</expiration-cache>
         <supports>
             <mime-type>text/html</mime-type>
@@ -519,454 +609,484 @@
             <portlet-mode>VIEW</portlet-mode>
             <portlet-mode>HELP</portlet-mode>
         </supports>
+        <supported-locale>en</supported-locale>                
         <portlet-info>
-          <title>SSO IFrame</title>
-          <short-title>SSO IFrame</short-title>
-          <keywords>tool,iframe,SSO,single,sign-on,security,web,frame</keywords>                        
-        </portlet-info>                
+            <title>SSO IFrame</title>
+            <short-title>SSO</short-title>
+            <keywords>frame,tool,iframe,SSO,single,sign-on,security,web,content,host</keywords>
+        </portlet-info>        
         <portlet-preferences>
             <preference>
                 <name>SRC</name>
-				<value>/demo/sso-demo</value>
+                <value>/demo/sso-demo</value>
+            </preference>
+            <preference>
+                <name>HEIGHT</name>
+                <value>100%</value>
+            </preference>
+            <preference>
+                <name>WIDTH</name>
+                <value>100%</value>
+            </preference>
+            <preference>
+                <name>MAX-HEIGHT</name>
+                <value>800</value>
+            </preference>
+            <preference>
+                <name>MAX-WIDTH</name>
+                <value>100%</value>
+            </preference>
+            <preference>
+                <name>sso.type</name>
+                <value>url</value>
             </preference>
-			<preference>
-				<name>HEIGHT</name>
-				<value>100%</value>
-			</preference>
-			<preference>
-				<name>WIDTH</name>
-				<value>100%</value>
-			</preference>
-			<preference>
-				<name>MAX-HEIGHT</name>
-				<value>800</value>
-			</preference>
-			<preference>
-				<name>MAX-WIDTH</name>
-				<value>100%</value>
-			</preference>			
-			<preference>
-				<name>sso.type</name>
-				<value>url</value>
-			</preference>			
         </portlet-preferences>
+    </portlet>
+    
+    <portlet id="CSSDemoPortlet">
+        <description>CSS Demo Portlet demonstating the different styles available to you from the Portlet API standard styles. See the portlet spec: appendix PLT.C CSS Style Definitions</description>
+        <portlet-name>CSSDemoPortlet</portlet-name>
+        <display-name>Portlet API CSS Styles Demo</display-name>
+        <portlet-class>org.apache.portals.bridges.common.GenericServletPortlet</portlet-class>        
+        <init-param>
+            <name>ViewPage</name>
+            <value>/WEB-INF/demo/css/css.jsp</value>
+        </init-param>
+        <init-param>
+            <name>portlet-icon</name>
+            <value>preferences-desktop-peripherals.png</value>
+        </init-param>                        
+        <expiration-cache>-1</expiration-cache>
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+        </supports>
         <supported-locale>en</supported-locale>
         <portlet-info>
-            <title>SSO IFrame Portlet</title>
-            <short-title>SSOIFrame</short-title>
-            <keywords>single-signon,SSO,iframe,frame</keywords>
+            <title>CSS Demo</title>
+            <short-title>CSS Demo</short-title>
+            <keywords>CSS,demo,tutorial,style</keywords>
         </portlet-info>
     </portlet>
-
-  <portlet id="CSSDemoPortlet">
-    <init-param>
-      <name>ViewPage</name>
-      <value>/WEB-INF/demo/css/css.jsp</value>
-    </init-param>
-    <portlet-name>CSSDemoPortlet</portlet-name>
-    <display-name>CSS Demo Portlet</display-name>
-    <portlet-class>org.apache.portals.bridges.common.GenericServletPortlet</portlet-class>
-    <expiration-cache>-1</expiration-cache>
-    <supports>
-      <mime-type>text/html</mime-type>
-      <portlet-mode>VIEW</portlet-mode>
-    </supports>
-    <supported-locale>en</supported-locale>
-    <portlet-info>
-      <title>CSS Demo Portlet</title>
-      <short-title>CSS Demo Portlet for PLT.C style</short-title>
-      <keywords>CSS,demo,tutorial,style</keywords>
-    </portlet-info>
-  </portlet>
-
-  <portlet id="web-cont-demo">
+    
+    <portlet id="web-cont-demo">
+        <description>Includes the content of another website inside the portal without using frames. All links are rewritten back to the portal to attempt to proxy all content through the portal.</description>        
         <portlet-name>WebContentPortlet</portlet-name>
         <display-name>WebContent Portlet</display-name>
-        <description>
-            Prototype of the WebContent portlet
-        </description>
-		<init-param>
-		<name>EditPage</name>
-		  <value>/WEB-INF/view/edit-wcprefs.vm</value>
-		</init-param>
-        <portlet-class>org.apache.jetspeed.portlet.WebContentPortlet</portlet-class>
+        <portlet-class>org.apache.jetspeed.portlet.WebContentPortlet</portlet-class>        
+        <init-param>
+            <name>EditPage</name>
+            <value>/WEB-INF/view/edit-wcprefs.vm</value>
+        </init-param>
+        <init-param>
+            <name>portlet-icon</name>
+            <value>preferences-system-network-proxy.png</value>
+        </init-param>                        
         <expiration-cache>-1</expiration-cache>
         <supports>
             <mime-type>text/html</mime-type>
             <portlet-mode>EDIT</portlet-mode>
             <portlet-mode>VIEW</portlet-mode>
-         </supports>
+        </supports>
+        <supported-locale>en</supported-locale>        
         <portlet-info>
             <title>WebContent Prototype</title>
             <short-title>WebContent</short-title>
             <keywords>web,content,webnav,bridge,proxy,rewrite</keywords>
-        </portlet-info>      
+        </portlet-info>
         <portlet-preferences>
             <preference>
                 <name>SRC</name>
-				<value>http://www.google.com</value>
+                <value>http://www.google.com</value>
             </preference>
-        </portlet-preferences>
-        <supported-locale>en</supported-locale>
+        </portlet-preferences>        
     </portlet>
-
-  <portlet id="SSOWebContent">
+    
+    <portlet id="SSOWebContent">
+        <description>Includes the content of another website inside the portal without using frames. All links are rewritten back to the portal to attempt to proxy all content through the portal. Additional Single-Signon Support to automatically log on this portlet to other web sites and manage sessions.</description>                
         <portlet-name>SSOWebContentPortlet</portlet-name>
         <display-name>SSO WebContent Portlet</display-name>
-        <description>
-            Prototype of the SSO WebContent portlet
-        </description>
-		<init-param>
-		<name>EditPage</name>
-		  <value>/WEB-INF/view/sso-edit-prefs.vm</value>
-		</init-param>
+        <portlet-class>org.apache.jetspeed.portlet.SSOWebContentPortlet</portlet-class>        
+        <init-param>
+            <name>EditPage</name>
+            <value>/WEB-INF/view/sso-edit-prefs.vm</value>
+        </init-param>
+        <init-param>
+            <name>HelpPage</name>
+            <value>/WEB-INF/view/sso-webcontent-help.vm</value>
+        </init-param>
         <init-param>
-  		  <name>HelpPage</name>
-		  <value>/WEB-INF/view/sso-webcontent-help.vm</value>
-		</init-param> 
-        <portlet-class>org.apache.jetspeed.portlet.SSOWebContentPortlet</portlet-class>
+            <name>portlet-icon</name>
+            <value>system-software-update.png</value>
+        </init-param>                        
         <expiration-cache>-1</expiration-cache>
         <supports>
             <mime-type>text/html</mime-type>
             <portlet-mode>EDIT</portlet-mode>
             <portlet-mode>VIEW</portlet-mode>
             <portlet-mode>HELP</portlet-mode>
-         </supports>
+        </supports>
+        <supported-locale>en</supported-locale>        
         <portlet-info>
             <title>SSO Web Content</title>
             <short-title>SSO Content</short-title>
-            <keywords>web,content,webnav,bridge,proxy,rewrite,SSO,single,sign-on</keywords>            
-        </portlet-info>     
-        <portlet-preferences>
+            <keywords>web,content,webnav,bridge,proxy,rewrite,SSO,single,sign-on</keywords>
+        </portlet-info>
+        <portlet-preferences>            
             <!--  NY TIMES EXAMPLE, user ID is 'jetspeed_test0' and password is 'jetspeed' -->
             <preference>
                 <name>SRC</name>
-				<value>http://www.nytimes.com</value>
+                <value>http://www.nytimes.com</value>
             </preference>
             <preference>
                 <name>sso.type</name>
-				<value>form</value>
+                <value>form</value>
             </preference>
             <preference>
                 <name>sso.form.Action</name>
-				<value>http://www.nytimes.com/auth/login</value>
+                <value>http://www.nytimes.com/auth/login</value>
             </preference>
             <preference>
                 <name>sso.form.Principal</name>
-				<value>USERID</value>
+                <value>USERID</value>
             </preference>
             <preference>
                 <name>sso.form.Credential</name>
-				<value>PASSWORD</value>
+                <value>PASSWORD</value>
             </preference>
             <preference>
                 <name>sso.form.Args</name>
-				<value>Submit2=Log In;OP=;OQ=;is_continue=false</value>
+                <value>Submit2=Log In;OP=;OQ=;is_continue=false</value>
+            </preference>
+        </portlet-preferences>
+    </portlet>
+    
+    <portlet>
+        <description>Database Browser will hook into any database table and display it in a tabular format. Edit mode allows configuration by JDBC, JNDI or SSO credentials</description>
+        <portlet-name>DbBrowserExample</portlet-name>
+        <display-name>Database Browser</display-name>
+        <portlet-class>org.apache.portals.gems.browser.DatabaseBrowserPortlet</portlet-class>
+        <init-param>
+            <name>ViewPage</name>
+            <value>/WEB-INF/view/database-view.vm</value>
+        </init-param>
+        <init-param>
+            <name>EditPage</name>
+            <value>/WEB-INF/view/database-edit.vm</value>
+        </init-param>
+        <init-param>
+            <name>HelpPage</name>
+            <value>/WEB-INF/view/database-help.vm</value>
+        </init-param>
+        <init-param>
+            <name>portlet-icon</name>
+            <value>system-file-manager.png</value>
+        </init-param>                                
+        <expiration-cache>0</expiration-cache>
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>EDIT</portlet-mode>
+            <portlet-mode>HELP</portlet-mode>
+        </supports>
+        <supported-locale>en</supported-locale>
+        <supported-locale>de</supported-locale>
+        <resource-bundle>org.apache.portals.gems.browser.resources.Browser</resource-bundle>
+        <portlet-info>
+            <title>Database Browser</title>
+            <short-title>DB Browser</short-title>
+            <keywords>tools,database,browser,SQL,query,DB</keywords>
+        </portlet-info>
+        <portlet-preferences>
+            <preference>
+                <name>DatasourceType</name>
+                <value>dbcp</value>
+            </preference>
+            <preference>
+                <name>JndiDatasource</name>
+                <value>jdbc/jetspeed</value>
+            </preference>
+            <preference>
+                <name>JdbcDriver</name>
+                <value>org.apache.derby.jdbc.EmbeddedDriver</value>
+            </preference>
+            <preference>
+                <name>JdbcConnection</name>
+                <value>jdbc:derby:/tmp/productiondb</value>
+            </preference>
+            <preference>
+                <name>JdbcUsername</name>
+                <value></value>
+            </preference>
+            <preference>
+                <name>JdbcPassword</name>
+                <value></value>
             </preference>
-		</portlet-preferences>
+            <preference>
+                <name>SSOJdbcDriver</name>
+                <value>org.apache.derby.jdbc.EmbeddedDriver</value>
+            </preference>
+            <preference>
+                <name>SSOJdbcConnection</name>
+                <value>jdbc:derby:/tmp/productiondb</value>
+            </preference>
+            <preference>
+                <name>SSOSite</name>
+                <value></value>
+            </preference>
+            <preference>
+                <name>WindowSize</name>
+                <value>10</value>
+            </preference>
+            <preference>
+                <name>sql</name>
+                <value>select * from CLUBS</value>
+            </preference>
+        </portlet-preferences>
+    </portlet>
+    
+    <portlet>
+        <description>Content Viewer displays the content of an HTML, PDF, or other file types from any where on the file system, or relative to the portlet application.</description>
+        <portlet-name>ContentViewer</portlet-name>
+        <display-name>Content Viewer</display-name>
+        <portlet-class>org.apache.portals.gems.file.FilePortlet</portlet-class>
+        <init-param>
+            <name>portlet-icon</name>
+            <value>folder-remote.png</value>
+        </init-param>                                        
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+        </supports>
+        <supports>
+            <mime-type>application/pdf</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+        </supports>
+        <supports>
+            <mime-type>application/zip</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+        </supports>
+        <supports>
+            <mime-type>text/csv</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+        </supports>
         <supported-locale>en</supported-locale>
+        <portlet-info>
+            <title>Content Viewer</title>
+            <short-title>Content</short-title>
+            <keywords>tools,CMS,content,viewer,file</keywords>
+        </portlet-info>
+        <portlet-preferences>
+            <preference>
+                <name>file</name>
+                <value>/_content/menu.html</value>
+            </preference>
+        </portlet-preferences>
     </portlet>
-
-  <portlet>
-    <description>Database Browser Example Portlet</description>
-    <portlet-name>DbBrowserExample</portlet-name>
-    <display-name>DB Browser</display-name>
-    <portlet-class>org.apache.portals.gems.browser.DatabaseBrowserPortlet</portlet-class>
-    <init-param>
-		<name>ViewPage</name>
-			<value>/WEB-INF/view/database-view.vm</value>
-     </init-param>   
-    <init-param>
-		<name>EditPage</name>
-			<value>/WEB-INF/view/database-edit.vm</value>
-     </init-param>   
-    <init-param>
-		<name>HelpPage</name>
-			<value>/WEB-INF/view/database-help.vm</value>
-     </init-param>   
-    <expiration-cache>0</expiration-cache>            
-    <supports>
-      <mime-type>text/html</mime-type>                
-      <portlet-mode>VIEW</portlet-mode>                
-      <portlet-mode>EDIT</portlet-mode>                
-      <portlet-mode>HELP</portlet-mode>                
-    </supports>                                
-    <supported-locale>en</supported-locale>                
-    <supported-locale>de</supported-locale>            
-    <resource-bundle>org.apache.portals.gems.browser.resources.Browser</resource-bundle>            
-    <portlet-info>
-        <title>Database Browser</title>
-        <short-title>DB Browser</short-title>
-        <keywords>database,browser,tools,SQL,query,DB</keywords>            
-    </portlet-info>           
-    <portlet-preferences>
-      <preference>                            
-        <name>DatasourceType</name>                    
-        <value>dbcp</value>    
-      </preference>                               
-      <preference>                            
-        <name>JndiDatasource</name>                    
-        <value>jdbc/jetspeed</value>    
-      </preference>                               
-      <preference>                            
-        <name>JdbcDriver</name>                    
-        <value>org.apache.derby.jdbc.EmbeddedDriver</value>    
-      </preference>                               
-      <preference>                            
-        <name>JdbcConnection</name>                    
-        <value>jdbc:derby:/tmp/productiondb</value>    
-      </preference>                               
-      <preference>                            
-        <name>JdbcUsername</name>                    
-        <value></value>    
-      </preference>                               
-      <preference>                            
-        <name>JdbcPassword</name>                    
-        <value></value>    
-      </preference>     
-      <preference>                            
-        <name>SSOJdbcDriver</name>                    
-        <value>org.apache.derby.jdbc.EmbeddedDriver</value>    
-      </preference>                               
-      <preference>                            
-        <name>SSOJdbcConnection</name>                   
-        <value>jdbc:derby:/tmp/productiondb</value>    
-      </preference>                                
-      <preference>                            
-        <name>SSOSite</name>                    
-        <value></value>    
-      </preference>                                                                     
-      <preference>                            
-        <name>WindowSize</name>                    
-        <value>10</value>    
-      </preference>                               		
-      <preference>                            
-        <name>sql</name>                    
-        <value>select * from CLUBS</value>    
-      </preference>                               
-    </portlet-preferences>        
-  </portlet>
-
-<portlet>        
-    <description>Content Viewer portlet</description>		
-    <portlet-name>ContentViewer</portlet-name>	
-    <display-name>Content Viewer</display-name>
-    <portlet-class>org.apache.portals.gems.file.FilePortlet</portlet-class>	        
-    <supports>
-        <mime-type>text/html</mime-type>
-        <portlet-mode>VIEW</portlet-mode>
-    </supports>
-    <supports>
-        <mime-type>application/pdf</mime-type>
-        <portlet-mode>VIEW</portlet-mode>
-    </supports>        
-    <supports>
-        <mime-type>application/zip</mime-type>
-        <portlet-mode>VIEW</portlet-mode>
-    </supports>            
-    <supports>
-        <mime-type>text/csv</mime-type>
-        <portlet-mode>VIEW</portlet-mode>
-    </supports>                
-    <supported-locale>en</supported-locale>      	
-	<portlet-info>
-        <title>Content Viewer</title>
-        <short-title>Content</short-title>
-		<keywords>tools,CMS,content,viewer,file</keywords>        
-    </portlet-info>
-    <portlet-preferences>
-        <preference>                            
-            <name>file</name>                    
-            <value>/_content/menu.html</value>    
-        </preference>         
-    </portlet-preferences>                      		
-</portlet> 
-<!--
-<portlet id="SSOProxyPortlet">
+    <!--
+    <portlet id="SSOProxyPortlet">
     <portlet-name>SSOProxyPortletPortlet</portlet-name>
     <display-name>SSOProxyPortlet</display-name>
     <description>
-            SSO Proxy Portlet
-        </description>
-		<init-param>
-		<name>EditPage</name>
-		  <value>/WEB-INF/view/edit-sso-proxy.vm</value>
-		</init-param>
+    SSO Proxy Portlet
+    </description>
+    <init-param>
+    <name>EditPage</name>
+    <value>/WEB-INF/view/edit-sso-proxy.vm</value>
+    </init-param>
     <portlet-class>org.apache.jetspeed.portlet.sso.SSOProxyPortlet</portlet-class>
     <expiration-cache>-1</expiration-cache>
     <supports>
-      <mime-type>text/html</mime-type>
-      <portlet-mode>VIEW</portlet-mode>
-      <portlet-mode>EDIT</portlet-mode>
+    <mime-type>text/html</mime-type>
+    <portlet-mode>VIEW</portlet-mode>
+    <portlet-mode>EDIT</portlet-mode>
     </supports>
     <supported-locale>en</supported-locale>
     <portlet-info>
-      <title>SSOProxyPortlet</title>
-      <short-title>SSOProxyPortlet</short-title>
-      <keywords>SSO,Proxy,Security</keywords>
+    <title>SSOProxyPortlet</title>
+    <short-title>SSOProxyPortlet</short-title>
+    <keywords>SSO,Proxy,Security</keywords>
     </portlet-info>
     <portlet-preferences>
-       <preference>
-         <name>ForceSSORefresh</name>
-         <value>false</value>
-        </preference>
+    <preference>
+    <name>ForceSSORefresh</name>
+    <value>false</value>
+    </preference>
     </portlet-preferences>
-  </portlet>
--->
-  <portlet id="GoogleMapsPortlet">
-      <init-param>
-          <name>ViewPage</name>
-          <value>/WEB-INF/other/googlemaps/GoogleMaps.vm</value>
-      </init-param>
-      <init-param>
-          <name>EditPage</name>
-          <value>/WEB-INF/other/googlemaps/EditGoogleMaps.vm</value>
-      </init-param>
-      <portlet-name>GoogleMapsPortlet</portlet-name>
-      <display-name>Google Maps Portlet</display-name>
-      <portlet-class>org.apache.portals.gems.googlemaps.GoogleMapsPortlet</portlet-class>
-      <expiration-cache>-1</expiration-cache>
-      <supports>
-          <mime-type>text/html</mime-type>
-          <portlet-mode>VIEW</portlet-mode>
-          <portlet-mode>EDIT</portlet-mode>
-      </supports>
-      <supported-locale>en</supported-locale>
-      <portlet-info>
-          <title>Google Map</title>
-          <short-title>Map</short-title>
-          <keywords>technology,map,google,satellite</keywords>
-      </portlet-info>
-      <portlet-preferences>
-          <preference>
-              <name>Location</name>
-              <value>San Francisco, CA</value>
-          </preference>
-      </portlet-preferences>
-      <portlet-preferences>
-          <preference>
-              <name>MapHeight</name>
-              <value>400px</value>
-          </preference>
-      </portlet-preferences>
-      <portlet-preferences>
-          <preference>
-              <name>APIKey</name>
-              <value>ABQIAAAAisHr-hr7f_yfo_m3teTC5RQXGaCFRGWXJQavRKQcb1Ew_fwkKRQ26QnpXVIkxSMwwTECWDV23ZDaLQ</value>
-          </preference>
-      </portlet-preferences>
-  </portlet>         
-
-  	<portlet id="weather">
-		<description>Weather Underground Portlet</description>
-		<portlet-name>WeatherPortlet</portlet-name>
-		<display-name>Weather</display-name>
-		<portlet-class>org.apache.portals.applications.desktop.WeatherPortlet</portlet-class>
+    </portlet>
+    -->
+    <portlet id="GoogleMapsPortlet">
+        <description>Display a Google Map inside of a portlet. Edit mode configures preferences by city location, which is translated into GPS coordinates.</description>
+        <portlet-name>GoogleMapsPortlet</portlet-name>
+        <display-name>Google Maps Portlet</display-name>
+        <portlet-class>org.apache.portals.gems.googlemaps.GoogleMapsPortlet</portlet-class>        
+        <init-param>
+            <name>ViewPage</name>
+            <value>/WEB-INF/other/googlemaps/GoogleMaps.vm</value>
+        </init-param>
+        <init-param>
+            <name>EditPage</name>
+            <value>/WEB-INF/other/googlemaps/EditGoogleMaps.vm</value>
+        </init-param>
+        <init-param>
+            <name>portlet-icon</name>
+            <value>gmap.png</value>
+        </init-param>                                                
+        <expiration-cache>-1</expiration-cache>
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>EDIT</portlet-mode>
+        </supports>
+        <supported-locale>en</supported-locale>
+        <portlet-info>
+            <title>Google Map</title>
+            <short-title>Map</short-title>
+            <keywords>technology,map,google,satellite</keywords>
+        </portlet-info>
+        <portlet-preferences>
+            <preference>
+                <name>Location</name>
+                <value>San Francisco, CA</value>
+            </preference>
+            <preference>
+                <name>MapHeight</name>
+                <value>400px</value>
+            </preference>
+            <preference>
+                <name>APIKey</name>
+                <value>ABQIAAAAisHr-hr7f_yfo_m3teTC5RQXGaCFRGWXJQavRKQcb1Ew_fwkKRQ26QnpXVIkxSMwwTECWDV23ZDaLQ</value>
+            </preference>
+        </portlet-preferences>
+    </portlet>
+    
+    <portlet id="weather">
+        <description>Weather Underground Portlet. Go to edit mode to configure the weather for your city.</description>
+        <portlet-name>WeatherPortlet</portlet-name>
+        <display-name>Weather</display-name>
+        <portlet-class>org.apache.portals.applications.desktop.WeatherPortlet</portlet-class>
         <init-param>
             <name>ViewPage</name>
             <value>/WEB-INF/view/weather.vm</value>
-        </init-param>		        
+        </init-param>
         <init-param>
             <name>EditPage</name>
             <value>/WEB-INF/view/edit-prefs.vm</value>
-        </init-param>	
-		<expiration-cache>0</expiration-cache>
-		<supports>
-			<mime-type>text/html</mime-type>
-			<portlet-mode>VIEW</portlet-mode>
-		    <portlet-mode>EDIT</portlet-mode>	  
-		</supports>
-		<supported-locale>en</supported-locale>        
-        <portlet-info>
-           <title>Weather</title>
-           <short-title>Weather</short-title>
-           <keywords>weather,tools,desktop</keywords>
-        </portlet-info>        
+        </init-param>
+        <init-param>
+            <name>portlet-icon</name>
+            <value>weather-showers.png</value>
+        </init-param>                                                        
+        <expiration-cache>0</expiration-cache>
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>EDIT</portlet-mode>
+        </supports>
+        <supported-locale>en</supported-locale>
+        <portlet-info>
+            <title>Weather</title>
+            <short-title>Weather</short-title>
+            <keywords>weather,tools,desktop</keywords>
+        </portlet-info>
         <portlet-preferences>
-		<preference>
-			<name>weather_state</name>
-			<value>CA</value>
-		</preference>
-		<preference>
-			<name>weather_city</name>
-			<value>Oakland</value>
-		</preference>
-		<preference>
-			<name>weather_station</name>
-			<value></value>
-		</preference>
-		<preference>
-			<name>weather_style</name>
-			<value>infobox</value>
-		</preference>
-		</portlet-preferences>
-	</portlet>         
-
-  	<portlet id="flash">
-		<description>Flash and Flex generic portlet</description>
-		<portlet-name>FlashPortlet</portlet-name>
-		<display-name>Flash and Flex</display-name>
-		<portlet-class>org.apache.portals.applications.desktop.FlashPortlet</portlet-class>
+            <preference>
+                <name>weather_state</name>
+                <value>CA</value>
+            </preference>
+            <preference>
+                <name>weather_city</name>
+                <value>Oakland</value>
+            </preference>
+            <preference>
+                <name>weather_station</name>
+                <value></value>
+            </preference>
+            <preference>
+                <name>weather_style</name>
+                <value>infobox</value>
+            </preference>
+        </portlet-preferences>
+    </portlet>
+    
+    <portlet id="flash">
+        <description>Hosts a Flash or Flex application inside a portlet. Go to edit mode to configure your Flash URL source.</description>
+        <portlet-name>FlashPortlet</portlet-name>
+        <display-name>Flash or Flex</display-name>
+        <portlet-class>org.apache.portals.applications.desktop.FlashPortlet</portlet-class>
         <init-param>
             <name>ViewPage</name>
             <value>/WEB-INF/view/flash-demo.vm</value>
-        </init-param>		        
+        </init-param>
         <init-param>
             <name>EditPage</name>
             <value>/WEB-INF/view/edit-prefs.vm</value>
-        </init-param>	
-		<expiration-cache>0</expiration-cache>
-		<supports>
-			<mime-type>text/html</mime-type>
-			<portlet-mode>VIEW</portlet-mode>
-		    <portlet-mode>EDIT</portlet-mode>	  
-		</supports>
-		<supported-locale>en</supported-locale>        
-        <portlet-info>
-           <title>Flash Demo</title>
-           <short-title>Flash</short-title>
-           <keywords>technology,flash,flex,SWF,FLA</keywords>
-        </portlet-info>        
+        </init-param>
+        <init-param>
+            <name>portlet-icon</name>
+            <value>applications-multimedia.png</value>
+        </init-param>                                                        
+        <expiration-cache>0</expiration-cache>
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>EDIT</portlet-mode>
+        </supports>
+        <supported-locale>en</supported-locale>
+        <portlet-info>
+            <title>Flash Demo</title>
+            <short-title>Flash</short-title>
+            <keywords>technology,flash,flex,SWF,FLA</keywords>
+        </portlet-info>
         <portlet-preferences>
-         <preference>
-            <name>SRC</name>
-            <value>/demo/SWF/Clock.swf</value>
-         </preference>
-         <preference>
-            <name>HEIGHT</name>
-            <value>305</value>
-         </preference>
-         <preference>
-            <name>WIDTH</name>
-            <value>303</value>
-         </preference>
-         <preference>
-            <name>MAX-SRC</name>
-            <value>/demo/SWF/Paycheck_calculator.swf</value>
-         </preference>            
-         <preference>
-            <name>MAX-HEIGHT</name>
-            <value>400</value>
-         </preference>
-         <preference>
-            <name>MAX-WIDTH</name>
-            <value>502</value>
-         </preference>          
-      </portlet-preferences>            
-	</portlet>                     
-    
-  <user-attribute>
-	<description>User Given Name</description>
-	<name>user.name.given</name>
-  </user-attribute>
-  <user-attribute>
-	<description>User Last Name</description>
-	<name>user.name.family</name>
-  </user-attribute>
-  <user-attribute>
-	<description>User eMail</description>
-	<name>user.home-info.online.email</name>
-  </user-attribute>
+            <preference>
+                <name>SRC</name>
+                <value>/demo/SWF/Clock.swf</value>
+            </preference>
+            <preference>
+                <name>HEIGHT</name>
+                <value>305</value>
+            </preference>
+            <preference>
+                <name>WIDTH</name>
+                <value>303</value>
+            </preference>
+            <preference>
+                <name>MAX-SRC</name>
+                <value>/demo/SWF/Paycheck_calculator.swf</value>
+            </preference>
+            <preference>
+                <name>MAX-HEIGHT</name>
+                <value>400</value>
+            </preference>
+            <preference>
+                <name>MAX-WIDTH</name>
+                <value>502</value>
+            </preference>
+        </portlet-preferences>
+    </portlet>
+    
+    <custom-portlet-mode>
+        <description>a Custom Print Mode</description>            
+        <portlet-mode>print</portlet-mode>
+    </custom-portlet-mode>
+    <custom-window-state>        
+        <!--  the custom "popup" window state is mapped to the Jetspeed-2 solo" window state in jetspeed-portlet.xml -->
+        <description>a Custom Popup State</description>
+        <window-state>popup</window-state>
+    </custom-window-state>
+    
+    <user-attribute>
+        <description>User Given Name</description>
+        <name>user.name.given</name>
+    </user-attribute>
+    <user-attribute>
+        <description>User Last Name</description>
+        <name>user.name.family</name>
+    </user-attribute>
+    <user-attribute>
+        <description>User eMail</description>
+        <name>user.home-info.online.email</name>
+    </user-attribute>
     
 </portlet-app>
-



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message