diff --git a/api-client/src/main/java/no/digipost/api/SdpMeldingSigner.java b/api-client/src/main/java/no/digipost/api/SdpMeldingSigner.java index 82cabb2a..4b781910 100644 --- a/api-client/src/main/java/no/digipost/api/SdpMeldingSigner.java +++ b/api-client/src/main/java/no/digipost/api/SdpMeldingSigner.java @@ -4,7 +4,7 @@ import no.digipost.api.xml.Constants; import no.digipost.api.xml.Marshalling; import org.springframework.oxm.jaxb.Jaxb2Marshaller; -import org.unece.cefact.namespaces.standardbusinessdocumentheader.StandardBusinessDocument; +import no.digipost.org.unece.cefact.namespaces.standardbusinessdocumentheader.StandardBusinessDocument; import org.w3c.dom.Document; import org.w3c.dom.Node; diff --git a/api-client/src/main/java/no/digipost/api/exceptions/MessageSenderEbmsErrorException.java b/api-client/src/main/java/no/digipost/api/exceptions/MessageSenderEbmsErrorException.java index 9078e6db..5179d4a7 100644 --- a/api-client/src/main/java/no/digipost/api/exceptions/MessageSenderEbmsErrorException.java +++ b/api-client/src/main/java/no/digipost/api/exceptions/MessageSenderEbmsErrorException.java @@ -1,6 +1,6 @@ package no.digipost.api.exceptions; -import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.Error; +import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.Error; import org.springframework.ws.soap.SoapMessage; public class MessageSenderEbmsErrorException extends MessageSenderSoapFaultException { @@ -16,4 +16,4 @@ public Error getError() { return error; } -} \ No newline at end of file +} diff --git a/api-client/src/main/java/no/digipost/api/exceptions/MessageSenderFaultMessageResolver.java b/api-client/src/main/java/no/digipost/api/exceptions/MessageSenderFaultMessageResolver.java index 95c07b6f..e4c90e0f 100644 --- a/api-client/src/main/java/no/digipost/api/exceptions/MessageSenderFaultMessageResolver.java +++ b/api-client/src/main/java/no/digipost/api/exceptions/MessageSenderFaultMessageResolver.java @@ -1,9 +1,9 @@ package no.digipost.api.exceptions; import no.digipost.api.xml.Marshalling; -import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.Error; -import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.Messaging; -import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.SignalMessage; +import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.Error; +import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.Messaging; +import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.SignalMessage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.oxm.jaxb.Jaxb2Marshaller; diff --git a/api-client/src/main/java/no/digipost/api/exceptions/MessageSenderOtherEbmsErrorException.java b/api-client/src/main/java/no/digipost/api/exceptions/MessageSenderOtherEbmsErrorException.java index 85634d0e..0cfe1172 100644 --- a/api-client/src/main/java/no/digipost/api/exceptions/MessageSenderOtherEbmsErrorException.java +++ b/api-client/src/main/java/no/digipost/api/exceptions/MessageSenderOtherEbmsErrorException.java @@ -1,6 +1,6 @@ package no.digipost.api.exceptions; -import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.Error; +import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.Error; import org.springframework.ws.soap.SoapMessage; import static java.lang.String.format; diff --git a/api-client/src/main/java/no/digipost/api/handlers/ApplikasjonsKvitteringReceiver.java b/api-client/src/main/java/no/digipost/api/handlers/ApplikasjonsKvitteringReceiver.java index d3cb7699..e1908315 100644 --- a/api-client/src/main/java/no/digipost/api/handlers/ApplikasjonsKvitteringReceiver.java +++ b/api-client/src/main/java/no/digipost/api/handlers/ApplikasjonsKvitteringReceiver.java @@ -3,13 +3,13 @@ import no.digipost.api.representations.EbmsAktoer; import no.digipost.api.representations.EbmsApplikasjonsKvittering; import no.digipost.api.xml.Marshalling; -import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.PartyInfo; +import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.PartyInfo; import org.springframework.oxm.jaxb.Jaxb2Marshaller; import org.springframework.ws.WebServiceMessage; import org.springframework.ws.client.core.WebServiceMessageExtractor; import org.springframework.ws.soap.SoapBody; import org.springframework.ws.soap.SoapMessage; -import org.unece.cefact.namespaces.standardbusinessdocumentheader.StandardBusinessDocument; +import no.digipost.org.unece.cefact.namespaces.standardbusinessdocumentheader.StandardBusinessDocument; import javax.xml.transform.TransformerException; import java.io.IOException; diff --git a/api-client/src/main/java/no/digipost/api/handlers/BekreftelseSender.java b/api-client/src/main/java/no/digipost/api/handlers/BekreftelseSender.java index 2f154fdd..565a71a1 100644 --- a/api-client/src/main/java/no/digipost/api/handlers/BekreftelseSender.java +++ b/api-client/src/main/java/no/digipost/api/handlers/BekreftelseSender.java @@ -5,7 +5,7 @@ import org.springframework.oxm.jaxb.Jaxb2Marshaller; import org.springframework.ws.WebServiceMessage; import org.springframework.ws.client.core.WebServiceMessageCallback; -import org.w3.xmldsig.Reference; +import no.digipost.org.w3.xmldsig.Reference; import javax.xml.transform.TransformerException; import java.io.IOException; diff --git a/api-client/src/main/java/no/digipost/api/handlers/ForsendelseSender.java b/api-client/src/main/java/no/digipost/api/handlers/ForsendelseSender.java index 9b6855eb..be82a100 100644 --- a/api-client/src/main/java/no/digipost/api/handlers/ForsendelseSender.java +++ b/api-client/src/main/java/no/digipost/api/handlers/ForsendelseSender.java @@ -12,9 +12,9 @@ import org.springframework.ws.WebServiceMessage; import org.springframework.ws.client.core.WebServiceMessageCallback; import org.springframework.ws.soap.SoapMessage; -import org.unece.cefact.namespaces.standardbusinessdocumentheader.StandardBusinessDocument; -import org.w3.xmldsig.DigestMethod; -import org.w3.xmldsig.Reference; +import no.digipost.org.unece.cefact.namespaces.standardbusinessdocumentheader.StandardBusinessDocument; +import no.digipost.org.w3.xmldsig.DigestMethod; +import no.digipost.org.w3.xmldsig.Reference; import org.w3c.dom.Document; import javax.activation.DataHandler; @@ -79,4 +79,4 @@ private String generateContentId() { return "<" + UUID.randomUUID().toString() + "@meldingsformidler.sdp.difi.no>"; } -} \ No newline at end of file +} diff --git a/api-client/src/main/java/no/digipost/api/handlers/PullRequestSender.java b/api-client/src/main/java/no/digipost/api/handlers/PullRequestSender.java index 59737582..c0ae3fe9 100644 --- a/api-client/src/main/java/no/digipost/api/handlers/PullRequestSender.java +++ b/api-client/src/main/java/no/digipost/api/handlers/PullRequestSender.java @@ -8,14 +8,14 @@ import no.digipost.api.representations.Mpc; import no.digipost.api.xml.Constants; import no.digipost.api.xml.Marshalling; -import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.PullRequest; -import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.SignalMessage; +import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.PullRequest; +import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.SignalMessage; import org.springframework.oxm.jaxb.Jaxb2Marshaller; import org.springframework.ws.WebServiceMessage; import org.springframework.ws.client.core.WebServiceMessageCallback; import org.springframework.ws.soap.SoapHeaderElement; import org.springframework.ws.soap.SoapMessage; -import org.w3.xmldsig.Reference; +import no.digipost.org.w3.xmldsig.Reference; import javax.xml.transform.TransformerException; import java.io.IOException; @@ -58,4 +58,4 @@ public void apply(final EbmsContext ebmsContext, final SoapHeaderElement ebmsMes }); } -} \ No newline at end of file +} diff --git a/api-client/src/main/java/no/digipost/api/handlers/TransportKvitteringReceiver.java b/api-client/src/main/java/no/digipost/api/handlers/TransportKvitteringReceiver.java index d1216015..cc7bf3de 100644 --- a/api-client/src/main/java/no/digipost/api/handlers/TransportKvitteringReceiver.java +++ b/api-client/src/main/java/no/digipost/api/handlers/TransportKvitteringReceiver.java @@ -1,7 +1,7 @@ package no.digipost.api.handlers; import no.digipost.api.representations.TransportKvittering; -import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.MessageInfo; +import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.MessageInfo; import org.springframework.ws.WebServiceMessage; import org.springframework.ws.client.core.WebServiceMessageExtractor; @@ -16,4 +16,4 @@ public TransportKvittering extractData(final WebServiceMessage message) throws I return new TransportKvittering(messageInfo.getMessageId(), messageInfo.getRefToMessageId()); } -} \ No newline at end of file +} diff --git a/api-client/src/main/java/no/digipost/api/interceptors/EbmsClientInterceptor.java b/api-client/src/main/java/no/digipost/api/interceptors/EbmsClientInterceptor.java index 104f799a..c4a25eda 100644 --- a/api-client/src/main/java/no/digipost/api/interceptors/EbmsClientInterceptor.java +++ b/api-client/src/main/java/no/digipost/api/interceptors/EbmsClientInterceptor.java @@ -7,10 +7,10 @@ import no.digipost.api.security.OrgnummerExtractor; import no.digipost.api.xml.Constants; import no.digipost.api.xml.Marshalling; -import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.Error; -import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.Messaging; -import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.SignalMessage; -import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.UserMessage; +import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.Error; +import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.Messaging; +import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.SignalMessage; +import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.UserMessage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.oxm.jaxb.Jaxb2Marshaller; diff --git a/api-client/src/main/java/no/digipost/api/interceptors/EbmsReferenceValidatorInterceptor.java b/api-client/src/main/java/no/digipost/api/interceptors/EbmsReferenceValidatorInterceptor.java index ee41f106..eff7743b 100644 --- a/api-client/src/main/java/no/digipost/api/interceptors/EbmsReferenceValidatorInterceptor.java +++ b/api-client/src/main/java/no/digipost/api/interceptors/EbmsReferenceValidatorInterceptor.java @@ -8,7 +8,7 @@ import org.springframework.ws.client.support.interceptor.ClientInterceptor; import org.springframework.ws.context.MessageContext; import org.springframework.ws.soap.SoapMessage; -import org.w3.xmldsig.Reference; +import no.digipost.org.w3.xmldsig.Reference; import java.util.Map; diff --git a/api-client/src/main/java/no/digipost/api/interceptors/steps/ReferenceValidatorStep.java b/api-client/src/main/java/no/digipost/api/interceptors/steps/ReferenceValidatorStep.java index 94439461..705c1424 100644 --- a/api-client/src/main/java/no/digipost/api/interceptors/steps/ReferenceValidatorStep.java +++ b/api-client/src/main/java/no/digipost/api/interceptors/steps/ReferenceValidatorStep.java @@ -2,14 +2,14 @@ import no.digipost.api.representations.EbmsContext; import no.digipost.api.representations.EbmsProcessingStep; -import org.oasis_open.docs.ebxml_bp.ebbp_signals_2.MessagePartNRInformation; -import org.oasis_open.docs.ebxml_bp.ebbp_signals_2.NonRepudiationInformation; -import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.Messaging; +import no.digipost.org.oasis_open.docs.ebxml_bp.ebbp_signals_2.MessagePartNRInformation; +import no.digipost.org.oasis_open.docs.ebxml_bp.ebbp_signals_2.NonRepudiationInformation; +import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.Messaging; import org.springframework.oxm.jaxb.Jaxb2Marshaller; import org.springframework.ws.soap.SoapHeaderElement; import org.springframework.ws.soap.SoapMessage; -import org.w3.xmldsig.Reference; -import org.w3.xmldsig.Transform; +import no.digipost.org.w3.xmldsig.Reference; +import no.digipost.org.w3.xmldsig.Transform; import java.util.Arrays; import java.util.Base64; diff --git a/api-commons/src/main/java/no/digipost/api/EbmsReferenceExtractor.java b/api-commons/src/main/java/no/digipost/api/EbmsReferenceExtractor.java index e25ca622..8f5c0faa 100644 --- a/api-commons/src/main/java/no/digipost/api/EbmsReferenceExtractor.java +++ b/api-commons/src/main/java/no/digipost/api/EbmsReferenceExtractor.java @@ -4,13 +4,13 @@ import no.digipost.api.xml.Marshalling; import no.digipost.api.xml.XpathUtil; import org.apache.commons.lang3.StringUtils; -import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.Messaging; -import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.PartInfo; -import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.UserMessage; +import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.Messaging; +import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.PartInfo; +import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.UserMessage; import org.springframework.oxm.jaxb.Jaxb2Marshaller; import org.springframework.ws.soap.SoapHeaderElement; import org.springframework.ws.soap.SoapMessage; -import org.w3.xmldsig.Reference; +import no.digipost.org.w3.xmldsig.Reference; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/api-commons/src/main/java/no/digipost/api/config/TransaksjonsLogg.java b/api-commons/src/main/java/no/digipost/api/config/TransaksjonsLogg.java index 88408f76..61165434 100644 --- a/api-commons/src/main/java/no/digipost/api/config/TransaksjonsLogg.java +++ b/api-commons/src/main/java/no/digipost/api/config/TransaksjonsLogg.java @@ -1,7 +1,7 @@ package no.digipost.api.config; -import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.Error; -import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.MessageInfo; +import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.Error; +import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.MessageInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.ws.soap.SoapFault; diff --git a/api-commons/src/main/java/no/digipost/api/interceptors/TransactionLog.java b/api-commons/src/main/java/no/digipost/api/interceptors/TransactionLog.java index 46291b9f..2ebfcd12 100644 --- a/api-commons/src/main/java/no/digipost/api/interceptors/TransactionLog.java +++ b/api-commons/src/main/java/no/digipost/api/interceptors/TransactionLog.java @@ -11,16 +11,16 @@ import no.digipost.api.xml.Constants; import no.digipost.api.xml.Marshalling; import no.digipost.api.xml.MessagingMarshalling; -import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.Error; -import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.MessageInfo; -import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.Messaging; -import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.SignalMessage; -import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.UserMessage; +import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.Error; +import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.MessageInfo; +import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.Messaging; +import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.SignalMessage; +import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.UserMessage; import org.springframework.oxm.jaxb.Jaxb2Marshaller; import org.springframework.ws.soap.SoapBody; import org.springframework.ws.soap.SoapFault; import org.springframework.ws.soap.SoapMessage; -import org.unece.cefact.namespaces.standardbusinessdocumentheader.StandardBusinessDocument; +import no.digipost.org.unece.cefact.namespaces.standardbusinessdocumentheader.StandardBusinessDocument; import static no.digipost.api.config.TransaksjonsLogg.EMPTY_MESSAGE_PARTITION_CHANNEL_EBMS_ERROR_CODE; import static no.digipost.api.config.TransaksjonsLogg.Type.APPLIKASJONSKVITTERING; diff --git a/api-commons/src/main/java/no/digipost/api/interceptors/steps/AddReferencesStep.java b/api-commons/src/main/java/no/digipost/api/interceptors/steps/AddReferencesStep.java index 5a74ca68..3ed27963 100644 --- a/api-commons/src/main/java/no/digipost/api/interceptors/steps/AddReferencesStep.java +++ b/api-commons/src/main/java/no/digipost/api/interceptors/steps/AddReferencesStep.java @@ -4,15 +4,15 @@ import no.digipost.api.representations.EbmsProcessingStep; import no.digipost.api.xml.Constants; import no.digipost.api.xml.Marshalling; -import org.oasis_open.docs.ebxml_bp.ebbp_signals_2.MessagePartNRInformation; -import org.oasis_open.docs.ebxml_bp.ebbp_signals_2.NonRepudiationInformation; -import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.MessageInfo; -import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.Receipt; -import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.SignalMessage; +import no.digipost.org.oasis_open.docs.ebxml_bp.ebbp_signals_2.MessagePartNRInformation; +import no.digipost.org.oasis_open.docs.ebxml_bp.ebbp_signals_2.NonRepudiationInformation; +import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.MessageInfo; +import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.Receipt; +import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.SignalMessage; import org.springframework.oxm.jaxb.Jaxb2Marshaller; import org.springframework.ws.soap.SoapHeaderElement; import org.springframework.ws.soap.SoapMessage; -import org.w3.xmldsig.Reference; +import no.digipost.org.w3.xmldsig.Reference; import java.time.ZonedDateTime; import java.util.ArrayList; diff --git a/api-commons/src/main/java/no/digipost/api/interceptors/steps/AddUserMessageStep.java b/api-commons/src/main/java/no/digipost/api/interceptors/steps/AddUserMessageStep.java index 303f85de..522f6cce 100644 --- a/api-commons/src/main/java/no/digipost/api/interceptors/steps/AddUserMessageStep.java +++ b/api-commons/src/main/java/no/digipost/api/interceptors/steps/AddUserMessageStep.java @@ -8,24 +8,24 @@ import no.digipost.api.representations.SimpleStandardBusinessDocument; import no.digipost.api.xml.Constants; import no.digipost.api.xml.Marshalling; -import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.AgreementRef; -import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.CollaborationInfo; -import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.From; -import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.MessageInfo; -import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.PartInfo; -import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.PartProperties; -import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.PartyId; -import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.PartyInfo; -import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.PayloadInfo; -import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.Property; -import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.Service; -import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.To; -import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.UserMessage; +import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.AgreementRef; +import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.CollaborationInfo; +import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.From; +import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.MessageInfo; +import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.PartInfo; +import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.PartProperties; +import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.PartyId; +import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.PartyInfo; +import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.PayloadInfo; +import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.Property; +import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.Service; +import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.To; +import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.UserMessage; import org.springframework.oxm.jaxb.Jaxb2Marshaller; import org.springframework.ws.mime.Attachment; import org.springframework.ws.soap.SoapHeaderElement; import org.springframework.ws.soap.SoapMessage; -import org.unece.cefact.namespaces.standardbusinessdocumentheader.StandardBusinessDocument; +import no.digipost.org.unece.cefact.namespaces.standardbusinessdocumentheader.StandardBusinessDocument; import java.time.ZonedDateTime; import java.util.ArrayList; diff --git a/api-commons/src/main/java/no/digipost/api/representations/ApplikasjonsKvitteringBuilder.java b/api-commons/src/main/java/no/digipost/api/representations/ApplikasjonsKvitteringBuilder.java index 4eb5e74b..05ed347b 100644 --- a/api-commons/src/main/java/no/digipost/api/representations/ApplikasjonsKvitteringBuilder.java +++ b/api-commons/src/main/java/no/digipost/api/representations/ApplikasjonsKvitteringBuilder.java @@ -11,7 +11,7 @@ import no.difi.begrep.sdp.schema_v10.SDPVarslingfeilet; import no.difi.begrep.sdp.schema_v10.SDPVarslingskanal; import no.digipost.api.PMode; -import org.unece.cefact.namespaces.standardbusinessdocumentheader.StandardBusinessDocument; +import no.digipost.org.unece.cefact.namespaces.standardbusinessdocumentheader.StandardBusinessDocument; import java.time.ZonedDateTime; diff --git a/api-commons/src/main/java/no/digipost/api/representations/EbmsAktoer.java b/api-commons/src/main/java/no/digipost/api/representations/EbmsAktoer.java index 75bcf1e1..6ce79ec3 100644 --- a/api-commons/src/main/java/no/digipost/api/representations/EbmsAktoer.java +++ b/api-commons/src/main/java/no/digipost/api/representations/EbmsAktoer.java @@ -1,8 +1,8 @@ package no.digipost.api.representations; import no.digipost.api.PMode; -import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.From; -import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.To; +import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.From; +import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.To; public class EbmsAktoer { diff --git a/api-commons/src/main/java/no/digipost/api/representations/EbmsApplikasjonsKvittering.java b/api-commons/src/main/java/no/digipost/api/representations/EbmsApplikasjonsKvittering.java index f69c0fad..c18bc20d 100644 --- a/api-commons/src/main/java/no/digipost/api/representations/EbmsApplikasjonsKvittering.java +++ b/api-commons/src/main/java/no/digipost/api/representations/EbmsApplikasjonsKvittering.java @@ -1,8 +1,8 @@ package no.digipost.api.representations; import no.digipost.api.PMode; -import org.unece.cefact.namespaces.standardbusinessdocumentheader.StandardBusinessDocument; -import org.w3.xmldsig.Reference; +import no.digipost.org.unece.cefact.namespaces.standardbusinessdocumentheader.StandardBusinessDocument; +import no.digipost.org.w3.xmldsig.Reference; import java.io.InputStream; import java.util.ArrayList; diff --git a/api-commons/src/main/java/no/digipost/api/representations/EbmsContext.java b/api-commons/src/main/java/no/digipost/api/representations/EbmsContext.java index 859b2e2f..2bfead2e 100644 --- a/api-commons/src/main/java/no/digipost/api/representations/EbmsContext.java +++ b/api-commons/src/main/java/no/digipost/api/representations/EbmsContext.java @@ -1,13 +1,13 @@ package no.digipost.api.representations; -import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.Error; -import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.Messaging; -import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.SignalMessage; -import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.UserMessage; +import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.Error; +import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.Messaging; +import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.SignalMessage; +import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.UserMessage; import org.springframework.ws.context.MessageContext; import org.springframework.ws.soap.SoapHeaderElement; import org.springframework.ws.soap.SoapMessage; -import org.w3.xmldsig.Reference; +import no.digipost.org.w3.xmldsig.Reference; import org.w3c.dom.Document; import java.util.ArrayList; diff --git a/api-commons/src/main/java/no/digipost/api/representations/EbmsForsendelse.java b/api-commons/src/main/java/no/digipost/api/representations/EbmsForsendelse.java index f5394e13..1095e7d8 100644 --- a/api-commons/src/main/java/no/digipost/api/representations/EbmsForsendelse.java +++ b/api-commons/src/main/java/no/digipost/api/representations/EbmsForsendelse.java @@ -3,7 +3,7 @@ import no.difi.begrep.sdp.schema_v10.SDPMelding; import no.digipost.api.PMode; import no.digipost.xsd.types.DigitalPostformidling; -import org.unece.cefact.namespaces.standardbusinessdocumentheader.StandardBusinessDocument; +import no.digipost.org.unece.cefact.namespaces.standardbusinessdocumentheader.StandardBusinessDocument; import java.io.InputStream; import java.time.Clock; diff --git a/api-commons/src/main/java/no/digipost/api/representations/EbmsOutgoingMessage.java b/api-commons/src/main/java/no/digipost/api/representations/EbmsOutgoingMessage.java index 8e8973f2..98cd482d 100644 --- a/api-commons/src/main/java/no/digipost/api/representations/EbmsOutgoingMessage.java +++ b/api-commons/src/main/java/no/digipost/api/representations/EbmsOutgoingMessage.java @@ -1,7 +1,7 @@ package no.digipost.api.representations; import no.digipost.api.PMode; -import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.MessageInfo; +import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.MessageInfo; import java.time.ZonedDateTime; diff --git a/api-commons/src/main/java/no/digipost/api/representations/KvitteringsReferanse.java b/api-commons/src/main/java/no/digipost/api/representations/KvitteringsReferanse.java index d21ae129..498aaac0 100644 --- a/api-commons/src/main/java/no/digipost/api/representations/KvitteringsReferanse.java +++ b/api-commons/src/main/java/no/digipost/api/representations/KvitteringsReferanse.java @@ -3,7 +3,7 @@ import no.digipost.api.xml.Marshalling; import org.springframework.oxm.jaxb.Jaxb2Marshaller; import org.springframework.xml.transform.StringResult; -import org.w3.xmldsig.Reference; +import no.digipost.org.w3.xmldsig.Reference; import javax.xml.transform.stream.StreamSource; import java.io.StringReader; diff --git a/api-commons/src/main/java/no/digipost/api/representations/SimpleStandardBusinessDocument.java b/api-commons/src/main/java/no/digipost/api/representations/SimpleStandardBusinessDocument.java index 3afa0627..d537a52e 100644 --- a/api-commons/src/main/java/no/digipost/api/representations/SimpleStandardBusinessDocument.java +++ b/api-commons/src/main/java/no/digipost/api/representations/SimpleStandardBusinessDocument.java @@ -11,9 +11,9 @@ import no.difi.begrep.sdp.schema_v10.SDPMottaker; import no.difi.begrep.sdp.schema_v10.SDPVarslingfeilet; import no.digipost.xsd.types.DigitalPostformidling; -import org.unece.cefact.namespaces.standardbusinessdocumentheader.Scope; -import org.unece.cefact.namespaces.standardbusinessdocumentheader.StandardBusinessDocument; -import org.w3.xmldsig.Reference; +import no.digipost.org.unece.cefact.namespaces.standardbusinessdocumentheader.Scope; +import no.digipost.org.unece.cefact.namespaces.standardbusinessdocumentheader.StandardBusinessDocument; +import no.digipost.org.w3.xmldsig.Reference; import java.time.Duration; import java.time.ZoneId; diff --git a/api-commons/src/main/java/no/digipost/api/representations/SimpleUserMessage.java b/api-commons/src/main/java/no/digipost/api/representations/SimpleUserMessage.java index bae68247..22316003 100644 --- a/api-commons/src/main/java/no/digipost/api/representations/SimpleUserMessage.java +++ b/api-commons/src/main/java/no/digipost/api/representations/SimpleUserMessage.java @@ -1,7 +1,7 @@ package no.digipost.api.representations; import no.digipost.api.PMode; -import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.UserMessage; +import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.UserMessage; import java.time.ZonedDateTime; diff --git a/api-commons/src/main/java/no/digipost/api/representations/StandardBusinessDocumentFactory.java b/api-commons/src/main/java/no/digipost/api/representations/StandardBusinessDocumentFactory.java index f199dd03..56c5cb41 100644 --- a/api-commons/src/main/java/no/digipost/api/representations/StandardBusinessDocumentFactory.java +++ b/api-commons/src/main/java/no/digipost/api/representations/StandardBusinessDocumentFactory.java @@ -5,13 +5,13 @@ import no.difi.begrep.sdp.schema_v10.SDPFlyttetDigitalPost; import no.difi.begrep.sdp.schema_v10.SDPKvittering; import no.difi.begrep.sdp.schema_v10.SDPMelding; -import org.unece.cefact.namespaces.standardbusinessdocumentheader.BusinessScope; -import org.unece.cefact.namespaces.standardbusinessdocumentheader.DocumentIdentification; -import org.unece.cefact.namespaces.standardbusinessdocumentheader.Partner; -import org.unece.cefact.namespaces.standardbusinessdocumentheader.PartnerIdentification; -import org.unece.cefact.namespaces.standardbusinessdocumentheader.Scope; -import org.unece.cefact.namespaces.standardbusinessdocumentheader.StandardBusinessDocument; -import org.unece.cefact.namespaces.standardbusinessdocumentheader.StandardBusinessDocumentHeader; +import no.digipost.org.unece.cefact.namespaces.standardbusinessdocumentheader.BusinessScope; +import no.digipost.org.unece.cefact.namespaces.standardbusinessdocumentheader.DocumentIdentification; +import no.digipost.org.unece.cefact.namespaces.standardbusinessdocumentheader.Partner; +import no.digipost.org.unece.cefact.namespaces.standardbusinessdocumentheader.PartnerIdentification; +import no.digipost.org.unece.cefact.namespaces.standardbusinessdocumentheader.Scope; +import no.digipost.org.unece.cefact.namespaces.standardbusinessdocumentheader.StandardBusinessDocument; +import no.digipost.org.unece.cefact.namespaces.standardbusinessdocumentheader.StandardBusinessDocumentHeader; import java.time.ZonedDateTime; diff --git a/api-commons/src/main/java/no/digipost/api/xml/Marshalling.java b/api-commons/src/main/java/no/digipost/api/xml/Marshalling.java index 1527f6b4..d4549c4a 100644 --- a/api-commons/src/main/java/no/digipost/api/xml/Marshalling.java +++ b/api-commons/src/main/java/no/digipost/api/xml/Marshalling.java @@ -3,12 +3,12 @@ import no.difi.begrep.sdp.schema_v10.SDPKvittering; import org.etsi.uri._01903.v1_3.QualifyingProperties; import org.etsi.uri._2918.v1_2.XAdESSignatures; -import org.oasis_open.docs.ebxml_bp.ebbp_signals_2.NonRepudiationInformation; -import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.Messaging; +import no.digipost.org.oasis_open.docs.ebxml_bp.ebbp_signals_2.NonRepudiationInformation; +import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.Messaging; import org.springframework.oxm.jaxb.Jaxb2Marshaller; import org.springframework.ws.soap.SoapBody; import org.springframework.ws.soap.SoapHeaderElement; -import org.unece.cefact.namespaces.standardbusinessdocumentheader.StandardBusinessDocument; +import no.digipost.org.unece.cefact.namespaces.standardbusinessdocumentheader.StandardBusinessDocument; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; @@ -38,8 +38,8 @@ public static Jaxb2Marshaller createNewMarshaller() { marshaller.setPackagesToScan( packageName(StandardBusinessDocument.class), packageName(Envelope.class), - packageName(org.w3.soap.Envelope.class), - packageName(org.w3.xmldsig.Reference.class), + packageName(no.digipost.org.w3.soap.Envelope.class), + packageName(no.digipost.org.w3.xmldsig.Reference.class), packageName(Messaging.class), packageName(NonRepudiationInformation.class), packageName(SDPKvittering.class), diff --git a/api-commons/src/main/java/no/digipost/api/xml/MessagingMarshalling.java b/api-commons/src/main/java/no/digipost/api/xml/MessagingMarshalling.java index f9482997..ac1bab2a 100644 --- a/api-commons/src/main/java/no/digipost/api/xml/MessagingMarshalling.java +++ b/api-commons/src/main/java/no/digipost/api/xml/MessagingMarshalling.java @@ -1,6 +1,6 @@ package no.digipost.api.xml; -import org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.Messaging; +import no.digipost.org.oasis_open.docs.ebxml_msg.ebms.v3_0.ns.core._200704.Messaging; import org.springframework.oxm.jaxb.Jaxb2Marshaller; import org.springframework.ws.WebServiceMessage; import org.springframework.ws.soap.SoapHeader; diff --git a/api-commons/src/test/java/no/digipost/api/representations/EbmsApplikasjonsKvitteringTest.java b/api-commons/src/test/java/no/digipost/api/representations/EbmsApplikasjonsKvitteringTest.java index c8abe757..66a8879b 100644 --- a/api-commons/src/test/java/no/digipost/api/representations/EbmsApplikasjonsKvitteringTest.java +++ b/api-commons/src/test/java/no/digipost/api/representations/EbmsApplikasjonsKvitteringTest.java @@ -3,7 +3,7 @@ import org.hamcrest.CustomTypeSafeMatcher; import org.hamcrest.Matcher; import org.junit.jupiter.api.Test; -import org.w3.xmldsig.Reference; +import no.digipost.org.w3.xmldsig.Reference; import java.util.ArrayList; import java.util.List; @@ -47,4 +47,4 @@ private EbmsApplikasjonsKvittering getEbmsApplikasjonskvittering() { .build(); } -} \ No newline at end of file +} diff --git a/api-commons/src/test/java/no/digipost/api/representations/KvitteringsReferanseTest.java b/api-commons/src/test/java/no/digipost/api/representations/KvitteringsReferanseTest.java index eb2d2c4f..4d20593b 100644 --- a/api-commons/src/test/java/no/digipost/api/representations/KvitteringsReferanseTest.java +++ b/api-commons/src/test/java/no/digipost/api/representations/KvitteringsReferanseTest.java @@ -1,7 +1,7 @@ package no.digipost.api.representations; import org.junit.jupiter.api.Test; -import org.w3.xmldsig.Reference; +import no.digipost.org.w3.xmldsig.Reference; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; @@ -35,4 +35,4 @@ public void testGetUnmarshalled() { assertThat(kvitteringsReferanse.getUnmarshalled(), is(referenceToOriginalMessage)); } -} \ No newline at end of file +} diff --git a/api-commons/src/test/java/no/digipost/api/representations/ObjectMother.java b/api-commons/src/test/java/no/digipost/api/representations/ObjectMother.java index 6c3e0276..72602a30 100644 --- a/api-commons/src/test/java/no/digipost/api/representations/ObjectMother.java +++ b/api-commons/src/test/java/no/digipost/api/representations/ObjectMother.java @@ -1,8 +1,8 @@ package no.digipost.api.representations; -import org.w3.xmldsig.DigestMethod; -import org.w3.xmldsig.Reference; -import org.w3.xmldsig.Transform; +import no.digipost.org.w3.xmldsig.DigestMethod; +import no.digipost.org.w3.xmldsig.Reference; +import no.digipost.org.w3.xmldsig.Transform; import java.util.ArrayList; import java.util.List; diff --git a/api-commons/src/test/java/no/digipost/api/representations/SimpleStandardBusinessDocumentTest.java b/api-commons/src/test/java/no/digipost/api/representations/SimpleStandardBusinessDocumentTest.java index b36ab9d7..b2cec493 100644 --- a/api-commons/src/test/java/no/digipost/api/representations/SimpleStandardBusinessDocumentTest.java +++ b/api-commons/src/test/java/no/digipost/api/representations/SimpleStandardBusinessDocumentTest.java @@ -7,7 +7,7 @@ import no.digipost.api.representations.SimpleStandardBusinessDocument.SimpleDigitalPostformidling.Type; import no.digipost.xsd.types.DigitalPostformidling; import org.junit.jupiter.api.Test; -import org.unece.cefact.namespaces.standardbusinessdocumentheader.StandardBusinessDocument; +import no.digipost.org.unece.cefact.namespaces.standardbusinessdocumentheader.StandardBusinessDocument; import java.time.LocalDate; import java.time.ZoneId; diff --git a/api-commons/src/test/java/no/digipost/api/xml/EbmsReferenceExtractorTest.java b/api-commons/src/test/java/no/digipost/api/xml/EbmsReferenceExtractorTest.java index c986777d..432f9a52 100644 --- a/api-commons/src/test/java/no/digipost/api/xml/EbmsReferenceExtractorTest.java +++ b/api-commons/src/test/java/no/digipost/api/xml/EbmsReferenceExtractorTest.java @@ -3,8 +3,8 @@ import no.digipost.api.EbmsReferenceExtractor; import org.junit.jupiter.api.Test; import org.springframework.ws.soap.saaj.SaajSoapMessage; -import org.w3.xmldsig.DigestMethod; -import org.w3.xmldsig.Reference; +import no.digipost.org.w3.xmldsig.DigestMethod; +import no.digipost.org.w3.xmldsig.Reference; import javax.xml.soap.MessageFactory; import javax.xml.soap.SOAPMessage; diff --git a/api-commons/src/test/java/no/digipost/api/xml/MarshallingTest.java b/api-commons/src/test/java/no/digipost/api/xml/MarshallingTest.java index 122ff981..c5094494 100644 --- a/api-commons/src/test/java/no/digipost/api/xml/MarshallingTest.java +++ b/api-commons/src/test/java/no/digipost/api/xml/MarshallingTest.java @@ -4,22 +4,22 @@ import org.junit.jupiter.api.Test; import org.springframework.oxm.MarshallingFailureException; import org.springframework.oxm.jaxb.Jaxb2Marshaller; -import org.unece.cefact.namespaces.standardbusinessdocumentheader.BusinessScope; -import org.unece.cefact.namespaces.standardbusinessdocumentheader.DocumentIdentification; -import org.unece.cefact.namespaces.standardbusinessdocumentheader.Partner; -import org.unece.cefact.namespaces.standardbusinessdocumentheader.PartnerIdentification; -import org.unece.cefact.namespaces.standardbusinessdocumentheader.Scope; -import org.unece.cefact.namespaces.standardbusinessdocumentheader.StandardBusinessDocument; -import org.unece.cefact.namespaces.standardbusinessdocumentheader.StandardBusinessDocumentHeader; -import org.w3.xmldsig.CanonicalizationMethod; -import org.w3.xmldsig.DigestMethod; -import org.w3.xmldsig.Reference; -import org.w3.xmldsig.Signature; -import org.w3.xmldsig.SignatureMethod; -import org.w3.xmldsig.SignatureValue; -import org.w3.xmldsig.SignedInfo; -import org.w3.xmldsig.Transform; -import org.w3.xmldsig.Transforms; +import no.digipost.org.unece.cefact.namespaces.standardbusinessdocumentheader.BusinessScope; +import no.digipost.org.unece.cefact.namespaces.standardbusinessdocumentheader.DocumentIdentification; +import no.digipost.org.unece.cefact.namespaces.standardbusinessdocumentheader.Partner; +import no.digipost.org.unece.cefact.namespaces.standardbusinessdocumentheader.PartnerIdentification; +import no.digipost.org.unece.cefact.namespaces.standardbusinessdocumentheader.Scope; +import no.digipost.org.unece.cefact.namespaces.standardbusinessdocumentheader.StandardBusinessDocument; +import no.digipost.org.unece.cefact.namespaces.standardbusinessdocumentheader.StandardBusinessDocumentHeader; +import no.digipost.org.w3.xmldsig.CanonicalizationMethod; +import no.digipost.org.w3.xmldsig.DigestMethod; +import no.digipost.org.w3.xmldsig.Reference; +import no.digipost.org.w3.xmldsig.Signature; +import no.digipost.org.w3.xmldsig.SignatureMethod; +import no.digipost.org.w3.xmldsig.SignatureValue; +import no.digipost.org.w3.xmldsig.SignedInfo; +import no.digipost.org.w3.xmldsig.Transform; +import no.digipost.org.w3.xmldsig.Transforms; import javax.xml.transform.stream.StreamResult; diff --git a/xsd/pom.xml b/xsd/pom.xml index 79009dbc..db695a4f 100644 --- a/xsd/pom.xml +++ b/xsd/pom.xml @@ -45,7 +45,7 @@ maven-javadoc-plugin - org.*,au.* + no.digipost.org.*,no.digipost.au.* all,-missing,-html diff --git a/xsd/src/main/java/no/digipost/xsd/types/DigitalPostformidling.java b/xsd/src/main/java/no/digipost/xsd/types/DigitalPostformidling.java index 752a6e44..73758f61 100644 --- a/xsd/src/main/java/no/digipost/xsd/types/DigitalPostformidling.java +++ b/xsd/src/main/java/no/digipost/xsd/types/DigitalPostformidling.java @@ -2,8 +2,8 @@ package no.digipost.xsd.types; import no.difi.begrep.sdp.schema_v10.*; -import org.w3.xmldsig.Reference; -import org.w3.xmldsig.Signature; +import no.digipost.org.w3.xmldsig.Reference; +import no.digipost.org.w3.xmldsig.Signature; /** diff --git a/xsd/src/main/jaxb/bindings.xjb b/xsd/src/main/jaxb/bindings.xjb index 1cd39f2b..4a59e212 100644 --- a/xsd/src/main/jaxb/bindings.xjb +++ b/xsd/src/main/jaxb/bindings.xjb @@ -14,7 +14,7 @@ xmlType="xs:dateTime"/> - + @@ -107,36 +107,51 @@ - - - + + + + + + - - - + + + + + - - - - - + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + + + + + + + + + + + + +