[exo-jcr-commits] exo-jcr SVN: r5827 - in core/branches/2.5.x: exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/impl and 6 other directories.

Wednesday, 7 March 2012


Author: andrew.plotnikov
Date: 2012-03-07 05:57:52 -0500 (Wed, 07 Mar 2012)
New Revision: 5827

Modified:
  
core/branches/2.5.x/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/OrganizationConfig.java
  
core/branches/2.5.x/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/OrganizationDatabaseInitializer.java
  
core/branches/2.5.x/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/User.java
  
core/branches/2.5.x/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/impl/UserImpl.java
  
core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/OrganizationServiceImpl.java
  
core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/UserImpl.java
  
core/branches/2.5.x/exo.core.component.organization.jdbc/src/test/resources/conf/standalone/test-configuration-hibernate.xml
  
core/branches/2.5.x/exo.core.component.organization.jdbc/src/test/resources/conf/standalone/test-configuration-jdbc.xml
  
core/branches/2.5.x/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/LDAPAttributeMapping.java
  
core/branches/2.5.x/exo.core.component.organization.ldap/src/main/resources/conf/portal/database-organization-configuration.xml
  
core/branches/2.5.x/exo.core.component.organization.ldap/src/test/resources/conf/standalone/test-configuration.xml
  
core/branches/2.5.x/exo.core.component.organization.tests/src/test/java/org/exoplatform/services/tck/organization/TestUserHandler.java
Log:
EXOJCR-1780: Allowed to modify and store the value of the display name

Modified:
core/branches/2.5.x/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/OrganizationConfig.java
===================================================================
---
core/branches/2.5.x/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/OrganizationConfig.java	2012-03-07
10:20:45 UTC (rev 5826)
+++
core/branches/2.5.x/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/OrganizationConfig.java	2012-03-07
10:57:52 UTC (rev 5827)
@@ -163,6 +163,8 @@
 
       private String email;
 
+      private String displayName;
+
       private String groups;
 
       public User()
@@ -179,6 +181,16 @@
          this.email = email;
       }
 
