taylor 2002/12/11 19:19:14
Modified: webapp/WEB-INF/conf JetspeedSecurity.properties
psml-mapping.xml
webapp/WEB-INF/psml/user/admin/html default.psml new.psml
Log:
- bug fix 15000, added more security to admin portlet sets, fixed bug in psml
mapping for references
Revision Changes Path
1.53 +0 -0 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.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
1.6 +4 -0 jakarta-jetspeed/webapp/WEB-INF/conf/psml-mapping.xml
Index: psml-mapping.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/psml-mapping.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- psml-mapping.xml 28 Jun 2002 05:37:37 -0000 1.5
+++ psml-mapping.xml 12 Dec 2002 03:19:13 -0000 1.6
@@ -250,6 +250,10 @@
<bind-xml name="metainfo"/>
</field>
+ <field name="securityRef" type="org.apache.jetspeed.om.BaseSecurityReference">
+ <bind-xml name="security-ref"/>
+ </field>
+
<field name="security"
type="org.apache.jetspeed.om.profile.psml.PsmlSecurity">
<bind-xml name="security"/>
1.18 +3 -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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- default.psml 20 Nov 2002 00:18:54 -0000 1.17
+++ default.psml 12 Dec 2002 03:19:13 -0000 1.18
@@ -7,6 +7,7 @@
<controller name="CardPortletController"/>
<control name="TabControl"/>
<portlets id='301'>
+ <security-ref parent="admin-only"/>
<controller name="ColumnController"/>
<metainfo>
<title>Content</title>
@@ -15,6 +16,7 @@
<entry id='322' parent="Search"/>
</portlets>
<portlets id='302'>
+ <security-ref parent="admin-only"/>
<controller name="CardPortletController">
<parameter name="parameter" value="select-panel"/>
</controller>
@@ -51,6 +53,7 @@
</portlets>
<portlets id='303'>
+ <security-ref parent="admin-only"/>
<controller name="CardPortletController">
<parameter name="parameter" value="select-panel"/>
</controller>
1.3 +6 -0 jakarta-jetspeed/webapp/WEB-INF/psml/user/admin/html/new.psml
Index: new.psml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/psml/user/admin/html/new.psml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- new.psml 20 Nov 2002 00:18:54 -0000 1.2
+++ new.psml 12 Dec 2002 03:19:13 -0000 1.3
@@ -10,6 +10,7 @@
<metainfo>
<title>General</title>
</metainfo>
+ <security-ref parent="admin-only"/>
<layout position="0" size="-1"/>
<control name="MenuControl"/>
<controller name="MenuController"/>
@@ -33,6 +34,7 @@
<metainfo>
<title>User & Security</title>
</metainfo>
+ <security-ref parent="admin-only"/>
<layout position="1" size="-1"/>
<control name="MenuControl"/>
<controller name="CardPortletController">
@@ -91,6 +93,7 @@
<metainfo>
<title>Layout</title>
</metainfo>
+ <security-ref parent="admin-only"/>
<layout position="2" size="-1"/>
<control name="MenuControl"/>
<controller name="CardPortletController">
@@ -126,6 +129,7 @@
<metainfo>
<title>Portlets</title>
</metainfo>
+ <security-ref parent="admin-only"/>
<layout position="3" size="-1"/>
<control name="MenuControl"/>
<controller name="MenuController"/>
@@ -140,6 +144,7 @@
<metainfo>
<title>Feeds</title>
</metainfo>
+ <security-ref parent="admin-only"/>
<layout position="5" size="-1"/>
<control name="MenuControl"/>
<controller name="MenuController"/>
@@ -150,6 +155,7 @@
<metainfo>
<title>Profiles</title>
</metainfo>
+ <security-ref parent="admin-only"/>
<layout position="4" size="-1"/>
<control name="MenuControl"/>
<controller name="MenuController"/>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
