Merged feature branch mocca-1.2.13-id@r724 back to trunk.

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@725 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4

1 files changed, 25 insertions, 25 deletions

diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/SignatureContext.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/SignatureContext.java
index 0925f2fd..48c82bd5 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/SignatureContext.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/SignatureContext.java
@@ -16,12 +16,12 @@
 */
 package at.gv.egiz.bku.slcommands.impl.xsect;

 

-import javax.xml.crypto.dsig.DigestMethod;

+import javax.xml.crypto.AlgorithmMethod;
 import javax.xml.crypto.dsig.XMLSignatureFactory;

 

 import org.w3c.dom.Document;

 

-import at.gv.egiz.bku.utils.urldereferencer.URLDereferencerContext;

+import at.gv.egiz.bku.utils.urldereferencer.URLDereferencer;
 

 /**

  * An instance of this class carries context information for a XML-Signature

@@ -45,16 +45,16 @@ public class SignatureContext {
    * The XMLSignatureFactory to create XML signature objects. 

    */

   private XMLSignatureFactory signatureFactory;

+  
+  /**
+   * The URLDereferencer to dereference URLs with.
+   */
+  private URLDereferencer urlDereferencer;
   

   /**

-   * The URLDereferencerContext for dereferencing URLs.

+   * The AlgorithmMethodFactory to create {@link AlgorithmMethod} objects.

    */

-  private URLDereferencerContext dereferencerContext;

-  

-  /**

-   * The DigestMethodFactory to create {@link DigestMethod} objects.

-   */

-  private AlgorithmMethodFactory digestMethodFactory;

+  private AlgorithmMethodFactory algorithmMethodFactory;

 

   /**

    * @return the document

@@ -99,31 +99,31 @@ public class SignatureContext {
   }

 

   /**

-   * @return the dereferencerContext

-   */

-  public URLDereferencerContext getDereferencerContext() {

-    return dereferencerContext;

-  }

-

-  /**

-   * @param dereferencerContext the dereferencerContext to set

-   */

-  public void setDereferencerContext(URLDereferencerContext dereferencerContext) {

-    this.dereferencerContext = dereferencerContext;

-  }

-

-  /**

    * @return the digestMethodFactory

    */

   public AlgorithmMethodFactory getAlgorithmMethodFactory() {

-    return digestMethodFactory;

+    return algorithmMethodFactory;

   }

 

   /**

    * @param digestMethodFactory the digestMethodFactory to set

    */

   public void setAlgorithmMethodFactory(AlgorithmMethodFactory digestMethodFactory) {

-    this.digestMethodFactory = digestMethodFactory;

+    this.algorithmMethodFactory = digestMethodFactory;

+  }
+
+  /**
+   * @return the urlDereferencer
+   */
+  public URLDereferencer getUrlDereferencer() {
+    return urlDereferencer;
+  }
+
+  /**
+   * @param urlDereferencer the urlDereferencer to set
+   */
+  public void setUrlDereferencer(URLDereferencer urlDereferencer) {
+    this.urlDereferencer = urlDereferencer;
   }

 

 }