taylor 02/03/26 01:02:04
Modified: webapp/WEB-INF/conf registry.xml
Added: webapp/WEB-INF/psml/test testcase-2.xreg url-testcase.xreg
Log:
- first phase on registry refactoring and added features.
- test cases for registry marshalling
Revision Changes Path
1.7 +60 -11 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- registry.xml 29 Jul 2001 13:42:52 -0000 1.6
+++ registry.xml 26 Mar 2002 09:02:03 -0000 1.7
@@ -4,7 +4,7 @@
<map-to xml="registry"/>
<field name="portlets"
- type="org.apache.jetspeed.services.registry.NormalizedPortletEntry"
+ type="org.apache.jetspeed.om.registry.base.BasePortletEntry"
collection="vector">
<bind-xml name="portlet-entry"/>
</field>
@@ -35,7 +35,7 @@
</class>
- <class name="org.apache.jetspeed.services.registry.NormalizedPortletEntry">
+ <class name="org.apache.jetspeed.om.registry.base.BasePortletEntry">
<map-to xml="portlet-entry"/>
<field name="name" type="java.lang.String">
@@ -51,17 +51,17 @@
<bind-xml name="security"/>
</field>
- <field name="metaInfo"
+ <field name="baseMetaInfo"
type="org.apache.jetspeed.om.registry.base.BaseMetaInfo">
<bind-xml name="meta-info"/>
</field>
- <field name="baseClassname" type="java.lang.String">
+ <field name="classname" type="java.lang.String">
<bind-xml name="classname" node="element"/>
</field>
<field name="parameters"
- type="org.apache.jetspeed.om.registry.base.BaseParameter"
+ type="org.apache.jetspeed.om.registry.base.BaseCachedParameter"
collection="vector">
<bind-xml name="parameter"/>
</field>
@@ -84,7 +84,7 @@
<bind-xml name="application" node="attribute"/>
</field>
- <field name="URL" type="java.lang.String">
+ <field name="contentURL"
type="org.apache.jetspeed.om.registry.base.BaseContentURL">
<bind-xml name="url" node="element"/>
</field>
</class>
@@ -105,7 +105,7 @@
<bind-xml name="security"/>
</field>
- <field name="metaInfo"
+ <field name="baseMetaInfo"
type="org.apache.jetspeed.om.registry.base.BaseMetaInfo">
<bind-xml name="meta-info"/>
</field>
@@ -144,7 +144,7 @@
<bind-xml name="security"/>
</field>
- <field name="metaInfo"
+ <field name="baseMetaInfo"
type="org.apache.jetspeed.om.registry.base.BaseMetaInfo">
<bind-xml name="meta-info"/>
</field>
@@ -183,7 +183,7 @@
<bind-xml name="security"/>
</field>
- <field name="metaInfo"
+ <field name="baseMetaInfo"
type="org.apache.jetspeed.om.registry.base.BaseMetaInfo">
<bind-xml name="meta-info"/>
</field>
@@ -210,7 +210,7 @@
<bind-xml name="security"/>
</field>
- <field name="metaInfo"
+ <field name="baseMetaInfo"
type="org.apache.jetspeed.om.registry.base.BaseMetaInfo">
<bind-xml name="meta-info"/>
</field>
@@ -279,11 +279,60 @@
<bind-xml name="security"/>
</field>
- <field name="metaInfo"
+ <field name="baseMetaInfo"
+ type="org.apache.jetspeed.om.registry.base.BaseMetaInfo">
+ <bind-xml name="meta-info"/>
+ </field>
+
+ </class>
+
+ <class name="org.apache.jetspeed.om.registry.base.BaseCachedParameter">
+ <map-to xml="parameter"/>
+
+ <field name="name" type="java.lang.String">
+ <bind-xml name="name" node="attribute"/>
+ </field>
+
+ <field name="value" type="java.lang.String">
+ <bind-xml name="value" node="attribute"/>
+ </field>
+
+ <field name="type" type="java.lang.String">
+ <bind-xml name="type" node="attribute"/>
+ </field>
+
+ <field name="hidden" type="boolean">
+ <bind-xml name="hidden" node="attribute"/>
+ </field>
+
+ <field name="baseSecurity"
+ type="org.apache.jetspeed.om.registry.base.BaseSecurity">
+ <bind-xml name="security"/>
+ </field>
+
+ <field name="baseMetaInfo"
type="org.apache.jetspeed.om.registry.base.BaseMetaInfo">
<bind-xml name="meta-info"/>
</field>
+ <field name="cachedOnName" type="boolean">
+ <bind-xml name="cachedOnName" node="attribute"/>
+ </field>
+ <field name="cachedOnValue" type="boolean">
+ <bind-xml name="cachedOnValue" node="attribute"/>
+ </field>
+
</class>
+
+
+ <class name="org.apache.jetspeed.om.registry.base.BaseContentURL">
+ <map-to xml="url"/>
+ <field name="URL" type="java.lang.String">
+ <bind-xml name="url" node="text"/>
+ </field>
+ <field name="cachedOnURL" type="boolean">
+ <bind-xml name="cachedOnURL" node="attribute"/>
+ </field>
+ </class>
</mapping>
1.1 jakarta-jetspeed/webapp/WEB-INF/psml/test/testcase-2.xreg
Index: testcase-2.xreg
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<registry>
<portlet-entry name="XSL" hidden="false" type="abstract" application="false">
<classname>org.apache.jetspeed.portal.portlets.XSLPortlet</classname>
</portlet-entry>
<portlet-entry name="RSS" hidden="false" type="abstract" application="false">
<meta-info>
<title>RSS-Default-Title</title>
<description>RSS-Default-Description</description>
</meta-info>
<classname>org.apache.jetspeed.portal.portlets.NewRSSPortlet</classname>
<parameter name="stylesheet" value="/WEB-INF/xsl/rss.xsl" hidden="false">
<security role="admin"/>
</parameter>
<parameter name="stylesheet.text/html" value="/WEB-INF/xsl/rss.xsl"
hidden="false">
<security role="admin"/>
</parameter>
<parameter name="stylesheet.text/vnd.wap.wml"
value="/WEB-INF/xsl/rss-wml.xsl" hidden="false">
<security role="admin"/>
</parameter>
<parameter name="itemdisplayed" value="15" hidden="false">
<meta-info>
<title>Number of items</title>
<description>This parameter controls how many items may
be shown in this portlet. If the
information channel has more items, only the first
will be displayed. </description>
</meta-info>
</parameter>
<parameter name="openinpopup" value="false" type="boolean" hidden="false">
<meta-info>
<title>Open links in Popup window</title>
<description>Links will be opened in a new browser
window.</description>
</meta-info>
</parameter>
<parameter name="showdescription" value="true" type="boolean" hidden="false">
<meta-info>
<title>Show item description ?</title>
<description> This parameter specify whether
the item descriptions and icons should be
displayed in this portlet, or only the headlines.
</description>
</meta-info>
</parameter>
<parameter name="showtitle" value="true" type="boolean" hidden="false">
<meta-info>
<title>Show title description ?</title>
<description> This parameter specify whether
the title description and icon should be
displayed in this portlet, or only the title.
</description>
</meta-info>
</parameter>
<parameter name="showtextinput" value="true" type="boolean" hidden="false">
<meta-info>
<title>Show Text Input?</title>
<description> This parameter specify whether
the text input will be displayed. Text
Input is an optional element in the RSS feed.
</description>
</meta-info>
</parameter>
<media-type ref="html"/>
</portlet-entry>
<portlet-entry name="XMLHack" hidden="true" type="ref" parent="RSS"
application="false">
<meta-info>
<title>XMLHack Title</title>
<description>XMLHack Description</description>
</meta-info>
<url cachedOnURL="true">http://www.xmlhack.com/rss.php</url>
<parameter name="HACK" value="hacker"/>
</portlet-entry>
<portlet-entry name="Feeder" hidden="true" type="ref" parent="RSS"
application="false">
<url cachedOnURL="true">http://www.feeder-site.com/feed.rss</url>
</portlet-entry>
<portlet-entry name="AdminScreen" hidden="false" type="instance"
application="false">
<meta-info>
<title>Turbine Screen in a portlet</title>
<description>We put the Admin Screen in a portlet.</description>
</meta-info>
<classname>org.apache.jetspeed.portal.portlets.TurbineScreenPortlet</classname>
<parameter name="display.screen" value="Admin" hidden="false"/>
<parameter name="bgcolor" value="gray" hidden="false"/>
<media-type ref="html"/>
</portlet-entry>
<portlet-entry name="MetaTest" hidden="false" type="ref" parent="AdminScreen"
application="false">
<media-type ref="wml"/>
<media-type ref="xml"/>
</portlet-entry>
<portlet-entry name="NoMediaType" hidden="false" type="ref" parent="AdminScreen"
application="false"/>
<portlet-entry name="KeyTest" hidden="true" type="ref" parent="RSS"
application="false">
<url cachedOnURL="false">http://www.newnews.com/</url>
<parameter cachedOnName="false" cachedOnValue="true" name="newsid"
value="99" hidden="false"/>
<parameter cachedOnName="true" cachedOnValue="false" name="sportsid"
value="100" hidden="false"/>
<parameter cachedOnName="false" cachedOnValue="false" name="contact"
value="Joe" hidden="false"/>
<parameter name="contact2" value="Jon" hidden="false"/>
</portlet-entry>
</registry>
1.1 jakarta-jetspeed/webapp/WEB-INF/psml/test/url-testcase.xreg
Index: url-testcase.xreg
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<url cacheKey='true'>http://www.xmlhack.com/rss.php</url>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
