Change to support in-place mode

Nathan McMinn · Nathan McMinn · commit 8bc8c0ff08aa · 2014-07-30T13:50:00.000-05:00
Additional changes to base classes and implementations to support
in-place transformations, not requiring a copy of a document to be made
to apply watermarks, delete pages, sign, etc.
diff --git a/pdf-toolkit-repo/src/main/amp/config/alfresco/module/org.alfresco.extension.pdftoolkit/context/custom-form-services-context.xml b/pdf-toolkit-repo/src/main/amp/config/alfresco/module/org.alfresco.extension.pdftoolkit/context/custom-form-services-context.xml
@@ -25,5 +25,6 @@
    	<bean id="pdftoolkit.actionFormFilter" class="org.alfresco.extension.pdftoolkit.form.PDFActionFormFilter" parent="baseFormFilter">
    		<property name="filterRegistry" ref="pdfActionFilterRegistry" />
    		<property name="serviceRegistry" ref="ServiceRegistry"/>
+   		<property name="repositoryHelper" ref="repositoryHelper" />
    	</bean>
 </beans>
diff --git a/pdf-toolkit-repo/src/main/java/org/alfresco/extension/pdftoolkit/form/PDFActionFormFilter.java b/pdf-toolkit-repo/src/main/java/org/alfresco/extension/pdftoolkit/form/PDFActionFormFilter.java
@@ -11,7 +11,11 @@
 import org.alfresco.repo.forms.FormData.FieldData;
 import org.alfresco.repo.forms.processor.AbstractFilter;
 import org.alfresco.repo.forms.processor.action.ActionFormResult;
+import org.alfresco.repo.model.Repository;
 import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -23,6 +27,7 @@ public class PDFActionFormFilter extends AbstractFilter<Object, ActionFormResult
 	private String			INPLACE_PARAM				= "prop_" + BasePDFActionExecuter.PARAM_INPLACE;
 	
 	private ServiceRegistry serviceRegistry;		
