taylor      02/03/28 17:08:58

  Modified:    webapp/WEB-INF/conf admin.xreg demo-portlets.xreg
                        portlets.xreg registry.xml
               webapp/WEB-INF/psml/test testcase-2.xreg
  Log:
  added sample categories to registries
  
  Revision  Changes    Path
  1.13      +37 -0     jakarta-jetspeed/webapp/WEB-INF/conf/admin.xreg
  
  Index: admin.xreg
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/admin.xreg,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- admin.xreg        23 Sep 2001 08:52:56 -0000      1.12
  +++ admin.xreg        29 Mar 2002 01:08:58 -0000      1.13
  @@ -4,6 +4,7 @@
     <portlet-entry type="instance" name="Applications" hidden="true">
       <security role="user"/>
       <classname>org.apache.jetspeed.portal.portlets.ApplicationsPortlet</classname>
  +    <category>admin</category>
     </portlet-entry>
   
     <portlet-entry type="instance" name="PortletCustomizer" hidden="true">
  @@ -14,6 +15,8 @@
       <meta-info>
         <title>Customize portlet</title>
       </meta-info>
  +    <category>admin</category>
  +    <category>customize.portlet</category>
     </portlet-entry>
   
     <portlet-entry type="instance" name="PortletSetCustomizer" hidden="true">
  @@ -24,6 +27,8 @@
       <meta-info>
         <title>Customize pane</title>
       </meta-info>
  +    <category>admin</category>
  +    <category>customize</category>
     </portlet-entry>
   
       <portlet-entry name="HomepageCustomizer" hidden="true"
  @@ -36,6 +41,8 @@
           <parameter name="customization_max_number" value="50" hidden="false"/>
           <parameter name="template" value="jsp" />
           <security role="user"/>
  +        <category>admin</category>
  +        <category>customize.page</category>
       </portlet-entry>
   
     <portlet-entry type="instance" name="PortletBrowser" hidden="true">
  @@ -49,6 +56,8 @@
         <title>Portlet browser</title>
       </meta-info>
       <media-type ref="html"/>
  +    <category>admin</category>
  +    <category>browser</category>
     </portlet-entry>
   
     <portlet-entry type="instance" name="ControlBrowser" hidden="true">
  @@ -62,6 +71,8 @@
         <title>Control browser</title>
       </meta-info>
       <media-type ref="html"/>
  +    <category>admin</category>
  +    <category>browser</category>
     </portlet-entry>
   
     <portlet-entry type="instance" name="ControllerBrowser" hidden="true">
  @@ -75,6 +86,8 @@
         <title>Controller browser</title>
       </meta-info>
       <media-type ref="html"/>
  +    <category>admin</category>
  +    <category>browser</category>
     </portlet-entry>
   
     <portlet-entry type="instance" name="MediaBrowser" hidden="true">
  @@ -88,6 +101,8 @@
         <title>Media Types browser</title>
       </meta-info>
       <media-type ref="html"/>
  +    <category>admin</category>
  +    <category>browser</category>
     </portlet-entry>
   
     <portlet-entry type="instance" name="SkinBrowser" hidden="true">
  @@ -101,6 +116,8 @@
         <title>Skin browser</title>
       </meta-info>
       <media-type ref="html"/>
  +    <category>admin</category>
  +    <category>browser</category>
     </portlet-entry>
   
     <portlet-entry type="instance" name="PortletInfoPortlet" hidden="true">
  @@ -122,6 +139,7 @@
         <description>Login portlet</description>
       </meta-info>
       <media-type ref="html"/>
  +    <category>admin</category>
     </portlet-entry>
   
     <!-- BEGIN ADMIN PORTLETS -->
  @@ -130,30 +148,35 @@
       <security role="admin"/>
       
<classname>org.apache.jetspeed.portal.portlets.admin.GlobalAdminPortlet</classname>
       <media-type ref="html"/>
  +    <category>admin</category>
     </portlet-entry>
   
     <portlet-entry type="instance" name="JavaRuntimePortlet" hidden="true">
       <security role="admin"/>
       
