summaryrefslogtreecommitdiff
path: root/BKUOnline/src/main
diff options
context:
space:
mode:
authortkellner <tkellner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2013-12-13 01:26:39 +0000
committertkellner <tkellner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2013-12-13 01:26:39 +0000
commitd311d0f7b7ef9ed5bc383d6744b7d61239aafbc1 (patch)
treeb48a211d1a907ad7af72027b2b2709ecd540b27c /BKUOnline/src/main
parent8d597612c69c77982c981f711f549bc826b06fd8 (diff)
downloadmocca-d311d0f7b7ef9ed5bc383d6744b7d61239aafbc1.tar.gz
mocca-d311d0f7b7ef9ed5bc383d6744b7d61239aafbc1.tar.bz2
mocca-d311d0f7b7ef9ed5bc383d6744b7d61239aafbc1.zip
Extend STAL to support CMS SignedAttributes
git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@1262 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
Diffstat (limited to 'BKUOnline/src/main')
-rw-r--r--BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALServiceImpl.java4
-rw-r--r--BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.xsd11
2 files changed, 13 insertions, 2 deletions
diff --git a/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALServiceImpl.java b/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALServiceImpl.java
index a1e29870..836d6538 100644
--- a/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALServiceImpl.java
+++ b/BKUOnline/src/main/java/at/gv/egiz/stal/service/impl/STALServiceImpl.java
@@ -408,7 +408,9 @@ public class STALServiceImpl implements STALPortType {
log.info("[TestSession] add SIGN " + keyIdentifier + " request");
SignRequestType sigT = stalObjFactory.createSignRequestType();
sigT.setKeyIdentifier(keyIdentifier);
- sigT.setSignedInfo(TestSignatureData.SIGNED_INFO.get(1)); //select!
+ SignRequestType.SignedInfo sigI = stalObjFactory.createSignRequestTypeSignedInfo();
+ sigI.setValue(TestSignatureData.SIGNED_INFO.get(1));
+ sigT.setSignedInfo(sigI); //select!
reqs.add(stalObjFactory.createGetNextRequestResponseTypeSignRequest(sigT));
}
diff --git a/BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.xsd b/BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.xsd
index b37e8df7..5f96578d 100644
--- a/BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.xsd
+++ b/BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.xsd
@@ -123,7 +123,16 @@
</restriction>
</simpleType>
</element>
- <element name="SignedInfo" type="base64Binary"/>
+ <element name="SignedInfo">
+ <complexType>
+ <simpleContent>
+ <extension base="base64Binary">
+ <attribute name="IsCMSSignedAttributes" type="boolean" default="false"/>
+ </extension>
+ </simpleContent>
+ </complexType>
+ </element>
+ <element name="SignatureMethod" type="string" minOccurs="0"/>
</sequence>
</extension>
</complexContent>