Cleanup of unused code, added decryption action

Author: Nathan McMinn

pdf-toolkit-repo/src/main/amp/config/alfresco/messages/pdf-toolkit.properties

@@ -113,6 +113,13 @@ pdf-encryption.encryption-level.display-label=Encryption level
 pdf-encryption.exclude-metadata.display-label=Exclude metadata from encryption
 pdf-encryption.inplace.display-label=Execute in place
 
+pdf-decryption.title=Decrypt PDF
+pdf-decryption.description=Decrypt PDF Document
+pdf-decryption.destination-folder.display-label=Destination folder
+pdf-decryption.destination-name.display-label=Destination name
+pdf-decryption.owner-password.display-label=Owner password
+pdf-decryption.inplace.display-label=Execute in place
+
 pdf-insert-at-page.title=Insert PDF
 pdf-insert-at-page.description=Insert PDF into another PDF
 pdf-insert-at-page.destination-folder.display-label=Destination folder

pdf-toolkit-repo/src/main/amp/config/alfresco/module/org.alfresco.extension.pdftoolkit/context/alfresco-pdf-toolkit-context.xml

@@ -5,7 +5,7 @@
 
 
    	<!--  PDF Toolkit service -->
-    <bean id="pdftoolkit" 
+    <bean id="org.alfresco.extension.pdf-toolkit-service" 
         class="org.alfresco.extension.pdftoolkit.service.PDFToolkitServiceImpl">
         <property name="serviceRegistry" ref="ServiceRegistry"/>
     </bean> 
@@ -14,12 +14,14 @@
 		<property name="serviceRegistry">
 			<ref bean="ServiceRegistry" />
 		</property>
