diff options
| author | tkellner <tkellner@174cde9d-5d70-4d2a-aa98-46368bc2aaf7> | 2013-04-10 18:50:06 +0000 |
|---|---|---|
| committer | tkellner <tkellner@174cde9d-5d70-4d2a-aa98-46368bc2aaf7> | 2013-04-10 18:50:06 +0000 |
| commit | de0324256c3af140a14f2bd3fe44d08116140ae3 (patch) | |
| tree | e5b030868ee8bf5518a93ce5e56e7bd4691c37af | |
| parent | c3d0c0ade67b5dfb9f56af109893275b4cf5a146 (diff) | |
| download | mocca-de0324256c3af140a14f2bd3fe44d08116140ae3.tar.gz mocca-de0324256c3af140a14f2bd3fe44d08116140ae3.tar.bz2 mocca-de0324256c3af140a14f2bd3fe44d08116140ae3.zip | |
Removed PDFSignator Interface
PDFSigner Factory
Refactoring
git-svn-id: https://joinup.ec.europa.eu/svn/pdf-over/trunk@7 174cde9d-5d70-4d2a-aa98-46368bc2aaf7
18 files changed, 237 insertions, 362 deletions
diff --git a/pdf-over/pdf-signator-interface/pom.xml b/pdf-over/pdf-signator-interface/pom.xml deleted file mode 100644 index f0985880..00000000 --- a/pdf-over/pdf-signator-interface/pom.xml +++ /dev/null @@ -1,17 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>pdf-over</artifactId> - <groupId>at.a-sit</groupId> - <version>4.0-SNAPSHOT</version> - <relativePath>..</relativePath> - </parent> - <artifactId>pdf-signator-interface</artifactId> - <dependencies> - <dependency> - <groupId>at.a-sit</groupId> - <artifactId>pdf-signer-interface</artifactId> - <version>0.1-SNAPSHOT</version> - </dependency> - </dependencies> -</project>
\ No newline at end of file diff --git a/pdf-over/pdf-signator-interface/src/main/java/at/asit/pdfover/pdfsignator/PDFSignatorInterface.java b/pdf-over/pdf-signator-interface/src/main/java/at/asit/pdfover/pdfsignator/PDFSignatorInterface.java deleted file mode 100644 index 9fc21eb8..00000000 --- a/pdf-over/pdf-signator-interface/src/main/java/at/asit/pdfover/pdfsignator/PDFSignatorInterface.java +++ /dev/null @@ -1,38 +0,0 @@ -/** - * - */ -package at.asit.pdfover.pdfsignator; - -import at.asit.pdfover.pdfsigner.PDFSignatureException; -import at.asit.pdfover.pdfsigner.SignResult; -import at.asit.pdfover.pdfsigner.SignatureParameter; -import at.asit.pdfover.pdfsigner.SigningState; - -/** - * The PDF-Signator Interface - * - * @author afitzek - */ -public interface PDFSignatorInterface { - - /** - * Creates signature parameter for the given pdf signer - * @param signer The pdf signer library - * @return The signature parameter - */ - public SignatureParameter GetSignatureParameters(PDFSigner signer); - - /** - * Prepares the signature - * @param parameter The signature parameter - * @return A Signature State for the signing library - */ - public SigningState SignPrepare(SignatureParameter parameter) throws PDFSignatureException; - - /** - * Performs the signature - * @param response The signing state - * @return The signed document - */ - public SignResult SignPerform(SigningState state) throws PDFSignatureException; -} diff --git a/pdf-over/pdf-signator-interface/src/model/PDFSignatorInterface.ucd b/pdf-over/pdf-signator-interface/src/model/PDFSignatorInterface.ucd deleted file mode 100644 index 2a011e93..00000000 --- a/pdf-over/pdf-signator-interface/src/model/PDFSignatorInterface.ucd +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<editmodel:ClassDiagramEditModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:editmodel="editmodel.xmi" xmlns:options="options.xmi" name="PDFSignatorInterface" size="1483,325" id="at.asit.pdfover.pdfsignator" metadata="uml2-1.0" initialized="true" tag="1000" key="32303037303533312D31303030207064662D7369676E61746F722D696E746572666163652F616669747A656B"> - <children xsi:type="editmodel:InterfaceEditModel" name="PDFSignatorInterface" location="60,45" size="435,117" id="at.asit.pdfover.pdfsignator/PDFSignatorInterface" runTimeClassModel="SignPerform(Lat.asit.pdfover.pdfsigner.SigningState;),SignPrepare(Lat.asit.pdfover.pdfsigner.SignatureParameter;),GetSignatureParameters(Lat.asit.pdfover.pdfsignator.PDFSigner;)"> - <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/> - <children xsi:type="editmodel:CompartmentEditModel" size="412,54"> - <children xsi:type="editmodel:MethodEditModel" name="GetSignatureParameters" id="at.asit.pdfover.pdfsignator/PDFSignatorInterface#GetSignatureParameters(Lat.asit.pdfover.pdfsignator.PDFSigner;)"/> - <children xsi:type="editmodel:MethodEditModel" name="SignPerform" id="at.asit.pdfover.pdfsignator/PDFSignatorInterface#SignPerform(Lat.asit.pdfover.pdfsigner.SigningState;)"/> - <children xsi:type="editmodel:MethodEditModel" name="SignPrepare" id="at.asit.pdfover.pdfsignator/PDFSignatorInterface#SignPrepare(Lat.asit.pdfover.pdfsigner.SignatureParameter;)"/> - </children> - <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/> - <sourceConnections xsi:type="editmodel:DependencyEditModel" autoLocated="true" id="at.asit.pdfover.pdfsignator/PDFSignatorInterface-Soyatec::Import->at.asit.pdfover.pdfsignator/PDFSigner" source="//@children.0" target="//@children.1" targetEnd="//@children.0/@sourceConnections.0/@children.2" label="//@children.0/@sourceConnections.0/@children.0" sourceEnd="//@children.0/@sourceConnections.0/@children.1" connectionRouterKind="Manual"> - <children xsi:type="editmodel:WireLabelEditModel" name="«Import»" size="51,13" anchorKind="MiddlePart"/> - <children xsi:type="editmodel:AssociationEndEditModel" location="54,117" attachSource="true"/> - <children xsi:type="editmodel:AssociationEndEditModel" location="64,0"/> - </sourceConnections> - <classifierPreferences xsi:type="editmodel:UMLClassDiagramClassifierPreference" showStereotype="true" showMethodsParameterTypes="true" showMethodsReturnType="true" showMethodsParameterNames="true" showMethodsParameterKinds="true" attributeSorter="Natural" methodSorter="Natural" innerClassSorter="Natural" showPublicAttributes="true" showPackageAttributes="true" showStaticAttributes="true" showPublicMethods="true" showStaticMethods="true" showPublicInnerClasses="true" showPackageInnerClasses="true" showStaticInnerClasses="true" packageIndication="3" showAttributeProperty="true"/> - </children> - <children xsi:type="editmodel:EnumerationEditModel" targetConnections="//@children.0/@sourceConnections.0" name="PDFSigner" location="50,234" size="119,71" id="at.asit.pdfover.pdfsignator/PDFSigner" runTimeClassModel="PDFAS%"> - <children xsi:type="editmodel:CompartmentEditModel" size="54,18"> - <children xsi:type="editmodel:EnumerationLiteralEditModel" name="PDFAS" id="at.asit.pdfover.pdfsignator/PDFSigner#PDFAS%"/> - </children> - <classifierPreferences xsi:type="editmodel:UMLClassDiagramClassifierPreference" showStereotype="true" showMethodsParameterTypes="true" showMethodsReturnType="true" showMethodsParameterNames="true" showMethodsParameterKinds="true" attributeSorter="Natural" methodSorter="Natural" innerClassSorter="Natural" showPublicAttributes="true" showPackageAttributes="true" showStaticAttributes="true" showPublicMethods="true" showStaticMethods="true" showPublicInnerClasses="true" showPackageInnerClasses="true" showStaticInnerClasses="true" packageIndication="3" showAttributeProperty="true"/> - </children> - <diagramOptions xsi:type="options:ClassDiagramOptions" properties="wireOptions=7;Product=eUML2" autoName="false"/> - <boardSetting snapToGeometry="true" gridEnabled="true" gridSpacing="15,15" gridOrigin="0,0" rulerUnit="pixel" gridVisibility="false"> - <leftRuler/> - <topRuler/> - </boardSetting> - <classDiagramPreferences xsi:type="editmodel:UMLClassDiagramPreference" showPopupBars="true" showConnectionHandles="true" showMethodsParameterTypes="true" showMethodsReturnType="true" showMethodsParameterNames="true" showMethodsParameterKinds="true" attributeSorter="Natural" methodSorter="Natural" showClassStereotype="true" showPackageStereotype="true" showDependencyStereotype="true" showInterfaceStereotype="true" innerClassSorter="Natural" showPublicAttributes="true" showPackageAttributes="true" showStaticAttributes="true" showPublicMethods="true" showStaticMethods="true" showPublicInnerClasses="true" showPackageInnerClasses="true" showStaticInnerClasses="true" packageIndication="3" showAttributeProperty="true"/> -</editmodel:ClassDiagramEditModel> diff --git a/pdf-over/pdf-signator-interface/src/model/SignatureSequence.usd b/pdf-over/pdf-signator-interface/src/model/SignatureSequence.usd deleted file mode 100644 index 0823809c..00000000 --- a/pdf-over/pdf-signator-interface/src/model/SignatureSequence.usd +++ /dev/null @@ -1,216 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<editmodel:SequenceDiagramEditModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:editmodel="editmodel.xmi" xmlns:options="options.xmi" name="SignatureSequence" size="1482,635" metadata="uml2-1.0" initialized="true" scrolledY="104" tag="1000" key="32303037303533312D31303030207064662D7369676E61746F722D696E746572666163652F616669747A656B"> - <children xsi:type="editmodel:InstanceEditModel" location="55,20" size="100,543" itemName="GUI"> - <children xsi:type="editmodel:ActivationEditModel" targetConnections="//@children.1/@children.0/@sourceConnections.2" location="42,102" size="16,138" sequenceItemContainer="//@children.0" length="138"> - <sourceConnections xsi:type="editmodel:SequenceMessageEditModel" name="GetSignatureParameters" id="at.asit.pdfover.pdfsignator/PDFSignatorInterface#GetSignatureParameters(Lat.asit.pdfover.pdfsignator.PDFSigner;)" source="//@children.0/@children.0" target="//@children.1/@children.0" targetEnd="//@children.0/@children.0/@sourceConnections.0/@children.1" sourceEnd="//@children.0/@children.0/@sourceConnections.0/@children.0" connectionRouterKind="Manual" associatedMethod="GetSignatureParameters(PDFSigner): SignatureParameter" associatedSequenceNumber="1" associatedReturnArrow="//@children.1/@children.0/@sourceConnections.2" shouldShowReturnArrow="true"> - <children xsi:type="editmodel:SequenceEndEditModel" anchorKind="FixedAtEdge" attachSource="true" userLabel="//@children.0/@children.0/@sourceConnections.0/@children.0/@children.0" methodLabel="//@children.0/@children.0/@sourceConnections.0/@children.0/@children.1" sequenceNumberLabel="//@children.0/@children.0/@sourceConnections.0/@children.0/@children.2" statementExpression="//@children.0/@children.0/@sourceConnections.0/@children.0/@children.3"> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - <children xsi:type="editmodel:LabelEditModel" name="GetSignatureParameters(PDFSigner): SignatureParameter" size="331,13"/> - <children xsi:type="editmodel:LabelEditModel" name="1" size="7,13"/> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - </children> - <children xsi:type="editmodel:SequenceEndEditModel" anchorKind="FixedAtEdge" userLabel="//@children.0/@children.0/@sourceConnections.0/@children.1/@children.0" methodLabel="//@children.0/@children.0/@sourceConnections.0/@children.1/@children.1" sequenceNumberLabel="//@children.0/@children.0/@sourceConnections.0/@children.1/@children.2" statementExpression="//@children.0/@children.0/@sourceConnections.0/@children.1/@children.3"> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - <children xsi:type="editmodel:LabelEditModel" size="0,13"/> - <children xsi:type="editmodel:LabelEditModel" size="0,13"/> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - </children> - </sourceConnections> - </children> - <children xsi:type="editmodel:ActivationEditModel" targetConnections="//@children.1/@children.1/@sourceConnections.1" location="42,278" size="16,55" sequenceItemContainer="//@children.0" length="55"> - <sourceConnections xsi:type="editmodel:SequenceMessageEditModel" name="SignPrepare" id="at.asit.pdfover.pdfsignator/PDFSignatorInterface#SignPrepare(Lat.asit.pdfover.pdfsigner.SignatureParameter;)" source="//@children.0/@children.1" target="//@children.1/@children.1" targetEnd="//@children.0/@children.1/@sourceConnections.0/@children.1" sourceEnd="//@children.0/@children.1/@sourceConnections.0/@children.0" connectionRouterKind="Manual" associatedMethod="SignPrepare(SignatureParameter): SigningState" associatedSequenceNumber="2" associatedReturnArrow="//@children.1/@children.1/@sourceConnections.1" shouldShowReturnArrow="true"> - <children xsi:type="editmodel:SequenceEndEditModel" anchorKind="FixedAtEdge" attachSource="true" userLabel="//@children.0/@children.1/@sourceConnections.0/@children.0/@children.0" methodLabel="//@children.0/@children.1/@sourceConnections.0/@children.0/@children.1" sequenceNumberLabel="//@children.0/@children.1/@sourceConnections.0/@children.0/@children.2" statementExpression="//@children.0/@children.1/@sourceConnections.0/@children.0/@children.3"> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - <children xsi:type="editmodel:LabelEditModel" name="SignPrepare(SignatureParameter): SigningState" size="273,13"/> - <children xsi:type="editmodel:LabelEditModel" name="2" size="7,13"/> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - </children> - <children xsi:type="editmodel:SequenceEndEditModel" anchorKind="FixedAtEdge" userLabel="//@children.0/@children.1/@sourceConnections.0/@children.1/@children.0" methodLabel="//@children.0/@children.1/@sourceConnections.0/@children.1/@children.1" sequenceNumberLabel="//@children.0/@children.1/@sourceConnections.0/@children.1/@children.2" statementExpression="//@children.0/@children.1/@sourceConnections.0/@children.1/@children.3"> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - <children xsi:type="editmodel:LabelEditModel" size="0,13"/> - <children xsi:type="editmodel:LabelEditModel" size="0,13"/> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - </children> - </sourceConnections> - </children> - <children xsi:type="editmodel:ActivationEditModel" targetConnections="//@children.1/@children.2/@sourceConnections.1" location="42,380" size="16,53" sequenceItemContainer="//@children.0" length="53"> - <sourceConnections xsi:type="editmodel:SequenceMessageEditModel" name="SignPerform" id="at.asit.pdfover.pdfsignator/PDFSignatorInterface#SignPerform(Lat.asit.pdfover.pdfsigner.SigningState;)" source="//@children.0/@children.2" target="//@children.1/@children.2" targetEnd="//@children.0/@children.2/@sourceConnections.0/@children.1" sourceEnd="//@children.0/@children.2/@sourceConnections.0/@children.0" connectionRouterKind="Manual" associatedMethod="SignPerform(SigningState): SignResult" associatedSequenceNumber="3" associatedReturnArrow="//@children.1/@children.2/@sourceConnections.1" shouldShowReturnArrow="true"> - <children xsi:type="editmodel:SequenceEndEditModel" anchorKind="FixedAtEdge" attachSource="true" userLabel="//@children.0/@children.2/@sourceConnections.0/@children.0/@children.0" methodLabel="//@children.0/@children.2/@sourceConnections.0/@children.0/@children.1" sequenceNumberLabel="//@children.0/@children.2/@sourceConnections.0/@children.0/@children.2" statementExpression="//@children.0/@children.2/@sourceConnections.0/@children.0/@children.3"> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - <children xsi:type="editmodel:LabelEditModel" name="SignPerform(SigningState): SignResult" size="219,13"/> - <children xsi:type="editmodel:LabelEditModel" name="3" size="7,13"/> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - </children> - <children xsi:type="editmodel:SequenceEndEditModel" anchorKind="FixedAtEdge" userLabel="//@children.0/@children.2/@sourceConnections.0/@children.1/@children.0" methodLabel="//@children.0/@children.2/@sourceConnections.0/@children.1/@children.1" sequenceNumberLabel="//@children.0/@children.2/@sourceConnections.0/@children.1/@children.2" statementExpression="//@children.0/@children.2/@sourceConnections.0/@children.1/@children.3"> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - <children xsi:type="editmodel:LabelEditModel" size="0,13"/> - <children xsi:type="editmodel:LabelEditModel" size="0,13"/> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - </children> - </sourceConnections> - </children> - </children> - <children xsi:type="editmodel:InstanceEditModel" name="PDFSignatorInterface" location="254,20" size="240,543" id="at.asit.pdfover.pdfsignator/PDFSignatorInterface" itemName="PDFSignator"> - <children xsi:type="editmodel:ActivationEditModel" targetConnections="//@children.0/@children.0/@sourceConnections.0 //@children.2/@children.1/@sourceConnections.0" location="112,102" size="16,138" sequenceItemContainer="//@children.1" length="138"> - <sourceConnections xsi:type="editmodel:SequenceMessageEditModel" source="//@children.1/@children.0" target="//@children.2" targetEnd="//@children.1/@children.0/@sourceConnections.0/@children.1" sourceEnd="//@children.1/@children.0/@sourceConnections.0/@children.0" connectionRouterKind="Manual" associatedMethod="" associatedSequenceNumber="1.1" creation="true"> - <children xsi:type="editmodel:SequenceEndEditModel" location="13,8" anchorKind="FixedAtEdge" attachSource="true" userLabel="//@children.1/@children.0/@sourceConnections.0/@children.0/@children.0" methodLabel="//@children.1/@children.0/@sourceConnections.0/@children.0/@children.1" sequenceNumberLabel="//@children.1/@children.0/@sourceConnections.0/@children.0/@children.2" statementExpression="//@children.1/@children.0/@sourceConnections.0/@children.0/@children.3"> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - <children xsi:type="editmodel:LabelEditModel" size="0,13"/> - <children xsi:type="editmodel:LabelEditModel" name="1.1" size="18,13"/> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - </children> - <children xsi:type="editmodel:SequenceEndEditModel" location="0,40" anchorKind="FixedAtEdge" userLabel="//@children.1/@children.0/@sourceConnections.0/@children.1/@children.0" methodLabel="//@children.1/@children.0/@sourceConnections.0/@children.1/@children.1" sequenceNumberLabel="//@children.1/@children.0/@sourceConnections.0/@children.1/@children.2" statementExpression="//@children.1/@children.0/@sourceConnections.0/@children.1/@children.3"> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - <children xsi:type="editmodel:LabelEditModel" size="0,13"/> - <children xsi:type="editmodel:LabelEditModel" size="0,13"/> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - </children> - </sourceConnections> - <sourceConnections xsi:type="editmodel:SequenceMessageEditModel" name="GetParameter" id="at.asit.pdfover.pdfsigner/PDFSignerInterface#GetParameter()" source="//@children.1/@children.0" target="//@children.2/@children.1" targetEnd="//@children.1/@children.0/@sourceConnections.1/@children.1" sourceEnd="//@children.1/@children.0/@sourceConnections.1/@children.0" connectionRouterKind="Manual" associatedMethod="GetParameter(): SignatureParameter" associatedSequenceNumber="1.2" associatedReturnArrow="//@children.2/@children.1/@sourceConnections.0" shouldShowReturnArrow="true"> - <children xsi:type="editmodel:SequenceEndEditModel" location="10,98" anchorKind="FixedAtEdge" attachSource="true" userLabel="//@children.1/@children.0/@sourceConnections.1/@children.0/@children.0" methodLabel="//@children.1/@children.0/@sourceConnections.1/@children.0/@children.1" sequenceNumberLabel="//@children.1/@children.0/@sourceConnections.1/@children.0/@children.2" statementExpression="//@children.1/@children.0/@sourceConnections.1/@children.0/@children.3"> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - <children xsi:type="editmodel:LabelEditModel" name="GetParameter(): SignatureParameter" size="211,13"/> - <children xsi:type="editmodel:LabelEditModel" name="1.2" size="18,13"/> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - </children> - <children xsi:type="editmodel:SequenceEndEditModel" anchorKind="FixedAtEdge" userLabel="//@children.1/@children.0/@sourceConnections.1/@children.1/@children.0" methodLabel="//@children.1/@children.0/@sourceConnections.1/@children.1/@children.1" sequenceNumberLabel="//@children.1/@children.0/@sourceConnections.1/@children.1/@children.2" statementExpression="//@children.1/@children.0/@sourceConnections.1/@children.1/@children.3"> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - <children xsi:type="editmodel:LabelEditModel" size="0,13"/> - <children xsi:type="editmodel:LabelEditModel" size="0,13"/> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - </children> - </sourceConnections> - <sourceConnections xsi:type="editmodel:ReturnArrowEditModel" source="//@children.1/@children.0" target="//@children.0/@children.0" targetEnd="//@children.1/@children.0/@sourceConnections.2/@children.1" sourceEnd="//@children.1/@children.0/@sourceConnections.2/@children.0" connectionRouterKind="Manual"> - <children xsi:type="editmodel:SequenceEndEditModel" location="0,138" anchorKind="FixedAtEdge" attachSource="true" userLabel="//@children.1/@children.0/@sourceConnections.2/@children.0/@children.0" methodLabel="//@children.1/@children.0/@sourceConnections.2/@children.0/@children.1" sequenceNumberLabel="//@children.1/@children.0/@sourceConnections.2/@children.0/@children.2" statementExpression="//@children.1/@children.0/@sourceConnections.2/@children.0/@children.3"> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - <children xsi:type="editmodel:LabelEditModel" size="0,13"/> - <children xsi:type="editmodel:LabelEditModel" size="0,13"/> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - </children> - <children xsi:type="editmodel:SequenceEndEditModel" location="0,138" anchorKind="FixedAtEdge" userLabel="//@children.1/@children.0/@sourceConnections.2/@children.1/@children.0" methodLabel="//@children.1/@children.0/@sourceConnections.2/@children.1/@children.1" sequenceNumberLabel="//@children.1/@children.0/@sourceConnections.2/@children.1/@children.2" statementExpression="//@children.1/@children.0/@sourceConnections.2/@children.1/@children.3"> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - <children xsi:type="editmodel:LabelEditModel" size="0,13"/> - <children xsi:type="editmodel:LabelEditModel" size="0,13"/> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - </children> - </sourceConnections> - </children> - <children xsi:type="editmodel:ActivationEditModel" targetConnections="//@children.0/@children.1/@sourceConnections.0 //@children.2/@children.2/@sourceConnections.0" location="112,278" size="16,55" sequenceItemContainer="//@children.1" length="55"> - <sourceConnections xsi:type="editmodel:SequenceMessageEditModel" name="Prepare" id="at.asit.pdfover.pdfsigner/PDFSignerInterface#Prepare(Lat.asit.pdfover.pdfsigner.SignatureParameter;)" source="//@children.1/@children.1" target="//@children.2/@children.2" targetEnd="//@children.1/@children.1/@sourceConnections.0/@children.1" sourceEnd="//@children.1/@children.1/@sourceConnections.0/@children.0" connectionRouterKind="Manual" associatedMethod="Prepare(SignatureParameter): SigningState" associatedSequenceNumber="2.1" associatedReturnArrow="//@children.2/@children.2/@sourceConnections.0" shouldShowReturnArrow="true"> - <children xsi:type="editmodel:SequenceEndEditModel" location="11,15" anchorKind="FixedAtEdge" attachSource="true" userLabel="//@children.1/@children.1/@sourceConnections.0/@children.0/@children.0" methodLabel="//@children.1/@children.1/@sourceConnections.0/@children.0/@children.1" sequenceNumberLabel="//@children.1/@children.1/@sourceConnections.0/@children.0/@children.2" statementExpression="//@children.1/@children.1/@sourceConnections.0/@children.0/@children.3"> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - <children xsi:type="editmodel:LabelEditModel" name="Prepare(SignatureParameter): SigningState" size="248,13"/> - <children xsi:type="editmodel:LabelEditModel" name="2.1" size="18,13"/> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - </children> - <children xsi:type="editmodel:SequenceEndEditModel" anchorKind="FixedAtEdge" userLabel="//@children.1/@children.1/@sourceConnections.0/@children.1/@children.0" methodLabel="//@children.1/@children.1/@sourceConnections.0/@children.1/@children.1" sequenceNumberLabel="//@children.1/@children.1/@sourceConnections.0/@children.1/@children.2" statementExpression="//@children.1/@children.1/@sourceConnections.0/@children.1/@children.3"> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - <children xsi:type="editmodel:LabelEditModel" size="0,13"/> - <children xsi:type="editmodel:LabelEditModel" size="0,13"/> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - </children> - </sourceConnections> - <sourceConnections xsi:type="editmodel:ReturnArrowEditModel" source="//@children.1/@children.1" target="//@children.0/@children.1" targetEnd="//@children.1/@children.1/@sourceConnections.1/@children.1" sourceEnd="//@children.1/@children.1/@sourceConnections.1/@children.0" connectionRouterKind="Manual"> - <children xsi:type="editmodel:SequenceEndEditModel" location="0,55" anchorKind="FixedAtEdge" attachSource="true" userLabel="//@children.1/@children.1/@sourceConnections.1/@children.0/@children.0" methodLabel="//@children.1/@children.1/@sourceConnections.1/@children.0/@children.1" sequenceNumberLabel="//@children.1/@children.1/@sourceConnections.1/@children.0/@children.2" statementExpression="//@children.1/@children.1/@sourceConnections.1/@children.0/@children.3"> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - <children xsi:type="editmodel:LabelEditModel" size="0,13"/> - <children xsi:type="editmodel:LabelEditModel" size="0,13"/> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - </children> - <children xsi:type="editmodel:SequenceEndEditModel" location="0,55" anchorKind="FixedAtEdge" userLabel="//@children.1/@children.1/@sourceConnections.1/@children.1/@children.0" methodLabel="//@children.1/@children.1/@sourceConnections.1/@children.1/@children.1" sequenceNumberLabel="//@children.1/@children.1/@sourceConnections.1/@children.1/@children.2" statementExpression="//@children.1/@children.1/@sourceConnections.1/@children.1/@children.3"> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - <children xsi:type="editmodel:LabelEditModel" size="0,13"/> - <children xsi:type="editmodel:LabelEditModel" size="0,13"/> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - </children> - </sourceConnections> - </children> - <children xsi:type="editmodel:ActivationEditModel" targetConnections="//@children.0/@children.2/@sourceConnections.0 //@children.2/@children.3/@sourceConnections.0" location="112,380" size="16,53" sequenceItemContainer="//@children.1" length="53"> - <sourceConnections xsi:type="editmodel:SequenceMessageEditModel" name="Sign" id="at.asit.pdfover.pdfsigner/PDFSignerInterface#Sign(Lat.asit.pdfover.pdfsigner.SigningState;)" source="//@children.1/@children.2" target="//@children.2/@children.3" targetEnd="//@children.1/@children.2/@sourceConnections.0/@children.1" sourceEnd="//@children.1/@children.2/@sourceConnections.0/@children.0" connectionRouterKind="Manual" associatedMethod="Sign(SigningState): SignResult" associatedSequenceNumber="3.1" associatedReturnArrow="//@children.2/@children.3/@sourceConnections.0" shouldShowReturnArrow="true"> - <children xsi:type="editmodel:SequenceEndEditModel" location="11,13" anchorKind="FixedAtEdge" attachSource="true" userLabel="//@children.1/@children.2/@sourceConnections.0/@children.0/@children.0" methodLabel="//@children.1/@children.2/@sourceConnections.0/@children.0/@children.1" sequenceNumberLabel="//@children.1/@children.2/@sourceConnections.0/@children.0/@children.2" statementExpression="//@children.1/@children.2/@sourceConnections.0/@children.0/@children.3"> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - <children xsi:type="editmodel:LabelEditModel" name="Sign(SigningState): SignResult" size="173,13"/> - <children xsi:type="editmodel:LabelEditModel" name="3.1" size="18,13"/> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - </children> - <children xsi:type="editmodel:SequenceEndEditModel" anchorKind="FixedAtEdge" userLabel="//@children.1/@children.2/@sourceConnections.0/@children.1/@children.0" methodLabel="//@children.1/@children.2/@sourceConnections.0/@children.1/@children.1" sequenceNumberLabel="//@children.1/@children.2/@sourceConnections.0/@children.1/@children.2" statementExpression="//@children.1/@children.2/@sourceConnections.0/@children.1/@children.3"> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - <children xsi:type="editmodel:LabelEditModel" size="0,13"/> - <children xsi:type="editmodel:LabelEditModel" size="0,13"/> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - </children> - </sourceConnections> - <sourceConnections xsi:type="editmodel:ReturnArrowEditModel" source="//@children.1/@children.2" target="//@children.0/@children.2" targetEnd="//@children.1/@children.2/@sourceConnections.1/@children.1" sourceEnd="//@children.1/@children.2/@sourceConnections.1/@children.0" connectionRouterKind="Manual"> - <children xsi:type="editmodel:SequenceEndEditModel" location="0,53" anchorKind="FixedAtEdge" attachSource="true" userLabel="//@children.1/@children.2/@sourceConnections.1/@children.0/@children.0" methodLabel="//@children.1/@children.2/@sourceConnections.1/@children.0/@children.1" sequenceNumberLabel="//@children.1/@children.2/@sourceConnections.1/@children.0/@children.2" statementExpression="//@children.1/@children.2/@sourceConnections.1/@children.0/@children.3"> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - <children xsi:type="editmodel:LabelEditModel" size="0,13"/> - <children xsi:type="editmodel:LabelEditModel" size="0,13"/> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - </children> - <children xsi:type="editmodel:SequenceEndEditModel" location="0,53" anchorKind="FixedAtEdge" userLabel="//@children.1/@children.2/@sourceConnections.1/@children.1/@children.0" methodLabel="//@children.1/@children.2/@sourceConnections.1/@children.1/@children.1" sequenceNumberLabel="//@children.1/@children.2/@sourceConnections.1/@children.1/@children.2" statementExpression="//@children.1/@children.2/@sourceConnections.1/@children.1/@children.3"> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - <children xsi:type="editmodel:LabelEditModel" size="0,13"/> - <children xsi:type="editmodel:LabelEditModel" size="0,13"/> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - </children> - </sourceConnections> - </children> - </children> - <children xsi:type="editmodel:InstanceEditModel" targetConnections="//@children.1/@children.0/@sourceConnections.0" name="PDFSignerInterface" location="598,90" size="268,473" id="at.asit.pdfover.pdfsigner/PDFSignerInterface" itemName="PDFSignerInterface" creatingActivation="//@children.2/@children.0" creation="true"> - <children xsi:type="editmodel:ActivationEditModel" location="126,80" size="16,40" sequenceItemContainer="//@children.2"/> - <children xsi:type="editmodel:ActivationEditModel" targetConnections="//@children.1/@children.0/@sourceConnections.1" location="126,130" size="16,40" sequenceItemContainer="//@children.2"> - <sourceConnections xsi:type="editmodel:ReturnArrowEditModel" source="//@children.2/@children.1" target="//@children.1/@children.0" targetEnd="//@children.2/@children.1/@sourceConnections.0/@children.1" sourceEnd="//@children.2/@children.1/@sourceConnections.0/@children.0" connectionRouterKind="Manual"> - <children xsi:type="editmodel:SequenceEndEditModel" location="0,40" anchorKind="FixedAtEdge" attachSource="true" userLabel="//@children.2/@children.1/@sourceConnections.0/@children.0/@children.0" methodLabel="//@children.2/@children.1/@sourceConnections.0/@children.0/@children.1" sequenceNumberLabel="//@children.2/@children.1/@sourceConnections.0/@children.0/@children.2" statementExpression="//@children.2/@children.1/@sourceConnections.0/@children.0/@children.3"> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - <children xsi:type="editmodel:LabelEditModel" size="0,13"/> - <children xsi:type="editmodel:LabelEditModel" size="0,13"/> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - </children> - <children xsi:type="editmodel:SequenceEndEditModel" location="0,138" anchorKind="FixedAtEdge" userLabel="//@children.2/@children.1/@sourceConnections.0/@children.1/@children.0" methodLabel="//@children.2/@children.1/@sourceConnections.0/@children.1/@children.1" sequenceNumberLabel="//@children.2/@children.1/@sourceConnections.0/@children.1/@children.2" statementExpression="//@children.2/@children.1/@sourceConnections.0/@children.1/@children.3"> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - <children xsi:type="editmodel:LabelEditModel" size="0,13"/> - <children xsi:type="editmodel:LabelEditModel" size="0,13"/> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - </children> - </sourceConnections> - </children> - <children xsi:type="editmodel:ActivationEditModel" targetConnections="//@children.1/@children.1/@sourceConnections.0" location="126,223" size="16,40" sequenceItemContainer="//@children.2"> - <sourceConnections xsi:type="editmodel:ReturnArrowEditModel" source="//@children.2/@children.2" target="//@children.1/@children.1" targetEnd="//@children.2/@children.2/@sourceConnections.0/@children.1" sourceEnd="//@children.2/@children.2/@sourceConnections.0/@children.0" connectionRouterKind="Manual"> - <children xsi:type="editmodel:SequenceEndEditModel" location="0,40" anchorKind="FixedAtEdge" attachSource="true" userLabel="//@children.2/@children.2/@sourceConnections.0/@children.0/@children.0" methodLabel="//@children.2/@children.2/@sourceConnections.0/@children.0/@children.1" sequenceNumberLabel="//@children.2/@children.2/@sourceConnections.0/@children.0/@children.2" statementExpression="//@children.2/@children.2/@sourceConnections.0/@children.0/@children.3"> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - <children xsi:type="editmodel:LabelEditModel" size="0,13"/> - <children xsi:type="editmodel:LabelEditModel" size="0,13"/> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - </children> - <children xsi:type="editmodel:SequenceEndEditModel" location="0,55" anchorKind="FixedAtEdge" userLabel="//@children.2/@children.2/@sourceConnections.0/@children.1/@children.0" methodLabel="//@children.2/@children.2/@sourceConnections.0/@children.1/@children.1" sequenceNumberLabel="//@children.2/@children.2/@sourceConnections.0/@children.1/@children.2" statementExpression="//@children.2/@children.2/@sourceConnections.0/@children.1/@children.3"> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - <children xsi:type="editmodel:LabelEditModel" size="0,13"/> - <children xsi:type="editmodel:LabelEditModel" size="0,13"/> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - </children> - </sourceConnections> - </children> - <children xsi:type="editmodel:ActivationEditModel" targetConnections="//@children.1/@children.2/@sourceConnections.0" location="126,323" size="16,40" sequenceItemContainer="//@children.2"> - <sourceConnections xsi:type="editmodel:ReturnArrowEditModel" source="//@children.2/@children.3" target="//@children.1/@children.2" targetEnd="//@children.2/@children.3/@sourceConnections.0/@children.1" sourceEnd="//@children.2/@children.3/@sourceConnections.0/@children.0" connectionRouterKind="Manual"> - <children xsi:type="editmodel:SequenceEndEditModel" location="0,40" anchorKind="FixedAtEdge" attachSource="true" userLabel="//@children.2/@children.3/@sourceConnections.0/@children.0/@children.0" methodLabel="//@children.2/@children.3/@sourceConnections.0/@children.0/@children.1" sequenceNumberLabel="//@children.2/@children.3/@sourceConnections.0/@children.0/@children.2" statementExpression="//@children.2/@children.3/@sourceConnections.0/@children.0/@children.3"> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - <children xsi:type="editmodel:LabelEditModel" size="0,13"/> - <children xsi:type="editmodel:LabelEditModel" size="0,13"/> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - </children> - <children xsi:type="editmodel:SequenceEndEditModel" location="0,53" anchorKind="FixedAtEdge" userLabel="//@children.2/@children.3/@sourceConnections.0/@children.1/@children.0" methodLabel="//@children.2/@children.3/@sourceConnections.0/@children.1/@children.1" sequenceNumberLabel="//@children.2/@children.3/@sourceConnections.0/@children.1/@children.2" statementExpression="//@children.2/@children.3/@sourceConnections.0/@children.1/@children.3"> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - <children xsi:type="editmodel:LabelEditModel" size="0,13"/> - <children xsi:type="editmodel:LabelEditModel" size="0,13"/> - <children xsi:type="editmodel:MessageLabelEditModel" size="0,13"/> - </children> - </sourceConnections> - </children> - </children> - <diagramOptions xsi:type="options:SequenceDiagramOptions" level="0" properties="Product=eUML2" autoName="false"/> - <boardSetting snapToGeometry="true" gridEnabled="true" gridSpacing="15,15" gridOrigin="0,0" rulerUnit="pixel" gridVisibility="false"> - <leftRuler/> - <topRuler/> - </boardSetting> - <sequenceDiagramPreferences showPopupBars="true" showConnectionHandles="true"/> -</editmodel:SequenceDiagramEditModel> diff --git a/pdf-over/pdf-signator/pom.xml b/pdf-over/pdf-signator/pom.xml deleted file mode 100644 index f66bc3c9..00000000 --- a/pdf-over/pdf-signator/pom.xml +++ /dev/null @@ -1,10 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>pdf-over</artifactId> - <groupId>at.a-sit</groupId> - <version>4.0-SNAPSHOT</version> - <relativePath>..</relativePath> - </parent> - <artifactId>pdf-signator</artifactId> -</project>
\ No newline at end of file diff --git a/pdf-over/pdf-signer-interface/pom.xml b/pdf-over/pdf-signer-interface/pom.xml index 6b70ebb1..47c84098 100644 --- a/pdf-over/pdf-signer-interface/pom.xml +++ b/pdf-over/pdf-signer-interface/pom.xml @@ -8,7 +8,6 @@ </parent> <artifactId>pdf-signer-interface</artifactId> <name>PDFSignator Interface</name> - <version>0.1-SNAPSHOT</version> <inceptionYear>2012</inceptionYear> <url>http://www.buergerkarte.at/</url> </project>
\ No newline at end of file diff --git a/pdf-over/pdf-signer-interface/src/main/java/at/asit/pdfover/pdfsigner/CollimatingMark.java b/pdf-over/pdf-signer-interface/src/main/java/at/asit/pdfover/pdfsigner/CollimatingMark.java index ad956fa7..cfca74fa 100644 --- a/pdf-over/pdf-signer-interface/src/main/java/at/asit/pdfover/pdfsigner/CollimatingMark.java +++ b/pdf-over/pdf-signer-interface/src/main/java/at/asit/pdfover/pdfsigner/CollimatingMark.java @@ -1,5 +1,6 @@ package at.asit.pdfover.pdfsigner; -public class CollimatingMark { - +public interface CollimatingMark { + + public String GetFileName(); } diff --git a/pdf-over/pdf-signer-interface/src/main/java/at/asit/pdfover/pdfsigner/PDFSignator.java b/pdf-over/pdf-signer-interface/src/main/java/at/asit/pdfover/pdfsigner/PDFSignator.java new file mode 100644 index 00000000..9fb14b4a --- /dev/null +++ b/pdf-over/pdf-signer-interface/src/main/java/at/asit/pdfover/pdfsigner/PDFSignator.java @@ -0,0 +1,68 @@ +package at.asit.pdfover.pdfsigner; + +import java.util.HashMap; +import java.util.Map; + +/** + * PDF Signator Interface + * @author afitzek + */ +public class PDFSignator { + + protected static Map<PDFSigner, PDFSignerFactory> _factory; + + // Let Factory choose if instance can be cached or not + //protected static Map<PDFSigner, PDFSignerInterface> _signer; + + static { + //_signer = new HashMap<PDFSigner, PDFSignerInterface>(); + _factory = new HashMap<PDFSigner, PDFSignerFactory>(); + + + try { + @SuppressWarnings("rawtypes") + Class pdfAsClass = Class.forName("at.asit.pdfover.pdfsigner.pdfas.PDFASSignerFactory"); + PDFSignerFactory factory = (PDFSignerFactory)pdfAsClass.newInstance(); + RegisterPDFSigner(factory.GetPDFSignerType(), factory); + } catch (ClassNotFoundException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (InstantiationException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (IllegalAccessException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + } + + public static void RegisterPDFSigner(PDFSigner signer, PDFSignerFactory factory) { + _factory.put(signer, factory); + } + + protected static PDFSignerInterface GetSigner(PDFSigner signer) throws PDFSignatureException { + /*if (_signer.containsKey(signer)) { + return _signer.get(signer); + }*/ + + if(_factory.containsKey(signer)) { + //_signer.put(signer, _factory.get(signer).CreatePDFSigner()); + return _factory.get(signer).CreatePDFSigner(); + } else { + throw new PDFSignatureException("Unknown PDF Library: " + signer.toString()); + } + + //return _signer.get(signer); + } + + /** + * Gets a PDF Signer according to the chosen pdf signer library + * @param signer + * @return + * @throws PDFSignatureException + */ + public static PDFSignerInterface GetPDFSigner(PDFSigner signer) throws PDFSignatureException { + return GetSigner(signer); + } +} diff --git a/pdf-over/pdf-signator-interface/src/main/java/at/asit/pdfover/pdfsignator/PDFSigner.java b/pdf-over/pdf-signer-interface/src/main/java/at/asit/pdfover/pdfsigner/PDFSigner.java index 6d8da945..332c111b 100644 --- a/pdf-over/pdf-signator-interface/src/main/java/at/asit/pdfover/pdfsignator/PDFSigner.java +++ b/pdf-over/pdf-signer-interface/src/main/java/at/asit/pdfover/pdfsigner/PDFSigner.java @@ -1,7 +1,7 @@ /** * */ -package at.asit.pdfover.pdfsignator; +package at.asit.pdfover.pdfsigner; /** * Available PDF Signer libraries @@ -12,5 +12,9 @@ public enum PDFSigner { * @uml.property name="pDFAS" * @uml.associationEnd */ - PDFAS + PDFAS { + public String toString() { + return "PDFAS"; + } + } } diff --git a/pdf-over/pdf-signer-interface/src/main/java/at/asit/pdfover/pdfsigner/PDFSignerFactory.java b/pdf-over/pdf-signer-interface/src/main/java/at/asit/pdfover/pdfsigner/PDFSignerFactory.java new file mode 100644 index 00000000..348c649a --- /dev/null +++ b/pdf-over/pdf-signer-interface/src/main/java/at/asit/pdfover/pdfsigner/PDFSignerFactory.java @@ -0,0 +1,6 @@ +package at.asit.pdfover.pdfsigner; + +public abstract class PDFSignerFactory { + public abstract PDFSignerInterface CreatePDFSigner(); + public abstract PDFSigner GetPDFSignerType(); +} diff --git a/pdf-over/pdf-signer-interface/src/main/java/at/asit/pdfover/pdfsigner/SignResultImpl.java b/pdf-over/pdf-signer-interface/src/main/java/at/asit/pdfover/pdfsigner/SignResultImpl.java index 433ad093..72a08d1f 100644 --- a/pdf-over/pdf-signer-interface/src/main/java/at/asit/pdfover/pdfsigner/SignResultImpl.java +++ b/pdf-over/pdf-signer-interface/src/main/java/at/asit/pdfover/pdfsigner/SignResultImpl.java @@ -7,7 +7,7 @@ public class SignResultImpl implements SignResult { private SignaturePosition position; private DocumentSource source; private X509Certificate certificate; - + @Override public SignaturePosition GetSignaturePosition() { return position; diff --git a/pdf-over/pdf-signer-interface/src/main/java/at/asit/pdfover/pdfsigner/SignatureParameter.java b/pdf-over/pdf-signer-interface/src/main/java/at/asit/pdfover/pdfsigner/SignatureParameter.java index 422b2c75..5876f1ef 100644 --- a/pdf-over/pdf-signer-interface/src/main/java/at/asit/pdfover/pdfsigner/SignatureParameter.java +++ b/pdf-over/pdf-signer-interface/src/main/java/at/asit/pdfover/pdfsigner/SignatureParameter.java @@ -1,5 +1,7 @@ package at.asit.pdfover.pdfsigner; +import java.util.HashMap; + /** * The Signature Parameter * @author afitzek @@ -102,5 +104,23 @@ public abstract class SignatureParameter { this.collimark = value; } + protected HashMap<String, String> _properties = new HashMap<String, String>(); + + /** + * Sets generic properties + * @param key + * @param value + */ + public void SetProperty(String key, String value) { + this._properties.put(key, value); + } + /** + * Gets generic properties + * @param key + * @return + */ + public String GetProperty(String key) { + return this._properties.get(key); + } } diff --git a/pdf-over/pdf-signer-interface/src/main/java/at/asit/pdfover/pdfsigner/SigningState.java b/pdf-over/pdf-signer-interface/src/main/java/at/asit/pdfover/pdfsigner/SigningState.java index ac0c736a..d1920135 100644 --- a/pdf-over/pdf-signer-interface/src/main/java/at/asit/pdfover/pdfsigner/SigningState.java +++ b/pdf-over/pdf-signer-interface/src/main/java/at/asit/pdfover/pdfsigner/SigningState.java @@ -10,11 +10,11 @@ public interface SigningState { * Gets the Security Layer Request to create the signature * @return The SL Signature Request */ - public SLRequest GetSLSignatureRequest(); + public abstract SLRequest GetSLSignatureRequest(); /** * Sets the Security Layer Request to create the signature * @param value The SL Signature Request */ - public void SetSLSignatureResponse(SLResponse value); + public abstract void SetSLSignatureResponse(SLResponse value); } diff --git a/pdf-over/pdf-signer-interface/src/model/PDFSignerInterface.ucd b/pdf-over/pdf-signer-interface/src/model/PDFSignerInterface.ucd index 450dd84c..b0c3edf6 100644 --- a/pdf-over/pdf-signer-interface/src/model/PDFSignerInterface.ucd +++ b/pdf-over/pdf-signer-interface/src/model/PDFSignerInterface.ucd @@ -1,12 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> -<editmodel:ClassDiagramEditModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:editmodel="editmodel.xmi" xmlns:options="options.xmi" name="PDFSignerInterface" size="2958,1133" id="at.asit.pdfover.pdfsigner" metadata="uml2-1.0" initialized="true" zoom="0.46313799621928164" tag="1000" key="32303037303533312D31303030207064662D7369676E65722D696E746572666163652F616669747A656B"> - <children xsi:type="editmodel:InterfaceEditModel" name="SigningState" location="456,157" size="320,99" id="at.asit.pdfover.pdfsigner/SigningState" runTimeClassModel="GetSLSignatureRequest(),SetSLSignatureResponse(Lat.asit.pdfover.pdfsigner.SLResponse;)"> +<editmodel:ClassDiagramEditModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:editmodel="editmodel.xmi" xmlns:options="options.xmi" name="PDFSignerInterface" size="2958,1133" id="at.asit.pdfover.pdfsigner" metadata="uml2-1.0" initialized="true" scrolledY="305" tag="1000" key="32303037303533312D31303030207064662D7369676E65722D696E746572666163652F616669747A656B"> + <children xsi:type="editmodel:InterfaceEditModel" targetConnections="//@children.1/@sourceConnections.1" name="SigningState" location="456,157" size="320,99" id="at.asit.pdfover.pdfsigner/SigningState" runTimeClassModel="GetSLSignatureRequest(),SetSLSignatureResponse(Lat.asit.pdfover.pdfsigner.SLResponse;)"> <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/> <children xsi:type="editmodel:CompartmentEditModel" size="297,36"> <children xsi:type="editmodel:MethodEditModel" name="GetSLSignatureRequest" id="at.asit.pdfover.pdfsigner/SigningState#GetSLSignatureRequest()"/> <children xsi:type="editmodel:MethodEditModel" name="SetSLSignatureResponse" id="at.asit.pdfover.pdfsigner/SigningState#SetSLSignatureResponse(Lat.asit.pdfover.pdfsigner.SLResponse;)"/> </children> <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/> + <sourceConnections xsi:type="editmodel:DependencyEditModel" autoLocated="true" id="at.asit.pdfover.pdfsigner/SigningState-Soyatec::Import->at.asit.pdfover.pdfsigner/SLRequest" source="//@children.0" target="//@children.2" targetEnd="//@children.0/@sourceConnections.0/@children.2" label="//@children.0/@sourceConnections.0/@children.0" sourceEnd="//@children.0/@sourceConnections.0/@children.1" connectionRouterKind="Manual"> + <children xsi:type="editmodel:WireLabelEditModel" name="«Import»" size="51,13" anchorKind="MiddlePart"/> + <children xsi:type="editmodel:AssociationEndEditModel" location="36,99" attachSource="true"/> + <children xsi:type="editmodel:AssociationEndEditModel" location="222,0"/> + </sourceConnections> + <sourceConnections xsi:type="editmodel:DependencyEditModel" autoLocated="true" id="at.asit.pdfover.pdfsigner/SigningState-Soyatec::Import->at.asit.pdfover.pdfsigner/SLResponse" source="//@children.0" target="//@children.3" targetEnd="//@children.0/@sourceConnections.1/@children.2" label="//@children.0/@sourceConnections.1/@children.0" sourceEnd="//@children.0/@sourceConnections.1/@children.1" connectionRouterKind="Manual"> + <children xsi:type="editmodel:WireLabelEditModel" name="«Import»" size="51,13" anchorKind="MiddlePart"/> + <children xsi:type="editmodel:AssociationEndEditModel" location="0,96" attachSource="true"/> + <children xsi:type="editmodel:AssociationEndEditModel" location="210,12"/> + </sourceConnections> <classifierPreferences xsi:type="editmodel:UMLClassDiagramClassifierPreference" showStereotype="true" showMethodsParameterTypes="true" showMethodsReturnType="true" showMethodsParameterNames="true" showMethodsParameterKinds="true" attributeSorter="Natural" methodSorter="Natural" innerClassSorter="Natural" showPublicAttributes="true" showStaticAttributes="true" showPublicMethods="true" showStaticMethods="true" showPublicInnerClasses="true" showPackageInnerClasses="true" showStaticInnerClasses="true" packageIndication="3" showAttributeProperty="true"/> </children> <children xsi:type="editmodel:InterfaceEditModel" name="PDFSignerInterface" location="211,14" size="376,117" id="at.asit.pdfover.pdfsigner/PDFSignerInterface" runTimeClassModel="GetParameter(),Prepare(Lat.asit.pdfover.pdfsigner.SignatureParameter;),Sign(Lat.asit.pdfover.pdfsigner.SigningState;)"> @@ -17,23 +27,46 @@ <children xsi:type="editmodel:MethodEditModel" name="Sign" id="at.asit.pdfover.pdfsigner/PDFSignerInterface#Sign(Lat.asit.pdfover.pdfsigner.SigningState;)"/> </children> <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/> + <sourceConnections xsi:type="editmodel:DependencyEditModel" autoLocated="true" id="at.asit.pdfover.pdfsigner/PDFSignerInterface-Soyatec::Import->at.asit.pdfover.pdfsigner/SignResult" source="//@children.1" target="//@children.4" targetEnd="//@children.1/@sourceConnections.0/@children.2" label="//@children.1/@sourceConnections.0/@children.0" sourceEnd="//@children.1/@sourceConnections.0/@children.1" connectionRouterKind="Manual"> + <children xsi:type="editmodel:WireLabelEditModel" name="«Import»" size="51,13" anchorKind="MiddlePart"/> + <children xsi:type="editmodel:AssociationEndEditModel" location="57,117" attachSource="true"/> + <children xsi:type="editmodel:AssociationEndEditModel" location="224,0"/> + </sourceConnections> + <sourceConnections xsi:type="editmodel:DependencyEditModel" autoLocated="true" id="at.asit.pdfover.pdfsigner/PDFSignerInterface-Soyatec::Import->at.asit.pdfover.pdfsigner/SigningState" source="//@children.1" target="//@children.0" targetEnd="//@children.1/@sourceConnections.1/@children.2" label="//@children.1/@sourceConnections.1/@children.0" sourceEnd="//@children.1/@sourceConnections.1/@children.1" connectionRouterKind="Manual"> + <children xsi:type="editmodel:WireLabelEditModel" name="«Import»" size="51,13" anchorKind="MiddlePart"/> + <children xsi:type="editmodel:AssociationEndEditModel" location="310,117" attachSource="true"/> + <children xsi:type="editmodel:AssociationEndEditModel" location="65,0"/> + </sourceConnections> + <sourceConnections xsi:type="editmodel:DependencyEditModel" autoLocated="true" id="at.asit.pdfover.pdfsigner/PDFSignerInterface-Soyatec::Import->at.asit.pdfover.pdfsigner/SignatureParameter" source="//@children.1" target="//@children.8" targetEnd="//@children.1/@sourceConnections.2/@children.2" label="//@children.1/@sourceConnections.2/@children.0" sourceEnd="//@children.1/@sourceConnections.2/@children.1" connectionRouterKind="Manual"> + <children xsi:type="editmodel:WireLabelEditModel" name="«Import»" size="51,13" anchorKind="MiddlePart"/> + <children xsi:type="editmodel:AssociationEndEditModel" location="273,117" attachSource="true"/> + <children xsi:type="editmodel:AssociationEndEditModel" location="102,0"/> + </sourceConnections> <classifierPreferences xsi:type="editmodel:UMLClassDiagramClassifierPreference" showStereotype="true" showMethodsParameterTypes="true" showMethodsReturnType="true" showMethodsParameterNames="true" showMethodsParameterKinds="true" attributeSorter="Natural" methodSorter="Natural" innerClassSorter="Natural" showPublicAttributes="true" showStaticAttributes="true" showPublicMethods="true" showStaticMethods="true" showPublicInnerClasses="true" showPackageInnerClasses="true" showStaticInnerClasses="true" packageIndication="3" showAttributeProperty="true"/> </children> - <children xsi:type="editmodel:ClassEditModel" name="SLRequest" location="270,279" size="260,68" id="at.asit.pdfover.pdfsigner/SLRequest" runTimeClassModel="GetSignatureData()"> + <children xsi:type="editmodel:ClassEditModel" targetConnections="//@children.0/@sourceConnections.0" name="SLRequest" location="270,279" size="260,68" id="at.asit.pdfover.pdfsigner/SLRequest" runTimeClassModel="GetSignatureData()"> <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/> <children xsi:type="editmodel:CompartmentEditModel" size="237,18"> <children xsi:type="editmodel:MethodEditModel" name="GetSignatureData" id="at.asit.pdfover.pdfsigner/SLRequest#GetSignatureData()"/> </children> <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/> + <sourceConnections xsi:type="editmodel:DependencyEditModel" autoLocated="true" id="at.asit.pdfover.pdfsigner/SLRequest-Soyatec::Import->at.asit.pdfover.pdfsigner/DocumentSource" source="//@children.2" target="//@children.9" targetEnd="//@children.2/@sourceConnections.0/@children.2" label="//@children.2/@sourceConnections.0/@children.0" sourceEnd="//@children.2/@sourceConnections.0/@children.1" connectionRouterKind="Manual"> + <children xsi:type="editmodel:WireLabelEditModel" name="«Import»" size="51,13" anchorKind="MiddlePart"/> + <children xsi:type="editmodel:AssociationEndEditModel" location="56,68" attachSource="true"/> + <children xsi:type="editmodel:AssociationEndEditModel" location="222,1"/> + </sourceConnections> <classifierPreferences xsi:type="editmodel:UMLClassDiagramClassifierPreference" showStereotype="true" showMethodsParameterTypes="true" showMethodsReturnType="true" showMethodsParameterNames="true" showMethodsParameterKinds="true" attributeSorter="Natural" methodSorter="Natural" innerClassSorter="Natural" showPublicAttributes="true" showStaticAttributes="true" showPublicMethods="true" showStaticMethods="true" showPublicInnerClasses="true" showPackageInnerClasses="true" showStaticInnerClasses="true" packageIndication="3" showAttributeProperty="true"/> </children> - <children xsi:type="editmodel:ClassEditModel" name="SLResponse" location="44,299" size="131,30" id="at.asit.pdfover.pdfsigner/SLResponse" runTimeClassModel=""> - <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/> + <children xsi:type="editmodel:ClassEditModel" targetConnections="//@children.0/@sourceConnections.1" name="SLResponse" location="44,299" size="210,86" id="at.asit.pdfover.pdfsigner/SLResponse" runTimeClassModel="SLResponse(Ljava.lang.String;),GetSLRespone()"> <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/> + <children xsi:type="editmodel:CompartmentEditModel" size="187,36"> + <children xsi:type="editmodel:MethodEditModel" name="GetSLRespone" id="at.asit.pdfover.pdfsigner/SLResponse#GetSLRespone()"/> + <children xsi:type="editmodel:MethodEditModel" name="SLResponse" id="at.asit.pdfover.pdfsigner/SLResponse#SLResponse(Ljava.lang.String;)"/> + </children> <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/> <classifierPreferences xsi:type="editmodel:UMLClassDiagramClassifierPreference" showStereotype="true" showMethodsParameterTypes="true" showMethodsReturnType="true" showMethodsParameterNames="true" showMethodsParameterKinds="true" attributeSorter="Natural" methodSorter="Natural" innerClassSorter="Natural" showPublicAttributes="true" showStaticAttributes="true" showPublicMethods="true" showStaticMethods="true" showPublicInnerClasses="true" showPackageInnerClasses="true" showStaticInnerClasses="true" packageIndication="3" showAttributeProperty="true"/> </children> - <children xsi:type="editmodel:InterfaceEditModel" name="SignResult" location="44,149" size="282,117" id="at.asit.pdfover.pdfsigner/SignResult" runTimeClassModel="GetSignedDocument(),GetSignerCertificate(),GetSignaturePosition()"> + <children xsi:type="editmodel:InterfaceEditModel" targetConnections="//@children.1/@sourceConnections.0" name="SignResult" location="44,149" size="282,117" id="at.asit.pdfover.pdfsigner/SignResult" runTimeClassModel="GetSignedDocument(),GetSignerCertificate(),GetSignaturePosition()"> <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/> <children xsi:type="editmodel:CompartmentEditModel" size="259,54"> <children xsi:type="editmodel:MethodEditModel" name="GetSignaturePosition" id="at.asit.pdfover.pdfsigner/SignResult#GetSignaturePosition()"/> @@ -41,9 +74,19 @@ <children xsi:type="editmodel:MethodEditModel" name="GetSignerCertificate" id="at.asit.pdfover.pdfsigner/SignResult#GetSignerCertificate()"/> </children> <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/> + <sourceConnections xsi:type="editmodel:DependencyEditModel" autoLocated="true" id="at.asit.pdfover.pdfsigner/SignResult-Soyatec::Import->at.asit.pdfover.pdfsigner/SignaturePosition" source="//@children.4" target="//@children.6" targetEnd="//@children.4/@sourceConnections.0/@children.2" label="//@children.4/@sourceConnections.0/@children.0" sourceEnd="//@children.4/@sourceConnections.0/@children.1" connectionRouterKind="Manual"> + <children xsi:type="editmodel:WireLabelEditModel" name="«Import»" size="51,13" anchorKind="MiddlePart"/> + <children xsi:type="editmodel:AssociationEndEditModel" location="186,117" attachSource="true"/> + <children xsi:type="editmodel:AssociationEndEditModel" location="74,0"/> + </sourceConnections> + <sourceConnections xsi:type="editmodel:DependencyEditModel" autoLocated="true" id="at.asit.pdfover.pdfsigner/SignResult-Soyatec::Import->at.asit.pdfover.pdfsigner/DocumentSource" source="//@children.4" target="//@children.9" targetEnd="//@children.4/@sourceConnections.1/@children.2" label="//@children.4/@sourceConnections.1/@children.0" sourceEnd="//@children.4/@sourceConnections.1/@children.1" connectionRouterKind="Manual"> + <children xsi:type="editmodel:WireLabelEditModel" name="«Import»" size="51,13" anchorKind="MiddlePart"/> + <children xsi:type="editmodel:AssociationEndEditModel" location="110,117" attachSource="true"/> + <children xsi:type="editmodel:AssociationEndEditModel" location="111,0"/> + </sourceConnections> <classifierPreferences xsi:type="editmodel:UMLClassDiagramClassifierPreference" showStereotype="true" showMethodsParameterTypes="true" showMethodsReturnType="true" showMethodsParameterNames="true" showMethodsParameterKinds="true" attributeSorter="Natural" methodSorter="Natural" innerClassSorter="Natural" showPublicAttributes="true" showStaticAttributes="true" showPublicMethods="true" showStaticMethods="true" showPublicInnerClasses="true" showPackageInnerClasses="true" showStaticInnerClasses="true" packageIndication="3" showAttributeProperty="true"/> </children> - <children xsi:type="editmodel:ClassEditModel" name="SignatureDimension" location="48,659" size="314,140" id="at.asit.pdfover.pdfsigner/SignatureDimension" runTimeClassModel="SetHeight(I),SignatureDimension(II),GetWidth(),GetHeight(),SetWidth(I)"> + <children xsi:type="editmodel:ClassEditModel" targetConnections="//@children.8/@sourceConnections.1" name="SignatureDimension" location="48,659" size="314,140" id="at.asit.pdfover.pdfsigner/SignatureDimension" runTimeClassModel="SetHeight(I),SignatureDimension(II),GetWidth(),GetHeight(),SetWidth(I)"> <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/> <children xsi:type="editmodel:CompartmentEditModel" size="291,90"> <children xsi:type="editmodel:MethodEditModel" name="GetHeight" id="at.asit.pdfover.pdfsigner/SignatureDimension#GetHeight()"/> @@ -55,41 +98,45 @@ <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/> <classifierPreferences xsi:type="editmodel:UMLClassDiagramClassifierPreference" showStereotype="true" showMethodsParameterTypes="true" showMethodsReturnType="true" showMethodsParameterNames="true" showMethodsParameterKinds="true" attributeSorter="Natural" methodSorter="Natural" innerClassSorter="Natural" showPublicAttributes="true" showStaticAttributes="true" showPublicMethods="true" showStaticMethods="true" showPublicInnerClasses="true" showPackageInnerClasses="true" showStaticInnerClasses="true" packageIndication="3" showAttributeProperty="true"/> </children> - <children xsi:type="editmodel:ClassEditModel" targetConnections="//@children.8/@sourceConnections.0" name="SignaturePosition" location="458,659" size="317,212" id="at.asit.pdfover.pdfsigner/SignaturePosition" runTimeClassModel="GetPage(),SignaturePosition(),SignaturePosition(III),GetX(),SetPage(I),SetX(I),SignaturePosition(II),SetY(I),GetY()"> + <children xsi:type="editmodel:ClassEditModel" targetConnections="//@children.8/@sourceConnections.0 //@children.4/@sourceConnections.0 //@children.8/@sourceConnections.3" name="SignaturePosition" location="458,659" size="339,248" id="at.asit.pdfover.pdfsigner/SignaturePosition" runTimeClassModel="GetPage(),SignaturePosition(),GetAuto(),GetX(),SetPage(I),SignaturePosition(FFI),SetX(F),SignaturePosition(FF),SetAuto(Z),SetY(F),GetY()"> <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/> - <children xsi:type="editmodel:CompartmentEditModel" size="294,162"> + <children xsi:type="editmodel:CompartmentEditModel" size="316,198"> <children xsi:type="editmodel:MethodEditModel" name="GetPage" id="at.asit.pdfover.pdfsigner/SignaturePosition#GetPage()"/> <children xsi:type="editmodel:MethodEditModel" name="GetX" id="at.asit.pdfover.pdfsigner/SignaturePosition#GetX()"/> <children xsi:type="editmodel:MethodEditModel" name="GetY" id="at.asit.pdfover.pdfsigner/SignaturePosition#GetY()"/> <children xsi:type="editmodel:MethodEditModel" name="SetPage" id="at.asit.pdfover.pdfsigner/SignaturePosition#SetPage(I)"/> - <children xsi:type="editmodel:MethodEditModel" name="SetX" id="at.asit.pdfover.pdfsigner/SignaturePosition#SetX(I)"/> - <children xsi:type="editmodel:MethodEditModel" name="SetY" id="at.asit.pdfover.pdfsigner/SignaturePosition#SetY(I)"/> - <children xsi:type="editmodel:MethodEditModel" name="SignaturePosition" id="at.asit.pdfover.pdfsigner/SignaturePosition#SignaturePosition(II)"/> - <children xsi:type="editmodel:MethodEditModel" name="SignaturePosition" id="at.asit.pdfover.pdfsigner/SignaturePosition#SignaturePosition(III)"/> <children xsi:type="editmodel:MethodEditModel" name="SignaturePosition" id="at.asit.pdfover.pdfsigner/SignaturePosition#SignaturePosition()"/> + <children xsi:type="editmodel:MethodEditModel" name="SetX" id="at.asit.pdfover.pdfsigner/SignaturePosition#SetX(F)"/> + <children xsi:type="editmodel:MethodEditModel" name="SetAuto" id="at.asit.pdfover.pdfsigner/SignaturePosition#SetAuto(Z)"/> + <children xsi:type="editmodel:MethodEditModel" name="SetY" id="at.asit.pdfover.pdfsigner/SignaturePosition#SetY(F)"/> + <children xsi:type="editmodel:MethodEditModel" name="SignaturePosition" id="at.asit.pdfover.pdfsigner/SignaturePosition#SignaturePosition(FF)"/> + <children xsi:type="editmodel:MethodEditModel" name="GetAuto" id="at.asit.pdfover.pdfsigner/SignaturePosition#GetAuto()"/> + <children xsi:type="editmodel:MethodEditModel" name="SignaturePosition" id="at.asit.pdfover.pdfsigner/SignaturePosition#SignaturePosition(FFI)"/> </children> <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/> <classifierPreferences xsi:type="editmodel:UMLClassDiagramClassifierPreference" showStereotype="true" showMethodsParameterTypes="true" showMethodsReturnType="true" showMethodsParameterNames="true" showMethodsParameterKinds="true" attributeSorter="Natural" methodSorter="Natural" innerClassSorter="Natural" showPublicAttributes="true" showStaticAttributes="true" showPublicMethods="true" showStaticMethods="true" showPublicInnerClasses="true" showPackageInnerClasses="true" showStaticInnerClasses="true" packageIndication="3" showAttributeProperty="true"/> </children> - <children xsi:type="editmodel:ClassEditModel" name="CollimatingMark" location="45,510" size="162,30" id="at.asit.pdfover.pdfsigner/CollimatingMark" runTimeClassModel=""> - <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/> + <children xsi:type="editmodel:ClassEditModel" targetConnections="//@children.8/@sourceConnections.2" name="CollimatingMark" location="45,510" size="167,68" id="at.asit.pdfover.pdfsigner/CollimatingMark" runTimeClassModel="GetFileName()"> <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/> + <children xsi:type="editmodel:CompartmentEditModel" size="144,18"> + <children xsi:type="editmodel:MethodEditModel" name="GetFileName" id="at.asit.pdfover.pdfsigner/CollimatingMark#GetFileName()"/> + </children> <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/> <sourceConnections xsi:type="editmodel:AssociationEditModel" autoLocated="true" id="at.asit.pdfover.pdfsigner/CollimatingMark@collimark+at.asit.pdfover.pdfsigner/SignatureParameter@" source="//@children.7" target="//@children.8" targetEnd="//@children.7/@sourceConnections.0/@children.2" label="//@children.7/@sourceConnections.0/@children.0" sourceEnd="//@children.7/@sourceConnections.0/@children.1" connectionRouterKind="Manhattan"> <children xsi:type="editmodel:WireLabelEditModel" size="0,13" anchorKind="MiddlePart"/> - <children xsi:type="editmodel:AssociationEndEditModel" name="collimark" location="162,15" id="at.asit.pdfover.pdfsigner/CollimatingMark@collimark+at.asit.pdfover.pdfsigner/SignatureParameter@|at.asit.pdfover.pdfsigner/CollimatingMark#collimark" attachSource="true" multiplicityLabel="//@children.7/@sourceConnections.0/@children.1/@children.1" roleLabel="//@children.7/@sourceConnections.0/@children.1/@children.0" navigable="true"> - <children xsi:type="editmodel:LabelEditModel" name=" # collimark" location="212,504" size="68,13" anchorKind="FirstPart"/> - <children xsi:type="editmodel:LabelEditModel" name="0..1" location="212,531" size="22,13" anchorKind="FirstPart"/> + <children xsi:type="editmodel:AssociationEndEditModel" name="collimark" location="167,63" id="at.asit.pdfover.pdfsigner/CollimatingMark@collimark+at.asit.pdfover.pdfsigner/SignatureParameter@|at.asit.pdfover.pdfsigner/CollimatingMark#collimark" attachSource="true" multiplicityLabel="//@children.7/@sourceConnections.0/@children.1/@children.1" roleLabel="//@children.7/@sourceConnections.0/@children.1/@children.0" navigable="true"> + <children xsi:type="editmodel:LabelEditModel" name=" # collimark" location="219,580" size="68,13" anchorKind="FirstPart"/> + <children xsi:type="editmodel:LabelEditModel" name="0..1" location="219,553" size="22,13" anchorKind="FirstPart"/> </children> - <children xsi:type="editmodel:AssociationEndEditModel" location="0,136" id="at.asit.pdfover.pdfsigner/CollimatingMark@collimark+at.asit.pdfover.pdfsigner/SignatureParameter@|at.asit.pdfover.pdfsigner/SignatureParameter#" roleLabel="//@children.7/@sourceConnections.0/@children.2/@children.0"> - <children xsi:type="editmodel:LabelEditModel" location="373,504" size="0,13" anchorKind="LastPart"/> + <children xsi:type="editmodel:AssociationEndEditModel" location="0,158" id="at.asit.pdfover.pdfsigner/CollimatingMark@collimark+at.asit.pdfover.pdfsigner/SignatureParameter@|at.asit.pdfover.pdfsigner/SignatureParameter#" roleLabel="//@children.7/@sourceConnections.0/@children.2/@children.0"> + <children xsi:type="editmodel:LabelEditModel" location="375,527" size="0,13" anchorKind="LastPart"/> </children> </sourceConnections> <classifierPreferences xsi:type="editmodel:UMLClassDiagramClassifierPreference" showStereotype="true" showMethodsParameterTypes="true" showMethodsReturnType="true" showMethodsParameterNames="true" showMethodsParameterKinds="true" attributeSorter="Natural" methodSorter="Natural" innerClassSorter="Natural" showPublicAttributes="true" showStaticAttributes="true" showPublicMethods="true" showStaticMethods="true" showPublicInnerClasses="true" showPackageInnerClasses="true" showStaticInnerClasses="true" packageIndication="3" showAttributeProperty="true"/> </children> - <children xsi:type="editmodel:ClassEditModel" targetConnections="//@children.7/@sourceConnections.0 //@children.9/@sourceConnections.0" name="SignatureParameter" location="382,389" size="394,212" id="at.asit.pdfover.pdfsigner/SignatureParameter" runTimeClassModel="GetCollimatingMark(),GetInputDocument(),SetKeyIdentifier(Ljava.lang.String;),GetPlaceholderDimension(),GetKeyIdentifier(),GetSignaturePosition(),SetCollimatingMark(Lat.asit.pdfover.pdfsigner.CollimatingMark;),SetSignaturePosition(Lat.asit.pdfover.pdfsigner.SignaturePosition;),SetInputDocument(Lat.asit.pdfover.pdfsigner.DocumentSource;)"> + <children xsi:type="editmodel:ClassEditModel" targetConnections="//@children.7/@sourceConnections.0 //@children.9/@sourceConnections.0 //@children.1/@sourceConnections.2" name="SignatureParameter" location="382,389" size="394,248" id="at.asit.pdfover.pdfsigner/SignatureParameter" runTimeClassModel="GetProperty(Ljava.lang.String;),GetCollimatingMark(),GetInputDocument(),SetKeyIdentifier(Ljava.lang.String;),GetPlaceholderDimension(),SetProperty(Ljava.lang.String;Ljava.lang.String;),GetKeyIdentifier(),GetSignaturePosition(),SetCollimatingMark(Lat.asit.pdfover.pdfsigner.CollimatingMark;),SetSignaturePosition(Lat.asit.pdfover.pdfsigner.SignaturePosition;),SetInputDocument(Lat.asit.pdfover.pdfsigner.DocumentSource;)"> <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/> - <children xsi:type="editmodel:CompartmentEditModel" size="371,162"> + <children xsi:type="editmodel:CompartmentEditModel" size="371,198"> <children xsi:type="editmodel:MethodEditModel" name="GetCollimatingMark" id="at.asit.pdfover.pdfsigner/SignatureParameter#GetCollimatingMark()"/> <children xsi:type="editmodel:MethodEditModel" name="GetInputDocument" id="at.asit.pdfover.pdfsigner/SignatureParameter#GetInputDocument()"/> <children xsi:type="editmodel:MethodEditModel" name="GetKeyIdentifier" location="346,527" id="at.asit.pdfover.pdfsigner/SignatureParameter#GetKeyIdentifier()"/> @@ -99,31 +146,57 @@ <children xsi:type="editmodel:MethodEditModel" name="SetInputDocument" id="at.asit.pdfover.pdfsigner/SignatureParameter#SetInputDocument(Lat.asit.pdfover.pdfsigner.DocumentSource;)"/> <children xsi:type="editmodel:MethodEditModel" name="SetKeyIdentifier" id="at.asit.pdfover.pdfsigner/SignatureParameter#SetKeyIdentifier(Ljava.lang.String;)"/> <children xsi:type="editmodel:MethodEditModel" name="SetSignaturePosition" id="at.asit.pdfover.pdfsigner/SignatureParameter#SetSignaturePosition(Lat.asit.pdfover.pdfsigner.SignaturePosition;)"/> + <children xsi:type="editmodel:MethodEditModel" name="GetProperty" id="at.asit.pdfover.pdfsigner/SignatureParameter#GetProperty(Ljava.lang.String;)"/> + <children xsi:type="editmodel:MethodEditModel" name="SetProperty" id="at.asit.pdfover.pdfsigner/SignatureParameter#SetProperty(Ljava.lang.String;Ljava.lang.String;)"/> </children> <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/> <sourceConnections xsi:type="editmodel:AssociationEditModel" autoLocated="true" id="at.asit.pdfover.pdfsigner/SignaturePosition@signaturePosition+at.asit.pdfover.pdfsigner/SignatureParameter@" source="//@children.8" target="//@children.6" targetEnd="//@children.8/@sourceConnections.0/@children.2" label="//@children.8/@sourceConnections.0/@children.0" sourceEnd="//@children.8/@sourceConnections.0/@children.1" connectionRouterKind="Manhattan"> <children xsi:type="editmodel:WireLabelEditModel" size="0,13" anchorKind="MiddlePart"/> - <children xsi:type="editmodel:AssociationEndEditModel" location="234,212" id="at.asit.pdfover.pdfsigner/SignaturePosition@signaturePosition+at.asit.pdfover.pdfsigner/SignatureParameter@|at.asit.pdfover.pdfsigner/SignatureParameter#" attachSource="true" roleLabel="//@children.8/@sourceConnections.0/@children.1/@children.0"> - <children xsi:type="editmodel:LabelEditModel" location="608,607" size="0,13" anchorKind="FirstPart"/> + <children xsi:type="editmodel:AssociationEndEditModel" location="234,248" id="at.asit.pdfover.pdfsigner/SignaturePosition@signaturePosition+at.asit.pdfover.pdfsigner/SignatureParameter@|at.asit.pdfover.pdfsigner/SignatureParameter#" attachSource="true" roleLabel="//@children.8/@sourceConnections.0/@children.1/@children.0"> + <children xsi:type="editmodel:LabelEditModel" location="609,644" size="0,13" anchorKind="FirstPart"/> </children> <children xsi:type="editmodel:AssociationEndEditModel" name="signaturePosition" location="158,0" id="at.asit.pdfover.pdfsigner/SignaturePosition@signaturePosition+at.asit.pdfover.pdfsigner/SignatureParameter@|at.asit.pdfover.pdfsigner/SignaturePosition#signaturePosition" multiplicityLabel="//@children.8/@sourceConnections.0/@children.2/@children.1" roleLabel="//@children.8/@sourceConnections.0/@children.2/@children.0" navigable="true"> - <children xsi:type="editmodel:LabelEditModel" name=" # signaturePosition" location="622,638" size="116,13" anchorKind="LastPart"/> - <children xsi:type="editmodel:LabelEditModel" name="1" location="601,638" size="7,13" anchorKind="LastPart"/> + <children xsi:type="editmodel:LabelEditModel" name=" # signaturePosition" location="623,639" size="116,13" anchorKind="LastPart"/> + <children xsi:type="editmodel:LabelEditModel" name="1" location="602,639" size="7,13" anchorKind="LastPart"/> </children> </sourceConnections> + <sourceConnections xsi:type="editmodel:DependencyEditModel" autoLocated="true" id="at.asit.pdfover.pdfsigner/SignatureParameter-Soyatec::Import->at.asit.pdfover.pdfsigner/SignatureDimension" source="//@children.8" target="//@children.5" targetEnd="//@children.8/@sourceConnections.1/@children.2" label="//@children.8/@sourceConnections.1/@children.0" sourceEnd="//@children.8/@sourceConnections.1/@children.1" connectionRouterKind="Manual"> + <children xsi:type="editmodel:WireLabelEditModel" name="«Import»" size="51,13" anchorKind="MiddlePart"/> + <children xsi:type="editmodel:AssociationEndEditModel" location="0,238" attachSource="true"/> + <children xsi:type="editmodel:AssociationEndEditModel" location="278,0"/> + </sourceConnections> + <sourceConnections xsi:type="editmodel:DependencyEditModel" autoLocated="true" id="at.asit.pdfover.pdfsigner/SignatureParameter-Soyatec::Import->at.asit.pdfover.pdfsigner/CollimatingMark" source="//@children.8" target="//@children.7" targetEnd="//@children.8/@sourceConnections.2/@children.2" label="//@children.8/@sourceConnections.2/@children.0" sourceEnd="//@children.8/@sourceConnections.2/@children.1" connectionRouterKind="Manual"> + <children xsi:type="editmodel:WireLabelEditModel" name="«Import»" size="51,13" anchorKind="MiddlePart"/> + <children xsi:type="editmodel:AssociationEndEditModel" location="0,154" attachSource="true"/> + <children xsi:type="editmodel:AssociationEndEditModel" location="167,33"/> + </sourceConnections> + <sourceConnections xsi:type="editmodel:DependencyEditModel" autoLocated="true" id="at.asit.pdfover.pdfsigner/SignatureParameter-Soyatec::Import->at.asit.pdfover.pdfsigner/SignaturePosition" source="//@children.8" target="//@children.6" targetEnd="//@children.8/@sourceConnections.3/@children.2" label="//@children.8/@sourceConnections.3/@children.0" sourceEnd="//@children.8/@sourceConnections.3/@children.1" connectionRouterKind="Manual"> + <children xsi:type="editmodel:WireLabelEditModel" name="«Import»" size="51,13" anchorKind="MiddlePart"/> + <children xsi:type="editmodel:AssociationEndEditModel" location="214,248" attachSource="true"/> + <children xsi:type="editmodel:AssociationEndEditModel" location="134,0"/> + </sourceConnections> + <sourceConnections xsi:type="editmodel:DependencyEditModel" autoLocated="true" id="at.asit.pdfover.pdfsigner/SignatureParameter-Soyatec::Import->at.asit.pdfover.pdfsigner/DocumentSource" source="//@children.8" target="//@children.9" targetEnd="//@children.8/@sourceConnections.4/@children.2" label="//@children.8/@sourceConnections.4/@children.0" sourceEnd="//@children.8/@sourceConnections.4/@children.1" connectionRouterKind="Manual"> + <children xsi:type="editmodel:WireLabelEditModel" name="«Import»" size="51,13" anchorKind="MiddlePart"/> + <children xsi:type="editmodel:AssociationEndEditModel" location="0,48" attachSource="true"/> + <children xsi:type="editmodel:AssociationEndEditModel" location="222,89"/> + </sourceConnections> <classifierPreferences xsi:type="editmodel:UMLClassDiagramClassifierPreference" showStereotype="true" showMethodsParameterTypes="true" showMethodsReturnType="true" showMethodsParameterNames="true" showMethodsParameterKinds="true" attributeSorter="Natural" methodSorter="Natural" innerClassSorter="Natural" showPublicAttributes="true" showStaticAttributes="true" showPublicMethods="true" showStaticMethods="true" showPublicInnerClasses="true" showPackageInnerClasses="true" showStaticInnerClasses="true" packageIndication="3" showAttributeProperty="true"/> </children> - <children xsi:type="editmodel:ClassEditModel" name="DocumentSource" location="43,374" size="167,30" id="at.asit.pdfover.pdfsigner/DocumentSource" runTimeClassModel=""> - <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/> + <children xsi:type="editmodel:ClassEditModel" targetConnections="//@children.2/@sourceConnections.0 //@children.4/@sourceConnections.1 //@children.8/@sourceConnections.4" name="DocumentSource" location="43,374" size="222,104" id="at.asit.pdfover.pdfsigner/DocumentSource" runTimeClassModel="GetInputStream(),GetLength(),GetByteArray()"> <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/> + <children xsi:type="editmodel:CompartmentEditModel" size="199,54"> + <children xsi:type="editmodel:MethodEditModel" name="GetLength" id="at.asit.pdfover.pdfsigner/DocumentSource#GetLength()"/> + <children xsi:type="editmodel:MethodEditModel" name="GetByteArray" id="at.asit.pdfover.pdfsigner/DocumentSource#GetByteArray()"/> + <children xsi:type="editmodel:MethodEditModel" name="GetInputStream" id="at.asit.pdfover.pdfsigner/DocumentSource#GetInputStream()"/> + </children> <children xsi:type="editmodel:CompartmentEditModel" size="0,0"/> <sourceConnections xsi:type="editmodel:AssociationEditModel" autoLocated="true" id="at.asit.pdfover.pdfsigner/DocumentSource@documentSource+at.asit.pdfover.pdfsigner/SignatureParameter@" source="//@children.9" target="//@children.8" targetEnd="//@children.9/@sourceConnections.0/@children.2" label="//@children.9/@sourceConnections.0/@children.0" sourceEnd="//@children.9/@sourceConnections.0/@children.1" connectionRouterKind="Manhattan"> <children xsi:type="editmodel:WireLabelEditModel" size="0,13" anchorKind="MiddlePart"/> - <children xsi:type="editmodel:AssociationEndEditModel" name="documentSource" location="147,22" id="at.asit.pdfover.pdfsigner/DocumentSource@documentSource+at.asit.pdfover.pdfsigner/SignatureParameter@|at.asit.pdfover.pdfsigner/DocumentSource#documentSource" attachSource="true" multiplicityLabel="//@children.9/@sourceConnections.0/@children.1/@children.1" roleLabel="//@children.9/@sourceConnections.0/@children.1/@children.0" navigable="true"> - <children xsi:type="editmodel:LabelEditModel" name=" # documentSource" location="216,375" size="113,13" anchorKind="FirstPart"/> - <children xsi:type="editmodel:LabelEditModel" name="1" location="216,402" size="7,13" anchorKind="FirstPart"/> + <children xsi:type="editmodel:AssociationEndEditModel" name="documentSource" location="222,59" id="at.asit.pdfover.pdfsigner/DocumentSource@documentSource+at.asit.pdfover.pdfsigner/SignatureParameter@|at.asit.pdfover.pdfsigner/DocumentSource#documentSource" attachSource="true" multiplicityLabel="//@children.9/@sourceConnections.0/@children.1/@children.1" roleLabel="//@children.9/@sourceConnections.0/@children.1/@children.0" navigable="true"> + <children xsi:type="editmodel:LabelEditModel" name=" # documentSource" location="272,458" size="113,13" anchorKind="FirstPart"/> + <children xsi:type="editmodel:LabelEditModel" name="1" location="272,431" size="7,13" anchorKind="FirstPart"/> </children> - <children xsi:type="editmodel:AssociationEndEditModel" location="0,7" id="at.asit.pdfover.pdfsigner/DocumentSource@documentSource+at.asit.pdfover.pdfsigner/SignatureParameter@|at.asit.pdfover.pdfsigner/SignatureParameter#"/> + <children xsi:type="editmodel:AssociationEndEditModel" location="0,44" id="at.asit.pdfover.pdfsigner/DocumentSource@documentSource+at.asit.pdfover.pdfsigner/SignatureParameter@|at.asit.pdfover.pdfsigner/SignatureParameter#"/> </sourceConnections> <classifierPreferences xsi:type="editmodel:UMLClassDiagramClassifierPreference" showStereotype="true" showMethodsParameterTypes="true" showMethodsReturnType="true" showMethodsParameterNames="true" showMethodsParameterKinds="true" attributeSorter="Natural" methodSorter="Natural" innerClassSorter="Natural" showPublicAttributes="true" showStaticAttributes="true" showPublicMethods="true" showStaticMethods="true" showPublicInnerClasses="true" showPackageInnerClasses="true" showStaticInnerClasses="true" packageIndication="3" showAttributeProperty="true"/> </children> diff --git a/pdf-over/pdf-signer-pdf-as/pom.xml b/pdf-over/pdf-signer-pdf-as/pom.xml index e71691f2..eea1568a 100644 --- a/pdf-over/pdf-signer-pdf-as/pom.xml +++ b/pdf-over/pdf-signer-pdf-as/pom.xml @@ -12,7 +12,7 @@ <dependency> <groupId>at.a-sit</groupId> <artifactId>pdf-signer-interface</artifactId> - <version>0.1-SNAPSHOT</version> + <version>4.0-SNAPSHOT</version> </dependency> <dependency> <groupId>knowcenter</groupId> diff --git a/pdf-over/pdf-signer-pdf-as/src/main/java/at/asit/pdfover/pdfsigner/pdfas/PDFASSigner.java b/pdf-over/pdf-signer-pdf-as/src/main/java/at/asit/pdfover/pdfsigner/pdfas/PDFASSigner.java index f94f3fdf..0cbaef1b 100644 --- a/pdf-over/pdf-signer-pdf-as/src/main/java/at/asit/pdfover/pdfsigner/pdfas/PDFASSigner.java +++ b/pdf-over/pdf-signer-pdf-as/src/main/java/at/asit/pdfover/pdfsigner/pdfas/PDFASSigner.java @@ -18,15 +18,15 @@ import at.gv.egiz.pdfas.api.internal.LocalBKUParams; import at.gv.egiz.pdfas.api.internal.PdfAsInternal; /** - * PDF AS Signer Implemtation + * PDF AS Signer Implementation * * @author afitzek */ public class PDFASSigner implements PDFSignerInterface { - protected static final String PROFILE_ID = ""; + protected static final String PROFILE_ID = "SIGNATURBLOCK_DE"; - protected static final String URL_TEMPLATE = ""; + protected static final String URL_TEMPLATE = "http://pdfover.4.gv.at/template"; @Override public SigningState Prepare(SignatureParameter parameter) @@ -53,15 +53,12 @@ public class PDFASSigner implements PDFSignerInterface { params.setSignatureProfileId(PROFILE_ID); if(parameter.GetCollimatingMark() != null) { - // TODO: Define CollimatingMark and use - params.setProfileOverrideValue("SIG_LABEL", "./images/signatur-logo_en.png"); + params.setProfileOverrideValue("SIG_LABEL", parameter.GetCollimatingMark().GetFileName()); } - params.setDocument(sign_para.GetPDFASDataSource()); state.setSignParameters(params); - PdfAsInternal pdfasInternal = PDFASHelper.GetPdfAsInternal(); @@ -114,7 +111,6 @@ public class PDFASSigner implements PDFSignerInterface { LocalBKUParams bkuParams = new LocalBKUParams(null, null, null); // Perform signature - // TODO: NEED TO check GetSLSignatureResponse() Interface to retrieve SL Response ... at.gv.egiz.pdfas.api.sign.SignResult signResult = pdfasInternal .finishLocalSign(pdfas, params, sdi, bkuParams, false, sstate.GetSLSignatureResponse().GetSLRespone()); diff --git a/pdf-over/pdf-signer-pdf-as/src/main/java/at/asit/pdfover/pdfsigner/pdfas/PDFASSignerFactory.java b/pdf-over/pdf-signer-pdf-as/src/main/java/at/asit/pdfover/pdfsigner/pdfas/PDFASSignerFactory.java new file mode 100644 index 00000000..2545578b --- /dev/null +++ b/pdf-over/pdf-signer-pdf-as/src/main/java/at/asit/pdfover/pdfsigner/pdfas/PDFASSignerFactory.java @@ -0,0 +1,19 @@ +package at.asit.pdfover.pdfsigner.pdfas; + +import at.asit.pdfover.pdfsigner.PDFSigner; +import at.asit.pdfover.pdfsigner.PDFSignerFactory; +import at.asit.pdfover.pdfsigner.PDFSignerInterface; + +public class PDFASSignerFactory extends PDFSignerFactory { + + @Override + public PDFSignerInterface CreatePDFSigner() { + return new PDFASSigner(); + } + + @Override + public PDFSigner GetPDFSignerType() { + return PDFSigner.PDFAS; + } + +} diff --git a/pdf-over/pom.xml b/pdf-over/pom.xml index 13547627..55c7a7fc 100644 --- a/pdf-over/pom.xml +++ b/pdf-over/pom.xml @@ -68,7 +68,7 @@ <modules> <module>pdf-signer-interface</module> <module>pdf-signer-pdf-as</module> - <module>pdf-signator-interface</module> - <module>pdf-signator</module> + + </modules> </project> |