gatein SVN: r3007 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-05-06 22:39:04 -0400 (Thu, 06 May 2010)
New Revision: 3007
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_26_MoveUpAndDownANode.html
Log:
TESTVN-356: Clean and improve
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_26_MoveUpAndDownANode.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_26_MoveUpAndDownANode.html 2010-05-07 02:38:49 UTC (rev 3006)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_26_MoveUpAndDownANode.html 2010-05-07 02:39:04 UTC (rev 3007)
@@ -122,11 +122,6 @@
<td></td>
</tr>
<tr>
- <td>echo</td>
- <td>https://jira.jboss.org/jira/browse/GTNPORTAL-1129</td>
- <td></td>
-</tr>
-<tr>
<td>waitForElementPresent</td>
<td>link=Save</td>
<td></td>
14 years, 7 months
gatein SVN: r3006 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-05-06 22:38:49 -0400 (Thu, 06 May 2010)
New Revision: 3006
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_25_EditPageOfNode.html
Log:
TESTVN-356: Clean and improve
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_25_EditPageOfNode.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_25_EditPageOfNode.html 2010-05-07 02:38:35 UTC (rev 3005)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_25_EditPageOfNode.html 2010-05-07 02:38:49 UTC (rev 3006)
@@ -138,11 +138,6 @@
</tr>
<tr>
<td>echo</td>
- <td>https://jira.jboss.org/jira/browse/GTNPORTAL-1128</td>
- <td></td>
-</tr>
-<tr>
- <td>echo</td>
<td>--Edit node's page</td>
<td></td>
</tr>
14 years, 7 months
gatein SVN: r3005 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-05-06 22:38:35 -0400 (Thu, 06 May 2010)
New Revision: 3005
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_24_EditNavigationAndEditPropertiesAndDeleteInGroupNavigation.html
Log:
TESTVN-356: Clean and improve
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_24_EditNavigationAndEditPropertiesAndDeleteInGroupNavigation.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_24_EditNavigationAndEditPropertiesAndDeleteInGroupNavigation.html 2010-05-07 02:31:44 UTC (rev 3004)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_24_EditNavigationAndEditPropertiesAndDeleteInGroupNavigation.html 2010-05-07 02:38:35 UTC (rev 3005)
@@ -202,11 +202,6 @@
<td></td>
</tr>
<tr>
- <td>echo</td>
- <td>https://jira.jboss.org/jira/browse/GTNPORTAL-1129</td>
- <td></td>
-</tr>
-<tr>
<td>clickAt</td>
<td>link=Save</td>
<td></td>
14 years, 7 months
gatein SVN: r3004 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-05-06 22:31:44 -0400 (Thu, 06 May 2010)
New Revision: 3004
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_13_AddRemoteAndCreateNewGadget.html
Log:
TESTVN-356: Clean and improve
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_13_AddRemoteAndCreateNewGadget.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_13_AddRemoteAndCreateNewGadget.html 2010-05-06 19:16:21 UTC (rev 3003)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_13_AddRemoteAndCreateNewGadget.html 2010-05-07 02:31:44 UTC (rev 3004)
@@ -22,11 +22,6 @@
<td></td>
</tr>
<tr>
- <td>setSpeed</td>
- <td>150</td>
- <td></td>
-</tr>
-<tr>
<td>clickAt</td>
<td>link=Sign in</td>
<td></td>
14 years, 7 months
gatein SVN: r3003 - portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply＠jboss.org
Author: mvanco(a)redhat.com
Date: 2010-05-06 15:16:21 -0400 (Thu, 06 May 2010)
New Revision: 3003
Modified:
portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_24_EditNavigationAndEditPropertiesAndDeleteInGroupNavigation.html
portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_25_EditPageOfNode.html
Log:
EPP5 UI tests: improved tests 24, 25
Modified: portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_24_EditNavigationAndEditPropertiesAndDeleteInGroupNavigation.html
===================================================================
--- portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_24_EditNavigationAndEditPropertiesAndDeleteInGroupNavigation.html 2010-05-06 17:45:38 UTC (rev 3002)
+++ portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_24_EditNavigationAndEditPropertiesAndDeleteInGroupNavigation.html 2010-05-06 19:16:21 UTC (rev 3003)
@@ -92,6 +92,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForTextPresent</td>
+ <td>Navigation Management</td>
+ <td></td>
+</tr>
+<tr>
<td>waitForElementPresent</td>
<td>link=Add Node</td>
<td></td>
@@ -102,6 +107,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForTextPresent</td>
+ <td>Page Node Setting</td>
+ <td></td>
+</tr>
+<tr>
<td>waitForElementPresent</td>
<td>name</td>
<td></td>
@@ -173,7 +183,7 @@
</tr>
<tr>
<td>waitForTextNotPresent</td>
- <td>Page Selector</td>
+ <td>Page Node Setting</td>
<td></td>
</tr>
<tr>
@@ -187,6 +197,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForTextNotPresent</td>
+ <td>Navigation Management</td>
+ <td></td>
+</tr>
+<tr>
<td>waitForElementPresent</td>
<td>link=test_grp_label_24</td>
<td></td>
@@ -198,25 +213,20 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>link=Group</td>
+ <td>//a[@class='EditProIcon']</td>
<td></td>
</tr>
<tr>
<td>clickAt</td>
- <td>link=Group</td>
+ <td>//a[@class='EditProIcon']</td>
<td></td>
</tr>
<tr>
- <td>waitForElementPresent</td>
- <td>xpath=//div[@id='UIGroupNavigationGrid']/table[1]//td[@class='ActionBlock']//a[@class='EditProIcon']</td>
+ <td>waitForTextPresent</td>
+ <td>Page Navigation Form</td>
<td></td>
</tr>
<tr>
- <td>clickAt</td>
- <td>xpath=//div[@id='UIGroupNavigationGrid']/table[1]//td[@class='ActionBlock']//a[@class='EditProIcon']</td>
- <td></td>
-</tr>
-<tr>
<td>echo</td>
<td>https://jira.jboss.org/jira/browse/GTNPORTAL-1129</td>
<td></td>
@@ -232,16 +242,26 @@
<td></td>
</tr>
<tr>
+ <td>waitForTextNotPresent</td>
+ <td>Page Navigation Form</td>
+ <td></td>
+</tr>
+<tr>
<td>waitForElementPresent</td>
- <td>xpath=//div[@ID='UIGroupNavigationGrid']//table[1]//a[@class='EditNavIcon']</td>
+ <td>//a[@class='EditNavIcon']</td>
<td></td>
</tr>
<tr>
<td>clickAt</td>
- <td>xpath=//div[@ID='UIGroupNavigationGrid']//table[1]//a[@class='EditNavIcon']</td>
+ <td>//a[@class='EditNavIcon']</td>
<td></td>
</tr>
<tr>
+ <td>waitForTextPresent</td>
+ <td>Navigation Management</td>
+ <td></td>
+</tr>
+<tr>
<td>waitForElementPresent</td>
<td>xpath=//a[@title='test_grp_label_24']</td>
<td></td>
@@ -262,8 +282,13 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Delete Node</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAt</td>
- <td>xpath=//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon DeleteNode16x16Icon']</td>
+ <td>link=Delete Node</td>
<td></td>
</tr>
<tr>
Modified: portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_25_EditPageOfNode.html
===================================================================
--- portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_25_EditPageOfNode.html 2010-05-06 17:45:38 UTC (rev 3002)
+++ portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_25_EditPageOfNode.html 2010-05-06 19:16:21 UTC (rev 3003)
@@ -22,6 +22,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign in</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAt</td>
<td>link=Sign in</td>
<td></td>
@@ -178,12 +183,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>xpath=//div[@ID='UIGroupNavigationGrid']//table[1]//a[@class='EditNavIcon']</td>
+ <td>//a[@class='EditNavIcon']</td>
<td></td>
</tr>
<tr>
<td>clickAt</td>
- <td>xpath=//div[@ID='UIGroupNavigationGrid']//table[1]//a[@class='EditNavIcon']</td>
+ <td>//a[@class='EditNavIcon']</td>
<td></td>
</tr>
<tr>
@@ -258,12 +263,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>xpath=//div[@ID='UIGroupNavigationGrid']//table[1]//a[@class='EditNavIcon']</td>
+ <td>//a[@class='EditNavIcon']</td>
<td></td>
</tr>
<tr>
<td>clickAt</td>
- <td>xpath=//div[@ID='UIGroupNavigationGrid']//table[1]//a[@class='EditNavIcon']</td>
+ <td>//a[@class='EditNavIcon']</td>
<td></td>
</tr>
<tr>
14 years, 7 months
gatein SVN: r3002 - portal/branches/EPP_5_0_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/rssAggregator.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-05-06 13:45:38 -0400 (Thu, 06 May 2010)
New Revision: 3002
Modified:
portal/branches/EPP_5_0_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/rssAggregator/script.js
Log:
JBEPP-340: RSS Gadget has wrong published date for feeds
Modified: portal/branches/EPP_5_0_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/rssAggregator/script.js
===================================================================
--- portal/branches/EPP_5_0_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/rssAggregator/script.js 2010-05-06 17:40:37 UTC (rev 3001)
+++ portal/branches/EPP_5_0_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/rssAggregator/script.js 2010-05-06 17:45:38 UTC (rev 3002)
@@ -43,7 +43,7 @@
if (isNaN(B)) {
return "an indeterminate amount of time ago"
}
- time = (new Date().getTime() - B) / 1000;
+ time = new Date().getTime() / 1000 - B;
if (time < 60) {
return "less than a minute ago"
} else {
@@ -119,7 +119,6 @@
item_title.innerHTML = bullet + "<a id='link_title_"+i+"' class='titlelink' href='" + feed.Entry[i].Link + "' onclick='rssAggregator.toggleDescription("+i+");return false;'>" + feed.Entry[i].Title + "</a>";
item_date.innerHTML = this.timeToPrettyString(feed.Entry[i].Date);
-
item_desc.innerHTML = feed.Entry[i].Summary;
item_link.innerHTML = this.generateLinkContent(i);
14 years, 7 months
gatein SVN: r3001 - portal/trunk/gadgets/eXoGadgets/src/main/webapp/gadgets/rssAggregator.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-05-06 13:40:37 -0400 (Thu, 06 May 2010)
New Revision: 3001
Modified:
portal/trunk/gadgets/eXoGadgets/src/main/webapp/gadgets/rssAggregator/script.js
Log:
GTNPORTAL-1167: RSS Gadget has wrong published date for feeds
Modified: portal/trunk/gadgets/eXoGadgets/src/main/webapp/gadgets/rssAggregator/script.js
===================================================================
--- portal/trunk/gadgets/eXoGadgets/src/main/webapp/gadgets/rssAggregator/script.js 2010-05-06 15:59:04 UTC (rev 3000)
+++ portal/trunk/gadgets/eXoGadgets/src/main/webapp/gadgets/rssAggregator/script.js 2010-05-06 17:40:37 UTC (rev 3001)
@@ -43,7 +43,7 @@
if (isNaN(B)) {
return "an indeterminate amount of time ago"
}
- time = (new Date().getTime() - B) / 1000;
+ time = new Date().getTime() / 1000 - B;
if (time < 60) {
return "less than a minute ago"
} else {
@@ -119,7 +119,6 @@
item_title.innerHTML = bullet + "<a id='link_title_"+i+"' class='titlelink' href='" + feed.Entry[i].Link + "' onclick='rssAggregator.toggleDescription("+i+");return false;'>" + feed.Entry[i].Title + "</a>";
item_date.innerHTML = this.timeToPrettyString(feed.Entry[i].Date);
-
item_desc.innerHTML = feed.Entry[i].Summary;
item_link.innerHTML = this.generateLinkContent(i);
14 years, 7 months
gatein SVN: r3000 - portal/branches/EPP_5_0_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-05-06 11:59:04 -0400 (Thu, 06 May 2010)
New Revision: 3000
Modified:
portal/branches/EPP_5_0_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/MembershipTypeDAOImpl.java
portal/branches/EPP_5_0_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserDAOImpl.java
Log:
JBEPP-338: OrganizationService failed to start when EPP5 is executed with different value of LANG environment variable
Modified: portal/branches/EPP_5_0_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/MembershipTypeDAOImpl.java
===================================================================
--- portal/branches/EPP_5_0_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/MembershipTypeDAOImpl.java 2010-05-06 15:56:13 UTC (rev 2999)
+++ portal/branches/EPP_5_0_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/MembershipTypeDAOImpl.java 2010-05-06 15:59:04 UTC (rev 3000)
@@ -22,10 +22,13 @@
import org.exoplatform.services.organization.MembershipType;
import org.exoplatform.services.organization.MembershipTypeHandler;
import org.exoplatform.services.organization.impl.MembershipTypeImpl;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
import org.picketlink.idm.api.IdentitySession;
import org.picketlink.idm.api.RoleType;
import java.text.DateFormat;
+import java.text.ParseException;
import java.util.Collection;
import java.util.Date;
import java.util.HashMap;
@@ -52,6 +55,8 @@
private PicketLinkIDMService service_;
private PicketLinkIDMOrganizationServiceImpl orgService;
+
+ private static Logger log = LoggerFactory.getLogger(MembershipTypeDAOImpl.class);
public MembershipTypeDAOImpl(PicketLinkIDMOrganizationServiceImpl orgService, PicketLinkIDMService service)
{
@@ -142,9 +147,9 @@
Map<String, String> props = new HashMap<String, String>();
props.put(MEMBERSHIP_DESCRIPTION, mt.getDescription());
- props.put(MEMBERSHIP_CREATE_DATE, mt.getCreatedDate() == null ? null : dateFormat.format(mt.getCreatedDate()));
+ props.put(MEMBERSHIP_CREATE_DATE, mt.getCreatedDate() == null ? null : "" + mt.getCreatedDate().getTime());
props
- .put(MEMBERSHIP_MODIFIED_DATE, mt.getModifiedDate() == null ? null : dateFormat.format(mt.getModifiedDate()));
+ .put(MEMBERSHIP_MODIFIED_DATE, mt.getModifiedDate() == null ? null : "" + mt.getModifiedDate().getTime());
props.put(MEMBERSHIP_OWNER, mt.getOwner());
getIdentitySession().getRoleManager().setProperties(rt, props);
@@ -167,12 +172,44 @@
if (cd != null)
{
- mt.setCreatedDate(dateFormat.parse(cd));
+ try
+ {
+ long date = Long.parseLong(cd);
+ mt.setCreatedDate(new Date(date));
+ }
+ catch (NumberFormatException e)
+ {
+ try
+ {
+ // For backward compatibility with GateIn 3.0 and EPP 5 Beta
+ mt.setCreatedDate(dateFormat.parse(cd));
+ }
+ catch (ParseException e2)
+ {
+ log.error("Cannot parse the membership type creation date for: " + mt.getName());
+ }
+ }
}
if (md != null)
{
- mt.setModifiedDate(dateFormat.parse(md));
+ try
+ {
+ long date = Long.parseLong(md);
+ mt.setModifiedDate(new Date(date));
+ }
+ catch (NumberFormatException e)
+ {
+ // For backward compatibility with GateIn 3.0 and EPP 5 Beta
+ try
+ {
+ mt.setModifiedDate(dateFormat.parse(md));
+ }
+ catch (ParseException e2)
+ {
+ log.error("Cannot parse the membership type modification date for: " + mt.getName());
+ }
+ }
}
return;
Modified: portal/branches/EPP_5_0_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserDAOImpl.java
===================================================================
--- portal/branches/EPP_5_0_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserDAOImpl.java 2010-05-06 15:56:13 UTC (rev 2999)
+++ portal/branches/EPP_5_0_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserDAOImpl.java 2010-05-06 15:59:04 UTC (rev 3000)
@@ -28,30 +28,32 @@
import org.exoplatform.services.organization.UserEventListener;
import org.exoplatform.services.organization.UserHandler;
import org.exoplatform.services.organization.impl.UserImpl;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
import org.picketlink.idm.api.Attribute;
import org.picketlink.idm.api.AttributesManager;
import org.picketlink.idm.api.IdentitySession;
import org.picketlink.idm.api.query.UserQueryBuilder;
import org.picketlink.idm.common.exception.IdentityException;
import org.picketlink.idm.impl.api.SimpleAttribute;
-import org.slf4j.LoggerFactory;
import java.text.DateFormat;
+import java.text.ParseException;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collections;
+import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.logging.Logger;
/*
* @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a>
*/
public class UserDAOImpl implements UserHandler
{
- private static org.slf4j.Logger log = LoggerFactory.getLogger(UserDAOImpl.class);
+ private static Logger log = LoggerFactory.getLogger(UserDAOImpl.class);
private final PicketLinkIDMService service_;
@@ -76,7 +78,7 @@
public static final DateFormat dateFormat = DateFormat.getInstance();
private PicketLinkIDMOrganizationServiceImpl orgService;
-
+
static
{
Set<String> keys = new HashSet<String>();
@@ -412,11 +414,11 @@
if (user.getCreatedDate() != null)
{
- attributes.add(new SimpleAttribute(USER_CREATED_DATE, dateFormat.format(user.getCreatedDate())));
+ attributes.add(new SimpleAttribute(USER_CREATED_DATE, "" + user.getCreatedDate().getTime()));
}
if (user.getLastLoginTime() != null)
{
- attributes.add(new SimpleAttribute(USER_LAST_LOGIN_TIME, dateFormat.format(user.getLastLoginTime())));
+ attributes.add(new SimpleAttribute(USER_LAST_LOGIN_TIME, "" + user.getLastLoginTime().getTime()));
}
if (user.getEmail() != null)
{
@@ -522,7 +524,23 @@
{
if (attrs.containsKey(USER_CREATED_DATE))
{
- user.setCreatedDate(dateFormat.parse(attrs.get(USER_CREATED_DATE).getValue().toString()));
+ try
+ {
+ long date = Long.parseLong(attrs.get(USER_CREATED_DATE).getValue().toString());
+ user.setCreatedDate(new Date(date));
+ }
+ catch (NumberFormatException e)
+ {
+ // For backward compatibility with GateIn 3.0 and EPP 5 Beta
+ try
+ {
+ user.setCreatedDate(dateFormat.parse(attrs.get(USER_CREATED_DATE).getValue().toString()));
+ }
+ catch (ParseException e2)
+ {
+ log.error("Cannot parse the creation date for: " + user.getUserName());
+ }
+ }
}
if (attrs.containsKey(USER_EMAIL))
{
@@ -534,7 +552,23 @@
}
if (attrs.containsKey(USER_LAST_LOGIN_TIME))
{
- user.setLastLoginTime(dateFormat.parse(attrs.get(USER_LAST_LOGIN_TIME).getValue().toString()));
+ try
+ {
+ long date = Long.parseLong(attrs.get(USER_LAST_LOGIN_TIME).getValue().toString());
+ user.setLastLoginTime(new Date(date));
+ }
+ catch (NumberFormatException e)
+ {
+ // For backward compatibility with GateIn 3.0 and EPP 5 Beta
+ try
+ {
+ user.setLastLoginTime(dateFormat.parse(attrs.get(USER_LAST_LOGIN_TIME).getValue().toString()));
+ }
+ catch (ParseException e2)
+ {
+ log.error("Cannot parse the last login date for: " + user.getUserName());
+ }
+ }
}
if (attrs.containsKey(USER_LAST_NAME))
{
14 years, 7 months
gatein SVN: r2999 - portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-05-06 11:56:13 -0400 (Thu, 06 May 2010)
New Revision: 2999
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/UserDAOImpl.java
Log:
GTNPORTAL-1166: OrganizationService failed to start when GateIn is executed with different value of LANG environment variable
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 2010-05-06 13:15:41 UTC (rev 2998)
+++ portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/MembershipTypeDAOImpl.java 2010-05-06 15:56:13 UTC (rev 2999)
@@ -22,10 +22,13 @@
import org.exoplatform.services.organization.MembershipType;
import org.exoplatform.services.organization.MembershipTypeHandler;
import org.exoplatform.services.organization.impl.MembershipTypeImpl;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
import org.picketlink.idm.api.IdentitySession;
import org.picketlink.idm.api.RoleType;
import java.text.DateFormat;
+import java.text.ParseException;
import java.util.Collection;
import java.util.Date;
import java.util.HashMap;
@@ -52,6 +55,8 @@
private PicketLinkIDMService service_;
private PicketLinkIDMOrganizationServiceImpl orgService;
+
+ private static Logger log = LoggerFactory.getLogger(MembershipTypeDAOImpl.class);
public MembershipTypeDAOImpl(PicketLinkIDMOrganizationServiceImpl orgService, PicketLinkIDMService service)
{
@@ -142,9 +147,9 @@
Map<String, String> props = new HashMap<String, String>();
props.put(MEMBERSHIP_DESCRIPTION, mt.getDescription());
- props.put(MEMBERSHIP_CREATE_DATE, mt.getCreatedDate() == null ? null : dateFormat.format(mt.getCreatedDate()));
+ props.put(MEMBERSHIP_CREATE_DATE, mt.getCreatedDate() == null ? null : "" + mt.getCreatedDate().getTime());
props
- .put(MEMBERSHIP_MODIFIED_DATE, mt.getModifiedDate() == null ? null : dateFormat.format(mt.getModifiedDate()));
+ .put(MEMBERSHIP_MODIFIED_DATE, mt.getModifiedDate() == null ? null : "" + mt.getModifiedDate().getTime());
props.put(MEMBERSHIP_OWNER, mt.getOwner());
getIdentitySession().getRoleManager().setProperties(rt, props);
@@ -167,12 +172,44 @@
if (cd != null)
{
- mt.setCreatedDate(dateFormat.parse(cd));
+ try
+ {
+ long date = Long.parseLong(cd);
+ mt.setCreatedDate(new Date(date));
+ }
+ catch (NumberFormatException e)
+ {
+ try
+ {
+ // For backward compatibility with GateIn 3.0 and EPP 5 Beta
+ mt.setCreatedDate(dateFormat.parse(cd));
+ }
+ catch (ParseException e2)
+ {
+ log.error("Cannot parse the membership type creation date for: " + mt.getName());
+ }
+ }
}
if (md != null)
{
- mt.setModifiedDate(dateFormat.parse(md));
+ try
+ {
+ long date = Long.parseLong(md);
+ mt.setModifiedDate(new Date(date));
+ }
+ catch (NumberFormatException e)
+ {
+ // For backward compatibility with GateIn 3.0 and EPP 5 Beta
+ try
+ {
+ mt.setModifiedDate(dateFormat.parse(md));
+ }
+ catch (ParseException e2)
+ {
+ log.error("Cannot parse the membership type modification date for: " + mt.getName());
+ }
+ }
}
return;
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 2010-05-06 13:15:41 UTC (rev 2998)
+++ portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserDAOImpl.java 2010-05-06 15:56:13 UTC (rev 2999)
@@ -28,30 +28,32 @@
import org.exoplatform.services.organization.UserEventListener;
import org.exoplatform.services.organization.UserHandler;
import org.exoplatform.services.organization.impl.UserImpl;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
import org.picketlink.idm.api.Attribute;
import org.picketlink.idm.api.AttributesManager;
import org.picketlink.idm.api.IdentitySession;
import org.picketlink.idm.api.query.UserQueryBuilder;
import org.picketlink.idm.common.exception.IdentityException;
import org.picketlink.idm.impl.api.SimpleAttribute;
-import org.slf4j.LoggerFactory;
import java.text.DateFormat;
+import java.text.ParseException;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collections;
+import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.logging.Logger;
/*
* @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a>
*/
public class UserDAOImpl implements UserHandler
{
- private static org.slf4j.Logger log = LoggerFactory.getLogger(UserDAOImpl.class);
+ private static Logger log = LoggerFactory.getLogger(UserDAOImpl.class);
private final PicketLinkIDMService service_;
@@ -76,7 +78,7 @@
public static final DateFormat dateFormat = DateFormat.getInstance();
private PicketLinkIDMOrganizationServiceImpl orgService;
-
+
static
{
Set<String> keys = new HashSet<String>();
@@ -412,11 +414,11 @@
if (user.getCreatedDate() != null)
{
- attributes.add(new SimpleAttribute(USER_CREATED_DATE, dateFormat.format(user.getCreatedDate())));
+ attributes.add(new SimpleAttribute(USER_CREATED_DATE, "" + user.getCreatedDate().getTime()));
}
if (user.getLastLoginTime() != null)
{
- attributes.add(new SimpleAttribute(USER_LAST_LOGIN_TIME, dateFormat.format(user.getLastLoginTime())));
+ attributes.add(new SimpleAttribute(USER_LAST_LOGIN_TIME, "" + user.getLastLoginTime().getTime()));
}
if (user.getEmail() != null)
{
@@ -522,7 +524,23 @@
{
if (attrs.containsKey(USER_CREATED_DATE))
{
- user.setCreatedDate(dateFormat.parse(attrs.get(USER_CREATED_DATE).getValue().toString()));
+ try
+ {
+ long date = Long.parseLong(attrs.get(USER_CREATED_DATE).getValue().toString());
+ user.setCreatedDate(new Date(date));
+ }
+ catch (NumberFormatException e)
+ {
+ // For backward compatibility with GateIn 3.0 and EPP 5 Beta
+ try
+ {
+ user.setCreatedDate(dateFormat.parse(attrs.get(USER_CREATED_DATE).getValue().toString()));
+ }
+ catch (ParseException e2)
+ {
+ log.error("Cannot parse the creation date for: " + user.getUserName());
+ }
+ }
}
if (attrs.containsKey(USER_EMAIL))
{
@@ -534,7 +552,23 @@
}
if (attrs.containsKey(USER_LAST_LOGIN_TIME))
{
- user.setLastLoginTime(dateFormat.parse(attrs.get(USER_LAST_LOGIN_TIME).getValue().toString()));
+ try
+ {
+ long date = Long.parseLong(attrs.get(USER_LAST_LOGIN_TIME).getValue().toString());
+ user.setLastLoginTime(new Date(date));
+ }
+ catch (NumberFormatException e)
+ {
+ // For backward compatibility with GateIn 3.0 and EPP 5 Beta
+ try
+ {
+ user.setLastLoginTime(dateFormat.parse(attrs.get(USER_LAST_LOGIN_TIME).getValue().toString()));
+ }
+ catch (ParseException e2)
+ {
+ log.error("Cannot parse the last login date for: " + user.getUserName());
+ }
+ }
}
if (attrs.containsKey(USER_LAST_NAME))
{
14 years, 7 months
gatein SVN: r2998 - in portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules: Advanced/JCR and 2 other directories.
by do-not-reply＠jboss.org
Author: smumford
Date: 2010-05-06 09:15:41 -0400 (Thu, 06 May 2010)
New Revision: 2998
Modified:
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/configuration.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/external-value-storages.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/query-handler-config.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/AuthenticationAndIdentity/BackendConfiguration.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/AuthenticationAndIdentity/SSO.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/InternationalizationConfiguration.xml
Log:
JBEPP-276: Resolved DOC TODOs with EPP team
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/configuration.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/configuration.xml 2010-05-06 12:34:13 UTC (rev 2997)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/configuration.xml 2010-05-06 13:15:41 UTC (rev 2998)
@@ -32,10 +32,10 @@
Like other eXo services eXo JCR can be configured and used in portal or embedded mode (as a service embedded in eXo Portal) and in standalone mode.
</para>
<para>
- In Embedded mode, JCR services are registered in the Portal container and the second option is to use a Standalone container. The main difference between these container types is that the first one is intended to be used in a Portal (Web) environment, while the second one can be used standalone (TODO see the comprehensive page Service Configuration for Beginners for more details).
+ In Embedded mode, JCR services are registered in the Portal container and the second option is to use a Standalone container. The main difference between these container types is that the first one is intended to be used in a Portal (Web) environment, while the second one can be used standalone <!--(TODO see the comprehensive page Service Configuration for Beginners for more details) -->.
</para>
<para>
- The following setup procedure is used to obtain a Standalone configuration (TODO find more in Container configuration):
+ The following setup procedure is used to obtain a Standalone configuration <!--(TODO find more in Container configuration)-->:
</para>
<itemizedlist>
<listitem>
@@ -530,9 +530,9 @@
</listitem>
</varlistentry>
</variablelist>
- <para>
+<!-- <para>
LinkedWorkspaceStorageCacheImpl supports additional optional parameters TODO
- </para>
+ </para> -->
</listitem>
</varlistentry>
</variablelist>
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/external-value-storages.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/external-value-storages.xml 2010-05-06 12:34:13 UTC (rev 2997)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/external-value-storages.xml 2010-05-06 13:15:41 UTC (rev 2998)
@@ -8,7 +8,7 @@
<section id="sect-Reference_Guide-External_Value_Storages-Introduction">
<title>Introduction</title>
<para>
- By default JCR Values are stored in the Workspace Data container along with the JCR structure (i.e. Nodes and Properties). eXo JCR offers an additional option of storing JCR Values separately from Workspace Data container, which can be extremely helpful to keep Binary Large Objects (BLOBs) for example (see [TODOBinary values processing link]).
+ By default JCR Values are stored in the Workspace Data container along with the JCR structure (i.e. Nodes and Properties). eXo JCR offers an additional option of storing JCR Values separately from Workspace Data container, which can be extremely helpful to keep Binary Large Objects (BLOBs) for example.
</para>
<para>
Value storage configuration is a part of Repository configuration, find more details in <xref linkend="sect-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration"/>.
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml 2010-05-06 12:34:13 UTC (rev 2997)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml 2010-05-06 13:15:41 UTC (rev 2998)
@@ -74,7 +74,7 @@
Each database software supports ANSI SQL standards but has its own specifics too. So, each database has its own configuration in eXo JCR as a database dialect parameter. If you need a more detailed configuration of the database it's possible to do that by editing the metadata SQL-script files.
</para>
<para>
- In case the non-ANSI node name is used it's necessary to use a database with MultiLanguage support[TODO link to MultiLanguage]. Some JDBC drivers need additional parameters for establishing a Unicode friendly connection. E.g. under mysql it's necessary to add an additional parameter for the JDBC driver at the end of JDBC URL. For instance: <code>jdbc:mysql://exoua.dnsalias.net/portal?characterEncoding=utf8</code>
+ In case the non-ANSI node name is used it's necessary to use a database with MultiLanguage support <!--[TODO link to MultiLanguage] -->. Some JDBC drivers need additional parameters for establishing a Unicode friendly connection. E.g. under mysql it's necessary to add an additional parameter for the JDBC driver at the end of JDBC URL. For instance: <code>jdbc:mysql://exoua.dnsalias.net/portal?characterEncoding=utf8</code>
</para>
<para>
There are preconfigured configuration files for HSQLDB. Look for these files in /conf/portal and /conf/standalone folders of the jar-file <package>exo.jcr.component.core-XXX.XXX.jar</package> or source-distribution of eXo JCR implementation.
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/query-handler-config.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/query-handler-config.xml 2010-05-06 12:34:13 UTC (rev 2997)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/Advanced/JCR/query-handler-config.xml 2010-05-06 13:15:41 UTC (rev 2998)
@@ -135,7 +135,7 @@
jgroups-configuration
</entry>
<entry>
- jgroups-configuration is template configuration for all components (search, cache, locks) [Add link to document describing template configurations]
+ jgroups-configuration is template configuration for all components (search, cache, locks) <!--[TODO 5.1 Add link to document describing template configurations] -->
</entry>
</row>
<row>
@@ -143,7 +143,7 @@
jgroups-multiplexer-stack
</entry>
<entry>
- [TODO about jgroups-multiplexer-stack - add link to JBoss doc]
+ If "jgroups-multiplexer-stack" is true and "jgroups-configuration" parameters are set then Multiplexing stack is enabled in JBossCache.
</entry>
</row>
<row>
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/AuthenticationAndIdentity/BackendConfiguration.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/AuthenticationAndIdentity/BackendConfiguration.xml 2010-05-06 12:34:13 UTC (rev 2997)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/AuthenticationAndIdentity/BackendConfiguration.xml 2010-05-06 13:15:41 UTC (rev 2998)
@@ -19,9 +19,9 @@
<para>
The identity model represented in '<emphasis role="bold">org.exoplatform.services.organization</emphasis>' interfaces and the one used in <emphasis role="bold">PicketLink IDM</emphasis> have some major differences.
</para>
- <para>
+<!-- <para>
TODO: tell more about org.exoplatform.services.organization
- </para>
+ </para> -->
<para>
For example: <emphasis role="bold">PicketLink IDM</emphasis> provides greater abstraction. It is possible for groups in <emphasis role="bold">IDM</emphasis> framework to form memberships with many parents (which requires recursive ID translation), while GateIn model allows only pure tree-like membership structures.
</para>
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/AuthenticationAndIdentity/SSO.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/AuthenticationAndIdentity/SSO.xml 2010-05-06 12:34:13 UTC (rev 2997)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/AuthenticationAndIdentity/SSO.xml 2010-05-06 13:15:41 UTC (rev 2998)
@@ -780,9 +780,9 @@
</step>
</procedure>
- <para>
+<!-- <para>
TODO: The above OpenSSO manual configuration could be replaced by configuration files prepared in advance
- </para>
+ </para> -->
</section>
</section>
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/InternationalizationConfiguration.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/InternationalizationConfiguration.xml 2010-05-06 12:34:13 UTC (rev 2997)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment/InternationalizationConfiguration.xml 2010-05-06 13:15:41 UTC (rev 2998)
@@ -163,7 +163,6 @@
<programlistingco>
<areaspec>
<area coords="6" id="area-Reference_Guide-i18n.rb.service.classpath_resources" />
- <area coords="11" id="area-Reference_Guide-i18n.rb.service.init_resources" />
<area coords="24" id="area-Reference_Guide-i18n.rb.service.portal_resource_names" />
</areaspec>
@@ -207,11 +206,6 @@
<emphasis>classpath.resources</emphasis> are discussed in a later section.
</para>
</callout>
- <callout arearefs="area-Reference_Guide-i18n.rb.service.init_resources">
- <para>
- <emphasis>init.resources</emphasis> TODO
- </para>
- </callout>
<callout arearefs="area-Reference_Guide-i18n.rb.service.portal_resource_names">
<para>
<emphasis>portal.resource.names</emphasis> Defines all resources that belong to the <emphasis>Portal Resource Bundle</emphasis>.
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment.xml 2010-05-06 12:34:13 UTC (rev 2997)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/modules/PortalDevelopment.xml 2010-05-06 13:15:41 UTC (rev 2998)
@@ -14,6 +14,6 @@
<xi:include href="PortalDevelopment/RTLFramework.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="PortalDevelopment/XMLResourceBundles.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="PortalDevelopment/JavascriptInterApplicationCommunication.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="PortalDevelopment/JavascriptConfiguration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+<!-- <xi:include href="PortalDevelopment/JavascriptConfiguration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
</part>
14 years, 7 months