From 9c23ced4aa0ec409812154f02ec630fd146de66e Mon Sep 17 00:00:00 2001 From: Kevin Roast Date: Wed, 20 Jan 2010 10:51:08 +0000 Subject: [PATCH] Merged V3.2E to HEAD 17635: Complete fix for ETHREEOH-2879 - user with missing first/last name able to use Discussions, Blogs, Links etc. in Share. 17637: Fix regression from r17601: Favourite sites in header menu. 17638: Fix ETHREEOH-3610 - upgrade Enterprise 2.x -> 3.2 (personUsagePatch) 17641: ETHREEOH-3612 Security Issue : DeploymentTarget uses String to represent passwords 17642: Fix for ETHREEOH-3482 - Impossible to delete content from its details page. - regression due to the "AbortProcessingException" changes added a while back. 17660: Minor functional fixes for mobile app and cleanup 17663: Fixed ETHREEOH-3664 "'My Tasks' dashlet could not load task list if a user was invited to a private site" - When webscript accessed a private site undefined was returned so the title and description couldn't be displayed, now the values are store on the invite task instead. 17665: Fix up compile errors from r17663 - also clean up old code to coding standards in related invite classes. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18162 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../invitation-nominated-workflow-model.xml | 6 + ...verAuthenticatorAuthenticationService.java | 4 +- .../DeploymentReceiverServiceClient.java | 4 +- .../repo/deploy/DeploymentServiceImpl.java | 2 +- .../repo/invitation/InvitationImpl.java | 100 +++---- .../invitation/InvitationServiceImpl.java | 70 ++--- .../invitation/NominatedInvitationImpl.java | 265 ++++++++++-------- .../WorkflowModelNominatedInvitation.java | 4 + .../HibernateNodeDaoServiceImpl.java | 22 +- .../cmr/invitation/NominatedInvitation.java | 5 +- 10 files changed, 252 insertions(+), 230 deletions(-) diff --git a/config/alfresco/workflow/invitation-nominated-workflow-model.xml b/config/alfresco/workflow/invitation-nominated-workflow-model.xml index 99e1b7a75c..d83a7518c9 100644 --- a/config/alfresco/workflow/invitation-nominated-workflow-model.xml +++ b/config/alfresco/workflow/invitation-nominated-workflow-model.xml @@ -74,6 +74,12 @@ d:text + + d:text + + + d:text + d:text diff --git a/source/java/org/alfresco/repo/deploy/DeploymentReceiverAuthenticatorAuthenticationService.java b/source/java/org/alfresco/repo/deploy/DeploymentReceiverAuthenticatorAuthenticationService.java index 665da10f4c..dc43ead670 100644 --- a/source/java/org/alfresco/repo/deploy/DeploymentReceiverAuthenticatorAuthenticationService.java +++ b/source/java/org/alfresco/repo/deploy/DeploymentReceiverAuthenticatorAuthenticationService.java @@ -24,11 +24,11 @@ public class DeploymentReceiverAuthenticatorAuthenticationService implements Dep * @param password * @return true, yes - go ahead. */ - public boolean logon(String user, String password) + public boolean logon(String user, char[] password) { try { - authenticationService.authenticate(user, password.toCharArray()); + authenticationService.authenticate(user, password); return true; } catch (AuthenticationException e) diff --git a/source/java/org/alfresco/repo/deploy/DeploymentReceiverServiceClient.java b/source/java/org/alfresco/repo/deploy/DeploymentReceiverServiceClient.java index 45e2cca9fd..020068236a 100644 --- a/source/java/org/alfresco/repo/deploy/DeploymentReceiverServiceClient.java +++ b/source/java/org/alfresco/repo/deploy/DeploymentReceiverServiceClient.java @@ -72,7 +72,7 @@ public class DeploymentReceiverServiceClient implements /* (non-Javadoc) * @see org.alfresco.deployment.DeploymentReceiverService#begin(java.lang.String, java.lang.String, java.lang.String) */ - public DeploymentToken begin(String target, String storeName, int version, String user, String password) + public DeploymentToken begin(String target, String storeName, int version, String user, char[] password) { return fTransport.begin(target, storeName, version, user, password); } @@ -138,7 +138,7 @@ public class DeploymentReceiverServiceClient implements /* (non-Javadoc) * @see org.alfresco.deployment.DeploymentReceiverService#shutDown(java.lang.String, java.lang.String) */ - public void shutDown(String user, String password) + public void shutDown(String user, char[] password) { fTransport.shutDown(user, password); } diff --git a/source/java/org/alfresco/repo/deploy/DeploymentServiceImpl.java b/source/java/org/alfresco/repo/deploy/DeploymentServiceImpl.java index dde432e977..58a94ae3a5 100644 --- a/source/java/org/alfresco/repo/deploy/DeploymentServiceImpl.java +++ b/source/java/org/alfresco/repo/deploy/DeploymentServiceImpl.java @@ -1082,7 +1082,7 @@ public class DeploymentServiceImpl implements DeploymentService try { - DeploymentToken token = service.begin(target, storeName, version, userName, password); + DeploymentToken token = service.begin(target, storeName, version, userName, password.toCharArray()); ticket = token.getTicket(); deployDirectoryPushFSR(service, ticket, version, srcPath, "/", matcher, eventQueue, sendQueue, errors, lock); } diff --git a/source/java/org/alfresco/repo/invitation/InvitationImpl.java b/source/java/org/alfresco/repo/invitation/InvitationImpl.java index c4e8e26d12..e40ea614e4 100644 --- a/source/java/org/alfresco/repo/invitation/InvitationImpl.java +++ b/source/java/org/alfresco/repo/invitation/InvitationImpl.java @@ -5,61 +5,61 @@ import org.alfresco.service.cmr.invitation.Invitation.ResourceType; /* package scope */ abstract class InvitationImpl { - - + /** + * Unique reference for this invitation + */ + private String inviteId; - /** - * Unique reference for this invitation - */ - private String inviteId; - - /** - * Which resource is this invitation for ? - */ - private String resourceName; - - /** - * What sort of invitation is this invitation for e.g. WEB_SITE or WEB_PROJECT - */ - private Invitation.ResourceType resourceType; + /** + * Which resource is this invitation for ? + */ + private String resourceName; + + /** + * What sort of invitation is this invitation for e.g. WEB_SITE or WEB_PROJECT + */ + private Invitation.ResourceType resourceType; - /** - * Create a new InvitationImpl - */ - public InvitationImpl() - { - super(); - } - - /** - * What sort of resource is it - * @return the resource type - */ - public ResourceType getResourceType() - { - return resourceType; - } - - public void setResourceType(ResourceType resourceType) - { - this.resourceType = resourceType; - } + /** + * Create a new InvitationImpl + */ + public InvitationImpl() + { + super(); + } + + /** + * What sort of resource is it + * @return the resource type + */ + public ResourceType getResourceType() + { + return resourceType; + } + + public void setResourceType(ResourceType resourceType) + { + this.resourceType = resourceType; + } - public void setInviteId(String inviteId) { - this.inviteId = inviteId; - } + public void setInviteId(String inviteId) + { + this.inviteId = inviteId; + } - public String getInviteId() { - return inviteId; - } + public String getInviteId() + { + return inviteId; + } - public void setResourceName(String resourceName) { - this.resourceName = resourceName; - } + public void setResourceName(String resourceName) + { + this.resourceName = resourceName; + } - public String getResourceName() { - return resourceName; - } - + public String getResourceName() + { + return resourceName; + } } diff --git a/source/java/org/alfresco/repo/invitation/InvitationServiceImpl.java b/source/java/org/alfresco/repo/invitation/InvitationServiceImpl.java index e8e85785eb..508c1f475e 100644 --- a/source/java/org/alfresco/repo/invitation/InvitationServiceImpl.java +++ b/source/java/org/alfresco/repo/invitation/InvitationServiceImpl.java @@ -59,6 +59,7 @@ import org.alfresco.service.cmr.security.MutableAuthenticationService; import org.alfresco.service.cmr.security.PermissionService; import org.alfresco.service.cmr.security.PersonService; import org.alfresco.service.cmr.site.SiteService; +import org.alfresco.service.cmr.site.SiteInfo; import org.alfresco.service.cmr.workflow.WorkflowDefinition; import org.alfresco.service.cmr.workflow.WorkflowException; import org.alfresco.service.cmr.workflow.WorkflowInstance; @@ -1320,46 +1321,35 @@ public class InvitationServiceImpl implements InvitationService, NodeServicePoli // Get invitee person NodeRef to add as assignee NodeRef inviteeNodeRef = this.personService.getPerson(inviteeUserName); - // create workflow properties - Map workflowProps = new HashMap( - 16); - workflowProps.put( - WorkflowModelNominatedInvitation.WF_PROP_INVITER_USER_NAME, - inviterUserName); - workflowProps.put( - WorkflowModelNominatedInvitation.WF_PROP_INVITEE_USER_NAME, - inviteeUserName); - workflowProps.put( - WorkflowModelNominatedInvitation.WF_PROP_INVITEE_EMAIL, - inviteeEmail); - workflowProps.put(WorkflowModel.ASSOC_ASSIGNEE, inviteeNodeRef); - workflowProps.put( - WorkflowModelNominatedInvitation.WF_PROP_INVITEE_FIRSTNAME, - inviteeFirstName); - workflowProps.put( - WorkflowModelNominatedInvitation.WF_PROP_INVITEE_LASTNAME, - inviteeLastName); - workflowProps.put( - WorkflowModelNominatedInvitation.WF_PROP_INVITEE_GEN_PASSWORD, - inviteePassword); - workflowProps.put( - WorkflowModelNominatedInvitation.WF_PROP_RESOURCE_NAME, - siteShortName); - workflowProps.put( - WorkflowModelNominatedInvitation.WF_PROP_RESOURCE_TYPE, - resourceType.toString()); - workflowProps.put( - WorkflowModelNominatedInvitation.WF_PROP_INVITEE_ROLE, - inviteeSiteRole); - workflowProps.put(WorkflowModelNominatedInvitation.WF_PROP_SERVER_PATH, - serverPath); - workflowProps.put(WorkflowModelNominatedInvitation.WF_PROP_ACCEPT_URL, - acceptUrl); - workflowProps.put(WorkflowModelNominatedInvitation.WF_PROP_REJECT_URL, - rejectUrl); - workflowProps.put( - WorkflowModelNominatedInvitation.WF_PROP_INVITE_TICKET, - inviteTicket); + SiteInfo siteInfo = this.siteService.getSite(siteShortName); + String siteDescription = siteInfo.getDescription(); + if (siteDescription == null) + { + siteDescription = ""; + } + else if (siteDescription.length() > 255) + { + siteDescription = siteDescription.substring(0, 255); + } + + // create workflow properties + Map workflowProps = new HashMap(16); + workflowProps.put(WorkflowModelNominatedInvitation.WF_PROP_INVITER_USER_NAME, inviterUserName); + workflowProps.put(WorkflowModelNominatedInvitation.WF_PROP_INVITEE_USER_NAME, inviteeUserName); + workflowProps.put(WorkflowModelNominatedInvitation.WF_PROP_INVITEE_EMAIL, inviteeEmail); + workflowProps.put(WorkflowModel.ASSOC_ASSIGNEE, inviteeNodeRef); + workflowProps.put(WorkflowModelNominatedInvitation.WF_PROP_INVITEE_FIRSTNAME, inviteeFirstName); + workflowProps.put(WorkflowModelNominatedInvitation.WF_PROP_INVITEE_LASTNAME, inviteeLastName); + workflowProps.put(WorkflowModelNominatedInvitation.WF_PROP_INVITEE_GEN_PASSWORD, inviteePassword); + workflowProps.put(WorkflowModelNominatedInvitation.WF_PROP_RESOURCE_NAME, siteShortName); + workflowProps.put(WorkflowModelNominatedInvitation.WF_PROP_RESOURCE_TITLE, siteInfo.getTitle()); + workflowProps.put(WorkflowModelNominatedInvitation.WF_PROP_RESOURCE_DESCRIPTION, siteDescription); + workflowProps.put(WorkflowModelNominatedInvitation.WF_PROP_RESOURCE_TYPE, resourceType.toString()); + workflowProps.put(WorkflowModelNominatedInvitation.WF_PROP_INVITEE_ROLE, inviteeSiteRole); + workflowProps.put(WorkflowModelNominatedInvitation.WF_PROP_SERVER_PATH, serverPath); + workflowProps.put(WorkflowModelNominatedInvitation.WF_PROP_ACCEPT_URL, acceptUrl); + workflowProps.put(WorkflowModelNominatedInvitation.WF_PROP_REJECT_URL, rejectUrl); + workflowProps.put(WorkflowModelNominatedInvitation.WF_PROP_INVITE_TICKET, inviteTicket); // start the workflow WorkflowPath wfPath = this.workflowService.startWorkflow(wfDefinition diff --git a/source/java/org/alfresco/repo/invitation/NominatedInvitationImpl.java b/source/java/org/alfresco/repo/invitation/NominatedInvitationImpl.java index 59b8994e24..eef65860da 100644 --- a/source/java/org/alfresco/repo/invitation/NominatedInvitationImpl.java +++ b/source/java/org/alfresco/repo/invitation/NominatedInvitationImpl.java @@ -41,149 +41,180 @@ import java.util.Map; * * @see org.alfresco.service.cmr.invitation.NominatedInvitation */ - /*package scope */ class NominatedInvitationImpl extends InvitationImpl implements NominatedInvitation, Serializable { - - private static final long serialVersionUID = -8800842866845149466L; - private String inviteeFirstName; - private String inviteeLastName; + private static final long serialVersionUID = -8800842866845149466L; + private String inviteeFirstName; + private String inviteeLastName; private String inviteeEmail; private String inviterUserName; + private String resourceDescription; + private String resourceTitle; private String roleName; private String serverPath; private String acceptUrl; private String rejectUrl; - private Date sentInviteDate; - private String ticket; - - /** - * Who is this invitation for - */ + private Date sentInviteDate; + private String ticket; + + /** + * Who is this invitation for + */ private String inviteeUserName; - - /** - * create a new nominated invitation - */ - public NominatedInvitationImpl() - { - super(); - } - - public NominatedInvitationImpl(Map workflowProps) - { - super(); - setInviteeUserName((String)workflowProps.get(WorkflowModelNominatedInvitation.WF_PROP_INVITEE_USER_NAME)); - inviteeFirstName = (String)workflowProps.get(WorkflowModelNominatedInvitation.WF_PROP_INVITEE_FIRSTNAME); - inviteeLastName = (String)workflowProps.get(WorkflowModelNominatedInvitation.WF_PROP_INVITEE_LASTNAME); - inviteeEmail = (String)workflowProps.get(WorkflowModelNominatedInvitation.WF_PROP_INVITEE_EMAIL); - inviterUserName = (String)workflowProps.get(WorkflowModelNominatedInvitation.WF_PROP_INVITER_USER_NAME); -// inviteePassword = (String)workflowProps.get(WorkflowModelNominatedInvitation.WF_PROP_INVITEE_GEN_PASSWORD); - setResourceName( (String)workflowProps.get(WorkflowModelNominatedInvitation.WF_PROP_RESOURCE_NAME)); - - if(workflowProps.containsKey(WorkflowModelNominatedInvitation.WF_PROP_RESOURCE_TYPE)) - { - setResourceType(ResourceType.valueOf((String)workflowProps.get(WorkflowModelNominatedInvitation.WF_PROP_RESOURCE_TYPE))); - } - roleName = (String)workflowProps.get(WorkflowModelNominatedInvitation.WF_PROP_INVITEE_ROLE); - serverPath = (String)workflowProps.get(WorkflowModelNominatedInvitation.WF_PROP_SERVER_PATH); - acceptUrl = (String)workflowProps.get(WorkflowModelNominatedInvitation.WF_PROP_ACCEPT_URL); - rejectUrl = (String)workflowProps.get(WorkflowModelNominatedInvitation.WF_PROP_REJECT_URL); - ticket = (String)workflowProps.get(WorkflowModelNominatedInvitation.WF_PROP_INVITE_TICKET); - - - } - - public void setInviteeFirstName(String inviteeFirstName) { - this.inviteeFirstName = inviteeFirstName; - } - public String getInviteeFirstName() { - return inviteeFirstName; - } + + /** + * create a new nominated invitation + */ + public NominatedInvitationImpl() + { + super(); + } + + public NominatedInvitationImpl(Map workflowProps) + { + super(); + setInviteeUserName((String)workflowProps.get(WorkflowModelNominatedInvitation.WF_PROP_INVITEE_USER_NAME)); + inviteeFirstName = (String)workflowProps.get(WorkflowModelNominatedInvitation.WF_PROP_INVITEE_FIRSTNAME); + inviteeLastName = (String)workflowProps.get(WorkflowModelNominatedInvitation.WF_PROP_INVITEE_LASTNAME); + inviteeEmail = (String)workflowProps.get(WorkflowModelNominatedInvitation.WF_PROP_INVITEE_EMAIL); + inviterUserName = (String)workflowProps.get(WorkflowModelNominatedInvitation.WF_PROP_INVITER_USER_NAME); + resourceTitle = (String)workflowProps.get(WorkflowModelNominatedInvitation.WF_PROP_RESOURCE_TITLE); + resourceDescription = (String)workflowProps.get(WorkflowModelNominatedInvitation.WF_PROP_RESOURCE_DESCRIPTION); + setResourceName( (String)workflowProps.get(WorkflowModelNominatedInvitation.WF_PROP_RESOURCE_NAME)); + + if (workflowProps.containsKey(WorkflowModelNominatedInvitation.WF_PROP_RESOURCE_TYPE)) + { + setResourceType(ResourceType.valueOf((String)workflowProps.get(WorkflowModelNominatedInvitation.WF_PROP_RESOURCE_TYPE))); + } + roleName = (String)workflowProps.get(WorkflowModelNominatedInvitation.WF_PROP_INVITEE_ROLE); + serverPath = (String)workflowProps.get(WorkflowModelNominatedInvitation.WF_PROP_SERVER_PATH); + acceptUrl = (String)workflowProps.get(WorkflowModelNominatedInvitation.WF_PROP_ACCEPT_URL); + rejectUrl = (String)workflowProps.get(WorkflowModelNominatedInvitation.WF_PROP_REJECT_URL); + ticket = (String)workflowProps.get(WorkflowModelNominatedInvitation.WF_PROP_INVITE_TICKET); + } + + public void setInviteeFirstName(String inviteeFirstName) + { + this.inviteeFirstName = inviteeFirstName; + } + + public String getInviteeFirstName() + { + return inviteeFirstName; + } - public void setInviteeLastName(String inviteeLastName) { - this.inviteeLastName = inviteeLastName; - } + public void setInviteeLastName(String inviteeLastName) + { + this.inviteeLastName = inviteeLastName; + } - public String getInviteeLastName() { - return inviteeLastName; - } + public String getInviteeLastName() + { + return inviteeLastName; + } - public void setInviteeEmail(String inviteeEmail) { - this.inviteeEmail = inviteeEmail; - } + public void setInviteeEmail(String inviteeEmail) + { + this.inviteeEmail = inviteeEmail; + } - public String getInviteeEmail() { - return inviteeEmail; - } + public String getInviteeEmail() + { + return inviteeEmail; + } + + public String getResourceDescription() + { + return resourceDescription; + } - public void setServerPath(String serverPath) { - this.serverPath = serverPath; - } + public String getResourceTitle() + { + return resourceTitle; + } - public String getServerPath() { - return serverPath; - } + public void setServerPath(String serverPath) + { + this.serverPath = serverPath; + } - public void setAcceptUrl(String acceptUrl) { - this.acceptUrl = acceptUrl; - } + public String getServerPath() + { + return serverPath; + } - public String getAcceptUrl() { - return acceptUrl; - } + public void setAcceptUrl(String acceptUrl) + { + this.acceptUrl = acceptUrl; + } - public void setRejectUrl(String rejectUrl) { - this.rejectUrl = rejectUrl; - } + public String getAcceptUrl() + { + return acceptUrl; + } - public String getRejectUrl() { - return rejectUrl; - } + public void setRejectUrl(String rejectUrl) + { + this.rejectUrl = rejectUrl; + } - public void setSentInviteDate(Date sentInviteDate) { - this.sentInviteDate = sentInviteDate; - } + public String getRejectUrl() + { + return rejectUrl; + } - public Date getSentInviteDate() { - return sentInviteDate; - } + public void setSentInviteDate(Date sentInviteDate) + { + this.sentInviteDate = sentInviteDate; + } - public void setTicket(String ticket) { - this.ticket = ticket; - } + public Date getSentInviteDate() + { + return sentInviteDate; + } - public String getTicket() { - return ticket; - } - - public void setRoleName(String roleName) { - this.roleName = roleName; - } + public void setTicket(String ticket) + { + this.ticket = ticket; + } - public String getRoleName() { - return roleName; - } + public String getTicket() + { + return ticket; + } + + public void setRoleName(String roleName) + { + this.roleName = roleName; + } - public InvitationType getInvitationType() { - return InvitationType.NOMINATED; + public String getRoleName() + { + return roleName; + } - } - - public void setInviteeUserName(String inviteeUserName) { - this.inviteeUserName = inviteeUserName; - } + public InvitationType getInvitationType() + { + return InvitationType.NOMINATED; + } + + public void setInviteeUserName(String inviteeUserName) + { + this.inviteeUserName = inviteeUserName; + } - public String getInviteeUserName() { - return inviteeUserName; - } + public String getInviteeUserName() + { + return inviteeUserName; + } - public String getInviterUserName() { - return inviterUserName; - } - - public void setInviterUserName(String inviterUserName) { - this.inviterUserName= inviterUserName; - } - + public String getInviterUserName() + { + return inviterUserName; + } + + public void setInviterUserName(String inviterUserName) + { + this.inviterUserName= inviterUserName; + } } diff --git a/source/java/org/alfresco/repo/invitation/WorkflowModelNominatedInvitation.java b/source/java/org/alfresco/repo/invitation/WorkflowModelNominatedInvitation.java index 9d6f4aac43..900137f86d 100644 --- a/source/java/org/alfresco/repo/invitation/WorkflowModelNominatedInvitation.java +++ b/source/java/org/alfresco/repo/invitation/WorkflowModelNominatedInvitation.java @@ -67,6 +67,8 @@ public interface WorkflowModelNominatedInvitation public static final QName WF_PROP_INVITEE_LASTNAME = QName.createQName(NAMESPACE_URI, "inviteeLastName"); public static final QName WF_PROP_RESOURCE_TYPE = QName.createQName(NAMESPACE_URI, "resourceType"); public static final QName WF_PROP_RESOURCE_NAME = QName.createQName(NAMESPACE_URI, "resourceName"); + public static final QName WF_PROP_RESOURCE_TITLE = QName.createQName(NAMESPACE_URI, "resourceTitle"); + public static final QName WF_PROP_RESOURCE_DESCRIPTION = QName.createQName(NAMESPACE_URI, "resourceDescription"); public static final QName WF_PROP_INVITEE_ROLE = QName.createQName(NAMESPACE_URI, "inviteeRole"); public static final QName WF_PROP_INVITEE_GEN_PASSWORD = QName.createQName(NAMESPACE_URI, "inviteeGenPassword"); @@ -74,6 +76,8 @@ public interface WorkflowModelNominatedInvitation public static final String wfVarInviteeUserName = "inwf_inviteeUserName"; public static final String wfVarInviterUserName = "inwf_inviterUserName"; public static final String wfVarResourceName = "inwf_resourceName"; + public static final String wfVarResourceTitle = "inwf_resourceTitle"; + public static final String wfVarResourceDescription = "inwf_resourceDescription"; public static final String wfVarResourceType = "inwf_resourceType"; public static final String wfVarWorkflowInstanceId = "workflowinstanceid"; public static final String wfVarRole = "inwf_inviteeRole"; diff --git a/source/java/org/alfresco/repo/node/db/hibernate/HibernateNodeDaoServiceImpl.java b/source/java/org/alfresco/repo/node/db/hibernate/HibernateNodeDaoServiceImpl.java index ebde7878e8..8fff95bdc2 100644 --- a/source/java/org/alfresco/repo/node/db/hibernate/HibernateNodeDaoServiceImpl.java +++ b/source/java/org/alfresco/repo/node/db/hibernate/HibernateNodeDaoServiceImpl.java @@ -4062,14 +4062,8 @@ public class HibernateNodeDaoServiceImpl final StoreRef storeRef, final ObjectArrayQueryCallback resultsCallback) { - final Pair sizeCurrentPropQNamePair = qnameDAO.getQName(ContentModel.PROP_SIZE_CURRENT); - final Pair personTypeQNamePair = qnameDAO.getQName(ContentModel.TYPE_PERSON); - - // Shortcut the query if the QNames don't exist - if (sizeCurrentPropQNamePair == null || personTypeQNamePair == null) - { - return; - } + final Pair sizeCurrentPropQNamePair = qnameDAO.getOrCreateQName(ContentModel.PROP_SIZE_CURRENT); + final Pair personTypeQNamePair = qnameDAO.getOrCreateQName(ContentModel.TYPE_PERSON); HibernateCallback callback = new HibernateCallback() { @@ -4115,15 +4109,9 @@ public class HibernateNodeDaoServiceImpl final StoreRef storeRef, final ObjectArrayQueryCallback resultsCallback) { - final Pair usernamePropQNamePair = qnameDAO.getQName(ContentModel.PROP_USERNAME); - final Pair sizeCurrentPropQNamePair = qnameDAO.getQName(ContentModel.PROP_SIZE_CURRENT); - final Pair personTypeQNamePair = qnameDAO.getQName(ContentModel.TYPE_PERSON); - - // Shortcut the query if the QNames don't exist - if (usernamePropQNamePair == null || sizeCurrentPropQNamePair == null || personTypeQNamePair == null) - { - return; - } + final Pair usernamePropQNamePair = qnameDAO.getOrCreateQName(ContentModel.PROP_USERNAME); + final Pair sizeCurrentPropQNamePair = qnameDAO.getOrCreateQName(ContentModel.PROP_SIZE_CURRENT); + final Pair personTypeQNamePair = qnameDAO.getOrCreateQName(ContentModel.TYPE_PERSON); HibernateCallback callback = new HibernateCallback() { diff --git a/source/java/org/alfresco/service/cmr/invitation/NominatedInvitation.java b/source/java/org/alfresco/service/cmr/invitation/NominatedInvitation.java index bcfa42b6e5..7623968dc6 100644 --- a/source/java/org/alfresco/service/cmr/invitation/NominatedInvitation.java +++ b/source/java/org/alfresco/service/cmr/invitation/NominatedInvitation.java @@ -49,6 +49,10 @@ public interface NominatedInvitation extends Invitation public String getResourceName(); + public String getResourceTitle(); + + public String getResourceDescription(); + public String getServerPath(); public String getAcceptUrl(); @@ -62,5 +66,4 @@ public interface NominatedInvitation extends Invitation public String getTicket(); public String getRoleName(); - }