<classname>org.apache.jetspeed.portal.portlets.admin.JavaRuntimePortlet</classname>
       <media-type ref="html"/>
  +    <category>admin</category>
     </portlet-entry>
           
     <portlet-entry type="instance" name="DaemonAdminPortlet" hidden="true">
       <security role="admin"/>
       
<classname>org.apache.jetspeed.portal.portlets.admin.DaemonAdminPortlet</classname>
       <media-type ref="html"/>
  +    <category>admin</category>
     </portlet-entry>
   
     <portlet-entry type="instance" name="JetspeedContentAdmin" hidden="true">
       <security role="admin"/>
       
<classname>org.apache.jetspeed.portal.portlets.admin.JetspeedContentAdmin</classname>
       <media-type ref="html"/>
  +    <category>admin</category>
     </portlet-entry>
   
     <portlet-entry type="instance" name="BadURLManagerPortlet" hidden="true">
       <security role="admin"/>
       
<classname>org.apache.jetspeed.portal.portlets.admin.BadURLManagerPortlet</classname>
       <media-type ref="html"/>
  +    <category>admin</category>
     </portlet-entry>
     
     <!-- BEGIN SECURITY PORTLETS -->
  @@ -167,6 +190,8 @@
         <description>User Browser for Jetspeed Security Management</description>
       </meta-info>
       <media-type ref="html"/>
  +    <category>admin.security</category>
  +    <category>browser</category>
     </portlet-entry>
   
     <portlet-entry type="ref" parent="CustomizerVelocity" name="RoleBrowser">
  @@ -178,6 +203,8 @@
         <description>Security Role Browser for Jetspeed Security 
Management</description>
       </meta-info>
       <media-type ref="html"/>
  +    <category>admin.security</category>
  +    <category>browser</category>
     </portlet-entry>
   
     <portlet-entry type="ref" parent="CustomizerVelocity" name="GroupBrowser">
  @@ -189,6 +216,8 @@
         <description>Group Browser for Jetspeed Security Management</description>
       </meta-info>
       <media-type ref="html"/>
  +    <category>admin.security</category>
  +    <category>browser</category>
     </portlet-entry>
   
     <portlet-entry type="ref" parent="CustomizerVelocity" name="PermissionBrowser">
  @@ -200,6 +229,8 @@
         <description>Permission Browser for Jetspeed Security Management</description>
       </meta-info>
       <media-type ref="html"/>
  +    <category>admin.security</category>
  +    <category>browser</category>
     </portlet-entry>
   
     <portlet-entry type="ref" parent="CustomizerVelocity" name="UserForm" >
  @@ -211,6 +242,7 @@
         <description>User Maintenance for Jetspeed Security Management</description>
       </meta-info>
       <media-type ref="html"/>
  +    <category>admin.security</category>
     </portlet-entry>
   
     <portlet-entry type="ref" parent="CustomizerVelocity" name="RoleForm" >
  @@ -222,6 +254,7 @@
         <description>Security Role Maintenance for Jetspeed Security 
Management</description>
       </meta-info>
       <media-type ref="html"/>
  +    <category>admin.security</category>
     </portlet-entry>
   
     <portlet-entry type="ref" parent="CustomizerVelocity" name="GroupForm" >
  @@ -233,6 +266,7 @@
         <description>Security Group Maintenance for Jetspeed Security 
Management</description>
       </meta-info>
       <media-type ref="html"/>
  +    <category>admin.security</category>
     </portlet-entry>
   
     <portlet-entry type="ref" parent="CustomizerVelocity" name="PermissionForm" >
  @@ -244,6 +278,7 @@
         <description>Permission Maintenance for Jetspeed Security 
