[exo-jcr-commits] exo-jcr SVN: r5226 - in core/trunk: exo.core.component.organization.ldap and 1 other directory.

Author: dkuleshov Date: 2011-11-21 07:14:43 -0500 (Mon, 21 Nov 2011) New Revision: 5226 Modified: core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/impl/GroupImpl.java core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/impl/MembershipImpl.java core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/impl/MembershipTypeImpl.java core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/impl/UserImpl.java core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/impl/UserProfileImpl.java core/trunk/exo.core.component.organization.ldap/pom.xml Log: EXOJCR-1545: added Cloneable interface implementations for entity classes Modified: core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/impl/GroupImpl.java =================================================================== --- core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/impl/GroupImpl.java 2011-11-21 12:11:27 UTC (rev 5225) +++ core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/impl/GroupImpl.java 2011-11-21 12:14:43 UTC (rev 5226) @@ -30,7 +30,7 @@ /** * @hibernate.class table="EXO_GROUP" */ -public class GroupImpl implements Group +public class GroupImpl implements Group, Cloneable { private String id; @@ -144,4 +144,20 @@ { return "Group[" + id + "|" + groupName + "]"; } + + /** + * {@inheritDoc} + **/ + public Object clone() + { + GroupImpl gi = new GroupImpl(); + + gi.setId(this.id); + gi.setParentId(this.parentId); + gi.setGroupName(this.groupName); + gi.setLabel(this.label); + gi.setDescription(this.desc); + + return gi; + } } Modified: core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/impl/MembershipImpl.java =================================================================== --- core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/impl/MembershipImpl.java 2011-11-21 12:11:27 UTC (rev 5225) +++ core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/impl/MembershipImpl.java 2011-11-21 12:14:43 UTC (rev 5226) @@ -23,7 +23,7 @@ /** * @hibernate.class table="EXO_MEMBERSHIP" */ -public class MembershipImpl implements Membership +public class MembershipImpl implements Membership, Cloneable { private String id = null; @@ -97,4 +97,19 @@ { return "Membership[" + id + "]"; } + + /** + * {@inheritDoc} + **/ + public Object clone() + { + MembershipImpl mi = new MembershipImpl(); + + mi.setGroupId(this.groupId); + mi.setMembershipType(this.membershipType); + mi.setId(this.id); + mi.setUserName(this.userName); + + return mi; + } } Modified: core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/impl/MembershipTypeImpl.java =================================================================== --- core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/impl/MembershipTypeImpl.java 2011-11-21 12:11:27 UTC (rev 5225) +++ core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/impl/MembershipTypeImpl.java 2011-11-21 12:14:43 UTC (rev 5226) @@ -28,7 +28,7 @@ * * @hibernate.class table="EXO_MEMBERSHIP_TYPE" */ -public class MembershipTypeImpl implements MembershipType +public class MembershipTypeImpl implements MembershipType, Cloneable { private String name; @@ -117,4 +117,18 @@ modifiedDate = d; } + /** + * {@inheritDoc} + **/ + public Object clone() + { + MembershipTypeImpl mti = new MembershipTypeImpl(); + mti.setName(this.name); + mti.setDescription(this.description); + mti.setOwner(this.owner); + mti.setCreatedDate((Date)this.createdDate.clone()); + mti.setModifiedDate((Date)this.modifiedDate.clone()); + + return mti; + } } Modified: core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/impl/UserImpl.java =================================================================== --- core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/impl/UserImpl.java 2011-11-21 12:11:27 UTC (rev 5225) +++ core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/impl/UserImpl.java 2011-11-21 12:14:43 UTC (rev 5226) @@ -25,7 +25,7 @@ /** * @hibernate.class table="EXO_USER" */ -public class UserImpl implements User +public class UserImpl implements User, Cloneable { private String id = null; @@ -185,4 +185,24 @@ { this.organizationId = organizationId; } + + /** + * {@inheritDoc} + **/ + public Object clone() + { + UserImpl ui = new UserImpl(); + + ui.setId(this.id); + ui.setUserName(this.userName); + ui.setPassword(this.password); + ui.setFirstName(this.firstName); + ui.setLastName(this.lastName); + ui.setEmail(this.email); + ui.setCreatedDate((Date)this.createdDate.clone()); + ui.setLastLoginTime((Date)this.lastLoginTime.clone()); + ui.setOrganizationId(this.organizationId); + + return ui; + } } Modified: core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/impl/UserProfileImpl.java =================================================================== --- core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/impl/UserProfileImpl.java 2011-11-21 12:11:27 UTC (rev 5225) +++ core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/impl/UserProfileImpl.java 2011-11-21 12:14:43 UTC (rev 5226) @@ -27,7 +27,7 @@ * Created by The eXo Platform SAS Author : Mestrallet Benjamin * benjmestrallet(a)users.sourceforge.net Date: Aug 21, 2003 Time: 3:22:54 PM */ -public class UserProfileImpl implements UserProfile +public class UserProfileImpl implements UserProfile, Cloneable { private String userName; @@ -86,4 +86,12 @@ { return attributes; } + + /** + * {@inheritDoc} + **/ + public Object clone() + { + return new UserProfileImpl(this.userName, new HashMap<String, String>(this.attributes)); + } } Modified: core/trunk/exo.core.component.organization.ldap/pom.xml =================================================================== --- core/trunk/exo.core.component.organization.ldap/pom.xml 2011-11-21 12:11:27 UTC (rev 5225) +++ core/trunk/exo.core.component.organization.ldap/pom.xml 2011-11-21 12:14:43 UTC (rev 5226) @@ -175,19 +175,6 @@ <includes> <include>org/exoplatform/services/tck/organization/Test*.java</include> </includes> - <excludes> - <!-- - Excluded as there some hibernate cache issues on pre-, postoperations - (e.g. preDelete, postDelete, etc.) - --> - - <exclude>org/exoplatform/services/tck/organization/TestMembershipTypeEventListener.java</exclude> - - <!-- - Excluded, as this class has no tests to be run - --> - <exclude>**/AbstractOrganizationServiceTest.java</exclude> - </excludes> </configuration> </plugin> <plugin>