Author: bdaw Date: 2011-09-29 19:21:31 -0400 (Thu, 29 Sep 2011) New Revision: 7566 Modified: epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/MembershipTypeDAOImpl.java epp/portal/branches/EPP_5_2_Branch/pom.xml Log: JBEPP-1231 Upgrade to eXo JCR 1.14.1 (with dependencies eXo Core, kernel, WS...) Modified: epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/MembershipTypeDAOImpl.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/MembershipTypeDAOImpl.java 2011-09-29 22:15:59 UTC (rev 7565) +++ epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/MembershipTypeDAOImpl.java 2011-09-29 23:21:31 UTC (rev 7566) @@ -21,7 +21,7 @@ import org.exoplatform.commons.utils.ListenerStack; import org.exoplatform.services.organization.MembershipType; -//import org.exoplatform.services.organization.MembershipTypeEventListener; +import org.exoplatform.services.organization.MembershipTypeEventListener; import org.exoplatform.services.organization.MembershipTypeHandler; import org.exoplatform.services.organization.impl.MembershipTypeImpl; import org.gatein.common.logging.LogLevel; @@ -70,25 +70,25 @@ this.orgService = orgService; } -// public void addMembershipTypeEventListener(MembershipTypeEventListener listener) -// { -// if (listener == null) -// { -// throw new IllegalArgumentException("Listener cannot be null"); -// } -// -// listeners_.add(listener); -// } -// -// public void removeMembershipTypeEventListener(MembershipTypeEventListener listener) -// { -// if (listener == null) -// { -// throw new IllegalArgumentException("Listener cannot be null"); -// } -// listeners_.remove(listener); -// } + public void addMembershipTypeEventListener(MembershipTypeEventListener listener) + { + if (listener == null) + { + throw new IllegalArgumentException("Listener cannot be null"); + } + listeners_.add(listener); + } + + public void removeMembershipTypeEventListener(MembershipTypeEventListener listener) + { + if (listener == null) + { + throw new IllegalArgumentException("Listener cannot be null"); + } + listeners_.remove(listener); + } + final public MembershipType createMembershipTypeInstance() { return new MembershipTypeImpl(); @@ -116,14 +116,14 @@ if (broadcast) { -// preSave(mt, true); + preSave(mt, true); } getIdentitySession().getRoleManager().createRoleType(mt.getName()); if (broadcast) { -// postSave(mt, true); + postSave(mt, true); } @@ -151,14 +151,14 @@ if (broadcast) { -// preSave(mt, true); + preSave(mt, true); } updateMembershipType(mt); if (broadcast) { -// postSave(mt, true); + postSave(mt, true); } return mt; @@ -223,14 +223,14 @@ { if (broadcast) { -// preDelete(mt); + preDelete(mt); } getIdentitySession().getRoleManager().removeRoleType(mt.getName()); if (broadcast) { -// postDelete(mt); + postDelete(mt); } } @@ -356,40 +356,40 @@ return; } -// private void preSave(MembershipType membershipType, boolean isNew) throws Exception -// { -// for (int i = 0; i < listeners_.size(); i++) -// { -// MembershipTypeEventListener listener = (MembershipTypeEventListener)listeners_.get(i); -// listener.preSave(membershipType, isNew); -// } -// } -// -// private void postSave(MembershipType membershipType, boolean isNew) throws Exception -// { -// for (int i = 0; i < listeners_.size(); i++) -// { -// MembershipTypeEventListener listener = (MembershipTypeEventListener)listeners_.get(i); -// listener.postSave(membershipType, isNew); -// } -// } -// -// private void preDelete(MembershipType membershipType) throws Exception -// { -// for (int i = 0; i < listeners_.size(); i++) -// { -// MembershipTypeEventListener listener = (MembershipTypeEventListener)listeners_.get(i); -// listener.preDelete(membershipType); -// } -// } -// -// private void postDelete(MembershipType membershipType) throws Exception -// { -// for (int i = 0; i < listeners_.size(); i++) -// { -// MembershipTypeEventListener listener = (MembershipTypeEventListener)listeners_.get(i); -// listener.postDelete(membershipType); -// } -// } + private void preSave(MembershipType membershipType, boolean isNew) throws Exception + { + for (int i = 0; i < listeners_.size(); i++) + { + MembershipTypeEventListener listener = (MembershipTypeEventListener)listeners_.get(i); + listener.preSave(membershipType, isNew); + } + } + private void postSave(MembershipType membershipType, boolean isNew) throws Exception + { + for (int i = 0; i < listeners_.size(); i++) + { + MembershipTypeEventListener listener = (MembershipTypeEventListener)listeners_.get(i); + listener.postSave(membershipType, isNew); + } + } + + private void preDelete(MembershipType membershipType) throws Exception + { + for (int i = 0; i < listeners_.size(); i++) + { + MembershipTypeEventListener listener = (MembershipTypeEventListener)listeners_.get(i); + listener.preDelete(membershipType); + } + } + + private void postDelete(MembershipType membershipType) throws Exception + { + for (int i = 0; i < listeners_.size(); i++) + { + MembershipTypeEventListener listener = (MembershipTypeEventListener)listeners_.get(i); + listener.postDelete(membershipType); + } + } + } Modified: epp/portal/branches/EPP_5_2_Branch/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-09-29 22:15:59 UTC (rev 7565) +++ epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-09-29 23:21:31 UTC (rev 7566) @@ -38,11 +38,11 @@ <properties> <org.exoplatform.parent.version>9</org.exoplatform.parent.version> - <org.exoplatform.kernel.version>2.3.0-GA</org.exoplatform.kernel.version> + <org.exoplatform.kernel.version>2.3.1-GA</org.exoplatform.kernel.version> <org.exoplatform.kernel.junit.version>1.2.1-GA</org.exoplatform.kernel.junit.version> <!-- from exo.kernel --> - <org.exoplatform.core.version>2.4.0-GA-CP02</org.exoplatform.core.version> - <org.exoplatform.ws.version>2.2.0-GA</org.exoplatform.ws.version> - <org.exoplatform.jcr.version>1.14.0-GA</org.exoplatform.jcr.version> + <org.exoplatform.core.version>2.4.1-GA</org.exoplatform.core.version> + <org.exoplatform.ws.version>2.2.1-GA</org.exoplatform.ws.version> + <org.exoplatform.jcr.version>1.14.1-GA</org.exoplatform.jcr.version> <org.exoplatform.doc-style.version>1</org.exoplatform.doc-style.version> <org.jibx.version>1.2.1</org.jibx.version> <org.shindig.version>2.0.2-Beta02</org.shindig.version>