Web-Application: Configuration may be declared via system property "pdf-as.work-dir" or via Servlet-Init-Parameter "work-dir".

Bug fixed in RetrieveSignatureDataServlet: Response header didn't contain a content length attribute. The ITS Mac BKU rejects those requests.
Workaround for ITS Mac BKU integrated. A redirect via response does only work if the response contains a valid SL request (e.g. a NullOperationRequest).
API: The configuration folder may be omitted at instantiating the api. Configuration may be set via system property "pdf-as.work-dir". If no configuration is given at all, the current user's home directory is searched for a folder "PDF-AS". If not found a default configuration is created.
If the configuration is explicitely given than the temporary folder is located within the given directory otherwise within the user's temporary directory.
Declaring the configuration folder, replacements for system properties like "${catalina.base}/conf/pdfas" may be used.
Web-Application: Session is now being invalidated after download of the signed pdf file.
Web-Application: Every hardcoded context "pdf-as" has been replaced.


git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@277 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c

1 files changed, 17 insertions, 18 deletions

diff --git a/src/main/java/at/gv/egiz/pdfas/impl/api/PdfAsObject.java b/src/main/java/at/gv/egiz/pdfas/impl/api/PdfAsObject.java
index b744d2a..303d48f 100644
--- a/src/main/java/at/gv/egiz/pdfas/impl/api/PdfAsObject.java
+++ b/src/main/java/at/gv/egiz/pdfas/impl/api/PdfAsObject.java
@@ -29,6 +29,7 @@ import at.gv.egiz.pdfas.api.verify.VerifyResult;
 import at.gv.egiz.pdfas.api.verify.VerifyResults;

 import at.gv.egiz.pdfas.commandline.CommandlineConnectorChooser;

 import at.gv.egiz.pdfas.exceptions.ErrorCode;

+import at.gv.egiz.pdfas.framework.ConnectorFactory;

 import at.gv.egiz.pdfas.framework.config.SettingsHelper;

 import at.gv.egiz.pdfas.framework.input.ExtractionStage;

 import at.gv.egiz.pdfas.framework.signator.SignatorInformation;

@@ -65,10 +66,6 @@ import at.knowcenter.wag.egov.egiz.sig.SignatureTypes;
  */

 public class PdfAsObject implements PdfAs

 {

-  /**

-   * The work directory.

-   */

-  protected File workDirectory = null;

 

   /**

    * The log.

@@ -86,21 +83,23 @@ public class PdfAsObject implements PdfAs
    */

   public PdfAsObject(File workDirectory) throws PdfAsException

   {

-    if (workDirectory == null)

-    {

-      throw new IllegalArgumentException("The work directory must not be null.");

-    }

-    if (!workDirectory.isDirectory())

-    {

-      throw new IllegalArgumentException("The work directory does not exist or is not a directory. " + workDirectory.getPath());

-    }

-

-    this.workDirectory = workDirectory;

-

-    SettingsReader.initialize(workDirectory.getPath());

+     String path = workDirectory != null ? workDirectory.getPath() : null;

+    SettingsReader.initialize(path, path);

     reloadConfig();

   }

-

+  

+  /**

+   * This constructor is for internal use only - use

+   * {@link at.gv.egiz.pdfas.PdfAsFactory} instead.

+   * 

+   * @throws PdfAsException

+   *           Thrown, if the configuration cannot be processed.

+   */

+  public PdfAsObject() throws PdfAsException

+  {

+     this(null);

+  }

+  

   /**

    * @see at.gv.egiz.pdfas.api.PdfAs#reloadConfig()

    */

@@ -235,7 +234,7 @@ public class PdfAsObject implements PdfAs
     TablePos pos = PosHelper.formTablePos(signParameters.getSignaturePositioning());

 

     String connectorId = CommandlineConnectorChooser.chooseCommandlineConnectorForSign(signParameters.getSignatureDevice());

-

+ 

     SignatorInformation si = PdfAS

         .signCommandline(new PdfDataSourceAdapter(signParameters.getDocument()), new DataSinkAdapter(signParameters.getOutput()), signatorId, connectorId, signParameters.getSignatureProfileId(), pos);