From cd3d7bc859c07dadb47219c1a38af1d3b8981a52 Mon Sep 17 00:00:00 2001 From: gregor Date: Wed, 26 Nov 2003 17:08:12 +0000 Subject: Zwischenstand Implementierung Feature 54. git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@63 d688527b-c9ab-4aba-bd8d-4036d912da1d --- .../src/at/gv/egovernment/moa/spss/api/SPSSFactory.java | 4 +++- .../at/gv/egovernment/moa/spss/api/common/MetaInfo.java | 6 ++++++ .../gv/egovernment/moa/spss/api/impl/MetaInfoImpl.java | 16 ++++++++++++++++ .../egovernment/moa/spss/api/impl/SPSSFactoryImpl.java | 4 +++- .../moa/spss/api/xmlbind/RequestParserUtils.java | 5 ++++- 5 files changed, 32 insertions(+), 3 deletions(-) (limited to 'spss.server/src/at/gv/egovernment/moa/spss/api') diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/SPSSFactory.java b/spss.server/src/at/gv/egovernment/moa/spss/api/SPSSFactory.java index dfa8927e1..e306127b3 100644 --- a/spss.server/src/at/gv/egovernment/moa/spss/api/SPSSFactory.java +++ b/spss.server/src/at/gv/egovernment/moa/spss/api/SPSSFactory.java @@ -832,6 +832,7 @@ public abstract class SPSSFactory { * @param mimeType The MIME type part of the meta information. * @param description Descriptive meta information. May be null. * @param otherInfo XML meta information. May be null. + * @param type Type information for XML signature creation. May be null. * @return The MetaInfo object containing the above data. * * @pre mimeType != null && mimeType.length() > 0 @@ -841,7 +842,8 @@ public abstract class SPSSFactory { public abstract MetaInfo createMetaInfo( String mimeType, String description, - NodeList otherInfo); + NodeList otherInfo, + String type); /** * Create a CanonicalizationTransform type of Transform. diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/common/MetaInfo.java b/spss.server/src/at/gv/egovernment/moa/spss/api/common/MetaInfo.java index fea0a1b42..56a1793af 100644 --- a/spss.server/src/at/gv/egovernment/moa/spss/api/common/MetaInfo.java +++ b/spss.server/src/at/gv/egovernment/moa/spss/api/common/MetaInfo.java @@ -28,4 +28,10 @@ public interface MetaInfo { * @return The elemental informations. */ public NodeList getAnyElements(); + /** + * Gets the XML signature creation type information of the associated object. + * + * @return the XML signature creation type information of the associated object. + */ + public String getType(); } diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/MetaInfoImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/MetaInfoImpl.java index c435dd8fd..93aceb033 100644 --- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/MetaInfoImpl.java +++ b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/MetaInfoImpl.java @@ -16,6 +16,8 @@ public class MetaInfoImpl implements MetaInfo { private String description; /** Descriptive XML content. */ private NodeList anyElements; + /** Type information for XML signature creation */ + private String type; /** * Sets the MIME type. @@ -56,4 +58,18 @@ public class MetaInfoImpl implements MetaInfo { return anyElements; } + /** + * Sets the XML signature creation type information. + * + * @param type the XML signature creation type information to set. + */ + public void setType(String type) { + this.type = type; + } + + public String getType() { + return type; + } + + } diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/SPSSFactoryImpl.java b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/SPSSFactoryImpl.java index a953c2af3..bf15bf37e 100644 --- a/spss.server/src/at/gv/egovernment/moa/spss/api/impl/SPSSFactoryImpl.java +++ b/spss.server/src/at/gv/egovernment/moa/spss/api/impl/SPSSFactoryImpl.java @@ -472,11 +472,13 @@ public class SPSSFactoryImpl extends SPSSFactory { public MetaInfo createMetaInfo( String mimeType, String description, - NodeList otherInfo) { + NodeList otherInfo, + String type) { MetaInfoImpl metaInfo = new MetaInfoImpl(); metaInfo.setMimeType(mimeType); metaInfo.setDescription(description); metaInfo.setAnyElements(otherInfo); + metaInfo.setType(type); return metaInfo; } diff --git a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/RequestParserUtils.java b/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/RequestParserUtils.java index a41b14df0..9e8c7d0e2 100644 --- a/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/RequestParserUtils.java +++ b/spss.server/src/at/gv/egovernment/moa/spss/api/xmlbind/RequestParserUtils.java @@ -32,6 +32,7 @@ public class RequestParserUtils { private static final String REFERENCE_ATTR_NAME = "Reference"; private static final String MIME_TYPE_XPATH = MOA + "MimeType"; private static final String DESCRIPTION_XPATH = MOA + "Description"; + private static final String TYPE_XPATH = MOA + "Type"; private static final String XML_ASSOC_CONTENT_XPATH = MOA + "Content"; private static final String CONTENT_XPATH = MOA + "Base64Content | " + MOA + "XMLContent |" + MOA + "LocRefContent"; @@ -71,8 +72,10 @@ public class RequestParserUtils { XPathUtils.getElementValue(metaInfoElem, DESCRIPTION_XPATH, null); NodeList anyOther = XPathUtils.selectNodeList(metaInfoElem, ANY_OTHER_XPATH); + String type = + XPathUtils.getElementValue(metaInfoElem, TYPE_XPATH, null); - return factory.createMetaInfo(mimeType, description, anyOther); + return factory.createMetaInfo(mimeType, description, anyOther, type); } /** -- cgit v1.2.3