Management</description>
       </meta-info>
       <media-type ref="html"/>
  +    <category>admin.security</category>
     </portlet-entry>
   
     <portlet-entry type="ref" parent="CustomizerVelocity" name="UserRoleForm">
  @@ -255,6 +290,7 @@
         <description>User Role Form for Jetspeed Security Management</description>
       </meta-info>
       <media-type ref="html"/>
  +    <category>admin.security</category>
     </portlet-entry>
   
     <portlet-entry type="ref" parent="CustomizerVelocity" name="RolePermissionForm">
  @@ -266,6 +302,7 @@
         <description>Role Permission Form for Jetspeed Security 
Management</description>
       </meta-info>
       <media-type ref="html"/>
  +    <category>admin.security</category>
     </portlet-entry>
   
   </registry>
  
  
  
  1.9       +21 -0     jakarta-jetspeed/webapp/WEB-INF/conf/demo-portlets.xreg
  
  Index: demo-portlets.xreg
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/demo-portlets.xreg,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- demo-portlets.xreg        23 Mar 2002 22:18:17 -0000      1.8
  +++ demo-portlets.xreg        29 Mar 2002 01:08:58 -0000      1.9
  @@ -11,6 +11,8 @@
           <parameter name="action" value="portlets.HelloAction" hidden="false"/>
           <parameter name="text" value="Hello - only changes occasionally due to 
content caching" hidden="false"/>
           <media-type ref="html"/>
  +        <category>demo</category>
  +        <category>velocity.demo</category>
       </portlet-entry>
       <portlet-entry name="HelloVelocity" hidden="false" type="ref"
           parent="CustomizerVelocity" application="false">
  @@ -22,6 +24,8 @@
           <parameter name="action" value="portlets.HelloAction" hidden="false"/>
           <parameter name="text" value="Hello World in Velocity" hidden="false"/>
           <media-type ref="html"/>
  +        <category>demo</category>
  +        <category>velocity.demo</category>
       </portlet-entry>
       <portlet-entry name="HelloJSP" hidden="false" type="ref"
           parent="JSP" application="false">
  @@ -32,6 +36,8 @@
           <parameter name="template"
               value="hello.jsp" hidden="false"/>
           <media-type ref="html"/>
  +        <category>demo</category>
  +        <category>jsp.demo</category>
       </portlet-entry>
       <portlet-entry name="JSP1_2andJetspeedTagLib" hidden="false" type="ref"
           parent="JSP" application="false">
  @@ -45,6 +51,8 @@
           <parameter name="template"
               value="JSP1_2andJetspeedTagLib.jsp" hidden="false"/>
           <media-type ref="html"/>
  +        <category>demo</category>
  +        <category>jsp.demo</category>
       </portlet-entry>
       <portlet-entry name="Search" hidden="false" type="ref" parent="HTML" 
application="false">
           <meta-info>
  @@ -52,6 +60,8 @@
               <description>Search the Internet</description>
           </meta-info>
           <url>/search/index.html</url>
  +        <category>search</category>
  +        <category>html</category>
       </portlet-entry>
       <portlet-entry name="Welcome" hidden="false" type="ref"
           parent="HTML" application="false">
  @@ -59,6 +69,8 @@
               <title>Welcome</title>
           </meta-info>
           <url>/welcome.html</url>
  +        <category>demo</category>
  +        <category>html.demo</category>
       </portlet-entry>
       <portlet-entry name="LoggedInWelcome" hidden="false" type="ref"
           parent="HTML" application="false">
  @@ -68,12 +80,15 @@
           </meta-info>
           <parameter name="_showtitlebar" value="false" hidden="false"/>
           <url>/LoggedInWelcome.html</url>
  +        <category>demo</category>
  +        <category>html.demo</category>
       </portlet-entry>
       <portlet-entry name="XMLHack" hidden="false" type="ref" parent="RSS" 
application="false">
           <meta-info>
               <title>XMLHack</title>
           </meta-info>
           <url>http://www.xmlhack.com/rss.php</url>
  +        <category>news.software.opensource</category>
       </portlet-entry>
       <portlet-entry name="Apacheweek" hidden="false" type="ref"
           parent="RSS" application="false">
  @@ -81,6 +96,7 @@
               <title>Apacheweek</title>
           </meta-info>
           <url>http://www.apacheweek.com/issues/apacheweek-headlines.xml</url>
  +        <category>news.software.opensource</category>
       </portlet-entry>
       <portlet-entry name="Mozilla" hidden="false" type="ref" parent="RSS" 
