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

FIXED : ALF-11051: publishing assets with comments not possible

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32050 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gethin James
2011-11-17 11:29:58 +00:00
parent d111a38a56
commit 6b0b6187c6
2 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
config/alfresco/content-publishing-context.xml
View File

@@ -88,8 +88,18 @@
<property name="transferManifestNodeFactory" ref="transferManifestNodeFactory" /> <property name="transferManifestNodeFactory" ref="transferManifestNodeFactory" />
<property name="versionService" ref="VersionService" /> <property name="versionService" ref="VersionService" />
<property name="workflowEngineId" value="activiti" /> <property name="workflowEngineId" value="activiti" />
<property name="excludedAspects" ref="excludedPublishingAspects" />
</bean> </bean>
<bean id="excludedPublishingAspects" class="java.util.ArrayList">
<constructor-arg>
<list>
<value>{http://www.alfresco.org/model/rule/1.0}rules</value>
<value>{http://www.alfresco.org/model/content/1.0}mlDocument</value>
<value>{http://www.alfresco.org/model/forum/1.0}discussable</value>
</list>
</constructor-arg>
</bean>
<!-- Publish Event Action --> <!-- Publish Event Action -->
<bean id="pub_publishEvent" class="org.alfresco.repo.publishing.PublishEventAction" > <bean id="pub_publishEvent" class="org.alfresco.repo.publishing.PublishEventAction" >

22
source/java/org/alfresco/repo/publishing/PublishingEventHelper.java
View File

@@ -46,6 +46,7 @@ import static org.alfresco.util.collections.CollectionUtils.transformFlat;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Calendar; import java.util.Calendar;
import java.util.Collection; import java.util.Collection;
@@ -81,6 +82,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.security.AccessStatus; import org.alfresco.service.cmr.security.AccessStatus;
import org.alfresco.service.cmr.security.PermissionService; import org.alfresco.service.cmr.security.PermissionService;
import org.alfresco.service.cmr.transfer.TransferDefinition;
import org.alfresco.service.cmr.version.VersionService; import org.alfresco.service.cmr.version.VersionService;
import org.alfresco.service.cmr.workflow.WorkflowDefinition; import org.alfresco.service.cmr.workflow.WorkflowDefinition;
import org.alfresco.service.cmr.workflow.WorkflowPath; import org.alfresco.service.cmr.workflow.WorkflowPath;
@@ -111,8 +113,10 @@ public class PublishingEventHelper
private NodeSnapshotSerializer serializer; private NodeSnapshotSerializer serializer;
private PermissionService permissionService; private PermissionService permissionService;
private TransferManifestNodeFactory transferManifestNodeFactory; private TransferManifestNodeFactory transferManifestNodeFactory;
private List<QName> excludedAspects = new ArrayList<QName>();
private String workflowEngineId; private String workflowEngineId;
private TransferDefinition excludedAspectsTransferDefinition;
/** /**
* @param nodeService * @param nodeService
@@ -559,7 +563,7 @@ public class PublishingEventHelper
private NodeSnapshotTransferImpl createPublishSnapshot(NodeRef node) private NodeSnapshotTransferImpl createPublishSnapshot(NodeRef node)
{ {
versionService.createVersion(node, null); versionService.createVersion(node, null);
TransferManifestNormalNode payload = (TransferManifestNormalNode) transferManifestNodeFactory.createTransferManifestNode(node, null); TransferManifestNormalNode payload = (TransferManifestNormalNode) transferManifestNodeFactory.createTransferManifestNode(node, excludedAspectsTransferDefinition);
NodeSnapshotTransferImpl snapshot = new NodeSnapshotTransferImpl(payload); NodeSnapshotTransferImpl snapshot = new NodeSnapshotTransferImpl(payload);
return snapshot; return snapshot;
} }
@@ -662,4 +666,20 @@ public class PublishingEventHelper
{ {
return new PublishingDetailsImpl(); return new PublishingDetailsImpl();
} }
/**
* Sets a list of excluded aspects, assumes the fully qualified name. Replaces any exising excluded aspects.
* @param excludedAspects
*/
public void setExcludedAspects(Collection<String> excludedAspects)
{
this.excludedAspects.clear();
for (String aspect : excludedAspects)
{
this.excludedAspects.add(QName.createQName(aspect));
}
this.excludedAspectsTransferDefinition = new TransferDefinition();
excludedAspectsTransferDefinition.setExcludedAspects(this.excludedAspects);
}
} }