Skip to content

Commit 100af03

Browse files
eivinhbeivinhb
authored
Merge pull request #147 from digipost/jakarta_plus_plus
Upgrade to jakarta for xml schema, marchalling etc.
2 parents dedb28e + fe9d3e5 commit 100af03

File tree

14 files changed

+205
-365
lines changed

14 files changed

+205
-365
lines changed

‎NOTICE‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,20 @@ Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.html
88

99
This software includes third party software subject to the following licenses:
1010

11+
Angus Activation Registries under EDL 1.0
1112
Apache Commons Lang under Apache-2.0
1213
Bouncy Castle Provider under Bouncy Castle Licence
13-
Digipost JAXB Resolver - com.sun.xml.bind under The Apache Software License, Version 2.0
14+
istack common utility code runtime under Eclipse Distribution License - v 1.0
1415
Jakarta Activation API under EDL 1.0
15-
JavaBeans Activation Framework API jar under CDDL/GPLv2+CE
16-
jaxb-api under CDDL 1.1 or GPL2 w/ CPE
17-
JAXB2 Basics - Runtime under BSD-Style License
16+
Jakarta XML Binding API under Eclipse Distribution License - v 1.0
17+
JAXB Core under Eclipse Distribution License - v 1.0
18+
JAXB Runtime under Eclipse Distribution License - v 1.0
19+
JAXB Tools :: JAXB Plugins :: Runtime under BSD-Style License
1820
JCL 1.2 implemented over SLF4J under Apache License, Version 2.0
1921
JUL to SLF4J bridge under MIT License
20-
Old JAXB Core under CDDL+GPL License
21-
Old JAXB Runtime under Eclipse Distribution License - v 1.0
2222
SDP Shared under The Apache Software License, Version 2.0
2323
SDP Shared - API Commons under The Apache Software License, Version 2.0
2424
SDP Shared - XSD & JAXB under The Apache Software License, Version 2.0
2525
SLF4J API Module under MIT License
26+
TXW2 Runtime under Eclipse Distribution License - v 1.0
2627

‎api-commons/pom.xml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45
<artifactId>sdp-api-commons</artifactId>
56
<name>SDP Shared - API Commons</name>
@@ -14,13 +15,17 @@
1415
<dependencies>
1516

1617
<dependency>
17-
<groupId>javax.xml.bind</groupId>
18-
<artifactId>jaxb-api</artifactId>
18+
<groupId>jakarta.xml.bind</groupId>
19+
<artifactId>jakarta.xml.bind-api</artifactId>
1920
</dependency>
2021
<dependency>
2122
<groupId>jakarta.activation</groupId>
2223
<artifactId>jakarta.activation-api</artifactId>
2324
</dependency>
25+
<dependency>
26+
<groupId>org.glassfish.jaxb</groupId>
27+
<artifactId>jaxb-runtime</artifactId>
28+
</dependency>
2429

2530
<dependency>
2631
<groupId>no.digipost</groupId>
@@ -37,7 +42,7 @@
3742
<groupId>org.bouncycastle</groupId>
3843
<artifactId>bcprov-jdk18on</artifactId>
3944
</dependency>
40-
45+
4146
<dependency>
4247
<groupId>org.slf4j</groupId>
4348
<artifactId>slf4j-api</artifactId>

‎api-commons/src/main/java/no/digipost/api/xml/JaxbMarshaller.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package no.digipost.api.xml;
22

3-
import javax.xml.bind.JAXBContext;
4-
import javax.xml.bind.JAXBException;
5-
import javax.xml.bind.Marshaller;
6-
import javax.xml.bind.Unmarshaller;
3+
import jakarta.xml.bind.JAXBContext;
4+
import jakarta.xml.bind.JAXBException;
5+
import jakarta.xml.bind.Marshaller;
6+
import jakarta.xml.bind.Unmarshaller;
7+
78
import javax.xml.transform.Result;
89
import javax.xml.transform.Source;
910
import javax.xml.validation.Schema;