application="false">
           <meta-info>
  @@ -88,11 +104,13 @@
           </meta-info>
           <parameter name="itemdisplayed" value="10" hidden="false"/>
           <url>http://www.mozilla.org/news.rdf</url>
  +        <category>news.software.opensource</category>
       </portlet-entry>
       <portlet-entry name="Jetspeed" hidden="false" type="ref"
           parent="RSS" application="false">
           <parameter name="openinpopup" value="true" hidden="false"/>
           <url>/rss/Jetspeed.rss</url>
  +        <category>news.software.opensource</category>
       </portlet-entry>
       <portlet-entry name="JavaWeb" hidden="false" type="ref"
           parent="WebPagePortlet" application="false">
  @@ -102,6 +120,7 @@
           </meta-info>
           <parameter name="dont_remove_applet" value="yes" hidden="false"/>
           <url>http://java.sun.com/</url>
  +        <category>sites.companies.sun</category>
       </portlet-entry>
       <portlet-entry type="ref" parent="CustomizerVelocity" name="StockQuote" 
application="false" hidden="false">
         <parameter name="template" value="stock-quote"/>
  @@ -112,6 +131,8 @@
         </meta-info>
         <media-type ref="html"/>
         <media-type ref="wml"/>
  +      <category>web services</category>
  +      <category>finance.stocks</category>
       </portlet-entry>
       <portlet-entry name="myLinks" hidden="false" type="ref"
           parent="LinkPortlet" application="false">
  
  
  
  1.18      +12 -0     jakarta-jetspeed/webapp/WEB-INF/conf/portlets.xreg
  
  Index: portlets.xreg
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/portlets.xreg,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- portlets.xreg     25 Feb 2002 05:39:55 -0000      1.17
  +++ portlets.xreg     29 Mar 2002 01:08:58 -0000      1.18
  @@ -2,6 +2,8 @@
   <registry>
       <portlet-entry name="XSL" hidden="false" type="abstract" application="false">
           <classname>org.apache.jetspeed.portal.portlets.XSLPortlet</classname>
  +        <category>xml</category>
  +        <category>transforms</category>
       </portlet-entry>
       <portlet-entry name="RSS" hidden="false" type="abstract" application="false">
           <classname>org.apache.jetspeed.portal.portlets.NewRSSPortlet</classname>
  @@ -56,6 +58,7 @@
               </meta-info>
           </parameter>
           <media-type ref="html"/>
  +        <category>rss</category>
       </portlet-entry>
       <portlet-entry name="WML" hidden="false" type="abstract" application="false">
           <classname>org.apache.jetspeed.portal.portlets.WMLFilePortlet</classname>
  @@ -63,13 +66,16 @@
       </portlet-entry>
       <portlet-entry name="Velocity" hidden="false" type="abstract" 
application="false">
           <classname>org.apache.jetspeed.portal.portlets.VelocityPortlet</classname>
  +        <category>velocity</category>
       </portlet-entry>
       <portlet-entry name="JSP" hidden="false" type="abstract" application="false">
           <classname>org.apache.jetspeed.portal.portlets.JspPortlet</classname>
  +        <category>jsp</category>
       </portlet-entry>
       <portlet-entry name="CustomizerVelocity" hidden="false"
           type="abstract" application="false">
           
<classname>org.apache.jetspeed.portal.portlets.CustomizerVelocityPortlet</classname>
  +        <category>velocity</category>
       </portlet-entry>
       <portlet-entry name="HTML" hidden="false" type="abstract" application="false">
           <classname>org.apache.jetspeed.portal.portlets.FileServerPortlet</classname>
  @@ -78,10 +84,13 @@
       <portlet-entry name="WebPagePortlet" hidden="false" type="abstract" 