+      public String getDisplayName()
+      {
+         return displayName;
+      }
+
+      public void setDisplayName(String displayName)
+      {
+         this.displayName = displayName;
+      }
+
       public String getFirstName()
       {
          return firstName;

Modified:
core/branches/2.5.x/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/OrganizationDatabaseInitializer.java
===================================================================
---
core/branches/2.5.x/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/OrganizationDatabaseInitializer.java	2012-03-07
10:20:45 UTC (rev 5826)
+++
core/branches/2.5.x/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/OrganizationDatabaseInitializer.java	2012-03-07
10:57:52 UTC (rev 5827)
@@ -158,6 +158,7 @@
          user.setFirstName(data.getFirstName());
          user.setLastName(data.getLastName());
          user.setEmail(data.getEmail());
+         user.setDisplayName(data.getDisplayName());
          if (service.getUserHandler().findUserByName(data.getUserName()) == null)
          {
             service.getUserHandler().createUser(user, true);

Modified:
core/branches/2.5.x/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/User.java
===================================================================
---
core/branches/2.5.x/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/User.java	2012-03-07
10:20:45 UTC (rev 5826)
+++
core/branches/2.5.x/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/User.java	2012-03-07
10:57:52 UTC (rev 5827)
@@ -84,11 +84,13 @@
    /**
     * @return return the full name of the user. The full name shoul have the
     *         format: first name, last name by default
+    * @deprecated This method call getDiplayName
     */
    public String getFullName();
 
    /**
     * @param s The name that should show in the full name
+    * @deprecated This method call setDiplayName
     */
    public void setFullName(String s);
 
@@ -125,6 +127,16 @@
    public void setLastLoginTime(Date t);
 
    /**
+    * @return return the display name
+    */
+   public String getDisplayName();
+
+   /**
+    * @param displayName The name that should show in the display name
+    */
+   public void setDisplayName(String displayName);
+
+   /**
     * @return the id of organization the user belongs to or null if not
     *         applicable
     */

Modified:
core/branches/2.5.x/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/impl/UserImpl.java
===================================================================
---
core/branches/2.5.x/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/impl/UserImpl.java	2012-03-07
10:20:45 UTC (rev 5826)
+++
core/branches/2.5.x/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/impl/UserImpl.java	2012-03-07
10:57:52 UTC (rev 5827)
@@ -47,6 +47,8 @@
 
    private String organizationId = null;
 
+   private String displayName = null;
+
    public UserImpl()
    {
    }
@@ -57,8 +59,21 @@
    }
 
    /**
+    * @hibernate.property
+    */
+   public String getDisplayName()
+   {
+      return displayName != null ? displayName : getFirstName() + " " +
getLastName();
+   }
+
+   public void setDisplayName(String displayName)
+   {
+      this.displayName = displayName;
+   }
+
+   /**
     * @hibernate.id generator-class="assigned" unsaved-value="null"
-    ***/
+    */
    public String getId()
    {
       return id;
@@ -71,7 +86,7 @@
 
    /**
     * @hibernate.property
-    **/
+    */
    public String getUserName()
    {
       return userName;
@@ -84,7 +99,7 @@
 
    /**
     * @hibernate.property
-    **/
+    */
    public String getPassword()
    {
       return password;
@@ -97,7 +112,7 @@
 
    /**
     * @hibernate.property
-    **/
+    */
    public String getFirstName()
    {
       return firstName;
@@ -110,7 +125,7 @@
 
    /**
     * @hibernate.property
-    **/
+    */
    public String getLastName()
    {
       return lastName;
@@ -123,7 +138,7 @@
 
    /**
     * @hibernate.property
-    **/
+    */
    public String getEmail()
    {
       return email;
@@ -137,17 +152,17 @@
    // wrapper method
    public String getFullName()
    {
-      return getFirstName() + " " + getLastName();
+      return getDisplayName();
    }
 
    public void setFullName(String fullName)
    {
-
+      setDisplayName(fullName);
    }
 
    /**
     * @hibernate.property
-    **/
+    */
    public Date getCreatedDate()
    {
       return createdDate;
@@ -160,7 +175,7 @@
 
    /**
     * @hibernate.property
-    **/
+    */
    public Date getLastLoginTime()
    {
       return lastLoginTime;
@@ -189,7 +204,7 @@
 
    /**
     * {@inheritDoc}
-    **/
+    */
    public UserImpl clone()
    {
       UserImpl ui;

Modified:
core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/OrganizationServiceImpl.java
===================================================================
---
core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/OrganizationServiceImpl.java	2012-03-07
10:20:45 UTC (rev 5826)
+++
core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/OrganizationServiceImpl.java	2012-03-07
10:57:52 UTC (rev 5827)
@@ -78,8 +78,9 @@
          java.sql.Date lastLogin = new java.sql.Date(date.getTime());
          return new String[][]{{"ID", String.valueOf(bean.getDBObjectId())},
{"USER_NAME", bean.getUserName()},
             {"PASSWORD", bean.getPassword()}, {"FIRST_NAME",
bean.getFirstName()}, {"LAST_NAME", bean.getLastName()},
-            {"EMAIL", bean.getEmail()}, {"CREATED_DATE",
createdDate.toString()},
-            {"LAST_LOGIN_TIME", lastLogin.toString()},
{"ORGANIZATION_ID", bean.getOrganizationId()}};
+            {"EMAIL", bean.getEmail()}, {"DISPLAY_NAME",
bean.getDisplayName()},
+            {"CREATED_DATE", createdDate.toString()},
{"LAST_LOGIN_TIME", lastLogin.toString()},
+            {"ORGANIZATION_ID", bean.getOrganizationId()}};
       }
 
       public void mapUpdate(UserImpl bean, PreparedStatement statement) throws Exception
@@ -89,18 +90,19 @@
          statement.setString(3, bean.getFirstName());
          statement.setString(4, bean.getLastName());
          statement.setString(5, bean.getEmail());
+         statement.setString(6, bean.getDisplayName());
 
          Date createdDate = bean.getCreatedDate();
          if (createdDate == null)
             createdDate = Calendar.getInstance().getTime();
-         statement.setDate(6, new java.sql.Date(createdDate.getTime()));
+         statement.setDate(7, new java.sql.Date(createdDate.getTime()));
 
          Date lastLoginTime = bean.getLastLoginTime();
          if (lastLoginTime == null)
             lastLoginTime = Calendar.getInstance().getTime();
-         statement.setDate(7, new java.sql.Date(lastLoginTime.getTime()));
+         statement.setDate(8, new java.sql.Date(lastLoginTime.getTime()));
 
-         statement.setString(8, bean.getOrganizationId());
+         statement.setString(9, bean.getOrganizationId());
       }
 
       public void mapResultSet(ResultSet res, UserImpl bean) throws Exception
@@ -111,6 +113,7 @@
          bean.setFirstName(res.getString("FIRST_NAME"));
          bean.setLastName(res.getString("LAST_NAME"));
          bean.setEmail(res.getString("EMAIL"));
+         bean.setDisplayName(res.getString("DISPLAY_NAME"));
 
          Calendar calendar = Calendar.getInstance();
          res.getDate("CREATED_DATE", calendar);

Modified:
core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/UserImpl.java
===================================================================
---
core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/UserImpl.java	2012-03-07
10:20:45 UTC (rev 5826)
+++
core/branches/2.5.x/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/UserImpl.java	2012-03-07
10:57:52 UTC (rev 5827)
@@ -31,6 +31,7 @@
    @TableField(name = "FIRST_NAME", type = "string", length = 500),
    @TableField(name = "LAST_NAME", type = "string", length = 200),
    @TableField(name = "EMAIL", type = "string", length = 200),
+   @TableField(name = "DISPLAY_NAME", type = "string", length =
200),
    @TableField(name = "CREATED_DATE", type = "date", length = 100),
    @TableField(name = "LAST_LOGIN_TIME", type = "date", length =
100),
    @TableField(name = "ORGANIZATION_ID", type = "string", length =
100)})
@@ -53,6 +54,8 @@
 
    private String organizationId = null;
 
+   private String displayName = null;
+
    public UserImpl()
    {
    }
@@ -62,6 +65,16 @@
       this.userName = username;
    }
 
+   public String getDisplayName()
+   {
+      return displayName != null ? displayName : getFirstName() + " " +
getLastName();
+   }
+
+   public void setDisplayName(String displayName)
+   {
+      this.displayName = displayName;
+   }
+
    public String getUserName()
    {
       return userName;
@@ -114,12 +127,13 @@
 
    public String getFullName()
    {
-      return getFirstName() + " " + getLastName();
+      return getDisplayName();
    }
 
    @SuppressWarnings("unused")
    public void setFullName(String s)
    {
+      setDisplayName(s);
    }
 
    public Date getCreatedDate()

Modified:
core/branches/2.5.x/exo.core.component.organization.jdbc/src/test/resources/conf/standalone/test-configuration-hibernate.xml
===================================================================
---
core/branches/2.5.x/exo.core.component.organization.jdbc/src/test/resources/conf/standalone/test-configuration-hibernate.xml	2012-03-07
10:20:45 UTC (rev 5826)
+++
core/branches/2.5.x/exo.core.component.organization.jdbc/src/test/resources/conf/standalone/test-configuration-hibernate.xml	2012-03-07
10:57:52 UTC (rev 5827)
@@ -289,6 +289,7 @@
                     <field 
name="firstName"><string>Root</string></field>
                     <field 
name="lastName"><string>Root</string></field>
                     <field 
name="email"><string>root@localhost</string></field>
+                    <field 
name="displayName"><string>Root</string></field>
                     <field  name="groups">
                       <string>
                       	manager:/platform/administrators,member:/platform/users,
@@ -305,6 +306,7 @@
                     <field 
name="firstName"><string>John</string></field>
                     <field 
name="lastName"><string>Anthony</string></field>
                     <field 
name="email"><string>john@localhost</string></field>
+                    <field 
name="displayName"><string>John</string></field>
                     <field  name="groups">
                       <string>
                       	member:/platform/administrators,member:/platform/users,
@@ -320,6 +322,7 @@
                     <field 
name="firstName"><string>Marry</string></field>
                     <field 
name="lastName"><string>Kelly</string></field>
                     <field 
name="email"><string>marry@localhost</string></field>
+                    <field 
name="displayName"><string>Marry</string></field>
                     <field  name="groups">
                       <string>member:/platform/users</string>
                     </field>
@@ -332,6 +335,7 @@
                     <field 
name="firstName"><string>Demo</string></field>
                     <field 
name="lastName"><string>exo</string></field>
                     <field 
name="email"><string>demo@localhost</string></field>
+                    <field 
name="displayName"><string>Demo</string></field>
                     <field  name="groups">
                      
<string>member:/platform/guests,member:/platform/users</string>
                     </field>

Modified:
core/branches/2.5.x/exo.core.component.organization.jdbc/src/test/resources/conf/standalone/test-configuration-jdbc.xml
===================================================================
---
core/branches/2.5.x/exo.core.component.organization.jdbc/src/test/resources/conf/standalone/test-configuration-jdbc.xml	2012-03-07
10:20:45 UTC (rev 5826)
+++
core/branches/2.5.x/exo.core.component.organization.jdbc/src/test/resources/conf/standalone/test-configuration-jdbc.xml	2012-03-07
10:57:52 UTC (rev 5827)
@@ -58,7 +58,7 @@
       <key>org.exoplatform.services.database.impl.ExoCacheProvider</key>
       <type>org.exoplatform.services.database.impl.ExoCacheProvider</type>
    </component-->
-
+
    <component>
       <key>org.exoplatform.services.organization.OrganizationService</key>
      
<type>org.exoplatform.services.organization.jdbc.OrganizationServiceImpl</type>
@@ -311,6 +311,7 @@
                     <field 
name="firstName"><string>Root</string></field>
                     <field 
name="lastName"><string>Root</string></field>
                     <field 
name="email"><string>root@localhost</string></field>
+                    <field 
name="displayName"><string>Root</string></field>
                     <field  name="groups">
                       <string>
                       	manager:/platform/administrators,member:/platform/users,
@@ -327,6 +328,7 @@
                     <field 
name="firstName"><string>John</string></field>
                     <field 
name="lastName"><string>Anthony</string></field>
                     <field 
name="email"><string>john@localhost</string></field>
+                    <field 
name="displayName"><string>John</string></field>
                     <field  name="groups">
                       <string>
                       	member:/platform/administrators,member:/platform/users,
@@ -342,6 +344,7 @@
                     <field 
name="firstName"><string>Marry</string></field>
                     <field 
name="lastName"><string>Kelly</string></field>
                     <field 
name="email"><string>marry@localhost</string></field>
+                    <field 
name="displayName"><string>Marry</string></field>
                     <field  name="groups">
                       <string>member:/platform/users</string>
                     </field>
@@ -354,6 +357,7 @@
                     <field 
name="firstName"><string>Demo</string></field>
                     <field 
name="lastName"><string>exo</string></field>
                     <field 
name="email"><string>demo@localhost</string></field>
+                    <field 
name="displayName"><string>Demo</string></field>
                     <field  name="groups">
                      
<string>member:/platform/guests,member:/platform/users</string>
                     </field>
@@ -367,7 +371,7 @@
     </component-plugin>
   </external-component-plugins>
   
-</configuration>
+</configuration>
 
-  
+  
  

Modified:
core/branches/2.5.x/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/LDAPAttributeMapping.java
===================================================================
---
core/branches/2.5.x/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/LDAPAttributeMapping.java	2012-03-07
10:20:45 UTC (rev 5826)
+++
core/branches/2.5.x/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/LDAPAttributeMapping.java	2012-03-07
10:57:52 UTC (rev 5827)
@@ -119,13 +119,13 @@
          USER_LDAP_CLASSES = userLDAPClasses.split(",");
       attrs.put(new ObjectClassAttribute(USER_LDAP_CLASSES));
       attrs.put(userDNKey, user.getUserName());
-      attrs.put(userDisplayNameAttr, user.getFullName());
+      attrs.put(userDisplayNameAttr, user.getDisplayName());
       attrs.put(userUsernameAttr, user.getUserName());
       attrs.put(userPassword, user.getPassword());
       attrs.put(userLastNameAttr, user.getLastName());
       attrs.put(userFirstNameAttr, user.getFirstName());
       attrs.put(userMailAttr, user.getEmail());
-      attrs.put(ldapDescriptionAttr, "Account for " + user.getFullName());
+      attrs.put(ldapDescriptionAttr, "Account for " + user.getDisplayName());
       return attrs;
    }
 
@@ -143,7 +143,7 @@
       user.setUserName(getAttributeValueAsString(attrs, userUsernameAttr));
       user.setLastName(getAttributeValueAsString(attrs, userLastNameAttr));
       user.setFirstName(getAttributeValueAsString(attrs, userFirstNameAttr));
-      user.setFullName(getAttributeValueAsString(attrs, userDisplayNameAttr));
+      user.setDisplayName(getAttributeValueAsString(attrs, userDisplayNameAttr));
       user.setEmail(getAttributeValueAsString(attrs, userMailAttr));
       user.setPassword(getAttributeValueAsString(attrs, userPassword));
       user.setCreatedDate(Calendar.getInstance().getTime());

Modified:
core/branches/2.5.x/exo.core.component.organization.ldap/src/main/resources/conf/portal/database-organization-configuration.xml
===================================================================
---
core/branches/2.5.x/exo.core.component.organization.ldap/src/main/resources/conf/portal/database-organization-configuration.xml	2012-03-07
10:20:45 UTC (rev 5826)
+++
core/branches/2.5.x/exo.core.component.organization.ldap/src/main/resources/conf/portal/database-organization-configuration.xml	2012-03-07
10:57:52 UTC (rev 5827)
@@ -359,6 +359,9 @@
                               <field name="email">
                                  <string>root@localhost</string>
                               </field>
+                              <field name="displayName">
+                                 <string>Root</string>
+                              </field>
                               <field name="groups">
                                  <string>
                                     *:/platform/administrators,manager:/platform/users,
@@ -385,6 +388,9 @@
                               <field name="email">
                                  <string>john@localhost</string>
                               </field>
+                              <field name="displayName">
+                                 <string>John</string>
+                              </field>
                               <field name="groups">
                                  <string>
                                    
member:/platform/administrators,manager:/platform/users,
@@ -410,6 +416,9 @@
                               <field name="email">
                                  <string>marry@localhost</string>
                               </field>
+                              <field name="displayName">
+                                 <string>Marry</string>
+                              </field>
                               <field name="groups">
                                  <string>member:/platform/users</string>
                               </field>
@@ -432,6 +441,9 @@
                               <field name="email">
                                  <string>demo@localhost</string>
                               </field>
+                              <field name="displayName">
+                                 <string>Demo</string>
+                              </field>
                               <field name="groups">
                                  <string>member:/platform/users</string>
                               </field>
@@ -454,6 +466,9 @@
                               <field name="email">
                                  <string>james@localhost</string>
                               </field>
+                              <field name="displayName">
+                                 <string>James</string>
+                              </field>
                               <field name="groups">
                                 
<string>manager:/organization/management/human-resources,member:/platform/users</string>
                               </field>

Modified:
core/branches/2.5.x/exo.core.component.organization.ldap/src/test/resources/conf/standalone/test-configuration.xml
===================================================================
---
core/branches/2.5.x/exo.core.component.organization.ldap/src/test/resources/conf/standalone/test-configuration.xml	2012-03-07
10:20:45 UTC (rev 5826)
+++
core/branches/2.5.x/exo.core.component.organization.ldap/src/test/resources/conf/standalone/test-configuration.xml	2012-03-07
10:57:52 UTC (rev 5827)
@@ -438,6 +438,7 @@
                     <field 
name="firstName"><string>Root</string></field>
                     <field 
name="lastName"><string>Root</string></field>
                     <field 
name="email"><string>root@localhost</string></field>
+                    <field 
name="displayName"><string>Root</string></field>
                     <field  name="groups">
                       <string>
                       	manager:/platform/administrators,member:/platform/users,
@@ -454,6 +455,7 @@
                     <field 
name="firstName"><string>John</string></field>
                     <field 
name="lastName"><string>Anthony</string></field>
                     <field 
name="email"><string>john@localhost</string></field>
+                    <field 
name="displayName"><string>John</string></field>
                     <field  name="groups">
                       <string>
                       	member:/platform/administrators,member:/platform/users,
@@ -469,6 +471,7 @@
                     <field 
name="firstName"><string>Marry</string></field>
                     <field 
name="lastName"><string>Kelly</string></field>
                     <field 
name="email"><string>marry@localhost</string></field>
+                    <field 
name="displayName"><string>Marry</string></field>
                     <field  name="groups">
                       <string>member:/platform/users</string>
                     </field>
@@ -481,6 +484,7 @@
                     <field 
name="firstName"><string>Demo</string></field>
                     <field 
name="lastName"><string>exo</string></field>
                     <field 
name="email"><string>demo@localhost</string></field>
+                    <field 
name="displayName"><string>Demo</string></field>
                     <field  name="groups">
                      
<string>member:/platform/guests,member:/platform/users</string>
                     </field>

Modified:
core/branches/2.5.x/exo.core.component.organization.tests/src/test/java/org/exoplatform/services/tck/organization/TestUserHandler.java
===================================================================
---
core/branches/2.5.x/exo.core.component.organization.tests/src/test/java/org/exoplatform/services/tck/organization/TestUserHandler.java	2012-03-07
10:20:45 UTC (rev 5826)
+++
core/branches/2.5.x/exo.core.component.organization.tests/src/test/java/org/exoplatform/services/tck/organization/TestUserHandler.java	2012-03-07
10:57:52 UTC (rev 5827)
@@ -297,14 +297,23 @@
       createUser(userName);
 
       String newEmail = "new@Email";
+      String displayName = "name";
 
       // change email and check
       User u = uHandler.findUserByName(userName);
       u.setEmail(newEmail);
 
       uHandler.saveUser(u, true);
-      assertEquals(newEmail, uHandler.findUserByName(userName).getEmail());
 
+      u = uHandler.findUserByName(userName);
+      assertEquals(newEmail, u.getEmail());
+      assertEquals(u.getDisplayName(), u.getFirstName() + " " +
u.getLastName());
+
+      u.setDisplayName(displayName);
+      uHandler.saveUser(u, true);
+
+      u = uHandler.findUserByName(userName);
+      assertEquals(u.getDisplayName(), displayName);
    }
 
    /**


    

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

[exo-jcr-commits] exo-jcr SVN: r5827 - in core/branches/2.5.x: exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/impl and 6 other directories.