Author: thomas.heute(a)jboss.com Date: 2007-06-27 12:35:00 -0400 (Wed, 27 Jun 2007) New Revision: 7586 Modified: docs/tags/JBoss_Portal_2_6_0/referenceGuide/en/modules/cmsPortlet.xml docs/tags/JBoss_Portal_2_6_0/userGuide/en/images/admincms/actions_menu.gif docs/tags/JBoss_Portal_2_6_0/userGuide/en/images/admincms/cms_adminpage.gif docs/tags/JBoss_Portal_2_6_0/userGuide/en/images/admincms/createdirectory.gif docs/tags/JBoss_Portal_2_6_0/userGuide/en/images/admincms/createhtml.gif docs/tags/JBoss_Portal_2_6_0/userGuide/en/images/admincms/editfile.gif docs/tags/JBoss_Portal_2_6_0/userGuide/en/images/admincms/fileproperties.gif docs/tags/JBoss_Portal_2_6_0/userGuide/en/images/admincms/resourcecopy.gif docs/tags/JBoss_Portal_2_6_0/userGuide/en/images/admincms/resourcedelete.gif docs/tags/JBoss_Portal_2_6_0/userGuide/en/images/admincms/resourcemove.gif docs/tags/JBoss_Portal_2_6_0/userGuide/en/images/admincms/resourceupload.gif docs/tags/JBoss_Portal_2_6_0/userGuide/en/images/admincms/resourceuploadarchive.gif docs/tags/JBoss_Portal_2_6_0/userGuide/en/images/admincms/ss_exportarchive.gif docs/tags/JBoss_Portal_2_6_0/userGuide/en/images/admincms/ss_viewfile.gif docs/tags/JBoss_Portal_2_6_0/userGuide/en/modules/admincmsPortlet.xml docs/tags/JBoss_Portal_2_6_0/userGuide/en/modules/user_role.xml Log: Doc update Modified: docs/tags/JBoss_Portal_2_6_0/referenceGuide/en/modules/cmsPortlet.xml =================================================================== --- docs/tags/JBoss_Portal_2_6_0/referenceGuide/en/modules/cmsPortlet.xml 2007-06-27 16:30:10 UTC (rev 7585) +++ docs/tags/JBoss_Portal_2_6_0/referenceGuide/en/modules/cmsPortlet.xml 2007-06-27 16:35:00 UTC (rev 7586) @@ -346,80 +346,92 @@ to the cms interceptor stack. For example, if you have the 2 default interceptors, you should have the following lines in the jboss-service.xml file: <programlisting><![CDATA[ - <!-- ACL Security Interceptor --> - <mbean - code="org.jboss.portal.cms.impl.interceptors.ACLInterceptor" - name="portal:service=Interceptor,type=Cms,name=ACL" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> - <xmbean/> - <attribute name="JNDIName">java:/portal/cms/ACLInterceptor</attribute> - <attribute name="CmsSessionFactory">java:/portal/cms/CMSSessionFactory</attribute> - <attribute name="IdentitySessionFactory">java:/portal/IdentitySessionFactory</attribute> - <attribute name="DefaultPolicy"> - <policy> - <!-- permissions on the root cms node --> - <criteria name="path" value="/"> - <permission name="cms" action="read"> - <role name="Anonymous"/> - </permission> - <permission name="cms" action="write"> - <role name="User"/> - </permission> - <permission name="cms" action="manage"> - <role name="Admin"/> - </permission> - </criteria> - <!-- permissions on the default cms node --> - <criteria name="path" value="/default"> - <permission name="cms" action="read"> - <role name="Anonymous"/> - </permission> - <permission name="cms" action="write"> - <role name="User"/> - </permission> - <permission name="cms" action="manage"> - <role name="Admin"/> - </permission> - </criteria> - <!-- permissions on the private/protected node --> - <criteria name="path" value="/default/private"> - <permission name="cms" action="manage"> - <role name="Admin"/> - </permission> - </criteria> - </policy> - </attribute> - <depends optional-attribute-name="AuthorizationManager" proxy-type="attribute"> - portal:service=AuthorizationManager,type=cms - </depends> - <depends>portal:service=Hibernate,type=CMS</depends> - <depends>portal:service=Module,type=IdentityServiceController</depends> - </mbean> - - <!-- Approval Workflow Interceptor --> - <mbean - code="org.jboss.portal.cms.impl.interceptors.ApprovalWorkflowInterceptor" - name="portal:service=Interceptor,type=Cms,name=ApprovalWorkflow" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> - <xmbean/> - <attribute name="JNDIName">java:/portal/cms/ApprovalWorkflowInterceptor</attribute> - <depends>portal:service=Hibernate,type=CMS</depends> - </mbean> - - <!-- CMS Interceptor Registration --> - <mbean - code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory" - name="portal:service=InterceptorStackFactory,type=Cms" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> - <xmbean/> - <depends-list optional-attribute-name="InterceptorNames"> - <depends-list-element>portal:service=Interceptor,type=Cms,name=ACL</depends-list-element> - <depends-list-element>portal:service=Interceptor,type=Cms,name=ApprovalWorkflow</depends-list-element> - </depends-list> - </mbean> +<!-- ACL Security Interceptor --> +<mbean code="org.jboss.portal.cms.impl.interceptors.ACLInterceptor" + name="portal:service=Interceptor,type=Cms,name=ACL" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <xmbean /> + <attribute name="JNDIName"> + java:/portal/cms/ACLInterceptor + </attribute> + <attribute name="CmsSessionFactory"> + java:/portal/cms/CMSSessionFactory + </attribute> + <attribute name="IdentitySessionFactory"> + java:/portal/IdentitySessionFactory + </attribute> + <attribute name="DefaultPolicy"> + <policy> + <!-- permissions on the root cms node --> + <criteria name="path" value="/"> + <permission name="cms" action="read"> + <role name="Anonymous" /> + </permission> + <permission name="cms" action="write"> + <role name="User" /> + </permission> + <permission name="cms" action="manage"> + <role name="Admin" /> + </permission> + </criteria> + <!-- permissions on the default cms node --> + <criteria name="path" value="/default"> + <permission name="cms" action="read"> + <role name="Anonymous" /> + </permission> + <permission name="cms" action="write"> + <role name="User" /> + </permission> + <permission name="cms" action="manage"> + <role name="Admin" /> + </permission> + </criteria> + <!-- permissions on the private/protected node --> + <criteria name="path" value="/default/private"> + <permission name="cms" action="manage"> + <role name="Admin" /> + </permission> + </criteria> + </policy> + </attribute> + <depends optional-attribute-name="AuthorizationManager" + proxy-type="attribute"> + portal:service=AuthorizationManager,type=cms + </depends> + <depends>portal:service=Hibernate,type=CMS</depends> + <depends> + portal:service=Module,type=IdentityServiceController + </depends> +</mbean> + +<!-- Approval Workflow Interceptor --> +<mbean + code="org.jboss.portal.cms.impl.interceptors.ApprovalWorkflowInterceptor" + name="portal:service=Interceptor,type=Cms,name=ApprovalWorkflow" + xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <xmbean /> + <attribute name="JNDIName"> + java:/portal/cms/ApprovalWorkflowInterceptor + </attribute> + <depends>portal:service=Hibernate,type=CMS</depends> +</mbean> + +<!-- CMS Interceptor Registration --> +<mbean + code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory" + name="portal:service=InterceptorStackFactory,type=Cms" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <xmbean /> + <depends-list optional-attribute-name="InterceptorNames"> + <depends-list-element> + portal:service=Interceptor,type=Cms,name=ACL + </depends-list-element> + <depends-list-element> + portal:service=Interceptor,type=Cms,name=ApprovalWorkflow + </depends-list-element> + </depends-list> +</mbean> ]]> </programlisting> The first two mbeans define the interceptors and the third mbean, define which interceptors to add to @@ -428,100 +440,115 @@ <para> If you create your own interceptor <literal>org.example.myCMSInterceptor</literal>, the service descriptor file will look like: <programlisting><![CDATA[ - <mbean - code="org.example.myCMSInterceptor" - name="portal:service=Interceptor,type=Cms,name=MyName" - xmbean-dd="" - xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean"> - <xmbean/> - </mbean> - - <!-- ACL Security Interceptor --> - <mbean - code="org.jboss.portal.cms.impl.interceptors.ACLInterceptor" - name="portal:service=Interceptor,type=Cms,name=ACL" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> - <xmbean/> - <attribute name="JNDIName">java:/portal/cms/ACLInterceptor</attribute> - <attribute name="CmsSessionFactory">java:/portal/cms/CMSSessionFactory</attribute> - <attribute name="IdentitySessionFactory">java:/portal/IdentitySessionFactory</attribute> - <attribute name="DefaultPolicy"> - <policy> - <!-- permissions on the root cms node --> - <criteria name="path" value="/"> - <permission name="cms" action="read"> - <role name="Anonymous"/> - </permission> - <permission name="cms" action="write"> - <role name="User"/> - </permission> - <permission name="cms" action="manage"> - <role name="Admin"/> - </permission> - </criteria> - <!-- permissions on the default cms node --> - <criteria name="path" value="/default"> - <permission name="cms" action="read"> - <role name="Anonymous"/> - </permission> - <permission name="cms" action="write"> - <role name="User"/> - </permission> - <permission name="cms" action="manage"> - <role name="Admin"/> - </permission> - </criteria> - <!-- permissions on the private/protected node --> - <criteria name="path" value="/default/private"> - <permission name="cms" action="manage"> - <role name="Admin"/> - </permission> - </criteria> - </policy> - </attribute> - <depends optional-attribute-name="AuthorizationManager" proxy-type="attribute"> - portal:service=AuthorizationManager,type=cms - </depends> - <depends>portal:service=Hibernate,type=CMS</depends> - <depends>portal:service=Module,type=IdentityServiceController</depends> - </mbean> - - <!-- Approval Workflow Interceptor --> - <mbean - code="org.jboss.portal.cms.impl.interceptors.ApprovalWorkflowInterceptor" - name="portal:service=Interceptor,type=Cms,name=ApprovalWorkflow" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> - <xmbean/> - <attribute name="JNDIName">java:/portal/cms/ApprovalWorkflowInterceptor</attribute> - <depends>portal:service=Hibernate,type=CMS</depends> - </mbean> - <mbean - code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory" - name="portal:service=InterceptorStackFactory,type=Cms" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> - <xmbean/> - <depends-list optional-attribute-name="InterceptorNames"> - <depends-list-element>portal:service=Interceptor,type=Cms,name=ACL</depends-list-element> - <depends-list-element>portal:service=Interceptor,type=Cms,name=ApprovalWorkflow</depends-list-element> - </depends-list> - </mbean> - - <!-- CMS Interceptor Registration --> - <mbean - code="org.jboss.portal.server.impl.invocation.JBossInterceptorStack" - name="portal:service=InterceptorStack,type=Cms" - xmbean-dd="" - xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean"> - <xmbean/> - <depends-list optional-attribute-name="InterceptorNames"> - <depends-list-element>portal:service=Interceptor,type=Cms,name=ACL</depends-list-element> - <depends-list-element>portal:service=Interceptor,type=Cms,name=ApprovalWorkflow</depends-list-element> - <depends-list-element>portal:service=Interceptor,type=Cms,name=MyName</depends-list-element> - </depends-list> - </mbean> + <mbean code="org.example.myCMSInterceptor" + name="portal:service=Interceptor,type=Cms,name=MyName" xmbean-dd="" + xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean"> + <xmbean /> +</mbean> + +<!-- ACL Security Interceptor --> +<mbean code="org.jboss.portal.cms.impl.interceptors.ACLInterceptor" + name="portal:service=Interceptor,type=Cms,name=ACL" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <xmbean /> + <attribute name="JNDIName"> + java:/portal/cms/ACLInterceptor + </attribute> + <attribute name="CmsSessionFactory"> + java:/portal/cms/CMSSessionFactory + </attribute> + <attribute name="IdentitySessionFactory"> + java:/portal/IdentitySessionFactory + </attribute> + <attribute name="DefaultPolicy"> + <policy> + <!-- permissions on the root cms node --> + <criteria name="path" value="/"> + <permission name="cms" action="read"> + <role name="Anonymous" /> + </permission> + <permission name="cms" action="write"> + <role name="User" /> + </permission> + <permission name="cms" action="manage"> + <role name="Admin" /> + </permission> + </criteria> + <!-- permissions on the default cms node --> + <criteria name="path" value="/default"> + <permission name="cms" action="read"> + <role name="Anonymous" /> + </permission> + <permission name="cms" action="write"> + <role name="User" /> + </permission> + <permission name="cms" action="manage"> + <role name="Admin" /> + </permission> + </criteria> + <!-- permissions on the private/protected node --> + <criteria name="path" value="/default/private"> + <permission name="cms" action="manage"> + <role name="Admin" /> + </permission> + </criteria> + </policy> + </attribute> + <depends optional-attribute-name="AuthorizationManager" + proxy-type="attribute"> + portal:service=AuthorizationManager,type=cms + </depends> + <depends>portal:service=Hibernate,type=CMS</depends> + <depends> + portal:service=Module,type=IdentityServiceController + </depends> +</mbean> + +<!-- Approval Workflow Interceptor --> +<mbean + code="org.jboss.portal.cms.impl.interceptors.ApprovalWorkflowInterceptor" + name="portal:service=Interceptor,type=Cms,name=ApprovalWorkflow" + xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <xmbean /> + <attribute name="JNDIName"> + java:/portal/cms/ApprovalWorkflowInterceptor + </attribute> + <depends>portal:service=Hibernate,type=CMS</depends> +</mbean> +<mbean + code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory" + name="portal:service=InterceptorStackFactory,type=Cms" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <xmbean /> + <depends-list optional-attribute-name="InterceptorNames"> + <depends-list-element> + portal:service=Interceptor,type=Cms,name=ACL + </depends-list-element> + <depends-list-element> + portal:service=Interceptor,type=Cms,name=ApprovalWorkflow + </depends-list-element> + </depends-list> +</mbean> + +<!-- CMS Interceptor Registration --> +<mbean + code="org.jboss.portal.server.impl.invocation.JBossInterceptorStack" + name="portal:service=InterceptorStack,type=Cms" xmbean-dd="" + xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean"> + <xmbean /> + <depends-list optional-attribute-name="InterceptorNames"> + <depends-list-element> + portal:service=Interceptor,type=Cms,name=ACL + </depends-list-element> + <depends-list-element> + portal:service=Interceptor,type=Cms,name=ApprovalWorkflow + </depends-list-element> + <depends-list-element> + portal:service=Interceptor,type=Cms,name=MyName + </depends-list-element> + </depends-list> +</mbean> ]]></programlisting> </para> <note> Modified: docs/tags/JBoss_Portal_2_6_0/userGuide/en/images/admincms/actions_menu.gif =================================================================== (Binary files differ) Modified: docs/tags/JBoss_Portal_2_6_0/userGuide/en/images/admincms/cms_adminpage.gif =================================================================== (Binary files differ) Modified: docs/tags/JBoss_Portal_2_6_0/userGuide/en/images/admincms/createdirectory.gif =================================================================== (Binary files differ) Modified: docs/tags/JBoss_Portal_2_6_0/userGuide/en/images/admincms/createhtml.gif =================================================================== (Binary files differ) Modified: docs/tags/JBoss_Portal_2_6_0/userGuide/en/images/admincms/editfile.gif =================================================================== (Binary files differ) Modified: docs/tags/JBoss_Portal_2_6_0/userGuide/en/images/admincms/fileproperties.gif =================================================================== (Binary files differ) Modified: docs/tags/JBoss_Portal_2_6_0/userGuide/en/images/admincms/resourcecopy.gif =================================================================== (Binary files differ) Modified: docs/tags/JBoss_Portal_2_6_0/userGuide/en/images/admincms/resourcedelete.gif =================================================================== (Binary files differ) Modified: docs/tags/JBoss_Portal_2_6_0/userGuide/en/images/admincms/resourcemove.gif =================================================================== (Binary files differ) Modified: docs/tags/JBoss_Portal_2_6_0/userGuide/en/images/admincms/resourceupload.gif =================================================================== (Binary files differ) Modified: docs/tags/JBoss_Portal_2_6_0/userGuide/en/images/admincms/resourceuploadarchive.gif =================================================================== (Binary files differ) Modified: docs/tags/JBoss_Portal_2_6_0/userGuide/en/images/admincms/ss_exportarchive.gif =================================================================== (Binary files differ) Modified: docs/tags/JBoss_Portal_2_6_0/userGuide/en/images/admincms/ss_viewfile.gif =================================================================== (Binary files differ) Modified: docs/tags/JBoss_Portal_2_6_0/userGuide/en/modules/admincmsPortlet.xml =================================================================== --- docs/tags/JBoss_Portal_2_6_0/userGuide/en/modules/admincmsPortlet.xml 2007-06-27 16:30:10 UTC (rev 7585) +++ docs/tags/JBoss_Portal_2_6_0/userGuide/en/modules/admincmsPortlet.xml 2007-06-27 16:35:00 UTC (rev 7586) @@ -26,79 +26,13 @@ <sect1> <title>Actions</title> <para>This section describes common actions an administrator can perform from within the AdminCMS Portlet. All - actions are available using the flyout menu. + actions are available using the flyout menu. Note that the Pending Items action is only available if the + workflow mechanism has been activated. <mediaobject> <imageobject> <imagedata fileref="images/admincms/actions_menu.gif" format="gif" align="center" valign="middle"/> </imageobject> </mediaobject> - <itemizedlist> - <listitem> - <para> - <xref linkend="viewdir"/> - </para> - </listitem> - <listitem> - <para> - <xref linkend="viewfileprops"/> - </para> - </listitem> - <listitem> - <para> - <xref linkend="copy"/> - </para> - </listitem> - <listitem> - <para> - <xref linkend="move"/> - </para> - </listitem> - <listitem> - <para> - <xref linkend="delete"/> - </para> - </listitem> - <listitem> - <para> - <xref linkend="createdir"/> - </para> - </listitem> - <listitem> - <para> - <xref linkend="createtext"/> - </para> - </listitem> - <listitem> - <para> - <xref linkend="uploadfile"/> - </para> - </listitem> - <listitem> - <para> - <xref linkend="uploadarchive"/> - </para> - </listitem> - <listitem> - <para> - <xref linkend="exportarchive"/> - </para> - </listitem> - <listitem> - <para> - <xref linkend="edittext"/> - </para> - </listitem> - <listitem> - <para> - <xref linkend="secure"/> - </para> - </listitem> - <listitem> - <para> - <xref linkend="workflow"/> - </para> - </listitem> - </itemizedlist> </para> <sect2 id="viewdir"> <title>Viewing Directories</title> @@ -300,7 +234,7 @@ <para> <mediaobject> <imageobject> - <imagedata fileref="images/admincms/ss_editfile.gif" format="gif" align="center" valign="middle"/> + <imagedata fileref="images/admincms/fileproperties.gif" format="gif" align="center" valign="middle"/> </imageobject> </mediaobject> Clicking on the "text/html"link, displays the edit file dialog window with the embedded WYSIWYG editor Modified: docs/tags/JBoss_Portal_2_6_0/userGuide/en/modules/user_role.xml =================================================================== --- docs/tags/JBoss_Portal_2_6_0/userGuide/en/modules/user_role.xml 2007-06-27 16:30:10 UTC (rev 7585) +++ docs/tags/JBoss_Portal_2_6_0/userGuide/en/modules/user_role.xml 2007-06-27 16:35:00 UTC (rev 7586) @@ -36,29 +36,6 @@ <imagedata fileref="images/role/user_ss.gif" format="gif" align="center" valign="middle"/> </imageobject> </mediaobject> - <orderedlist> - <para>Managing users using the UserPortlet consists of:</para> - <listitem> - <para> - <xref linkend="searchingusers"/> - </para> - </listitem> - <listitem> - <para> - <xref linkend="updatingusers"/> - </para> - </listitem> - <listitem> - <para> - <xref linkend="updatinguserroles"/> - </para> - </listitem> - <listitem> - <para> - <xref linkend="creatingusers"/> - </para> - </listitem> - </orderedlist> </para> <sect3 id="searchingusers"> <title>Searching for Users</title> @@ -127,31 +104,6 @@ </sect2> <sect2> <title>Actions</title> - <para> - <orderedlist> - <para>Managing roles using the RolePortlet consists of:</para> - <listitem> - <para> - <xref linkend="createrole"/> - </para> - </listitem> - <listitem> - <para> - <xref linkend="editrole"/> - </para> - </listitem> - <listitem> - <para> - <xref linkend="editrolemembers"/> - </para> - </listitem> - <listitem> - <para> - <xref linkend="deleteroles"/> - </para> - </listitem> - </orderedlist> - </para> <sect3 id="createrole"> <title>Creating Roles</title> <para>