gatein SVN: r7567 - epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm.
by do-not-reply＠jboss.org
Author: bdaw
Date: 2011-09-29 20:07:13 -0400 (Thu, 29 Sep 2011)
New Revision: 7567
Modified:
epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/IDMUserListAccess.java
epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserDAOImpl.java
Log:
JBEPP-1188 Cluster profile: Attempt to replicate non-serializable class PicketlinkIDMServiceImpl
Modified: epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/IDMUserListAccess.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/IDMUserListAccess.java 2011-09-29 23:21:31 UTC (rev 7566)
+++ epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/IDMUserListAccess.java 2011-09-30 00:07:13 UTC (rev 7567)
@@ -20,6 +20,8 @@
package org.exoplatform.services.organization.idm;
import org.exoplatform.commons.utils.ListAccess;
+import org.exoplatform.container.PortalContainer;
+import org.exoplatform.services.organization.OrganizationService;
import org.exoplatform.services.organization.User;
import org.exoplatform.services.organization.impl.UserImpl;
@@ -41,10 +43,6 @@
{
private static Logger log = LoggerFactory.getLogger(IDMUserListAccess.class);
- private final UserDAOImpl userDAO;
-
- private final PicketLinkIDMService idmService;
-
private final UserQueryBuilder userQueryBuilder;
private final int pageSize;
@@ -55,11 +53,8 @@
private int size = -1;
- public IDMUserListAccess(UserDAOImpl userDAO, PicketLinkIDMService idmService, UserQueryBuilder userQueryBuilder,
- int pageSize, boolean countAll)
+ public IDMUserListAccess(UserQueryBuilder userQueryBuilder, int pageSize, boolean countAll)
{
- this.userDAO = userDAO;
- this.idmService = idmService;
this.userQueryBuilder = userQueryBuilder;
this.pageSize = pageSize;
this.countAll = countAll;
@@ -84,11 +79,11 @@
if (fullResults == null)
{
- userDAO.getOrgService().flush();
+ getOrganizationService().flush();
userQueryBuilder.page(index, length);
UserQuery query = userQueryBuilder.sort(SortOrder.ASCENDING).createQuery();
- users = idmService.getIdentitySession().list(query);
+ users = getIDMService().getIdentitySession().list(query);
}
else
{
@@ -102,7 +97,8 @@
org.picketlink.idm.api.User user = users.get(i);
User gtnUser = new UserImpl(user.getId());
- userDAO.populateUser(gtnUser, idmService.getIdentitySession());
+ ((UserDAOImpl)getOrganizationService().getUserHandler())
+ .populateUser(gtnUser, getIDMService().getIdentitySession());
exoUsers[i] = gtnUser;
}
@@ -131,7 +127,7 @@
);
}
- userDAO.getOrgService().flush();
+ getOrganizationService().flush();
int result;
@@ -144,13 +140,13 @@
}
else if (countAll)
{
- result = idmService.getIdentitySession().getPersistenceManager().getUserCount();
+ result = getIDMService().getIdentitySession().getPersistenceManager().getUserCount();
}
else
{
userQueryBuilder.page(0, 0);
UserQuery query = userQueryBuilder.sort(SortOrder.ASCENDING).createQuery();
- fullResults = idmService.getIdentitySession().list(query);
+ fullResults = getIDMService().getIdentitySession().list(query);
result = fullResults.size();
}
@@ -174,4 +170,16 @@
return result;
}
+
+ PicketLinkIDMService getIDMService()
+ {
+ return (PicketLinkIDMService)
+ PortalContainer.getInstance().getComponentInstanceOfType(PicketLinkIDMService.class);
+ }
+
+ PicketLinkIDMOrganizationServiceImpl getOrganizationService()
+ {
+ return (PicketLinkIDMOrganizationServiceImpl)
+ PortalContainer.getInstance().getComponentInstanceOfType(OrganizationService.class);
+ }
}
Modified: epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserDAOImpl.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserDAOImpl.java 2011-09-29 23:21:31 UTC (rev 7566)
+++ epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserDAOImpl.java 2011-09-30 00:07:13 UTC (rev 7567)
@@ -337,7 +337,7 @@
UserQueryBuilder qb = service_.getIdentitySession().createUserQueryBuilder();
- return new LazyPageList(new IDMUserListAccess(this, service_, qb, pageSize, true), pageSize);
+ return new LazyPageList(new IDMUserListAccess(qb, pageSize, true), pageSize);
}
public ListAccess<User> findAllUsers() throws Exception
@@ -354,7 +354,7 @@
UserQueryBuilder qb = service_.getIdentitySession().createUserQueryBuilder();
- return new IDMUserListAccess(this, service_, qb, 20, true);
+ return new IDMUserListAccess(qb, 20, true);
}
//
@@ -540,11 +540,11 @@
q.getFirstName() == null &&
q.getLastName() == null)
{
- list = new IDMUserListAccess(this, service_, qb, 20, true);
+ list = new IDMUserListAccess(qb, 20, true);
}
else
{
- list = new IDMUserListAccess(this, service_, qb, 20, false);
+ list = new IDMUserListAccess(qb, 20, false);
}
if (cache != null)
@@ -655,7 +655,7 @@
qb.addRelatedGroup(jbidGroup);
- return new IDMUserListAccess(this, service_, qb, 20, false);
+ return new IDMUserListAccess(qb, 20, false);
}
//
12 years, 7 months
gatein SVN: r7566 - in epp/portal/branches/EPP_5_2_Branch: component/identity/src/main/java/org/exoplatform/services/organization/idm and 1 other directory.
by do-not-reply＠jboss.org
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>
12 years, 7 months
gatein SVN: r7565 - portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm.
by do-not-reply＠jboss.org
Author: bdaw
Date: 2011-09-29 18:15:59 -0400 (Thu, 29 Sep 2011)
New Revision: 7565
Modified:
portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/IDMUserListAccess.java
portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserDAOImpl.java
Log:
GTNPORTAL-2138 Cluster profile: Attempt to replicate non-serializable class PicketlinkIDMServiceImpl
Modified: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/IDMUserListAccess.java
===================================================================
--- portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/IDMUserListAccess.java 2011-09-29 20:48:11 UTC (rev 7564)
+++ portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/IDMUserListAccess.java 2011-09-29 22:15:59 UTC (rev 7565)
@@ -20,6 +20,8 @@
package org.exoplatform.services.organization.idm;
import org.exoplatform.commons.utils.ListAccess;
+import org.exoplatform.container.PortalContainer;
+import org.exoplatform.services.organization.OrganizationService;
import org.exoplatform.services.organization.User;
import org.exoplatform.services.organization.impl.UserImpl;
@@ -41,10 +43,6 @@
{
private static Logger log = LoggerFactory.getLogger(IDMUserListAccess.class);
- private final UserDAOImpl userDAO;
-
- private final PicketLinkIDMService idmService;
-
private final UserQueryBuilder userQueryBuilder;
private final int pageSize;
@@ -55,11 +53,8 @@
private int size = -1;
- public IDMUserListAccess(UserDAOImpl userDAO, PicketLinkIDMService idmService, UserQueryBuilder userQueryBuilder,
- int pageSize, boolean countAll)
+ public IDMUserListAccess(UserQueryBuilder userQueryBuilder, int pageSize, boolean countAll)
{
- this.userDAO = userDAO;
- this.idmService = idmService;
this.userQueryBuilder = userQueryBuilder;
this.pageSize = pageSize;
this.countAll = countAll;
@@ -84,11 +79,11 @@
if (fullResults == null)
{
- userDAO.getOrgService().flush();
+ getOrganizationService().flush();
userQueryBuilder.page(index, length);
UserQuery query = userQueryBuilder.sort(SortOrder.ASCENDING).createQuery();
- users = idmService.getIdentitySession().list(query);
+ users = getIDMService().getIdentitySession().list(query);
}
else
{
@@ -102,7 +97,8 @@
org.picketlink.idm.api.User user = users.get(i);
User gtnUser = new UserImpl(user.getId());
- userDAO.populateUser(gtnUser, idmService.getIdentitySession());
+ ((UserDAOImpl)getOrganizationService().getUserHandler())
+ .populateUser(gtnUser, getIDMService().getIdentitySession());
exoUsers[i] = gtnUser;
}
@@ -131,7 +127,7 @@
);
}
- userDAO.getOrgService().flush();
+ getOrganizationService().flush();
int result;
@@ -144,13 +140,13 @@
}
else if (countAll)
{
- result = idmService.getIdentitySession().getPersistenceManager().getUserCount();
+ result = getIDMService().getIdentitySession().getPersistenceManager().getUserCount();
}
else
{
userQueryBuilder.page(0, 0);
UserQuery query = userQueryBuilder.sort(SortOrder.ASCENDING).createQuery();
- fullResults = idmService.getIdentitySession().list(query);
+ fullResults = getIDMService().getIdentitySession().list(query);
result = fullResults.size();
}
@@ -174,4 +170,16 @@
return result;
}
+
+ PicketLinkIDMService getIDMService()
+ {
+ return (PicketLinkIDMService)
+ PortalContainer.getInstance().getComponentInstanceOfType(PicketLinkIDMService.class);
+ }
+
+ PicketLinkIDMOrganizationServiceImpl getOrganizationService()
+ {
+ return (PicketLinkIDMOrganizationServiceImpl)
+ PortalContainer.getInstance().getComponentInstanceOfType(OrganizationService.class);
+ }
}
Modified: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserDAOImpl.java
===================================================================
--- portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserDAOImpl.java 2011-09-29 20:48:11 UTC (rev 7564)
+++ portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserDAOImpl.java 2011-09-29 22:15:59 UTC (rev 7565)
@@ -337,7 +337,7 @@
UserQueryBuilder qb = service_.getIdentitySession().createUserQueryBuilder();
- return new LazyPageList(new IDMUserListAccess(this, service_, qb, pageSize, true), pageSize);
+ return new LazyPageList(new IDMUserListAccess(qb, pageSize, true), pageSize);
}
public ListAccess<User> findAllUsers() throws Exception
@@ -354,7 +354,7 @@
UserQueryBuilder qb = service_.getIdentitySession().createUserQueryBuilder();
- return new IDMUserListAccess(this, service_, qb, 20, true);
+ return new IDMUserListAccess(qb, 20, true);
}
//
@@ -540,11 +540,11 @@
q.getFirstName() == null &&
q.getLastName() == null)
{
- list = new IDMUserListAccess(this, service_, qb, 20, true);
+ list = new IDMUserListAccess(qb, 20, true);
}
else
{
- list = new IDMUserListAccess(this, service_, qb, 20, false);
+ list = new IDMUserListAccess(qb, 20, false);
}
if (cache != null)
@@ -655,7 +655,7 @@
qb.addRelatedGroup(jbidGroup);
- return new IDMUserListAccess(this, service_, qb, 20, false);
+ return new IDMUserListAccess(qb, 20, false);
}
//
12 years, 7 months
gatein SVN: r7564 - components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter.
by do-not-reply＠jboss.org
Author: bdaw
Date: 2011-09-29 16:48:11 -0400 (Thu, 29 Sep 2011)
New Revision: 7564
Modified:
components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/CASLogoutFilter.java
Log:
GTNPORTAL-1908 NPE when request to portal which configured to use SSO integration
GTNPORTAL-1763 can't logout after authentication with CAS server
Modified: components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/CASLogoutFilter.java
===================================================================
--- components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/CASLogoutFilter.java 2011-09-29 20:40:13 UTC (rev 7563)
+++ components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/CASLogoutFilter.java 2011-09-29 20:48:11 UTC (rev 7564)
@@ -65,6 +65,8 @@
String redirectUrl = this.logoutUrl+"?url="+httpRequest.getRequestURL()+"?"+parameters;
+ httpRequest.getSession().invalidate();
+
return redirectUrl;
}
catch(Exception e)
12 years, 7 months
gatein SVN: r7563 - in components/sso/trunk: auth-callback and 4 other directories.
by do-not-reply＠jboss.org
Author: bdaw
Date: 2011-09-29 16:40:13 -0400 (Thu, 29 Sep 2011)
New Revision: 7563
Modified:
components/sso/trunk/auth-callback/pom.xml
components/sso/trunk/cas/gatein-cas-portal/pom.xml
components/sso/trunk/josso/gatein-josso-portal/pom.xml
components/sso/trunk/opensso/gatein-opensso-portal/pom.xml
components/sso/trunk/packaging/pom.xml
components/sso/trunk/pom.xml
Log:
- Upgrade WCI, WS and Core versions
- use ${project.version} in poms
Modified: components/sso/trunk/auth-callback/pom.xml
===================================================================
--- components/sso/trunk/auth-callback/pom.xml 2011-09-29 18:09:28 UTC (rev 7562)
+++ components/sso/trunk/auth-callback/pom.xml 2011-09-29 20:40:13 UTC (rev 7563)
@@ -24,7 +24,11 @@
<artifactId>exo.core.component.security.core</artifactId>
</dependency>
- <dependency>
+ <dependency>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
</dependency>
Modified: components/sso/trunk/cas/gatein-cas-portal/pom.xml
===================================================================
--- components/sso/trunk/cas/gatein-cas-portal/pom.xml 2011-09-29 18:09:28 UTC (rev 7562)
+++ components/sso/trunk/cas/gatein-cas-portal/pom.xml 2011-09-29 20:40:13 UTC (rev 7563)
@@ -14,7 +14,7 @@
<dependency>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-cas-plugin</artifactId>
- <version>1.1.0-Beta01-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
@@ -23,12 +23,12 @@
<dependency>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-agent</artifactId>
- <version>1.1.0-Beta01-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-auth-callback</artifactId>
- <version>1.1.0-Beta01-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jasig.cas</groupId>
Modified: components/sso/trunk/josso/gatein-josso-portal/pom.xml
===================================================================
--- components/sso/trunk/josso/gatein-josso-portal/pom.xml 2011-09-29 18:09:28 UTC (rev 7562)
+++ components/sso/trunk/josso/gatein-josso-portal/pom.xml 2011-09-29 20:40:13 UTC (rev 7563)
@@ -54,12 +54,12 @@
<dependency>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-agent</artifactId>
- <version>1.1.0-Beta01-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-auth-callback</artifactId>
- <version>1.1.0-Beta01-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
@@ -74,7 +74,7 @@
<dependency>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-josso-plugin</artifactId>
- <version>1.1.0-Beta01-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>apache-log4j</groupId>
Modified: components/sso/trunk/opensso/gatein-opensso-portal/pom.xml
===================================================================
--- components/sso/trunk/opensso/gatein-opensso-portal/pom.xml 2011-09-29 18:09:28 UTC (rev 7562)
+++ components/sso/trunk/opensso/gatein-opensso-portal/pom.xml 2011-09-29 20:40:13 UTC (rev 7563)
@@ -14,7 +14,7 @@
<dependency>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-opensso-plugin</artifactId>
- <version>1.1.0-Beta01-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
@@ -28,12 +28,12 @@
<dependency>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-agent</artifactId>
- <version>1.1.0-Beta01-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-auth-callback</artifactId>
- <version>1.1.0-Beta01-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
Modified: components/sso/trunk/packaging/pom.xml
===================================================================
--- components/sso/trunk/packaging/pom.xml 2011-09-29 18:09:28 UTC (rev 7562)
+++ components/sso/trunk/packaging/pom.xml 2011-09-29 20:40:13 UTC (rev 7563)
@@ -14,12 +14,12 @@
<dependency>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-agent</artifactId>
- <version>1.1.0-Beta01-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.gatein.sso</groupId>
<artifactId>spnego</artifactId>
- <version>1.1.0-Beta01-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.security</groupId>
Modified: components/sso/trunk/pom.xml
===================================================================
--- components/sso/trunk/pom.xml 2011-09-29 18:09:28 UTC (rev 7562)
+++ components/sso/trunk/pom.xml 2011-09-29 20:40:13 UTC (rev 7563)
@@ -68,9 +68,9 @@
<!-- exo -->
- <org.exoplatform.core.version>2.3.7-GA</org.exoplatform.core.version>
- <org.exoplatform.ws.version>2.1.7-GA</org.exoplatform.ws.version>
- <org.gatein.wci.version>2.1.0-Beta01</org.gatein.wci.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.gatein.wci.version>2.1.0-Beta06</org.gatein.wci.version>
<!-- JAX-RS jsr-311 -->
<version.javax.ws.rs>1.0</version.javax.ws.rs>
12 years, 7 months
gatein SVN: r7562 - in portal/trunk: component/identity/src/main/java/org/exoplatform/services/organization/idm and 1 other directory.
by do-not-reply＠jboss.org
Author: bdaw
Date: 2011-09-29 14:09:28 -0400 (Thu, 29 Sep 2011)
New Revision: 7562
Modified:
portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/MembershipTypeDAOImpl.java
portal/trunk/pom.xml
Log:
GTNPORTAL-2137 Upgrade to eXo JCR 1.14.1 (with dependencies eXo Core, kernel, WS...)
Modified: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/MembershipTypeDAOImpl.java
===================================================================
--- portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/MembershipTypeDAOImpl.java 2011-09-29 17:32:41 UTC (rev 7561)
+++ portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/MembershipTypeDAOImpl.java 2011-09-29 18:09:28 UTC (rev 7562)
@@ -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: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2011-09-29 17:32:41 UTC (rev 7561)
+++ portal/trunk/pom.xml 2011-09-29 18:09:28 UTC (rev 7562)
@@ -37,10 +37,10 @@
<name>GateIn - Portal</name>
<properties>
- <org.exoplatform.kernel.version>2.3.0-GA</org.exoplatform.kernel.version>
- <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.kernel.version>2.3.1-GA</org.exoplatform.kernel.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.shindig.version>2.0.2-Beta02</org.shindig.version>
<nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version>
<org.gatein.common.version>2.0.4-Beta03</org.gatein.common.version>
12 years, 7 months
gatein SVN: r7561 - epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/skin/portal/webui/component/UINavigationPortlet.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2011-09-29 13:32:41 -0400 (Thu, 29 Sep 2011)
New Revision: 7561
Modified:
epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/skin/portal/webui/component/UINavigationPortlet/DefaultStylesheet.css
Log:
JBEPP-1162: update buttons to work with RTL languages for the navigation bar (ie when the bar can't display all the nodes for the current level when there are too many).
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/skin/portal/webui/component/UINavigationPortlet/DefaultStylesheet.css
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/skin/portal/webui/component/UINavigationPortlet/DefaultStylesheet.css 2011-09-29 16:46:56 UTC (rev 7560)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/web/src/main/webapp/skin/portal/webui/component/UINavigationPortlet/DefaultStylesheet.css 2011-09-29 17:32:41 UTC (rev 7561)
@@ -206,7 +206,7 @@
display: none;
cursor:pointer;
float: right; /* orientation=lt */
-
+ float: left; /* orientation=rt */
height: 15px;
width: 20px;
}
@@ -217,38 +217,38 @@
width: 10px;
height: 15px;
float: left; /* orientation=lt */
-
+ float: right; /* orientation=rt */
}
.UINavigationPortlet .ScrollLeftButton {
background: url('/web/skin/portal/webui/component/UINavigationPortlet/DefaultSkin/background/Button.gif') no-repeat left -15px; /* orientation=lt */
+ background: url('/web/skin/portal/webui/component/UINavigationPortlet/DefaultSkin/background/Button.gif') no-repeat right -15px; /* orientation=rt */
-
}
.UINavigationPortlet .ScrollRightButton {
background: url('/web/skin/portal/webui/component/UINavigationPortlet/DefaultSkin/background/Button.gif') no-repeat right -15px; /* orientation=lt */
-
+ background: url('/web/skin/portal/webui/component/UINavigationPortlet/DefaultSkin/background/Button.gif') no-repeat left -15px; /* orientation=rt */
}
.UINavigationPortlet .DisableScrollLeftButton {
background: url('/web/skin/portal/webui/component/UINavigationPortlet/DefaultSkin/background/Button.gif') no-repeat left -30px; /* orientation=lt */
-
+ background: url('/web/skin/portal/webui/component/UINavigationPortlet/DefaultSkin/background/Button.gif') no-repeat right -30px; /* orientation=rt */
}
.UINavigationPortlet .DisableScrollRightButton {
background: url('/web/skin/portal/webui/component/UINavigationPortlet/DefaultSkin/background/Button.gif') no-repeat right -30px; /* orientation=lt */
-
+ background: url('/web/skin/portal/webui/component/UINavigationPortlet/DefaultSkin/background/Button.gif') no-repeat left -30px; /* orientation=rt */
}
.UINavigationPortlet .HighlightScrollLeftButton ,.UINavigationPortlet .ScrollLeftButton:hover{
background: url('/web/skin/portal/webui/component/UINavigationPortlet/DefaultSkin/background/Button.gif') no-repeat left top; /* orientation=lt */
-
+ background: url('/web/skin/portal/webui/component/UINavigationPortlet/DefaultSkin/background/Button.gif') no-repeat right top; /* orientation=rt */
}
.UINavigationPortlet .HighlightScrollRightButton,.UINavigationPortlet .ScrollRightButton:hover {
background: url('/web/skin/portal/webui/component/UINavigationPortlet/DefaultSkin/background/Button.gif') no-repeat right top; /* orientation=lt */
-
+ background: url('/web/skin/portal/webui/component/UINavigationPortlet/DefaultSkin/background/Button.gif') no-repeat left top; /* orientation=rt */
}
/***********GroupNavigation*************/
12 years, 7 months
gatein SVN: r7559 - sandbox/as7_support/trunk/wci/jboss/jboss7/src/main/java/org/gatein/wci/jboss.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2011-09-29 07:16:26 -0400 (Thu, 29 Sep 2011)
New Revision: 7559
Modified:
sandbox/as7_support/trunk/wci/jboss/jboss7/src/main/java/org/gatein/wci/jboss/JB7ServletContainerContext.java
Log:
Added fix for deadlock on stop()
Modified: sandbox/as7_support/trunk/wci/jboss/jboss7/src/main/java/org/gatein/wci/jboss/JB7ServletContainerContext.java
===================================================================
--- sandbox/as7_support/trunk/wci/jboss/jboss7/src/main/java/org/gatein/wci/jboss/JB7ServletContainerContext.java 2011-09-29 11:15:55 UTC (rev 7558)
+++ sandbox/as7_support/trunk/wci/jboss/jboss7/src/main/java/org/gatein/wci/jboss/JB7ServletContainerContext.java 2011-09-29 11:16:26 UTC (rev 7559)
@@ -374,9 +374,14 @@
{
try
{
- if (registration != null)
+ // we need to preemptively synchronize on context to prevent deadlocks from
+ // opposite order locking on jboss-as7
+ synchronized(context)
{
- registration.unregisterWebApp(context.getPath());
+ if (registration != null)
+ {
+ registration.unregisterWebApp(context.getPath());
+ }
}
}
catch (Exception e)
12 years, 7 months
gatein SVN: r7558 - sandbox/as7_support/trunk/wci/jboss/jboss7.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2011-09-29 07:15:55 -0400 (Thu, 29 Sep 2011)
New Revision: 7558
Modified:
sandbox/as7_support/trunk/wci/jboss/jboss7/pom.xml
Log:
Synced version with other modules
Modified: sandbox/as7_support/trunk/wci/jboss/jboss7/pom.xml
===================================================================
--- sandbox/as7_support/trunk/wci/jboss/jboss7/pom.xml 2011-09-29 11:10:02 UTC (rev 7557)
+++ sandbox/as7_support/trunk/wci/jboss/jboss7/pom.xml 2011-09-29 11:15:55 UTC (rev 7558)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-jboss</artifactId>
- <version>2.1.0-Beta05-SNAPSHOT</version>
+ <version>2.1.0-Beta07-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-jboss7</artifactId>
12 years, 7 months