From 41034fdfc18cd6fdeca00cdbb225e6af08825d01 Mon Sep 17 00:00:00 2001 From: tkellner Date: Wed, 25 Jan 2012 14:37:05 +0000 Subject: Reference Type doesn't require version number anymore git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@1014 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4 --- .../main/java/at/gv/egiz/bku/slcommands/impl/xsect/Signature.java | 4 ++-- .../main/java/at/gv/egiz/xades/QualifyingProperties1_4Factory.java | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/Signature.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/Signature.java index bf2bbac4..ebee694b 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/Signature.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/Signature.java @@ -816,7 +816,7 @@ public class Signature { String referenceURI = "#" + objectIdValue; String referenceIdValue = ctx.getIdValueFactory().createIdValue("Reference"); - String referenceType = QualifyingProperties1_4Factory.SIGNED_PROPERTIES_REFERENCE_TYPE_V1_4_1; + String referenceType = QualifyingProperties1_4Factory.SIGNED_PROPERTIES_REFERENCE_TYPE; try { dm = ctx.getAlgorithmMethodFactory().createDigestMethod(ctx); @@ -834,7 +834,7 @@ public class Signature { Node child = fragment.getFirstChild(); if (child instanceof Element) { - NodeList nodes = ((Element) child).getElementsByTagNameNS(QualifyingProperties1_4Factory.NS_URI_V1_4_1, "SignedProperties"); + NodeList nodes = ((Element) child).getElementsByTagNameNS(QualifyingProperties1_4Factory.NS_URI_V1_3_2, "SignedProperties"); if (nodes.getLength() > 0) { IdAttribute idAttribute = new IdAttribute(); idAttribute.element = (Element) nodes.item(0); diff --git a/utils/src/main/java/at/gv/egiz/xades/QualifyingProperties1_4Factory.java b/utils/src/main/java/at/gv/egiz/xades/QualifyingProperties1_4Factory.java index 25acb944..1ac0ce7d 100644 --- a/utils/src/main/java/at/gv/egiz/xades/QualifyingProperties1_4Factory.java +++ b/utils/src/main/java/at/gv/egiz/xades/QualifyingProperties1_4Factory.java @@ -61,9 +61,10 @@ import at.gv.egiz.marshal.MarshallerFactory; public class QualifyingProperties1_4Factory { - public static String NS_URI_V1_4_1 = "http://uri.etsi.org/01903/v1.4.1#"; + public static String NS_URI = "http://uri.etsi.org/01903#"; + public static String NS_URI_V1_3_2 = "http://uri.etsi.org/01903/v1.3.2#"; - public static String SIGNED_PROPERTIES_REFERENCE_TYPE_V1_4_1 = NS_URI_V1_4_1 + "SignedProperties"; + public static String SIGNED_PROPERTIES_REFERENCE_TYPE = NS_URI + "SignedProperties"; private static QualifyingProperties1_4Factory instance; -- cgit v1.2.3