From fefddb593a08ca8ed6e9d5fed3b47bc9bc6fdddb Mon Sep 17 00:00:00 2001
From: Ramona Neamtu <ramona.popa@ness.com>
Date: Thu, 14 Apr 2016 11:24:43 +0000
Subject: [PATCH] Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)    125247 rneamtu:
 Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)       125138 bhorje: ACE-5306 added
 cm:titled aspect to virtual smart folder entries

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125324 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../repo/virtual/bundle/VirtualNodeServiceExtension.java      | 2 +-
 .../java/org/alfresco/repo/virtual/ref/GetAspectsMethod.java  | 2 ++
 .../alfresco/repo/virtual/VirtualizationIntegrationTest.java  | 4 +++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/source/java/org/alfresco/repo/virtual/bundle/VirtualNodeServiceExtension.java b/source/java/org/alfresco/repo/virtual/bundle/VirtualNodeServiceExtension.java
index d54271d79b..1a317e49bb 100644
--- a/source/java/org/alfresco/repo/virtual/bundle/VirtualNodeServiceExtension.java
+++ b/source/java/org/alfresco/repo/virtual/bundle/VirtualNodeServiceExtension.java
@@ -102,7 +102,7 @@ public class VirtualNodeServiceExtension extends VirtualSpringBeanExtension<Node
         if (Reference.isReference(nodeRef))
         {
             boolean isNodeProtocol = Reference.fromNodeRef(nodeRef).getProtocol().equals(Protocols.NODE.protocol);
-            if (VirtualContentModel.ASPECT_VIRTUAL.equals(aspectQName))
+            if (VirtualContentModel.ASPECT_VIRTUAL.equals(aspectQName) || ContentModel.ASPECT_TITLED.equals(aspectQName))
             {
                 return !isNodeProtocol;
             }
diff --git a/source/java/org/alfresco/repo/virtual/ref/GetAspectsMethod.java b/source/java/org/alfresco/repo/virtual/ref/GetAspectsMethod.java
index 5c7bbd60c8..9798c96b5b 100644
--- a/source/java/org/alfresco/repo/virtual/ref/GetAspectsMethod.java
+++ b/source/java/org/alfresco/repo/virtual/ref/GetAspectsMethod.java
@@ -22,6 +22,7 @@ package org.alfresco.repo.virtual.ref;
 import java.util.HashSet;
 import java.util.Set;
 
+import org.alfresco.model.ContentModel;
 import org.alfresco.repo.node.db.traitextender.NodeServiceTrait;
 import org.alfresco.repo.virtual.ActualEnvironment;
 import org.alfresco.repo.virtual.ActualEnvironmentException;
@@ -46,6 +47,7 @@ public class GetAspectsMethod extends AbstractProtocolMethod<Set<QName>>
     {
         Set<QName> aspects = new HashSet<QName>();
         aspects.add(VirtualContentModel.ASPECT_VIRTUAL);
+        aspects.add(ContentModel.ASPECT_TITLED);
         return aspects;
     }
 
diff --git a/source/test-java/org/alfresco/repo/virtual/VirtualizationIntegrationTest.java b/source/test-java/org/alfresco/repo/virtual/VirtualizationIntegrationTest.java
index 92bf85f379..09c7f1d097 100644
--- a/source/test-java/org/alfresco/repo/virtual/VirtualizationIntegrationTest.java
+++ b/source/test-java/org/alfresco/repo/virtual/VirtualizationIntegrationTest.java
@@ -308,7 +308,9 @@ public abstract class VirtualizationIntegrationTest extends TestCase implements
         assertTrue(nodeService.hasAspect(nodeRef,
                                          VirtualContentModel.ASPECT_VIRTUAL));
         Set<QName> aspects = nodeService.getAspects(nodeRef);
-        assertTrue(aspects.contains(VirtualContentModel.ASPECT_VIRTUAL));
+        assertTrue("Smart virtual node missing virtual aspect",aspects.contains(VirtualContentModel.ASPECT_VIRTUAL));
+        //ACE-5303 injected properties title and description  require the titled aspect 
+        assertTrue("Smaft virtual node missing titled aspect",aspects.contains(ContentModel.ASPECT_TITLED));
 
         Map<QName, Serializable> nodeProperties = nodeService.getProperties(nodeRef);