Author: julien(a)jboss.com Date: 2007-08-07 14:17:19 -0400 (Tue, 07 Aug 2007) New Revision: 7869 Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet-instances.xml branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml Log: minor updates to the new admin portlet mode Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2007-08-07 16:49:21 UTC (rev 7868) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2007-08-07 18:17:19 UTC (rev 7869) @@ -478,7 +478,7 @@ public SelectItem[] getAvailableActions() { - return new SelectItem[]{ new SelectItem("view", "View") }; + return new SelectItem[]{ new SelectItem("view", "View"), new SelectItem("admin", "Admin")}; } } } Modified: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet-instances.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet-instances.xml 2007-08-07 16:49:21 UTC (rev 7868) +++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet-instances.xml 2007-08-07 18:17:19 UTC (rev 7869) @@ -33,9 +33,13 @@ <portlet-ref>ModePortlet</portlet-ref> <security-constraint> <policy-permission> + <action-name>admin</action-name> <role-name>Admin</role-name> - <action-name>admin</action-name> </policy-permission> + <policy-permission> + <action-name>view</action-name> + <unchecked/> + </policy-permission> </security-constraint> </instance> </deployment> Modified: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml 2007-08-07 16:49:21 UTC (rev 7868) +++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml 2007-08-07 18:17:19 UTC (rev 7869) @@ -42,12 +42,6 @@ <title>Mode Portlet</title> <keywords>sample,test</keywords> </portlet-info> - <portlet-preferences> - <preference> - <name>foo</name> - <value>bar</value> - </preference> - </portlet-preferences> </portlet> <portlet> <description>Portlet to test modification of head content</description> @@ -346,7 +340,7 @@ </portlet-info> </portlet> <custom-portlet-mode> - <name>admin</name> + <name>ADMIN</name> </custom-portlet-mode> <user-attribute> <name>user.name.nickName</name>