gatein SVN: r8748 - epp/portal/branches/EPP_5_2_Branch/gadgets/gwtGadgets/src/main/java/org/gatein/management/gadget/mop/exportimport/public.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2012-06-27 02:46:36 -0400 (Wed, 27 Jun 2012)
New Revision: 8748
Modified:
epp/portal/branches/EPP_5_2_Branch/gadgets/gwtGadgets/src/main/java/org/gatein/management/gadget/mop/exportimport/public/Application.css
Log:
Bug 813804 - Import site dialog - resource not found
Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/gwtGadgets/src/main/java/org/gatein/management/gadget/mop/exportimport/public/Application.css
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/gwtGadgets/src/main/java/org/gatein/management/gadget/mop/exportimport/public/Application.css 2012-06-26 14:25:04 UTC (rev 8747)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/gwtGadgets/src/main/java/org/gatein/management/gadget/mop/exportimport/public/Application.css 2012-06-27 06:46:36 UTC (rev 8748)
@@ -185,7 +185,7 @@
}
.gwt-DialogBox .Caption {
- background-image: url(gray_gradient.gif);
+ /*background-image: url(gray_gradient.gif);*/
background-repeat: repeat-x;
padding: 4px;
padding-bottom: 8px;
11 years, 10 months
gatein SVN: r8747 - epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm.
by do-not-reply＠jboss.org
Author: mposolda
Date: 2012-06-26 10:25:04 -0400 (Tue, 26 Jun 2012)
New Revision: 8747
Added:
epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/AbstractDAOImpl.java
Modified:
epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/GroupDAOImpl.java
epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/MembershipDAOImpl.java
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/PicketLinkIDMOrganizationServiceImpl.java
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/UserProfileDAOImpl.java
Log:
Bug 835580 - UserTransaction should be marked for rollback if IdentityException is thrown. Added new abstract class for general operations like exception handling.
Added: epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/AbstractDAOImpl.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/AbstractDAOImpl.java (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/AbstractDAOImpl.java 2012-06-26 14:25:04 UTC (rev 8747)
@@ -0,0 +1,72 @@
+/*
+ * JBoss, a division of Red Hat
+ * Copyright 2012, Red Hat Middleware, LLC, and individual
+ * contributors as indicated by the @authors tag. See the
+ * copyright.txt in the distribution for a full listing of
+ * individual contributors.
+ *
+ * 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.exoplatform.services.organization.idm;
+
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
+
+import javax.transaction.Status;
+import javax.transaction.UserTransaction;
+
+/**
+ * Abstract superclass for other DAO classes
+ *
+ * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
+ */
+public class AbstractDAOImpl
+{
+ protected final PicketLinkIDMService service_;
+
+ protected final PicketLinkIDMOrganizationServiceImpl orgService;
+
+ protected final Logger log = LoggerFactory.getLogger(getClass());
+
+ public AbstractDAOImpl(PicketLinkIDMOrganizationServiceImpl orgService, PicketLinkIDMService idmService)
+ {
+ service_ = idmService;
+ this.orgService = orgService;
+ }
+
+ public void handleException(String messageToLog, Exception e)
+ {
+ log.info(messageToLog, e);
+
+ // Mark JTA transaction to rollback-only if JTA setup is enabled
+ if (orgService.getConfiguration().isUseJTA())
+ {
+ try
+ {
+ UserTransaction tx = orgService.getUserTransaction();
+ if (tx.getStatus() == Status.STATUS_ACTIVE)
+ {
+ tx.setRollbackOnly();
+ }
+ }
+ catch (Exception tre)
+ {
+ log.warn("Unable to set Transaction status to be rollback only", tre);
+ }
+ }
+ }
+}
Modified: epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/GroupDAOImpl.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/GroupDAOImpl.java 2012-06-26 14:22:40 UTC (rev 8746)
+++ epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/GroupDAOImpl.java 2012-06-26 14:25:04 UTC (rev 8747)
@@ -45,27 +45,20 @@
/*
* @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a>
*/
-public class GroupDAOImpl implements GroupHandler
+public class GroupDAOImpl extends AbstractDAOImpl implements GroupHandler
{
- private static Logger log = LoggerFactory.getLogger(GroupDAOImpl.class);
-
public static final String GROUP_LABEL = "label";
public static final String GROUP_DESCRIPTION = "description";
- private PicketLinkIDMService service_;
-
private List<GroupEventListener> listeners_;
- private PicketLinkIDMOrganizationServiceImpl orgService;
-
private static final String CYCLIC_ID = "org.gatein.portal.identity.LOOPED_GROUP_ID";
public GroupDAOImpl(PicketLinkIDMOrganizationServiceImpl orgService, PicketLinkIDMService service)
{
- service_ = service;
- this.orgService = orgService;
+ super(orgService, service);
listeners_ = new ArrayList<GroupEventListener>();
}
@@ -149,7 +142,7 @@
}
catch (Exception e)
{
- log.info("Cannot obtain group: " + parentPLGroupName, e);
+ handleException("Cannot obtain group: " + parentPLGroupName, e);
}
@@ -186,7 +179,7 @@
}
catch (Exception e)
{
- log.info("Cannot associate groups: ", e);
+ handleException("Cannot associate groups: ", e);
}
if (broadcast)
@@ -257,7 +250,7 @@
}
catch (Exception e)
{
- log.info("Cannot obtain group: " + plGroupName + "; ", e);
+ handleException("Cannot obtain group: " + plGroupName + "; ", e);
}
if (jbidGroup == null)
@@ -304,7 +297,7 @@
}
catch (Exception e)
{
- log.info("Cannot clear group relationships: " + plGroupName + "; ", e);
+ handleException("Cannot clear group relationships: " + plGroupName + "; ", e);
}
try
@@ -314,7 +307,7 @@
}
catch (Exception e)
{
- log.info("Cannot remove group: " + plGroupName + "; ", e);
+ handleException("Cannot remove group: " + plGroupName + "; ", e);
}
if (broadcast)
@@ -349,7 +342,7 @@
}
catch (Exception e)
{
- log.info("Identity operation error: ", e);
+ handleException("Identity operation error: ", e);
}
Set<Group> exoGroups = new HashSet<Group>();
@@ -376,7 +369,7 @@
}
catch (Exception e)
{
- log.info("Identity operation error: ", e);
+ handleException("Identity operation error: ", e);
}
for (org.picketlink.idm.api.Group group : groups)
@@ -484,7 +477,7 @@
catch (Exception e)
{
//TODO:
- log.info("Identity operation error: ", e);
+ handleException("Identity operation error: ", e);
}
}
@@ -509,7 +502,7 @@
catch (Exception e)
{
//TODO:
- log.info("Identity operation error: ", e);
+ handleException("Identity operation error: ", e);
}
@@ -529,7 +522,7 @@
catch (Exception e)
{
//TODO:
- log.info("Identity operation error: ", e);
+ handleException("Identity operation error: ", e);
}
}
}
@@ -639,7 +632,7 @@
catch (Exception e)
{
//TODO:
- log.info("Identity operation error: ", e);
+ handleException("Identity operation error: ", e);
}
@@ -690,7 +683,7 @@
catch (Exception e)
{
//TODO:
- log.info("Identity operation error: ", e);
+ handleException("Identity operation error: ", e);
}
@@ -707,7 +700,7 @@
catch (Exception e)
{
//TODO:
- log.info("Identity operation error: ", e);
+ handleException("Identity operation error: ", e);
}
}
}
@@ -799,7 +792,7 @@
catch (Exception e)
{
//TODO:
- log.info("Identity operation error: ", e);
+ handleException("Identity operation error: ", e);
}
String gtnGroupName = getGtnGroupName(jbidGroup.getName());
@@ -924,7 +917,7 @@
catch (Exception e)
{
//TODO:
- log.info("Identity operation error: ", e);
+ handleException("Identity operation error: ", e);
}
// Check if there is cross reference so we ended in a loop and break the process.
@@ -1044,7 +1037,7 @@
catch (Exception e)
{
//TODO:
- log.info("Identity operation error: ", e);
+ handleException("Identity operation error: ", e);
}
if (jbidGroup == null)
@@ -1058,7 +1051,7 @@
catch (Exception e)
{
//TODO:
- log.info("Identity operation error: ", e);
+ handleException("Identity operation error: ", e);
}
}
@@ -1089,7 +1082,7 @@
catch (Exception e)
{
//TODO:
- log.info("Identity operation error: ", e);
+ handleException("Identity operation error: ", e);
}
}
@@ -1166,7 +1159,7 @@
catch (Exception e)
{
//TODO:
- log.info("Identity operation error: ", e);
+ handleException("Identity operation error: ", e);
}
if (rootGroup == null)
@@ -1182,7 +1175,7 @@
catch (Exception e)
{
//TODO:
- log.info("Identity operation error: ", e);
+ handleException("Identity operation error: ", e);
}
}
Modified: epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/MembershipDAOImpl.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/MembershipDAOImpl.java 2012-06-26 14:22:40 UTC (rev 8746)
+++ epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/MembershipDAOImpl.java 2012-06-26 14:25:04 UTC (rev 8747)
@@ -48,21 +48,15 @@
/*
* @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a>
*/
-public class MembershipDAOImpl implements MembershipHandler
+public class MembershipDAOImpl extends AbstractDAOImpl implements MembershipHandler
{
- private static Logger log = LoggerFactory.getLogger(MembershipDAOImpl.class);
- private PicketLinkIDMService service_;
-
private List listeners_;
- private PicketLinkIDMOrganizationServiceImpl orgService;
-
public MembershipDAOImpl(PicketLinkIDMOrganizationServiceImpl orgService, PicketLinkIDMService service)
{
- service_ = service;
+ super(orgService, service);
listeners_ = new ListenerStack(5);
- this.orgService = orgService;
}
public void addMembershipEventListener(MembershipEventListener listener)
@@ -233,7 +227,7 @@
catch (Exception e)
{
//TODO:
- log.info("Identity operation error: ", e);
+ handleException("Identity operation error: ", e);
}
@@ -257,7 +251,7 @@
catch (Exception e)
{
//TODO:
- log.info("Identity operation error: ", e);
+ handleException("Identity operation error: ", e);
}
}
@@ -270,7 +264,7 @@
catch (Exception e)
{
//TODO:
- log.info("Identity operation error: ", e);
+ handleException("Identity operation error: ", e);
}
}
@@ -315,7 +309,7 @@
catch (Exception e)
{
//TODO:
- log.info("Identity operation error: ", e);
+ handleException("Identity operation error: ", e);
}
@@ -328,7 +322,7 @@
catch (Exception e)
{
//TODO:
- log.info("Identity operation error: ", e);
+ handleException("Identity operation error: ", e);
}
if (!hasRole &&
@@ -352,7 +346,7 @@
catch (Exception e)
{
//TODO:
- log.info("Identity operation error: ", e);
+ handleException("Identity operation error: ", e);
}
}
@@ -368,7 +362,7 @@
catch (Exception e)
{
//TODO:
- log.info("Identity operation error: ", e);
+ handleException("Identity operation error: ", e);
}
}
@@ -407,7 +401,7 @@
catch (Exception e)
{
//TODO:
- log.info("Identity operation error: ", e);
+ handleException("Identity operation error: ", e);
}
@@ -448,7 +442,7 @@
catch (Exception e)
{
//TODO:
- log.info("Identity operation error: ", e);
+ handleException("Identity operation error: ", e);
}
@@ -464,7 +458,7 @@
catch (Exception e)
{
//TODO:
- log.info("Identity operation error: ", e);
+ handleException("Identity operation error: ", e);
}
}
@@ -512,7 +506,7 @@
catch (Exception e)
{
//TODO:
- log.info("Identity operation error: ", e);
+ handleException("Identity operation error: ", e);
}
@@ -531,7 +525,7 @@
catch (Exception e)
{
//TODO:
- log.info("Identity operation error: ", e);
+ handleException("Identity operation error: ", e);
}
@@ -620,7 +614,7 @@
catch (Exception e)
{
//TODO:
- log.info("Identity operation error: ", e);
+ handleException("Identity operation error: ", e);
}
@@ -647,7 +641,7 @@
catch (Exception e)
{
//TODO:
- log.info("Identity operation error: ", e);
+ handleException("Identity operation error: ", e);
}
@@ -701,7 +695,7 @@
catch (Exception e)
{
//TODO:
- log.info("Identity operation error: ", e);
+ handleException("Identity operation error: ", e);
}
@@ -742,7 +736,7 @@
catch (Exception e)
{
//TODO:
- log.info("Identity operation error: ", e);
+ handleException("Identity operation error: ", e);
}
@@ -840,7 +834,7 @@
catch (Exception e)
{
//TODO:
- log.info("Identity operation error: ", e);
+ handleException("Identity operation error: ", e);
}
@@ -872,7 +866,7 @@
catch (Exception e)
{
//TODO:
- log.info("Identity operation error: ", e);
+ handleException("Identity operation error: ", e);
}
@@ -954,7 +948,7 @@
catch (Exception e)
{
//TODO:
- log.info("Identity operation error: ", e);
+ handleException("Identity operation error: ", e);
}
@@ -979,7 +973,7 @@
catch (Exception e)
{
//TODO:
- log.info("Identity operation error: ", e);
+ handleException("Identity operation error: ", e);
}
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 2012-06-26 14:22:40 UTC (rev 8746)
+++ epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/MembershipTypeDAOImpl.java 2012-06-26 14:25:04 UTC (rev 8747)
@@ -42,7 +42,7 @@
/*
* @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a>
*/
-public class MembershipTypeDAOImpl implements MembershipTypeHandler
+public class MembershipTypeDAOImpl extends AbstractDAOImpl implements MembershipTypeHandler
{
public static final String MEMBERSHIP_DESCRIPTION = "description";
@@ -55,19 +55,12 @@
public static final DateFormat dateFormat = DateFormat.getInstance();
- private PicketLinkIDMService service_;
-
- private PicketLinkIDMOrganizationServiceImpl orgService;
-
- private static Logger log = LoggerFactory.getLogger(MembershipTypeDAOImpl.class);
-
private List listeners_;
public MembershipTypeDAOImpl(PicketLinkIDMOrganizationServiceImpl orgService, PicketLinkIDMService service)
{
- service_ = service;
+ super(orgService, service);
listeners_ = new ListenerStack(5);
- this.orgService = orgService;
}
public void addMembershipTypeEventListener(MembershipTypeEventListener listener)
Modified: epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMOrganizationServiceImpl.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMOrganizationServiceImpl.java 2012-06-26 14:22:40 UTC (rev 8746)
+++ epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMOrganizationServiceImpl.java 2012-06-26 14:25:04 UTC (rev 8747)
@@ -282,7 +282,7 @@
// It's fine to reuse same instance of UserTransaction as UserTransaction is singleton in JBoss and most other AS.
// And new InitialContext().lookup("java:comp/UserTransaction") is quite expensive operation
- private UserTransaction getUserTransaction() throws Exception
+ protected UserTransaction getUserTransaction() throws Exception
{
if (userTransaction == null)
{
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 2012-06-26 14:22:40 UTC (rev 8746)
+++ epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserDAOImpl.java 2012-06-26 14:25:04 UTC (rev 8747)
@@ -50,12 +50,9 @@
/*
* @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a>
*/
-public class UserDAOImpl implements UserHandler
+public class UserDAOImpl extends AbstractDAOImpl implements UserHandler
{
- private static Logger log = LoggerFactory.getLogger(UserDAOImpl.class);
- private final PicketLinkIDMService service_;
-
private List<UserEventListener> listeners_ = new ArrayList<UserEventListener>(3);
public static final String USER_PASSWORD = "password";
@@ -77,8 +74,6 @@
public static final Set<String> USER_NON_PROFILE_KEYS;
public static final DateFormat dateFormat = DateFormat.getInstance();
-
- private PicketLinkIDMOrganizationServiceImpl orgService;
static
{
@@ -98,8 +93,7 @@
public UserDAOImpl(PicketLinkIDMOrganizationServiceImpl orgService, PicketLinkIDMService idmService)
throws Exception
{
- service_ = idmService;
- this.orgService = orgService;
+ super(orgService, idmService);
}
final public List getUserEventListeners()
@@ -165,7 +159,7 @@
}
catch (IdentityException e)
{
- log.info("Identity operation error: ", e);
+ handleException("Identity operation error: ", e);
}
@@ -241,7 +235,7 @@
}
catch (IdentityException e)
{
- log.info("Cannot obtain user: " + userName + "; ", e);
+ handleException("Cannot obtain user: " + userName + "; ", e);
}
@@ -258,7 +252,7 @@
}
catch (Exception e)
{
- log.info("Cannot cleanup user relationships: " + userName + "; ", e);
+ handleException("Cannot cleanup user relationships: " + userName + "; ", e);
}
@@ -275,7 +269,7 @@
}
catch (IdentityException e)
{
- log.info("Cannot remove user: " + userName + "; ", e);
+ handleException("Cannot remove user: " + userName + "; ", e);
}
@@ -410,7 +404,7 @@
}
catch (Exception e)
{
- log.info("Cannot authenticate user: " + username + "; ", e);
+ handleException("Cannot authenticate user: " + username + "; ", e);
}
}
@@ -616,7 +610,7 @@
}
catch (IdentityException e)
{
- log.info("Cannot find user by email: " + email + "; ", e );
+ handleException("Cannot find user by email: " + email + "; ", e );
}
@@ -666,7 +660,7 @@
}
catch (Exception e)
{
- log.info("Cannot obtain group: " + groupId + "; ", e);
+ handleException("Cannot obtain group: " + groupId + "; ", e);
}
@@ -774,7 +768,7 @@
}
catch (IdentityException e)
{
- log.info("Cannot update password: " + user.getUserName() + "; ", e);
+ handleException("Cannot update password: " + user.getUserName() + "; ", e);
}
}
@@ -789,7 +783,7 @@
}
catch (IdentityException e)
{
- log.info("Cannot update attributes for user: " + user.getUserName() + "; ", e);
+ handleException("Cannot update attributes for user: " + user.getUserName() + "; ", e);
}
@@ -807,7 +801,7 @@
}
catch (IdentityException e)
{
- log.info("Cannot obtain user: " + userName + "; ", e);
+ handleException("Cannot obtain user: " + userName + "; ", e);
}
@@ -839,7 +833,7 @@
catch (IdentityException e)
{
- log.info("Cannot obtain attributes for user: " + user.getUserName() + "; ", e);
+ handleException("Cannot obtain attributes for user: " + user.getUserName() + "; ", e);
}
@@ -965,7 +959,7 @@
}
catch (IdentityException e)
{
- log.error("Cannot remove displayName attribute of user: " + user.getUserName() + "; ", e);
+ handleException("Cannot remove displayName attribute of user: " + user.getUserName() + "; ", e);
}
}
Modified: epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserProfileDAOImpl.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserProfileDAOImpl.java 2012-06-26 14:22:40 UTC (rev 8746)
+++ epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserProfileDAOImpl.java 2012-06-26 14:25:04 UTC (rev 8747)
@@ -43,25 +43,18 @@
/*
* @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a>
*/
-public class UserProfileDAOImpl implements UserProfileHandler
+public class UserProfileDAOImpl extends AbstractDAOImpl implements UserProfileHandler
{
- private static Logger log = LoggerFactory.getLogger(UserProfileDAOImpl.class);
-
static private UserProfile NOT_FOUND = new UserProfileImpl();
- private PicketLinkIDMService service_;
-
private List<UserProfileEventListener> listeners_;
- private PicketLinkIDMOrganizationServiceImpl orgService;
-
public UserProfileDAOImpl(PicketLinkIDMOrganizationServiceImpl orgService, PicketLinkIDMService service)
throws Exception
{
- service_ = service;
+ super(orgService, service);
listeners_ = new ArrayList<UserProfileEventListener>(3);
- this.orgService = orgService;
}
public void addUserProfileEventListener(UserProfileEventListener listener)
@@ -159,7 +152,7 @@
catch (Exception e)
{
//TODO:
- log.info("Identity operation error: ", e);
+ handleException("Identity operation error: ", e);
}
if (foundUser == null)
@@ -242,7 +235,7 @@
catch (Exception e)
{
//TODO:
- log.info("Identity operation error: ", e);
+ handleException("Identity operation error: ", e);
}
if (u == null)
@@ -259,7 +252,7 @@
catch (Exception e)
{
//TODO:
- log.info("Identity operation error: ", e);
+ handleException("Identity operation error: ", e);
}
if (attrs == null || attrs.isEmpty())
@@ -320,7 +313,7 @@
catch (Exception e)
{
//TODO:
- log.info("Identity operation error: ", e);
+ handleException("Identity operation error: ", e);
}
}
@@ -340,7 +333,7 @@
catch (Exception e)
{
//TODO:
- log.info("Identity operation error: ", e);
+ handleException("Identity operation error: ", e);
}
}
11 years, 10 months
gatein SVN: r8746 - in epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm: examples and 1 other directory.
by do-not-reply＠jboss.org
Author: mposolda
Date: 2012-06-26 10:22:40 -0400 (Tue, 26 Jun 2012)
New Revision: 8746
Modified:
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-acme-config.xml
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-config.xml
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-config.xml
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-readonly-config.xml
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-openldap-acme-config.xml
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-openldap-config.xml
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/picketlink-idm-config.xml
Log:
Bug 835578 New option 'lazyStartOfHibernateTransaction' added to Picketlink IDM configuration for support of lazy hibernate transaction. Default value is false, so it will still use old behaviour.
Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-acme-config.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-acme-config.xml 2012-06-26 07:11:28 UTC (rev 8745)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-acme-config.xml 2012-06-26 14:22:40 UTC (rev 8746)
@@ -144,6 +144,10 @@
<name>isRealmAware</name>
<value>true</value>
</option>
+ <option>
+ <name>lazyStartOfHibernateTransaction</name>
+ <value>false</value>
+ </option>
</options>
</identity-store>
<identity-store>
Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-config.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-config.xml 2012-06-26 07:11:28 UTC (rev 8745)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-config.xml 2012-06-26 14:22:40 UTC (rev 8746)
@@ -139,6 +139,10 @@
<name>isRealmAware</name>
<value>true</value>
</option>
+ <option>
+ <name>lazyStartOfHibernateTransaction</name>
+ <value>false</value>
+ </option>
</options>
</identity-store>
<identity-store>
Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-config.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-config.xml 2012-06-26 07:11:28 UTC (rev 8745)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-config.xml 2012-06-26 14:22:40 UTC (rev 8746)
@@ -138,6 +138,10 @@
<name>isRealmAware</name>
<value>true</value>
</option>
+ <option>
+ <name>lazyStartOfHibernateTransaction</name>
+ <value>false</value>
+ </option>
</options>
</identity-store>
<identity-store>
Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-readonly-config.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-readonly-config.xml 2012-06-26 07:11:28 UTC (rev 8745)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-msad-readonly-config.xml 2012-06-26 14:22:40 UTC (rev 8746)
@@ -143,6 +143,10 @@
<name>isRealmAware</name>
<value>true</value>
</option>
+ <option>
+ <name>lazyStartOfHibernateTransaction</name>
+ <value>false</value>
+ </option>
</options>
</identity-store>
<identity-store>
Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-openldap-acme-config.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-openldap-acme-config.xml 2012-06-26 07:11:28 UTC (rev 8745)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-openldap-acme-config.xml 2012-06-26 14:22:40 UTC (rev 8746)
@@ -144,6 +144,10 @@
<name>isRealmAware</name>
<value>true</value>
</option>
+ <option>
+ <name>lazyStartOfHibernateTransaction</name>
+ <value>false</value>
+ </option>
</options>
</identity-store>
<identity-store>
Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-openldap-config.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-openldap-config.xml 2012-06-26 07:11:28 UTC (rev 8745)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/examples/picketlink-idm-openldap-config.xml 2012-06-26 14:22:40 UTC (rev 8746)
@@ -139,6 +139,10 @@
<name>isRealmAware</name>
<value>true</value>
</option>
+ <option>
+ <name>lazyStartOfHibernateTransaction</name>
+ <value>false</value>
+ </option>
</options>
</identity-store>
<identity-store>
Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/picketlink-idm-config.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/picketlink-idm-config.xml 2012-06-26 07:11:28 UTC (rev 8745)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/picketlink-idm-config.xml 2012-06-26 14:22:40 UTC (rev 8746)
@@ -102,6 +102,10 @@
<name>isRealmAware</name>
<value>true</value>
</option>
+ <option>
+ <name>lazyStartOfHibernateTransaction</name>
+ <value>false</value>
+ </option>
</options>
</identity-store>
</identity-stores>
11 years, 10 months
gatein SVN: r8745 - epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2012-06-26 03:11:28 -0400 (Tue, 26 Jun 2012)
New Revision: 8745
Modified:
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/pom.xml
Log:
Bug 835416 - Update packaging
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/pom.xml 2012-06-25 09:06:26 UTC (rev 8744)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/pom.xml 2012-06-26 07:11:28 UTC (rev 8745)
@@ -182,8 +182,18 @@
-->
</modules>
</profile>
-<!--gatein-parent-->
<profile>
+ <id>jcr-all</id>
+ <modules>
+ <module>exo-kernel </module>
+ <module>exo-core </module>
+ <module>exo-ws </module>
+ <module>exo-jcr </module>
+ </modules>
+ </profile>
+
+ <!--gatein-parent-->
+ <profile>
<id>gatein-parent</id>
<modules>
<module>gatein-parent</module>
11 years, 10 months
gatein SVN: r8744 - epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/core.
by do-not-reply＠jboss.org
Author: ppalaga
Date: 2012-06-25 05:06:26 -0400 (Mon, 25 Jun 2012)
New Revision: 8744
Modified:
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/core/UIVirtualList.gtmpl
Log:
Bug 794025 - (JBEPP-1094) in IE7 page administration table is not rendered correctly
Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/core/UIVirtualList.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/core/UIVirtualList.gtmpl 2012-06-24 10:07:10 UTC (rev 8743)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/webui/core/UIVirtualList.gtmpl 2012-06-25 09:06:26 UTC (rev 8744)
@@ -9,9 +9,11 @@
rcontext.getJavascriptManager().importJavascript('eXo.core.Browser');
rcontext.getJavascriptManager().importJavascript('eXo.webui.UIVirtualList');
- String url = uicomponent.url("LoadNext") + "&ajaxRequest=true";
+ String url = uicomponent.url("LoadNext") + "&ajaxRequest=true";
+
+ /* overflow-x:hidden is a fix for https://bugzilla.redhat.com/show_bug.cgi?id=794025 */
%>
-<div id="$uicomponent.id" style="overflow:auto;"
+<div id="$uicomponent.id" style="overflow:auto; overflow-x:hidden; "
onscroll="eXo.webui.UIVirtualList.scrollMove(this,'$url');">
<div style="width: 99%;" >
<% uicomponent.renderChildren();%>
11 years, 10 months
gatein SVN: r8743 - epp/portal/branches/EPP_5_2_Branch.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2012-06-24 06:07:10 -0400 (Sun, 24 Jun 2012)
New Revision: 8743
Modified:
epp/portal/branches/EPP_5_2_Branch/pom.xml
Log:
Bug 830084 - JCR update
Modified: epp/portal/branches/EPP_5_2_Branch/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/pom.xml 2012-06-24 10:03:29 UTC (rev 8742)
+++ epp/portal/branches/EPP_5_2_Branch/pom.xml 2012-06-24 10:07:10 UTC (rev 8743)
@@ -38,11 +38,11 @@
<properties>
<org.exoplatform.parent.version>9</org.exoplatform.parent.version>
- <org.exoplatform.kernel.version>2.3.6-GA</org.exoplatform.kernel.version>
+ <org.exoplatform.kernel.version>2.3.7-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.6-GA</org.exoplatform.core.version>
- <org.exoplatform.ws.version>2.2.6-GA</org.exoplatform.ws.version>
- <org.exoplatform.jcr.version>1.14.6-GA</org.exoplatform.jcr.version>
+ <org.exoplatform.core.version>2.4.7-GA</org.exoplatform.core.version>
+ <org.exoplatform.ws.version>2.2.7-GA</org.exoplatform.ws.version>
+ <org.exoplatform.jcr.version>1.14.7-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-CP01</org.shindig.version>
11 years, 10 months
gatein SVN: r8742 - in epp/portal/branches/EPP_5_2_Branch: portlet/dashboard/src/main/java/org/exoplatform/gadget/webui/component and 2 other directories.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2012-06-24 06:03:29 -0400 (Sun, 24 Jun 2012)
New Revision: 8742
Modified:
epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistryServiceImpl.java
epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/java/org/exoplatform/gadget/webui/component/UIGadgetPortlet.java
epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/gadget/Gadgets.js
epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/gadget/UIGadget.js
epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIGadget.java
Log:
Bug 824852 - UIGadgetPortlet doesn't set up correctly browser caching for gadget resources
Modified: epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistryServiceImpl.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistryServiceImpl.java 2012-06-24 09:36:01 UTC (rev 8741)
+++ epp/portal/branches/EPP_5_2_Branch/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistryServiceImpl.java 2012-06-24 10:03:29 UTC (rev 8742)
@@ -304,9 +304,7 @@
public boolean isGadgetDeveloper(String username)
{
- if(PropertyManager.isDevelopping())
- return true;
- return false;
+ return PropertyManager.isDevelopping();
}
public String getCountry()
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/java/org/exoplatform/gadget/webui/component/UIGadgetPortlet.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/java/org/exoplatform/gadget/webui/component/UIGadgetPortlet.java 2012-06-24 09:36:01 UTC (rev 8741)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/java/org/exoplatform/gadget/webui/component/UIGadgetPortlet.java 2012-06-24 10:03:29 UTC (rev 8742)
@@ -20,8 +20,9 @@
package org.exoplatform.gadget.webui.component;
import org.exoplatform.application.gadget.Gadget;
+import org.exoplatform.application.gadget.GadgetRegistryService;
import org.exoplatform.application.gadget.GadgetImporter;
-import org.exoplatform.application.gadget.GadgetRegistryService;
+import org.exoplatform.commons.utils.PropertyManager;
import org.exoplatform.container.ExoContainer;
import org.exoplatform.container.ExoContainerContext;
import org.exoplatform.portal.webui.application.GadgetUtil;
@@ -198,6 +199,16 @@
return metadata_;
}
+ public boolean isNoCache()
+ {
+ return PropertyManager.isDevelopping();
+ }
+
+ public boolean isDebug()
+ {
+ return PropertyManager.isDevelopping();
+ }
+
static public class SaveUserPrefActionListener extends EventListener<UIGadgetPortlet>
{
public void execute(Event<UIGadgetPortlet> event) throws Exception
Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/gadget/Gadgets.js
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/gadget/Gadgets.js 2012-06-24 09:36:01 UTC (rev 8741)
+++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/gadget/Gadgets.js 2012-06-24 10:03:29 UTC (rev 8742)
@@ -712,26 +712,6 @@
this.id +').handleSaveUserPrefs()"> <input type="button" value="'+eXo.gadget.UIGadget.CancelTitle+'" onclick="gadgets.container.getGadget(' +
this.id +').handleCancelUserPrefs()">';
parentEl.appendChild(saveEl);
-
- /** Minh Hoang TO: Instantly remove the noCache and Debug boxes
- if(gadget.isdev) {
- //Are we in a portlet ? if not, we don't had this code because we can't save the value
- var gadgetEl = document.getElementById("gadget_" + gadget.id) ;
- var portletFragment = eXo.core.DOMUtil.findAncestorByClass(gadgetEl, "PORTLET-FRAGMENT");
-
- if (portletFragment) {
- var devEl = document.createElement("div");
- devEl.className = "devToolbar";
- devEl.innerHTML = '<table>' +
- '<tr><td>'+eXo.gadget.UIGadget.Cache+'</td><td><input type="checkbox"' + (gadget.nocache ? ' checked=""' : "") + ' onclick="gadgets.container.getGadget(' + this.id + ').setNoCache(checked)"/></td></tr>' +
- '<tr><td>'+eXo.gadget.UIGadget.Debug+'</td><td><input type="checkbox"' + (gadget.debug ? ' checked=""' : "") + ' onclick="gadgets.container.getGadget(' + this.id + ').setDebug(checked)"/></td></tr>' +
- '</table>';
- parentEl.appendChild(devEl);
- }
- }
- */
-
-
};
gadgets.IfrGadget.prototype.buildUserPrefsDialog = function(content) {
Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/gadget/UIGadget.js
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/gadget/UIGadget.js 2012-06-24 09:36:01 UTC (rev 8741)
+++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/gadget/UIGadget.js 2012-06-24 10:03:29 UTC (rev 8742)
@@ -25,11 +25,10 @@
* @param {String} metadata contain information of gadget
* @param {Object} userPref
* @param {String} view type of view (home, canvas, ...)
- * @param {boolean} isdev normal or development mode (0, 1)
* @param {boolean} debug normal or debug mode (0, 1)
* @param {String} nocache value indicate cache or nocache at shindig level (0, 1)
*/
- createGadget : function(url, id, metadata, userPref, view, hostName, isdev, debug, nocache) {
+ createGadget : function(url, id, metadata, userPref, view, hostName, debug, nocache) {
//eXo = eXo || {};
window.gadgets = window.gadgets || {};
eXo.gadgets = window.gadgets;
@@ -43,7 +42,7 @@
eXo.gadget.UIGadget.createCallback, null, arguments);
},
- createCallback : function(url, id, metadata, userPref, view, hostName, isdev, debug, nocache) {
+ createCallback : function(url, id, metadata, userPref, view, hostName, debug, nocache) {
//TODO: dang.tung - set language for gadget
//-----------------------------------------
var language = eXo.core.I18n.getLanguage();
@@ -63,7 +62,6 @@
gadget.parentId = id;
gadget.debug = debug;
gadget.nocache = nocache;
- gadget.isdev = isdev;
gadget.serverBase_ = hostName;
gadgets.container.addGadget(gadget);
Modified: epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIGadget.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIGadget.java 2012-06-24 09:36:01 UTC (rev 8741)
+++ epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIGadget.java 2012-06-24 10:03:29 UTC (rev 8742)
@@ -22,7 +22,6 @@
import org.exoplatform.application.gadget.Gadget;
import org.exoplatform.application.gadget.GadgetRegistryService;
import org.exoplatform.commons.utils.PropertyManager;
-import org.exoplatform.container.ExoContainerContext;
import org.exoplatform.portal.config.DataStorage;
import org.exoplatform.portal.config.model.ApplicationState;
import org.exoplatform.portal.config.model.ApplicationType;
@@ -76,8 +75,6 @@
private String url_;
- private GadgetRegistryService gadgetRegistryService = null;
-
public static final String PREF_KEY = "_pref_gadget_";
public static final String PREF_NO_CACHE = "_pref_no_cache_";
@@ -389,42 +386,16 @@
return url_;
}
- private GadgetRegistryService getGadgetRegistryService()
- {
- if (gadgetRegistryService == null)
- gadgetRegistryService =
- (GadgetRegistryService)ExoContainerContext.getCurrentContainer().getComponentInstanceOfType(
- GadgetRegistryService.class);
- return gadgetRegistryService;
- }
-
public boolean isNoCache()
{
- if(PropertyManager.isDevelopping())
- return true;
- return false;
+ return PropertyManager.isDevelopping();
}
- public void setNoCache(boolean value)
- {
- }
-
public boolean isDebug()
{
- if(PropertyManager.isDevelopping())
- return true;
- return false;
+ return PropertyManager.isDevelopping();
}
- public void setDebug(boolean value)
- {
- }
-
- public boolean isGadgetDeveloper()
- {
- return getGadgetRegistryService().isGadgetDeveloper(Util.getPortalRequestContext().getRemoteUser());
- }
-
public String getView()
{
if (view != null)
11 years, 10 months
gatein SVN: r8741 - epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2012-06-24 05:36:01 -0400 (Sun, 24 Jun 2012)
New Revision: 8741
Added:
epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_cs.js
Log:
Bug 809612 - MessageResource_cs.js not found
Added: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_cs.js
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_cs.js (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/javascript/eXo/i18n/MessageResource_cs.js 2012-06-24 09:36:01 UTC (rev 8741)
@@ -0,0 +1,23 @@
+/**
+ * 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.
+ */
+
+eXo.i18n.I18NMessage.SessionTimeout = "Relace vypršela! Obnovte prohlížeč.";
+eXo.i18n.I18NMessage.TargetBlockNotFound = "Požadovaný dotaz nelze dokončit. Komponent (blockId: {0}) nelze nalézt. Pokud se změnil obsah stránky, je potřeba ji obnovit."
+eXo.i18n.I18NMessage.BlockUpdateNotFound = "Nelze nalézt blockId: {0}";
+eXo.i18n.I18NMessage.DefaultTheme = "Výchozí téma";
\ No newline at end of file
11 years, 10 months
gatein SVN: r8740 - epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm.
by do-not-reply＠jboss.org
Author: mposolda
Date: 2012-06-22 12:02:01 -0400 (Fri, 22 Jun 2012)
New Revision: 8740
Modified:
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-api-cluster.xml
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-store-cluster.xml
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache.xml
Log:
Bug 834635 - JBoss cache for Picketlink IDM will be JTA aware now
Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-api-cluster.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-api-cluster.xml 2012-06-22 13:06:17 UTC (rev 8739)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-api-cluster.xml 2012-06-22 16:02:01 UTC (rev 8740)
@@ -1,5 +1,8 @@
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1">
+ <!-- Configure the TransactionManager -->
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup" />
+
<!-- The cluster name will be changed programmatically. Portal container name will be added to the end of name. -->
<clustering mode="replication" clusterName="${jboss.partition.name:DefaultPartition}-idm-api-cluster">
<stateRetrieval timeout="20000" fetchInMemoryState="false" />
Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-store-cluster.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-store-cluster.xml 2012-06-22 13:06:17 UTC (rev 8739)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-store-cluster.xml 2012-06-22 16:02:01 UTC (rev 8740)
@@ -1,5 +1,8 @@
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1">
+ <!-- Configure the TransactionManager -->
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup" />
+
<!-- The cluster name will be changed programmatically. Portal container name will be added to the end of name. -->
<clustering mode="replication" clusterName="${jboss.partition.name:DefaultPartition}-idm-store-cluster">
<stateRetrieval timeout="20000" fetchInMemoryState="false" />
Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache.xml 2012-06-22 13:06:17 UTC (rev 8739)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache.xml 2012-06-22 16:02:01 UTC (rev 8740)
@@ -1,5 +1,8 @@
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1">
+ <!-- Configure the TransactionManager -->
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup" />
+
<!-- Eviction configuration -->
<eviction wakeUpInterval="5000">
<default algorithmClass="org.jboss.cache.eviction.ExpirationAlgorithm"
11 years, 10 months
gatein SVN: r8739 - epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/localization.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2012-06-22 09:06:17 -0400 (Fri, 22 Jun 2012)
New Revision: 8739
Modified:
epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/localization/LocalizationFilter.java
Log:
Bug 818565 - Portal container name is hardcoded in the LocalizationFilter
Modified: epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/localization/LocalizationFilter.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/localization/LocalizationFilter.java 2012-06-22 13:04:56 UTC (rev 8738)
+++ epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/localization/LocalizationFilter.java 2012-06-22 13:06:17 UTC (rev 8739)
@@ -138,7 +138,7 @@
}
if (container instanceof RootContainer)
- container = (ExoContainer) container.getComponentInstance("portal");
+ container = (ExoContainer) container.getComponentInstance(req.getContextPath().substring(1));
LocaleConfigService localeConfigService = (LocaleConfigService)
container.getComponentInstanceOfType(LocaleConfigService.class);
11 years, 10 months