inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD (5.2) to 5.2.N (5.2.1)

Browse Source 
127562 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      125748 jkaabimofrad: RA-933, RA-934, RA-972: Modified the logout and validate ticket API to support only "-me-" (dummy parameter) in the URL path rather than ticket id. Also, renamed the JSON attributes.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127656 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-06-03 14:08:59 +00:00
parent b9f4a68302
commit ad267ea682
6 changed files with 129 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
source/java/org/alfresco/rest/api/model/LoginTicket.java
View File

@@ -24,18 +24,18 @@ package org.alfresco.rest.api.model;
*/
public class LoginTicket
{
protected String username;
protected String userId;
protected String password;
protected String ticket;
protected String id;
public String getUsername()
public String getUserId()
{
return username;
return userId;
}
public void setUsername(String username)
public void setUserId(String userId)
{
this.username = username;
this.userId = userId;
}
public String getPassword()
@@ -48,23 +48,23 @@ public class LoginTicket
this.password = password;
}
public String getTicket()
public String getId()
{
return ticket;
return id;
}
public void setTicket(String ticket)
public void setId(String id)
{
this.ticket = ticket;
this.id = id;
}
@Override
public String toString()
{
final StringBuilder sb = new StringBuilder(150);
sb.append("LoginTicket [username=").append(username)
sb.append("LoginTicket [userId=").append(userId)
.append(", password=").append(password)
.append(", ticket=").append(ticket)
.append(", id=").append(id)
.append(']');
return sb.toString();
}

4
source/java/org/alfresco/rest/api/model/LoginTicketResponse.java
View File

@@ -46,9 +46,9 @@ public class LoginTicketResponse extends LoginTicket
public String toString()
{
final StringBuilder sb = new StringBuilder(150);
sb.append("LoginTicketResponse [username=").append(username)
sb.append("LoginTicketResponse [userId=").append(userId)
.append(", password=").append(password)
.append(", ticket=").append(ticket)
.append(", id=").append(id)
.append(']');
return sb.toString();
}