You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ra...@apache.org on 2002/10/30 16:55:51 UTC
cvs commit: jakarta-jetspeed/webapp/WEB-INF/xsl defaultstyle.xsl
raphael 2002/10/30 07:55:51
Modified: webapp/WEB-INF/conf JetspeedResources.properties
JetspeedSecurity.properties admin.xreg registry.xml
webapp/WEB-INF/psml/user/admin/html default.psml
Added: webapp/WEB-INF/conf client.xreg
webapp/WEB-INF/templates/vm/portlets/html browser-client.vm
Removed: webapp/WEB-INF/xsl defaultstyle.xsl
Log:
- Add a client.xreg basic Client registry
- Define a new ClientBrowser admin portlet to browse the registry and add it to
admin user PSML
- Update registry mapping to recognize the client registry
- Add default properties for client registry in JR.p
Revision Changes Path
1.91 +2 -1 jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedResources.properties
Index: JetspeedResources.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedResources.properties,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- JetspeedResources.properties 19 Sep 2002 01:24:13 -0000 1.90
+++ JetspeedResources.properties 30 Oct 2002 15:55:50 -0000 1.91
@@ -309,6 +309,7 @@
services.Registry.default.MediaType=local-medias
services.Registry.default.Skin=local-skins
services.Registry.default.Security=local-security
+services.Registry.default.Client=local-clients
services.Registry.extension=.xreg
# Refresh rate, in seconds. 0 = no refresh. Min value = 60
services.Registry.refreshRate=300
1.39 +6 -1 jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedSecurity.properties
Index: JetspeedSecurity.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedSecurity.properties,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- JetspeedSecurity.properties 29 Oct 2002 19:10:57 -0000 1.38
+++ JetspeedSecurity.properties 30 Oct 2002 15:55:50 -0000 1.39
@@ -48,6 +48,7 @@
services.GroupManagement.classname=org.apache.jetspeed.services.security.turbine.TurbineGroupManagement
services.JetspeedSecurity.group.class=org.apache.jetspeed.om.security.BaseJetspeedGroup
+
#########################################
# Permission Management Service #
@@ -62,6 +63,8 @@
services.SecurityCache.classname=org.apache.jetspeed.services.security.SecurityCacheImpl
+services.JetspeedSecurity.user.class=org.apache.jetspeed.om.security.BaseJetspeedUser
+
# This is used by the SecurityService to make the password checking
# secure. When enabled, passwords are transformed by a one-way
# function into a sequence of bytes that is base64 encoded.
@@ -130,4 +133,6 @@
#########################################
services.JetspeedSecurity.actions.anon.disable=true
services.JetspeedSecurity.action.allusers.disable=false
+
+
1.24 +16 -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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- admin.xreg 16 Jul 2002 22:05:57 -0000 1.23
+++ admin.xreg 30 Oct 2002 15:55:50 -0000 1.24
@@ -34,6 +34,22 @@
<category>customize</category>
</portlet-entry>
+ <portlet-entry type="instance" name="ClientBrowser" hidden="true">
+ <security role="user"/>
+ <security-ref parent="user-only"/>
+ <classname>org.apache.jetspeed.portal.portlets.VelocityPortlet</classname>
+ <parameter name="template" value="browser-client"/>
+ <parameter name="registry" value="Client"/>
+ <parameter name="page-size" value="10"/>
+ <parameter name="action" value="portlets.RegistryBrowseAction"/>
+ <meta-info>
+ <title>Client browser</title>
+ </meta-info>
+ <media-type ref="html"/>
+ <category>admin</category>
+ <category>browser</category>
+ </portlet-entry>
+
<portlet-entry type="instance" name="PortletBrowser" hidden="true">
<security role="user"/>
<security-ref parent="user-only"/>
1.12 +86 -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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- registry.xml 25 Aug 2002 19:09:42 -0000 1.11
+++ registry.xml 30 Oct 2002 15:55:50 -0000 1.12
@@ -39,6 +39,11 @@
<bind-xml name="security-entry"/>
</field>
+ <field name="clients"
+ type="org.apache.jetspeed.om.registry.base.BaseClientEntry"
+ collection="vector">
+ <bind-xml name="client-entry"/>
+ </field>
</class>
<class name="org.apache.jetspeed.om.registry.base.BasePortletEntry">
@@ -224,6 +229,11 @@
<bind-xml name="character-set" node="element"/>
</field>
+ <field name="capabilities"
+ type="org.apache.jetspeed.om.registry.base.BaseCapabilityMap">
+ <bind-xml name="capability-map" node="element"/>
+ </field>
+
</class>
<class name="org.apache.jetspeed.om.registry.base.BaseSkinEntry">
@@ -456,4 +466,80 @@
</field>
</class>
+
+ <!-- Class mapping for the Client Registry definition -->
+
+ <class name="org.apache.jetspeed.om.registry.base.BaseClientEntry">
+ <map-to xml="client-entry"/>
+
+ <field name="name" type="java.lang.String">
+ <bind-xml name="name" 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="securityRef" type="org.apache.jetspeed.om.BaseSecurityReference">
+ <bind-xml name="security-ref"/>
+ </field>
+
+ <field name="baseMetaInfo"
+ type="org.apache.jetspeed.om.registry.base.BaseMetaInfo">
+ <bind-xml name="meta-info"/>
+ </field>
+
+ <field name="useragentpattern" type="java.lang.String">
+ <bind-xml name="user-agent-pattern" node="element"/>
+ </field>
+
+ <field name="manufacturer" type="java.lang.String">
+ <bind-xml name="manufacturer" node="element"/>
+ </field>
+
+ <field name="model" type="java.lang.String">
+ <bind-xml name="model" node="element"/>
+ </field>
+
+ <field name="version" type="java.lang.String">
+ <bind-xml name="version" node="element"/>
+ </field>
+
+ <field name="mimetypes"
+ type="org.apache.jetspeed.om.registry.base.BaseMimetypeMap">
+ <bind-xml name="mimetype-map" node="element"/>
+ </field>
+
+ <field name="capabilities"
+ type="org.apache.jetspeed.om.registry.base.BaseCapabilityMap">
+ <bind-xml name="capability-map" node="element"/>
+ </field>
+
+ </class>
+
+ <class name="org.apache.jetspeed.om.registry.base.BaseMimetypeMap">
+ <map-to xml="mimetype-map"/>
+
+ <field name="mimetypesVector"
+ type="java.lang.String"
+ collection="vector">
+ <bind-xml name="mimetype" node="element"/>
+ </field>
+ </class>
+
+ <class name="org.apache.jetspeed.om.registry.base.BaseCapabilityMap">
+ <map-to xml="capability-map"/>
+
+ <field name="caps"
+ type="java.lang.String"
+ collection="vector">
+ <bind-xml name="capability" node="element"/>
+ </field>
+ </class>
+
</mapping>
1.1 jakarta-jetspeed/webapp/WEB-INF/conf/client.xreg
Index: client.xreg
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
possible capabilities:
HTML_3_2
HTML_4_0
HTML_TABLE
HTML_NESTED_TABLE
HTML_FORM
HTML_FRAME
HTML_IMAGE
HTML_JAVA
HTML_JAVA_1_0
HTML_JAVA_1_1
HTML_JAVA_JRE
HTML_JAVASCRIPT
HTML_JAVASCRIPT_1_0
HTML_JAVASCRIPT_1_1
HTML_JAVASCRIPT_1_2
HTML_ACTIVE_X
HTML_CSS1
HTML_CSS2
HTML_CSSP
HTML_IFRAME
HTML_LAYER
HTML_DOM_IE
HTML_DOM_NS4
HTML_DOM_1
HTML_DOM_2
WML_1_0
WML_1_1
WML_TABLE
HTTP_1_1
HTTP_COOKIE
-->
<registry>
<client-entry name="ie5">
<!--Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 5.0)-->
<user-agent-pattern>.*MSIE.*5.*</user-agent-pattern>
<manufacturer>Microsoft</manufacturer>
<model>None</model>
<version>5.5</version>
<mimetype-map>
<mimetype>text/html</mimetype>
<mimetype>text/xml</mimetype>
</mimetype-map>
<capability-map>
<capability>HTML_JAVA</capability>
<capability>HTML_JAVASCRIPT</capability>
<capability>HTML_TABLE</capability>
<capability>HTML_NESTED_TABLE</capability>
<capability>HTML_FORM</capability>
<capability>HTML_FRAME</capability>
<capability>HTML_IMAGE</capability>
<capability>HTML_ACTIVE_X</capability>
<capability>HTML_CSS1</capability>
<capability>HTML_CSS2</capability>
<capability>HTTP_COOKIE</capability>
</capability-map>
</client-entry>
<client-entry name="ns4">
<!--Mozilla/4.75 [en] (Windows NT 5.0; U)-->
<user-agent-pattern>.*Mozilla.*4.*</user-agent-pattern>
<manufacturer>Netscape</manufacturer>
<model>None</model>
<version>4.75</version>
<mimetype-map>
<mimetype>text/html</mimetype>
</mimetype-map>
<capability-map>
<capability>HTML_JAVA</capability>
<capability>HTML_JAVASCRIPT</capability>
<capability>HTML_TABLE</capability>
<capability>HTML_FORM</capability>
<capability>HTML_FRAME</capability>
<capability>HTML_IMAGE</capability>
<capability>HTML_CSS1</capability>
<capability>HTTP_COOKIE</capability>
</capability-map>
</client-entry>
<client-entry name="default">
<!--Mozilla/4.75 [en] (Windows NT 5.0; U)-->
<user-agent-pattern>.*Mozilla.*4.*</user-agent-pattern>
<manufacturer>Netscape</manufacturer>
<model>None</model>
<version>4.75</version>
<mimetype-map>
<mimetype>text/html</mimetype>
</mimetype-map>
<capability-map>
<capability>HTML_JAVA</capability>
<capability>HTML_JAVASCRIPT</capability>
<capability>HTML_TABLE</capability>
<capability>HTML_NESTED_TABLE</capability>
<capability>HTML_FORM</capability>
<capability>HTML_FRAME</capability>
<capability>HTML_IMAGE</capability>
<capability>HTML_CSS1</capability>
<capability>HTTP_COOKIE</capability>
</capability-map>
</client-entry>
</registry>
1.14 +1 -0 jakarta-jetspeed/webapp/WEB-INF/psml/user/admin/html/default.psml
Index: default.psml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/user/admin/html/default.psml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- default.psml 2 Jul 2002 01:24:48 -0000 1.13
+++ default.psml 30 Oct 2002 15:55:51 -0000 1.14
@@ -59,6 +59,7 @@
<entry id='335' parent="ControllerBrowser"/>
<entry id='336' parent="ControlBrowser"/>
<entry id='337' parent="MediaBrowser"/>
+ <entry id='347' parent="ClientBrowser"/>
<entry id='338' parent="SkinBrowser"/>
<entry id='345' parent="SecurityBrowser" />
<entry id='339' parent="JavaRuntimePortlet"/>
1.1 jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/browser-client.vm
Index: browser-client.vm
===================================================================
<form action="$jslink" method="post">
<table width="100%" cellpadding="0" cellspacing="0">
<tr>
<th>Name</th>
<th>Pattern</th>
<th>Mime Types</th>
<th>Capabilities</th>
</tr>
#foreach ( $entry in $registry )
<tr>
<td>$entry.Name</td>
<td>$entry.Useragentpattern</td>
<td valign="top">
#foreach ( $type in $entry.MimetypeMap.Mimetypes )
#if ( $type.equals($entry.MimetypeMap.preferredMimetype) )
<b>$type</b>
#else
$type
#end
<br/>
#end
</td>
<td>
#foreach ( $capability in $entry.CapabilityMap.Capabilities )
$capability<br />
#end
</td>
</tr>
#end
</table>
<table width="100%" cellpadding="0" cellspacing="0">
<tr>
<td align="right" width="50%">
#if ($prev)
<input type="submit" value="< < Previous">
#end
</td>
<td align="left" width="50%">
#if ($prev)
<input type="submit" value="Next > >">
#end
</td>
</tr>
</table>
</form>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>