application="false">
           <classname>org.apache.jetspeed.portal.portlets.WebPagePortlet</classname>
           <media-type ref="html"/>
  +        <category>web</category>
  +        <category>proxy</category>
       </portlet-entry>
       <portlet-entry name="LinkPortlet" hidden="false" type="abstract" 
application="false">
           <classname>org.apache.jetspeed.portal.portlets.LinkPortlet</classname>
           <media-type ref="html"/>
  +        <category>bookmarks</category>
       </portlet-entry>
       <portlet-entry name="ClearPortlet" hidden="true" type="instance" 
application="false">
           <classname>org.apache.jetspeed.portal.portlets.ClearPortlet</classname>
  @@ -96,6 +105,7 @@
       <portlet-entry name="AdminInfo" hidden="false" type="ref"
           parent="RSS" application="false">
           <url>/rss/admin.rss</url>
  +        <category>rss</category>
       </portlet-entry>
       <portlet-entry name="AdminScreen" hidden="false" type="instance" 
application="false">
           <meta-info>
  @@ -106,8 +116,10 @@
           <parameter name="display.screen" value="Admin" hidden="false"/>
           <parameter name="bgcolor" value="gray" hidden="false"/>
           <media-type ref="html"/>
  +        <category>admin</category>
       </portlet-entry>
       <portlet-entry name="IFramePortlet" hidden="false" type="abstract" 
application="false">
           <classname>org.apache.jetspeed.portal.portlets.IFramePortlet</classname>
  +        <category>frames</category>
       </portlet-entry> 
   </registry>
  
  
  
  1.8       +16 -0     jakarta-jetspeed/webapp/WEB-INF/conf/registry.xml
  
  Index: registry.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/registry.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- registry.xml      26 Mar 2002 09:02:03 -0000      1.7
  +++ registry.xml      29 Mar 2002 01:08:58 -0000      1.8
  @@ -87,6 +87,12 @@
       <field name="contentURL" 
type="org.apache.jetspeed.om.registry.base.BaseContentURL">
         <bind-xml name="url" node="element"/>
       </field>
  +
  +    <field name="categories" 
type="org.apache.jetspeed.om.registry.base.BaseCategory"
  +                             collection="vector">
  +      <bind-xml name="category" node="element"/>
  +    </field>
  +
     </class>
   
     <class name="org.apache.jetspeed.om.registry.base.BasePortletControlEntry">
  @@ -332,6 +338,16 @@
                </field>
                <field name="cachedOnURL" type="boolean">
                        <bind-xml name="cachedOnURL" node="attribute"/>         
  +             </field>        
  +     </class>
  +
  +     <class name="org.apache.jetspeed.om.registry.base.BaseCategory">
  +             <map-to xml="category"/>        
  +             <field name="name" type="java.lang.String">
  +                     <bind-xml name="category" node="text"/>
  +             </field>
  +             <field name="group" type="java.lang.String">
  +                     <bind-xml name="group" node="attribute"/>               
                </field>        
        </class>
   
  
  
  
  1.2       +4 -0      jakarta-jetspeed/webapp/WEB-INF/psml/test/testcase-2.xreg
  
  Index: testcase-2.xreg
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/test/testcase-2.xreg,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- testcase-2.xreg   26 Mar 2002 09:02:03 -0000      1.1
  +++ testcase-2.xreg   29 Mar 2002 01:08:58 -0000      1.2
  @@ -58,6 +58,8 @@
                       Input is an optional element in the RSS feed.         
</description>
               </meta-info>
           </parameter>
  +        <category>news.feeds</category>
  +        <category group="base">xml.rss</category>
           <media-type ref="html"/>
       </portlet-entry>
       
  @@ -72,6 +74,8 @@
   
       <portlet-entry name="Feeder" hidden="true" type="ref" parent="RSS" 
application="false">
           <url cachedOnURL="true">http://www.feeder-site.com/feed.rss</url>
  +        <category group="news">news.world.politics</category>
  +        <category group="news">news.world.wars</category>
       </portlet-entry>
   
       <portlet-entry name="AdminScreen" hidden="false" type="instance" 
application="false">
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to