January 2010 - gatein-commits - Jboss List Archives

gatein SVN: r1171 - portal/trunk/docs/user-guide/en/modules/portal.

by do-not-reply＠jboss.org

Author: smumford Date: 2010-01-06 02:05:58 -0500 (Wed, 06 Jan 2010) New Revision: 1171 Modified: portal/trunk/docs/user-guide/en/modules/portal/Manage_Page_Navigation.xml Log: further edits Modified: portal/trunk/docs/user-guide/en/modules/portal/Manage_Page_Navigation.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/portal/Manage_Page_Navigation.xml 2010-01-06 07:05:20 UTC (rev 1170) +++ portal/trunk/docs/user-guide/en/modules/portal/Manage_Page_Navigation.xml 2010-01-06 07:05:58 UTC (rev 1171) @@ -23,7 +23,7 @@ --><title>Manage Page Navigation</title> <para> - In order to understand clearly about what the navigation is and navigation types that GateIn Portal supports, please refer the <xref linkend="sect-User_Guide-Navigation" /> page. + Navigation types that &PRODUCT; supports, please refer the <xref linkend="sect-User_Guide-Navigation" /> page. </para> <!-- <section id="User_Guide-Manage_Page_Navigation-Portals_page_navigation">

14 years, 11 months

1
0
0 / 0

gatein SVN: r1170 - in portal/trunk/docs/user-guide/en/modules: terms and 1 other directory.

by do-not-reply＠jboss.org

Author: smumford Date: 2010-01-06 02:05:20 -0500 (Wed, 06 Jan 2010) New Revision: 1170 Modified: portal/trunk/docs/user-guide/en/modules/portal/Change_Portal_Skins.xml portal/trunk/docs/user-guide/en/modules/portal/Manage_Page_Navigation.xml portal/trunk/docs/user-guide/en/modules/portal/Manage_Permission.xml portal/trunk/docs/user-guide/en/modules/terms/Navigation_concept.xml portal/trunk/docs/user-guide/en/modules/terms/Permission_levels.xml Log: further edits Modified: portal/trunk/docs/user-guide/en/modules/portal/Change_Portal_Skins.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/portal/Change_Portal_Skins.xml 2010-01-05 22:40:22 UTC (rev 1169) +++ portal/trunk/docs/user-guide/en/modules/portal/Change_Portal_Skins.xml 2010-01-06 07:05:20 UTC (rev 1170) @@ -23,78 +23,81 @@ --><title>Change Portal Skins</title> <para> - GateIn Portal skins are graphic styles that help users display an attractive user interface. Each skin has its own characteristics with different backgrounds, icons, etc. In order to be user-friendly and flexible in use, users are allowed to change their skins without having edit rights on the portal. + Skins are graphic styles that display an attractive user interface. Each skin has its own characteristics with different backgrounds, icons, and other visual elements. In order to be user-friendly and flexible, users are allowed to change the skin they use on the portal without having edit rights. </para> <para> - skin switch that takes only effect on the user's current session until he signs out. You can change the skin permanently or temporarily. + Skins can be changed temporarily (and are reset at log-out) or permanently. </para> + <variablelist> + <varlistentry> + <term>Change the skin temporarily</term> + <listitem> + <procedure> + <step> + <para> + Go to <emphasis role="bold">GateIn Start</emphasis> and click on <emphasis role="bold">Change Skin</emphasis>. + </para> + </step> + <step> + <para> + Select a new skin from the list on the left of the <emphasis role="bold">Skin Settings</emphasis> box. When you highlight a skin in the list a preview will appear in the pane on the right of the box. + </para> + <mediaobject> + <imageobject> + <imagedata fileref="images/SkinSet1.png" format="PNG" width="444" /> + </imageobject> + </mediaobject> + </step> + <step> + <para> + If you are happy with your choice, click the <emphasis role="bold">Apply</emphasis> button to have it applied to the portal. + </para> + <para> + Or, if you decide not to change the skin, click <emphasis role="bold">Cancel</emphasis> to close the dialogue box without making any changes to the portal. + </para> + </step> + </procedure> + </listitem> + </varlistentry> + <varlistentry> + <term>Change the skin permanently</term> + <listitem> + <procedure> + <step> + <para> + Go to <emphasis role="bold">GateIn Start</emphasis> -> <emphasis role="bold">Administration</emphasis> -> <emphasis role="bold">Advanced</emphasis> -> <emphasis role="bold">Edit Current portal</emphasis> + </para> + </step> + <step> + <para> + Click the edit icon to edit portal properties. + </para> + </step> + <step> + <para> + In the <emphasis role="bold">Portal Setting</emphasis> tab: select one skin type in the <emphasis role="bold">Skin</emphasis> list field to change and display a skin. + </para> + <mediaobject> + <imageobject> + <imagedata fileref="images/Skin1.png" format="PNG" width="444" /> + </imageobject> + </mediaobject> + </step> + <step> + <para> + Click <emphasis role="bold">Save</emphasis> and <emphasis role="bold">Finish</emphasis> icon so that the modification can take effect. + </para> + </step> + </procedure> + </listitem> + </varlistentry> + </variablelist> + <warning> + <para> + The <emphasis role="bold">Administration</emphasis> item referred to in the above procedure is not present in GateIn 3.0 Beta 3 + </para> + </warning> - - - <procedure> - <step> - <para> - Go to <emphasis role="bold">GateIn</emphasis> on the Toolbar > click <emphasis role="bold">Change Skin</emphasis>. The <emphasis role="bold">Skin Setting</emphasis> form is displayed with a list of all supported skins. The left pane contains the skin list and the right pane is used to display the template of the selected skin. - </para> - </step> - <step> - <para> - Select a skin by clicking on the its name. - </para> - </step> - <step> - <para> - Click the <emphasis role="bold">Apply</emphasis> button and wait for few seconds to take effect. - </para> - <mediaobject> - <imageobject> - <imagedata fileref="images/SkinSet1.png" format="PNG" width="444" /> - </imageobject> - </mediaobject> - </step> - </procedure> - </section> Modified: portal/trunk/docs/user-guide/en/modules/portal/Manage_Page_Navigation.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/portal/Manage_Page_Navigation.xml 2010-01-05 22:40:22 UTC (rev 1169) +++ portal/trunk/docs/user-guide/en/modules/portal/Manage_Page_Navigation.xml 2010-01-06 07:05:20 UTC (rev 1170) @@ -26,12 +26,12 @@ In order to understand clearly about what the navigation is and navigation types that GateIn Portal supports, please refer the <xref linkend="sect-User_Guide-Navigation" /> page. </para> - <section id="User_Guide-Manage_Page_Navigation-Portals_page_navigation"> + <section id="User_Guide-Manage_Page_Navigation-Creating_a_portals_navigation"> <title>Creating a portal's navigation</title> @@ -42,12 +42,12 @@ <section id="User_Guide-Manage_Page_Navigation-Editing_a_portals_navigation"> <title>Editing a portal's navigation</title> - <para> - Only users who have the edit right on a portal can perform this action. - </para> - <para> - Follows these below guides to edit a portal's navigation: - </para> + <note> + <title>Edit permissions</title> + <para> + Only users who have the edit right on a portal can edit entries in navigation menus. + </para> + </note> <procedure> <step> <para> Modified: portal/trunk/docs/user-guide/en/modules/portal/Manage_Permission.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/portal/Manage_Permission.xml 2010-01-05 22:40:22 UTC (rev 1169) +++ portal/trunk/docs/user-guide/en/modules/portal/Manage_Permission.xml 2010-01-06 07:05:20 UTC (rev 1170) @@ -23,40 +23,59 @@ --><title>Manage Permissions</title> <para> - Permissions play an important part in accessing and performing actions in the Portal. Depending on permissions assigned by an administrator, users can either access or edit portals, pages and portlets. GateIn Portal have applied several permission levels: + Permissions play an important part in accessing and performing actions in the Portal. Depending on permissions assigned by an administrator, users can either access or edit portals, pages and portlets. &PRODUCT; has several permission levels: </para> - <itemizedlist> - <listitem> - <para> - <emphasis role="bold">Portal</emphasis> : The portal includes all pages, pages only can be accessed if the user has also access the Portal. - </para> - </listitem> - <listitem> - <para> - <emphasis role="bold">Page</emphasis> : You can restrict the access to single pages. Users can change page information (properties, layout) if they have the edit right. - </para> - </listitem> - <listitem> - <para> - <emphasis role="bold">Portlet</emphasis> : When users create a page, they need to drag and drop portlets into a page to create the page content. Some portlets are only used for administrators, some are used for individual needs of a group thus you have to set the appropriate access permission. - </para> - </listitem> - </itemizedlist> <para> + Details about permission types and levels can be found in <xref linkend="sect-User_Guide-Permissions"/> + </para> + + + <section id="sect-User_Guide-Manage_Permission-Set_the_Access_Permission_on_a_Portal"> - <title>Set the Access Permission on a Portal</title> + <title>Set the Access permission on a portal</title> <para> - You have to set permission for new portals as well as existing portals: + Administrators have to set permissions for new portals as well as existing portals: </para> <variablelist> <varlistentry> - <term>New Portals</term> + <term>New portals</term> <listitem> <para> On the Toolbar select <emphasis role="bold">Site</emphasis> then click on the <emphasis role="bold">Add New Portal</emphasis> button, select the <emphasis role="bold">Permission Setting</emphasis> tab then the <emphasis role="bold">Access Permission Setting</emphasis> sub tab. </para> +<warning> +<para> + The <emphasis role="bold">Add New Portal</emphasis> button mentioned in the above paragraph is not present in GateIn 3.0 Beta 3 +</para> +</warning> <mediaobject> <imageobject> <imagedata fileref="images/Access2.6.png" format="PNG" width="444" /> @@ -65,10 +84,10 @@ </listitem> </varlistentry> <varlistentry> - <term>Existing Portals</term> + <term>Existing portals</term> <listitem> <para> - On the Toolbar click <emphasis role="bold">Site Editor</emphasis> then <emphasis role="bold">Edit Page</emphasis> . Click on <emphasis role="bold">View Page properties</emphasis> then select the <emphasis role="bold">Permission Setting</emphasis> tab. + On the Toolbar click <emphasis role="bold">Site Editor</emphasis> then <emphasis role="bold">Edit Page</emphasis> . Click on <emphasis role="bold">View Page Properties</emphasis> button located in the <emphasis role="bold">Page Editor</emphasis> applet then select the <emphasis role="bold">Permission Setting</emphasis> tab. </para> <mediaobject> <imageobject> @@ -79,23 +98,31 @@ </listitem> </varlistentry> </variablelist> + <note> + <title>Public access</title> <para> - If you do not want everyone to access the Portal, do not select the <emphasis role="bold">Make it public</emphasis> check box and you have to select group by group. Do as follows: + If you do not want your Portal to be publicly accessible, ensure the <emphasis role="bold">Make it public</emphasis> check box is clear. + </para> + </note> + + <para> + If the <emphasis role="bold">Make it public</emphasis> check-box is clear, you will need to add permissions by member group. </para> + <procedure> <step> <para> - Click the <emphasis role="bold">Add Permission</emphasis> button. + Click the <emphasis role="bold">Add Permissions</emphasis> sub-tag on the <emphasis role="bold">Permission Setting</emphasis> tab. </para> </step> <step> <para> - Select the group you want to add on the left and then select a membership type on the right. In the membership types list, means allowing any membership type. + Make the appropriate selections from the <emphasis>group</emphasis> and <emphasis>membership</emphasis> options presented in the <emphasis role="bold">Permission Selector</emphasis> dialogue box. </para> </step> <step> <para> - After selecting a membership type, the selected permission is displayed in the access permission list. Each time, you only can select one group with one membership type. If you want to add more, click <emphasis role="bold">Add Permission</emphasis> and select again. + After selecting a membership type, the selected permission is displayed in the access permission list. You can only select one group with one membership type at a time. If you want to add more, click <emphasis role="bold">Add Permission</emphasis> and select again. Repeat the process for as many permission settings as you require. <mediaobject> <imageobject> <imagedata fileref="images/PermissionSetting2.png" format="PNG" width="444" /> @@ -109,183 +136,263 @@ <section id="sect-User_Guide-Manage_Permission-Set_the_Edit_Permission_on_a_Portal"> <title>Set the Edit Permission on a Portal</title> <para> - Only users who are in the portal editor group can edit that portal. Access rights can be given to several groups but edit rights can only be given to a group with a membership type (or every membership type by select ). To assign an edit permission to a user, you must add him to the editor group of the respective portal. + Only users who are in the portal editor group can edit that portal. Access rights can be given to several groups but edit rights can only be given to a group with a membership type. To assign an edit permission to a user, you must add him to the editor group of the respective portal. </para> + <para> + Use one of these following paths to open the permission setting function of the portal: + </para> + <procedure> + <step> + <para> + On the Toolbar select <emphasis role="bold">Site</emphasis> and click on <emphasis role="bold">Add New Portal</emphasis>. + </para> + </step> + <step> + <para> + <emphasis role="bold">Permission Setting</emphasis> tab and the <emphasis role="bold">Edit Permission Setting</emphasis> sub-tab. + </para> + </step> + </procedure> +<warning> +<para> + The <emphasis role="bold">Add New Portal</emphasis> button mentioned in the above procedure is not present in GateIn 3.0 Beta 3 +</para> +</warning> + <para> + Or; + </para> <procedure> <step> <para> - Use one of these following paths to assign permissions on a portal: + On the Toolbar click <emphasis role="bold">Site Editor</emphasis> then <emphasis role="bold">Edit Page</emphasis>. + </para> + </step> + <step> + <para> + Click on <emphasis role="bold">View Page Properties</emphasis> button located in the <emphasis role="bold">Page Editor</emphasis> applet then select the <emphasis role="bold">Permission Setting</emphasis> tab. + </para> + </step> + <step> + <para> + Go to the <emphasis role="bold">Edit Permission Setting</emphasis> sub tab. + </para> + </step> + </procedure> + <mediaobject> + <imageobject> + <imagedata fileref="images/Edit2.6.png" format="PNG" width="444" /> + </imageobject> + </mediaobject> + <para> + Once you have the <emphasis role="bold">Edit Permission Setting</emphasis> screen open, follow the steps below to set the edit permissions of the portal. + </para> + <procedure> + <step> + <para> + Click <emphasis role="bold">Select Permission</emphasis> to choose a group. + </para> + </step> + <step> + <para> + Select a group and a membership type from the left and right panes, respectively, of the <emphasis role="bold">Permission Selector</emphasis> window (select * if you want to assign all available membership types to the selected group). + </para> + </step> + <step> + <para> + Click on the <emphasis role="bold">Save</emphasis> button to accept. + <mediaobject> + <imageobject> + <imagedata fileref="images/PermissionSetting1.png" format="PNG" width="444" /> + </imageobject> + </mediaobject> + </para> + </step> + </procedure> + </section> + + <section id="sect-User_Guide-Manage_Permission-Initialize_a_Permission_on_a_Page"> + <title>Initialize a Permission on a Page</title> + <para> + In some cases, permissions on a page are initialized and users who have the edit permission can change the page. + </para> + <variablelist> + <varlistentry> + <term>User</term> + <listitem> + <para> + If the owner type of a page is "user", you don't have to set permissions, no one except the creator has access and edit permissions. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term>Group</term> + <listitem> + <para> + If the Owner type of a page is "group", initial permissions on page are: + </para> <itemizedlist> <listitem> <para> - On the Toolbar select <emphasis role="bold">Site</emphasis> -> <emphasis role="bold">Add New Portal</emphasis> -> <emphasis role="bold">Permission Setting</emphasis> tab --> <emphasis role="bold">Edit Permission Setting</emphasis> sub tab. + Access permission: everyone in that group. </para> </listitem> + <listitem> + <para> + Edit permission: the manager of that group. + </para> + </listitem> </itemizedlist> + </listitem> + </varlistentry> + <varlistentry> + <term>Portal</term> + <listitem> + <para> + If the Owner type of a page is portal, initial permissions are: + </para> <itemizedlist> <listitem> <para> - On the Toolbar click <emphasis role="bold">Site Editor</emphasis> -> <emphasis role="bold">Edit Page</emphasis> -> <emphasis role="bold">View Page properties</emphasis> -> <emphasis role="bold">Permission Setting</emphasis> tab --> <emphasis role="bold">Edit Permission Setting</emphasis> sub tab. + Access permission: users who can access that portal. </para> </listitem> + <listitem> + <para> + Edit permission: users who can edit that portal. + </para> + </listitem> </itemizedlist> - <mediaobject> - <imageobject> - <imagedata fileref="images/Edit2.6.png" format="PNG" width="444" /> - </imageobject> - </mediaobject> + </listitem> + </varlistentry> + </variablelist> + </section> + + <section id="sect-User_Guide-Manage_Permission-Set_the_Access_Permission_on_a_Page"> + <title>Set the Access Permission on a Page</title> + <para> + These following process will help you quickly set access permission for a page: + </para> + <procedure> + <step> + <para> + Select <emphasis role="bold">Site Editor</emphasis> on the Toolbar and click the <emphasis role="bold">Edit Page</emphasis> entry. </para> </step> <step> <para> - Click <emphasis role="bold">Select Permission</emphasis> to choose a group. + Click on the <emphasis role="bold">View Page Properties</emphasis> button in the <emphasis role="bold">Page Editor</emphasis> applet. </para> </step> <step> <para> - Select a group and a membership type (select if you want to assign all membership types for the selected group). After selecting the membership from the right, the selected information is displayed. + Click the <emphasis role="bold">Permission Setting</emphasis> tab. You will see the <emphasis role="bold">Access Permission Setting</emphasis> sub tab. </para> </step> + </procedure> + + <para> + To be able to access a page users have to be in one of the groups that have access permission to that page. There may be several groups that have access rights to a page. A list of the permissions for that page will be shown (provided the <emphasis role="bold">Make it public</emphasis> check-box has not been used). + </para> + <procedure> <step> <para> - Click on the <emphasis role="bold">Save</emphasis> button to accept. - <mediaobject> - <imageobject> - <imagedata fileref="images/PermissionSetting1.png" format="PNG" width="444" /> - </imageobject> - </mediaobject> + Click the <emphasis role="bold">Add Permission</emphasis> button </para> </step> + <step> + <para> + Select a group you want to add on the left and then select a membership type on the right. + </para> + </step> + <step> + <para> + After selecting a membership type, the selected permission is displayed in the access right list. Each time, you can only select one group with one membership type. If you want to add more, click the <emphasis role="bold">Add Permission</emphasis> button and select again. + </para> + </step> </procedure> + <para> + If you want to allow any visitors to access the page tick the <emphasis role="bold">Make it public</emphasis> check-box. Any permission set for that page will be relaxed and the permissions list will disappear. When you click <emphasis role="bold">Save</emphasis> the page will be made accessible to the public. + </para> + </section> - <section id="sect-User_Guide-Manage_Permission-Initialize_a_Permission_on_a_Page"> - <title>Initialize a Permission on a Page</title> + <section id="sect-User_Guide-Manage_Permission-Set_the_Edit_Permission_on_a_Page"> + <title>Set the Edit Permission on a Page</title> <para> - In some cases, permissions on a page are initialized and users who have the edit permission can change the page. + Only users who are in the page's editor group can edit it. The access right can be set for several groups but the <emphasis>edit</emphasis> right only can be set for one group. To give a user the edit permission, you must add them to the editors group of that page. </para> - <itemizedlist> - <listitem> + <para> + This can be accessed on of two ways: + </para> + <procedure> + <step> <para> - If the owner type of a page is "user", you don't have to set permissions, no one except the creator has access and edit permissions. + Select <emphasis role="bold">Site Editor</emphasis> on the Toolbar and click the <emphasis role="bold">Edit Page</emphasis> entry. </para> - </listitem> - <listitem> + </step> + <step> <para> - If the Owner type of a page is "group", initial permissions on page are: + Select <emphasis role="bold">Site Editor</emphasis> on the Toolbar and click the <emphasis role="bold">Edit Page</emphasis> entry. </para> - </listitem> - <listitem> + </step> + <step> <para> - Access permission: everyone in that group. + Click on the <emphasis role="bold">View Page Properties</emphasis> button in the <emphasis role="bold">Page Editor</emphasis> applet. </para> - </listitem> - <listitem> + </step> + <step> <para> - Edit permission: the manager of that group. + Click the <emphasis role="bold">Permission Setting</emphasis> tab then the <emphasis role="bold">Edit Permission Setting</emphasis> sub tab. </para> - </listitem> - </itemizedlist> - <itemizedlist> - <listitem> + </step> + </procedure> + <para> + Or; + </para> + <procedure> + <step> <para> - If the Owner type of a page is portal, initial permissions are: + Select the <emphasis role="bold">Group</emphasis> navigation on the Toolbar, go to <emphasis role="bold">Administration</emphasis> and click on <emphasis role="bold">Page Management</emphasis>. </para> - </listitem> - <listitem> + </step> + <step> <para> - Access permission: users who can access that portal. - </para> - </listitem> - <listitem> + Locate the page you want to edit using the <emphasis role="bold">Page Id</emphasis> column then click the edit icon (next to the trash icon). You will be taken to the <emphasis role="bold">Page Editor</emphasis> applet. + </para> + </step> + <step> <para> - Edit permission: users who can edit that portal. + As, above, click on the <emphasis role="bold">Permission Setting</emphasis> tab then the <emphasis role="bold">Edit Permission Setting</emphasis> sub tab. </para> - </listitem> - </itemizedlist> - </section> - - <section id="sect-User_Guide-Manage_Permission-Set_the_Access_Permission_on_a_Page"> - <title>Set the Access Permission on a Page</title> + </step> + </procedure> <para> - When you have access permission on a specific page, you can access that page which other users can't access it because they are not given that permission. + You will see the <emphasis role="bold">Current Permission</emphasis> listed. </para> - <para> - These following path help you quickly set access permission for a page: - </para> - <para> - Select <emphasis role="bold">Site Editor</emphasis> on the Toolbar -> <emphasis role="bold">Edit Page</emphasis> -> <emphasis role="bold">View Page Properties</emphasis> tab -> <emphasis role="bold">Access Permission Setting (default)</emphasis> sub tab. - </para> - <para> - To be able to access a page (read the page content or take an action on the page), users have to be in one of the groups that have access permission to that page. There may be several groups that have access right to a page. - </para> - <para> - If you allow anyone to access the page tick on <emphasis role="bold">Make it public</emphasis> , otherwise, you have to select the groups one by one. - </para> <procedure> <step> <para> - Click the <emphasis role="bold">Add Permission</emphasis> button + Click the <emphasis role="bold">Select Permission</emphasis> button to set new or change another group. </para> </step> <step> <para> - Select a group you want to add on the left and then select a membership type on the right. In a membership types list, means allowing any membership type. + Select a group with a membership type (select * if you want all membership types in a selected group) </para> </step> <step> <para> - After selecting a membership type, the selected permission is displayed in the access right list. Each time, you can only select one group with one membership type. If you want to add more, click the <emphasis role="bold">Add Permission</emphasis> button and select again. + After selecting a specific membership from the right, the selected information is displayed. </para> </step> + <step> + <para> + Click the <emphasis role="bold">Save</emphasis> button to accept. + </para> + </step> </procedure> </section> - <section id="sect-User_Guide-Manage_Permission-Set_the_Edit_Permission_on_a_Page"> - <title>Set the Edit Permission on a Page</title> - <para> - Only users who are in the page's editor group can edit it. The access right can be set for several groups but the edit right only can be set for one single group. To give a user the edit permission, you must add him to the editors group of that page. - </para> - <procedure> - <step> - <para> - <itemizedlist> - <listitem> - <para> - Select <emphasis role="bold">Site Editor</emphasis> on the Toolbar -> <emphasis role="bold">Edit Page</emphasis> -> <emphasis role="bold">View Page Properties</emphasis> tab -> <emphasis role="bold">Edit Permission Setting</emphasis> sub tab. - </para> - </listitem> - <listitem> - <para> - Or, select <emphasis role="bold">Group</emphasis> on the Toolbar -> <emphasis role="bold">Administration</emphasis> -> <emphasis role="bold">Page Management</emphasis> -> <emphasis role="bold">Edit Page icon</emphasis> -> <emphasis role="bold">View Page Properties</emphasis> tab -> <emphasis role="bold">Edit Permission Setting</emphasis> sub tab. - </para> - </listitem> - </itemizedlist> - </para> - </step> - <step> - <para> - Click the <emphasis role="bold">Select Permission</emphasis> button to set new or change another group. - </para> - </step> - <step> - <para> - Select a group with a membership type (select if you want all membership types in a selected group) - </para> - </step> - <step> - <para> - After selecting a specific membership from the right, the selected information is displayed. - </para> - </step> - <step> - <para> - Click the <emphasis role="bold">Save</emphasis> button to accept. - </para> - </step> - </procedure> - </section> - <section id="sect-User_Guide-Manage_Permission-Set_the_Access_Permission_on_a_Portlet"> <title>Set the Access Permission on a Portlet</title> <para> @@ -294,7 +401,7 @@ <procedure> <step> <para> - Select <emphasis role="bold">Group</emphasis> --> <emphasis role="bold">Administration</emphasis> --> <emphasis role="bold">Application Registry</emphasis> on the navigation bar + Select <emphasis role="bold">Group</emphasis> from the Toolbar. Highlight the <emphasis role="bold">Administration</emphasis> entry and click on <emphasis role="bold">Application Registry</emphasis>. <mediaobject> <imageobject> <imagedata fileref="images/Application1.png" format="PNG" width="444" /> @@ -304,25 +411,25 @@ </step> <step> <para> - Select a category on the left pane that includes the portlet you want to set right. Then all portlets of the selected category are listed immediately and detail information of each portlet is displayed on the right pane. + Select a category on the left pane that includes the portlet you want to set rights for. Then all portlets of the selected category are listed immediately and detail information of each portlet is displayed on the right pane. </para> </step> <step> <para> To set permissions for a portlet: - <itemizedlist> - <listitem> + </para> + <procedure> + <step> <para> Click the <emphasis role="bold">Add Permission</emphasis> button to add access permissions to more groups . </para> - </listitem> - <listitem> + </step> + <step> <para> Or select the <emphasis role="bold">Make it public</emphasis> check box to allow everyone to access. </para> - </listitem> - </itemizedlist> - </para> + </step> + </procedure> </step> </procedure> </section> Modified: portal/trunk/docs/user-guide/en/modules/terms/Navigation_concept.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/terms/Navigation_concept.xml 2010-01-05 22:40:22 UTC (rev 1169) +++ portal/trunk/docs/user-guide/en/modules/terms/Navigation_concept.xml 2010-01-06 07:05:20 UTC (rev 1170) @@ -59,11 +59,14 @@ </para> <variablelist> <varlistentry> - <term>Site Editor</term> + <term>Site/Group Editor</term> <listitem> <para> - This navigation contains links to add a new page to the portal, to edit a page or to change the portal's layout. Administrators can use these links to manage the portal. + This navigation appears as either <emphasis role="bold">Site Editor</emphasis> or <emphasis role="bold">Group Editor</emphasis> depending on the administrator's location within the portal. When in areas of the portal displaying content, the navigation shows as <emphasis role="bold">Site Editor</emphasis> and in areas of the portal pertaining to users, the navigation shows as <emphasis role="bold">Group Editor</emphasis>. </para> + <para> + This navigation contains links to add a new pages to the portal, to edit a page or to change the portal's layout. Administrators can use these links to manage the portal. + </para> </listitem> </varlistentry> </variablelist> Modified: portal/trunk/docs/user-guide/en/modules/terms/Permission_levels.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/terms/Permission_levels.xml 2010-01-05 22:40:22 UTC (rev 1169) +++ portal/trunk/docs/user-guide/en/modules/terms/Permission_levels.xml 2010-01-06 07:05:20 UTC (rev 1170) @@ -26,7 +26,7 @@ Permission settings control what users can and cannot do within the portal and are set by portal administrators. </para> <para> - Permission <emphasis role="bold">types</emphasis> dictate <emphasis>what</emphasis> a user can do within the portal. There are two permission types used in &PRODUCT;: + Permission <emphasis role="bold">types</emphasis> dictate what a user can do within the portal. There are two permission types used in &PRODUCT;: </para> <variablelist>