+	private Repository repositoryHelper;
 	
 	@Override
 	public void afterGenerate(Object obj, List<String> fields,
@@ -48,6 +53,8 @@ public void beforeGenerate(Object obj, List<String> fields,
 	public void beforePersist(Object obj, FormData formData) {
 		logger.debug("beforePersist");
 		
+		NodeService ns = serviceRegistry.getNodeService();
+		
 		//check the action, is it one we need to handle?
 		if(obj != null)
 		{
@@ -59,7 +66,7 @@ public void beforePersist(Object obj, FormData formData) {
 			FieldData inplace = formData.getFieldData(INPLACE_PARAM);
 			if(Boolean.valueOf(String.valueOf(inplace.getValue())))
 			{
-				formData.addFieldData(DESTINATION_FOLDER_FIELD, "null://null/null", true);
+				formData.addFieldData(DESTINATION_FOLDER_FIELD, repositoryHelper.getCompanyHome(), true);
 			}
 			
 			ActionDefinitionImpl act = (ActionDefinitionImpl)obj;
@@ -91,5 +98,9 @@ public void setServiceRegistry(ServiceRegistry serviceRegistry)
 	{
 		this.serviceRegistry = serviceRegistry;
 	}
-
+	
+	public void setRepositoryHelper(Repository repositoryHelper)
+	{
+		this.repositoryHelper = repositoryHelper;
+	}
 }
diff --git a/pdf-toolkit-repo/src/main/java/org/alfresco/extension/pdftoolkit/repo/action/executer/BasePDFActionExecuter.java b/pdf-toolkit-repo/src/main/java/org/alfresco/extension/pdftoolkit/repo/action/executer/BasePDFActionExecuter.java
@@ -104,11 +104,18 @@ protected ContentReader getReader(NodeRef nodeRef)
      * @param filename
      * @return
      */
-    protected NodeRef createDestinationNode(String filename, NodeRef destinationParent, NodeRef target)
+    protected NodeRef createDestinationNode(String filename, NodeRef destinationParent, NodeRef target, boolean inplace)
     {
 
     	NodeRef destinationNode;
     	
+    	// if inplace mode is turned on, the destination for the modified content
+    	// is the original node
+    	if(inplace)
+    	{
+    		return target;
+    	}
+    	
     	if(createNew)
     	{
 	    	//create a file in the right location
diff --git a/pdf-toolkit-repo/src/main/java/org/alfresco/extension/pdftoolkit/repo/action/executer/PDFAppendActionExecuter.java b/pdf-toolkit-repo/src/main/java/org/alfresco/extension/pdftoolkit/repo/action/executer/PDFAppendActionExecuter.java
@@ -209,7 +209,7 @@ protected final void action(Action ruleAction, NodeRef actionedUponNodeRef, Node
                         // Get a writer and prep it for putting it back into the
                         // repo
                         NodeRef destinationNode = createDestinationNode(fileName, 
-                        		(NodeRef)ruleAction.getParameterValue(PARAM_DESTINATION_FOLDER), actionedUponNodeRef);
+                        		(NodeRef)ruleAction.getParameterValue(PARAM_DESTINATION_FOLDER), actionedUponNodeRef, false);
                         writer = serviceRegistry.getContentService().getWriter(destinationNode, ContentModel.PROP_CONTENT, true);
                         
                         writer.setEncoding(reader.getEncoding()); // original
diff --git a/pdf-toolkit-repo/src/main/java/org/alfresco/extension/pdftoolkit/repo/action/executer/PDFDeletePageActionExecuter.java b/pdf-toolkit-repo/src/main/java/org/alfresco/extension/pdftoolkit/repo/action/executer/PDFDeletePageActionExecuter.java
@@ -105,6 +105,8 @@ private void doDelete(Action action, NodeRef actionedUponNodeRef, ContentReader
             tempDir.mkdir();
             
             Serializable providedName = action.getParameterValue(PARAM_DESTINATION_NAME);
+            Boolean inplace = Boolean.valueOf(String.valueOf(action.getParameterValue(PARAM_INPLACE)));
+            
             String fileName = null;
             if(providedName != null)
             {
@@ -133,7 +135,7 @@ private void doDelete(Action action, NodeRef actionedUponNodeRef, ContentReader
             doc.close();
 
             NodeRef destinationNode = createDestinationNode(fileName, 
-            		(NodeRef)action.getParameterValue(PARAM_DESTINATION_FOLDER), actionedUponNodeRef);
+            		(NodeRef)action.getParameterValue(PARAM_DESTINATION_FOLDER), actionedUponNodeRef, inplace);
             writer = serviceRegistry.getContentService().getWriter(destinationNode, ContentModel.PROP_CONTENT, true);
 
             writer.setEncoding(reader.getEncoding());
diff --git a/pdf-toolkit-repo/src/main/java/org/alfresco/extension/pdftoolkit/repo/action/executer/PDFEncryptionActionExecuter.java b/pdf-toolkit-repo/src/main/java/org/alfresco/extension/pdftoolkit/repo/action/executer/PDFEncryptionActionExecuter.java
@@ -220,6 +220,7 @@ protected final void action(Action ruleAction, NodeRef actionedUponNodeRef, Cont
             // get the parameters
             String userPassword = (String)options.get(PARAM_USER_PASSWORD);
             String ownerPassword = (String)options.get(PARAM_OWNER_PASSWORD);
+            Boolean inplace = Boolean.valueOf(String.valueOf(options.get(PARAM_INPLACE)));
             int permissions = buildPermissionMask(options);
             int encryptionType = Integer.parseInt((String)options.get(PARAM_ENCRYPTION_LEVEL));
 
@@ -245,7 +246,7 @@ protected final void action(Action ruleAction, NodeRef actionedUponNodeRef, Cont
 
             // write out to destination
             NodeRef destinationNode = createDestinationNode(file.getName(), 
-            		(NodeRef)ruleAction.getParameterValue(PARAM_DESTINATION_FOLDER), actionedUponNodeRef);
+            		(NodeRef)ruleAction.getParameterValue(PARAM_DESTINATION_FOLDER), actionedUponNodeRef, inplace);
             writer = serviceRegistry.getContentService().getWriter(destinationNode, ContentModel.PROP_CONTENT, true);
 
             writer.setEncoding(actionedUponContentReader.getEncoding());
diff --git a/pdf-toolkit-repo/src/main/java/org/alfresco/extension/pdftoolkit/repo/action/executer/PDFInsertAtPageActionExecuter.java b/pdf-toolkit-repo/src/main/java/org/alfresco/extension/pdftoolkit/repo/action/executer/PDFInsertAtPageActionExecuter.java
@@ -197,7 +197,8 @@ protected final void action(Action ruleAction, NodeRef actionedUponNodeRef, Cont
             tempDir.mkdir();
 
             String fileName = options.get(PARAM_DESTINATION_NAME).toString();
-
+            Boolean inplace = Boolean.valueOf(String.valueOf(options.get(PARAM_INPLACE)));
+            
             PDDocument completePDF = (PDDocument)pdfs.get(0);
 
             completePDF.save(tempDir + "" + File.separatorChar + fileName + FILE_EXTENSION);
@@ -222,7 +223,7 @@ protected final void action(Action ruleAction, NodeRef actionedUponNodeRef, Cont
                         // Get a writer and prep it for putting it back into the
                         // repo
                         NodeRef destinationNode = createDestinationNode(file.getName(), 
-                        		(NodeRef)ruleAction.getParameterValue(PARAM_DESTINATION_FOLDER), actionedUponNodeRef);
+                        		(NodeRef)ruleAction.getParameterValue(PARAM_DESTINATION_FOLDER), actionedUponNodeRef, inplace);
                         writer = serviceRegistry.getContentService().getWriter(destinationNode, ContentModel.PROP_CONTENT, true);
                         
                         writer.setEncoding(reader.getEncoding()); // original
diff --git a/pdf-toolkit-repo/src/main/java/org/alfresco/extension/pdftoolkit/repo/action/executer/PDFSignatureActionExecuter.java b/pdf-toolkit-repo/src/main/java/org/alfresco/extension/pdftoolkit/repo/action/executer/PDFSignatureActionExecuter.java
@@ -213,6 +213,8 @@ protected void doSignature(Action ruleAction, NodeRef actionedUponNodeRef, Conte
         int locationX = getInteger(ruleAction.getParameterValue(PARAM_LOCATION_X));
         int locationY = getInteger(ruleAction.getParameterValue(PARAM_LOCATION_Y));
         
+        Boolean inplace = Boolean.valueOf(String.valueOf(ruleAction.getParameterValue(PARAM_INPLACE)));
+        
         File tempDir = null;
         ContentWriter writer = null;
         KeyStore ks = null;
@@ -282,7 +284,7 @@ else if (keyType.equalsIgnoreCase(KEY_TYPE_PKCS12))
 
             //can't use BasePDFActionExecuter.getWriter here need the nodeRef of the destination
             NodeRef destinationNode = createDestinationNode(file.getName(), 
-            		(NodeRef)ruleAction.getParameterValue(PARAM_DESTINATION_FOLDER), actionedUponNodeRef);
+            		(NodeRef)ruleAction.getParameterValue(PARAM_DESTINATION_FOLDER), actionedUponNodeRef, inplace);
             writer = serviceRegistry.getContentService().getWriter(destinationNode, ContentModel.PROP_CONTENT, true);
             
             writer.setEncoding(actionedUponContentReader.getEncoding());
diff --git a/pdf-toolkit-repo/src/main/java/org/alfresco/extension/pdftoolkit/repo/action/executer/PDFSplitActionExecuter.java b/pdf-toolkit-repo/src/main/java/org/alfresco/extension/pdftoolkit/repo/action/executer/PDFSplitActionExecuter.java
@@ -248,7 +248,7 @@ protected final void action(Action ruleAction, NodeRef actionedUponNodeRef, Cont
                         // Get a writer and prep it for putting it back into the
                         // repo
                         NodeRef destinationNode = createDestinationNode(file.getName(), 
-                        		(NodeRef)ruleAction.getParameterValue(PARAM_DESTINATION_FOLDER), actionedUponNodeRef);
+                        		(NodeRef)ruleAction.getParameterValue(PARAM_DESTINATION_FOLDER), actionedUponNodeRef, false);
                         writer = serviceRegistry.getContentService().getWriter(destinationNode, ContentModel.PROP_CONTENT, true);
                         
                         writer.setEncoding(reader.getEncoding()); // original
diff --git a/pdf-toolkit-repo/src/main/java/org/alfresco/extension/pdftoolkit/repo/action/executer/PDFSplitAtPageActionExecuter.java b/pdf-toolkit-repo/src/main/java/org/alfresco/extension/pdftoolkit/repo/action/executer/PDFSplitAtPageActionExecuter.java
@@ -283,7 +283,7 @@ protected final void action(Action ruleAction, NodeRef actionedUponNodeRef, Cont
                         // Get a writer and prep it for putting it back into the
                         // repo
                         NodeRef destinationNode = createDestinationNode(file.getName(), 
-                        		(NodeRef)ruleAction.getParameterValue(PARAM_DESTINATION_FOLDER), actionedUponNodeRef);
+                        		(NodeRef)ruleAction.getParameterValue(PARAM_DESTINATION_FOLDER), actionedUponNodeRef, false);
                         writer = serviceRegistry.getContentService().getWriter(destinationNode, ContentModel.PROP_CONTENT, true);
 
                         writer.setEncoding(reader.getEncoding()); // original
diff --git a/pdf-toolkit-repo/src/main/java/org/alfresco/extension/pdftoolkit/repo/action/executer/PDFWatermarkActionExecuter.java b/pdf-toolkit-repo/src/main/java/org/alfresco/extension/pdftoolkit/repo/action/executer/PDFWatermarkActionExecuter.java
@@ -280,6 +280,7 @@ private void imageAction(Action ruleAction, NodeRef actionedUponNodeRef, NodeRef
             String pages = (String)options.get(PARAM_PAGE);
             String position = (String)options.get(PARAM_POSITION);
             String depth = (String)options.get(PARAM_WATERMARK_DEPTH);
+            Boolean inplace = Boolean.valueOf(String.valueOf(options.get(PARAM_INPLACE)));
 
             // get the manual positioning options (if provided)
             int locationX = getInteger(ruleAction.getParameterValue(PARAM_LOCATION_X));
@@ -346,7 +347,7 @@ else if (position.equals(POSITION_MANUAL))
             // Get a writer and prep it for putting it back into the repo
             //can't use BasePDFActionExecuter.getWriter here need the nodeRef of the destination
             NodeRef destinationNode = createDestinationNode(file.getName(), 
-            		(NodeRef)ruleAction.getParameterValue(PARAM_DESTINATION_FOLDER), actionedUponNodeRef);
+            		(NodeRef)ruleAction.getParameterValue(PARAM_DESTINATION_FOLDER), actionedUponNodeRef, inplace);
             writer = serviceRegistry.getContentService().getWriter(destinationNode, ContentModel.PROP_CONTENT, true);
             
             writer.setEncoding(actionedUponContentReader.getEncoding());
@@ -434,7 +435,8 @@ private void textAction(Action ruleAction, NodeRef actionedUponNodeRef, ContentR
             String depth = (String)options.get(PARAM_WATERMARK_DEPTH);
             int locationX = getInteger(ruleAction.getParameterValue(PARAM_LOCATION_X));
             int locationY = getInteger(ruleAction.getParameterValue(PARAM_LOCATION_Y));
-            
+            Boolean inplace = Boolean.valueOf(String.valueOf(options.get(PARAM_INPLACE)));
+
             // create the base font for the text stamp
             BaseFont bf = BaseFont.createFont((String)options.get(PARAM_WATERMARK_FONT), BaseFont.CP1250, BaseFont.EMBEDDED);
 
@@ -487,7 +489,7 @@ private void textAction(Action ruleAction, NodeRef actionedUponNodeRef, ContentR
             // Get a writer and prep it for putting it back into the repo
             //can't use BasePDFActionExecuter.getWriter here need the nodeRef of the destination
             NodeRef destinationNode = createDestinationNode(file.getName(), 
-            		(NodeRef)ruleAction.getParameterValue(PARAM_DESTINATION_FOLDER), actionedUponNodeRef);
+            		(NodeRef)ruleAction.getParameterValue(PARAM_DESTINATION_FOLDER), actionedUponNodeRef, inplace);
             writer = serviceRegistry.getContentService().getWriter(destinationNode, ContentModel.PROP_CONTENT, true);
             writer.setEncoding(actionedUponContentReader.getEncoding());
             writer.setMimetype(FILE_MIMETYPE);
diff --git a/pdf-toolkit-share/src/main/resources/META-INF/share-config-custom.xml b/pdf-toolkit-share/src/main/resources/META-INF/share-config-custom.xml
@@ -515,10 +515,10 @@
         	<form>
             	<field-visibility>
             		<show id="destination-folder"/>
-            		<show id="page"/>
+            		<show id="split-at-page"/>
                 </field-visibility>
                 <appearance>
-                	<field id="page">
+                	<field id="split-at-page">
                     	<control template="/org/alfresco/pdftoolkit/components/form/controls/selectPage.ftl" >
                         	<control-param name="showPageScheme">false</control-param>
                         </control>