+		<property name="PDFToolkitService">
+			<ref bean="org.alfresco.extension.pdf-toolkit-service"/>
+		</property>
 		<property name="applicableTypes">
             <list>
                 <value>{http://www.alfresco.org/model/content/1.0}content</value>
             </list>
         </property>
-        <property name="createNew" value="true"/>
 	</bean>
 
 	<!-- pdfsplit -->
@@ -77,9 +79,12 @@
 		<property name="encryptionLevelConstraint">
 			<ref bean="pdfc-encryptionlevel" />
 		</property>
-        <property name="useAspect">
-        	<value>true</value>
-        </property>
+	</bean>
+	
+	<!-- pdfdecryption -->
+	<bean id="pdf-decryption"
+		class="org.alfresco.extension.pdftoolkit.repo.action.executer.PDFDecryptionActionExecuter"
+		parent="org.alfresco.extension.pdf-toolkit-action" depends-on="pdftoolkit-messages">
 	</bean>
 
 	<!-- pdfsignature -->
@@ -98,9 +103,6 @@
 		<property name="pageConstraint">
 			<ref bean="pdfc-page"/>
 		</property>
-        <property name="useAspect">
-        	<value>true</value>
-        </property>
 	</bean>
 
 	<!-- pdfdelete -->

pdf-toolkit-repo/src/main/java/org/alfresco/extension/pdftoolkit/repo/action/executer/BasePDFActionExecuter.java

@@ -33,7 +33,6 @@
 public abstract class BasePDFActionExecuter
     extends ActionExecuterAbstractBase
 {
-	private boolean createNew = true;
 
     protected ServiceRegistry     				serviceRegistry;
     protected PDFToolkitService					pdfToolkitService;
@@ -52,17 +51,6 @@ public void setServiceRegistry(ServiceRegistry serviceRegistry)
     {
         this.serviceRegistry = serviceRegistry;
     }
-
-    /**
-     * Sets whether a PDF action creates a new empty node or copies the source node, preserving
-     * the content type, applied aspects and properties
-     * 
-     * @param createNew
-     */
-    public void setCreateNew(boolean createNew)
-    {
-    	this.createNew = createNew;
-    }
 
     /**
      * Add parameter definitions

pdf-toolkit-repo/src/main/java/org/alfresco/extension/pdftoolkit/repo/action/executer/PDFDecryptionActionExecuter.java

@@ -0,0 +1,41 @@
+package org.alfresco.extension.pdftoolkit.repo.action.executer;
+
+import java.util.List;
+
+import org.alfresco.extension.pdftoolkit.constants.PDFToolkitConstants;
+import org.alfresco.repo.action.ParameterDefinitionImpl;
+import org.alfresco.service.cmr.action.Action;
+import org.alfresco.service.cmr.action.ParameterDefinition;
+import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
+import org.alfresco.service.cmr.repository.NodeRef;
+
+public class PDFDecryptionActionExecuter extends BasePDFActionExecuter 
+{
+
+    /**
+     * Action constants
+     */
+    public static final String            NAME                                = "pdf-decryption";
+    
+	/**
+     * Add parameter definitions
+     */
+    @Override
+    protected void addParameterDefinitions(List<ParameterDefinition> paramList)
+    {
+
+        paramList.add(new ParameterDefinitionImpl(PDFToolkitConstants.PARAM_DESTINATION_FOLDER, DataTypeDefinition.NODE_REF, false, getParamDisplayLabel(PDFToolkitConstants.PARAM_DESTINATION_FOLDER)));
+        paramList.add(new ParameterDefinitionImpl(PDFToolkitConstants.PARAM_OWNER_PASSWORD, DataTypeDefinition.TEXT, true, getParamDisplayLabel(PDFToolkitConstants.PARAM_OWNER_PASSWORD)));
+        paramList.add(new ParameterDefinitionImpl(PDFToolkitConstants.PARAM_DESTINATION_NAME, DataTypeDefinition.TEXT, false, getParamDisplayLabel(PDFToolkitConstants.PARAM_DESTINATION_NAME)));
+
+        super.addParameterDefinitions(paramList);
+    }
+    
+	@Override
+	protected void executeImpl(Action action, NodeRef actionedUponNodeRef) 
+	{
+		// TODO Auto-generated method stub
+
+	}
+
+}

pdf-toolkit-repo/src/main/java/org/alfresco/extension/pdftoolkit/repo/action/executer/PDFEncryptionActionExecuter.java

@@ -33,19 +33,13 @@
 import org.apache.commons.logging.LogFactory;
 
 
-public class PDFEncryptionActionExecuter
-    extends BasePDFActionExecuter
+public class PDFEncryptionActionExecuter extends BasePDFActionExecuter
 {
 
     /**
      * The logger
      */
     private static Log                    logger                              = LogFactory.getLog(PDFEncryptionActionExecuter.class);
-
-    /**
-     * Flag for use of "pdft:encrypted" aspect, enable search by encryption metadata
-     */
-    private boolean useAspect									   			  = true;
 
     /**
      * Constraints
@@ -67,11 +61,6 @@ public void setEncryptionLevelConstraint(MapConstraint mc)
         encryptionLevelConstraint.putAll(mc.getAllowableValues());
     }
 
-    public void setUseAspect(boolean useAspect)
-    {
-    	this.useAspect = useAspect;
-    }
-
     /**
      * Add parameter definitions
      */
@@ -97,7 +86,6 @@ protected void addParameterDefinitions(List<ParameterDefinition> paramList)
         super.addParameterDefinitions(paramList);
     }
 
-
     /**
      * @see org.alfresco.repo.action.executer.ActionExecuterAbstractBase#executeImpl(org.alfresco.service.cmr.repository.NodeRef,
      * org.alfresco.service.cmr.repository.NodeRef)

pdf-toolkit-repo/src/main/java/org/alfresco/extension/pdftoolkit/repo/action/executer/PDFRotateActionExecuter.java

@@ -1,34 +1,16 @@
 package org.alfresco.extension.pdftoolkit.repo.action.executer;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Serializable;
 import java.util.List;
 
-import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.extension.pdftoolkit.constants.PDFToolkitConstants;
-import org.alfresco.model.ContentModel;
 import org.alfresco.repo.action.ParameterDefinitionImpl;
 import org.alfresco.service.cmr.action.Action;
 import org.alfresco.service.cmr.action.ParameterDefinition;
 import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
-import org.alfresco.service.cmr.repository.ContentReader;
-import org.alfresco.service.cmr.repository.ContentWriter;
 import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.service.cmr.repository.NodeService;
-import org.alfresco.util.TempFileProvider;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.itextpdf.text.DocumentException;
-import com.itextpdf.text.pdf.PdfDictionary;
-import com.itextpdf.text.pdf.PdfName;
-import com.itextpdf.text.pdf.PdfNumber;
-import com.itextpdf.text.pdf.PdfReader;
-import com.itextpdf.text.pdf.PdfStamper;
-
 public class PDFRotateActionExecuter extends BasePDFActionExecuter {
 
 	/**

pdf-toolkit-repo/src/main/java/org/alfresco/extension/pdftoolkit/repo/action/executer/PDFSignatureActionExecuter.java

@@ -40,11 +40,6 @@ public class PDFSignatureActionExecuter extends BasePDFStampActionExecuter
      * The logger
      */
     private static Log                    logger                   = LogFactory.getLog(PDFSignatureActionExecuter.class);
-
-    /**
-     * Flag for use of "pdft:signed" aspect, enable search by signature metadata
-     */
-    private boolean useAspect									   = true;
 
     /**
      * Constraints
@@ -71,11 +66,6 @@ public void setVisibilityConstraint(MapConstraint mc)
     {
         visibilityConstraint.putAll(mc.getAllowableValues());
     }
-
-    public void setUseAspect(boolean useAspect)
-    {
-    	this.useAspect = useAspect;
-    }
 
     /**
      * Add parameter definitions

pdf-toolkit-repo/src/main/java/org/alfresco/extension/pdftoolkit/service/PDFToolkitService.java

@@ -28,6 +28,7 @@ public interface PDFToolkitService
 	// the actual action code
 	public void appendPDF(NodeRef targetNodeRef, Map<String, Serializable> params);
     public void encryptPDF(NodeRef targetNodeRef, Map<String, Serializable> params);
+    public void decryptPDF(NodeRef targetNodeRef, Map<String, Serializable> params);
     public void signPDF(NodeRef targetNodeRef, Map<String, Serializable> params);
     public void watermarkPDF(NodeRef targetNodeRef, Map<String, Serializable> params);
     public void splitPDF(NodeRef targetNodeRef, Map<String, Serializable> params);