14 years, 11 months

1
0
0 / 0

gatein SVN: r1169 - in components/wsrp/trunk/producer/src/main/java/org/gatein: registration/impl and 1 other directories.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2010-01-05 17:40:22 -0500 (Tue, 05 Jan 2010) New Revision: 1169 Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/registration/AbstractRegistrationPersistenceManager.java components/wsrp/trunk/producer/src/main/java/org/gatein/registration/RegistrationPersistenceManager.java components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/RegistrationPersistenceManagerImpl.java components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/RegistrationHandler.java Log: - Added RegistrationPersistenceManager.saveChangesTo method to be able to save changes that occurred in a Consumer. - Consumer is now set valid when we update the registration information and changes should be saved to persistent storage. Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/registration/AbstractRegistrationPersistenceManager.java =================================================================== --- components/wsrp/trunk/producer/src/main/java/org/gatein/registration/AbstractRegistrationPersistenceManager.java 2010-01-05 22:24:55 UTC (rev 1168) +++ components/wsrp/trunk/producer/src/main/java/org/gatein/registration/AbstractRegistrationPersistenceManager.java 2010-01-05 22:40:22 UTC (rev 1169) @@ -48,6 +48,18 @@ return consumer; } + public void saveChangesTo(Consumer consumer) + { + ParameterValidation.throwIllegalArgExceptionIfNull(consumer, "Consumer"); + + if (consumer.getPersistentKey() == null) + { + throw new IllegalArgumentException("Consumer " + consumer + " hasn't yet been persisted and thus cannot be updated."); + } + + internalSaveChangesTo(consumer); + } + public ConsumerGroup createConsumerGroup(String name) throws RegistrationException { ConsumerGroup group = getConsumerGroup(name); @@ -153,6 +165,8 @@ protected abstract ConsumerSPI internalCreateConsumer(String consumerId, String consumerName); + protected abstract ConsumerSPI internalSaveChangesTo(Consumer consumer); + protected abstract void internalAddConsumerGroup(ConsumerGroupSPI group); protected abstract ConsumerGroupSPI internalRemoveConsumerGroup(String name); Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/registration/RegistrationPersistenceManager.java =================================================================== --- components/wsrp/trunk/producer/src/main/java/org/gatein/registration/RegistrationPersistenceManager.java 2010-01-05 22:24:55 UTC (rev 1168) +++ components/wsrp/trunk/producer/src/main/java/org/gatein/registration/RegistrationPersistenceManager.java 2010-01-05 22:40:22 UTC (rev 1169) @@ -43,6 +43,13 @@ Consumer createConsumer(String consumerId, String consumerName) throws RegistrationException; /** + * Saves changes made to the specified consumer. + * + * @param consumer + */ + void saveChangesTo(Consumer consumer); + + /** * Retrieves the ConsumerGroup identified by the specified name. * * @param name the name of the group to be retrieved Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/RegistrationPersistenceManagerImpl.java =================================================================== --- components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/RegistrationPersistenceManagerImpl.java 2010-01-05 22:24:55 UTC (rev 1168) +++ components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/RegistrationPersistenceManagerImpl.java 2010-01-05 22:40:22 UTC (rev 1169) @@ -162,4 +162,10 @@ { return (ConsumerSPI)getConsumerById(consumerId); } + + @Override + protected ConsumerSPI internalSaveChangesTo(Consumer consumer) + { + return (ConsumerSPI)consumer; // nothing to do here, left up to subclasses to implement update in persistent store + } } Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/RegistrationHandler.java =================================================================== --- components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/RegistrationHandler.java 2010-01-05 22:24:55 UTC (rev 1168) +++ components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/RegistrationHandler.java 2010-01-05 22:40:22 UTC (rev 1169) @@ -113,6 +113,7 @@ registration.setStatus(RegistrationStatus.VALID); Consumer consumer = registration.getConsumer(); consumer.setConsumerAgent(registrationData.getConsumerAgent()); + consumer.setStatus(RegistrationStatus.VALID); ConsumerCapabilities capabilities = consumer.getCapabilities(); List<String> modeStrings = registrationData.getConsumerModes(); @@ -142,6 +143,8 @@ capabilities.setSupportedUserProfileData(registrationData.getCustomUserProfileData()); capabilities.setSupportedUserScopes(registrationData.getConsumerUserScopes()); capabilities.setSupportsGetMethod(registrationData.isMethodGetSupported()); + + producer.getRegistrationManager().getPersistenceManager().saveChangesTo(consumer); } public ReturnAny deregister(RegistrationContext deregister) throws OperationFailed, InvalidRegistration @@ -351,7 +354,7 @@ { List<Property> regProperties = registrationData.getRegistrationProperties(); Map<QName, Object> properties; - if (regProperties != null) + if (regProperties != null && !regProperties.isEmpty()) { properties = new HashMap<QName, Object>(regProperties.size()); for (Property property : regProperties)

14 years, 11 months

1
0
0 / 0

gatein SVN: r1168 - components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2010-01-05 17:24:55 -0500 (Tue, 05 Jan 2010) New Revision: 1168 Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/ConsumerImpl.java Log: - Wasn't properly checking for proper identity value. Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/ConsumerImpl.java =================================================================== --- components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/ConsumerImpl.java 2010-01-05 22:23:20 UTC (rev 1167) +++ components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/ConsumerImpl.java 2010-01-05 22:24:55 UTC (rev 1168) @@ -64,7 +64,7 @@ ConsumerImpl(String identity, String name) { ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(name, "name", "Consumer"); - ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(name, "identity", "Consumer"); + ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(identity, "identity", "Consumer"); this.name = name; this.identity = identity;

14 years, 11 months

1
0
0 / 0

gatein SVN: r1167 - in components/wsrp/trunk/consumer/src: main/java/org/gatein/wsrp/services and 1 other directories.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2010-01-05 17:23:20 -0500 (Tue, 05 Jan 2010) New Revision: 1167 Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/EndpointConfigurationInfo.java components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/SOAPServiceFactory.java components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/ServiceFactory.java components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/ServiceWrapper.java components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/support/BehaviorBackedServiceFactory.java Log: - Added possibility to change the timeout for WS operations on a per ServiceFactory basis. Will allow setting this in the admin GUI. Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/EndpointConfigurationInfo.java =================================================================== --- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/EndpointConfigurationInfo.java 2010-01-05 19:28:49 UTC (rev 1166) +++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/EndpointConfigurationInfo.java 2010-01-05 22:23:20 UTC (rev 1167) @@ -173,4 +173,20 @@ return remoteHostAddress; } + + /** + * Number of milliseconds before a WS operation is considered as having timed out. + * + * @param msBeforeTimeOut number of milliseconds to wait for a WS operation to return before timing out. Will be set + * to {@link ServiceFactory#DEFAULT_TIMEOUT_MS} if negative. + */ + public void setWSOperationTimeOut(int msBeforeTimeOut) + { + serviceFactory.setWSOperationTimeOut(msBeforeTimeOut); + } + + public int getWSOperationTimeOut() + { + return serviceFactory.getWSOperationTimeOut(); + } } Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/SOAPServiceFactory.java =================================================================== --- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/SOAPServiceFactory.java 2010-01-05 19:28:49 UTC (rev 1166) +++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/SOAPServiceFactory.java 2010-01-05 22:23:20 UTC (rev 1167) @@ -61,6 +61,7 @@ private String registrationURL; private boolean failed; private boolean available; + private int msBeforeTimeOut; public <T> T getService(Class<T> clazz) throws Exception { @@ -205,6 +206,21 @@ this.available = available; } + public void setWSOperationTimeOut(int msBeforeTimeOut) + { + if (msBeforeTimeOut < 0) + { + msBeforeTimeOut = DEFAULT_TIMEOUT_MS; + } + + this.msBeforeTimeOut = msBeforeTimeOut; + } + + public int getWSOperationTimeOut() + { + return msBeforeTimeOut; + } + public String getWsdlDefinitionURL() { return wsdlDefinitionURL; Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/ServiceFactory.java =================================================================== --- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/ServiceFactory.java 2010-01-05 19:28:49 UTC (rev 1166) +++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/ServiceFactory.java 2010-01-05 22:23:20 UTC (rev 1167) @@ -30,6 +30,8 @@ */ public interface ServiceFactory { + int DEFAULT_TIMEOUT_MS = 10000; + <T> T getService(Class<T> clazz) throws Exception; /** @@ -73,4 +75,14 @@ void setWsdlDefinitionURL(String wsdlDefinitionURL); String getWsdlDefinitionURL(); + + /** + * Number of milliseconds before a WS operation is considered as having timed out. + * + * @param msBeforeTimeOut number of milliseconds to wait for a WS operation to return before timing out. Will be set + * to {@link #DEFAULT_TIMEOUT_MS} if negative. + */ + void setWSOperationTimeOut(int msBeforeTimeOut); + + int getWSOperationTimeOut(); } Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/ServiceWrapper.java =================================================================== --- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/ServiceWrapper.java 2010-01-05 19:28:49 UTC (rev 1166) +++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/ServiceWrapper.java 2010-01-05 22:23:20 UTC (rev 1167) @@ -40,7 +40,6 @@ { protected T service; protected ManageableServiceFactory parentFactory; - private static final int TIMEOUT_MS = 10 * 1000; //todo: expose timeout so that it can be changed from the GUI /** * HTTP request timeout property. JAX-WS doesn't standardize that value, so needs to be adapted per used @@ -61,7 +60,7 @@ // set timeout properties for different WS stacks BindingProvider bindingProvider = (BindingProvider)service; - setTimeout(bindingProvider); + setTimeout(bindingProvider, parentFactory); Class tClass = (Class)((ParameterizedType)getClass().getGenericSuperclass()).getActualTypeArguments()[0]; @@ -76,18 +75,18 @@ this.parentFactory = parentFactory; } - private static void setTimeout(BindingProvider bindingProvider) + private static void setTimeout(BindingProvider bindingProvider, ManageableServiceFactory parentFactory) { Map<String, Object> requestContext = bindingProvider.getRequestContext(); - requestContext.put(JBOSS_WS_TIMEOUT, TIMEOUT_MS); - requestContext.put(SUN_WS_TIMEOUT, TIMEOUT_MS); - requestContext.put(IBM_WS_TIMEOUT, TIMEOUT_MS); + requestContext.put(JBOSS_WS_TIMEOUT, parentFactory.getWSOperationTimeOut()); + requestContext.put(SUN_WS_TIMEOUT, parentFactory.getWSOperationTimeOut()); + requestContext.put(IBM_WS_TIMEOUT, parentFactory.getWSOperationTimeOut()); } public static <T> T getServiceWrapper(Class<T> expectedServiceInterface, Object service, ManageableServiceFactory parentFactory) { // for now, only set timeouts - setTimeout((BindingProvider)service); + setTimeout((BindingProvider)service, parentFactory); return expectedServiceInterface.cast(service); } Modified: components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/support/BehaviorBackedServiceFactory.java =================================================================== --- components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/support/BehaviorBackedServiceFactory.java 2010-01-05 19:28:49 UTC (rev 1166) +++ components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/support/BehaviorBackedServiceFactory.java 2010-01-05 22:23:20 UTC (rev 1167) @@ -64,6 +64,7 @@ private boolean initialized = false; private String wsdl = DEFAULT_WSDL_URL; public static final String DEFAULT_WSDL_URL = "http://example.com?wsdl"; + private int timeout; public BehaviorBackedServiceFactory() @@ -123,6 +124,21 @@ // do nothing } + public void setWSOperationTimeOut(int msBeforeTimeOut) + { + if (msBeforeTimeOut < 0) + { + msBeforeTimeOut = DEFAULT_TIMEOUT_MS; + } + + timeout = msBeforeTimeOut; + } + + public int getWSOperationTimeOut() + { + return timeout; + } + public String getServiceDescriptionURL() { return SD_URL;

14 years, 11 months

1
0
0 / 0

gatein SVN: r1166 - in portal/trunk: component/identity/src/main/java/conf/portal and 6 other directories.

by do-not-reply＠jboss.org

Author: bdaw Date: 2010-01-05 14:28:49 -0500 (Tue, 05 Jan 2010) New Revision: 1166 Added: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/exo/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/exo/activedirectory-configuration.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/exo/hibernate-configuration.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/exo/installCS-ActiveDirectory.txt portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/exo/jdbc-configuration.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/exo/ldap-configuration.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/default-ldap.ldif portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/picketlink-idm-ldap-config.xml Removed: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/activedirectory-configuration.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/hibernate-configuration.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/installCS-ActiveDirectory.txt portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/jdbc-configuration.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/ldap-configuration.xml Modified: portal/trunk/component/identity/src/main/java/conf/portal/idm-config.xml portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMOrganizationServiceImpl.java portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMServiceImpl.java portal/trunk/component/test/organization/src/main/resources/conf/picketlink-idm-config.xml portal/trunk/pom.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/picketlink-idm-config.xml Log: - Update PicketLink IDM to 1.1.0.Beta1 - Sample LDAP configuration Modified: portal/trunk/component/identity/src/main/java/conf/portal/idm-config.xml =================================================================== --- portal/trunk/component/identity/src/main/java/conf/portal/idm-config.xml 2010-01-05 15:21:02 UTC (rev 1165) +++ portal/trunk/component/identity/src/main/java/conf/portal/idm-config.xml 2010-01-05 19:28:49 UTC (rev 1166) @@ -20,9 +20,9 @@ --> -<jboss-identity xmlns="urn:picketlink:idm:config:v1_0_0_cr1" +<jboss-identity xmlns="urn:picketlink:idm:config:v1_0_0_ga" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 identity-config.xsd"> + xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_ga identity-config.xsd"> <realms> <realm> <id>PortalRealm</id> Modified: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMOrganizationServiceImpl.java =================================================================== --- portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMOrganizationServiceImpl.java 2010-01-05 15:21:02 UTC (rev 1165) +++ portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMOrganizationServiceImpl.java 2010-01-05 19:28:49 UTC (rev 1166) @@ -99,7 +99,7 @@ } } - } + } public final org.picketlink.idm.api.Group getJBIDMGroup(String groupId) throws Exception { Modified: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMServiceImpl.java =================================================================== --- portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMServiceImpl.java 2010-01-05 15:21:02 UTC (rev 1165) +++ portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMServiceImpl.java 2010-01-05 19:28:49 UTC (rev 1166) @@ -54,7 +54,7 @@ public static final String PARAM_JNDI_NAME_OPTION = "jndiName"; - public static final String DEFAULT_REALM_NAME_OPTION = "PortalRealm"; + public static final String REALM_NAME_OPTION = "portalRealm"; // We may have several portal containers thus we need one indentitySessionFactory per portal container // private static IdentitySessionFactory identitySessionFactory; @@ -62,7 +62,7 @@ private String config; - private String defaultRealmName = "PortalRealm"; + private String realmName = "PortalRealm"; private IdentityConfiguration identityConfiguration; @@ -78,7 +78,7 @@ { ValueParam config = initParams.getValueParam(PARAM_CONFIG_OPTION); ValueParam jndiName = initParams.getValueParam(PARAM_JNDI_NAME_OPTION); - ValueParam realmName = initParams.getValueParam(DEFAULT_REALM_NAME_OPTION); + ValueParam realmName = initParams.getValueParam(REALM_NAME_OPTION); if (config == null && jndiName == null) { @@ -87,7 +87,7 @@ } if (realmName != null) { - this.defaultRealmName = realmName.getValue(); + this.realmName = realmName.getValue(); } if (config != null) @@ -140,7 +140,7 @@ public IdentitySession getIdentitySession() throws Exception { - return getIdentitySessionFactory().getCurrentIdentitySession(defaultRealmName); + return getIdentitySessionFactory().getCurrentIdentitySession(realmName); } public IdentitySession getIdentitySession(String realm) throws Exception Modified: portal/trunk/component/test/organization/src/main/resources/conf/picketlink-idm-config.xml =================================================================== --- portal/trunk/component/test/organization/src/main/resources/conf/picketlink-idm-config.xml 2010-01-05 15:21:02 UTC (rev 1165) +++ portal/trunk/component/test/organization/src/main/resources/conf/picketlink-idm-config.xml 2010-01-05 19:28:49 UTC (rev 1166) @@ -20,9 +20,9 @@ --> -<jboss-identity xmlns="urn:picketlink:idm:config:v1_0_0_cr1" +<jboss-identity xmlns="urn:picketlink:idm:config:v1_0_0_ga" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 identity-config.xsd"> + xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_ga identity-config.xsd"> <realms> <realm> <id>PortalRealm</id> Modified: portal/trunk/pom.xml =================================================================== --- portal/trunk/pom.xml 2010-01-05 15:21:02 UTC (rev 1165) +++ portal/trunk/pom.xml 2010-01-05 19:28:49 UTC (rev 1166) @@ -46,7 +46,7 @@ <org.gatein.common.version>2.0.0-CR02</org.gatein.common.version> <org.gatein.wci.version>2.0.0-CR02</org.gatein.wci.version> <org.gatein.pc.version>2.1.0-CR01</org.gatein.pc.version> - <org.picketlink.idm>1.0.0.CR1</org.picketlink.idm> + <org.picketlink.idm>1.1.0.Beta1</org.picketlink.idm> <org.gatein.wsrp.version>1.0.0-Beta03</org.gatein.wsrp.version> <org.gatein.mop.version>1.0.0-Beta12</org.gatein.mop.version> <org.slf4j.version>1.5.6</org.slf4j.version> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml 2010-01-05 15:21:02 UTC (rev 1165) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml 2010-01-05 19:28:49 UTC (rev 1166) @@ -32,22 +32,24 @@ <import>war:/conf/database/database-configuration.xml</import> <import>war:/conf/jcr/jcr-configuration.xml</import> -  -  + +  <import>war:/conf/organization/idm-configuration.xml</import> -  +  +  +    -    + <import>war:/conf/organization/organization-configuration.xml</import> <import>war:/conf/jcr/component-plugins-configuration.xml</import> <import>war:/conf/mail/portal-mail-configuration.xml</import> Deleted: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/activedirectory-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/activedirectory-configuration.xml 2010-01-05 15:21:02 UTC (rev 1165) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/activedirectory-configuration.xml 2010-01-05 19:28:49 UTC (rev 1166) @@ -1,133 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - - -<configuration - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> - <component> - <key>org.exoplatform.services.ldap.LDAPService</key> - <type>org.exoplatform.services.ldap.impl.LDAPServiceImpl</type> - <init-params> - <object-param> - <name>ldap.config</name> - <description>Default ldap config</description> - <object type="org.exoplatform.services.ldap.impl.LDAPConnectionConfig"> -  -  -  -  -  - <field name="providerURL"><string>ldaps://10.0.0.3:636</string></field> - <field name="rootdn"><string>CN=Administrator,CN=Users, DC=exoplatform,DC=org</string></field> - <field name="password"><string>site</string></field> - - <field name="version"><string>3</string></field> - - <field name="minConnection"><int>5</int></field> - - <field name="maxConnection"><int>10</int></field> - - <field name="referralMode"><string>ignore</string></field> - - <field name="serverName"><string>active.directory</string></field> - - </object> - </object-param> - </init-params> - </component> - - <component> - <key>org.exoplatform.services.organization.OrganizationService</key> - <type>org.exoplatform.services.organization.ldap.OrganizationServiceImpl</type> - <component-plugins> - <component-plugin> - <name>init.service.listener</name> - <set-method>addListenerPlugin</set-method> - <type>org.exoplatform.services.organization.ldap.OrganizationLdapInitializer</type> - <description>this listener populate organization ldap service create default dn</description> - </component-plugin> - </component-plugins> - <init-params> - <object-param> - <name>ldap.attribute.mapping</name> - <description>ldap attribute mapping</description> - <object type="org.exoplatform.services.organization.ldap.LDAPAttributeMapping"> - <field name="userLDAPClasses"><string>top,person,organizationalPerson,user</string></field> - <field name="profileLDAPClasses"><string>top,organizationalPerson</string></field> - <field name="groupLDAPClasses"><string>top,organizationalUnit</string></field> - <field name="membershipTypeLDAPClasses"><string>top,group</string></field> - <field name="membershipLDAPClasses"><string>top,group</string></field> - - <field name="baseURL"><string>dc=exoplatform,dc=org</string></field> - <field name="groupsURL"><string>ou=groups,ou=portal,dc=exoplatform,dc=org</string></field> - <field name="membershipTypeURL"><string>ou=memberships,ou=portal,dc=exoplatform,dc=org</string></field> - <field name="userURL"><string>ou=users,ou=portal,dc=exoplatform,dc=org</string></field> - <field name="profileURL"><string>ou=profiles,ou=portal,dc=exoplatform,dc=org</string></field> - - <field name="userAuthenticationAttr"><string>mail</string></field> - <field name="userUsernameAttr"><string>sAMAccountName</string></field> - <field name="userPassword"><string>unicodePwd</string></field> -  - <field name="userFirstNameAttr"><string>givenName</string></field> - <field name="userLastNameAttr"><string>sn</string></field> - <field name="userDisplayNameAttr"><string>displayName</string></field> - <field name="userMailAttr"><string>mail</string></field> - <field name="userObjectClassFilter"><string>objectClass=user</string></field> - - <field name="membershipTypeMemberValue"><string>member</string></field> - <field name="membershipTypeRoleNameAttr"><string>cn</string></field> - <field name="membershipTypeNameAttr"><string>cn</string></field> - <field name="membershipTypeObjectClassFilter"><string>objectClass=group</string></field> - <field name="membershiptypeObjectClass"><string>group</string></field> - - <field name="groupObjectClass"><string>organizationalUnit</string></field> - <field name="groupObjectClassFilter"><string>objectClass=organizationalUnit</string></field> - - <field name="membershipObjectClass"><string>group</string></field> - <field name="membershipObjectClassFilter"><string>objectClass=group</string></field> - - <field name="ldapCreatedTimeStampAttr"><string>createdTimeStamp</string></field> - <field name="ldapModifiedTimeStampAttr"><string>modifiedTimeStamp</string></field> - <field name="ldapDescriptionAttr"><string>description</string></field> - </object> - </object-param> - </init-params> - </component> - -  - - <import>classpath:/conf/portal/organization-configuration.xml</import> -</configuration> Copied: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/exo/activedirectory-configuration.xml (from rev 1155, portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/activedirectory-configuration.xml) =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/exo/activedirectory-configuration.xml (rev 0) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/exo/activedirectory-configuration.xml 2010-01-05 19:28:49 UTC (rev 1166) @@ -0,0 +1,133 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + +<configuration + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> + <component> + <key>org.exoplatform.services.ldap.LDAPService</key> + <type>org.exoplatform.services.ldap.impl.LDAPServiceImpl</type> + <init-params> + <object-param> + <name>ldap.config</name> + <description>Default ldap config</description> + <object type="org.exoplatform.services.ldap.impl.LDAPConnectionConfig"> +  +  +  +  +  + <field name="providerURL"><string>ldaps://10.0.0.3:636</string></field> + <field name="rootdn"><string>CN=Administrator,CN=Users, DC=exoplatform,DC=org</string></field> + <field name="password"><string>site</string></field> + + <field name="version"><string>3</string></field> + + <field name="minConnection"><int>5</int></field> + + <field name="maxConnection"><int>10</int></field> + + <field name="referralMode"><string>ignore</string></field> + + <field name="serverName"><string>active.directory</string></field> + + </object> + </object-param> + </init-params> + </component> + + <component> + <key>org.exoplatform.services.organization.OrganizationService</key> + <type>org.exoplatform.services.organization.ldap.OrganizationServiceImpl</type> + <component-plugins> + <component-plugin> + <name>init.service.listener</name> + <set-method>addListenerPlugin</set-method> + <type>org.exoplatform.services.organization.ldap.OrganizationLdapInitializer</type> + <description>this listener populate organization ldap service create default dn</description> + </component-plugin> + </component-plugins> + <init-params> + <object-param> + <name>ldap.attribute.mapping</name> + <description>ldap attribute mapping</description> + <object type="org.exoplatform.services.organization.ldap.LDAPAttributeMapping"> + <field name="userLDAPClasses"><string>top,person,organizationalPerson,user</string></field> + <field name="profileLDAPClasses"><string>top,organizationalPerson</string></field> + <field name="groupLDAPClasses"><string>top,organizationalUnit</string></field> + <field name="membershipTypeLDAPClasses"><string>top,group</string></field> + <field name="membershipLDAPClasses"><string>top,group</string></field> + + <field name="baseURL"><string>dc=exoplatform,dc=org</string></field> + <field name="groupsURL"><string>ou=groups,ou=portal,dc=exoplatform,dc=org</string></field> + <field name="membershipTypeURL"><string>ou=memberships,ou=portal,dc=exoplatform,dc=org</string></field> + <field name="userURL"><string>ou=users,ou=portal,dc=exoplatform,dc=org</string></field> + <field name="profileURL"><string>ou=profiles,ou=portal,dc=exoplatform,dc=org</string></field> + + <field name="userAuthenticationAttr"><string>mail</string></field> + <field name="userUsernameAttr"><string>sAMAccountName</string></field> + <field name="userPassword"><string>unicodePwd</string></field> +  + <field name="userFirstNameAttr"><string>givenName</string></field> + <field name="userLastNameAttr"><string>sn</string></field> + <field name="userDisplayNameAttr"><string>displayName</string></field> + <field name="userMailAttr"><string>mail</string></field> + <field name="userObjectClassFilter"><string>objectClass=user</string></field> + + <field name="membershipTypeMemberValue"><string>member</string></field> + <field name="membershipTypeRoleNameAttr"><string>cn</string></field> + <field name="membershipTypeNameAttr"><string>cn</string></field> + <field name="membershipTypeObjectClassFilter"><string>objectClass=group</string></field> + <field name="membershiptypeObjectClass"><string>group</string></field> + + <field name="groupObjectClass"><string>organizationalUnit</string></field> + <field name="groupObjectClassFilter"><string>objectClass=organizationalUnit</string></field> + + <field name="membershipObjectClass"><string>group</string></field> + <field name="membershipObjectClassFilter"><string>objectClass=group</string></field> + + <field name="ldapCreatedTimeStampAttr"><string>createdTimeStamp</string></field> + <field name="ldapModifiedTimeStampAttr"><string>modifiedTimeStamp</string></field> + <field name="ldapDescriptionAttr"><string>description</string></field> + </object> + </object-param> + </init-params> + </component> + +  + + <import>classpath:/conf/portal/organization-configuration.xml</import> +</configuration> Copied: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/exo/hibernate-configuration.xml (from rev 1155, portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/hibernate-configuration.xml) =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/exo/hibernate-configuration.xml (rev 0) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/exo/hibernate-configuration.xml 2010-01-05 19:28:49 UTC (rev 1166) @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + +<configuration + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> + <component> + <key>org.exoplatform.services.organization.OrganizationService</key> + <type>org.exoplatform.services.organization.hibernate.OrganizationServiceImpl</type> + </component> + <external-component-plugins> + <target-component>org.exoplatform.services.database.HibernateService</target-component> + <component-plugin> + <name>add.hibernate.mapping</name> + <set-method>addPlugin</set-method> + <type>org.exoplatform.services.database.impl.AddHibernateMappingPlugin</type> + <init-params> + <values-param> + <name>hibernate.mapping</name> + <value>org/exoplatform/services/organization/impl/UserImpl.hbm.xml</value> + <value>org/exoplatform/services/organization/impl/MembershipImpl.hbm.xml</value> + <value>org/exoplatform/services/organization/impl/GroupImpl.hbm.xml</value> + <value>org/exoplatform/services/organization/impl/MembershipTypeImpl.hbm.xml</value> + <value>org/exoplatform/services/organization/impl/UserProfileData.hbm.xml</value> + </values-param> + </init-params> + </component-plugin> + </external-component-plugins> + <import>classpath:/conf/portal/organization-configuration.xml</import> +</configuration> \ No newline at end of file Copied: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/exo/installCS-ActiveDirectory.txt (from rev 1155, portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/installCS-ActiveDirectory.txt) =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/exo/installCS-ActiveDirectory.txt (rev 0) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/exo/installCS-ActiveDirectory.txt 2010-01-05 19:28:49 UTC (rev 1166) @@ -0,0 +1,39 @@ +==== + Copyright (C) 2009 eXo Platform SAS. + + This is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of + the License, or (at your option) any later version. + + This software is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this software; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA, or see the FSF site: http://www.fsf.org. +==== + +Install CA Certificate + +- Installed an Enterprise CA , with the distinguished name of cn=portal,dc=exoplatform,dc=org" + +- By default, domain controllers automatically enroll for domain controller certificates once an Enterprise CA has been installed. The root certificate can be found in the root of the system drive (Eg. if the operating system has been installed in c:\windows, the cert will be found in c:\) + By default the certificate file is named <dns name of ca>_<name of cert>.crt + + +- Copy <dns name of ca>_<name of cert>.crt (example : Win2k3vm.exoplatform.org_portal.crt) to java.home/jre/lib/security + +- Goto java.home/jre/lib/security/ + +- Run: keytool -import -file <Win2k3vm.exoplatform.org_portal.crt> -keystore cacerts + +- Enter password : changeit + +- To delete CA Certificate : keytool -delete -alias mykey -keystore cacerts + + + Copied: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/exo/jdbc-configuration.xml (from rev 1155, portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/jdbc-configuration.xml) =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/exo/jdbc-configuration.xml (rev 0) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/exo/jdbc-configuration.xml 2010-01-05 19:28:49 UTC (rev 1166) @@ -0,0 +1,85 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + +<configuration + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> + <component> + <key>org.exoplatform.services.organization.OrganizationService</key> + <type>org.exoplatform.services.organization.jdbc.OrganizationServiceImpl</type> + </component> + + <external-component-plugins> + <target-component>org.exoplatform.services.listener.ListenerService</target-component> + + <component-plugin> + <name>organization.user.preDelete</name> + <set-method>addListener</set-method> + <type>org.exoplatform.services.organization.jdbc.listeners.RemoveUserProfileListener</type> + </component-plugin> + + <component-plugin> + <name>organization.user.postCreate</name> + <set-method>addListener</set-method> + <type>org.exoplatform.services.organization.jdbc.listeners.CreateUserListener</type> + </component-plugin> + + <component-plugin> + <name>organization.user.preDelete</name> + <set-method>addListener</set-method> + <type>org.exoplatform.services.organization.jdbc.listeners.RemoveMembershipListener</type> + </component-plugin> + + <component-plugin> + <name>organization.user.preDelete</name> + <set-method>addListener</set-method> + <type>org.exoplatform.portal.config.RemoveUserPortalConfigListener</type> + </component-plugin> + + <component-plugin> + <name>organization.membershipType.preDelete</name> + <set-method>addListener</set-method> + <type>org.exoplatform.services.organization.jdbc.listeners.RemoveMembershipListener</type> + </component-plugin> + + <component-plugin> + <name>organization.group.preDelete</name> + <set-method>addListener</set-method> + <type>org.exoplatform.services.organization.jdbc.listeners.RemoveMembershipListener</type> + </component-plugin> + + <component-plugin> + <name>organization.group.preDelete</name> + <set-method>addListener</set-method> + <type>org.exoplatform.portal.config.RemoveGroupPortalConfigListener</type> + </component-plugin> + + <component-plugin> + <name>organization.group.preDelete</name> + <set-method>addListener</set-method> + <type>org.exoplatform.services.organization.jdbc.listeners.RemoveGroupListener</type> + </component-plugin> + + </external-component-plugins> + +</configuration> Copied: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/exo/ldap-configuration.xml (from rev 1155, portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/ldap-configuration.xml) =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/exo/ldap-configuration.xml (rev 0) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/exo/ldap-configuration.xml 2010-01-05 19:28:49 UTC (rev 1166) @@ -0,0 +1,167 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + +<configuration + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> + <component> + <key>org.exoplatform.services.ldap.LDAPService</key> + <type>org.exoplatform.services.ldap.impl.LDAPServiceImpl</type> + <init-params> + <object-param> + <name>ldap.config</name> + <description>Default ldap config</description> + <object type="org.exoplatform.services.ldap.impl.LDAPConnectionConfig"> + +  + <field name="providerURL"><string>ldap://127.0.0.1:389,10.0.0.1:389</string></field> + + <field name="rootdn"><string>CN=Manager,DC=exoplatform,DC=org</string></field> + + <field name="password"><string>secret</string></field> + + <field name="version"><string>3</string></field> + + <field name="minConnection"><int>5</int></field> + + <field name="maxConnection"><int>10</int></field> + + <field name="referralMode"><string>follow</string></field> + + + + <field name="serverName"><string>default</string></field> + + + + + </object> + </object-param> + </init-params> + </component> + + <component> + <key>org.exoplatform.services.organization.OrganizationService</key> + <type>org.exoplatform.services.organization.ldap.OrganizationServiceImpl</type> + <component-plugins> + <component-plugin> + <name>init.service.listener</name> + <set-method>addListenerPlugin</set-method> + <type>org.exoplatform.services.organization.ldap.OrganizationLdapInitializer</type> + <description>this listener populate organization ldap service create default dn</description> + </component-plugin> + </component-plugins> + <init-params> + <value-param> + <name>ldap.userDN.key</name> + <description>The key used to compose user DN</description> + <value>cn</value> + </value-param> + + <object-param> + <name>ldap.attribute.mapping</name> + <description>ldap attribute mapping</description> + <object type="org.exoplatform.services.organization.ldap.LDAPAttributeMapping"> + <field name="userLDAPClasses"><string>top,person,organizationalPerson,inetOrgPerson</string></field> + <field name="profileLDAPClasses"><string>top,organizationalPerson</string></field> + <field name="groupLDAPClasses"><string>top,organizationalUnit</string></field> + <field name="membershipTypeLDAPClasses"><string>top,organizationalRole</string></field> + <field name="membershipLDAPClasses"><string>top,groupOfNames</string></field> + + <field name="baseURL"><string>dc=exoplatform,dc=org</string></field> + <field name="groupsURL"><string>ou=groups,ou=portal,dc=exoplatform,dc=org</string></field> + <field name="membershipTypeURL"><string>ou=memberships,ou=portal,dc=exoplatform,dc=org</string></field> + <field name="userURL"><string>ou=users,ou=portal,dc=exoplatform,dc=org</string></field> + <field name="profileURL"><string>ou=profiles,ou=portal,dc=exoplatform,dc=org</string></field> + + <field name="userUsernameAttr"><string>uid</string></field> + <field name="userPassword"><string>userPassword</string></field> + <field name="userFirstNameAttr"><string>givenName</string></field> + <field name="userLastNameAttr"><string>sn</string></field> + <field name="userDisplayNameAttr"><string>displayName</string></field> + <field name="userMailAttr"><string>mail</string></field> + <field name="userObjectClassFilter"><string>objectClass=person</string></field> + + <field name="membershipTypeMemberValue"><string>member</string></field> + <field name="membershipTypeRoleNameAttr"><string>cn</string></field> + <field name="membershipTypeNameAttr"><string>cn</string></field> + <field name="membershipTypeObjectClassFilter"><string>objectClass=organizationalRole</string></field> + <field name="membershiptypeObjectClass"><string>organizationalRole</string></field> + + <field name="groupObjectClass"><string>organizationalUnit</string></field> + <field name="groupObjectClassFilter"><string>objectClass=organizationalUnit</string></field> + + <field name="membershipObjectClass"><string>groupOfNames</string></field> + <field name="membershipObjectClassFilter"><string>objectClass=groupOfNames</string></field> + + <field name="ldapCreatedTimeStampAttr"><string>createdTimeStamp</string></field> + <field name="ldapModifiedTimeStampAttr"><string>modifiedTimeStamp</string></field> + <field name="ldapDescriptionAttr"><string>description</string></field> + </object> + </object-param> + </init-params> + </component> + + <external-component-plugins> + <target-component>org.exoplatform.services.database.HibernateService</target-component> + <component-plugin> + <name>add.hibernate.mapping</name> + <set-method>addPlugin</set-method> + <type>org.exoplatform.services.database.impl.AddHibernateMappingPlugin</type> + <init-params> + <values-param> + <name>hibernate.mapping</name> + <value>org/exoplatform/services/organization/impl/UserProfileData.hbm.xml</value> + </values-param> + </init-params> + </component-plugin> + </external-component-plugins> + +  +</configuration> Deleted: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/hibernate-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/hibernate-configuration.xml 2010-01-05 15:21:02 UTC (rev 1165) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/hibernate-configuration.xml 2010-01-05 19:28:49 UTC (rev 1166) @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - - -<configuration - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> - <component> - <key>org.exoplatform.services.organization.OrganizationService</key> - <type>org.exoplatform.services.organization.hibernate.OrganizationServiceImpl</type> - </component> - <external-component-plugins> - <target-component>org.exoplatform.services.database.HibernateService</target-component> - <component-plugin> - <name>add.hibernate.mapping</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.database.impl.AddHibernateMappingPlugin</type> - <init-params> - <values-param> - <name>hibernate.mapping</name> - <value>org/exoplatform/services/organization/impl/UserImpl.hbm.xml</value> - <value>org/exoplatform/services/organization/impl/MembershipImpl.hbm.xml</value> - <value>org/exoplatform/services/organization/impl/GroupImpl.hbm.xml</value> - <value>org/exoplatform/services/organization/impl/MembershipTypeImpl.hbm.xml</value> - <value>org/exoplatform/services/organization/impl/UserProfileData.hbm.xml</value> - </values-param> - </init-params> - </component-plugin> - </external-component-plugins> - <import>classpath:/conf/portal/organization-configuration.xml</import> -</configuration> \ No newline at end of file Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml 2010-01-05 15:21:02 UTC (rev 1165) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml 2010-01-05 19:28:49 UTC (rev 1166) @@ -34,6 +34,11 @@ <name>config</name> <value>war:/conf/organization/picketlink-idm/picketlink-idm-config.xml</value> </value-param> + <value-param> + <name>portalRealm</name> + <value>realm${container.name.suffix}</value> + </value-param> + </init-params> </component> Deleted: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/installCS-ActiveDirectory.txt =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/installCS-ActiveDirectory.txt 2010-01-05 15:21:02 UTC (rev 1165) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/installCS-ActiveDirectory.txt 2010-01-05 19:28:49 UTC (rev 1166) @@ -1,39 +0,0 @@ -==== - Copyright (C) 2009 eXo Platform SAS. - - This is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of - the License, or (at your option) any later version. - - This software is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this software; if not, write to the Free - Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - 02110-1301 USA, or see the FSF site: http://www.fsf.org. -==== - -Install CA Certificate - -- Installed an Enterprise CA , with the distinguished name of cn=portal,dc=exoplatform,dc=org" - -- By default, domain controllers automatically enroll for domain controller certificates once an Enterprise CA has been installed. The root certificate can be found in the root of the system drive (Eg. if the operating system has been installed in c:\windows, the cert will be found in c:\) - By default the certificate file is named <dns name of ca>_<name of cert>.crt - - -- Copy <dns name of ca>_<name of cert>.crt (example : Win2k3vm.exoplatform.org_portal.crt) to java.home/jre/lib/security - -- Goto java.home/jre/lib/security/ - -- Run: keytool -import -file <Win2k3vm.exoplatform.org_portal.crt> -keystore cacerts - -- Enter password : changeit - -- To delete CA Certificate : keytool -delete -alias mykey -keystore cacerts - - - Deleted: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/jdbc-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/jdbc-configuration.xml 2010-01-05 15:21:02 UTC (rev 1165) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/jdbc-configuration.xml 2010-01-05 19:28:49 UTC (rev 1166) @@ -1,85 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - - -<configuration - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> - <component> - <key>org.exoplatform.services.organization.OrganizationService</key> - <type>org.exoplatform.services.organization.jdbc.OrganizationServiceImpl</type> - </component> - - <external-component-plugins> - <target-component>org.exoplatform.services.listener.ListenerService</target-component> - - <component-plugin> - <name>organization.user.preDelete</name> - <set-method>addListener</set-method> - <type>org.exoplatform.services.organization.jdbc.listeners.RemoveUserProfileListener</type> - </component-plugin> - - <component-plugin> - <name>organization.user.postCreate</name> - <set-method>addListener</set-method> - <type>org.exoplatform.services.organization.jdbc.listeners.CreateUserListener</type> - </component-plugin> - - <component-plugin> - <name>organization.user.preDelete</name> - <set-method>addListener</set-method> - <type>org.exoplatform.services.organization.jdbc.listeners.RemoveMembershipListener</type> - </component-plugin> - - <component-plugin> - <name>organization.user.preDelete</name> - <set-method>addListener</set-method> - <type>org.exoplatform.portal.config.RemoveUserPortalConfigListener</type> - </component-plugin> - - <component-plugin> - <name>organization.membershipType.preDelete</name> - <set-method>addListener</set-method> - <type>org.exoplatform.services.organization.jdbc.listeners.RemoveMembershipListener</type> - </component-plugin> - - <component-plugin> - <name>organization.group.preDelete</name> - <set-method>addListener</set-method> - <type>org.exoplatform.services.organization.jdbc.listeners.RemoveMembershipListener</type> - </component-plugin> - - <component-plugin> - <name>organization.group.preDelete</name> - <set-method>addListener</set-method> - <type>org.exoplatform.portal.config.RemoveGroupPortalConfigListener</type> - </component-plugin> - - <component-plugin> - <name>organization.group.preDelete</name> - <set-method>addListener</set-method> - <type>org.exoplatform.services.organization.jdbc.listeners.RemoveGroupListener</type> - </component-plugin> - - </external-component-plugins> - -</configuration> Deleted: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/ldap-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/ldap-configuration.xml 2010-01-05 15:21:02 UTC (rev 1165) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/ldap-configuration.xml 2010-01-05 19:28:49 UTC (rev 1166) @@ -1,167 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - - -<configuration - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> - <component> - <key>org.exoplatform.services.ldap.LDAPService</key> - <type>org.exoplatform.services.ldap.impl.LDAPServiceImpl</type> - <init-params> - <object-param> - <name>ldap.config</name> - <description>Default ldap config</description> - <object type="org.exoplatform.services.ldap.impl.LDAPConnectionConfig"> - -  - <field name="providerURL"><string>ldap://127.0.0.1:389,10.0.0.1:389</string></field> - - <field name="rootdn"><string>CN=Manager,DC=exoplatform,DC=org</string></field> - - <field name="password"><string>secret</string></field> - - <field name="version"><string>3</string></field> - - <field name="minConnection"><int>5</int></field> - - <field name="maxConnection"><int>10</int></field> - - <field name="referralMode"><string>follow</string></field> - - - - <field name="serverName"><string>default</string></field> - - - - - </object> - </object-param> - </init-params> - </component> - - <component> - <key>org.exoplatform.services.organization.OrganizationService</key> - <type>org.exoplatform.services.organization.ldap.OrganizationServiceImpl</type> - <component-plugins> - <component-plugin> - <name>init.service.listener</name> - <set-method>addListenerPlugin</set-method> - <type>org.exoplatform.services.organization.ldap.OrganizationLdapInitializer</type> - <description>this listener populate organization ldap service create default dn</description> - </component-plugin> - </component-plugins> - <init-params> - <value-param> - <name>ldap.userDN.key</name> - <description>The key used to compose user DN</description> - <value>cn</value> - </value-param> - - <object-param> - <name>ldap.attribute.mapping</name> - <description>ldap attribute mapping</description> - <object type="org.exoplatform.services.organization.ldap.LDAPAttributeMapping"> - <field name="userLDAPClasses"><string>top,person,organizationalPerson,inetOrgPerson</string></field> - <field name="profileLDAPClasses"><string>top,organizationalPerson</string></field> - <field name="groupLDAPClasses"><string>top,organizationalUnit</string></field> - <field name="membershipTypeLDAPClasses"><string>top,organizationalRole</string></field> - <field name="membershipLDAPClasses"><string>top,groupOfNames</string></field> - - <field name="baseURL"><string>dc=exoplatform,dc=org</string></field> - <field name="groupsURL"><string>ou=groups,ou=portal,dc=exoplatform,dc=org</string></field> - <field name="membershipTypeURL"><string>ou=memberships,ou=portal,dc=exoplatform,dc=org</string></field> - <field name="userURL"><string>ou=users,ou=portal,dc=exoplatform,dc=org</string></field> - <field name="profileURL"><string>ou=profiles,ou=portal,dc=exoplatform,dc=org</string></field> - - <field name="userUsernameAttr"><string>uid</string></field> - <field name="userPassword"><string>userPassword</string></field> - <field name="userFirstNameAttr"><string>givenName</string></field> - <field name="userLastNameAttr"><string>sn</string></field> - <field name="userDisplayNameAttr"><string>displayName</string></field> - <field name="userMailAttr"><string>mail</string></field> - <field name="userObjectClassFilter"><string>objectClass=person</string></field> - - <field name="membershipTypeMemberValue"><string>member</string></field> - <field name="membershipTypeRoleNameAttr"><string>cn</string></field> - <field name="membershipTypeNameAttr"><string>cn</string></field> - <field name="membershipTypeObjectClassFilter"><string>objectClass=organizationalRole</string></field> - <field name="membershiptypeObjectClass"><string>organizationalRole</string></field> - - <field name="groupObjectClass"><string>organizationalUnit</string></field> - <field name="groupObjectClassFilter"><string>objectClass=organizationalUnit</string></field> - - <field name="membershipObjectClass"><string>groupOfNames</string></field> - <field name="membershipObjectClassFilter"><string>objectClass=groupOfNames</string></field> - - <field name="ldapCreatedTimeStampAttr"><string>createdTimeStamp</string></field> - <field name="ldapModifiedTimeStampAttr"><string>modifiedTimeStamp</string></field> - <field name="ldapDescriptionAttr"><string>description</string></field> - </object> - </object-param> - </init-params> - </component> - - <external-component-plugins> - <target-component>org.exoplatform.services.database.HibernateService</target-component> - <component-plugin> - <name>add.hibernate.mapping</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.database.impl.AddHibernateMappingPlugin</type> - <init-params> - <values-param> - <name>hibernate.mapping</name> - <value>org/exoplatform/services/organization/impl/UserProfileData.hbm.xml</value> - </values-param> - </init-params> - </component-plugin> - </external-component-plugins> - -  -</configuration> Added: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/default-ldap.ldif =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/default-ldap.ldif (rev 0) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/default-ldap.ldif 2010-01-05 19:28:49 UTC (rev 1166) @@ -0,0 +1,35 @@ +dn: o=gatein,dc=example,dc=com +objectclass: top +objectclass: organization +o: gatein + +dn: o=portal,o=gatein,dc=example,dc=com +objectclass: top +objectclass: organization +o: portal + +dn: ou=People,o=portal,o=gatein,dc=example,dc=com +objectclass: top +objectclass: organizationalUnit +ou: People + +dn: ou=Groups,o=portal,o=gatein,dc=example,dc=com +objectclass: top +objectclass: organizationalUnit +ou: Groups + +dn: o=sample-portal,o=gatein,dc=example,dc=com +objectclass: top +objectclass: organization +o: sample-portal + +dn: ou=People,o=sample-portal,o=gatein,dc=example,dc=com +objectclass: top +objectclass: organizationalUnit +ou: People + +dn: ou=Groups,o=sample-portal,o=gatein,dc=example,dc=com +objectclass: top +objectclass: organizationalUnit +ou: Groups + Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/picketlink-idm-config.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/picketlink-idm-config.xml 2010-01-05 15:21:02 UTC (rev 1165) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/picketlink-idm-config.xml 2010-01-05 19:28:49 UTC (rev 1166) @@ -20,76 +20,106 @@ --> -<jboss-identity xmlns="urn:picketlink:idm:config:v1_0_0_cr1" +<jboss-identity xmlns="urn:picketlink:idm:config:v1_0_0_ga" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 identity-config.xsd"> - <realms> - <realm> - <id>PortalRealm</id> - <repository-id-ref>PortalRepository</repository-id-ref> - <identity-type-mappings> - <user-mapping>USER</user-mapping> - </identity-type-mappings> - </realm> - </realms> - <repositories> - <repository> - <id>PortalRepository</id> - <class>org.picketlink.idm.impl.repository.WrapperIdentityStoreRepository</class> - <external-config/> - <default-identity-store-id>HibernateStore</default-identity-store-id> - <default-attribute-store-id>HibernateStore</default-attribute-store-id> - </repository> - </repositories> - <stores> - <attribute-stores/> - <identity-stores> - <identity-store> - <id>HibernateStore</id> - <class>org.picketlink.idm.impl.store.hibernate.HibernateIdentityStoreImpl</class> - <external-config/> - <supported-relationship-types> - <relationship-type>JBOSS_IDENTITY_MEMBERSHIP</relationship-type> - <relationship-type>JBOSS_IDENTITY_ROLE</relationship-type> - </supported-relationship-types> - <supported-identity-object-types> - <identity-object-type> - <name>USER</name> - <relationships/> - <credentials> - <credential-type>PASSWORD</credential-type> - </credentials> - <attributes/> - <options/> - </identity-object-type> - </supported-identity-object-types> - <options> - <option> - <name>hibernateSessionFactoryRegistryName</name> - <value>hibernateSessionFactory</value> - </option> - <option> - <name>allowNotDefinedIdentityObjectTypes</name> - <value>true</value> - </option> - <option> - <name>populateRelationshipTypes</name> - <value>true</value> - </option> - <option> - <name>populateIdentityObjectTypes</name> - <value>true</value> - </option> - <option> - <name>allowNotDefinedAttributes</name> - <value>true</value> - </option> - <option> - <name>isRealmAware</name> - <value>true</value> - </option> - </options> - </identity-store> - </identity-stores> - </stores> + xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_ga identity-config.xsd"> + <realms> + <realm> + <id>realm</id> + <repository-id-ref>PortalRepository</repository-id-ref> + <identity-type-mappings> + <user-mapping>USER</user-mapping> + </identity-type-mappings> + </realm> + <realm> + <id>realm_portal</id> + <repository-id-ref>PortalRepository</repository-id-ref> + <identity-type-mappings> + <user-mapping>USER</user-mapping> + </identity-type-mappings> + </realm> + <realm> + <id>realm_sample-portal</id> + <repository-id-ref>PortalRepository</repository-id-ref> + <identity-type-mappings> + <user-mapping>USER</user-mapping> + </identity-type-mappings> + </realm> + </realms> + <repositories> + <repository> + <id>PortalRepository</id> + <class>org.picketlink.idm.impl.repository.WrapperIdentityStoreRepository</class> + <external-config/> + <default-identity-store-id>HibernateStore</default-identity-store-id> + <default-attribute-store-id>HibernateStore</default-attribute-store-id> + </repository> + </repositories> + <stores> + <attribute-stores/> + <identity-stores> + <identity-store> + <id>HibernateStore</id> + <class>org.picketlink.idm.impl.store.hibernate.HibernateIdentityStoreImpl</class> + <external-config/> + <supported-relationship-types> + <relationship-type>JBOSS_IDENTITY_MEMBERSHIP</relationship-type> + <relationship-type>JBOSS_IDENTITY_ROLE</relationship-type> + </supported-relationship-types> + <supported-identity-object-types> + <identity-object-type> + <name>USER</name> + <relationships/> + <credentials> + <credential-type>PASSWORD</credential-type> + </credentials> + <attributes/> + <options/> + </identity-object-type> + <identity-object-type> + <name>GTN_GROUP_TYPE</name> + <relationships> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>USER</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>GTN_GROUP_TYPE</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref> + <identity-object-type-ref>USER</identity-object-type-ref> + </relationship> + </relationships> + <credentials/> + <attributes/> + <options/> + </identity-object-type> + </supported-identity-object-types> + <options> + <option> + <name>hibernateSessionFactoryRegistryName</name> + <value>hibernateSessionFactory</value> + </option> + <option> + <name>populateRelationshipTypes</name> + <value>true</value> + </option> + <option> + <name>populateIdentityObjectTypes</name> + <value>true</value> + </option> + <option> + <name>allowNotDefinedAttributes</name> + <value>true</value> + </option> + <option> + <name>isRealmAware</name> + <value>true</value> + </option> + </options> + </identity-store> + </identity-stores> + </stores> </jboss-identity> \ No newline at end of file Added: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/picketlink-idm-ldap-config.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/picketlink-idm-ldap-config.xml (rev 0) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/picketlink-idm-ldap-config.xml 2010-01-05 19:28:49 UTC (rev 1166) @@ -0,0 +1,388 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<jboss-identity xmlns="urn:picketlink:idm:config:v1_0_0_ga" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_ga identity-config.xsd"> + <realms> + <realm> + <id>realm</id> + <repository-id-ref>PortalRepository</repository-id-ref> + <identity-type-mappings> + <user-mapping>USER</user-mapping> + </identity-type-mappings> + </realm> + <realm> + <id>realm_portal</id> + <repository-id-ref>PortalRepository</repository-id-ref> + <identity-type-mappings> + <user-mapping>USER</user-mapping> + </identity-type-mappings> + </realm> + <realm> + <id>realm_sample-portal</id> + <repository-id-ref>SamplePortalRepository</repository-id-ref> + <identity-type-mappings> + <user-mapping>USER</user-mapping> + </identity-type-mappings> + </realm> + </realms> + <repositories> + <repository> + <id>PortalRepository</id> + <class>org.picketlink.idm.impl.repository.FallbackIdentityStoreRepository</class> + <external-config/> + <default-identity-store-id>HibernateStore</default-identity-store-id> + <default-attribute-store-id>HibernateStore</default-attribute-store-id> + <identity-store-mappings> + <identity-store-mapping> + <identity-store-id>PortalLDAPStore</identity-store-id> + <identity-object-types> + <identity-object-type>USER</identity-object-type> + <identity-object-type>GTN_GROUP_TYPE</identity-object-type> + </identity-object-types> + <options/> + </identity-store-mapping> + </identity-store-mappings> + <options> + <option> + <name>allowNotDefinedAttributes</name> + <value>true</value> + </option> + </options> + </repository> + <repository> + <id>SamplePortalRepository</id> + <class>org.picketlink.idm.impl.repository.FallbackIdentityStoreRepository</class> + <external-config/> + <default-identity-store-id>HibernateStore</default-identity-store-id> + <default-attribute-store-id>HibernateStore</default-attribute-store-id> + <identity-store-mappings> + <identity-store-mapping> + <identity-store-id>SamplePortalLDAPStore</identity-store-id> + <identity-object-types> + <identity-object-type>USER</identity-object-type> + <identity-object-type>GTN_GROUP_TYPE</identity-object-type> + </identity-object-types> + <options/> + </identity-store-mapping> + </identity-store-mappings> + <options> + <option> + <name>allowNotDefinedAttributes</name> + <value>true</value> + </option> + </options> + </repository> + </repositories> + <stores> + <attribute-stores/> + <identity-stores> + <identity-store> + <id>HibernateStore</id> + <class>org.picketlink.idm.impl.store.hibernate.HibernateIdentityStoreImpl</class> + <external-config/> + <supported-relationship-types> + <relationship-type>JBOSS_IDENTITY_MEMBERSHIP</relationship-type> + <relationship-type>JBOSS_IDENTITY_ROLE</relationship-type> + </supported-relationship-types> + <supported-identity-object-types> + <identity-object-type> + <name>USER</name> + <relationships/> + <credentials> + <credential-type>PASSWORD</credential-type> + </credentials> + <attributes/> + <options/> + </identity-object-type> + <identity-object-type> + <name>GTN_GROUP_TYPE</name> + <relationships> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>USER</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>GTN_GROUP_TYPE</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref> + <identity-object-type-ref>USER</identity-object-type-ref> + </relationship> + </relationships> + <credentials/> + <attributes/> + <options/> + </identity-object-type> + </supported-identity-object-types> + <options> + <option> + <name>hibernateSessionFactoryRegistryName</name> + <value>hibernateSessionFactory</value> + </option> + <option> + <name>populateRelationshipTypes</name> + <value>true</value> + </option> + <option> + <name>populateIdentityObjectTypes</name> + <value>true</value> + </option> + <option> + <name>allowNotDefinedAttributes</name> + <value>true</value> + </option> + <option> + <name>isRealmAware</name> + <value>true</value> + </option> + </options> + </identity-store> + <identity-store> + <id>PortalLDAPStore</id> + <class>org.picketlink.idm.impl.store.ldap.LDAPIdentityStoreImpl</class> + <external-config/> + <supported-relationship-types> + <relationship-type>JBOSS_IDENTITY_MEMBERSHIP</relationship-type> + </supported-relationship-types> + <supported-identity-object-types> + <identity-object-type> + <name>USER</name> + <relationships/> + <credentials> + <credential-type>PASSWORD</credential-type> + </credentials> + <attributes> + </attributes> + <options> + <option> + <name>idAttributeName</name> + <value>uid</value> + </option> + <option> + <name>passwordAttributeName</name> + <value>userPassword</value> + </option> + <option> + <name>ctxDNs</name> + <value>ou=People,o=portal,o=gatein,dc=example,dc=com</value> + </option> + <option> + <name>allowCreateEntry</name> + <value>true</value> + </option> + <option> + <name>createEntryAttributeValues</name> + <value>objectClass=top</value> + <value>objectClass=inetOrgPerson</value> + <value>sn= </value> + <value>cn= </value> + </option> + </options> + </identity-object-type> + <identity-object-type> + <name>GTN_GROUP_TYPE</name> + <relationships> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>USER</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>GTN_GROUP_TYPE</identity-object-type-ref> + </relationship> + </relationships> + <credentials/> + <attributes/> + <options> + <option> + <name>idAttributeName</name> + <value>cn</value> + </option> + <option> + <name>ctxDNs</name> + <value>ou=Groups,o=portal,o=gatein,dc=example,dc=com</value> + </option> +  +  +  +  + <option> + <name>allowCreateEntry</name> + <value>true</value> + </option> + <option> + <name>parentMembershipAttributeName</name> + <value>member</value> + </option> + <option> + <name>isParentMembershipAttributeDN</name> + <value>true</value> + </option> + <option> + <name>allowEmptyMemberships</name> + <value>true</value> + </option> + <option> + <name>createEntryAttributeValues</name> + <value>objectClass=top</value> + <value>objectClass=groupOfNames</value> + </option> + </options> + </identity-object-type> + </supported-identity-object-types> + <options> + <option> + <name>providerURL</name> + <value>ldap://localhost:1389</value> + </option> + <option> + <name>adminDN</name> + <value>cn=Directory Manager</value> + </option> + <option> + <name>adminPassword</name> + <value>password</value> + </option> + <option> + <name>searchTimeLimit</name> + <value>10000</value> + </option> + </options> + </identity-store> + <identity-store> + <id>SamplePortalLDAPStore</id> + <class>org.picketlink.idm.impl.store.ldap.LDAPIdentityStoreImpl</class> + <external-config/> + <supported-relationship-types> + <relationship-type>JBOSS_IDENTITY_MEMBERSHIP</relationship-type> + </supported-relationship-types> + <supported-identity-object-types> + <identity-object-type> + <name>USER</name> + <relationships/> + <credentials> + <credential-type>PASSWORD</credential-type> + </credentials> + <attributes> + </attributes> + <options> + <option> + <name>idAttributeName</name> + <value>uid</value> + </option> + <option> + <name>passwordAttributeName</name> + <value>userPassword</value> + </option> + <option> + <name>ctxDNs</name> + <value>ou=People,o=sample-portal,o=gatein,dc=example,dc=com</value> + </option> + <option> + <name>allowCreateEntry</name> + <value>true</value> + </option> + <option> + <name>createEntryAttributeValues</name> + <value>objectClass=top</value> + <value>objectClass=inetOrgPerson</value> + <value>sn= </value> + <value>cn= </value> + </option> + </options> + </identity-object-type> + <identity-object-type> + <name>GTN_GROUP_TYPE</name> + <relationships> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>USER</identity-object-type-ref> + </relationship> + <relationship> + <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> + <identity-object-type-ref>GTN_GROUP_TYPE</identity-object-type-ref> + </relationship> + </relationships> + <credentials/> + <attributes/> + <options> + <option> + <name>idAttributeName</name> + <value>cn</value> + </option> + <option> + <name>ctxDNs</name> + <value>ou=Groups,o=sample-portal,o=gatein,dc=example,dc=com</value> + </option> +  +  +  +  + <option> + <name>allowCreateEntry</name> + <value>true</value> + </option> + <option> + <name>parentMembershipAttributeName</name> + <value>member</value> + </option> + <option> + <name>isParentMembershipAttributeDN</name> + <value>true</value> + </option> + <option> + <name>allowEmptyMemberships</name> + <value>true</value> + </option> + <option> + <name>createEntryAttributeValues</name> + <value>objectClass=top</value> + <value>objectClass=groupOfNames</value> + </option> + </options> + </identity-object-type> + </supported-identity-object-types> + <options> + <option> + <name>providerURL</name> + <value>ldap://localhost:1389</value> + </option> + <option> + <name>adminDN</name> + <value>cn=Directory Manager</value> + </option> + <option> + <name>adminPassword</name> + <value>password</value> + </option> + <option> + <name>searchTimeLimit</name> + <value>10000</value> + </option> + </options> + </identity-store> + </identity-stores> + </stores> +</jboss-identity> \ No newline at end of file

14 years, 11 months

1
0
0 / 0

gatein SVN: r1165 - in components/mop/trunk: core/src/main/java/org/gatein/mop/core/api and 2 other directories.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-01-05 10:21:02 -0500 (Tue, 05 Jan 2010) New Revision: 1165 Removed: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/SharedSite.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/SharedSiteContainer.java Modified: components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/ObjectType.java components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/Workspace.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/ModelImpl.java components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceImpl.java components/mop/trunk/core/src/main/resources/conf/mop-nodetypes.xml Log: remove notion of shared site that may create future legacy and is not yet used Modified: components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/ObjectType.java =================================================================== --- components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/ObjectType.java 2010-01-05 15:07:37 UTC (rev 1164) +++ components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/ObjectType.java 2010-01-05 15:21:02 UTC (rev 1165) @@ -56,9 +56,6 @@ public static final ObjectType<Site> USER_SITE = new ObjectType<Site>(Site.class, SITE); /** . */ - public static final ObjectType<Site> SHARED_SITE = new ObjectType<Site>(Site.class, SITE); - - /** . */ public static final ObjectType<Page> PAGE = new ObjectType<Page>(Page.class); /** . */ Modified: components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/Workspace.java =================================================================== --- components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/Workspace.java 2010-01-05 15:07:37 UTC (rev 1164) +++ components/mop/trunk/api/src/main/java/org/gatein/mop/api/workspace/Workspace.java 2010-01-05 15:21:02 UTC (rev 1165) @@ -30,13 +30,6 @@ { /** - * Returns the default share site. - * - * @return the default shared site - */ - Site getSharedSite(); - - /** * Returns a specified site or null if it cannot be found. * * @param siteType the site type Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/ModelImpl.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/ModelImpl.java 2010-01-05 15:07:37 UTC (rev 1164) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/ModelImpl.java 2010-01-05 15:21:02 UTC (rev 1165) @@ -32,7 +32,6 @@ import org.gatein.mop.core.api.workspace.PageImpl; import org.gatein.mop.core.api.workspace.NavigationImpl; import org.gatein.mop.core.api.workspace.WorkspaceObjectImpl; -import org.gatein.mop.core.api.workspace.SharedSite; import org.gatein.mop.core.api.workspace.UIComponentImpl; import org.gatein.mop.core.api.workspace.PageLinkImpl; import org.gatein.mop.core.api.workspace.URLLinkImpl; @@ -71,7 +70,6 @@ tmp.put(ObjectType.PORTAL_SITE, PortalSite.class); tmp.put(ObjectType.GROUP_SITE, GroupSite.class); tmp.put(ObjectType.USER_SITE, UserSite.class); - tmp.put(ObjectType.SHARED_SITE, SharedSite.class); tmp.put(ObjectType.PAGE, PageImpl.class); tmp.put(ObjectType.NAVIGATION, NavigationImpl.class); tmp.put(ObjectType.COMPONENT, UIComponentImpl.class); Deleted: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/SharedSite.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/SharedSite.java 2010-01-05 15:07:37 UTC (rev 1164) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/SharedSite.java 2010-01-05 15:21:02 UTC (rev 1165) @@ -1,40 +0,0 @@ -/** - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.gatein.mop.core.api.workspace; - -import org.chromattic.api.annotations.NodeMapping; -import org.gatein.mop.core.api.workspace.SiteImpl; -import org.gatein.mop.api.workspace.ObjectType; -import org.gatein.mop.api.workspace.Site; - -/** - * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> - * @version $Revision$ - */ -@NodeMapping(name = "mop:sharedsite") -public abstract class SharedSite extends SiteImpl -{ - - // Site implementation *********************************************************************************************** - - public ObjectType<? extends Site> getObjectType() - { - return ObjectType.SHARED_SITE; - } -} \ No newline at end of file Deleted: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/SharedSiteContainer.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/SharedSiteContainer.java 2010-01-05 15:07:37 UTC (rev 1164) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/SharedSiteContainer.java 2010-01-05 15:21:02 UTC (rev 1165) @@ -1,37 +0,0 @@ -/** - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.gatein.mop.core.api.workspace; - -import org.chromattic.api.annotations.NodeMapping; -import org.chromattic.api.annotations.RelatedMappedBy; -import org.gatein.mop.core.api.workspace.SiteContainer; -import org.gatein.mop.core.api.workspace.WorkspaceImpl; - -/** - * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> - * @version $Revision$ - */ -@NodeMapping(name = "mop:sharedsites") -public abstract class SharedSiteContainer extends SiteContainer<SharedSite> -{ - - @RelatedMappedBy("sharedsites") - public abstract WorkspaceImpl getWorkspace(); - -} \ No newline at end of file Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceImpl.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceImpl.java 2010-01-05 15:07:37 UTC (rev 1164) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceImpl.java 2010-01-05 15:21:02 UTC (rev 1165) @@ -25,7 +25,6 @@ import org.gatein.mop.api.workspace.Workspace; import org.gatein.mop.api.workspace.Site; import org.gatein.mop.api.workspace.ObjectType; -import org.gatein.mop.api.workspace.WorkspaceObject; import org.gatein.mop.api.workspace.WorkspaceCustomizationContext; import org.gatein.mop.api.content.CustomizationContext; import org.gatein.mop.api.content.Customization; @@ -62,10 +61,6 @@ public abstract UserSiteContainer getUserSites(); @OneToOne - @MappedBy("sharedsites") - public abstract UserSiteContainer getSharedSites(); - - @OneToOne @MappedBy("customizations") public abstract CustomizationContainer getCustomizations(); @@ -128,10 +123,6 @@ { return (SiteContainer<S>)getUserSites(); } - else if (siteType == ObjectType.SHARED_SITE) - { - return (SiteContainer<S>)getSharedSites(); - } else { throw new UnsupportedOperationException(); @@ -160,9 +151,4 @@ SiteContainer<S> sites = getSiteContainer(siteType); return sites.addSite(name); } - - public Site getSharedSite() - { - return getSite(ObjectType.SHARED_SITE, "default"); - } } Modified: components/mop/trunk/core/src/main/resources/conf/mop-nodetypes.xml =================================================================== --- components/mop/trunk/core/src/main/resources/conf/mop-nodetypes.xml 2010-01-05 15:07:37 UTC (rev 1164) +++ components/mop/trunk/core/src/main/resources/conf/mop-nodetypes.xml 2010-01-05 15:21:02 UTC (rev 1165) @@ -349,12 +349,6 @@ </supertypes> </nodeType> - <nodeType name="mop:sharedsite" isMixin="false" hasOrderableChildNodes="false" primaryItemName=""> - <supertypes> - <supertype>mop:site</supertype> - </supertypes> - </nodeType> - <nodeType name="mop:portalsites" isMixin="false" hasOrderableChildNodes="false" primaryItemName=""> <supertypes> <supertype>nt:base</supertype> @@ -400,21 +394,6 @@ </childNodeDefinitions> </nodeType> - <nodeType name="mop:sharedsites" isMixin="false" hasOrderableChildNodes="false" primaryItemName=""> - <supertypes> - <supertype>nt:base</supertype> - <supertype>mix:referenceable</supertype> - </supertypes> - <childNodeDefinitions> - <childNodeDefinition name="*" defaultPrimaryType="mop:sharedsite" autoCreated="false" mandatory="false" - onParentVersion="COPY" protected="false" sameNameSiblings="false"> - <requiredPrimaryTypes> - <requiredPrimaryType>mop:sharedsite</requiredPrimaryType> - </requiredPrimaryTypes> - </childNodeDefinition> - </childNodeDefinitions> - </nodeType> - <nodeType name="mop:workspace" isMixin="false" hasOrderableChildNodes="false" primaryItemName=""> <supertypes> <supertype>mop:workspaceobject</supertype> @@ -439,12 +418,6 @@ <requiredPrimaryType>mop:usersites</requiredPrimaryType> </requiredPrimaryTypes> </childNodeDefinition> - <childNodeDefinition name="sharedsites" defaultPrimaryType="mop:sharedsites" autoCreated="true" mandatory="false" - onParentVersion="COPY" protected="false" sameNameSiblings="false"> - <requiredPrimaryTypes> - <requiredPrimaryType>mop:sharedsites</requiredPrimaryType> - </requiredPrimaryTypes> - </childNodeDefinition> </childNodeDefinitions> </nodeType>

14 years, 11 months

1
0
0 / 0

gatein SVN: r1164 - portal/trunk/component/test/organization/src/main/resources/conf.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-01-05 10:07:37 -0500 (Tue, 05 Jan 2010) New Revision: 1164 Removed: portal/trunk/component/test/organization/src/main/resources/conf/organization/ Log: remove empty dir

14 years, 11 months

1
0
0 / 0

gatein SVN: r1163 - in portal/trunk/component: application-registry/src/test/java/org/exoplatform/application and 13 other directories.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-01-05 10:01:32 -0500 (Tue, 05 Jan 2010) New Revision: 1163 Added: portal/trunk/component/application-registry/src/test/java/conf/exo.portal.component.application-registry-configuration.xml portal/trunk/component/common/src/test/resources/conf/exo.portal.component.common-configuration.xml portal/trunk/component/portal/src/test/java/conf/exo.portal.component.portal-configuration1.xml portal/trunk/component/portal/src/test/java/conf/exo.portal.component.portal-configuration2.xml portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-configuration.xml portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-repository-configuration.xml portal/trunk/component/test/organization/src/main/resources/conf/exo.portal.component.test.organization-configuration.xml portal/trunk/component/test/organization/src/main/resources/conf/mappings/ portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObject.hbm.xml portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectAttribute.hbm.xml portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectAttributeBinaryValue.hbm.xml portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectCredential.hbm.xml portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectCredentialBinaryValue.hbm.xml portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectCredentialType.hbm.xml portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectRelationship.hbm.xml portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectRelationshipName.hbm.xml portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectRelationshipType.hbm.xml portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectType.hbm.xml portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateRealm.hbm.xml portal/trunk/component/test/organization/src/main/resources/conf/picketlink-idm-config.xml portal/trunk/component/wsrp/src/test/resources/conf/exo.portal.component.wsrp-configuration.xml Removed: portal/trunk/component/application-registry/src/test/java/conf/application-registry-configuration.xml portal/trunk/component/common/src/test/resources/conf/chromattic-configuration.xml portal/trunk/component/portal/src/test/java/conf/portal-configuration.xml portal/trunk/component/portal/src/test/java/conf/portal/ portal/trunk/component/test/jcr/src/main/resources/conf/jcr/ portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObject.hbm.xml portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectAttribute.hbm.xml portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectAttributeBinaryValue.hbm.xml portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectCredential.hbm.xml portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectCredentialBinaryValue.hbm.xml portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectCredentialType.hbm.xml portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectRelationship.hbm.xml portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectRelationshipName.hbm.xml portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectRelationshipType.hbm.xml portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectType.hbm.xml portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateRealm.hbm.xml portal/trunk/component/test/organization/src/main/resources/conf/organization/organization-configuration.xml portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/ portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/picketlink-idm-config.xml portal/trunk/component/wsrp/src/test/resources/conf/wsrp-configuration.xml Modified: portal/trunk/component/application-registry/src/test/java/org/exoplatform/application/AbstractApplicationRegistryTest.java portal/trunk/component/common/src/test/java/org/exoplatform/commons/chromattic/ChromatticIntegrationTestCase.java portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/AbstractPortalTest.java portal/trunk/component/test/jcr/src/test/java/org/exoplatform/component/test/jcr/BootstrapTestCase.java portal/trunk/component/test/organization/src/test/java/org/exoplatform/component/test/organization/BootstrapTestCase.java portal/trunk/component/wsrp/src/test/java/org/gatein/portal/wsrp/state/consumer/ConsumerRegistryTestCase.java Log: use configuration files identified by the artifact id of the module they are to avoid any naming issue when loading configuration Deleted: portal/trunk/component/application-registry/src/test/java/conf/application-registry-configuration.xml =================================================================== --- portal/trunk/component/application-registry/src/test/java/conf/application-registry-configuration.xml 2010-01-05 13:57:00 UTC (rev 1162) +++ portal/trunk/component/application-registry/src/test/java/conf/application-registry-configuration.xml 2010-01-05 15:01:32 UTC (rev 1163) @@ -1,593 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - - -<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> - - <component> - <key>org.exoplatform.application.registry.ApplicationRegistryService</key> - <type>org.exoplatform.application.registry.impl.ApplicationRegistryServiceImpl</type> -  - </component> - - <external-component-plugins> - <target-component>org.exoplatform.commons.chromattic.ChromatticManager</target-component> - <component-plugin> - <name>chromattic</name> - <set-method>addLifeCycle</set-method> - <type>org.exoplatform.application.registry.impl.ApplicationRegistryChromatticLifeCycle</type> - <init-params> - <value-param> - <name>domain-name</name> - <value>app</value> - </value-param> - <value-param> - <name>workspace-name</name> - <value>portal-test</value> - </value-param> - <values-param> - <name>entities</name> - <value>org.exoplatform.application.registry.impl.ContentRegistry</value> - <value>org.exoplatform.application.registry.impl.CategoryDefinition</value> - <value>org.exoplatform.application.registry.impl.ContentDefinition</value> - <value>org.exoplatform.application.gadget.impl.GadgetRegistry</value> - <value>org.exoplatform.application.gadget.impl.GadgetDefinition</value> - <value>org.exoplatform.application.gadget.impl.LocalGadgetData</value> - <value>org.exoplatform.application.gadget.impl.RemoteGadgetData</value> - <value>org.chromattic.ntdef.NTFile</value> - <value>org.chromattic.ntdef.NTFolder</value> - <value>org.chromattic.ntdef.NTResource</value> - </values-param> - </init-params> - </component-plugin> - </external-component-plugins> - - <external-component-plugins> - <target-component>org.exoplatform.services.jcr.RepositoryService</target-component> - <component-plugin> - <name>add.namespaces</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.jcr.impl.AddNamespacesPlugin</type> - <init-params> - <properties-param> - <name>namespaces</name> - <property name="app" value="http://www.gatein.org/jcr/application-registry/1.0/"/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>add.nodeType</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.jcr.impl.AddNodeTypePlugin</type> - <init-params> - <values-param> - <name>autoCreatedInNewRepository</name> - <description>Node types configuration file</description> - <value>jar:/conf/application-nodetypes.xml</value> - </values-param> - </init-params> - </component-plugin> - </external-component-plugins> - - <external-component-plugins> - <target-component>org.exoplatform.portal.config.UserPortalConfigService</target-component> - <component-plugin> - <name>new.portal.config.user.listener</name> - <set-method>initListener</set-method> - <type>org.exoplatform.portal.config.NewPortalConfigListener</type> - <description>this listener init the portal configuration</description> - <init-params> - <value-param> - <name>default.portal</name> - <description>The default portal for checking db is empty or not</description> - <value>classic</value> - </value-param> - <value-param> - <name>initializing.failure.ignore</name> - <description>In the run method, use try catch or not (value is true/false)</description> - <value>true</value> - </value-param> - <object-param> - <name>portal.configuration</name> - <description>description</description> - <object type="org.exoplatform.portal.config.NewPortalConfig"> - <field name="predefinedOwner"> - <collection type="java.util.HashSet"> - <value> - <string>classic</string> - </value> - <value> - <string>test</string> - </value> - </collection> - </field> - <field name="ownerType"> - <string>portal</string> - </field> - <field name="templateLocation"> - <string>classpath:/portal</string> - </field> - </object> - </object-param> - <object-param> - <name>group.configuration</name> - <description>description</description> - <object type="org.exoplatform.portal.config.NewPortalConfig"> - <field name="predefinedOwner"> - <collection type="java.util.HashSet"> - <value> - <string>platform/administrators</string> - </value> - <value> - <string>platform/users</string> - </value> - <value> - <string>platform/guests</string> - </value> - <value> - <string>platform/test/legacy</string> - </value> - <value> - <string>platform/test/normalized</string> - </value> - <value> - <string>organization/management/executive-board</string> - </value> - </collection> - </field> - <field name="ownerType"> - <string>group</string> - </field> - <field name="templateLocation"> - <string>classpath:/portal</string> - </field> - </object> - </object-param> - <object-param> - <name>user.configuration</name> - <description>description</description> - <object type="org.exoplatform.portal.config.NewPortalConfig"> - <field name="predefinedOwner"> - <collection type="java.util.HashSet"> - <value> - <string>root</string> - </value> - <value> - <string>john</string> - </value> - <value> - <string>mary</string> - </value> - <value> - <string>demo</string> - </value> - <value> - <string>overwritelayout</string> - </value> - </collection> - </field> - <field name="ownerType"> - <string>user</string> - </field> - <field name="templateLocation"> - <string>classpath:/portal</string> - </field> - </object> - </object-param> - <object-param> - <name>page.templates</name> - <description>List of page templates</description> - <object type="org.exoplatform.portal.config.PageTemplateConfig"> - <field name="templates"> - <collection type="java.util.ArrayList"></collection> - </field> - <field name="location"> - <string>classpath:/portal/template/pages</string> - </field> - </object> - </object-param> - </init-params> - </component-plugin> - </external-component-plugins> - - <external-component-plugins> - <target-component>org.exoplatform.services.organization.OrganizationService</target-component> - <component-plugin> - <name>init.service.listener</name> - <set-method>addListenerPlugin</set-method> - <type>org.exoplatform.services.organization.OrganizationDatabaseInitializer</type> - <description>this listener populate organization data for the first launch</description> - <init-params> - <value-param> - <name>checkDatabaseAlgorithm</name> - <description>check database</description> - <value>entry</value> - </value-param> - <value-param> - <name>printInformation</name> - <description>Print information init database</description> - <value>true</value> - </value-param> - <object-param> - <name>configuration</name> - <description>description</description> - <object type="org.exoplatform.services.organization.OrganizationConfig"> - <field name="membershipType"> - <collection type="java.util.ArrayList"> - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$MembershipType"> - <field name="type"><string>member</string></field> - <field name="description"><string>member membership type</string></field> - </object> - </value> - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$MembershipType"> - <field name="type"><string>MembershipType_1</string></field> - <field name="description"><string>MembershipType_1 membership type</string></field> - </object> - </value> - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$MembershipType"> - <field name="type"><string>MembershipType_2</string></field> - <field name="description"><string>MembershipType_2 membership type</string></field> - </object> - </value> - </collection> - </field> - - <field name="group"> - <collection type="java.util.ArrayList"> - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> - <field name="name"><string>platform</string></field> - <field name="parentId"><string></string></field> - <field name="description"><string>the /platform group</string></field> - <field name="label"><string>Platform</string></field> - </object> - </value> - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> - <field name="name"><string>users</string></field> - <field name="parentId"><string>/platform</string></field> - <field name="description"><string>the /platform/users group</string></field> - <field name="label"><string>Users</string></field> - </object> - </value> - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> - <field name="name"><string>Group1</string></field> - <field name="parentId"><string>/platform/users</string></field> - <field name="description"><string>the /platform/users/Group1 group</string></field> - <field name="label"><string>Group1</string></field> - </object> - </value> - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> - <field name="name"><string>Group2</string></field> - <field name="parentId"><string>/platform/users</string></field> - <field name="description"><string>the /platform/users/Group2 group</string></field> - <field name="label"><string>Group2</string></field> - </object> - </value> - </collection> - </field> - - <field name="user"> - <collection type="java.util.ArrayList"> - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$User"> - <field name="userName"><string>demo</string></field> - <field name="password"><string>gtn</string></field> - <field name="firstName"><string>Demo</string></field> - <field name="lastName"><string>gtn</string></field> - <field name="email"><string>demo@localhost</string></field> - <field name="groups"> - <string>member:/platform/users</string> - </field> - </object> - </value> - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$User"> - <field name="userName"><string>userName_1</string></field> - <field name="password"><string>default</string></field> - <field name="firstName"><string>default</string></field> - <field name="lastName"><string>default</string></field> - <field name="email"><string>exo(a)exoportal.org</string></field> - <field name="groups"> - <string>member:/platform/users</string> - </field> - </object> - </value> - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$User"> - <field name="userName"><string>userName_2</string></field> - <field name="password"><string>default</string></field> - <field name="firstName"><string>default</string></field> - <field name="lastName"><string>default</string></field> - <field name="email"><string>exo(a)exoportal.org</string></field> - <field name="groups"> - <string>member:/platform/users</string> - </field> - </object> - </value> - -  - - </collection> - </field> - </object> - </object-param> - </init-params> - </component-plugin> - - </external-component-plugins> - -</configuration> Copied: portal/trunk/component/application-registry/src/test/java/conf/exo.portal.component.application-registry-configuration.xml (from rev 1154, portal/trunk/component/application-registry/src/test/java/conf/application-registry-configuration.xml) =================================================================== --- portal/trunk/component/application-registry/src/test/java/conf/exo.portal.component.application-registry-configuration.xml (rev 0) +++ portal/trunk/component/application-registry/src/test/java/conf/exo.portal.component.application-registry-configuration.xml 2010-01-05 15:01:32 UTC (rev 1163) @@ -0,0 +1,593 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> + + <component> + <key>org.exoplatform.application.registry.ApplicationRegistryService</key> + <type>org.exoplatform.application.registry.impl.ApplicationRegistryServiceImpl</type> +  + </component> + + <external-component-plugins> + <target-component>org.exoplatform.commons.chromattic.ChromatticManager</target-component> + <component-plugin> + <name>chromattic</name> + <set-method>addLifeCycle</set-method> + <type>org.exoplatform.application.registry.impl.ApplicationRegistryChromatticLifeCycle</type> + <init-params> + <value-param> + <name>domain-name</name> + <value>app</value> + </value-param> + <value-param> + <name>workspace-name</name> + <value>portal-test</value> + </value-param> + <values-param> + <name>entities</name> + <value>org.exoplatform.application.registry.impl.ContentRegistry</value> + <value>org.exoplatform.application.registry.impl.CategoryDefinition</value> + <value>org.exoplatform.application.registry.impl.ContentDefinition</value> + <value>org.exoplatform.application.gadget.impl.GadgetRegistry</value> + <value>org.exoplatform.application.gadget.impl.GadgetDefinition</value> + <value>org.exoplatform.application.gadget.impl.LocalGadgetData</value> + <value>org.exoplatform.application.gadget.impl.RemoteGadgetData</value> + <value>org.chromattic.ntdef.NTFile</value> + <value>org.chromattic.ntdef.NTFolder</value> + <value>org.chromattic.ntdef.NTResource</value> + </values-param> + </init-params> + </component-plugin> + </external-component-plugins> + + <external-component-plugins> + <target-component>org.exoplatform.services.jcr.RepositoryService</target-component> + <component-plugin> + <name>add.namespaces</name> + <set-method>addPlugin</set-method> + <type>org.exoplatform.services.jcr.impl.AddNamespacesPlugin</type> + <init-params> + <properties-param> + <name>namespaces</name> + <property name="app" value="http://www.gatein.org/jcr/application-registry/1.0/"/> + </properties-param> + </init-params> + </component-plugin> + <component-plugin> + <name>add.nodeType</name> + <set-method>addPlugin</set-method> + <type>org.exoplatform.services.jcr.impl.AddNodeTypePlugin</type> + <init-params> + <values-param> + <name>autoCreatedInNewRepository</name> + <description>Node types configuration file</description> + <value>jar:/conf/application-nodetypes.xml</value> + </values-param> + </init-params> + </component-plugin> + </external-component-plugins> + + <external-component-plugins> + <target-component>org.exoplatform.portal.config.UserPortalConfigService</target-component> + <component-plugin> + <name>new.portal.config.user.listener</name> + <set-method>initListener</set-method> + <type>org.exoplatform.portal.config.NewPortalConfigListener</type> + <description>this listener init the portal configuration</description> + <init-params> + <value-param> + <name>default.portal</name> + <description>The default portal for checking db is empty or not</description> + <value>classic</value> + </value-param> + <value-param> + <name>initializing.failure.ignore</name> + <description>In the run method, use try catch or not (value is true/false)</description> + <value>true</value> + </value-param> + <object-param> + <name>portal.configuration</name> + <description>description</description> + <object type="org.exoplatform.portal.config.NewPortalConfig"> + <field name="predefinedOwner"> + <collection type="java.util.HashSet"> + <value> + <string>classic</string> + </value> + <value> + <string>test</string> + </value> + </collection> + </field> + <field name="ownerType"> + <string>portal</string> + </field> + <field name="templateLocation"> + <string>classpath:/portal</string> + </field> + </object> + </object-param> + <object-param> + <name>group.configuration</name> + <description>description</description> + <object type="org.exoplatform.portal.config.NewPortalConfig"> + <field name="predefinedOwner"> + <collection type="java.util.HashSet"> + <value> + <string>platform/administrators</string> + </value> + <value> + <string>platform/users</string> + </value> + <value> + <string>platform/guests</string> + </value> + <value> + <string>platform/test/legacy</string> + </value> + <value> + <string>platform/test/normalized</string> + </value> + <value> + <string>organization/management/executive-board</string> + </value> + </collection> + </field> + <field name="ownerType"> + <string>group</string> + </field> + <field name="templateLocation"> + <string>classpath:/portal</string> + </field> + </object> + </object-param> + <object-param> + <name>user.configuration</name> + <description>description</description> + <object type="org.exoplatform.portal.config.NewPortalConfig"> + <field name="predefinedOwner"> + <collection type="java.util.HashSet"> + <value> + <string>root</string> + </value> + <value> + <string>john</string> + </value> + <value> + <string>mary</string> + </value> + <value> + <string>demo</string> + </value> + <value> + <string>overwritelayout</string> + </value> + </collection> + </field> + <field name="ownerType"> + <string>user</string> + </field> + <field name="templateLocation"> + <string>classpath:/portal</string> + </field> + </object> + </object-param> + <object-param> + <name>page.templates</name> + <description>List of page templates</description> + <object type="org.exoplatform.portal.config.PageTemplateConfig"> + <field name="templates"> + <collection type="java.util.ArrayList"></collection> + </field> + <field name="location"> + <string>classpath:/portal/template/pages</string> + </field> + </object> + </object-param> + </init-params> + </component-plugin> + </external-component-plugins> + + <external-component-plugins> + <target-component>org.exoplatform.services.organization.OrganizationService</target-component> + <component-plugin> + <name>init.service.listener</name> + <set-method>addListenerPlugin</set-method> + <type>org.exoplatform.services.organization.OrganizationDatabaseInitializer</type> + <description>this listener populate organization data for the first launch</description> + <init-params> + <value-param> + <name>checkDatabaseAlgorithm</name> + <description>check database</description> + <value>entry</value> + </value-param> + <value-param> + <name>printInformation</name> + <description>Print information init database</description> + <value>true</value> + </value-param> + <object-param> + <name>configuration</name> + <description>description</description> + <object type="org.exoplatform.services.organization.OrganizationConfig"> + <field name="membershipType"> + <collection type="java.util.ArrayList"> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$MembershipType"> + <field name="type"><string>member</string></field> + <field name="description"><string>member membership type</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$MembershipType"> + <field name="type"><string>MembershipType_1</string></field> + <field name="description"><string>MembershipType_1 membership type</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$MembershipType"> + <field name="type"><string>MembershipType_2</string></field> + <field name="description"><string>MembershipType_2 membership type</string></field> + </object> + </value> + </collection> + </field> + + <field name="group"> + <collection type="java.util.ArrayList"> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>platform</string></field> + <field name="parentId"><string></string></field> + <field name="description"><string>the /platform group</string></field> + <field name="label"><string>Platform</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>users</string></field> + <field name="parentId"><string>/platform</string></field> + <field name="description"><string>the /platform/users group</string></field> + <field name="label"><string>Users</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>Group1</string></field> + <field name="parentId"><string>/platform/users</string></field> + <field name="description"><string>the /platform/users/Group1 group</string></field> + <field name="label"><string>Group1</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>Group2</string></field> + <field name="parentId"><string>/platform/users</string></field> + <field name="description"><string>the /platform/users/Group2 group</string></field> + <field name="label"><string>Group2</string></field> + </object> + </value> + </collection> + </field> + + <field name="user"> + <collection type="java.util.ArrayList"> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$User"> + <field name="userName"><string>demo</string></field> + <field name="password"><string>gtn</string></field> + <field name="firstName"><string>Demo</string></field> + <field name="lastName"><string>gtn</string></field> + <field name="email"><string>demo@localhost</string></field> + <field name="groups"> + <string>member:/platform/users</string> + </field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$User"> + <field name="userName"><string>userName_1</string></field> + <field name="password"><string>default</string></field> + <field name="firstName"><string>default</string></field> + <field name="lastName"><string>default</string></field> + <field name="email"><string>exo(a)exoportal.org</string></field> + <field name="groups"> + <string>member:/platform/users</string> + </field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$User"> + <field name="userName"><string>userName_2</string></field> + <field name="password"><string>default</string></field> + <field name="firstName"><string>default</string></field> + <field name="lastName"><string>default</string></field> + <field name="email"><string>exo(a)exoportal.org</string></field> + <field name="groups"> + <string>member:/platform/users</string> + </field> + </object> + </value> + +  + + </collection> + </field> + </object> + </object-param> + </init-params> + </component-plugin> + + </external-component-plugins> + +</configuration> Modified: portal/trunk/component/application-registry/src/test/java/org/exoplatform/application/AbstractApplicationRegistryTest.java =================================================================== --- portal/trunk/component/application-registry/src/test/java/org/exoplatform/application/AbstractApplicationRegistryTest.java 2010-01-05 13:57:00 UTC (rev 1162) +++ portal/trunk/component/application-registry/src/test/java/org/exoplatform/application/AbstractApplicationRegistryTest.java 2010-01-05 15:01:32 UTC (rev 1163) @@ -28,10 +28,10 @@ * @version $Revision$ */ @ConfiguredBy({ - @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/jcr/jcr-configuration.xml"), - @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/organization/organization-configuration.xml"), - @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/application-registry-configuration.xml"), - @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/portal/portal-configuration.xml") + @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/exo.portal.component.test.jcr-configuration.xml"), + @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/exo.portal.component.test.organization-configuration.xml"), + @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/exo.portal.component.application-registry-configuration.xml"), + @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/exo.portal.component.portal-configuration1.xml") }) public abstract class AbstractApplicationRegistryTest extends AbstractGateInTest { Modified: portal/trunk/component/common/src/test/java/org/exoplatform/commons/chromattic/ChromatticIntegrationTestCase.java =================================================================== --- portal/trunk/component/common/src/test/java/org/exoplatform/commons/chromattic/ChromatticIntegrationTestCase.java 2010-01-05 13:57:00 UTC (rev 1162) +++ portal/trunk/component/common/src/test/java/org/exoplatform/commons/chromattic/ChromatticIntegrationTestCase.java 2010-01-05 15:01:32 UTC (rev 1163) @@ -34,8 +34,8 @@ * @version $Revision$ */ @ConfiguredBy({ - @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/jcr/jcr-configuration.xml"), - @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/chromattic-configuration.xml") + @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/exo.portal.component.test.jcr-configuration.xml"), + @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/exo.portal.component.common-configuration.xml") }) public class ChromatticIntegrationTestCase extends AbstractGateInTest { Deleted: portal/trunk/component/common/src/test/resources/conf/chromattic-configuration.xml =================================================================== --- portal/trunk/component/common/src/test/resources/conf/chromattic-configuration.xml 2010-01-05 13:57:00 UTC (rev 1162) +++ portal/trunk/component/common/src/test/resources/conf/chromattic-configuration.xml 2010-01-05 15:01:32 UTC (rev 1163) @@ -1,52 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - - -<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> - <component> - <key>org.exoplatform.commons.chromattic.ChromatticManager</key> - <type>org.exoplatform.commons.chromattic.ChromatticManager</type> - </component> - <external-component-plugins> - <target-component>org.exoplatform.commons.chromattic.ChromatticManager</target-component> - <component-plugin> - <name>chromattic</name> - <set-method>addLifeCycle</set-method> - <type>org.exoplatform.commons.chromattic.ChromatticLifeCycle</type> - <init-params> - <value-param> - <name>domain-name</name> - <value>test</value> - </value-param> - <value-param> - <name>workspace-name</name> - <value>portal-test</value> - </value-param> - <values-param> - <name>entities</name> - <value>org.exoplatform.commons.chromattic.FooEntity</value> - </values-param> - </init-params> - </component-plugin> - </external-component-plugins> -</configuration> Copied: portal/trunk/component/common/src/test/resources/conf/exo.portal.component.common-configuration.xml (from rev 1159, portal/trunk/component/common/src/test/resources/conf/chromattic-configuration.xml) =================================================================== --- portal/trunk/component/common/src/test/resources/conf/exo.portal.component.common-configuration.xml (rev 0) +++ portal/trunk/component/common/src/test/resources/conf/exo.portal.component.common-configuration.xml 2010-01-05 15:01:32 UTC (rev 1163) @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> + <component> + <key>org.exoplatform.commons.chromattic.ChromatticManager</key> + <type>org.exoplatform.commons.chromattic.ChromatticManager</type> + </component> + <external-component-plugins> + <target-component>org.exoplatform.commons.chromattic.ChromatticManager</target-component> + <component-plugin> + <name>chromattic</name> + <set-method>addLifeCycle</set-method> + <type>org.exoplatform.commons.chromattic.ChromatticLifeCycle</type> + <init-params> + <value-param> + <name>domain-name</name> + <value>test</value> + </value-param> + <value-param> + <name>workspace-name</name> + <value>portal-test</value> + </value-param> + <values-param> + <name>entities</name> + <value>org.exoplatform.commons.chromattic.FooEntity</value> + </values-param> + </init-params> + </component-plugin> + </external-component-plugins> +</configuration> Copied: portal/trunk/component/portal/src/test/java/conf/exo.portal.component.portal-configuration1.xml (from rev 1154, portal/trunk/component/portal/src/test/java/conf/portal/portal-configuration.xml) =================================================================== --- portal/trunk/component/portal/src/test/java/conf/exo.portal.component.portal-configuration1.xml (rev 0) +++ portal/trunk/component/portal/src/test/java/conf/exo.portal.component.portal-configuration1.xml 2010-01-05 15:01:32 UTC (rev 1163) @@ -0,0 +1,230 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> + + <component> + <key>org.exoplatform.services.cache.CacheService</key> + <jmx-name>cache:type=CacheService</jmx-name> + <type>org.exoplatform.services.cache.impl.CacheServiceImpl</type> + <init-params> + <object-param> + <name>cache.config.default</name> + <description>The default cache configuration</description> + <object type="org.exoplatform.services.cache.ExoCacheConfig"> + <field name="name"><string>default</string></field> + <field name="maxSize"><int>300</int></field> + <field name="liveTime"><long>6000</long></field> + <field name="distributed"><boolean>false</boolean></field> + <field name="implementation"><string>org.exoplatform.services.cache.concurrent.ConcurrentFIFOExoCache</string></field> + </object> + </object-param> + </init-params> + </component> + + <component> + <key>org.exoplatform.services.security.Authenticator</key> + <type>org.exoplatform.services.organization.auth.OrganizationAuthenticatorImpl</type> + </component> + + <component> + <key>org.exoplatform.services.listener.ListenerService</key> + <type>org.exoplatform.services.listener.ListenerService</type> + </component> + + <component> + <key>org.exoplatform.commons.chromattic.ChromatticManager</key> + <type>org.exoplatform.commons.chromattic.ChromatticManager</type> + </component> + + <component> + <key>org.exoplatform.portal.pom.config.POMSessionManager</key> + <type>org.exoplatform.portal.pom.config.POMSessionManager</type> + </component> + + <component> + <key>org.exoplatform.portal.pom.data.ModelDataStorage</key> + <type>org.exoplatform.portal.pom.config.POMDataStorage</type> + </component> + + <component> + <key>org.exoplatform.portal.config.DataStorage</key> + <type>org.exoplatform.portal.config.DataStorageImpl</type> + </component> + + <component> + <key>org.exoplatform.services.jcr.ext.hierarchy.NodeHierarchyCreator</key> + <type>org.exoplatform.services.jcr.ext.hierarchy.impl.NodeHierarchyCreatorImpl</type> + </component> + + <component> + <key>org.exoplatform.portal.config.UserACL</key> + <type>org.exoplatform.portal.config.UserACL</type> + <init-params> + <value-param> + <name>super.user</name> + <description>administrator</description> + <value>root</value> + </value-param> + <value-param> + <name>guests.group</name> + <description>guests group</description> + <value>/platform/guests</value> + </value-param> + <value-param> + <name>navigation.creator.membership.type</name> + <description>specific membership type have full permission with group navigation</description> + <value>manager</value> + </value-param> + </init-params> + </component> + + <component> + <key>org.exoplatform.portal.config.UserPortalConfigService</key> + <type>org.exoplatform.portal.config.UserPortalConfigService</type> + </component> + + <external-component-plugins> + <target-component>org.exoplatform.services.jcr.RepositoryService</target-component> + <component-plugin> + <name>add.namespaces</name> + <set-method>addPlugin</set-method> + <type>org.exoplatform.services.jcr.impl.AddNamespacesPlugin</type> + <init-params> + <properties-param> + <name>namespaces</name> + <property name="mop" value="http://www.gatein.org/jcr/mop/1.0/"/> + </properties-param> + </init-params> + </component-plugin> + <component-plugin> + <name>add.nodeType</name> + <set-method>addPlugin</set-method> + <type>org.exoplatform.services.jcr.impl.AddNodeTypePlugin</type> + <init-params> + <values-param> + <name>autoCreatedInNewRepository</name> + <description>Node types configuration file</description> + <value>jar:/conf/mop-nodetypes.xml</value> + <value>jar:/conf/content-nodetypes.xml</value> + </values-param> + </init-params> + </component-plugin> + </external-component-plugins> + + <external-component-plugins> + <target-component>org.exoplatform.commons.chromattic.ChromatticManager</target-component> + <component-plugin> + <name>chromattic</name> + <set-method>addLifeCycle</set-method> + <type>org.exoplatform.portal.pom.config.MOPChromatticLifeCycle</type> + <init-params> + <value-param> + <name>domain-name</name> + <value>mop</value> + </value-param> + <value-param> + <name>workspace-name</name> + <value>portal-test</value> + </value-param> + <values-param> + <name>entities</name> + <value>org.gatein.mop.core.api.workspace.WorkspaceImpl</value> + <value>org.gatein.mop.core.api.workspace.UIContainerImpl</value> + <value>org.gatein.mop.core.api.workspace.UIWindowImpl</value> + <value>org.gatein.mop.core.api.workspace.UIBodyImpl</value> + <value>org.gatein.mop.core.api.workspace.PageImpl</value> + <value>org.gatein.mop.core.api.workspace.PageContainer</value> + <value>org.gatein.mop.core.api.workspace.NavigationImpl</value> + <value>org.gatein.mop.core.api.workspace.NavigationContainer</value> + <value>org.gatein.mop.core.api.workspace.PageLinkImpl</value> + <value>org.gatein.mop.core.api.workspace.URLLinkImpl</value> + <value>org.gatein.mop.core.api.workspace.PortalSiteContainer</value> + <value>org.gatein.mop.core.api.workspace.PortalSite</value> + <value>org.gatein.mop.core.api.workspace.GroupSiteContainer</value> + <value>org.gatein.mop.core.api.workspace.GroupSite</value> + <value>org.gatein.mop.core.api.workspace.UserSiteContainer</value> + <value>org.gatein.mop.core.api.workspace.UserSite</value> + <value>org.gatein.mop.core.api.workspace.content.CustomizationContainer</value> + <value>org.gatein.mop.core.api.workspace.content.ContextTypeContainer</value> + <value>org.gatein.mop.core.api.workspace.content.ContextType</value> + <value>org.gatein.mop.core.api.workspace.content.ContextSpecialization</value> + <value>org.gatein.mop.core.api.workspace.content.WorkspaceClone</value> + <value>org.gatein.mop.core.api.workspace.content.WorkspaceSpecialization</value> + <value>org.exoplatform.portal.pom.spi.portlet.PortletState</value> + <value>org.exoplatform.portal.pom.spi.portlet.PreferenceState</value> + <value>org.exoplatform.portal.pom.spi.gadget.GadgetState</value> + <value>org.exoplatform.portal.pom.spi.wsrp.WSRPState</value> + </values-param> + </init-params> + </component-plugin> + </external-component-plugins> + + <external-component-plugins> + <target-component>org.exoplatform.services.organization.OrganizationService</target-component> + <component-plugin> + <name>new.user.event.listener</name> + <set-method>addListenerPlugin</set-method> + <type>org.exoplatform.services.organization.impl.NewUserEventListener</type> + <description>this listener assign group and membership to a new created user</description> + <init-params> + <object-param> + <name>configuration</name> + <description>description</description> + <object type="org.exoplatform.services.organization.impl.NewUserConfig"> + <field name="group"> + <collection type="java.util.ArrayList"> + <value> + <object type="org.exoplatform.services.organization.impl.NewUserConfig$JoinGroup"> + <field name="groupId"><string>/platform/users</string></field> + <field name="membership"><string>member</string></field> + </object> + </value> + </collection> + </field> + <field name="ignoredUser"> + <collection type="java.util.HashSet"> + <value><string>root</string></value> + <value><string>john</string></value> + <value><string>mary</string></value> + <value><string>demo</string></value> + </collection> + </field> + </object> + </object-param> + </init-params> + </component-plugin> + <component-plugin> + <name>user.portal.config.listener</name> + <set-method>addListenerPlugin</set-method> + <type>org.exoplatform.portal.config.UserPortalConfigListener</type> + </component-plugin> + <component-plugin> + <name>group.portal.config.listener</name> + <set-method>addListenerPlugin</set-method> + <type>org.exoplatform.portal.config.GroupPortalConfigListener</type> + </component-plugin> + </external-component-plugins> + +</configuration> Copied: portal/trunk/component/portal/src/test/java/conf/exo.portal.component.portal-configuration2.xml (from rev 1159, portal/trunk/component/portal/src/test/java/conf/portal-configuration.xml) =================================================================== --- portal/trunk/component/portal/src/test/java/conf/exo.portal.component.portal-configuration2.xml (rev 0) +++ portal/trunk/component/portal/src/test/java/conf/exo.portal.component.portal-configuration2.xml 2010-01-05 15:01:32 UTC (rev 1163) @@ -0,0 +1,406 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> + + <external-component-plugins> + <target-component>org.exoplatform.portal.config.UserPortalConfigService</target-component> + <component-plugin> + <name>new.portal.config.user.listener</name> + <set-method>initListener</set-method> + <type>org.exoplatform.portal.config.NewPortalConfigListener</type> + <description>this listener init the portal configuration</description> + <init-params> + <value-param> + <name>default.portal</name> + <description>The default portal for checking db is empty or not</description> + <value>classic</value> + </value-param> + <value-param> + <name>initializing.failure.ignore</name> + <description>In the run method, use try catch or not (value is true/false)</description> + <value>true</value> + </value-param> + <object-param> + <name>portal.configuration</name> + <description>description</description> + <object type="org.exoplatform.portal.config.NewPortalConfig"> + <field name="predefinedOwner"> + <collection type="java.util.HashSet"> + <value> + <string>classic</string> + </value> + <value> + <string>test</string> + </value> + </collection> + </field> + <field name="ownerType"> + <string>portal</string> + </field> + <field name="templateLocation"> + <string>classpath:/portal</string> + </field> + </object> + </object-param> + <object-param> + <name>group.configuration</name> + <description>description</description> + <object type="org.exoplatform.portal.config.NewPortalConfig"> + <field name="predefinedOwner"> + <collection type="java.util.HashSet"> + <value> + <string>platform/administrators</string> + </value> + <value> + <string>platform/users</string> + </value> + <value> + <string>platform/guests</string> + </value> + <value> + <string>platform/test/legacy</string> + </value> + <value> + <string>platform/test/normalized</string> + </value> + <value> + <string>organization/management/executive-board</string> + </value> + </collection> + </field> + <field name="ownerType"> + <string>group</string> + </field> + <field name="templateLocation"> + <string>classpath:/portal</string> + </field> + </object> + </object-param> + <object-param> + <name>user.configuration</name> + <description>description</description> + <object type="org.exoplatform.portal.config.NewPortalConfig"> + <field name="predefinedOwner"> + <collection type="java.util.HashSet"> + <value> + <string>root</string> + </value> + <value> + <string>john</string> + </value> + <value> + <string>mary</string> + </value> + <value> + <string>demo</string> + </value> + <value> + <string>overwritelayout</string> + </value> + </collection> + </field> + <field name="ownerType"> + <string>user</string> + </field> + <field name="templateLocation"> + <string>classpath:/portal</string> + </field> + </object> + </object-param> + <object-param> + <name>page.templates</name> + <description>List of page templates</description> + <object type="org.exoplatform.portal.config.PageTemplateConfig"> + <field name="templates"> + <collection type="java.util.ArrayList"></collection> + </field> + <field name="location"> + <string>classpath:/portal/template/pages</string> + </field> + </object> + </object-param> + </init-params> + </component-plugin> + </external-component-plugins> + + <external-component-plugins> + <target-component>org.exoplatform.services.organization.OrganizationService</target-component> + <component-plugin> + <name>init.service.listener</name> + <set-method>addListenerPlugin</set-method> + <type>org.exoplatform.services.organization.OrganizationDatabaseInitializer</type> + <description>this listener populate organization data for the first launch</description> + <init-params> + <value-param> + <name>checkDatabaseAlgorithm</name> + <description>check database</description> + <value>entry</value> + </value-param> + <value-param> + <name>printInformation</name> + <description>Print information init database</description> + <value>true</value> + </value-param> + <object-param> + <name>configuration</name> + <description>description</description> + <object type="org.exoplatform.services.organization.OrganizationConfig"> + <field name="membershipType"> + <collection type="java.util.ArrayList"> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$MembershipType"> + <field name="type"><string>manager</string></field> + <field name="description"><string>manager membership type</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$MembershipType"> + <field name="type"><string>member</string></field> + <field name="description"><string>member membership type</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$MembershipType"> + <field name="type"><string>validator</string></field> + <field name="description"><string>validator membership type</string></field> + </object> + </value> + </collection> + </field> + + <field name="group"> + <collection type="java.util.ArrayList"> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>platform</string></field> + <field name="parentId"><string></string></field> + <field name="description"><string>the /platform group</string></field> + <field name="label"><string>Platform</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>administrators</string></field> + <field name="parentId"><string>/platform</string></field> + <field name="description"><string>the /platform/administrators group</string></field> + <field name="label"><string>Administrators</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>users</string></field> + <field name="parentId"><string>/platform</string></field> + <field name="description"><string>the /platform/users group</string></field> + <field name="label"><string>Users</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>guests</string></field> + <field name="parentId"><string>/platform</string></field> + <field name="description"><string>the /platform/guests group</string></field> + <field name="label"><string>Guests</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>organization</string></field> + <field name="parentId"><string></string></field> + <field name="description"><string>the organization group</string></field> + <field name="label"><string>Organization</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>management</string></field> + <field name="parentId"><string>/organization</string></field> + <field name="description"><string>the /organization/management group</string></field> + <field name="label"><string>Management</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>executive-board</string></field> + <field name="parentId"><string>/organization/management</string></field> + <field name="description"><string>the /organization/management/executive-board group</string></field> + <field name="label"><string>Executive Board</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>human-resources</string></field> + <field name="parentId"><string>/organization/management</string></field> + <field name="description"><string>the /organization/management/human-resource group</string></field> + <field name="label"><string>Human Resources</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>communication</string></field> + <field name="parentId"><string>/organization</string></field> + <field name="description"><string>the /organization/communication group</string></field> + <field name="label"><string>Communication</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>marketing</string></field> + <field name="parentId"><string>/organization/communication</string></field> + <field name="description"><string>the /organization/communication/marketing group</string></field> + <field name="label"><string>Marketing</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>press-and-media</string></field> + <field name="parentId"><string>/organization/communication</string></field> + <field name="description"><string>the /organization/communication/press-and-media group</string></field> + <field name="label"><string>Press and Media</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>operations</string></field> + <field name="parentId"><string>/organization</string></field> + <field name="description"><string>the /organization/operations and media group</string></field> + <field name="label"><string>Operations</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>sales</string></field> + <field name="parentId"><string>/organization/operations</string></field> + <field name="description"><string>the /organization/operations/sales group</string></field> + <field name="label"><string>Sales</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>finances</string></field> + <field name="parentId"><string>/organization/operations</string></field> + <field name="description"><string>the /organization/operations/finances group</string></field> + <field name="label"><string>Finances</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>customers</string></field> + <field name="parentId"><string></string></field> + <field name="description"><string>the /customers group</string></field> + <field name="label"><string>Customers</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"><string>partners</string></field> + <field name="parentId"><string></string></field> + <field name="description"><string>the /partners group</string></field> + <field name="label"><string>Partners</string></field> + </object> + </value> + </collection> + </field> + + <field name="user"> + <collection type="java.util.ArrayList"> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$User"> + <field name="userName"><string>root</string></field> + <field name="password"><string>gtn</string></field> + <field name="firstName"><string>Root</string></field> + <field name="lastName"><string>Root</string></field> + <field name="email"><string>root@localhost</string></field> + <field name="groups"> + <string> + manager:/platform/administrators,member:/platform/users, + member:/organization/management/executive-board + </string> + </field> + </object> + </value> + + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$User"> + <field name="userName"><string>john</string></field> + <field name="password"><string>gtn</string></field> + <field name="firstName"><string>John</string></field> + <field name="lastName"><string>Anthony</string></field> + <field name="email"><string>john@localhost</string></field> + <field name="groups"> + <string> + member:/platform/administrators,member:/platform/users, + manager:/organization/management/executive-board + </string> + </field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$User"> + <field name="userName"><string>mary</string></field> + <field name="password"><string>gtn</string></field> + <field name="firstName"><string>Mary</string></field> + <field name="lastName"><string>Kelly</string></field> + <field name="email"><string>mary@localhost</string></field> + <field name="groups"> + <string>member:/platform/users</string> + </field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$User"> + <field name="userName"><string>demo</string></field> + <field name="password"><string>gtn</string></field> + <field name="firstName"><string>Demo</string></field> + <field name="lastName"><string>gtn</string></field> + <field name="email"><string>demo@localhost</string></field> + <field name="groups"> + <string>member:/platform/guests,member:/platform/users</string> + </field> + </object> + </value> + + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$User"> + <field name="userName"><string>overwritelayout</string></field> + <field name="password"><string>whatever</string></field> + <field name="firstName"><string>whatever</string></field> + <field name="lastName"><string>whatever</string></field> + <field name="email"><string>whatever@localhost</string></field> + <field name="groups"> + <string>member:/platform/guests</string> + </field> + </object> + </value> + + </collection> + </field> + </object> + </object-param> + </init-params> + </component-plugin> + + </external-component-plugins> + +</configuration> Deleted: portal/trunk/component/portal/src/test/java/conf/portal-configuration.xml =================================================================== --- portal/trunk/component/portal/src/test/java/conf/portal-configuration.xml 2010-01-05 13:57:00 UTC (rev 1162) +++ portal/trunk/component/portal/src/test/java/conf/portal-configuration.xml 2010-01-05 15:01:32 UTC (rev 1163) @@ -1,406 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - - -<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> - - <external-component-plugins> - <target-component>org.exoplatform.portal.config.UserPortalConfigService</target-component> - <component-plugin> - <name>new.portal.config.user.listener</name> - <set-method>initListener</set-method> - <type>org.exoplatform.portal.config.NewPortalConfigListener</type> - <description>this listener init the portal configuration</description> - <init-params> - <value-param> - <name>default.portal</name> - <description>The default portal for checking db is empty or not</description> - <value>classic</value> - </value-param> - <value-param> - <name>initializing.failure.ignore</name> - <description>In the run method, use try catch or not (value is true/false)</description> - <value>true</value> - </value-param> - <object-param> - <name>portal.configuration</name> - <description>description</description> - <object type="org.exoplatform.portal.config.NewPortalConfig"> - <field name="predefinedOwner"> - <collection type="java.util.HashSet"> - <value> - <string>classic</string> - </value> - <value> - <string>test</string> - </value> - </collection> - </field> - <field name="ownerType"> - <string>portal</string> - </field> - <field name="templateLocation"> - <string>classpath:/portal</string> - </field> - </object> - </object-param> - <object-param> - <name>group.configuration</name> - <description>description</description> - <object type="org.exoplatform.portal.config.NewPortalConfig"> - <field name="predefinedOwner"> - <collection type="java.util.HashSet"> - <value> - <string>platform/administrators</string> - </value> - <value> - <string>platform/users</string> - </value> - <value> - <string>platform/guests</string> - </value> - <value> - <string>platform/test/legacy</string> - </value> - <value> - <string>platform/test/normalized</string> - </value> - <value> - <string>organization/management/executive-board</string> - </value> - </collection> - </field> - <field name="ownerType"> - <string>group</string> - </field> - <field name="templateLocation"> - <string>classpath:/portal</string> - </field> - </object> - </object-param> - <object-param> - <name>user.configuration</name> - <description>description</description> - <object type="org.exoplatform.portal.config.NewPortalConfig"> - <field name="predefinedOwner"> - <collection type="java.util.HashSet"> - <value> - <string>root</string> - </value> - <value> - <string>john</string> - </value> - <value> - <string>mary</string> - </value> - <value> - <string>demo</string> - </value> - <value> - <string>overwritelayout</string> - </value> - </collection> - </field> - <field name="ownerType"> - <string>user</string> - </field> - <field name="templateLocation"> - <string>classpath:/portal</string> - </field> - </object> - </object-param> - <object-param> - <name>page.templates</name> - <description>List of page templates</description> - <object type="org.exoplatform.portal.config.PageTemplateConfig"> - <field name="templates"> - <collection type="java.util.ArrayList"></collection> - </field> - <field name="location"> - <string>classpath:/portal/template/pages</string> - </field> - </object> - </object-param> - </init-params> - </component-plugin> - </external-component-plugins> - - <external-component-plugins> - <target-component>org.exoplatform.services.organization.OrganizationService</target-component> - <component-plugin> - <name>init.service.listener</name> - <set-method>addListenerPlugin</set-method> - <type>org.exoplatform.services.organization.OrganizationDatabaseInitializer</type> - <description>this listener populate organization data for the first launch</description> - <init-params> - <value-param> - <name>checkDatabaseAlgorithm</name> - <description>check database</description> - <value>entry</value> - </value-param> - <value-param> - <name>printInformation</name> - <description>Print information init database</description> - <value>true</value> - </value-param> - <object-param> - <name>configuration</name> - <description>description</description> - <object type="org.exoplatform.services.organization.OrganizationConfig"> - <field name="membershipType"> - <collection type="java.util.ArrayList"> - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$MembershipType"> - <field name="type"><string>manager</string></field> - <field name="description"><string>manager membership type</string></field> - </object> - </value> - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$MembershipType"> - <field name="type"><string>member</string></field> - <field name="description"><string>member membership type</string></field> - </object> - </value> - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$MembershipType"> - <field name="type"><string>validator</string></field> - <field name="description"><string>validator membership type</string></field> - </object> - </value> - </collection> - </field> - - <field name="group"> - <collection type="java.util.ArrayList"> - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> - <field name="name"><string>platform</string></field> - <field name="parentId"><string></string></field> - <field name="description"><string>the /platform group</string></field> - <field name="label"><string>Platform</string></field> - </object> - </value> - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> - <field name="name"><string>administrators</string></field> - <field name="parentId"><string>/platform</string></field> - <field name="description"><string>the /platform/administrators group</string></field> - <field name="label"><string>Administrators</string></field> - </object> - </value> - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> - <field name="name"><string>users</string></field> - <field name="parentId"><string>/platform</string></field> - <field name="description"><string>the /platform/users group</string></field> - <field name="label"><string>Users</string></field> - </object> - </value> - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> - <field name="name"><string>guests</string></field> - <field name="parentId"><string>/platform</string></field> - <field name="description"><string>the /platform/guests group</string></field> - <field name="label"><string>Guests</string></field> - </object> - </value> - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> - <field name="name"><string>organization</string></field> - <field name="parentId"><string></string></field> - <field name="description"><string>the organization group</string></field> - <field name="label"><string>Organization</string></field> - </object> - </value> - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> - <field name="name"><string>management</string></field> - <field name="parentId"><string>/organization</string></field> - <field name="description"><string>the /organization/management group</string></field> - <field name="label"><string>Management</string></field> - </object> - </value> - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> - <field name="name"><string>executive-board</string></field> - <field name="parentId"><string>/organization/management</string></field> - <field name="description"><string>the /organization/management/executive-board group</string></field> - <field name="label"><string>Executive Board</string></field> - </object> - </value> - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> - <field name="name"><string>human-resources</string></field> - <field name="parentId"><string>/organization/management</string></field> - <field name="description"><string>the /organization/management/human-resource group</string></field> - <field name="label"><string>Human Resources</string></field> - </object> - </value> - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> - <field name="name"><string>communication</string></field> - <field name="parentId"><string>/organization</string></field> - <field name="description"><string>the /organization/communication group</string></field> - <field name="label"><string>Communication</string></field> - </object> - </value> - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> - <field name="name"><string>marketing</string></field> - <field name="parentId"><string>/organization/communication</string></field> - <field name="description"><string>the /organization/communication/marketing group</string></field> - <field name="label"><string>Marketing</string></field> - </object> - </value> - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> - <field name="name"><string>press-and-media</string></field> - <field name="parentId"><string>/organization/communication</string></field> - <field name="description"><string>the /organization/communication/press-and-media group</string></field> - <field name="label"><string>Press and Media</string></field> - </object> - </value> - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> - <field name="name"><string>operations</string></field> - <field name="parentId"><string>/organization</string></field> - <field name="description"><string>the /organization/operations and media group</string></field> - <field name="label"><string>Operations</string></field> - </object> - </value> - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> - <field name="name"><string>sales</string></field> - <field name="parentId"><string>/organization/operations</string></field> - <field name="description"><string>the /organization/operations/sales group</string></field> - <field name="label"><string>Sales</string></field> - </object> - </value> - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> - <field name="name"><string>finances</string></field> - <field name="parentId"><string>/organization/operations</string></field> - <field name="description"><string>the /organization/operations/finances group</string></field> - <field name="label"><string>Finances</string></field> - </object> - </value> - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> - <field name="name"><string>customers</string></field> - <field name="parentId"><string></string></field> - <field name="description"><string>the /customers group</string></field> - <field name="label"><string>Customers</string></field> - </object> - </value> - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> - <field name="name"><string>partners</string></field> - <field name="parentId"><string></string></field> - <field name="description"><string>the /partners group</string></field> - <field name="label"><string>Partners</string></field> - </object> - </value> - </collection> - </field> - - <field name="user"> - <collection type="java.util.ArrayList"> - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$User"> - <field name="userName"><string>root</string></field> - <field name="password"><string>gtn</string></field> - <field name="firstName"><string>Root</string></field> - <field name="lastName"><string>Root</string></field> - <field name="email"><string>root@localhost</string></field> - <field name="groups"> - <string> - manager:/platform/administrators,member:/platform/users, - member:/organization/management/executive-board - </string> - </field> - </object> - </value> - - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$User"> - <field name="userName"><string>john</string></field> - <field name="password"><string>gtn</string></field> - <field name="firstName"><string>John</string></field> - <field name="lastName"><string>Anthony</string></field> - <field name="email"><string>john@localhost</string></field> - <field name="groups"> - <string> - member:/platform/administrators,member:/platform/users, - manager:/organization/management/executive-board - </string> - </field> - </object> - </value> - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$User"> - <field name="userName"><string>mary</string></field> - <field name="password"><string>gtn</string></field> - <field name="firstName"><string>Mary</string></field> - <field name="lastName"><string>Kelly</string></field> - <field name="email"><string>mary@localhost</string></field> - <field name="groups"> - <string>member:/platform/users</string> - </field> - </object> - </value> - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$User"> - <field name="userName"><string>demo</string></field> - <field name="password"><string>gtn</string></field> - <field name="firstName"><string>Demo</string></field> - <field name="lastName"><string>gtn</string></field> - <field name="email"><string>demo@localhost</string></field> - <field name="groups"> - <string>member:/platform/guests,member:/platform/users</string> - </field> - </object> - </value> - - <value> - <object type="org.exoplatform.services.organization.OrganizationConfig$User"> - <field name="userName"><string>overwritelayout</string></field> - <field name="password"><string>whatever</string></field> - <field name="firstName"><string>whatever</string></field> - <field name="lastName"><string>whatever</string></field> - <field name="email"><string>whatever@localhost</string></field> - <field name="groups"> - <string>member:/platform/guests</string> - </field> - </object> - </value> - - </collection> - </field> - </object> - </object-param> - </init-params> - </component-plugin> - - </external-component-plugins> - -</configuration> Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/AbstractPortalTest.java =================================================================== --- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/AbstractPortalTest.java 2010-01-05 13:57:00 UTC (rev 1162) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/AbstractPortalTest.java 2010-01-05 15:01:32 UTC (rev 1163) @@ -30,10 +30,10 @@ * @version $Revision$ */ @ConfiguredBy({ - @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/jcr/jcr-configuration.xml"), - @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/organization/organization-configuration.xml"), - @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/portal/portal-configuration.xml"), - @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/portal-configuration.xml") + @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/exo.portal.component.test.jcr-configuration.xml"), + @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/exo.portal.component.test.organization-configuration.xml"), + @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/exo.portal.component.portal-configuration1.xml"), + @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/exo.portal.component.portal-configuration2.xml") }) public abstract class AbstractPortalTest extends AbstractGateInTest { Copied: portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-configuration.xml (from rev 1154, portal/trunk/component/test/jcr/src/main/resources/conf/jcr/jcr-configuration.xml) =================================================================== --- portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-configuration.xml (rev 0) +++ portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-configuration.xml 2010-01-05 15:01:32 UTC (rev 1163) @@ -0,0 +1,183 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + +<configuration + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> + + <component> + <key>org.exoplatform.services.idgenerator.IDGeneratorService</key> + <type>org.exoplatform.services.idgenerator.impl.IDGeneratorServiceImpl</type> + </component> + + <component> + <type>org.exoplatform.services.security.IdentityRegistry</type> + </component> + + <component> + <key>org.exoplatform.services.document.DocumentReaderService</key> + <type>org.exoplatform.services.document.impl.DocumentReaderServiceImpl</type> + <component-plugins> + <component-plugin> + <name>pdf.document.reader</name> + <set-method>addDocumentReader</set-method> + <type>org.exoplatform.services.document.impl.PDFDocumentReader</type> + <description>to read the pdf inputstream</description> + <init-params> + <values-param> + <name>document.known.types</name> + <description>description</description> + <value>application/pdf</value> + </values-param> + </init-params> + </component-plugin> + + <component-plugin> + <name>document.readerMSWord</name> + <set-method>addDocumentReader</set-method> + <type>org.exoplatform.services.document.impl.MSWordDocumentReader</type> + <description>to read the ms word inputstream</description> + <init-params> + <values-param> + <name>document.known.typesMSWord</name> + <description>description</description> + <value>application/msword</value> + </values-param> + </init-params> + </component-plugin> + + <component-plugin> + <name>document.readerMSExcel</name> + <set-method>addDocumentReader</set-method> + <type>org.exoplatform.services.document.impl.MSExcelDocumentReader</type> + <description>to read the ms excel inputstream</description> + <init-params> + <values-param> + <name>document.known.typesMSExcel</name> + <description>description</description> + <value>application/excel</value> + </values-param> + </init-params> + </component-plugin> + + <component-plugin> + <name>document.readerMSOutlook</name> + <set-method>addDocumentReader</set-method> + <type>org.exoplatform.services.document.impl.MSOutlookDocumentReader</type> + <description>to read the ms outlook inputstream</description> + <init-params> + <values-param> + <name>document.known.typesMSOutlook</name> + <description>description</description> + <value>application/vnd.ms-outlook</value> + </values-param> + </init-params> + </component-plugin> + + <component-plugin> + <name>PPTdocument.reader</name> + <set-method>addDocumentReader</set-method> + <type>org.exoplatform.services.document.impl.PPTDocumentReader</type> + <description>to read the ms ppt inputstream</description> + <init-params> + <values-param> + <name>document.known.typesPPT</name> + <description>description</description> + <value>application/ppt</value> + </values-param> + </init-params> + </component-plugin> + + <component-plugin> + <name>document.readerHTML</name> + <set-method>addDocumentReader</set-method> + <type>org.exoplatform.services.document.impl.HTMLDocumentReader</type> + <description>to read the html inputstream</description> + <init-params> + <values-param> + <name>document.known.typesHTML</name> + <description>description</description> + <value>text/html</value> + </values-param> + </init-params> + </component-plugin> + + <component-plugin> + <name>document.readerXML</name> + <set-method>addDocumentReader</set-method> + <type>org.exoplatform.services.document.impl.XMLDocumentReader</type> + <description>to read the xml inputstream</description> + <init-params> + <values-param> + <name>document.known.typesXML</name> + <description>description</description> + <value>text/xml</value> + </values-param> + </init-params> + </component-plugin> + + <component-plugin> + <name>TPdocument.reader</name> + <set-method>addDocumentReader</set-method> + <type>org.exoplatform.services.document.impl.TextPlainDocumentReader</type> + <description>to read the plain text inputstream</description> + <init-params> + <values-param> + <name>document.known.typesTextPlain</name> + <description>description</description> + <value>text/plain</value> + </values-param> +  + </init-params> + </component-plugin> + + <component-plugin> + <name>document.readerOO</name> + <set-method>addDocumentReader</set-method> + <type>org.exoplatform.services.document.impl.OpenOfficeDocumentReader</type> + <description>to read the OO inputstream</description> + </component-plugin> + + </component-plugins> + </component> + + <component> + <key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key> + <type>org.exoplatform.services.jcr.impl.config.RepositoryServiceConfigurationImpl</type> + <init-params> + <value-param> + <name>conf-path</name> + <description>JCR configuration file</description> + <value>jar:/conf/exo.portal.component.test.jcr-repository-configuration.xml</value> + </value-param> + </init-params> + </component> + + <component> + <key>org.exoplatform.services.jcr.RepositoryService</key> + <type>org.exoplatform.services.jcr.impl.RepositoryServiceImpl</type> + </component> + +</configuration> Copied: portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-repository-configuration.xml (from rev 1159, portal/trunk/component/test/jcr/src/main/resources/conf/jcr/repository-configuration.xml) =================================================================== --- portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-repository-configuration.xml (rev 0) +++ portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-repository-configuration.xml 2010-01-05 15:01:32 UTC (rev 1163) @@ -0,0 +1,129 @@ + + +<repository-service default-repository="repository"> + <repositories> + <repository name="repository" system-workspace="system" default-workspace="portal-test"> + <security-domain>gatein-domain</security-domain> + <access-control>optional</access-control> + <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> + +  + <workspaces> + <workspace name="system"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="jdbcexo"/> + <property name="dialect" value="hsqldb"/> + <property name="multi-db" value="false"/> + <property name="update-storage" value="true"/> + <property name="max-buffer-size" value="204800"/> + <property name="swap-directory" value="${gatein.tmp.dir}/jcr/swap/system"/> + </properties> + <value-storages> + <value-storage id="system" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" value="${gatein.tmp.dir}/jcr/values/system"/> + </properties> + <filters> + <filter property-type="Binary"/> + </filters> + </value-storage> + </value-storages> + </container> + <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> + <properties> + <property name="root-nodetype" value="nt:unstructured"/> + <property name="root-permissions" value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/> + </properties> + </initializer> + <cache enabled="true"> + <properties> + <property name="max-size" value="20000"/> + <property name="live-time" value="30000"/> + </properties> + </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" value="${gatein.tmp.dir}/jcr/jcrlucenedb/system"/> + </properties> + </query-handler> + <lock-manager> + <time-out>15m</time-out> + <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> + <properties> + <property name="path" value="${gatein.tmp.dir}/jcr/lock/system"/> + </properties> + </persister> + </lock-manager> + </workspace> + +  + <workspace name="portal-test"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="jdbcexo"/> + <property name="dialect" value="hsqldb"/> + <property name="multi-db" value="false"/> + <property name="update-storage" value="true"/> + <property name="max-buffer-size" value="204800"/> + <property name="swap-directory" value="${gatein.tmp.dir}/jcr/swap/portal-test"/> + </properties> + <value-storages> + <value-storage id="portal-test" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" value="${gatein.tmp.dir}/jcr/values/portal-test"/> + </properties> + <filters> + <filter property-type="Binary"/> + </filters> + </value-storage> + </value-storages> + </container> + <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> + <properties> + <property name="root-nodetype" value="nt:unstructured"/> + <property name="root-permissions" value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/> + </properties> + </initializer> + <cache enabled="true"> + <properties> + <property name="max-size" value="20000"/> + <property name="live-time" value="30000"/> + </properties> + </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" value="${gatein.tmp.dir}/jcr/jcrlucenedb/portal-test"/> + </properties> + </query-handler> + <lock-manager> + <time-out>15m</time-out> + <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> + <properties> + <property name="path" value="${gatein.tmp.dir}/jcr/lock/portal-test"/> + </properties> + </persister> + </lock-manager> + </workspace> + + </workspaces> + </repository> + </repositories> +</repository-service> Modified: portal/trunk/component/test/jcr/src/test/java/org/exoplatform/component/test/jcr/BootstrapTestCase.java =================================================================== --- portal/trunk/component/test/jcr/src/test/java/org/exoplatform/component/test/jcr/BootstrapTestCase.java 2010-01-05 13:57:00 UTC (rev 1162) +++ portal/trunk/component/test/jcr/src/test/java/org/exoplatform/component/test/jcr/BootstrapTestCase.java 2010-01-05 15:01:32 UTC (rev 1163) @@ -32,7 +32,7 @@ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -@ConfiguredBy({@ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/jcr/jcr-configuration.xml")}) +@ConfiguredBy({@ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/exo.portal.component.test.jcr-configuration.xml")}) public class BootstrapTestCase extends AbstractGateInTest { Copied: portal/trunk/component/test/organization/src/main/resources/conf/exo.portal.component.test.organization-configuration.xml (from rev 1154, portal/trunk/component/test/organization/src/main/resources/conf/organization/organization-configuration.xml) =================================================================== --- portal/trunk/component/test/organization/src/main/resources/conf/exo.portal.component.test.organization-configuration.xml (rev 0) +++ portal/trunk/component/test/organization/src/main/resources/conf/exo.portal.component.test.organization-configuration.xml 2010-01-05 15:01:32 UTC (rev 1163) @@ -0,0 +1,122 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> + + + + <component> + <key>org.exoplatform.services.organization.idm.PicketLinkIDMService</key> + <type>org.exoplatform.services.organization.idm.PicketLinkIDMServiceImpl</type> + <init-params> + <value-param> + <name>config</name> + <value>jar:/conf/picketlink-idm-config.xml</value> + </value-param> + </init-params> + </component> + + <component> + <key>org.exoplatform.services.organization.OrganizationService</key> + <type>org.exoplatform.services.organization.idm.PicketLinkIDMOrganizationServiceImpl</type> + </component> + + <component> + <key>org.exoplatform.services.cache.CacheService</key> + <jmx-name>cache:type=CacheService</jmx-name> + <type>org.exoplatform.services.cache.impl.CacheServiceImpl</type> + <init-params> + <object-param> + <name>cache.config.default</name> + <description>The default cache configuration</description> + <object type="org.exoplatform.services.cache.ExoCacheConfig"> + <field name="name"><string>default</string></field> + <field name="maxSize"><int>300</int></field> + <field name="liveTime"><long>60</long></field> + <field name="distributed"><boolean>false</boolean></field> + <field name="implementation"><string>org.exoplatform.services.cache.concurrent.ConcurrentFIFOExoCache</string></field> + </object> + </object-param> + </init-params> + </component> + + <component> + <key>org.exoplatform.services.database.HibernateService</key> + <jmx-name>database:type=HibernateService</jmx-name> + <type>org.exoplatform.services.database.impl.HibernateServiceImpl</type> + <init-params> + <properties-param> + <name>hibernate.properties</name> + <description>Default Hibernate Service</description> + <property name="hibernate.hbm2ddl.auto" value="create-drop"/> + <property name="hibernate.show_sql" value="false"/> + <property name="hibernate.current_session_context_class" value="thread"/> + <property name="hibernate.cache.use_second_level_cache" value="true"/> + <property name="hibernate.cache.use_query_cache" value="true"/> +  + <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/> + <property name="hibernate.cglib.use_reflection_optimizer" value="true"/> + + <property name="hibernate.connection.datasource" value="jdbcexo"/> + <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/> + <property name="hibernate.c3p0.min_size" value="5"/> + <property name="hibernate.c3p0.max_size" value="20"/> + <property name="hibernate.c3p0.timeout" value="1800"/> + <property name="hibernate.c3p0.max_statements" value="50"/> + </properties-param> + </init-params> + </component> + + <external-component-plugins> + <target-component>org.exoplatform.services.database.HibernateService</target-component> + <component-plugin> + <name>add.hibernate.mapping</name> + <set-method>addPlugin</set-method> + <type>org.exoplatform.services.database.impl.AddHibernateMappingPlugin</type> + <init-params> + <values-param> + <name>hibernate.mapping</name> + <value>conf/mappings/HibernateRealm.hbm.xml</value> + <value>conf/mappings/HibernateIdentityObjectCredentialBinaryValue.hbm.xml</value> + <value>conf/mappings/HibernateIdentityObjectAttributeBinaryValue.hbm.xml</value> + <value>conf/mappings/HibernateIdentityObject.hbm.xml</value> + <value>conf/mappings/HibernateIdentityObjectCredential.hbm.xml</value> + <value>conf/mappings/HibernateIdentityObjectCredentialType.hbm.xml</value> + <value>conf/mappings/HibernateIdentityObjectAttribute.hbm.xml</value> + <value>conf/mappings/HibernateIdentityObjectType.hbm.xml</value> + <value>conf/mappings/HibernateIdentityObjectRelationship.hbm.xml</value> + <value>conf/mappings/HibernateIdentityObjectRelationshipType.hbm.xml</value> + <value>conf/mappings/HibernateIdentityObjectRelationshipName.hbm.xml</value> + </values-param> + </init-params> + </component-plugin> + </external-component-plugins> + +</configuration> \ No newline at end of file Copied: portal/trunk/component/test/organization/src/main/resources/conf/mappings (from rev 1154, portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings) Deleted: portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObject.hbm.xml =================================================================== --- portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObject.hbm.xml 2010-01-01 18:01:10 UTC (rev 1154) +++ portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObject.hbm.xml 2010-01-05 15:01:32 UTC (rev 1163) @@ -1,95 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping> - <class name="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObject" - table="jbid_io"> - <cache usage="read-write"/> - <id name="id" - type="java.lang.Long" - access="field"> - <column name="ID" /> - <generator class="native"/> - </id> - <set name="attributes" - inverse="true" - cascade="all, delete-orphan" - lazy="extra" - fetch="subselect"> - <cache usage="read-write"/> - <key> - <column name="IDENTITY_OBJECT_ID" /> - </key> - <one-to-many class="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectAttribute" /> - </set> - <set name="credentials" - inverse="true" - cascade="all, delete-orphan" - lazy="extra" - fetch="subselect"> - <cache usage="read-write"/> - <key> - <column name="IDENTITY_OBJECT_ID" /> - </key> - <one-to-many class="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectCredential" /> - </set> - <set name="fromRelationships" - inverse="true" - lazy="extra" - fetch="subselect"> - <cache usage="read-write"/> - <key> - <column name="FROM_IDENTITY" /> - </key> - <one-to-many class="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectRelationship" /> - </set> - <many-to-one name="identityType" - class="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectType" - access="field" - fetch="join" - lazy="false"> - <column name="IDENTITY_TYPE" - not-null="true" - unique-key="id"/> - </many-to-one> - <property name="name" - type="java.lang.String" - access="field" - lazy="false"> - <column name="NAME" - not-null="true" - unique-key="id"/> - </property> - <map name="properties" - table="jbid_io_props" - cascade="all, delete-orphan" - lazy="extra" - fetch="subselect"> - <cache usage="read-write"/> - <key column="PROP_ID"/> - <map-key type="string" - column="PROP_NAME"/> - <element type="string" - column="PROP_VALUE" - not-null="true"/> - </map> - <many-to-one name="realm" - class="org.picketlink.idm.impl.model.hibernate.HibernateRealm" - access="field" - fetch="select"> - <column name="REALM" - not-null="true" - unique-key="id"/> - </many-to-one> - <set name="toRelationships" - inverse="true" - lazy="extra" - fetch="subselect"> - <cache usage="read-write"/> - <key> - <column name="TO_IDENTITY" /> - </key> - <one-to-many class="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectRelationship" /> - </set> - </class> -</hibernate-mapping> Copied: portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObject.hbm.xml (from rev 1162, portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObject.hbm.xml) =================================================================== --- portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObject.hbm.xml (rev 0) +++ portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObject.hbm.xml 2010-01-05 15:01:32 UTC (rev 1163) @@ -0,0 +1,95 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping> + <class name="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObject" + table="jbid_io"> + <cache usage="read-write"/> + <id name="id" + type="java.lang.Long" + access="field"> + <column name="ID" /> + <generator class="native"/> + </id> + <set name="attributes" + inverse="true" + cascade="all, delete-orphan" + lazy="extra" + fetch="subselect"> + <cache usage="read-write"/> + <key> + <column name="IDENTITY_OBJECT_ID" /> + </key> + <one-to-many class="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectAttribute" /> + </set> + <set name="credentials" + inverse="true" + cascade="all, delete-orphan" + lazy="extra" + fetch="subselect"> + <cache usage="read-write"/> + <key> + <column name="IDENTITY_OBJECT_ID" /> + </key> + <one-to-many class="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectCredential" /> + </set> + <set name="fromRelationships" + inverse="true" + lazy="extra" + fetch="subselect"> + <cache usage="read-write"/> + <key> + <column name="FROM_IDENTITY" /> + </key> + <one-to-many class="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectRelationship" /> + </set> + <many-to-one name="identityType" + class="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectType" + access="field" + fetch="join" + lazy="false"> + <column name="IDENTITY_TYPE" + not-null="true" + unique-key="id"/> + </many-to-one> + <property name="name" + type="java.lang.String" + access="field" + lazy="false"> + <column name="NAME" + not-null="true" + unique-key="id"/> + </property> + <map name="properties" + table="jbid_io_props" + cascade="all, delete-orphan" + lazy="extra" + fetch="subselect"> + <cache usage="read-write"/> + <key column="PROP_ID"/> + <map-key type="string" + column="PROP_NAME"/> + <element type="string" + column="PROP_VALUE" + not-null="true"/> + </map> + <many-to-one name="realm" + class="org.picketlink.idm.impl.model.hibernate.HibernateRealm" + access="field" + fetch="select"> + <column name="REALM" + not-null="true" + unique-key="id"/> + </many-to-one> + <set name="toRelationships" + inverse="true" + lazy="extra" + fetch="subselect"> + <cache usage="read-write"/> + <key> + <column name="TO_IDENTITY" /> + </key> + <one-to-many class="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectRelationship" /> + </set> + </class> +</hibernate-mapping> Deleted: portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectAttribute.hbm.xml =================================================================== --- portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectAttribute.hbm.xml 2010-01-01 18:01:10 UTC (rev 1154) +++ portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectAttribute.hbm.xml 2010-01-05 15:01:32 UTC (rev 1163) @@ -1,55 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping> - <class name="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectAttribute" - table="jbid_io_attr"> - <cache usage="read-write"/> - <id name="id" - type="java.lang.Long" - access="field"> - <column name="ATTRIBUTE_ID" /> - <generator class="native"/> - </id> - <many-to-one name="identityObject" - class="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObject" - access="field" - fetch="join"> - <column name="IDENTITY_OBJECT_ID" not-null="true" unique-key="id"/> - </many-to-one> - <property name="name" - type="java.lang.String" - access="property" - lazy="false"> - <column name="NAME" - unique-key="id" /> - </property> - <property name="type" - type="java.lang.String" - access="field" - lazy="false" - not-null="true"> - <column name="ATTRIBUTE_TYPE"/> - </property> - <set name="textValues" - table="jbid_io_attr_text_values" - cascade="all, delete-orphan" - access="field" - lazy="extra" - fetch="subselect"> - <cache usage="read-write"/> - <key column="TEXT_ATTR_VALUE_ID"/> - <element type="string" - column="ATTR_VALUE"/> - </set> - <many-to-one name="binaryValue" - class="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectAttributeBinaryValue" - not-null="false" - column="BIN_VALUE_ID" - unique="false" - lazy="proxy" - access="field" - fetch="select" - cascade="all"/> - </class> -</hibernate-mapping> Copied: portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectAttribute.hbm.xml (from rev 1162, portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectAttribute.hbm.xml) =================================================================== --- portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectAttribute.hbm.xml (rev 0) +++ portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectAttribute.hbm.xml 2010-01-05 15:01:32 UTC (rev 1163) @@ -0,0 +1,55 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping> + <class name="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectAttribute" + table="jbid_io_attr"> + <cache usage="read-write"/> + <id name="id" + type="java.lang.Long" + access="field"> + <column name="ATTRIBUTE_ID" /> + <generator class="native"/> + </id> + <many-to-one name="identityObject" + class="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObject" + access="field" + fetch="join"> + <column name="IDENTITY_OBJECT_ID" not-null="true" unique-key="id"/> + </many-to-one> + <property name="name" + type="java.lang.String" + access="property" + lazy="false"> + <column name="NAME" + unique-key="id" /> + </property> + <property name="type" + type="java.lang.String" + access="field" + lazy="false" + not-null="true"> + <column name="ATTRIBUTE_TYPE"/> + </property> + <set name="textValues" + table="jbid_io_attr_text_values" + cascade="all, delete-orphan" + access="field" + lazy="extra" + fetch="subselect"> + <cache usage="read-write"/> + <key column="TEXT_ATTR_VALUE_ID"/> + <element type="string" + column="ATTR_VALUE"/> + </set> + <many-to-one name="binaryValue" + class="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectAttributeBinaryValue" + not-null="false" + column="BIN_VALUE_ID" + unique="false" + lazy="proxy" + access="field" + fetch="select" + cascade="all"/> + </class> +</hibernate-mapping> Deleted: portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectAttributeBinaryValue.hbm.xml =================================================================== --- portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectAttributeBinaryValue.hbm.xml 2010-01-01 18:01:10 UTC (rev 1154) +++ portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectAttributeBinaryValue.hbm.xml 2010-01-05 15:01:32 UTC (rev 1163) @@ -1,22 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping> - <class name="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectAttributeBinaryValue" - table="jbid_attr_bin_value"> - <cache usage="read-write"/> - <id name="id" - type="java.lang.Long" - access="field"> - <column name="BIN_VALUE_ID" /> - <generator class="native"/> - </id> - <property name="value" - type="org.hibernate.type.PrimitiveByteArrayBlobType" - access="field" - lazy="false" - not-null="true"> - <column name="VALUE" length="10240000"/> - </property> - </class> -</hibernate-mapping> Copied: portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectAttributeBinaryValue.hbm.xml (from rev 1162, portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectAttributeBinaryValue.hbm.xml) =================================================================== --- portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectAttributeBinaryValue.hbm.xml (rev 0) +++ portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectAttributeBinaryValue.hbm.xml 2010-01-05 15:01:32 UTC (rev 1163) @@ -0,0 +1,22 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping> + <class name="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectAttributeBinaryValue" + table="jbid_attr_bin_value"> + <cache usage="read-write"/> + <id name="id" + type="java.lang.Long" + access="field"> + <column name="BIN_VALUE_ID" /> + <generator class="native"/> + </id> + <property name="value" + type="org.hibernate.type.PrimitiveByteArrayBlobType" + access="field" + lazy="false" + not-null="true"> + <column name="VALUE" length="10240000"/> + </property> + </class> +</hibernate-mapping> Deleted: portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectCredential.hbm.xml =================================================================== --- portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectCredential.hbm.xml 2010-01-01 18:01:10 UTC (rev 1154) +++ portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectCredential.hbm.xml 2010-01-05 15:01:32 UTC (rev 1163) @@ -1,62 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping> - <class name="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectCredential" - table="jbid_io_creden"> - <cache usage="read-write"/> - - <id name="id" - type="java.lang.Long" - access="field"> - <column name="ID" /> - <generator class="native"/> - </id> - <many-to-one name="binaryValue" - class="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectCredentialBinaryValue" - not-null="false" - column="BIN_VALUE_ID" - unique="false" - lazy="proxy" - access="field" - fetch="select" - cascade="all"/> - <many-to-one name="identityObject" - class="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObject" - access="field" - fetch="select" - lazy="proxy"> - <column name="IDENTITY_OBJECT_ID" - not-null="true" - unique-key="id" /> - </many-to-one> - <map name="properties" - table="jbid_io_creden_props" - cascade="all, delete-orphan" - lazy="extra" - fetch="subselect"> - <cache usage="read-write"/> - <key column="PROP_ID"/> - <map-key type="string" - column="PROP_NAME"/> - <element type="string" - column="PROP_VALUE" - not-null="true"/> - </map> - <property name="textValue" - type="java.lang.String" - access="field" - lazy="false"> - <column name="TEXT" /> - </property> - <many-to-one name="type" - class="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType" - access="field" - fetch="join" - lazy="false"> - <column name="CREDENTIAL_TYPE" - not-null="true" - unique-key="id"/> - </many-to-one> - </class> -</hibernate-mapping> Copied: portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectCredential.hbm.xml (from rev 1162, portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectCredential.hbm.xml) =================================================================== --- portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectCredential.hbm.xml (rev 0) +++ portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectCredential.hbm.xml 2010-01-05 15:01:32 UTC (rev 1163) @@ -0,0 +1,62 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping> + <class name="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectCredential" + table="jbid_io_creden"> + <cache usage="read-write"/> + + <id name="id" + type="java.lang.Long" + access="field"> + <column name="ID" /> + <generator class="native"/> + </id> + <many-to-one name="binaryValue" + class="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectCredentialBinaryValue" + not-null="false" + column="BIN_VALUE_ID" + unique="false" + lazy="proxy" + access="field" + fetch="select" + cascade="all"/> + <many-to-one name="identityObject" + class="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObject" + access="field" + fetch="select" + lazy="proxy"> + <column name="IDENTITY_OBJECT_ID" + not-null="true" + unique-key="id" /> + </many-to-one> + <map name="properties" + table="jbid_io_creden_props" + cascade="all, delete-orphan" + lazy="extra" + fetch="subselect"> + <cache usage="read-write"/> + <key column="PROP_ID"/> + <map-key type="string" + column="PROP_NAME"/> + <element type="string" + column="PROP_VALUE" + not-null="true"/> + </map> + <property name="textValue" + type="java.lang.String" + access="field" + lazy="false"> + <column name="TEXT" /> + </property> + <many-to-one name="type" + class="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType" + access="field" + fetch="join" + lazy="false"> + <column name="CREDENTIAL_TYPE" + not-null="true" + unique-key="id"/> + </many-to-one> + </class> +</hibernate-mapping> Deleted: portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectCredentialBinaryValue.hbm.xml =================================================================== --- portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectCredentialBinaryValue.hbm.xml 2010-01-01 18:01:10 UTC (rev 1154) +++ portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectCredentialBinaryValue.hbm.xml 2010-01-05 15:01:32 UTC (rev 1163) @@ -1,22 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping> - <class name="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectCredentialBinaryValue" - table="jbid_creden_bin_value"> - <cache usage="read-write"/> - <id name="id" - type="java.lang.Long" - access="field"> - <column name="BIN_VALUE_ID" /> - <generator class="native"/> - </id> - <property name="value" - type="org.hibernate.type.PrimitiveByteArrayBlobType" - access="field" - lazy="false" - not-null="true"> - <column name="VALUE" length="10240000"/> - </property> - </class> -</hibernate-mapping> Copied: portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectCredentialBinaryValue.hbm.xml (from rev 1162, portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectCredentialBinaryValue.hbm.xml) =================================================================== --- portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectCredentialBinaryValue.hbm.xml (rev 0) +++ portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectCredentialBinaryValue.hbm.xml 2010-01-05 15:01:32 UTC (rev 1163) @@ -0,0 +1,22 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping> + <class name="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectCredentialBinaryValue" + table="jbid_creden_bin_value"> + <cache usage="read-write"/> + <id name="id" + type="java.lang.Long" + access="field"> + <column name="BIN_VALUE_ID" /> + <generator class="native"/> + </id> + <property name="value" + type="org.hibernate.type.PrimitiveByteArrayBlobType" + access="field" + lazy="false" + not-null="true"> + <column name="VALUE" length="10240000"/> + </property> + </class> +</hibernate-mapping> Deleted: portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectCredentialType.hbm.xml =================================================================== --- portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectCredentialType.hbm.xml 2010-01-01 18:01:10 UTC (rev 1154) +++ portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectCredentialType.hbm.xml 2010-01-05 15:01:32 UTC (rev 1163) @@ -1,23 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" -"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping> - <class name="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType" - table="jbid_io_creden_type"> - <cache usage="read-write"/> - - <id name="id" - type="java.lang.Long" - access="field"> - <column name="ID" /> - <generator class="native"/> - </id> - <property name="name" - type="java.lang.String" - access="field" - lazy="false"> - <column name="NAME" - unique="true" /> - </property> - </class> -</hibernate-mapping> Copied: portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectCredentialType.hbm.xml (from rev 1162, portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectCredentialType.hbm.xml) =================================================================== --- portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectCredentialType.hbm.xml (rev 0) +++ portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectCredentialType.hbm.xml 2010-01-05 15:01:32 UTC (rev 1163) @@ -0,0 +1,23 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" +"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping> + <class name="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType" + table="jbid_io_creden_type"> + <cache usage="read-write"/> + + <id name="id" + type="java.lang.Long" + access="field"> + <column name="ID" /> + <generator class="native"/> + </id> + <property name="name" + type="java.lang.String" + access="field" + lazy="false"> + <column name="NAME" + unique="true" /> + </property> + </class> +</hibernate-mapping> Deleted: portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectRelationship.hbm.xml =================================================================== --- portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectRelationship.hbm.xml 2010-01-01 18:01:10 UTC (rev 1154) +++ portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectRelationship.hbm.xml 2010-01-05 15:01:32 UTC (rev 1163) @@ -1,63 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping> - <class name="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectRelationship" - table="jbid_io_rel"> - <cache usage="read-write"/> - <id name="id" - type="java.lang.Long" - access="field"> - <column name="ID" /> - <generator class="native"/> - </id> - <many-to-one name="fromIdentityObject" - class="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObject" - access="field" - fetch="select" - lazy="proxy"> - <column name="FROM_IDENTITY" - not-null="true" - unique-key="id"/> - </many-to-one> - <many-to-one name="name" - class="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName" - access="field" - fetch="join" - lazy="proxy"> - <column name="NAME" - unique-key="id"/> - </many-to-one> - <many-to-one name="toIdentityObject" - class="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObject" - access="field" - fetch="select" - lazy="proxy"> - <column name="TO_IDENTITY" - not-null="true" - unique-key="id"/> - </many-to-one> - <many-to-one name="type" - class="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType" - access="field" - fetch="select" - lazy="proxy"> - <column name="REL_TYPE" - not-null="true" - unique-key="id" /> - </many-to-one> - <map name="properties" - table="jbid_io_rel_props" - cascade="all, delete-orphan" - fetch="subselect" - lazy="extra"> - <cache usage="read-write"/> - <key column="PROP_ID"/> - <map-key type="string" - column="PROP_NAME"/> - <element type="string" - column="PROP_VALUE" - not-null="true"/> - </map> - </class> -</hibernate-mapping> Copied: portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectRelationship.hbm.xml (from rev 1162, portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectRelationship.hbm.xml) =================================================================== --- portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectRelationship.hbm.xml (rev 0) +++ portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectRelationship.hbm.xml 2010-01-05 15:01:32 UTC (rev 1163) @@ -0,0 +1,63 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping> + <class name="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectRelationship" + table="jbid_io_rel"> + <cache usage="read-write"/> + <id name="id" + type="java.lang.Long" + access="field"> + <column name="ID" /> + <generator class="native"/> + </id> + <many-to-one name="fromIdentityObject" + class="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObject" + access="field" + fetch="select" + lazy="proxy"> + <column name="FROM_IDENTITY" + not-null="true" + unique-key="id"/> + </many-to-one> + <many-to-one name="name" + class="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName" + access="field" + fetch="join" + lazy="proxy"> + <column name="NAME" + unique-key="id"/> + </many-to-one> + <many-to-one name="toIdentityObject" + class="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObject" + access="field" + fetch="select" + lazy="proxy"> + <column name="TO_IDENTITY" + not-null="true" + unique-key="id"/> + </many-to-one> + <many-to-one name="type" + class="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType" + access="field" + fetch="select" + lazy="proxy"> + <column name="REL_TYPE" + not-null="true" + unique-key="id" /> + </many-to-one> + <map name="properties" + table="jbid_io_rel_props" + cascade="all, delete-orphan" + fetch="subselect" + lazy="extra"> + <cache usage="read-write"/> + <key column="PROP_ID"/> + <map-key type="string" + column="PROP_NAME"/> + <element type="string" + column="PROP_VALUE" + not-null="true"/> + </map> + </class> +</hibernate-mapping> Deleted: portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectRelationshipName.hbm.xml =================================================================== --- portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectRelationshipName.hbm.xml 2010-01-01 18:01:10 UTC (rev 1154) +++ portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectRelationshipName.hbm.xml 2010-01-05 15:01:32 UTC (rev 1163) @@ -1,48 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" -"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping> - <class name="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName" - table="jbid_io_rel_name"> - <cache usage="read-write"/> - - <id name="id" - type="java.lang.Long" - access="field"> - <column name="ID"/> - <generator class="native"/> - </id> - <property name="name" - type="java.lang.String" - access="field" - lazy="false"> - <column name="NAME" - not-null="true" - unique="true" - unique-key="id"/> - </property> - <map name="properties" - table="jbid_io_rel_name_props" - cascade="all, delete-orphan" - lazy="extra" - fetch="subselect"> - <cache usage="read-write"/> - <key column="PROP_ID"/> - <map-key type="string" - column="PROP_NAME"/> - <element type="string" - column="PROP_VALUE" - not-null="true"/> - </map> - <many-to-one name="realm" - class="org.picketlink.idm.impl.model.hibernate.HibernateRealm" - access="field" - fetch="select" - lazy="proxy"> - <column name="REALM" - not-null="true" - unique-key="id"/> - </many-to-one> - - </class> -</hibernate-mapping> Copied: portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectRelationshipName.hbm.xml (from rev 1162, portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectRelationshipName.hbm.xml) =================================================================== --- portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectRelationshipName.hbm.xml (rev 0) +++ portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectRelationshipName.hbm.xml 2010-01-05 15:01:32 UTC (rev 1163) @@ -0,0 +1,48 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" +"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping> + <class name="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName" + table="jbid_io_rel_name"> + <cache usage="read-write"/> + + <id name="id" + type="java.lang.Long" + access="field"> + <column name="ID"/> + <generator class="native"/> + </id> + <property name="name" + type="java.lang.String" + access="field" + lazy="false"> + <column name="NAME" + not-null="true" + unique="true" + unique-key="id"/> + </property> + <map name="properties" + table="jbid_io_rel_name_props" + cascade="all, delete-orphan" + lazy="extra" + fetch="subselect"> + <cache usage="read-write"/> + <key column="PROP_ID"/> + <map-key type="string" + column="PROP_NAME"/> + <element type="string" + column="PROP_VALUE" + not-null="true"/> + </map> + <many-to-one name="realm" + class="org.picketlink.idm.impl.model.hibernate.HibernateRealm" + access="field" + fetch="select" + lazy="proxy"> + <column name="REALM" + not-null="true" + unique-key="id"/> + </many-to-one> + + </class> +</hibernate-mapping> Deleted: portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectRelationshipType.hbm.xml =================================================================== --- portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectRelationshipType.hbm.xml 2010-01-01 18:01:10 UTC (rev 1154) +++ portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectRelationshipType.hbm.xml 2010-01-05 15:01:32 UTC (rev 1163) @@ -1,23 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping> - <class name="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType" - table="jbid_io_rel_type"> - <cache usage="read-write"/> - <id name="id" - type="java.lang.Long" - access="field"> - <column name="ID" /> - <generator class="native"/> - </id> - <property name="name" - type="java.lang.String" - access="field" - lazy="false"> - <column name="NAME" - not-null="true" - unique="true" /> - </property> - </class> -</hibernate-mapping> Copied: portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectRelationshipType.hbm.xml (from rev 1162, portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectRelationshipType.hbm.xml) =================================================================== --- portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectRelationshipType.hbm.xml (rev 0) +++ portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectRelationshipType.hbm.xml 2010-01-05 15:01:32 UTC (rev 1163) @@ -0,0 +1,23 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping> + <class name="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType" + table="jbid_io_rel_type"> + <cache usage="read-write"/> + <id name="id" + type="java.lang.Long" + access="field"> + <column name="ID" /> + <generator class="native"/> + </id> + <property name="name" + type="java.lang.String" + access="field" + lazy="false"> + <column name="NAME" + not-null="true" + unique="true" /> + </property> + </class> +</hibernate-mapping> Deleted: portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectType.hbm.xml =================================================================== --- portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectType.hbm.xml 2010-01-01 18:01:10 UTC (rev 1154) +++ portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectType.hbm.xml 2010-01-05 15:01:32 UTC (rev 1163) @@ -1,23 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping> - <class name="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectType" - table="jbid_io_type"> - <cache usage="read-write"/> - <id name="id" - type="java.lang.Long" - access="field"> - <column name="ID" /> - <generator class="native"/> - </id> - <property name="name" - type="java.lang.String" - access="field" - lazy="false"> - <column name="NAME" - not-null="true" - unique="true" /> - </property> - </class> -</hibernate-mapping> Copied: portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectType.hbm.xml (from rev 1162, portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateIdentityObjectType.hbm.xml) =================================================================== --- portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectType.hbm.xml (rev 0) +++ portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateIdentityObjectType.hbm.xml 2010-01-05 15:01:32 UTC (rev 1163) @@ -0,0 +1,23 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping> + <class name="org.picketlink.idm.impl.model.hibernate.HibernateIdentityObjectType" + table="jbid_io_type"> + <cache usage="read-write"/> + <id name="id" + type="java.lang.Long" + access="field"> + <column name="ID" /> + <generator class="native"/> + </id> + <property name="name" + type="java.lang.String" + access="field" + lazy="false"> + <column name="NAME" + not-null="true" + unique="true" /> + </property> + </class> +</hibernate-mapping> Deleted: portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateRealm.hbm.xml =================================================================== --- portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateRealm.hbm.xml 2010-01-01 18:01:10 UTC (rev 1154) +++ portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateRealm.hbm.xml 2010-01-05 15:01:32 UTC (rev 1163) @@ -1,36 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" -"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping> - <class name="org.picketlink.idm.impl.model.hibernate.HibernateRealm" - table="jbid_realm"> - <cache usage="read-write"/> - <id name="id" - type="java.lang.Long" - access="field"> - <column name="ID" /> - <generator class="native"/> - </id> - <property name="name" - type="java.lang.String" - access="field" - lazy="false"> - <column name="NAME" - not-null="true" - unique-key="id"/> - </property> - <map name="properties" - table="jbid_real_props" - cascade="all, delete-orphan" - fetch="subselect" - lazy="extra"> - <cache usage="read-write"/> - <key column="PROP_ID"/> - <map-key type="string" - column="PROP_NAME"/> - <element type="string" - column="PROP_VALUE" - not-null="true"/> - </map> - </class> -</hibernate-mapping> Copied: portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateRealm.hbm.xml (from rev 1162, portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/mappings/HibernateRealm.hbm.xml) =================================================================== --- portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateRealm.hbm.xml (rev 0) +++ portal/trunk/component/test/organization/src/main/resources/conf/mappings/HibernateRealm.hbm.xml 2010-01-05 15:01:32 UTC (rev 1163) @@ -0,0 +1,36 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" +"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping> + <class name="org.picketlink.idm.impl.model.hibernate.HibernateRealm" + table="jbid_realm"> + <cache usage="read-write"/> + <id name="id" + type="java.lang.Long" + access="field"> + <column name="ID" /> + <generator class="native"/> + </id> + <property name="name" + type="java.lang.String" + access="field" + lazy="false"> + <column name="NAME" + not-null="true" + unique-key="id"/> + </property> + <map name="properties" + table="jbid_real_props" + cascade="all, delete-orphan" + fetch="subselect" + lazy="extra"> + <cache usage="read-write"/> + <key column="PROP_ID"/> + <map-key type="string" + column="PROP_NAME"/> + <element type="string" + column="PROP_VALUE" + not-null="true"/> + </map> + </class> +</hibernate-mapping> Deleted: portal/trunk/component/test/organization/src/main/resources/conf/organization/organization-configuration.xml =================================================================== --- portal/trunk/component/test/organization/src/main/resources/conf/organization/organization-configuration.xml 2010-01-05 13:57:00 UTC (rev 1162) +++ portal/trunk/component/test/organization/src/main/resources/conf/organization/organization-configuration.xml 2010-01-05 15:01:32 UTC (rev 1163) @@ -1,122 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - - -<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> - - - - <component> - <key>org.exoplatform.services.organization.idm.PicketLinkIDMService</key> - <type>org.exoplatform.services.organization.idm.PicketLinkIDMServiceImpl</type> - <init-params> - <value-param> - <name>config</name> - <value>jar:/conf/organization/picketlink-idm/picketlink-idm-config.xml</value> - </value-param> - </init-params> - </component> - - <component> - <key>org.exoplatform.services.organization.OrganizationService</key> - <type>org.exoplatform.services.organization.idm.PicketLinkIDMOrganizationServiceImpl</type> - </component> - - <component> - <key>org.exoplatform.services.cache.CacheService</key> - <jmx-name>cache:type=CacheService</jmx-name> - <type>org.exoplatform.services.cache.impl.CacheServiceImpl</type> - <init-params> - <object-param> - <name>cache.config.default</name> - <description>The default cache configuration</description> - <object type="org.exoplatform.services.cache.ExoCacheConfig"> - <field name="name"><string>default</string></field> - <field name="maxSize"><int>300</int></field> - <field name="liveTime"><long>60</long></field> - <field name="distributed"><boolean>false</boolean></field> - <field name="implementation"><string>org.exoplatform.services.cache.concurrent.ConcurrentFIFOExoCache</string></field> - </object> - </object-param> - </init-params> - </component> - - <component> - <key>org.exoplatform.services.database.HibernateService</key> - <jmx-name>database:type=HibernateService</jmx-name> - <type>org.exoplatform.services.database.impl.HibernateServiceImpl</type> - <init-params> - <properties-param> - <name>hibernate.properties</name> - <description>Default Hibernate Service</description> - <property name="hibernate.hbm2ddl.auto" value="create-drop"/> - <property name="hibernate.show_sql" value="false"/> - <property name="hibernate.current_session_context_class" value="thread"/> - <property name="hibernate.cache.use_second_level_cache" value="true"/> - <property name="hibernate.cache.use_query_cache" value="true"/> -  - <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/> - <property name="hibernate.cglib.use_reflection_optimizer" value="true"/> - - <property name="hibernate.connection.datasource" value="jdbcexo"/> - <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/> - <property name="hibernate.c3p0.min_size" value="5"/> - <property name="hibernate.c3p0.max_size" value="20"/> - <property name="hibernate.c3p0.timeout" value="1800"/> - <property name="hibernate.c3p0.max_statements" value="50"/> - </properties-param> - </init-params> - </component> - - <external-component-plugins> - <target-component>org.exoplatform.services.database.HibernateService</target-component> - <component-plugin> - <name>add.hibernate.mapping</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.database.impl.AddHibernateMappingPlugin</type> - <init-params> - <values-param> - <name>hibernate.mapping</name> - <value>conf/organization/picketlink-idm/mappings/HibernateRealm.hbm.xml</value> - <value>conf/organization/picketlink-idm/mappings/HibernateIdentityObjectCredentialBinaryValue.hbm.xml</value> - <value>conf/organization/picketlink-idm/mappings/HibernateIdentityObjectAttributeBinaryValue.hbm.xml</value> - <value>conf/organization/picketlink-idm/mappings/HibernateIdentityObject.hbm.xml</value> - <value>conf/organization/picketlink-idm/mappings/HibernateIdentityObjectCredential.hbm.xml</value> - <value>conf/organization/picketlink-idm/mappings/HibernateIdentityObjectCredentialType.hbm.xml</value> - <value>conf/organization/picketlink-idm/mappings/HibernateIdentityObjectAttribute.hbm.xml</value> - <value>conf/organization/picketlink-idm/mappings/HibernateIdentityObjectType.hbm.xml</value> - <value>conf/organization/picketlink-idm/mappings/HibernateIdentityObjectRelationship.hbm.xml</value> - <value>conf/organization/picketlink-idm/mappings/HibernateIdentityObjectRelationshipType.hbm.xml</value> - <value>conf/organization/picketlink-idm/mappings/HibernateIdentityObjectRelationshipName.hbm.xml</value> - </values-param> - </init-params> - </component-plugin> - </external-component-plugins> - -</configuration> \ No newline at end of file Deleted: portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/picketlink-idm-config.xml =================================================================== --- portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/picketlink-idm-config.xml 2010-01-05 13:57:00 UTC (rev 1162) +++ portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/picketlink-idm-config.xml 2010-01-05 15:01:32 UTC (rev 1163) @@ -1,95 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<jboss-identity xmlns="urn:picketlink:idm:config:v1_0_0_cr1" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 identity-config.xsd"> - <realms> - <realm> - <id>PortalRealm</id> - <repository-id-ref>PortalRepository</repository-id-ref> - <identity-type-mappings> - <user-mapping>USER</user-mapping> - </identity-type-mappings> - </realm> - </realms> - <repositories> - <repository> - <id>PortalRepository</id> - <class>org.picketlink.idm.impl.repository.WrapperIdentityStoreRepository</class> - <external-config/> - <default-identity-store-id>HibernateStore</default-identity-store-id> - <default-attribute-store-id>HibernateStore</default-attribute-store-id> - </repository> - </repositories> - <stores> - <attribute-stores/> - <identity-stores> - <identity-store> - <id>HibernateStore</id> - <class>org.picketlink.idm.impl.store.hibernate.HibernateIdentityStoreImpl</class> - <external-config/> - <supported-relationship-types> - <relationship-type>JBOSS_IDENTITY_MEMBERSHIP</relationship-type> - <relationship-type>JBOSS_IDENTITY_ROLE</relationship-type> - </supported-relationship-types> - <supported-identity-object-types> - <identity-object-type> - <name>USER</name> - <relationships/> - <credentials> - <credential-type>PASSWORD</credential-type> - </credentials> - <attributes/> - <options/> - </identity-object-type> - </supported-identity-object-types> - <options> - <option> - <name>hibernateSessionFactoryRegistryName</name> - <value>hibernateSessionFactory</value> - </option> - <option> - <name>allowNotDefinedIdentityObjectTypes</name> - <value>true</value> - </option> - <option> - <name>populateRelationshipTypes</name> - <value>true</value> - </option> - <option> - <name>populateIdentityObjectTypes</name> - <value>true</value> - </option> - <option> - <name>allowNotDefinedAttributes</name> - <value>true</value> - </option> - <option> - <name>isRealmAware</name> - <value>true</value> - </option> - </options> - </identity-store> - </identity-stores> - </stores> -</jboss-identity> \ No newline at end of file Copied: portal/trunk/component/test/organization/src/main/resources/conf/picketlink-idm-config.xml (from rev 1154, portal/trunk/component/test/organization/src/main/resources/conf/organization/picketlink-idm/picketlink-idm-config.xml) =================================================================== --- portal/trunk/component/test/organization/src/main/resources/conf/picketlink-idm-config.xml (rev 0) +++ portal/trunk/component/test/organization/src/main/resources/conf/picketlink-idm-config.xml 2010-01-05 15:01:32 UTC (rev 1163) @@ -0,0 +1,95 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<jboss-identity xmlns="urn:picketlink:idm:config:v1_0_0_cr1" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:picketlink:idm:config:v1_0_0_cr1 identity-config.xsd"> + <realms> + <realm> + <id>PortalRealm</id> + <repository-id-ref>PortalRepository</repository-id-ref> + <identity-type-mappings> + <user-mapping>USER</user-mapping> + </identity-type-mappings> + </realm> + </realms> + <repositories> + <repository> + <id>PortalRepository</id> + <class>org.picketlink.idm.impl.repository.WrapperIdentityStoreRepository</class> + <external-config/> + <default-identity-store-id>HibernateStore</default-identity-store-id> + <default-attribute-store-id>HibernateStore</default-attribute-store-id> + </repository> + </repositories> + <stores> + <attribute-stores/> + <identity-stores> + <identity-store> + <id>HibernateStore</id> + <class>org.picketlink.idm.impl.store.hibernate.HibernateIdentityStoreImpl</class> + <external-config/> + <supported-relationship-types> + <relationship-type>JBOSS_IDENTITY_MEMBERSHIP</relationship-type> + <relationship-type>JBOSS_IDENTITY_ROLE</relationship-type> + </supported-relationship-types> + <supported-identity-object-types> + <identity-object-type> + <name>USER</name> + <relationships/> + <credentials> + <credential-type>PASSWORD</credential-type> + </credentials> + <attributes/> + <options/> + </identity-object-type> + </supported-identity-object-types> + <options> + <option> + <name>hibernateSessionFactoryRegistryName</name> + <value>hibernateSessionFactory</value> + </option> + <option> + <name>allowNotDefinedIdentityObjectTypes</name> + <value>true</value> + </option> + <option> + <name>populateRelationshipTypes</name> + <value>true</value> + </option> + <option> + <name>populateIdentityObjectTypes</name> + <value>true</value> + </option> + <option> + <name>allowNotDefinedAttributes</name> + <value>true</value> + </option> + <option> + <name>isRealmAware</name> + <value>true</value> + </option> + </options> + </identity-store> + </identity-stores> + </stores> +</jboss-identity> \ No newline at end of file Modified: portal/trunk/component/test/organization/src/test/java/org/exoplatform/component/test/organization/BootstrapTestCase.java =================================================================== --- portal/trunk/component/test/organization/src/test/java/org/exoplatform/component/test/organization/BootstrapTestCase.java 2010-01-05 13:57:00 UTC (rev 1162) +++ portal/trunk/component/test/organization/src/test/java/org/exoplatform/component/test/organization/BootstrapTestCase.java 2010-01-05 15:01:32 UTC (rev 1163) @@ -33,7 +33,7 @@ import org.exoplatform.services.organization.User; import org.exoplatform.services.organization.impl.UserImpl; -@ConfiguredBy({@ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/organization/organization-configuration.xml")}) +@ConfiguredBy({@ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/exo.portal.component.test.organization-configuration.xml")}) public class BootstrapTestCase extends AbstractGateInTest { Modified: portal/trunk/component/wsrp/src/test/java/org/gatein/portal/wsrp/state/consumer/ConsumerRegistryTestCase.java =================================================================== --- portal/trunk/component/wsrp/src/test/java/org/gatein/portal/wsrp/state/consumer/ConsumerRegistryTestCase.java 2010-01-05 13:57:00 UTC (rev 1162) +++ portal/trunk/component/wsrp/src/test/java/org/gatein/portal/wsrp/state/consumer/ConsumerRegistryTestCase.java 2010-01-05 15:01:32 UTC (rev 1163) @@ -44,8 +44,8 @@ * @version $Revision$ */ @ConfiguredBy({ - @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/jcr/jcr-configuration.xml"), - @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/wsrp-configuration.xml") + @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/exo.portal.component.test.jcr-configuration.xml"), + @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/exo.portal.component.wsrp-configuration.xml") }) public class ConsumerRegistryTestCase extends AbstractGateInTest { Copied: portal/trunk/component/wsrp/src/test/resources/conf/exo.portal.component.wsrp-configuration.xml (from rev 1159, portal/trunk/component/wsrp/src/test/resources/conf/wsrp-configuration.xml) =================================================================== --- portal/trunk/component/wsrp/src/test/resources/conf/exo.portal.component.wsrp-configuration.xml (rev 0) +++ portal/trunk/component/wsrp/src/test/resources/conf/exo.portal.component.wsrp-configuration.xml 2010-01-05 15:01:32 UTC (rev 1163) @@ -0,0 +1,83 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> + <component> + <key>org.exoplatform.commons.chromattic.ChromatticManager</key> + <type>org.exoplatform.commons.chromattic.ChromatticManager</type> + </component> + <external-component-plugins> + <target-component>org.exoplatform.services.jcr.RepositoryService</target-component> + <component-plugin> + <name>add.namespaces</name> + <set-method>addPlugin</set-method> + <type>org.exoplatform.services.jcr.impl.AddNamespacesPlugin</type> + <init-params> + <properties-param> + <name>namespaces</name> + <property name="wsrp" value="http://www.gatein.org/jcr/wsrp/1.0/"/> + </properties-param> + </init-params> + </component-plugin> + <component-plugin> + <name>add.nodeType</name> + <set-method>addPlugin</set-method> + <type>org.exoplatform.services.jcr.impl.AddNodeTypePlugin</type> + <init-params> + <values-param> + <name>autoCreatedInNewRepository</name> + <description>Node types configuration file</description> + <value>jar:/conf/consumers-configuration-nodetypes.xml</value> + </values-param> + </init-params> + </component-plugin> + </external-component-plugins> + <external-component-plugins> + <target-component>org.exoplatform.commons.chromattic.ChromatticManager</target-component> + <component-plugin> + <name>chromattic</name> + <set-method>addLifeCycle</set-method> + <type>org.exoplatform.commons.chromattic.ChromatticLifeCycle</type> + <init-params> + <value-param> + <name>domain-name</name> + <value>wsrp</value> + </value-param> + <value-param> + <name>workspace-name</name> + <value>portal-test</value> + </value-param> + <values-param> + <name>entities</name> + <value>org.gatein.portal.wsrp.state.mapping.RegistrationPropertyDescriptionMapping</value> + <value>org.gatein.portal.wsrp.state.consumer.mapping.ProducerInfoMapping</value> + <value>org.gatein.portal.wsrp.state.consumer.mapping.ProducerInfosMapping</value> + <value>org.gatein.portal.wsrp.state.consumer.mapping.RegistrationInfoMapping</value> + <value>org.gatein.portal.wsrp.state.consumer.mapping.RegistrationPropertyMapping</value> + <value>org.gatein.portal.wsrp.state.consumer.mapping.EndpointInfoMapping</value> + </values-param> + </init-params> + </component-plugin> + </external-component-plugins> +</configuration> Deleted: portal/trunk/component/wsrp/src/test/resources/conf/wsrp-configuration.xml =================================================================== --- portal/trunk/component/wsrp/src/test/resources/conf/wsrp-configuration.xml 2010-01-05 13:57:00 UTC (rev 1162) +++ portal/trunk/component/wsrp/src/test/resources/conf/wsrp-configuration.xml 2010-01-05 15:01:32 UTC (rev 1163) @@ -1,83 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - - -<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> - <component> - <key>org.exoplatform.commons.chromattic.ChromatticManager</key> - <type>org.exoplatform.commons.chromattic.ChromatticManager</type> - </component> - <external-component-plugins> - <target-component>org.exoplatform.services.jcr.RepositoryService</target-component> - <component-plugin> - <name>add.namespaces</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.jcr.impl.AddNamespacesPlugin</type> - <init-params> - <properties-param> - <name>namespaces</name> - <property name="wsrp" value="http://www.gatein.org/jcr/wsrp/1.0/"/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>add.nodeType</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.jcr.impl.AddNodeTypePlugin</type> - <init-params> - <values-param> - <name>autoCreatedInNewRepository</name> - <description>Node types configuration file</description> - <value>jar:/conf/consumers-configuration-nodetypes.xml</value> - </values-param> - </init-params> - </component-plugin> - </external-component-plugins> - <external-component-plugins> - <target-component>org.exoplatform.commons.chromattic.ChromatticManager</target-component> - <component-plugin> - <name>chromattic</name> - <set-method>addLifeCycle</set-method> - <type>org.exoplatform.commons.chromattic.ChromatticLifeCycle</type> - <init-params> - <value-param> - <name>domain-name</name> - <value>wsrp</value> - </value-param> - <value-param> - <name>workspace-name</name> - <value>portal-test</value> - </value-param> - <values-param> - <name>entities</name> - <value>org.gatein.portal.wsrp.state.mapping.RegistrationPropertyDescriptionMapping</value> - <value>org.gatein.portal.wsrp.state.consumer.mapping.ProducerInfoMapping</value> - <value>org.gatein.portal.wsrp.state.consumer.mapping.ProducerInfosMapping</value> - <value>org.gatein.portal.wsrp.state.consumer.mapping.RegistrationInfoMapping</value> - <value>org.gatein.portal.wsrp.state.consumer.mapping.RegistrationPropertyMapping</value> - <value>org.gatein.portal.wsrp.state.consumer.mapping.EndpointInfoMapping</value> - </values-param> - </init-params> - </component-plugin> - </external-component-plugins> -</configuration>

14 years, 11 months

1
0
0 / 0

gatein SVN: r1162 - portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr.

by do-not-reply＠jboss.org

Author: mpodolin Date: 2010-01-05 08:57:00 -0500 (Tue, 05 Jan 2010) New Revision: 1162 Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.tmpl.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml Log: absolute path definition replaced by a system property Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.tmpl.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.tmpl.xml 2010-01-05 13:34:59 UTC (rev 1161) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.tmpl.xml 2010-01-05 13:57:00 UTC (rev 1162) @@ -182,13 +182,13 @@ <property name="multi-db" value="false"/> <property name="update-storage" value="true"/> <property name="max-buffer-size" value="204800"/> - <property name="swap-directory" value="../temp/swap/wsrp${container.name.suffix}"/> + <property name="swap-directory" value="${gatein.jcr.data.dir}/swap/wsrp${container.name.suffix}"/> </properties> <value-storages> <value-storage id="gadgets" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> <properties> - <property name="path" value="../temp/values/wsrp${container.name.suffix}"/> + <property name="path" value="${gatein.jcr.data.dir}/values/wsrp${container.name.suffix}"/> </properties> <filters> <filter property-type="Binary"/> @@ -211,14 +211,14 @@ </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> <properties> - <property name="index-dir" value="../temp/jcrlucenedb/wsrp${container.name.suffix}"/> + <property name="index-dir" value="${gatein.jcr.data.dir}/jcrlucenedb/wsrp${container.name.suffix}"/> </properties> </query-handler> <lock-manager> <time-out>15m</time-out> <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> <properties> - <property name="path" value="../temp/lock/wsrp${container.name.suffix}"/> + <property name="path" value="${gatein.jcr.data.dir}/lock/wsrp${container.name.suffix}"/> </properties> </persister> </lock-manager> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml 2010-01-05 13:34:59 UTC (rev 1161) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml 2010-01-05 13:57:00 UTC (rev 1162) @@ -182,13 +182,13 @@ <property name="multi-db" value="false"/> <property name="update-storage" value="true"/> <property name="max-buffer-size" value="204800"/> - <property name="swap-directory" value="../temp/swap/wsrp${container.name.suffix}"/> + <property name="swap-directory" value="${gatein.jcr.data.dir}/swap/wsrp${container.name.suffix}"/> </properties> <value-storages> <value-storage id="gadgets" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> <properties> - <property name="path" value="../temp/values/wsrp${container.name.suffix}"/> + <property name="path" value="${gatein.jcr.data.dir}/values/wsrp${container.name.suffix}"/> </properties> <filters> <filter property-type="Binary"/> @@ -211,14 +211,14 @@ </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> <properties> - <property name="index-dir" value="../temp/jcrlucenedb/wsrp${container.name.suffix}"/> + <property name="index-dir" value="${gatein.jcr.data.dir}/jcrlucenedb/wsrp${container.name.suffix}"/> </properties> </query-handler> <lock-manager> <time-out>15m</time-out> <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> <properties> - <property name="path" value="../temp/lock/wsrp${container.name.suffix}"/> + <property name="path" value="${gatein.jcr.data.dir}/lock/wsrp${container.name.suffix}"/> </properties> </persister> </lock-manager>

14 years, 11 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits January 2010