‎api-commons/src/main/java/no/digipost/api/xml/Marshalling.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package no.digipost.api.xml;
22

3+
import jakarta.xml.bind.JAXBElement;
4+
import jakarta.xml.bind.JAXBException;
35
import no.difi.begrep.sdp.schema_v10.SDPKvittering;
46
import no.digipost.org.oasis_open.docs.ebxml_bp.ebbp_signals_2.NonRepudiationInformation;
57
import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.Messaging;
@@ -9,8 +11,6 @@
911
import org.w3c.dom.Node;
1012
import org.xmlsoap.schemas.soap.envelope.Envelope;
1113

12-
import javax.xml.bind.JAXBElement;
13-
import javax.xml.bind.JAXBException;
1414
import javax.xml.transform.stream.StreamSource;
1515
import java.io.InputStream;
1616

‎api-commons/src/test/java/no/digipost/api/xml/UnmarshallingTest.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
package no.digipost.api.xml;
22

33
import no.difi.begrep.sdp.schema_v10.SDPDigitalPost;
4-
import org.junit.jupiter.api.Disabled;
54
import org.junit.jupiter.api.Test;
65

76
import javax.xml.transform.stream.StreamSource;
87

98
import java.io.InputStream;
109

11-
@Disabled
1210
public class UnmarshallingTest {
1311

1412
@Test
15-
public void should_unmashall_schema_valid_xml() {
13+
public void should_unmarshall_schema_valid_xml() {
1614
InputStream xml = getClass().getResourceAsStream("/difi2.xml");
1715
Marshalling.getMarshallerSingleton().unmarshal(new StreamSource(xml), SDPDigitalPost.class);
1816
}

‎api-commons/src/test/resources/difi2.xml‎

Lines changed: 90 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -1,108 +1,97 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<digitalPost xmlns:enc="http://www.w3.org/2001/04/xmlenc#"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xmlns="http://begrep.difi.no/sdp/schema_v10"
5-
xsi:schemaLocation="http://begrep.difi.no/sdp/schema_v10 /Users/gk/digipost/digipost-offentlig/xsd/src/main/difi-begrepskatalog/resources/begrep/sikkerDigitalPost/xsd/sdp-melding.xsd "
6-
>
2+
<digitalPost
3+
xmlns="http://begrep.difi.no/sdp/schema_v10"
4+
xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
5+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
6+
xsi:schemaLocation="http://begrep.difi.no/sdp/schema_v10 ../xsd/sdp-melding.xsd ">
77

8-
<sdpMeldingId>31415926535987</sdpMeldingId>
98

10-
<avsender>
11-
<organisasjon>9908:123456789</organisasjon>
12-
<avsenderidentifikator>123456789-A</avsenderidentifikator>
13-
<fakturaReferanse>asdf</fakturaReferanse>
14-
</avsender>
9+
<Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
10+
<SignedInfo>
11+
<CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
12+
<SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
13+
<Reference URI="">
14+
<Transforms>
15+
<Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
16+
</Transforms>
17+
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
18+
<DigestValue>uooqbWYa5VCqcJCbuymBKqm17vY=</DigestValue>
19+
</Reference>
20+
</SignedInfo>
21+
<SignatureValue xmlns="http://www.w3.org/2000/09/xmldsig#">KedJuTob5gtvYx9qM3k3gm7kbLBwVbEQRl26S2tmXjqNND7MRGtoew==</SignatureValue>
22+
<KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
23+
<X509Data>
24+
<X509Certificate>
25+
MIIElTCCA32gAwIBAgIDDUL8MA0GCSqGSIb3DQEBBQUAMEsxCzAJBgNVBAYTAk5P
26+
MR0wGwYDVQQKDBRCdXlwYXNzIEFTLTk4MzE2MzMyNzEdMBsGA1UEAwwUQnV5cGFz
27+
cyBDbGFzcyAzIENBIDEwHhcNMTEwNTEzMTI0MjU3WhcNMTQwNTEzMTI0MjUzWjBo
28+
MQswCQYDVQQGEwJOTzEYMBYGA1UECgwPUE9TVEVOIE5PUkdFIEFTMREwDwYDVQQL
29+
DAhEaWdpcG9zdDEYMBYGA1UEAwwPUE9TVEVOIE5PUkdFIEFTMRIwEAYDVQQFEwk5
30+
ODQ2NjExODUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC68mb3nPMY
31+
KPN+jOLJCQ8x2it9PxMh8eiZ0cr5oK7C2fPs/3ywwWpav1yQdsLc5zSMQupzmqXN
32+
OoAirP42sO+MonAmsBbgAmJfKepQCBg5CX3qZUuId6kn7BZcPIMzTWF44wc5UrF1
33+
TlE2Ib/1ZS05lJCyLkdqpobBBKXoh2PP3xai5hFo8i+bohhyR+RWNxDnjPyp1mMX
34+
2bLjmD+/g/0QQM3SbwKdjmy7Ylr/2EDrAQ+S0OSjR3G0BnpRCOvhVLcXfjDM1GWq
35+
KIWKnQYFSTMB1cSpkqk9AxMY3MNT/DwUFWOihVlWvVWGjKrTBJC7FZpIqJBchNF4
36+
hiWv4iNI7vYfAgMBAAGjggFjMIIBXzAJBgNVHRMEAjAAMB8GA1UdIwQYMBaAFDgU
37+
5sjwqaQD9E4+IqNb8tbgrUB0MB0GA1UdDgQWBBQQPwlTXTPvyhFL30Sf3TxwhBHM
38+
KjAOBgNVHQ8BAf8EBAMCBLAwFQYDVR0gBA4wDDAKBghghEIBGgEDAjCBpQYDVR0f
39+
BIGdMIGaMC+gLaArhilodHRwOi8vY3JsLmJ1eXBhc3Mubm8vY3JsL0JQQ2xhc3Mz
40+
Q0ExLmNybDBnoGWgY4ZhbGRhcDovL2xkYXAuYnV5cGFzcy5uby9kYz1CdXlwYXNz
41+
LGRjPU5PLENOPUJ1eXBhc3MlMjBDbGFzcyUyMDMlMjBDQSUyMDE/Y2VydGlmaWNh
42+
dGVSZXZvY2F0aW9uTGlzdDBDBggrBgEFBQcBAQQ3MDUwMwYIKwYBBQUHMAGGJ2h0
43+
dHA6Ly9vY3NwLmJ1eXBhc3Mubm8vb2NzcC9CUENsYXNzM0NBMTANBgkqhkiG9w0B
44+
AQUFAAOCAQEAivJd3hg5+16QOv638JlKixMivlZjbtAj8TGDKhnB6sXBw4bNbHQS
45+
GDVdO07JKzBeYcohiYKPSn6+6NAEhJaetwVrhZgMQxNluUSOj+KSxzVVD6NLC3ga
46+
wswK6i3OruBvpynXViNVCTjlmQzi/4pp5NjRNFcbJrfeONZwzClmIqhJorDqhw2T
47+
/55OBEC+FxtQ9bEFBwHT0Qrx4L+HHJP7Vkk0CLWY5Ib89PZHFke/X/ad/HEla8F3
48+
UjKB02xxs2OKEmE0gQrn3SYjOtONfQDK377RiQPiY3eKV4CBVUcidbfqPyjY/rbZ
49+
TaPOXIYao3VFv6RCTO80zn1qw1JqGvDgNg==
50+
</X509Certificate>
51+
</X509Data>
52+
</KeyInfo>
53+
</Signature>
1554

16-
<digitalPostInfo>
17-
<virkningsdato>2014-05-17</virkningsdato>
18-
<aapningskvittering>false</aapningskvittering>
19-
<sikkerhetsnivaa>3</sikkerhetsnivaa>
20-
<tittel lang="no">Hurra for 17. mai</tittel>
21-
<varsler>
22-
<epostVarsel>
23-
<tekst lang="no">Viktig melding fra Staten i din digitale postkasse</tekst>
24-
<repetisjoner>
25-
<dagerEtter>0</dagerEtter>
26-
<dagerEtter>7</dagerEtter>
27-
</repetisjoner>
28-
</epostVarsel>
29-
<smsVarsel>
30-
<tekst lang="no">Viktig melding fra Staten</tekst>
31-
<repetisjoner>
32-
<dagerEtter>1</dagerEtter>
33-
</repetisjoner>
34-
</smsVarsel>
35-
</varsler>
36-
</digitalPostInfo>
55+
<avsender>
56+
<organisasjon>9908:123456789</organisasjon>
57+
<avsenderidentifikator>123456789-A</avsenderidentifikator>
58+
<fakturaReferanse>ØK1</fakturaReferanse>
59+
</avsender>
3760

38-
<dokumentpakke>
39-
<digest>
40-
<ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
41-
<ds:DigestValue/>
42-
</digest>
43-
<encryptedKey Encoding="" MimeType="" Recipient="" Type="">
44-
<enc:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p">
45-
<ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
46-
</enc:EncryptionMethod>
47-
<ds:KeyInfo Id="id0001">
48-
<ds:KeyName>nøkkelnavn</ds:KeyName>
49-
<X509Data>
50-
<X509SubjectName>...</X509SubjectName>
51-
<X509Certificate>...</X509Certificate>
52-
</X509Data>
53-
</ds:KeyInfo>
54-
<enc:CipherData>
55-
<enc:CipherValue>Zm9v</enc:CipherValue>
56-
</enc:CipherData>
57-
</encryptedKey>
58-
</dokumentpakke>
61+
<mottaker>
62+
<person>
63+
<personidentifikator>17051400000</personidentifikator>
64+
<postkasseadresse>ola.nordmann#0ABC</postkasseadresse>
65+
</person>
66+
</mottaker>
5967

60-
<signatur>
61-
<SignedInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
62-
<CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
63-
<SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
64-
<Reference URI="">
65-
<Transforms>
66-
<Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
67-
</Transforms>
68-
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
69-
<DigestValue>uooqbWYa5VCqcJCbuymBKqm17vY=</DigestValue>
70-
</Reference>
71-
</SignedInfo>
72-
<SignatureValue xmlns="http://www.w3.org/2000/09/xmldsig#">
73-
KedJuTob5gtvYx9qM3k3gm7kbLBwVbEQRl26S2tmXjqNND7MRGtoew==
74-
</SignatureValue>
75-
<KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
76-
<X509Data>
77-
<X509Certificate>
78-
MIIElTCCA32gAwIBAgIDDUL8MA0GCSqGSIb3DQEBBQUAMEsxCzAJBgNVBAYTAk5P
79-
MR0wGwYDVQQKDBRCdXlwYXNzIEFTLTk4MzE2MzMyNzEdMBsGA1UEAwwUQnV5cGFz
80-
cyBDbGFzcyAzIENBIDEwHhcNMTEwNTEzMTI0MjU3WhcNMTQwNTEzMTI0MjUzWjBo
81-
MQswCQYDVQQGEwJOTzEYMBYGA1UECgwPUE9TVEVOIE5PUkdFIEFTMREwDwYDVQQL
82-
DAhEaWdpcG9zdDEYMBYGA1UEAwwPUE9TVEVOIE5PUkdFIEFTMRIwEAYDVQQFEwk5
83-
ODQ2NjExODUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC68mb3nPMY
84-
KPN+jOLJCQ8x2it9PxMh8eiZ0cr5oK7C2fPs/3ywwWpav1yQdsLc5zSMQupzmqXN
85-
OoAirP42sO+MonAmsBbgAmJfKepQCBg5CX3qZUuId6kn7BZcPIMzTWF44wc5UrF1
86-
TlE2Ib/1ZS05lJCyLkdqpobBBKXoh2PP3xai5hFo8i+bohhyR+RWNxDnjPyp1mMX
87-
2bLjmD+/g/0QQM3SbwKdjmy7Ylr/2EDrAQ+S0OSjR3G0BnpRCOvhVLcXfjDM1GWq
88-
KIWKnQYFSTMB1cSpkqk9AxMY3MNT/DwUFWOihVlWvVWGjKrTBJC7FZpIqJBchNF4
89-
hiWv4iNI7vYfAgMBAAGjggFjMIIBXzAJBgNVHRMEAjAAMB8GA1UdIwQYMBaAFDgU
90-
5sjwqaQD9E4+IqNb8tbgrUB0MB0GA1UdDgQWBBQQPwlTXTPvyhFL30Sf3TxwhBHM
91-
KjAOBgNVHQ8BAf8EBAMCBLAwFQYDVR0gBA4wDDAKBghghEIBGgEDAjCBpQYDVR0f
92-
BIGdMIGaMC+gLaArhilodHRwOi8vY3JsLmJ1eXBhc3Mubm8vY3JsL0JQQ2xhc3Mz
93-
Q0ExLmNybDBnoGWgY4ZhbGRhcDovL2xkYXAuYnV5cGFzcy5uby9kYz1CdXlwYXNz
94-
LGRjPU5PLENOPUJ1eXBhc3MlMjBDbGFzcyUyMDMlMjBDQSUyMDE/Y2VydGlmaWNh
95-
dGVSZXZvY2F0aW9uTGlzdDBDBggrBgEFBQcBAQQ3MDUwMwYIKwYBBQUHMAGGJ2h0
96-
dHA6Ly9vY3NwLmJ1eXBhc3Mubm8vb2NzcC9CUENsYXNzM0NBMTANBgkqhkiG9w0B
97-
AQUFAAOCAQEAivJd3hg5+16QOv638JlKixMivlZjbtAj8TGDKhnB6sXBw4bNbHQS
98-
GDVdO07JKzBeYcohiYKPSn6+6NAEhJaetwVrhZgMQxNluUSOj+KSxzVVD6NLC3ga
99-
wswK6i3OruBvpynXViNVCTjlmQzi/4pp5NjRNFcbJrfeONZwzClmIqhJorDqhw2T
100-
/55OBEC+FxtQ9bEFBwHT0Qrx4L+HHJP7Vkk0CLWY5Ib89PZHFke/X/ad/HEla8F3
101-
UjKB02xxs2OKEmE0gQrn3SYjOtONfQDK377RiQPiY3eKV4CBVUcidbfqPyjY/rbZ
102-
TaPOXIYao3VFv6RCTO80zn1qw1JqGvDgNg==
103-
</X509Certificate>
104-
</X509Data>
105-
</KeyInfo>
106-
</signatur>
68+
<digitalPostInfo>
69+
<virkningsdato>2014-05-17</virkningsdato>
70+
<aapningskvittering>false</aapningskvittering>
71+
<sikkerhetsnivaa>3</sikkerhetsnivaa>
72+
<ikkeSensitivTittel lang="no">Hurra for 17. mai</ikkeSensitivTittel>
73+
<varsler>
74+
<epostVarsel>
75+
<epostadresse>[email protected]</epostadresse>
76+
<varslingsTekst lang="no">Viktig melding fra Staten i din digitale postkasse</varslingsTekst>
77+
<repetisjoner>
78+
<dagerEtter>0</dagerEtter>
79+
<dagerEtter>7</dagerEtter>
80+
</repetisjoner>
81+
</epostVarsel>
82+
<smsVarsel>
83+
<mobiltelefonnummer>12345678</mobiltelefonnummer>
84+
<varslingsTekst lang="no">Viktig melding fra Staten</varslingsTekst>
85+
<repetisjoner>
86+
<dagerEtter>1</dagerEtter>
87+
</repetisjoner>
88+
</smsVarsel>
89+
</varsler>
90+
</digitalPostInfo>
10791

108-
</digitalPost>
92+
<dokumentpakkefingeravtrykk>
93+
<ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
94+
<ds:DigestValue></ds:DigestValue>
95+
</dokumentpakkefingeravtrykk>
96+
97+
</digitalPost>

0 commit comments

Comments
 (0)