diff --git a/dss-asic/src/main/java/eu/europa/ec/markt/dss/parameter/ASiCParameters.java b/dss-asic/src/main/java/eu/europa/esig/dss/asic/ASiCParameters.java similarity index 96% rename from dss-asic/src/main/java/eu/europa/ec/markt/dss/parameter/ASiCParameters.java rename to dss-asic/src/main/java/eu/europa/esig/dss/asic/ASiCParameters.java index b178d18f45..abd5990f54 100644 --- a/dss-asic/src/main/java/eu/europa/ec/markt/dss/parameter/ASiCParameters.java +++ b/dss-asic/src/main/java/eu/europa/esig/dss/asic/ASiCParameters.java @@ -18,12 +18,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.parameter; +package eu.europa.esig.dss.asic; import java.io.Serializable; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.validation102853.SignatureForm; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.x509.SignatureForm; /** * This class regroups the signature parameters related to ASiC form. diff --git a/dss-asic/src/main/java/eu/europa/ec/markt/dss/parameter/ASiCSignatureParameters.java b/dss-asic/src/main/java/eu/europa/esig/dss/asic/ASiCSignatureParameters.java similarity index 92% rename from dss-asic/src/main/java/eu/europa/ec/markt/dss/parameter/ASiCSignatureParameters.java rename to dss-asic/src/main/java/eu/europa/esig/dss/asic/ASiCSignatureParameters.java index 393ce0bd9b..e86e9bfcae 100644 --- a/dss-asic/src/main/java/eu/europa/ec/markt/dss/parameter/ASiCSignatureParameters.java +++ b/dss-asic/src/main/java/eu/europa/esig/dss/asic/ASiCSignatureParameters.java @@ -1,6 +1,7 @@ -package eu.europa.ec.markt.dss.parameter; +package eu.europa.esig.dss.asic; -import eu.europa.ec.markt.dss.signature.SignatureLevel; +import eu.europa.esig.dss.AbstractSignatureParameters; +import eu.europa.esig.dss.SignatureLevel; public class ASiCSignatureParameters extends AbstractSignatureParameters { diff --git a/dss-asic/src/main/java/eu/europa/ec/markt/dss/signature/asic/ASiCService.java b/dss-asic/src/main/java/eu/europa/esig/dss/asic/signature/ASiCService.java similarity index 94% rename from dss-asic/src/main/java/eu/europa/ec/markt/dss/signature/asic/ASiCService.java rename to dss-asic/src/main/java/eu/europa/esig/dss/asic/signature/ASiCService.java index 0a61d89357..c2ece7ec26 100644 --- a/dss-asic/src/main/java/eu/europa/ec/markt/dss/signature/asic/ASiCService.java +++ b/dss-asic/src/main/java/eu/europa/esig/dss/asic/signature/ASiCService.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.asic; +package eu.europa.esig.dss.asic.signature; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -46,31 +46,31 @@ import org.w3c.dom.Element; import org.w3c.dom.Text; -import eu.europa.ec.markt.dss.ASiCNamespaces; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DSSXMLUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.parameter.ASiCParameters; -import eu.europa.ec.markt.dss.parameter.ASiCSignatureParameters; -import eu.europa.ec.markt.dss.parameter.AbstractSignatureParameters; -import eu.europa.ec.markt.dss.parameter.CAdESSignatureParameters; -import eu.europa.ec.markt.dss.parameter.XAdESSignatureParameters; -import eu.europa.ec.markt.dss.signature.AbstractSignatureService; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.InMemoryDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.cades.CAdESService; -import eu.europa.ec.markt.dss.signature.validation.DocumentValidator; -import eu.europa.ec.markt.dss.signature.xades.XAdESService; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.SignatureForm; -import eu.europa.ec.markt.dss.validation102853.SignedDocumentValidator; -import eu.europa.ec.markt.dss.validation102853.asic.ASiCCMSDocumentValidator; -import eu.europa.ec.markt.dss.validation102853.asic.ASiCContainerValidator; +import eu.europa.esig.dss.ASiCNamespaces; +import eu.europa.esig.dss.AbstractSignatureParameters; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DSSXMLUtils; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.InMemoryDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.asic.ASiCParameters; +import eu.europa.esig.dss.asic.ASiCSignatureParameters; +import eu.europa.esig.dss.asic.validation.ASiCCMSDocumentValidator; +import eu.europa.esig.dss.asic.validation.ASiCContainerValidator; +import eu.europa.esig.dss.cades.CAdESSignatureParameters; +import eu.europa.esig.dss.cades.signature.CAdESService; +import eu.europa.esig.dss.signature.AbstractSignatureService; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.DocumentValidator; +import eu.europa.esig.dss.validation.SignedDocumentValidator; +import eu.europa.esig.dss.x509.SignatureForm; +import eu.europa.esig.dss.xades.XAdESSignatureParameters; +import eu.europa.esig.dss.xades.signature.XAdESService; /** * Implementation of {@code DocumentSignatureService} for ASiC-S and -E containers. It allows the creation of containers based on XAdES or CAdES standard. @@ -705,7 +705,7 @@ private void initXAdESDocumentRoot(XAdESSignatureParameters xadesParameters, ASi * @param asicParameters ASiC parameters * @param signature signature being created * @param outZip destination {@code ZipOutputStream} - * @throws eu.europa.ec.markt.dss.exception.DSSException + * @throws eu.europa.esig.dss.DSSException */ private void buildXAdES(final ASiCParameters asicParameters, final DSSDocument signature, final ZipOutputStream outZip) throws DSSException { final String signatureZipEntryName = getSignatureFileName(asicParameters); diff --git a/dss-asic/src/main/java/eu/europa/ec/markt/dss/validation102853/asic/ASiCCMSDocumentValidator.java b/dss-asic/src/main/java/eu/europa/esig/dss/asic/validation/ASiCCMSDocumentValidator.java similarity index 86% rename from dss-asic/src/main/java/eu/europa/ec/markt/dss/validation102853/asic/ASiCCMSDocumentValidator.java rename to dss-asic/src/main/java/eu/europa/esig/dss/asic/validation/ASiCCMSDocumentValidator.java index 2e3f7000b5..41bc0aedf0 100644 --- a/dss-asic/src/main/java/eu/europa/ec/markt/dss/validation102853/asic/ASiCCMSDocumentValidator.java +++ b/dss-asic/src/main/java/eu/europa/esig/dss/asic/validation/ASiCCMSDocumentValidator.java @@ -18,14 +18,14 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.asic; +package eu.europa.esig.dss.asic.validation; import java.util.List; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.validation.DocumentValidator; -import eu.europa.ec.markt.dss.validation102853.cades.CMSDocumentValidator; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.cades.validation.CMSDocumentValidator; +import eu.europa.esig.dss.validation.DocumentValidator; /** * Validator for ASiC signature diff --git a/dss-asic/src/main/java/eu/europa/ec/markt/dss/validation102853/asic/ASiCContainerValidator.java b/dss-asic/src/main/java/eu/europa/esig/dss/asic/validation/ASiCContainerValidator.java similarity index 95% rename from dss-asic/src/main/java/eu/europa/ec/markt/dss/validation102853/asic/ASiCContainerValidator.java rename to dss-asic/src/main/java/eu/europa/esig/dss/asic/validation/ASiCContainerValidator.java index e7bd6ed57e..2c05156f99 100644 --- a/dss-asic/src/main/java/eu/europa/ec/markt/dss/validation102853/asic/ASiCContainerValidator.java +++ b/dss-asic/src/main/java/eu/europa/esig/dss/asic/validation/ASiCContainerValidator.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.asic; +package eu.europa.esig.dss.asic.validation; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -37,21 +37,21 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; -import eu.europa.ec.markt.dss.ASiCNamespaces; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DSSXMLUtils; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.exception.DSSNotETSICompliantException; -import eu.europa.ec.markt.dss.signature.AsicManifestDocument; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.InMemoryDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.asic.ASiCService; -import eu.europa.ec.markt.dss.signature.validation.AdvancedSignature; -import eu.europa.ec.markt.dss.signature.validation.DocumentValidator; -import eu.europa.ec.markt.dss.validation102853.SignedDocumentValidator; -import eu.europa.ec.markt.dss.validation102853.policy.ValidationPolicy; -import eu.europa.ec.markt.dss.validation102853.report.Reports; +import eu.europa.esig.dss.ASiCNamespaces; +import eu.europa.esig.dss.AsicManifestDocument; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSNotETSICompliantException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DSSXMLUtils; +import eu.europa.esig.dss.InMemoryDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.asic.signature.ASiCService; +import eu.europa.esig.dss.validation.AdvancedSignature; +import eu.europa.esig.dss.validation.DocumentValidator; +import eu.europa.esig.dss.validation.SignedDocumentValidator; +import eu.europa.esig.dss.validation.policy.ValidationPolicy; +import eu.europa.esig.dss.validation.report.Reports; /** * This class is the base class for ASiC containers. diff --git a/dss-asic/src/main/java/eu/europa/ec/markt/dss/validation102853/asic/ASiCTimestampDocumentValidator.java b/dss-asic/src/main/java/eu/europa/esig/dss/asic/validation/ASiCTimestampDocumentValidator.java similarity index 87% rename from dss-asic/src/main/java/eu/europa/ec/markt/dss/validation102853/asic/ASiCTimestampDocumentValidator.java rename to dss-asic/src/main/java/eu/europa/esig/dss/asic/validation/ASiCTimestampDocumentValidator.java index 5e59ed0c35..c5124f823e 100644 --- a/dss-asic/src/main/java/eu/europa/ec/markt/dss/validation102853/asic/ASiCTimestampDocumentValidator.java +++ b/dss-asic/src/main/java/eu/europa/esig/dss/asic/validation/ASiCTimestampDocumentValidator.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.asic; +package eu.europa.esig.dss.asic.validation; import java.io.IOException; import java.util.List; @@ -26,10 +26,10 @@ import org.bouncycastle.tsp.TSPException; import org.bouncycastle.tsp.TimeStampToken; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.validation.DocumentValidator; -import eu.europa.ec.markt.dss.validation102853.cades.CMSDocumentValidator; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.cades.validation.CMSDocumentValidator; +import eu.europa.esig.dss.validation.DocumentValidator; /** * Validator for ASiC timeStampToken @@ -53,7 +53,7 @@ public class ASiCTimestampDocumentValidator extends CMSDocumentValidator { * * @param timestamp {@code DSSDocument} representing the timestamp to validate * @param detachedContents the {@code List} containing the potential signed documents - * @throws eu.europa.ec.markt.dss.exception.DSSException + * @throws eu.europa.esig.dss.DSSException */ public ASiCTimestampDocumentValidator(final DSSDocument timestamp, final List detachedContents) throws DSSException { diff --git a/dss-asic/src/main/java/eu/europa/ec/markt/dss/validation102853/asic/ASiCXMLDocumentValidator.java b/dss-asic/src/main/java/eu/europa/esig/dss/asic/validation/ASiCXMLDocumentValidator.java similarity index 86% rename from dss-asic/src/main/java/eu/europa/ec/markt/dss/validation102853/asic/ASiCXMLDocumentValidator.java rename to dss-asic/src/main/java/eu/europa/esig/dss/asic/validation/ASiCXMLDocumentValidator.java index b58bf14d0d..dade53c616 100644 --- a/dss-asic/src/main/java/eu/europa/ec/markt/dss/validation102853/asic/ASiCXMLDocumentValidator.java +++ b/dss-asic/src/main/java/eu/europa/esig/dss/asic/validation/ASiCXMLDocumentValidator.java @@ -18,14 +18,14 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.asic; +package eu.europa.esig.dss.asic.validation; import java.util.List; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.validation.DocumentValidator; -import eu.europa.ec.markt.dss.validation102853.xades.XMLDocumentValidator; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.validation.DocumentValidator; +import eu.europa.esig.dss.xades.validation.XMLDocumentValidator; /** * Validator for ASiC signature diff --git a/dss-asic/src/test/java/eu/europa/ec/markt/dss/extension/asic/AbstractTestASiCwithCAdESExtension.java b/dss-asic/src/test/java/eu/europa/esig/dss/asic/extension/AbstractTestASiCwithCAdESExtension.java similarity index 77% rename from dss-asic/src/test/java/eu/europa/ec/markt/dss/extension/asic/AbstractTestASiCwithCAdESExtension.java rename to dss-asic/src/test/java/eu/europa/esig/dss/asic/extension/AbstractTestASiCwithCAdESExtension.java index 5359619292..9b584e6344 100644 --- a/dss-asic/src/test/java/eu/europa/ec/markt/dss/extension/asic/AbstractTestASiCwithCAdESExtension.java +++ b/dss-asic/src/test/java/eu/europa/esig/dss/asic/extension/AbstractTestASiCwithCAdESExtension.java @@ -18,24 +18,24 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.extension.asic; +package eu.europa.esig.dss.asic.extension; import java.util.Date; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.extension.AbstractTestExtension; -import eu.europa.ec.markt.dss.mock.MockTSPSource; -import eu.europa.ec.markt.dss.parameter.ASiCSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.InMemoryDocument; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.asic.ASiCService; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.SignatureForm; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.InMemoryDocument; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.asic.ASiCSignatureParameters; +import eu.europa.esig.dss.asic.signature.ASiCService; +import eu.europa.esig.dss.extension.AbstractTestExtension; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.test.mock.MockTSPSource; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.x509.SignatureForm; public abstract class AbstractTestASiCwithCAdESExtension extends AbstractTestExtension { diff --git a/dss-asic/src/test/java/eu/europa/ec/markt/dss/extension/asic/AbstractTestASiCwithXAdESExtension.java b/dss-asic/src/test/java/eu/europa/esig/dss/asic/extension/AbstractTestASiCwithXAdESExtension.java similarity index 77% rename from dss-asic/src/test/java/eu/europa/ec/markt/dss/extension/asic/AbstractTestASiCwithXAdESExtension.java rename to dss-asic/src/test/java/eu/europa/esig/dss/asic/extension/AbstractTestASiCwithXAdESExtension.java index 50c6a40a21..14bcb00fef 100644 --- a/dss-asic/src/test/java/eu/europa/ec/markt/dss/extension/asic/AbstractTestASiCwithXAdESExtension.java +++ b/dss-asic/src/test/java/eu/europa/esig/dss/asic/extension/AbstractTestASiCwithXAdESExtension.java @@ -18,24 +18,24 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.extension.asic; +package eu.europa.esig.dss.asic.extension; import java.util.Date; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.extension.AbstractTestExtension; -import eu.europa.ec.markt.dss.mock.MockTSPSource; -import eu.europa.ec.markt.dss.parameter.ASiCSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.InMemoryDocument; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.asic.ASiCService; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.SignatureForm; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.InMemoryDocument; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.asic.ASiCSignatureParameters; +import eu.europa.esig.dss.asic.signature.ASiCService; +import eu.europa.esig.dss.extension.AbstractTestExtension; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.test.mock.MockTSPSource; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.x509.SignatureForm; public abstract class AbstractTestASiCwithXAdESExtension extends AbstractTestExtension { diff --git a/dss-asic/src/test/java/eu/europa/ec/markt/dss/extension/asic/asice/ASiCeExtensionWithXAdESBToLTTest.java b/dss-asic/src/test/java/eu/europa/esig/dss/asic/extension/asice/ASiCeExtensionWithXAdESBToLTTest.java similarity index 88% rename from dss-asic/src/test/java/eu/europa/ec/markt/dss/extension/asic/asice/ASiCeExtensionWithXAdESBToLTTest.java rename to dss-asic/src/test/java/eu/europa/esig/dss/asic/extension/asice/ASiCeExtensionWithXAdESBToLTTest.java index 8f6cb9e096..40a57330c3 100644 --- a/dss-asic/src/test/java/eu/europa/ec/markt/dss/extension/asic/asice/ASiCeExtensionWithXAdESBToLTTest.java +++ b/dss-asic/src/test/java/eu/europa/esig/dss/asic/extension/asice/ASiCeExtensionWithXAdESBToLTTest.java @@ -18,10 +18,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.extension.asic.asice; +package eu.europa.esig.dss.asic.extension.asice; -import eu.europa.ec.markt.dss.extension.asic.AbstractTestASiCwithXAdESExtension; -import eu.europa.ec.markt.dss.signature.SignatureLevel; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.asic.extension.AbstractTestASiCwithXAdESExtension; public class ASiCeExtensionWithXAdESBToLTTest extends AbstractTestASiCwithXAdESExtension { diff --git a/dss-asic/src/test/java/eu/europa/ec/markt/dss/extension/asic/asice/ASiCeExtensionWithXAdESBToTTest.java b/dss-asic/src/test/java/eu/europa/esig/dss/asic/extension/asice/ASiCeExtensionWithXAdESBToTTest.java similarity index 88% rename from dss-asic/src/test/java/eu/europa/ec/markt/dss/extension/asic/asice/ASiCeExtensionWithXAdESBToTTest.java rename to dss-asic/src/test/java/eu/europa/esig/dss/asic/extension/asice/ASiCeExtensionWithXAdESBToTTest.java index b899fb738f..93100e15dd 100644 --- a/dss-asic/src/test/java/eu/europa/ec/markt/dss/extension/asic/asice/ASiCeExtensionWithXAdESBToTTest.java +++ b/dss-asic/src/test/java/eu/europa/esig/dss/asic/extension/asice/ASiCeExtensionWithXAdESBToTTest.java @@ -18,10 +18,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.extension.asic.asice; +package eu.europa.esig.dss.asic.extension.asice; -import eu.europa.ec.markt.dss.extension.asic.AbstractTestASiCwithXAdESExtension; -import eu.europa.ec.markt.dss.signature.SignatureLevel; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.asic.extension.AbstractTestASiCwithXAdESExtension; public class ASiCeExtensionWithXAdESBToTTest extends AbstractTestASiCwithXAdESExtension { diff --git a/dss-asic/src/test/java/eu/europa/ec/markt/dss/extension/asic/asice/ASiCeExtensionWithXAdESTToLTTest.java b/dss-asic/src/test/java/eu/europa/esig/dss/asic/extension/asice/ASiCeExtensionWithXAdESTToLTTest.java similarity index 88% rename from dss-asic/src/test/java/eu/europa/ec/markt/dss/extension/asic/asice/ASiCeExtensionWithXAdESTToLTTest.java rename to dss-asic/src/test/java/eu/europa/esig/dss/asic/extension/asice/ASiCeExtensionWithXAdESTToLTTest.java index b009936cc5..d08bddeb7d 100644 --- a/dss-asic/src/test/java/eu/europa/ec/markt/dss/extension/asic/asice/ASiCeExtensionWithXAdESTToLTTest.java +++ b/dss-asic/src/test/java/eu/europa/esig/dss/asic/extension/asice/ASiCeExtensionWithXAdESTToLTTest.java @@ -18,10 +18,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.extension.asic.asice; +package eu.europa.esig.dss.asic.extension.asice; -import eu.europa.ec.markt.dss.extension.asic.AbstractTestASiCwithXAdESExtension; -import eu.europa.ec.markt.dss.signature.SignatureLevel; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.asic.extension.AbstractTestASiCwithXAdESExtension; public class ASiCeExtensionWithXAdESTToLTTest extends AbstractTestASiCwithXAdESExtension { diff --git a/dss-asic/src/test/java/eu/europa/ec/markt/dss/extension/asic/asics/ASiCsExtensionWithCAdESBToTTest.java b/dss-asic/src/test/java/eu/europa/esig/dss/asic/extension/asics/ASiCsExtensionWithCAdESBToTTest.java similarity index 88% rename from dss-asic/src/test/java/eu/europa/ec/markt/dss/extension/asic/asics/ASiCsExtensionWithCAdESBToTTest.java rename to dss-asic/src/test/java/eu/europa/esig/dss/asic/extension/asics/ASiCsExtensionWithCAdESBToTTest.java index 27e4530eec..a98e077a08 100644 --- a/dss-asic/src/test/java/eu/europa/ec/markt/dss/extension/asic/asics/ASiCsExtensionWithCAdESBToTTest.java +++ b/dss-asic/src/test/java/eu/europa/esig/dss/asic/extension/asics/ASiCsExtensionWithCAdESBToTTest.java @@ -18,10 +18,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.extension.asic.asics; +package eu.europa.esig.dss.asic.extension.asics; -import eu.europa.ec.markt.dss.extension.asic.AbstractTestASiCwithCAdESExtension; -import eu.europa.ec.markt.dss.signature.SignatureLevel; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.asic.extension.AbstractTestASiCwithCAdESExtension; public class ASiCsExtensionWithCAdESBToTTest extends AbstractTestASiCwithCAdESExtension { diff --git a/dss-asic/src/test/java/eu/europa/ec/markt/dss/extension/asic/asics/ASiCsExtensionWithXAdESBToLTTest.java b/dss-asic/src/test/java/eu/europa/esig/dss/asic/extension/asics/ASiCsExtensionWithXAdESBToLTTest.java similarity index 88% rename from dss-asic/src/test/java/eu/europa/ec/markt/dss/extension/asic/asics/ASiCsExtensionWithXAdESBToLTTest.java rename to dss-asic/src/test/java/eu/europa/esig/dss/asic/extension/asics/ASiCsExtensionWithXAdESBToLTTest.java index 787903e4b1..33d7fe1908 100644 --- a/dss-asic/src/test/java/eu/europa/ec/markt/dss/extension/asic/asics/ASiCsExtensionWithXAdESBToLTTest.java +++ b/dss-asic/src/test/java/eu/europa/esig/dss/asic/extension/asics/ASiCsExtensionWithXAdESBToLTTest.java @@ -18,10 +18,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.extension.asic.asics; +package eu.europa.esig.dss.asic.extension.asics; -import eu.europa.ec.markt.dss.extension.asic.AbstractTestASiCwithXAdESExtension; -import eu.europa.ec.markt.dss.signature.SignatureLevel; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.asic.extension.AbstractTestASiCwithXAdESExtension; public class ASiCsExtensionWithXAdESBToLTTest extends AbstractTestASiCwithXAdESExtension { diff --git a/dss-asic/src/test/java/eu/europa/ec/markt/dss/extension/asic/asics/ASiCsExtensionWithXAdESBToTTest.java b/dss-asic/src/test/java/eu/europa/esig/dss/asic/extension/asics/ASiCsExtensionWithXAdESBToTTest.java similarity index 88% rename from dss-asic/src/test/java/eu/europa/ec/markt/dss/extension/asic/asics/ASiCsExtensionWithXAdESBToTTest.java rename to dss-asic/src/test/java/eu/europa/esig/dss/asic/extension/asics/ASiCsExtensionWithXAdESBToTTest.java index 09114b58a9..843a8c86df 100644 --- a/dss-asic/src/test/java/eu/europa/ec/markt/dss/extension/asic/asics/ASiCsExtensionWithXAdESBToTTest.java +++ b/dss-asic/src/test/java/eu/europa/esig/dss/asic/extension/asics/ASiCsExtensionWithXAdESBToTTest.java @@ -18,10 +18,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.extension.asic.asics; +package eu.europa.esig.dss.asic.extension.asics; -import eu.europa.ec.markt.dss.extension.asic.AbstractTestASiCwithXAdESExtension; -import eu.europa.ec.markt.dss.signature.SignatureLevel; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.asic.extension.AbstractTestASiCwithXAdESExtension; public class ASiCsExtensionWithXAdESBToTTest extends AbstractTestASiCwithXAdESExtension { diff --git a/dss-asic/src/test/java/eu/europa/ec/markt/dss/extension/asic/asics/ASiCsExtensionWithXAdESTToLTTest.java b/dss-asic/src/test/java/eu/europa/esig/dss/asic/extension/asics/ASiCsExtensionWithXAdESTToLTTest.java similarity index 88% rename from dss-asic/src/test/java/eu/europa/ec/markt/dss/extension/asic/asics/ASiCsExtensionWithXAdESTToLTTest.java rename to dss-asic/src/test/java/eu/europa/esig/dss/asic/extension/asics/ASiCsExtensionWithXAdESTToLTTest.java index 14cd3d5ad5..6375b07dbe 100644 --- a/dss-asic/src/test/java/eu/europa/ec/markt/dss/extension/asic/asics/ASiCsExtensionWithXAdESTToLTTest.java +++ b/dss-asic/src/test/java/eu/europa/esig/dss/asic/extension/asics/ASiCsExtensionWithXAdESTToLTTest.java @@ -18,10 +18,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.extension.asic.asics; +package eu.europa.esig.dss.asic.extension.asics; -import eu.europa.ec.markt.dss.extension.asic.AbstractTestASiCwithXAdESExtension; -import eu.europa.ec.markt.dss.signature.SignatureLevel; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.asic.extension.AbstractTestASiCwithXAdESExtension; public class ASiCsExtensionWithXAdESTToLTTest extends AbstractTestASiCwithXAdESExtension { diff --git a/dss-asic/src/test/java/eu/europa/ec/markt/dss/signature/asice/ASiCELevelBCAdESTest.java b/dss-asic/src/test/java/eu/europa/esig/dss/asic/signature/asice/ASiCELevelBCAdESTest.java similarity index 74% rename from dss-asic/src/test/java/eu/europa/ec/markt/dss/signature/asice/ASiCELevelBCAdESTest.java rename to dss-asic/src/test/java/eu/europa/esig/dss/asic/signature/asice/ASiCELevelBCAdESTest.java index c6f6ac637a..9ae02d6442 100644 --- a/dss-asic/src/test/java/eu/europa/ec/markt/dss/signature/asice/ASiCELevelBCAdESTest.java +++ b/dss-asic/src/test/java/eu/europa/esig/dss/asic/signature/asice/ASiCELevelBCAdESTest.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.asice; +package eu.europa.esig.dss.asic.signature.asice; import static org.junit.Assert.assertEquals; @@ -26,22 +26,22 @@ import org.junit.Before; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.parameter.ASiCSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.AbstractTestSignature; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.InMemoryDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.asic.ASiCService; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.SignatureForm; -import eu.europa.ec.markt.dss.validation102853.report.DiagnosticData; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.InMemoryDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.asic.ASiCSignatureParameters; +import eu.europa.esig.dss.asic.signature.ASiCService; +import eu.europa.esig.dss.signature.AbstractTestSignature; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.report.DiagnosticData; +import eu.europa.esig.dss.x509.SignatureForm; public class ASiCELevelBCAdESTest extends AbstractTestSignature { diff --git a/dss-asic/src/test/java/eu/europa/ec/markt/dss/signature/asice/ASiCELevelBInclusiveCanonicalizationTest.java b/dss-asic/src/test/java/eu/europa/esig/dss/asic/signature/asice/ASiCELevelBInclusiveCanonicalizationTest.java similarity index 77% rename from dss-asic/src/test/java/eu/europa/ec/markt/dss/signature/asice/ASiCELevelBInclusiveCanonicalizationTest.java rename to dss-asic/src/test/java/eu/europa/esig/dss/asic/signature/asice/ASiCELevelBInclusiveCanonicalizationTest.java index 301df94b92..23955e8925 100644 --- a/dss-asic/src/test/java/eu/europa/ec/markt/dss/signature/asice/ASiCELevelBInclusiveCanonicalizationTest.java +++ b/dss-asic/src/test/java/eu/europa/esig/dss/asic/signature/asice/ASiCELevelBInclusiveCanonicalizationTest.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.asice; +package eu.europa.esig.dss.asic.signature.asice; import static org.junit.Assert.assertEquals; @@ -28,21 +28,21 @@ import org.junit.Before; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.parameter.ASiCSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.AbstractTestSignature; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.InMemoryDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.asic.ASiCService; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.report.DiagnosticData; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.InMemoryDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.asic.ASiCSignatureParameters; +import eu.europa.esig.dss.asic.signature.ASiCService; +import eu.europa.esig.dss.signature.AbstractTestSignature; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.report.DiagnosticData; public class ASiCELevelBInclusiveCanonicalizationTest extends AbstractTestSignature { diff --git a/dss-asic/src/test/java/eu/europa/ec/markt/dss/signature/asice/ASiCELevelBTest.java b/dss-asic/src/test/java/eu/europa/esig/dss/asic/signature/asice/ASiCELevelBTest.java similarity index 75% rename from dss-asic/src/test/java/eu/europa/ec/markt/dss/signature/asice/ASiCELevelBTest.java rename to dss-asic/src/test/java/eu/europa/esig/dss/asic/signature/asice/ASiCELevelBTest.java index 18c0b087a4..6a2a0f27cf 100644 --- a/dss-asic/src/test/java/eu/europa/ec/markt/dss/signature/asice/ASiCELevelBTest.java +++ b/dss-asic/src/test/java/eu/europa/esig/dss/asic/signature/asice/ASiCELevelBTest.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.asice; +package eu.europa.esig.dss.asic.signature.asice; import static org.junit.Assert.assertEquals; @@ -26,21 +26,21 @@ import org.junit.Before; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.parameter.ASiCSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.AbstractTestSignature; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.InMemoryDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.asic.ASiCService; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.report.DiagnosticData; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.InMemoryDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.asic.ASiCSignatureParameters; +import eu.europa.esig.dss.asic.signature.ASiCService; +import eu.europa.esig.dss.signature.AbstractTestSignature; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.report.DiagnosticData; public class ASiCELevelBTest extends AbstractTestSignature { diff --git a/dss-asic/src/test/java/eu/europa/ec/markt/dss/signature/asice/ASiCELevelLTTest.java b/dss-asic/src/test/java/eu/europa/esig/dss/asic/signature/asice/ASiCELevelLTTest.java similarity index 75% rename from dss-asic/src/test/java/eu/europa/ec/markt/dss/signature/asice/ASiCELevelLTTest.java rename to dss-asic/src/test/java/eu/europa/esig/dss/asic/signature/asice/ASiCELevelLTTest.java index 8208cda685..43718ef656 100644 --- a/dss-asic/src/test/java/eu/europa/ec/markt/dss/signature/asice/ASiCELevelLTTest.java +++ b/dss-asic/src/test/java/eu/europa/esig/dss/asic/signature/asice/ASiCELevelLTTest.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.asice; +package eu.europa.esig.dss.asic.signature.asice; import static org.junit.Assert.assertEquals; @@ -26,22 +26,22 @@ import org.junit.Before; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.mock.MockTSPSource; -import eu.europa.ec.markt.dss.parameter.ASiCSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.AbstractTestSignature; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.InMemoryDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.asic.ASiCService; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.report.DiagnosticData; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.InMemoryDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.asic.ASiCSignatureParameters; +import eu.europa.esig.dss.asic.signature.ASiCService; +import eu.europa.esig.dss.signature.AbstractTestSignature; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.test.mock.MockTSPSource; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.report.DiagnosticData; public class ASiCELevelLTTest extends AbstractTestSignature { diff --git a/dss-asic/src/test/java/eu/europa/ec/markt/dss/signature/asice/ASiCELevelTCAdESTest.java b/dss-asic/src/test/java/eu/europa/esig/dss/asic/signature/asice/ASiCELevelTCAdESTest.java similarity index 75% rename from dss-asic/src/test/java/eu/europa/ec/markt/dss/signature/asice/ASiCELevelTCAdESTest.java rename to dss-asic/src/test/java/eu/europa/esig/dss/asic/signature/asice/ASiCELevelTCAdESTest.java index a8a3d50f1d..40d0a4087d 100644 --- a/dss-asic/src/test/java/eu/europa/ec/markt/dss/signature/asice/ASiCELevelTCAdESTest.java +++ b/dss-asic/src/test/java/eu/europa/esig/dss/asic/signature/asice/ASiCELevelTCAdESTest.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.asice; +package eu.europa.esig.dss.asic.signature.asice; import static org.junit.Assert.assertEquals; @@ -26,22 +26,22 @@ import org.junit.Before; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.mock.MockTSPSource; -import eu.europa.ec.markt.dss.parameter.ASiCSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.AbstractTestSignature; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.InMemoryDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.asic.ASiCService; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.report.DiagnosticData; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.InMemoryDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.asic.ASiCSignatureParameters; +import eu.europa.esig.dss.asic.signature.ASiCService; +import eu.europa.esig.dss.signature.AbstractTestSignature; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.test.mock.MockTSPSource; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.report.DiagnosticData; public class ASiCELevelTCAdESTest extends AbstractTestSignature { diff --git a/dss-asic/src/test/java/eu/europa/ec/markt/dss/signature/asice/ASiCELevelTTest.java b/dss-asic/src/test/java/eu/europa/esig/dss/asic/signature/asice/ASiCELevelTTest.java similarity index 75% rename from dss-asic/src/test/java/eu/europa/ec/markt/dss/signature/asice/ASiCELevelTTest.java rename to dss-asic/src/test/java/eu/europa/esig/dss/asic/signature/asice/ASiCELevelTTest.java index 57e133b851..64e500bf66 100644 --- a/dss-asic/src/test/java/eu/europa/ec/markt/dss/signature/asice/ASiCELevelTTest.java +++ b/dss-asic/src/test/java/eu/europa/esig/dss/asic/signature/asice/ASiCELevelTTest.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.asice; +package eu.europa.esig.dss.asic.signature.asice; import static org.junit.Assert.assertEquals; @@ -26,22 +26,22 @@ import org.junit.Before; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.mock.MockTSPSource; -import eu.europa.ec.markt.dss.parameter.ASiCSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.AbstractTestSignature; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.InMemoryDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.asic.ASiCService; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.report.DiagnosticData; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.InMemoryDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.asic.ASiCSignatureParameters; +import eu.europa.esig.dss.asic.signature.ASiCService; +import eu.europa.esig.dss.signature.AbstractTestSignature; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.test.mock.MockTSPSource; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.report.DiagnosticData; public class ASiCELevelTTest extends AbstractTestSignature { diff --git a/dss-asic/src/test/java/eu/europa/ec/markt/dss/signature/asics/ASiCSLevelBCAdESTest.java b/dss-asic/src/test/java/eu/europa/esig/dss/asic/signature/asics/ASiCSLevelBCAdESTest.java similarity index 74% rename from dss-asic/src/test/java/eu/europa/ec/markt/dss/signature/asics/ASiCSLevelBCAdESTest.java rename to dss-asic/src/test/java/eu/europa/esig/dss/asic/signature/asics/ASiCSLevelBCAdESTest.java index 8abb4da6c9..9082240552 100644 --- a/dss-asic/src/test/java/eu/europa/ec/markt/dss/signature/asics/ASiCSLevelBCAdESTest.java +++ b/dss-asic/src/test/java/eu/europa/esig/dss/asic/signature/asics/ASiCSLevelBCAdESTest.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.asics; +package eu.europa.esig.dss.asic.signature.asics; import static org.junit.Assert.assertEquals; @@ -26,22 +26,22 @@ import org.junit.Before; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.parameter.ASiCSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.AbstractTestSignature; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.InMemoryDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.asic.ASiCService; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.SignatureForm; -import eu.europa.ec.markt.dss.validation102853.report.DiagnosticData; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.InMemoryDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.asic.ASiCSignatureParameters; +import eu.europa.esig.dss.asic.signature.ASiCService; +import eu.europa.esig.dss.signature.AbstractTestSignature; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.report.DiagnosticData; +import eu.europa.esig.dss.x509.SignatureForm; public class ASiCSLevelBCAdESTest extends AbstractTestSignature { diff --git a/dss-asic/src/test/java/eu/europa/ec/markt/dss/signature/asics/ASiCSLevelBInclusiveCanonicalizationTest.java b/dss-asic/src/test/java/eu/europa/esig/dss/asic/signature/asics/ASiCSLevelBInclusiveCanonicalizationTest.java similarity index 77% rename from dss-asic/src/test/java/eu/europa/ec/markt/dss/signature/asics/ASiCSLevelBInclusiveCanonicalizationTest.java rename to dss-asic/src/test/java/eu/europa/esig/dss/asic/signature/asics/ASiCSLevelBInclusiveCanonicalizationTest.java index fff5d767d3..341bc73396 100644 --- a/dss-asic/src/test/java/eu/europa/ec/markt/dss/signature/asics/ASiCSLevelBInclusiveCanonicalizationTest.java +++ b/dss-asic/src/test/java/eu/europa/esig/dss/asic/signature/asics/ASiCSLevelBInclusiveCanonicalizationTest.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.asics; +package eu.europa.esig.dss.asic.signature.asics; import static org.junit.Assert.assertEquals; @@ -28,21 +28,21 @@ import org.junit.Before; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.parameter.ASiCSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.AbstractTestSignature; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.InMemoryDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.asic.ASiCService; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.report.DiagnosticData; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.InMemoryDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.asic.ASiCSignatureParameters; +import eu.europa.esig.dss.asic.signature.ASiCService; +import eu.europa.esig.dss.signature.AbstractTestSignature; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.report.DiagnosticData; public class ASiCSLevelBInclusiveCanonicalizationTest extends AbstractTestSignature { diff --git a/dss-asic/src/test/java/eu/europa/ec/markt/dss/signature/asics/ASiCSLevelBTest.java b/dss-asic/src/test/java/eu/europa/esig/dss/asic/signature/asics/ASiCSLevelBTest.java similarity index 75% rename from dss-asic/src/test/java/eu/europa/ec/markt/dss/signature/asics/ASiCSLevelBTest.java rename to dss-asic/src/test/java/eu/europa/esig/dss/asic/signature/asics/ASiCSLevelBTest.java index 1e1b742062..e953147b1d 100644 --- a/dss-asic/src/test/java/eu/europa/ec/markt/dss/signature/asics/ASiCSLevelBTest.java +++ b/dss-asic/src/test/java/eu/europa/esig/dss/asic/signature/asics/ASiCSLevelBTest.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.asics; +package eu.europa.esig.dss.asic.signature.asics; import static org.junit.Assert.assertEquals; @@ -26,21 +26,21 @@ import org.junit.Before; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.parameter.ASiCSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.AbstractTestSignature; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.InMemoryDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.asic.ASiCService; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.report.DiagnosticData; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.InMemoryDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.asic.ASiCSignatureParameters; +import eu.europa.esig.dss.asic.signature.ASiCService; +import eu.europa.esig.dss.signature.AbstractTestSignature; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.report.DiagnosticData; public class ASiCSLevelBTest extends AbstractTestSignature { diff --git a/dss-asic/src/test/java/eu/europa/ec/markt/dss/signature/asics/ASiCSLevelLTTest.java b/dss-asic/src/test/java/eu/europa/esig/dss/asic/signature/asics/ASiCSLevelLTTest.java similarity index 74% rename from dss-asic/src/test/java/eu/europa/ec/markt/dss/signature/asics/ASiCSLevelLTTest.java rename to dss-asic/src/test/java/eu/europa/esig/dss/asic/signature/asics/ASiCSLevelLTTest.java index 6bdfe5e965..9bb9a0c570 100644 --- a/dss-asic/src/test/java/eu/europa/ec/markt/dss/signature/asics/ASiCSLevelLTTest.java +++ b/dss-asic/src/test/java/eu/europa/esig/dss/asic/signature/asics/ASiCSLevelLTTest.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.asics; +package eu.europa.esig.dss.asic.signature.asics; import static org.junit.Assert.assertEquals; @@ -26,23 +26,23 @@ import org.junit.Before; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.mock.MockTSPSource; -import eu.europa.ec.markt.dss.parameter.ASiCSignatureParameters; -import eu.europa.ec.markt.dss.parameter.AbstractSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.AbstractTestSignature; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.InMemoryDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.asic.ASiCService; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.report.DiagnosticData; +import eu.europa.esig.dss.AbstractSignatureParameters; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.InMemoryDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.asic.ASiCSignatureParameters; +import eu.europa.esig.dss.asic.signature.ASiCService; +import eu.europa.esig.dss.signature.AbstractTestSignature; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.test.mock.MockTSPSource; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.report.DiagnosticData; public class ASiCSLevelLTTest extends AbstractTestSignature { diff --git a/dss-asic/src/test/java/eu/europa/ec/markt/dss/signature/asics/ASiCSLevelTTest.java b/dss-asic/src/test/java/eu/europa/esig/dss/asic/signature/asics/ASiCSLevelTTest.java similarity index 75% rename from dss-asic/src/test/java/eu/europa/ec/markt/dss/signature/asics/ASiCSLevelTTest.java rename to dss-asic/src/test/java/eu/europa/esig/dss/asic/signature/asics/ASiCSLevelTTest.java index 37b03ef67a..db499774fb 100644 --- a/dss-asic/src/test/java/eu/europa/ec/markt/dss/signature/asics/ASiCSLevelTTest.java +++ b/dss-asic/src/test/java/eu/europa/esig/dss/asic/signature/asics/ASiCSLevelTTest.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.asics; +package eu.europa.esig.dss.asic.signature.asics; import static org.junit.Assert.assertEquals; @@ -26,22 +26,22 @@ import org.junit.Before; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.mock.MockTSPSource; -import eu.europa.ec.markt.dss.parameter.ASiCSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.AbstractTestSignature; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.InMemoryDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.asic.ASiCService; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.report.DiagnosticData; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.InMemoryDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.asic.ASiCSignatureParameters; +import eu.europa.esig.dss.asic.signature.ASiCService; +import eu.europa.esig.dss.signature.AbstractTestSignature; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.test.mock.MockTSPSource; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.report.DiagnosticData; public class ASiCSLevelTTest extends AbstractTestSignature { diff --git a/dss-asic/src/test/java/eu/europa/ec/markt/dss/validation/ASiCEWithMalformedOCSPTest.java b/dss-asic/src/test/java/eu/europa/esig/dss/asic/validation/ASiCEWithMalformedOCSPTest.java similarity index 79% rename from dss-asic/src/test/java/eu/europa/ec/markt/dss/validation/ASiCEWithMalformedOCSPTest.java rename to dss-asic/src/test/java/eu/europa/esig/dss/asic/validation/ASiCEWithMalformedOCSPTest.java index 56afcafeaa..a6cbb15d78 100644 --- a/dss-asic/src/test/java/eu/europa/ec/markt/dss/validation/ASiCEWithMalformedOCSPTest.java +++ b/dss-asic/src/test/java/eu/europa/esig/dss/asic/validation/ASiCEWithMalformedOCSPTest.java @@ -18,18 +18,18 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation; +package eu.europa.esig.dss.asic.validation; import static org.junit.Assert.assertNotNull; import org.junit.Test; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.SignedDocumentValidator; -import eu.europa.ec.markt.dss.validation102853.report.DiagnosticData; -import eu.europa.ec.markt.dss.validation102853.report.Reports; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.SignedDocumentValidator; +import eu.europa.esig.dss.validation.report.DiagnosticData; +import eu.europa.esig.dss.validation.report.Reports; /** * Unit test added to fix : https://esig-dss.atlassian.net/browse/DSS-663 diff --git a/dss-asic/src/test/java/eu/europa/ec/markt/dss/validation/SignedPropertiesNotCheckedTest.java b/dss-asic/src/test/java/eu/europa/esig/dss/asic/validation/SignedPropertiesNotCheckedTest.java similarity index 80% rename from dss-asic/src/test/java/eu/europa/ec/markt/dss/validation/SignedPropertiesNotCheckedTest.java rename to dss-asic/src/test/java/eu/europa/esig/dss/asic/validation/SignedPropertiesNotCheckedTest.java index 1dccdb194e..50151d2a0b 100644 --- a/dss-asic/src/test/java/eu/europa/ec/markt/dss/validation/SignedPropertiesNotCheckedTest.java +++ b/dss-asic/src/test/java/eu/europa/esig/dss/asic/validation/SignedPropertiesNotCheckedTest.java @@ -18,21 +18,21 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation; +package eu.europa.esig.dss.asic.validation; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import org.junit.Test; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.SignedDocumentValidator; -import eu.europa.ec.markt.dss.validation102853.report.DetailedReport; -import eu.europa.ec.markt.dss.validation102853.report.DiagnosticData; -import eu.europa.ec.markt.dss.validation102853.report.Reports; -import eu.europa.ec.markt.dss.validation102853.rules.SubIndication; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.SignedDocumentValidator; +import eu.europa.esig.dss.validation.policy.rules.SubIndication; +import eu.europa.esig.dss.validation.report.DetailedReport; +import eu.europa.esig.dss.validation.report.DiagnosticData; +import eu.europa.esig.dss.validation.report.Reports; /** * Unit test added to fix : https://joinup.ec.europa.eu/asset/sd-dss/issue/xades-signedproperties-reference diff --git a/dss-asic/src/test/java/known/issues/DSS631/ASiCELevelLTATest.java b/dss-asic/src/test/java/known/issues/DSS631/ASiCELevelLTATest.java index 06cc758a96..4202f47d29 100644 --- a/dss-asic/src/test/java/known/issues/DSS631/ASiCELevelLTATest.java +++ b/dss-asic/src/test/java/known/issues/DSS631/ASiCELevelLTATest.java @@ -26,22 +26,22 @@ import org.junit.Before; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.mock.MockTSPSource; -import eu.europa.ec.markt.dss.parameter.ASiCSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.AbstractTestSignature; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.InMemoryDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.asic.ASiCService; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.report.DiagnosticData; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.InMemoryDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.asic.ASiCSignatureParameters; +import eu.europa.esig.dss.asic.signature.ASiCService; +import eu.europa.esig.dss.signature.AbstractTestSignature; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.test.mock.MockTSPSource; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.report.DiagnosticData; public class ASiCELevelLTATest extends AbstractTestSignature { diff --git a/dss-asic/src/test/java/known/issues/DSS631/ASiCSLevelLTATest.java b/dss-asic/src/test/java/known/issues/DSS631/ASiCSLevelLTATest.java index 45499a15ab..654f7ea551 100644 --- a/dss-asic/src/test/java/known/issues/DSS631/ASiCSLevelLTATest.java +++ b/dss-asic/src/test/java/known/issues/DSS631/ASiCSLevelLTATest.java @@ -26,22 +26,22 @@ import org.junit.Before; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.mock.MockTSPSource; -import eu.europa.ec.markt.dss.parameter.ASiCSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.AbstractTestSignature; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.InMemoryDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.asic.ASiCService; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.report.DiagnosticData; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.InMemoryDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.asic.ASiCSignatureParameters; +import eu.europa.esig.dss.asic.signature.ASiCService; +import eu.europa.esig.dss.signature.AbstractTestSignature; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.test.mock.MockTSPSource; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.report.DiagnosticData; public class ASiCSLevelLTATest extends AbstractTestSignature { diff --git a/dss-asic/src/test/java/known/issues/DSS631/ASiCeExtensionWithXAdESBToLTATest.java b/dss-asic/src/test/java/known/issues/DSS631/ASiCeExtensionWithXAdESBToLTATest.java index 59f59752fa..b032b496e6 100644 --- a/dss-asic/src/test/java/known/issues/DSS631/ASiCeExtensionWithXAdESBToLTATest.java +++ b/dss-asic/src/test/java/known/issues/DSS631/ASiCeExtensionWithXAdESBToLTATest.java @@ -20,8 +20,8 @@ */ package known.issues.DSS631; -import eu.europa.ec.markt.dss.extension.asic.AbstractTestASiCwithXAdESExtension; -import eu.europa.ec.markt.dss.signature.SignatureLevel; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.asic.extension.AbstractTestASiCwithXAdESExtension; public class ASiCeExtensionWithXAdESBToLTATest extends AbstractTestASiCwithXAdESExtension { diff --git a/dss-asic/src/test/java/known/issues/DSS631/ASiCeExtensionWithXAdESLTToLTATest.java b/dss-asic/src/test/java/known/issues/DSS631/ASiCeExtensionWithXAdESLTToLTATest.java index e56e1489dc..cfd695cef4 100644 --- a/dss-asic/src/test/java/known/issues/DSS631/ASiCeExtensionWithXAdESLTToLTATest.java +++ b/dss-asic/src/test/java/known/issues/DSS631/ASiCeExtensionWithXAdESLTToLTATest.java @@ -20,8 +20,8 @@ */ package known.issues.DSS631; -import eu.europa.ec.markt.dss.extension.asic.AbstractTestASiCwithXAdESExtension; -import eu.europa.ec.markt.dss.signature.SignatureLevel; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.asic.extension.AbstractTestASiCwithXAdESExtension; public class ASiCeExtensionWithXAdESLTToLTATest extends AbstractTestASiCwithXAdESExtension { diff --git a/dss-asic/src/test/java/known/issues/DSS631/ASiCeExtensionWithXAdESTToLTATest.java b/dss-asic/src/test/java/known/issues/DSS631/ASiCeExtensionWithXAdESTToLTATest.java index 07b13bc300..b32c512fa7 100644 --- a/dss-asic/src/test/java/known/issues/DSS631/ASiCeExtensionWithXAdESTToLTATest.java +++ b/dss-asic/src/test/java/known/issues/DSS631/ASiCeExtensionWithXAdESTToLTATest.java @@ -20,8 +20,8 @@ */ package known.issues.DSS631; -import eu.europa.ec.markt.dss.extension.asic.AbstractTestASiCwithXAdESExtension; -import eu.europa.ec.markt.dss.signature.SignatureLevel; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.asic.extension.AbstractTestASiCwithXAdESExtension; public class ASiCeExtensionWithXAdESTToLTATest extends AbstractTestASiCwithXAdESExtension { diff --git a/dss-asic/src/test/java/known/issues/DSS631/ASiCsExtensionWithCAdESBToLTATest.java b/dss-asic/src/test/java/known/issues/DSS631/ASiCsExtensionWithCAdESBToLTATest.java index 5fb57f3cc5..70665d80dd 100644 --- a/dss-asic/src/test/java/known/issues/DSS631/ASiCsExtensionWithCAdESBToLTATest.java +++ b/dss-asic/src/test/java/known/issues/DSS631/ASiCsExtensionWithCAdESBToLTATest.java @@ -20,8 +20,8 @@ */ package known.issues.DSS631; -import eu.europa.ec.markt.dss.extension.asic.AbstractTestASiCwithCAdESExtension; -import eu.europa.ec.markt.dss.signature.SignatureLevel; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.asic.extension.AbstractTestASiCwithCAdESExtension; public class ASiCsExtensionWithCAdESBToLTATest extends AbstractTestASiCwithCAdESExtension { diff --git a/dss-asic/src/test/java/known/issues/DSS631/ASiCsExtensionWithCAdESBToLTTest.java b/dss-asic/src/test/java/known/issues/DSS631/ASiCsExtensionWithCAdESBToLTTest.java index b55678dcf9..d6b5f24b32 100644 --- a/dss-asic/src/test/java/known/issues/DSS631/ASiCsExtensionWithCAdESBToLTTest.java +++ b/dss-asic/src/test/java/known/issues/DSS631/ASiCsExtensionWithCAdESBToLTTest.java @@ -20,8 +20,8 @@ */ package known.issues.DSS631; -import eu.europa.ec.markt.dss.extension.asic.AbstractTestASiCwithCAdESExtension; -import eu.europa.ec.markt.dss.signature.SignatureLevel; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.asic.extension.AbstractTestASiCwithCAdESExtension; public class ASiCsExtensionWithCAdESBToLTTest extends AbstractTestASiCwithCAdESExtension { diff --git a/dss-asic/src/test/java/known/issues/DSS631/ASiCsExtensionWithCAdESLTToLTATest.java b/dss-asic/src/test/java/known/issues/DSS631/ASiCsExtensionWithCAdESLTToLTATest.java index 5b4457b614..8150740076 100644 --- a/dss-asic/src/test/java/known/issues/DSS631/ASiCsExtensionWithCAdESLTToLTATest.java +++ b/dss-asic/src/test/java/known/issues/DSS631/ASiCsExtensionWithCAdESLTToLTATest.java @@ -20,8 +20,8 @@ */ package known.issues.DSS631; -import eu.europa.ec.markt.dss.extension.asic.AbstractTestASiCwithCAdESExtension; -import eu.europa.ec.markt.dss.signature.SignatureLevel; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.asic.extension.AbstractTestASiCwithCAdESExtension; public class ASiCsExtensionWithCAdESLTToLTATest extends AbstractTestASiCwithCAdESExtension { diff --git a/dss-asic/src/test/java/known/issues/DSS631/ASiCsExtensionWithCAdESTToLTTest.java b/dss-asic/src/test/java/known/issues/DSS631/ASiCsExtensionWithCAdESTToLTTest.java index 55b806217c..ce6849e939 100644 --- a/dss-asic/src/test/java/known/issues/DSS631/ASiCsExtensionWithCAdESTToLTTest.java +++ b/dss-asic/src/test/java/known/issues/DSS631/ASiCsExtensionWithCAdESTToLTTest.java @@ -20,8 +20,8 @@ */ package known.issues.DSS631; -import eu.europa.ec.markt.dss.extension.asic.AbstractTestASiCwithCAdESExtension; -import eu.europa.ec.markt.dss.signature.SignatureLevel; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.asic.extension.AbstractTestASiCwithCAdESExtension; public class ASiCsExtensionWithCAdESTToLTTest extends AbstractTestASiCwithCAdESExtension { diff --git a/dss-asic/src/test/java/known/issues/DSS631/ASiCsExtensionWithXAdESBToLTATest.java b/dss-asic/src/test/java/known/issues/DSS631/ASiCsExtensionWithXAdESBToLTATest.java index ed6278efc2..0d1f078f10 100644 --- a/dss-asic/src/test/java/known/issues/DSS631/ASiCsExtensionWithXAdESBToLTATest.java +++ b/dss-asic/src/test/java/known/issues/DSS631/ASiCsExtensionWithXAdESBToLTATest.java @@ -20,8 +20,8 @@ */ package known.issues.DSS631; -import eu.europa.ec.markt.dss.extension.asic.AbstractTestASiCwithXAdESExtension; -import eu.europa.ec.markt.dss.signature.SignatureLevel; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.asic.extension.AbstractTestASiCwithXAdESExtension; public class ASiCsExtensionWithXAdESBToLTATest extends AbstractTestASiCwithXAdESExtension { diff --git a/dss-asic/src/test/java/known/issues/DSS631/ASiCsExtensionWithXAdESLTToLTATest.java b/dss-asic/src/test/java/known/issues/DSS631/ASiCsExtensionWithXAdESLTToLTATest.java index 516737075e..d2f0a9e14f 100644 --- a/dss-asic/src/test/java/known/issues/DSS631/ASiCsExtensionWithXAdESLTToLTATest.java +++ b/dss-asic/src/test/java/known/issues/DSS631/ASiCsExtensionWithXAdESLTToLTATest.java @@ -20,8 +20,8 @@ */ package known.issues.DSS631; -import eu.europa.ec.markt.dss.extension.asic.AbstractTestASiCwithXAdESExtension; -import eu.europa.ec.markt.dss.signature.SignatureLevel; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.asic.extension.AbstractTestASiCwithXAdESExtension; public class ASiCsExtensionWithXAdESLTToLTATest extends AbstractTestASiCwithXAdESExtension { diff --git a/dss-asic/src/test/java/known/issues/DSS650/ASiCeExtensionWithCAdESBToLTATest.java b/dss-asic/src/test/java/known/issues/DSS650/ASiCeExtensionWithCAdESBToLTATest.java index 961131be2d..2b8b335856 100644 --- a/dss-asic/src/test/java/known/issues/DSS650/ASiCeExtensionWithCAdESBToLTATest.java +++ b/dss-asic/src/test/java/known/issues/DSS650/ASiCeExtensionWithCAdESBToLTATest.java @@ -20,8 +20,8 @@ */ package known.issues.DSS650; -import eu.europa.ec.markt.dss.extension.asic.AbstractTestASiCwithCAdESExtension; -import eu.europa.ec.markt.dss.signature.SignatureLevel; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.asic.extension.AbstractTestASiCwithCAdESExtension; public class ASiCeExtensionWithCAdESBToLTATest extends AbstractTestASiCwithCAdESExtension { diff --git a/dss-asic/src/test/java/known/issues/DSS650/ASiCeExtensionWithCAdESBToLTTest.java b/dss-asic/src/test/java/known/issues/DSS650/ASiCeExtensionWithCAdESBToLTTest.java index 0d4418ff75..ea5cbb41d9 100644 --- a/dss-asic/src/test/java/known/issues/DSS650/ASiCeExtensionWithCAdESBToLTTest.java +++ b/dss-asic/src/test/java/known/issues/DSS650/ASiCeExtensionWithCAdESBToLTTest.java @@ -20,8 +20,8 @@ */ package known.issues.DSS650; -import eu.europa.ec.markt.dss.extension.asic.AbstractTestASiCwithCAdESExtension; -import eu.europa.ec.markt.dss.signature.SignatureLevel; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.asic.extension.AbstractTestASiCwithCAdESExtension; public class ASiCeExtensionWithCAdESBToLTTest extends AbstractTestASiCwithCAdESExtension { diff --git a/dss-asic/src/test/java/known/issues/DSS650/ASiCeExtensionWithCAdESBToTTest.java b/dss-asic/src/test/java/known/issues/DSS650/ASiCeExtensionWithCAdESBToTTest.java index 5b31ba4b0d..f6fe45e930 100644 --- a/dss-asic/src/test/java/known/issues/DSS650/ASiCeExtensionWithCAdESBToTTest.java +++ b/dss-asic/src/test/java/known/issues/DSS650/ASiCeExtensionWithCAdESBToTTest.java @@ -20,8 +20,8 @@ */ package known.issues.DSS650; -import eu.europa.ec.markt.dss.extension.asic.AbstractTestASiCwithCAdESExtension; -import eu.europa.ec.markt.dss.signature.SignatureLevel; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.asic.extension.AbstractTestASiCwithCAdESExtension; public class ASiCeExtensionWithCAdESBToTTest extends AbstractTestASiCwithCAdESExtension { diff --git a/dss-asic/src/test/java/known/issues/DSS650/ASiCeSignAndExtendTest.java b/dss-asic/src/test/java/known/issues/DSS650/ASiCeSignAndExtendTest.java index c67bef0d38..b383a40e35 100644 --- a/dss-asic/src/test/java/known/issues/DSS650/ASiCeSignAndExtendTest.java +++ b/dss-asic/src/test/java/known/issues/DSS650/ASiCeSignAndExtendTest.java @@ -5,21 +5,21 @@ import org.junit.Test; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.mock.MockTSPSource; -import eu.europa.ec.markt.dss.parameter.ASiCSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.signature.InMemoryDocument; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.asic.ASiCService; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.utils.TestUtils; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.SignatureForm; -import eu.europa.ec.markt.dss.validation102853.SignedDocumentValidator; -import eu.europa.ec.markt.dss.validation102853.report.Reports; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.InMemoryDocument; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.asic.ASiCSignatureParameters; +import eu.europa.esig.dss.asic.signature.ASiCService; +import eu.europa.esig.dss.test.TestUtils; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.test.mock.MockTSPSource; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.SignedDocumentValidator; +import eu.europa.esig.dss.validation.report.Reports; +import eu.europa.esig.dss.x509.SignatureForm; public class ASiCeSignAndExtendTest { diff --git a/dss-asic/src/test/java/known/issues/DSS665/ASiCEtoASiCSTest.java b/dss-asic/src/test/java/known/issues/DSS665/ASiCEtoASiCSTest.java index 09e847051c..bb1f95c13a 100644 --- a/dss-asic/src/test/java/known/issues/DSS665/ASiCEtoASiCSTest.java +++ b/dss-asic/src/test/java/known/issues/DSS665/ASiCEtoASiCSTest.java @@ -6,21 +6,21 @@ import org.junit.Test; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.parameter.ASiCSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.InMemoryDocument; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.asic.ASiCService; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.utils.TestUtils; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.SignedDocumentValidator; -import eu.europa.ec.markt.dss.validation102853.report.DiagnosticData; -import eu.europa.ec.markt.dss.validation102853.report.Reports; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.InMemoryDocument; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.asic.ASiCSignatureParameters; +import eu.europa.esig.dss.asic.signature.ASiCService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.TestUtils; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.SignedDocumentValidator; +import eu.europa.esig.dss.validation.report.DiagnosticData; +import eu.europa.esig.dss.validation.report.Reports; public class ASiCEtoASiCSTest { diff --git a/dss-asic/src/test/java/known/issues/DSS665/ASiCStoASiCETest.java b/dss-asic/src/test/java/known/issues/DSS665/ASiCStoASiCETest.java index d77e0e31b2..c5f81399d7 100644 --- a/dss-asic/src/test/java/known/issues/DSS665/ASiCStoASiCETest.java +++ b/dss-asic/src/test/java/known/issues/DSS665/ASiCStoASiCETest.java @@ -6,21 +6,21 @@ import org.junit.Test; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.parameter.ASiCSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.InMemoryDocument; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.asic.ASiCService; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.utils.TestUtils; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.SignedDocumentValidator; -import eu.europa.ec.markt.dss.validation102853.report.DiagnosticData; -import eu.europa.ec.markt.dss.validation102853.report.Reports; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.InMemoryDocument; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.asic.ASiCSignatureParameters; +import eu.europa.esig.dss.asic.signature.ASiCService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.TestUtils; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.SignedDocumentValidator; +import eu.europa.esig.dss.validation.report.DiagnosticData; +import eu.europa.esig.dss.validation.report.Reports; public class ASiCStoASiCETest { diff --git a/dss-asic/src/test/java/known/issues/DSS666/CertificatePoolSharingTest.java b/dss-asic/src/test/java/known/issues/DSS666/CertificatePoolSharingTest.java index 61cff4cfed..ecf47a93cd 100644 --- a/dss-asic/src/test/java/known/issues/DSS666/CertificatePoolSharingTest.java +++ b/dss-asic/src/test/java/known/issues/DSS666/CertificatePoolSharingTest.java @@ -9,22 +9,22 @@ import org.apache.commons.collections.CollectionUtils; import org.junit.Test; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.parameter.ASiCSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.InMemoryDocument; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.asic.ASiCService; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.signature.validation.AdvancedSignature; -import eu.europa.ec.markt.dss.utils.TestUtils; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.SignatureForm; -import eu.europa.ec.markt.dss.validation102853.SignedDocumentValidator; -import eu.europa.ec.markt.dss.validation102853.report.Reports; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.InMemoryDocument; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.asic.ASiCSignatureParameters; +import eu.europa.esig.dss.asic.signature.ASiCService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.TestUtils; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.AdvancedSignature; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.SignedDocumentValidator; +import eu.europa.esig.dss.validation.report.Reports; +import eu.europa.esig.dss.x509.SignatureForm; public class CertificatePoolSharingTest { diff --git a/dss-asic/src/test/java/plugtests/ETSISamplesValidationTest.java b/dss-asic/src/test/java/plugtests/ETSISamplesValidationTest.java index 55dff5ab7a..ba08743541 100644 --- a/dss-asic/src/test/java/plugtests/ETSISamplesValidationTest.java +++ b/dss-asic/src/test/java/plugtests/ETSISamplesValidationTest.java @@ -12,13 +12,13 @@ import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.SignedDocumentValidator; -import eu.europa.ec.markt.dss.validation102853.report.DetailedReport; -import eu.europa.ec.markt.dss.validation102853.report.DiagnosticData; -import eu.europa.ec.markt.dss.validation102853.report.Reports; -import eu.europa.ec.markt.dss.validation102853.report.SimpleReport; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.SignedDocumentValidator; +import eu.europa.esig.dss.validation.report.DetailedReport; +import eu.europa.esig.dss.validation.report.DiagnosticData; +import eu.europa.esig.dss.validation.report.Reports; +import eu.europa.esig.dss.validation.report.SimpleReport; /** * This test is only to ensure that we don't have exception with valid? files diff --git a/dss-cades/src/main/java/eu/europa/ec/markt/dss/parameter/CAdESSignatureParameters.java b/dss-cades/src/main/java/eu/europa/ec/markt/dss/parameter/CAdESSignatureParameters.java deleted file mode 100644 index 0f24976990..0000000000 --- a/dss-cades/src/main/java/eu/europa/ec/markt/dss/parameter/CAdESSignatureParameters.java +++ /dev/null @@ -1,5 +0,0 @@ -package eu.europa.ec.markt.dss.parameter; - -public class CAdESSignatureParameters extends AbstractSignatureParameters { - -} diff --git a/dss-cades/src/main/java/eu/europa/esig/dss/cades/CAdESSignatureParameters.java b/dss-cades/src/main/java/eu/europa/esig/dss/cades/CAdESSignatureParameters.java new file mode 100644 index 0000000000..62bf32ae80 --- /dev/null +++ b/dss-cades/src/main/java/eu/europa/esig/dss/cades/CAdESSignatureParameters.java @@ -0,0 +1,7 @@ +package eu.europa.esig.dss.cades; + +import eu.europa.esig.dss.AbstractSignatureParameters; + +public class CAdESSignatureParameters extends AbstractSignatureParameters { + +} diff --git a/dss-cades/src/main/java/eu/europa/ec/markt/dss/signature/cades/CAdESLevelBaselineB.java b/dss-cades/src/main/java/eu/europa/esig/dss/cades/signature/CAdESLevelBaselineB.java similarity index 96% rename from dss-cades/src/main/java/eu/europa/ec/markt/dss/signature/cades/CAdESLevelBaselineB.java rename to dss-cades/src/main/java/eu/europa/esig/dss/cades/signature/CAdESLevelBaselineB.java index b3bb5e70a5..c5fa459511 100644 --- a/dss-cades/src/main/java/eu/europa/ec/markt/dss/signature/cades/CAdESLevelBaselineB.java +++ b/dss-cades/src/main/java/eu/europa/esig/dss/cades/signature/CAdESLevelBaselineB.java @@ -18,9 +18,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.cades; +package eu.europa.esig.dss.cades.signature; -import static eu.europa.ec.markt.dss.DigestAlgorithm.SHA1; +import static eu.europa.esig.dss.DigestAlgorithm.SHA1; import static org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers.id_aa_contentHint; import static org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers.id_aa_contentIdentifier; import static org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers.id_aa_ets_commitmentType; @@ -72,19 +72,19 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.DSSASN1Utils; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.OID; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.parameter.BLevelParameters; -import eu.europa.ec.markt.dss.parameter.CAdESSignatureParameters; -import eu.europa.ec.markt.dss.parameter.ChainCertificate; -import eu.europa.ec.markt.dss.parameter.Policy; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.validation.TimestampToken; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; +import eu.europa.esig.dss.BLevelParameters; +import eu.europa.esig.dss.ChainCertificate; +import eu.europa.esig.dss.DSSASN1Utils; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.OID; +import eu.europa.esig.dss.Policy; +import eu.europa.esig.dss.cades.CAdESSignatureParameters; +import eu.europa.esig.dss.validation.TimestampToken; +import eu.europa.esig.dss.x509.CertificateToken; /** * This class holds the CAdES-B signature profile; it supports the inclusion of the mandatory signed diff --git a/dss-cades/src/main/java/eu/europa/ec/markt/dss/signature/cades/CAdESLevelBaselineLT.java b/dss-cades/src/main/java/eu/europa/esig/dss/cades/signature/CAdESLevelBaselineLT.java similarity index 88% rename from dss-cades/src/main/java/eu/europa/ec/markt/dss/signature/cades/CAdESLevelBaselineLT.java rename to dss-cades/src/main/java/eu/europa/esig/dss/cades/signature/CAdESLevelBaselineLT.java index 0cfc239423..1017dadcb5 100644 --- a/dss-cades/src/main/java/eu/europa/ec/markt/dss/signature/cades/CAdESLevelBaselineLT.java +++ b/dss-cades/src/main/java/eu/europa/esig/dss/cades/signature/CAdESLevelBaselineLT.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.cades; +package eu.europa.esig.dss.cades.signature; import java.util.Collection; import java.util.HashSet; @@ -37,19 +37,19 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.DSSASN1Utils; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.parameter.CAdESSignatureParameters; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.validation.ValidationContext; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.DefaultAdvancedSignature; -import eu.europa.ec.markt.dss.validation102853.OCSPToken; -import eu.europa.ec.markt.dss.validation102853.cades.CAdESSignature; -import eu.europa.ec.markt.dss.validation102853.crl.CRLToken; -import eu.europa.ec.markt.dss.validation102853.tsp.TSPSource; +import eu.europa.esig.dss.DSSASN1Utils; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.cades.CAdESSignatureParameters; +import eu.europa.esig.dss.cades.validation.CAdESSignature; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.DefaultAdvancedSignature; +import eu.europa.esig.dss.validation.ValidationContext; +import eu.europa.esig.dss.x509.CertificateToken; +import eu.europa.esig.dss.x509.OCSPToken; +import eu.europa.esig.dss.x509.crl.CRLToken; +import eu.europa.esig.dss.x509.tsp.TSPSource; /** * This class holds the CAdES-LT signature profiles diff --git a/dss-cades/src/main/java/eu/europa/ec/markt/dss/signature/cades/CAdESLevelBaselineLTA.java b/dss-cades/src/main/java/eu/europa/esig/dss/cades/signature/CAdESLevelBaselineLTA.java similarity index 91% rename from dss-cades/src/main/java/eu/europa/ec/markt/dss/signature/cades/CAdESLevelBaselineLTA.java rename to dss-cades/src/main/java/eu/europa/esig/dss/cades/signature/CAdESLevelBaselineLTA.java index 9e656fadaf..f433a0fb59 100644 --- a/dss-cades/src/main/java/eu/europa/ec/markt/dss/signature/cades/CAdESLevelBaselineLTA.java +++ b/dss-cades/src/main/java/eu/europa/esig/dss/cades/signature/CAdESLevelBaselineLTA.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.cades; +package eu.europa.esig.dss.cades.signature; import org.bouncycastle.asn1.ASN1Object; import org.bouncycastle.asn1.cms.Attribute; @@ -29,14 +29,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.OID; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.parameter.CAdESSignatureParameters; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.cades.CAdESSignature; -import eu.europa.ec.markt.dss.validation102853.tsp.TSPSource; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.OID; +import eu.europa.esig.dss.cades.CAdESSignatureParameters; +import eu.europa.esig.dss.cades.validation.CAdESSignature; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.x509.tsp.TSPSource; /** * This class holds the CAdES-A signature profiles; it supports the later, over time _extension_ of a signature with @@ -101,7 +101,7 @@ protected SignerInformation extendCMSSignature(final CMSSignedData cmsSignedData * @param signerInformation * @param parameters * @param unsignedAttributes - * @throws eu.europa.ec.markt.dss.exception.DSSException + * @throws eu.europa.esig.dss.DSSException */ private AttributeTable addArchiveTimestampV3Attribute(CAdESSignature cadesSignature, CMSSignedData cmsSignedData, SignerInformation signerInformation, CAdESSignatureParameters parameters, AttributeTable unsignedAttributes) throws DSSException { @@ -126,7 +126,7 @@ private AttributeTable addArchiveTimestampV3Attribute(CAdESSignature cadesSignat * @param cmsSignedData * @param parameters * @return - * @throws eu.europa.ec.markt.dss.exception.DSSException + * @throws eu.europa.esig.dss.DSSException */ private byte[] getOriginalDocumentBytes(CMSSignedData cmsSignedData, CAdESSignatureParameters parameters) throws DSSException { diff --git a/dss-cades/src/main/java/eu/europa/ec/markt/dss/signature/cades/CAdESLevelBaselineT.java b/dss-cades/src/main/java/eu/europa/esig/dss/cades/signature/CAdESLevelBaselineT.java similarity index 90% rename from dss-cades/src/main/java/eu/europa/ec/markt/dss/signature/cades/CAdESLevelBaselineT.java rename to dss-cades/src/main/java/eu/europa/esig/dss/cades/signature/CAdESLevelBaselineT.java index d232e0b79e..6edff98a62 100644 --- a/dss-cades/src/main/java/eu/europa/ec/markt/dss/signature/cades/CAdESLevelBaselineT.java +++ b/dss-cades/src/main/java/eu/europa/esig/dss/cades/signature/CAdESLevelBaselineT.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.cades; +package eu.europa.esig.dss.cades.signature; import org.bouncycastle.asn1.ASN1Object; import org.bouncycastle.asn1.cms.AttributeTable; @@ -28,12 +28,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.parameter.CAdESSignatureParameters; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.cades.CAdESSignature; -import eu.europa.ec.markt.dss.validation102853.tsp.TSPSource; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.cades.CAdESSignatureParameters; +import eu.europa.esig.dss.cades.validation.CAdESSignature; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.x509.tsp.TSPSource; /** * This class holds the CAdES-T signature profile; it supports the inclusion of the mandatory unsigned diff --git a/dss-cades/src/main/java/eu/europa/ec/markt/dss/signature/cades/CAdESService.java b/dss-cades/src/main/java/eu/europa/esig/dss/cades/signature/CAdESService.java similarity index 93% rename from dss-cades/src/main/java/eu/europa/ec/markt/dss/signature/cades/CAdESService.java rename to dss-cades/src/main/java/eu/europa/esig/dss/cades/signature/CAdESService.java index 126f8048fd..219f24783d 100644 --- a/dss-cades/src/main/java/eu/europa/ec/markt/dss/signature/cades/CAdESService.java +++ b/dss-cades/src/main/java/eu/europa/esig/dss/cades/signature/CAdESService.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.cades; +package eu.europa.esig.dss.cades.signature; import java.io.InputStream; @@ -35,19 +35,19 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.DSSASN1Utils; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.parameter.CAdESSignatureParameters; -import eu.europa.ec.markt.dss.signature.AbstractSignatureService; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.InMemoryDocument; -import eu.europa.ec.markt.dss.signature.SignatureExtension; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.signature.token.SignatureTokenConnection; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; +import eu.europa.esig.dss.DSSASN1Utils; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.InMemoryDocument; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.cades.CAdESSignatureParameters; +import eu.europa.esig.dss.signature.AbstractSignatureService; +import eu.europa.esig.dss.signature.SignatureExtension; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.token.SignatureTokenConnection; +import eu.europa.esig.dss.validation.CertificateVerifier; /** * CAdES implementation of DocumentSignatureService diff --git a/dss-cades/src/main/java/eu/europa/ec/markt/dss/signature/cades/CAdESSignatureExtension.java b/dss-cades/src/main/java/eu/europa/esig/dss/cades/signature/CAdESSignatureExtension.java similarity index 93% rename from dss-cades/src/main/java/eu/europa/ec/markt/dss/signature/cades/CAdESSignatureExtension.java rename to dss-cades/src/main/java/eu/europa/esig/dss/cades/signature/CAdESSignatureExtension.java index 7286c1aea0..684269c896 100644 --- a/dss-cades/src/main/java/eu/europa/ec/markt/dss/signature/cades/CAdESSignatureExtension.java +++ b/dss-cades/src/main/java/eu/europa/esig/dss/cades/signature/CAdESSignatureExtension.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.cades; +package eu.europa.esig.dss.cades.signature; import java.io.IOException; import java.io.InputStream; @@ -41,18 +41,18 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.DSSASN1Utils; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.exception.DSSConfigurationException; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.parameter.CAdESSignatureParameters; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.SignatureExtension; -import eu.europa.ec.markt.dss.validation102853.SignatureForm; -import eu.europa.ec.markt.dss.validation102853.bean.SignatureCryptographicVerification; -import eu.europa.ec.markt.dss.validation102853.cades.CAdESSignature; -import eu.europa.ec.markt.dss.validation102853.tsp.TSPSource; +import eu.europa.esig.dss.DSSASN1Utils; +import eu.europa.esig.dss.DSSConfigurationException; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.cades.CAdESSignatureParameters; +import eu.europa.esig.dss.cades.validation.CAdESSignature; +import eu.europa.esig.dss.signature.SignatureExtension; +import eu.europa.esig.dss.validation.SignatureCryptographicVerification; +import eu.europa.esig.dss.x509.SignatureForm; +import eu.europa.esig.dss.x509.tsp.TSPSource; /** * Base class for extending a CAdESSignature. @@ -96,7 +96,7 @@ public TSPSource getSignatureTsa() { * @param signatureToExtend to be extended * @param parameters of the extension * @return a new extended document - * @throws eu.europa.ec.markt.dss.exception.DSSException + * @throws eu.europa.esig.dss.DSSException */ @Override public CMSSignedDocument extendSignatures(final DSSDocument signatureToExtend, final CAdESSignatureParameters parameters) throws DSSException { diff --git a/dss-cades/src/main/java/eu/europa/ec/markt/dss/signature/cades/CMSSignedDataBuilder.java b/dss-cades/src/main/java/eu/europa/esig/dss/cades/signature/CMSSignedDataBuilder.java similarity index 95% rename from dss-cades/src/main/java/eu/europa/ec/markt/dss/signature/cades/CMSSignedDataBuilder.java rename to dss-cades/src/main/java/eu/europa/esig/dss/cades/signature/CMSSignedDataBuilder.java index 91e764919d..af065835d4 100644 --- a/dss-cades/src/main/java/eu/europa/ec/markt/dss/signature/cades/CMSSignedDataBuilder.java +++ b/dss-cades/src/main/java/eu/europa/esig/dss/cades/signature/CMSSignedDataBuilder.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.cades; +package eu.europa.esig.dss.cades.signature; import static org.bouncycastle.asn1.cms.CMSObjectIdentifiers.id_ri_ocsp_response; import static org.bouncycastle.asn1.ocsp.OCSPObjectIdentifiers.id_pkix_ocsp_basic; @@ -52,13 +52,13 @@ import org.bouncycastle.operator.bc.BcDigestCalculatorProvider; import org.bouncycastle.util.Store; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.parameter.CAdESSignatureParameters; -import eu.europa.ec.markt.dss.parameter.ChainCertificate; -import eu.europa.ec.markt.dss.validation102853.CertificateSource; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; +import eu.europa.esig.dss.ChainCertificate; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.cades.CAdESSignatureParameters; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.x509.CertificateSource; +import eu.europa.esig.dss.x509.CertificateToken; /** * @@ -95,7 +95,7 @@ public CMSSignedDataBuilder(final CertificateVerifier certificateVerifier) { * @param signerInfoGeneratorBuilder true if the unsigned attributes must be included * @param originalSignedData the original signed data if extending an existing signature. null otherwise. * @return the bouncycastle signed data generator which signs the document and adds the required signed and unsigned CMS attributes - * @throws eu.europa.ec.markt.dss.exception.DSSException + * @throws eu.europa.esig.dss.DSSException */ protected CMSSignedDataGenerator createCMSSignedDataGenerator(final CAdESSignatureParameters parameters, final ContentSigner contentSigner, final SignerInfoGeneratorBuilder signerInfoGeneratorBuilder, diff --git a/dss-cades/src/main/java/eu/europa/ec/markt/dss/signature/cades/CMSSignedDocument.java b/dss-cades/src/main/java/eu/europa/esig/dss/cades/signature/CMSSignedDocument.java similarity index 90% rename from dss-cades/src/main/java/eu/europa/ec/markt/dss/signature/cades/CMSSignedDocument.java rename to dss-cades/src/main/java/eu/europa/esig/dss/cades/signature/CMSSignedDocument.java index 0bb7e87733..1fd5993bdd 100644 --- a/dss-cades/src/main/java/eu/europa/ec/markt/dss/signature/cades/CMSSignedDocument.java +++ b/dss-cades/src/main/java/eu/europa/esig/dss/cades/signature/CMSSignedDocument.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.cades; +package eu.europa.esig.dss.cades.signature; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -32,12 +32,12 @@ import org.bouncycastle.asn1.DEROutputStream; import org.bouncycastle.cms.CMSSignedData; -import eu.europa.ec.markt.dss.DSSASN1Utils; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.signature.CommonDocument; -import eu.europa.ec.markt.dss.signature.MimeType; +import eu.europa.esig.dss.CommonDocument; +import eu.europa.esig.dss.DSSASN1Utils; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.MimeType; /** * A document composed by a CMSSignedData diff --git a/dss-cades/src/main/java/eu/europa/ec/markt/dss/signature/cades/CadesLevelBaselineLTATimestampExtractor.java b/dss-cades/src/main/java/eu/europa/esig/dss/cades/signature/CadesLevelBaselineLTATimestampExtractor.java similarity index 97% rename from dss-cades/src/main/java/eu/europa/ec/markt/dss/signature/cades/CadesLevelBaselineLTATimestampExtractor.java rename to dss-cades/src/main/java/eu/europa/esig/dss/cades/signature/CadesLevelBaselineLTATimestampExtractor.java index dd52afc156..651f223954 100644 --- a/dss-cades/src/main/java/eu/europa/ec/markt/dss/signature/cades/CadesLevelBaselineLTATimestampExtractor.java +++ b/dss-cades/src/main/java/eu/europa/esig/dss/cades/signature/CadesLevelBaselineLTATimestampExtractor.java @@ -18,9 +18,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.cades; +package eu.europa.esig.dss.cades.signature; -import static eu.europa.ec.markt.dss.OID.id_aa_ATSHashIndex; +import static eu.europa.esig.dss.OID.id_aa_ATSHashIndex; import static org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers.id_aa_ets_certValues; import static org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers.id_aa_ets_revocationValues; @@ -59,13 +59,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.DSSASN1Utils; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.signature.validation.TimestampToken; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.validation102853.cades.CAdESSignature; +import eu.europa.esig.dss.DSSASN1Utils; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.cades.validation.CAdESSignature; +import eu.europa.esig.dss.validation.TimestampToken; +import eu.europa.esig.dss.x509.CertificateToken; /** * Extracts the necessary information to compute the CAdES Archive Timestamp V3. @@ -169,7 +169,7 @@ private Attribute getComposedAtsHashIndex(AlgorithmIdentifier algorithmIdentifie * requested, shall be included in certificatesHashIndex. No other hash value shall be included in this field. * * @return - * @throws eu.europa.ec.markt.dss.exception.DSSException + * @throws eu.europa.esig.dss.DSSException */ private ASN1Sequence getCertificatesHashIndex() throws DSSException { @@ -195,7 +195,7 @@ private ASN1Sequence getCertificatesHashIndex() throws DSSException { * requested, shall be included in certificatesHashIndex. No other hash value shall be included in this field. * * @return - * @throws eu.europa.ec.markt.dss.exception.DSSException + * @throws eu.europa.esig.dss.DSSException */ @SuppressWarnings("unchecked") private ASN1Sequence getVerifiedCertificatesHashIndex(TimestampToken timestampToken) throws DSSException { @@ -231,7 +231,7 @@ private ASN1Sequence getVerifiedCertificatesHashIndex(TimestampToken timestampTo * included in crlsHashIndex. No other hash values shall be included in this field. * * @return - * @throws eu.europa.ec.markt.dss.exception.DSSException + * @throws eu.europa.esig.dss.DSSException */ @SuppressWarnings("unchecked") private ASN1Sequence getCRLsHashIndex() throws DSSException { @@ -269,7 +269,7 @@ private void digestAndAddToList(ASN1EncodableVector crlsHashIndex, byte[] encode * included in crlsHashIndex. No other hash values shall be included in this field. * * @return - * @throws eu.europa.ec.markt.dss.exception.DSSException + * @throws eu.europa.esig.dss.DSSException */ @SuppressWarnings("unchecked") private ASN1Sequence getVerifiedCRLsHashIndex(TimestampToken timestampToken) throws DSSException { diff --git a/dss-cades/src/main/java/eu/europa/ec/markt/dss/signature/cades/CounterSignatureBuilder.java b/dss-cades/src/main/java/eu/europa/esig/dss/cades/signature/CounterSignatureBuilder.java similarity index 95% rename from dss-cades/src/main/java/eu/europa/ec/markt/dss/signature/cades/CounterSignatureBuilder.java rename to dss-cades/src/main/java/eu/europa/esig/dss/cades/signature/CounterSignatureBuilder.java index 30112a0e26..cf04bd11e5 100644 --- a/dss-cades/src/main/java/eu/europa/ec/markt/dss/signature/cades/CounterSignatureBuilder.java +++ b/dss-cades/src/main/java/eu/europa/esig/dss/cades/signature/CounterSignatureBuilder.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.cades; +package eu.europa.esig.dss.cades.signature; import java.util.ArrayList; import java.util.Collection; @@ -29,8 +29,8 @@ import org.bouncycastle.cms.SignerInformation; import org.bouncycastle.cms.SignerInformationStore; -import eu.europa.ec.markt.dss.OID; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; +import eu.europa.esig.dss.OID; +import eu.europa.esig.dss.validation.CertificateVerifier; public class CounterSignatureBuilder extends CMSSignedDataBuilder { diff --git a/dss-cades/src/main/java/eu/europa/ec/markt/dss/signature/cades/CustomContentSigner.java b/dss-cades/src/main/java/eu/europa/esig/dss/cades/signature/CustomContentSigner.java similarity index 96% rename from dss-cades/src/main/java/eu/europa/ec/markt/dss/signature/cades/CustomContentSigner.java rename to dss-cades/src/main/java/eu/europa/esig/dss/cades/signature/CustomContentSigner.java index 3f33470051..c99ae862e6 100644 --- a/dss-cades/src/main/java/eu/europa/ec/markt/dss/signature/cades/CustomContentSigner.java +++ b/dss-cades/src/main/java/eu/europa/esig/dss/cades/signature/CustomContentSigner.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.cades; +package eu.europa.esig.dss.cades.signature; import java.io.ByteArrayOutputStream; @@ -26,7 +26,7 @@ import org.bouncycastle.operator.ContentSigner; import org.bouncycastle.operator.DefaultSignatureAlgorithmIdentifierFinder; -import eu.europa.ec.markt.dss.DSSUtils; +import eu.europa.esig.dss.DSSUtils; /** * ContentSigner using a provided pre-computed signature diff --git a/dss-cades/src/main/java/eu/europa/ec/markt/dss/validation102853/cades/CAdESCRLSource.java b/dss-cades/src/main/java/eu/europa/esig/dss/cades/validation/CAdESCRLSource.java similarity index 96% rename from dss-cades/src/main/java/eu/europa/ec/markt/dss/validation102853/cades/CAdESCRLSource.java rename to dss-cades/src/main/java/eu/europa/esig/dss/cades/validation/CAdESCRLSource.java index 2d434daa45..3f1d105453 100644 --- a/dss-cades/src/main/java/eu/europa/ec/markt/dss/validation102853/cades/CAdESCRLSource.java +++ b/dss-cades/src/main/java/eu/europa/esig/dss/cades/validation/CAdESCRLSource.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.cades; +package eu.europa.esig.dss.cades.validation; import java.security.cert.CRLException; import java.security.cert.X509CRL; @@ -38,9 +38,9 @@ import org.bouncycastle.jce.provider.X509CRLObject; import org.bouncycastle.util.Store; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.validation102853.crl.OfflineCRLSource; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.x509.crl.OfflineCRLSource; /** * CRLSource that retrieves information from a CAdES signature. diff --git a/dss-cades/src/main/java/eu/europa/ec/markt/dss/validation102853/cades/CAdESOCSPSource.java b/dss-cades/src/main/java/eu/europa/esig/dss/cades/validation/CAdESOCSPSource.java similarity index 97% rename from dss-cades/src/main/java/eu/europa/ec/markt/dss/validation102853/cades/CAdESOCSPSource.java rename to dss-cades/src/main/java/eu/europa/esig/dss/cades/validation/CAdESOCSPSource.java index 2bbf4c122d..66e8a57cee 100644 --- a/dss-cades/src/main/java/eu/europa/ec/markt/dss/validation102853/cades/CAdESOCSPSource.java +++ b/dss-cades/src/main/java/eu/europa/esig/dss/cades/validation/CAdESOCSPSource.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.cades; +package eu.europa.esig.dss.cades.validation; import java.util.ArrayList; import java.util.Collection; @@ -43,8 +43,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.DSSASN1Utils; -import eu.europa.ec.markt.dss.validation102853.ocsp.OfflineOCSPSource; +import eu.europa.esig.dss.DSSASN1Utils; +import eu.europa.esig.dss.x509.ocsp.OfflineOCSPSource; /** * OCSPSource that retrieves information from a CAdESSignature. diff --git a/dss-cades/src/main/java/eu/europa/ec/markt/dss/validation102853/cades/CAdESSignature.java b/dss-cades/src/main/java/eu/europa/esig/dss/cades/validation/CAdESSignature.java similarity index 94% rename from dss-cades/src/main/java/eu/europa/ec/markt/dss/validation102853/cades/CAdESSignature.java rename to dss-cades/src/main/java/eu/europa/esig/dss/cades/validation/CAdESSignature.java index 66ee9de5f0..1511f71c5a 100644 --- a/dss-cades/src/main/java/eu/europa/ec/markt/dss/validation102853/cades/CAdESSignature.java +++ b/dss-cades/src/main/java/eu/europa/esig/dss/cades/validation/CAdESSignature.java @@ -18,17 +18,17 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.cades; - -import static eu.europa.ec.markt.dss.OID.id_aa_ets_archiveTimestampV2; -import static eu.europa.ec.markt.dss.OID.id_aa_ets_archiveTimestampV3; -import static eu.europa.ec.markt.dss.validation102853.ArchiveTimestampType.CAdES_V2; -import static eu.europa.ec.markt.dss.validation102853.ArchiveTimestampType.CAdES_v3; -import static eu.europa.ec.markt.dss.validation102853.TimestampType.ARCHIVE_TIMESTAMP; -import static eu.europa.ec.markt.dss.validation102853.TimestampType.CONTENT_TIMESTAMP; -import static eu.europa.ec.markt.dss.validation102853.TimestampType.SIGNATURE_TIMESTAMP; -import static eu.europa.ec.markt.dss.validation102853.TimestampType.VALIDATION_DATA_REFSONLY_TIMESTAMP; -import static eu.europa.ec.markt.dss.validation102853.TimestampType.VALIDATION_DATA_TIMESTAMP; +package eu.europa.esig.dss.cades.validation; + +import static eu.europa.esig.dss.OID.id_aa_ets_archiveTimestampV2; +import static eu.europa.esig.dss.OID.id_aa_ets_archiveTimestampV3; +import static eu.europa.esig.dss.x509.ArchiveTimestampType.CAdES_V2; +import static eu.europa.esig.dss.x509.ArchiveTimestampType.CAdES_v3; +import static eu.europa.esig.dss.x509.TimestampType.ARCHIVE_TIMESTAMP; +import static eu.europa.esig.dss.x509.TimestampType.CONTENT_TIMESTAMP; +import static eu.europa.esig.dss.x509.TimestampType.SIGNATURE_TIMESTAMP; +import static eu.europa.esig.dss.x509.TimestampType.VALIDATION_DATA_REFSONLY_TIMESTAMP; +import static eu.europa.esig.dss.x509.TimestampType.VALIDATION_DATA_TIMESTAMP; import static org.bouncycastle.asn1.cms.CMSObjectIdentifiers.id_ri_ocsp_response; import static org.bouncycastle.asn1.ocsp.OCSPObjectIdentifiers.id_pkix_ocsp_basic; import static org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers.id_aa_ets_certCRLTimestamp; @@ -131,38 +131,38 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.DSSASN1Utils; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.EncryptionAlgorithm; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.cades.CadesLevelBaselineLTATimestampExtractor; -import eu.europa.ec.markt.dss.signature.validation.AdvancedSignature; -import eu.europa.ec.markt.dss.signature.validation.TimestampToken; -import eu.europa.ec.markt.dss.signature.validation.cades.CAdESCertificateSource; -import eu.europa.ec.markt.dss.validation102853.ArchiveTimestampType; -import eu.europa.ec.markt.dss.validation102853.CertificatePool; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.validation102853.DefaultAdvancedSignature; -import eu.europa.ec.markt.dss.validation102853.SignatureForm; -import eu.europa.ec.markt.dss.validation102853.SignaturePolicy; -import eu.europa.ec.markt.dss.validation102853.TimestampReference; -import eu.europa.ec.markt.dss.validation102853.TimestampReferenceCategory; -import eu.europa.ec.markt.dss.validation102853.TimestampType; -import eu.europa.ec.markt.dss.validation102853.bean.CandidatesForSigningCertificate; -import eu.europa.ec.markt.dss.validation102853.bean.CertificateValidity; -import eu.europa.ec.markt.dss.validation102853.bean.CertifiedRole; -import eu.europa.ec.markt.dss.validation102853.bean.CommitmentType; -import eu.europa.ec.markt.dss.validation102853.bean.SignatureCryptographicVerification; -import eu.europa.ec.markt.dss.validation102853.bean.SignatureProductionPlace; -import eu.europa.ec.markt.dss.validation102853.certificate.CertificateRef; -import eu.europa.ec.markt.dss.validation102853.crl.CRLRef; -import eu.europa.ec.markt.dss.validation102853.crl.OfflineCRLSource; -import eu.europa.ec.markt.dss.validation102853.ocsp.OCSPRef; -import eu.europa.ec.markt.dss.validation102853.ocsp.OfflineOCSPSource; +import eu.europa.esig.dss.DSSASN1Utils; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.EncryptionAlgorithm; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.cades.signature.CadesLevelBaselineLTATimestampExtractor; +import eu.europa.esig.dss.validation.AdvancedSignature; +import eu.europa.esig.dss.validation.CAdESCertificateSource; +import eu.europa.esig.dss.validation.CRLRef; +import eu.europa.esig.dss.validation.CandidatesForSigningCertificate; +import eu.europa.esig.dss.validation.CertificateRef; +import eu.europa.esig.dss.validation.CertificateValidity; +import eu.europa.esig.dss.validation.CertifiedRole; +import eu.europa.esig.dss.validation.CommitmentType; +import eu.europa.esig.dss.validation.DefaultAdvancedSignature; +import eu.europa.esig.dss.validation.OCSPRef; +import eu.europa.esig.dss.validation.SignatureCryptographicVerification; +import eu.europa.esig.dss.validation.SignatureProductionPlace; +import eu.europa.esig.dss.validation.TimestampReference; +import eu.europa.esig.dss.validation.TimestampReferenceCategory; +import eu.europa.esig.dss.validation.TimestampToken; +import eu.europa.esig.dss.x509.ArchiveTimestampType; +import eu.europa.esig.dss.x509.CertificatePool; +import eu.europa.esig.dss.x509.CertificateToken; +import eu.europa.esig.dss.x509.SignatureForm; +import eu.europa.esig.dss.x509.SignaturePolicy; +import eu.europa.esig.dss.x509.TimestampType; +import eu.europa.esig.dss.x509.crl.OfflineCRLSource; +import eu.europa.esig.dss.x509.ocsp.OfflineOCSPSource; /** * CAdES Signature class helper @@ -728,39 +728,6 @@ public SignatureProductionPlace getSignatureProductionPlace() { try { signerLocation = SignerLocation.getInstance(asn1Encodable); } catch (Exception e) { - /* - * // TODO: (Bob: 2013 Dec 11) ---> Validation: - * /C:/ws_trunk/apps/dss - * /core/dss-document/target/test-classes/cades2013 - * /CAdES-EPES.SCOK/BULL/Signature-C-EPES-2.p7s - * - * WARN SignedDocumentValidator.java:557 - - * org.bouncycastle.asn1.DERUTF8String cannot be cast to - * org.bouncycastle.asn1.DERTaggedObject - * java.lang.ClassCastException: org.bouncycastle.asn1.DERUTF8String - * cannot be cast to org.bouncycastle.asn1.DERTaggedObject at - * org.bouncycastle.asn1.esf.SignerLocation.(Unknown Source) - * ~[bcprov-ext-jdk15on-1.49.jar:1.49.0] at - * org.bouncycastle.asn1.esf.SignerLocation.getInstance(Unknown - * Source) ~[bcprov-ext-jdk15on-1.49.jar:1.49.0] at - * eu.europa.ec.markt.dss.validation102853.cades.CAdESSignature. - * getSignatureProductionPlace(CAdESSignature.java:663) - * ~[classes/:na] at - * eu.europa.ec.markt.dss.validation102853.SignedDocumentValidator - * .dealSignature(SignedDocumentValidator.java:1209) [classes/:na] - * at - * eu.europa.ec.markt.dss.validation102853.SignedDocumentValidator - * .validateSignature(SignedDocumentValidator.java:535) - * [classes/:na] at - * eu.europa.ec.markt.dss.validation102853.SignedDocumentValidator - * .generateDiagnosticData(SignedDocumentValidator.java:510) - * [classes/:na] at - * eu.europa.ec.markt.dss.validation102853.SignedDocumentValidator - * .validateDocument(SignedDocumentValidator.java:469) [classes/:na] - * at - * eu.europa.ec.markt.dss.validation102853.SignedDocumentValidator - * .validateDocument(SignedDocumentValidator.java:450) [classes/:na] - */ LOG.error(e.getMessage(), e); } if (signerLocation == null) { diff --git a/dss-cades/src/main/java/eu/europa/ec/markt/dss/validation102853/scope/CAdESSignatureScopeFinder.java b/dss-cades/src/main/java/eu/europa/esig/dss/cades/validation/CAdESSignatureScopeFinder.java similarity index 86% rename from dss-cades/src/main/java/eu/europa/ec/markt/dss/validation102853/scope/CAdESSignatureScopeFinder.java rename to dss-cades/src/main/java/eu/europa/esig/dss/cades/validation/CAdESSignatureScopeFinder.java index e5b1721712..c8eae7f64b 100644 --- a/dss-cades/src/main/java/eu/europa/ec/markt/dss/validation102853/scope/CAdESSignatureScopeFinder.java +++ b/dss-cades/src/main/java/eu/europa/esig/dss/cades/validation/CAdESSignatureScopeFinder.java @@ -18,13 +18,14 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.scope; +package eu.europa.esig.dss.cades.validation; import java.util.ArrayList; import java.util.List; -import eu.europa.ec.markt.dss.signature.validation.scope.SignatureScopeFinder; -import eu.europa.ec.markt.dss.validation102853.cades.CAdESSignature; +import eu.europa.esig.dss.validation.FullSignatureScope; +import eu.europa.esig.dss.validation.SignatureScope; +import eu.europa.esig.dss.validation.SignatureScopeFinder; public class CAdESSignatureScopeFinder implements SignatureScopeFinder { diff --git a/dss-cades/src/main/java/eu/europa/ec/markt/dss/validation102853/cades/CMSDocumentValidator.java b/dss-cades/src/main/java/eu/europa/esig/dss/cades/validation/CMSDocumentValidator.java similarity index 87% rename from dss-cades/src/main/java/eu/europa/ec/markt/dss/validation102853/cades/CMSDocumentValidator.java rename to dss-cades/src/main/java/eu/europa/esig/dss/cades/validation/CMSDocumentValidator.java index 7744f98be4..3c654c7029 100644 --- a/dss-cades/src/main/java/eu/europa/ec/markt/dss/validation102853/cades/CMSDocumentValidator.java +++ b/dss-cades/src/main/java/eu/europa/esig/dss/cades/validation/CMSDocumentValidator.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.cades; +package eu.europa.esig.dss.cades.validation; import java.io.InputStream; import java.util.ArrayList; @@ -29,13 +29,12 @@ import org.bouncycastle.cms.CMSSignedData; import org.bouncycastle.cms.SignerInformation; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.exception.DSSUnsupportedOperationException; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.validation.AdvancedSignature; -import eu.europa.ec.markt.dss.validation102853.SignedDocumentValidator; -import eu.europa.ec.markt.dss.validation102853.scope.CAdESSignatureScopeFinder; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUnsupportedOperationException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.validation.AdvancedSignature; +import eu.europa.esig.dss.validation.SignedDocumentValidator; /** * Validation of CMS document diff --git a/dss-cades/src/test/java/eu/europa/ec/markt/dss/extension/cades/AbstractTestCAdESExtension.java b/dss-cades/src/test/java/eu/europa/esig/dss/cades/extension/AbstractTestCAdESExtension.java similarity index 78% rename from dss-cades/src/test/java/eu/europa/ec/markt/dss/extension/cades/AbstractTestCAdESExtension.java rename to dss-cades/src/test/java/eu/europa/esig/dss/cades/extension/AbstractTestCAdESExtension.java index 08b8525be3..922d60aae5 100644 --- a/dss-cades/src/test/java/eu/europa/ec/markt/dss/extension/cades/AbstractTestCAdESExtension.java +++ b/dss-cades/src/test/java/eu/europa/esig/dss/cades/extension/AbstractTestCAdESExtension.java @@ -18,23 +18,23 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.extension.cades; +package eu.europa.esig.dss.cades.extension; import java.util.Date; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.extension.AbstractTestExtension; -import eu.europa.ec.markt.dss.mock.MockTSPSource; -import eu.europa.ec.markt.dss.parameter.CAdESSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.InMemoryDocument; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.cades.CAdESService; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.InMemoryDocument; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.cades.CAdESSignatureParameters; +import eu.europa.esig.dss.cades.signature.CAdESService; +import eu.europa.esig.dss.extension.AbstractTestExtension; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.test.mock.MockTSPSource; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; public abstract class AbstractTestCAdESExtension extends AbstractTestExtension { diff --git a/dss-cades/src/test/java/eu/europa/ec/markt/dss/extension/cades/CAdESExtensionBToTTest.java b/dss-cades/src/test/java/eu/europa/esig/dss/cades/extension/CAdESExtensionBToTTest.java similarity index 92% rename from dss-cades/src/test/java/eu/europa/ec/markt/dss/extension/cades/CAdESExtensionBToTTest.java rename to dss-cades/src/test/java/eu/europa/esig/dss/cades/extension/CAdESExtensionBToTTest.java index 07b057db01..28ee912915 100644 --- a/dss-cades/src/test/java/eu/europa/ec/markt/dss/extension/cades/CAdESExtensionBToTTest.java +++ b/dss-cades/src/test/java/eu/europa/esig/dss/cades/extension/CAdESExtensionBToTTest.java @@ -18,9 +18,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.extension.cades; +package eu.europa.esig.dss.cades.extension; -import eu.europa.ec.markt.dss.signature.SignatureLevel; +import eu.europa.esig.dss.SignatureLevel; public class CAdESExtensionBToTTest extends AbstractTestCAdESExtension { diff --git a/dss-cades/src/test/java/eu/europa/ec/markt/dss/signature/cades/CAdESLevelBDetachedTest.java b/dss-cades/src/test/java/eu/europa/esig/dss/cades/signature/CAdESLevelBDetachedTest.java similarity index 76% rename from dss-cades/src/test/java/eu/europa/ec/markt/dss/signature/cades/CAdESLevelBDetachedTest.java rename to dss-cades/src/test/java/eu/europa/esig/dss/cades/signature/CAdESLevelBDetachedTest.java index 2b3e96b5af..9261fa9327 100644 --- a/dss-cades/src/test/java/eu/europa/ec/markt/dss/signature/cades/CAdESLevelBDetachedTest.java +++ b/dss-cades/src/test/java/eu/europa/esig/dss/cades/signature/CAdESLevelBDetachedTest.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.cades; +package eu.europa.esig.dss.cades.signature; import java.util.ArrayList; import java.util.Date; @@ -26,21 +26,22 @@ import org.junit.Before; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.parameter.CAdESSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.AbstractTestSignature; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.InMemoryDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.SignedDocumentValidator; -import eu.europa.ec.markt.dss.validation102853.report.Reports; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.InMemoryDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.cades.CAdESSignatureParameters; +import eu.europa.esig.dss.cades.signature.CAdESService; +import eu.europa.esig.dss.signature.AbstractTestSignature; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.SignedDocumentValidator; +import eu.europa.esig.dss.validation.report.Reports; public class CAdESLevelBDetachedTest extends AbstractTestSignature { diff --git a/dss-cades/src/test/java/eu/europa/ec/markt/dss/signature/cades/CAdESLevelBSHA512Test.java b/dss-cades/src/test/java/eu/europa/esig/dss/cades/signature/CAdESLevelBSHA512Test.java similarity index 76% rename from dss-cades/src/test/java/eu/europa/ec/markt/dss/signature/cades/CAdESLevelBSHA512Test.java rename to dss-cades/src/test/java/eu/europa/esig/dss/cades/signature/CAdESLevelBSHA512Test.java index 4faadeb686..9ce33f6786 100644 --- a/dss-cades/src/test/java/eu/europa/ec/markt/dss/signature/cades/CAdESLevelBSHA512Test.java +++ b/dss-cades/src/test/java/eu/europa/esig/dss/cades/signature/CAdESLevelBSHA512Test.java @@ -18,26 +18,27 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.cades; +package eu.europa.esig.dss.cades.signature; import java.util.Date; import org.junit.Before; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.parameter.CAdESSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.AbstractTestSignature; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.InMemoryDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.InMemoryDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.cades.CAdESSignatureParameters; +import eu.europa.esig.dss.cades.signature.CAdESService; +import eu.europa.esig.dss.signature.AbstractTestSignature; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; public class CAdESLevelBSHA512Test extends AbstractTestSignature { diff --git a/dss-cades/src/test/java/eu/europa/ec/markt/dss/signature/cades/CAdESLevelBTest.java b/dss-cades/src/test/java/eu/europa/esig/dss/cades/signature/CAdESLevelBTest.java similarity index 91% rename from dss-cades/src/test/java/eu/europa/ec/markt/dss/signature/cades/CAdESLevelBTest.java rename to dss-cades/src/test/java/eu/europa/esig/dss/cades/signature/CAdESLevelBTest.java index 4d5f4fd1ab..4d2f225bb6 100644 --- a/dss-cades/src/test/java/eu/europa/ec/markt/dss/signature/cades/CAdESLevelBTest.java +++ b/dss-cades/src/test/java/eu/europa/esig/dss/cades/signature/CAdESLevelBTest.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.cades; +package eu.europa.esig.dss.cades.signature; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -61,23 +61,24 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.parameter.AbstractSignatureParameters; -import eu.europa.ec.markt.dss.parameter.CAdESSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.AbstractTestSignature; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.InMemoryDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.cades.CAdESSignature; +import eu.europa.esig.dss.AbstractSignatureParameters; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.InMemoryDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.cades.CAdESSignatureParameters; +import eu.europa.esig.dss.cades.signature.CAdESService; +import eu.europa.esig.dss.cades.validation.CAdESSignature; +import eu.europa.esig.dss.signature.AbstractTestSignature; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; public class CAdESLevelBTest extends AbstractTestSignature { diff --git a/dss-cades/src/test/java/eu/europa/ec/markt/dss/signature/cades/CAdESLevelBWithExpiredCertificate.java b/dss-cades/src/test/java/eu/europa/esig/dss/cades/signature/CAdESLevelBWithExpiredCertificate.java similarity index 68% rename from dss-cades/src/test/java/eu/europa/ec/markt/dss/signature/cades/CAdESLevelBWithExpiredCertificate.java rename to dss-cades/src/test/java/eu/europa/esig/dss/cades/signature/CAdESLevelBWithExpiredCertificate.java index 283e0f026a..5c5c73bbc6 100644 --- a/dss-cades/src/test/java/eu/europa/ec/markt/dss/signature/cades/CAdESLevelBWithExpiredCertificate.java +++ b/dss-cades/src/test/java/eu/europa/esig/dss/cades/signature/CAdESLevelBWithExpiredCertificate.java @@ -1,4 +1,4 @@ -package eu.europa.ec.markt.dss.signature.cades; +package eu.europa.esig.dss.cades.signature; import static org.junit.Assert.assertEquals; @@ -6,23 +6,24 @@ import org.junit.Before; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.parameter.AbstractSignatureParameters; -import eu.europa.ec.markt.dss.parameter.CAdESSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.AbstractTestSignature; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.InMemoryDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.report.SimpleReport; -import eu.europa.ec.markt.dss.validation102853.rules.Indication; -import eu.europa.ec.markt.dss.validation102853.rules.SubIndication; +import eu.europa.esig.dss.AbstractSignatureParameters; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.InMemoryDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.cades.CAdESSignatureParameters; +import eu.europa.esig.dss.cades.signature.CAdESService; +import eu.europa.esig.dss.signature.AbstractTestSignature; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.policy.rules.Indication; +import eu.europa.esig.dss.validation.policy.rules.SubIndication; +import eu.europa.esig.dss.validation.report.SimpleReport; /** * Cryptographic signature is valid with expired certificate diff --git a/dss-cades/src/test/java/eu/europa/ec/markt/dss/signature/cades/CAdESLevelBWithPolicyTest.java b/dss-cades/src/test/java/eu/europa/esig/dss/cades/signature/CAdESLevelBWithPolicyTest.java similarity index 78% rename from dss-cades/src/test/java/eu/europa/ec/markt/dss/signature/cades/CAdESLevelBWithPolicyTest.java rename to dss-cades/src/test/java/eu/europa/esig/dss/cades/signature/CAdESLevelBWithPolicyTest.java index e07e104822..b206dbd50e 100644 --- a/dss-cades/src/test/java/eu/europa/ec/markt/dss/signature/cades/CAdESLevelBWithPolicyTest.java +++ b/dss-cades/src/test/java/eu/europa/esig/dss/cades/signature/CAdESLevelBWithPolicyTest.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.cades; +package eu.europa.esig.dss.cades.signature; import static org.junit.Assert.assertEquals; @@ -28,22 +28,23 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.parameter.CAdESSignatureParameters; -import eu.europa.ec.markt.dss.parameter.Policy; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.AbstractTestSignature; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.InMemoryDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.report.DiagnosticData; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.InMemoryDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.Policy; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.cades.CAdESSignatureParameters; +import eu.europa.esig.dss.cades.signature.CAdESService; +import eu.europa.esig.dss.signature.AbstractTestSignature; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.report.DiagnosticData; public class CAdESLevelBWithPolicyTest extends AbstractTestSignature { diff --git a/dss-cades/src/test/java/eu/europa/ec/markt/dss/signature/cades/CAdESLevelTTest.java b/dss-cades/src/test/java/eu/europa/esig/dss/cades/signature/CAdESLevelTTest.java similarity index 74% rename from dss-cades/src/test/java/eu/europa/ec/markt/dss/signature/cades/CAdESLevelTTest.java rename to dss-cades/src/test/java/eu/europa/esig/dss/cades/signature/CAdESLevelTTest.java index dee97bbff5..ea8ac8bc8c 100644 --- a/dss-cades/src/test/java/eu/europa/ec/markt/dss/signature/cades/CAdESLevelTTest.java +++ b/dss-cades/src/test/java/eu/europa/esig/dss/cades/signature/CAdESLevelTTest.java @@ -18,27 +18,28 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.cades; +package eu.europa.esig.dss.cades.signature; import java.util.Date; import org.junit.Before; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.mock.MockTSPSource; -import eu.europa.ec.markt.dss.parameter.AbstractSignatureParameters; -import eu.europa.ec.markt.dss.parameter.CAdESSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.AbstractTestSignature; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.InMemoryDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; +import eu.europa.esig.dss.AbstractSignatureParameters; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.InMemoryDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.cades.CAdESSignatureParameters; +import eu.europa.esig.dss.cades.signature.CAdESService; +import eu.europa.esig.dss.signature.AbstractTestSignature; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.test.mock.MockTSPSource; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; public class CAdESLevelTTest extends AbstractTestSignature { diff --git a/dss-cades/src/test/java/eu/europa/ec/markt/dss/signature/cades/CAdESWithContentTimestampTest.java b/dss-cades/src/test/java/eu/europa/esig/dss/cades/signature/CAdESWithContentTimestampTest.java similarity index 86% rename from dss-cades/src/test/java/eu/europa/ec/markt/dss/signature/cades/CAdESWithContentTimestampTest.java rename to dss-cades/src/test/java/eu/europa/esig/dss/cades/signature/CAdESWithContentTimestampTest.java index c48c912a6e..cc16f7ed13 100644 --- a/dss-cades/src/test/java/eu/europa/ec/markt/dss/signature/cades/CAdESWithContentTimestampTest.java +++ b/dss-cades/src/test/java/eu/europa/esig/dss/cades/signature/CAdESWithContentTimestampTest.java @@ -1,4 +1,4 @@ -package eu.europa.ec.markt.dss.signature.cades; +package eu.europa.esig.dss.cades.signature; import static org.junit.Assert.assertTrue; @@ -21,12 +21,12 @@ import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers; import org.junit.Test; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.SignedDocumentValidator; -import eu.europa.ec.markt.dss.validation102853.TimestampType; -import eu.europa.ec.markt.dss.validation102853.report.DiagnosticData; -import eu.europa.ec.markt.dss.validation102853.report.Reports; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.SignedDocumentValidator; +import eu.europa.esig.dss.validation.report.DiagnosticData; +import eu.europa.esig.dss.validation.report.Reports; +import eu.europa.esig.dss.x509.TimestampType; public class CAdESWithContentTimestampTest { diff --git a/dss-cades/src/test/java/eu/europa/ec/markt/dss/validation/CAdESDigestComputationSetOrderedTest.java b/dss-cades/src/test/java/eu/europa/esig/dss/cades/validation/CAdESDigestComputationSetOrderedTest.java similarity index 83% rename from dss-cades/src/test/java/eu/europa/ec/markt/dss/validation/CAdESDigestComputationSetOrderedTest.java rename to dss-cades/src/test/java/eu/europa/esig/dss/cades/validation/CAdESDigestComputationSetOrderedTest.java index d22986adeb..6af9005bd9 100644 --- a/dss-cades/src/test/java/eu/europa/ec/markt/dss/validation/CAdESDigestComputationSetOrderedTest.java +++ b/dss-cades/src/test/java/eu/europa/esig/dss/cades/validation/CAdESDigestComputationSetOrderedTest.java @@ -18,18 +18,18 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation; +package eu.europa.esig.dss.cades.validation; import static org.junit.Assert.assertTrue; import org.junit.Test; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.SignedDocumentValidator; -import eu.europa.ec.markt.dss.validation102853.report.DiagnosticData; -import eu.europa.ec.markt.dss.validation102853.report.Reports; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.SignedDocumentValidator; +import eu.europa.esig.dss.validation.report.DiagnosticData; +import eu.europa.esig.dss.validation.report.Reports; /** * Unit test added to fix : https://esig-dss.atlassian.net/browse/DSS-667 diff --git a/dss-cades/src/test/java/eu/europa/ec/markt/dss/validation/CAdESWithDEREncodedTimestampTest.java b/dss-cades/src/test/java/eu/europa/esig/dss/cades/validation/CAdESWithDEREncodedTimestampTest.java similarity index 84% rename from dss-cades/src/test/java/eu/europa/ec/markt/dss/validation/CAdESWithDEREncodedTimestampTest.java rename to dss-cades/src/test/java/eu/europa/esig/dss/cades/validation/CAdESWithDEREncodedTimestampTest.java index a39d8a48e3..6518d8eba5 100644 --- a/dss-cades/src/test/java/eu/europa/ec/markt/dss/validation/CAdESWithDEREncodedTimestampTest.java +++ b/dss-cades/src/test/java/eu/europa/esig/dss/cades/validation/CAdESWithDEREncodedTimestampTest.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation; +package eu.europa.esig.dss.cades.validation; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -30,14 +30,14 @@ import org.bouncycastle.cms.CMSSignedData; import org.junit.Test; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.SignedDocumentValidator; -import eu.europa.ec.markt.dss.validation102853.cades.CAdESSignature; -import eu.europa.ec.markt.dss.validation102853.report.DiagnosticData; -import eu.europa.ec.markt.dss.validation102853.report.Reports; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.cades.validation.CAdESSignature; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.SignedDocumentValidator; +import eu.europa.esig.dss.validation.report.DiagnosticData; +import eu.europa.esig.dss.validation.report.Reports; /** * Unit test added to fix : https://esig-dss.atlassian.net/browse/DSS-662 diff --git a/dss-cades/src/test/java/known/issues/DSS631/CAdESExtensionBToLTATest.java b/dss-cades/src/test/java/known/issues/DSS631/CAdESExtensionBToLTATest.java index eeea987bdf..2411b93489 100644 --- a/dss-cades/src/test/java/known/issues/DSS631/CAdESExtensionBToLTATest.java +++ b/dss-cades/src/test/java/known/issues/DSS631/CAdESExtensionBToLTATest.java @@ -20,8 +20,8 @@ */ package known.issues.DSS631; -import eu.europa.ec.markt.dss.extension.cades.AbstractTestCAdESExtension; -import eu.europa.ec.markt.dss.signature.SignatureLevel; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.cades.extension.AbstractTestCAdESExtension; public class CAdESExtensionBToLTATest extends AbstractTestCAdESExtension { diff --git a/dss-cades/src/test/java/known/issues/DSS631/CAdESExtensionBToLTTest.java b/dss-cades/src/test/java/known/issues/DSS631/CAdESExtensionBToLTTest.java index ecb11a67c2..35455ab6a2 100644 --- a/dss-cades/src/test/java/known/issues/DSS631/CAdESExtensionBToLTTest.java +++ b/dss-cades/src/test/java/known/issues/DSS631/CAdESExtensionBToLTTest.java @@ -20,8 +20,8 @@ */ package known.issues.DSS631; -import eu.europa.ec.markt.dss.extension.cades.AbstractTestCAdESExtension; -import eu.europa.ec.markt.dss.signature.SignatureLevel; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.cades.extension.AbstractTestCAdESExtension; public class CAdESExtensionBToLTTest extends AbstractTestCAdESExtension { diff --git a/dss-cades/src/test/java/known/issues/DSS631/CAdESExtensionLTToLTATest.java b/dss-cades/src/test/java/known/issues/DSS631/CAdESExtensionLTToLTATest.java index c0a0074068..1a2e2f32cc 100644 --- a/dss-cades/src/test/java/known/issues/DSS631/CAdESExtensionLTToLTATest.java +++ b/dss-cades/src/test/java/known/issues/DSS631/CAdESExtensionLTToLTATest.java @@ -20,8 +20,8 @@ */ package known.issues.DSS631; -import eu.europa.ec.markt.dss.extension.cades.AbstractTestCAdESExtension; -import eu.europa.ec.markt.dss.signature.SignatureLevel; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.cades.extension.AbstractTestCAdESExtension; public class CAdESExtensionLTToLTATest extends AbstractTestCAdESExtension { diff --git a/dss-cades/src/test/java/known/issues/DSS631/CAdESExtensionTToLTATest.java b/dss-cades/src/test/java/known/issues/DSS631/CAdESExtensionTToLTATest.java index 1a4da74c31..291ce9c935 100644 --- a/dss-cades/src/test/java/known/issues/DSS631/CAdESExtensionTToLTATest.java +++ b/dss-cades/src/test/java/known/issues/DSS631/CAdESExtensionTToLTATest.java @@ -20,8 +20,8 @@ */ package known.issues.DSS631; -import eu.europa.ec.markt.dss.extension.cades.AbstractTestCAdESExtension; -import eu.europa.ec.markt.dss.signature.SignatureLevel; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.cades.extension.AbstractTestCAdESExtension; public class CAdESExtensionTToLTATest extends AbstractTestCAdESExtension { diff --git a/dss-cades/src/test/java/known/issues/DSS631/CAdESExtensionTToLTTest.java b/dss-cades/src/test/java/known/issues/DSS631/CAdESExtensionTToLTTest.java index a80d8b4e42..665300c46c 100644 --- a/dss-cades/src/test/java/known/issues/DSS631/CAdESExtensionTToLTTest.java +++ b/dss-cades/src/test/java/known/issues/DSS631/CAdESExtensionTToLTTest.java @@ -20,8 +20,8 @@ */ package known.issues.DSS631; -import eu.europa.ec.markt.dss.extension.cades.AbstractTestCAdESExtension; -import eu.europa.ec.markt.dss.signature.SignatureLevel; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.cades.extension.AbstractTestCAdESExtension; public class CAdESExtensionTToLTTest extends AbstractTestCAdESExtension { diff --git a/dss-cades/src/test/java/known/issues/DSS631/CAdESLevelLTATest.java b/dss-cades/src/test/java/known/issues/DSS631/CAdESLevelLTATest.java index df11a3b722..15399b1925 100644 --- a/dss-cades/src/test/java/known/issues/DSS631/CAdESLevelLTATest.java +++ b/dss-cades/src/test/java/known/issues/DSS631/CAdESLevelLTATest.java @@ -24,21 +24,21 @@ import org.junit.Before; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.mock.MockTSPSource; -import eu.europa.ec.markt.dss.parameter.CAdESSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.AbstractTestSignature; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.InMemoryDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.cades.CAdESService; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.InMemoryDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.cades.CAdESSignatureParameters; +import eu.europa.esig.dss.cades.signature.CAdESService; +import eu.europa.esig.dss.signature.AbstractTestSignature; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.test.mock.MockTSPSource; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; public class CAdESLevelLTATest extends AbstractTestSignature { diff --git a/dss-cades/src/test/java/known/issues/DSS631/CAdESLevelLTTest.java b/dss-cades/src/test/java/known/issues/DSS631/CAdESLevelLTTest.java index 9aaedb18e6..0b0352d97b 100644 --- a/dss-cades/src/test/java/known/issues/DSS631/CAdESLevelLTTest.java +++ b/dss-cades/src/test/java/known/issues/DSS631/CAdESLevelLTTest.java @@ -24,21 +24,21 @@ import org.junit.Before; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.mock.MockTSPSource; -import eu.europa.ec.markt.dss.parameter.CAdESSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.AbstractTestSignature; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.InMemoryDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.cades.CAdESService; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.InMemoryDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.cades.CAdESSignatureParameters; +import eu.europa.esig.dss.cades.signature.CAdESService; +import eu.europa.esig.dss.signature.AbstractTestSignature; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.test.mock.MockTSPSource; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; public class CAdESLevelLTTest extends AbstractTestSignature { diff --git a/dss-cades/src/test/java/known/issues/DSS642/CAdESCounterSignatureTest.java b/dss-cades/src/test/java/known/issues/DSS642/CAdESCounterSignatureTest.java index c2a3b10d58..5c799865bc 100644 --- a/dss-cades/src/test/java/known/issues/DSS642/CAdESCounterSignatureTest.java +++ b/dss-cades/src/test/java/known/issues/DSS642/CAdESCounterSignatureTest.java @@ -38,24 +38,24 @@ import org.bouncycastle.cms.SignerInformationStore; import org.junit.Test; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.mock.MockPrivateKeyEntry; -import eu.europa.ec.markt.dss.mock.MockSignatureTokenConnection; -import eu.europa.ec.markt.dss.parameter.CAdESSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.cades.CAdESService; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.SignedDocumentValidator; -import eu.europa.ec.markt.dss.validation102853.report.DiagnosticData; -import eu.europa.ec.markt.dss.validation102853.report.Reports; -import eu.europa.ec.markt.dss.validation102853.rules.AttributeValue; -import eu.europa.ec.markt.dss.validation102853.xml.XmlDom; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.XmlDom; +import eu.europa.esig.dss.cades.CAdESSignatureParameters; +import eu.europa.esig.dss.cades.signature.CAdESService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.test.mock.MockPrivateKeyEntry; +import eu.europa.esig.dss.test.mock.MockSignatureTokenConnection; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.SignedDocumentValidator; +import eu.europa.esig.dss.validation.policy.rules.AttributeValue; +import eu.europa.esig.dss.validation.report.DiagnosticData; +import eu.europa.esig.dss.validation.report.Reports; public class CAdESCounterSignatureTest { diff --git a/dss-cades/src/test/java/known/issues/DSS646/ExtendToCAdESLtaTest.java b/dss-cades/src/test/java/known/issues/DSS646/ExtendToCAdESLtaTest.java index 83233d7796..35b226e3ef 100644 --- a/dss-cades/src/test/java/known/issues/DSS646/ExtendToCAdESLtaTest.java +++ b/dss-cades/src/test/java/known/issues/DSS646/ExtendToCAdESLtaTest.java @@ -8,18 +8,18 @@ import org.junit.Test; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.mock.MockTSPSource; -import eu.europa.ec.markt.dss.parameter.CAdESSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.cades.CAdESService; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.SignedDocumentValidator; -import eu.europa.ec.markt.dss.validation102853.report.DiagnosticData; -import eu.europa.ec.markt.dss.validation102853.report.Reports; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.cades.CAdESSignatureParameters; +import eu.europa.esig.dss.cades.signature.CAdESService; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.test.mock.MockTSPSource; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.SignedDocumentValidator; +import eu.europa.esig.dss.validation.report.DiagnosticData; +import eu.europa.esig.dss.validation.report.Reports; /** * Unit test to fix issue https://esig-dss.atlassian.net/browse/DSS-646 diff --git a/dss-cades/src/test/java/plugtests/ETSISamplesValidationTest.java b/dss-cades/src/test/java/plugtests/ETSISamplesValidationTest.java index 7dc3150736..1e1f36f5bf 100644 --- a/dss-cades/src/test/java/plugtests/ETSISamplesValidationTest.java +++ b/dss-cades/src/test/java/plugtests/ETSISamplesValidationTest.java @@ -12,13 +12,13 @@ import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.SignedDocumentValidator; -import eu.europa.ec.markt.dss.validation102853.report.DetailedReport; -import eu.europa.ec.markt.dss.validation102853.report.DiagnosticData; -import eu.europa.ec.markt.dss.validation102853.report.Reports; -import eu.europa.ec.markt.dss.validation102853.report.SimpleReport; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.SignedDocumentValidator; +import eu.europa.esig.dss.validation.report.DetailedReport; +import eu.europa.esig.dss.validation.report.DiagnosticData; +import eu.europa.esig.dss.validation.report.Reports; +import eu.europa.esig.dss.validation.report.SimpleReport; /** * This test is only to ensure that we don't have exception with valid? files diff --git a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/Cookbook.java b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/Cookbook.java similarity index 82% rename from dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/Cookbook.java rename to dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/Cookbook.java index 6354467f1a..f3ce9c4c35 100644 --- a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/Cookbook.java +++ b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/Cookbook.java @@ -18,20 +18,20 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.cookbook.example; +package eu.europa.esig.dss.cookbook.example; import java.net.URL; import java.util.Date; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.mock.MockTSPSource; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.signature.token.AbstractSignatureTokenConnection; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.signature.token.Pkcs12SignatureToken; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.test.mock.MockTSPSource; +import eu.europa.esig.dss.token.AbstractSignatureTokenConnection; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.token.Pkcs12SignatureToken; /** * Super-class for all cookbook examples. diff --git a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/CountersignXmlXadesB.java b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/CountersignXmlXadesB.java similarity index 79% rename from dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/CountersignXmlXadesB.java rename to dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/CountersignXmlXadesB.java index c47a774132..9a1562b581 100644 --- a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/CountersignXmlXadesB.java +++ b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/CountersignXmlXadesB.java @@ -18,23 +18,23 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.cookbook.example.sign; +package eu.europa.esig.dss.cookbook.example.sign; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.cookbook.example.Cookbook; -import eu.europa.ec.markt.dss.parameter.BLevelParameters; -import eu.europa.ec.markt.dss.parameter.BLevelParameters.SignerLocation; -import eu.europa.ec.markt.dss.parameter.XAdESSignatureParameters; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.xades.XAdESService; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; +import eu.europa.esig.dss.BLevelParameters; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.BLevelParameters.SignerLocation; +import eu.europa.esig.dss.cookbook.example.Cookbook; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.xades.XAdESSignatureParameters; +import eu.europa.esig.dss.xades.signature.XAdESService; /** * How to generate a countersignature over an existing signature diff --git a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/EidNativeSignatureTokenConnection.java b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/EidNativeSignatureTokenConnection.java similarity index 87% rename from dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/EidNativeSignatureTokenConnection.java rename to dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/EidNativeSignatureTokenConnection.java index 122ccd24d3..ad701a7c12 100644 --- a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/EidNativeSignatureTokenConnection.java +++ b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/EidNativeSignatureTokenConnection.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.cookbook.example.sign; +package eu.europa.esig.dss.cookbook.example.sign; import java.io.IOException; import java.security.NoSuchAlgorithmException; @@ -34,13 +34,13 @@ import be.fedict.eid.applet.Messages; import be.fedict.eid.applet.sc.PcscEid; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.cookbook.sources.AppletView; -import eu.europa.ec.markt.dss.cookbook.sources.EidPrivateKeyEntry; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.signature.token.AbstractSignatureTokenConnection; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.cookbook.sources.AppletView; +import eu.europa.esig.dss.cookbook.sources.EidPrivateKeyEntry; +import eu.europa.esig.dss.token.AbstractSignatureTokenConnection; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.x509.CertificateToken; public class EidNativeSignatureTokenConnection extends AbstractSignatureTokenConnection { diff --git a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/ExtendSignXmlXadesBToT.java b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/ExtendSignXmlXadesBToT.java similarity index 76% rename from dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/ExtendSignXmlXadesBToT.java rename to dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/ExtendSignXmlXadesBToT.java index c03a43d119..d274c65278 100644 --- a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/ExtendSignXmlXadesBToT.java +++ b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/ExtendSignXmlXadesBToT.java @@ -18,22 +18,22 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.cookbook.example.sign; +package eu.europa.esig.dss.cookbook.example.sign; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.cookbook.example.Cookbook; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.parameter.XAdESSignatureParameters; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.xades.XAdESService; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.cookbook.example.Cookbook; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.xades.XAdESSignatureParameters; +import eu.europa.esig.dss.xades.signature.XAdESService; /** * How to extend with XAdES-BASELINE-T diff --git a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/SignPdfAsicB.java b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/SignPdfAsicB.java similarity index 86% rename from dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/SignPdfAsicB.java rename to dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/SignPdfAsicB.java index c095314121..742229eb7c 100644 --- a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/SignPdfAsicB.java +++ b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/SignPdfAsicB.java @@ -18,18 +18,18 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.cookbook.example.sign; +package eu.europa.esig.dss.cookbook.example.sign; import java.io.IOException; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.cookbook.example.Cookbook; -import eu.europa.ec.markt.dss.parameter.ASiCSignatureParameters; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.asic.ASiCService; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.asic.ASiCSignatureParameters; +import eu.europa.esig.dss.asic.signature.ASiCService; +import eu.europa.esig.dss.cookbook.example.Cookbook; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; /** * How to sign with ASiC-BASELINE-B diff --git a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/SignPdfPadesB.java b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/SignPdfPadesB.java similarity index 85% rename from dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/SignPdfPadesB.java rename to dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/SignPdfPadesB.java index f6950cc9e2..7373502596 100644 --- a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/SignPdfPadesB.java +++ b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/SignPdfPadesB.java @@ -18,19 +18,19 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.cookbook.example.sign; +package eu.europa.esig.dss.cookbook.example.sign; import java.io.IOException; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.cookbook.example.Cookbook; -import eu.europa.ec.markt.dss.parameter.PAdESSignatureParameters; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.pades.PAdESService; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.cookbook.example.Cookbook; +import eu.europa.esig.dss.pades.PAdESSignatureParameters; +import eu.europa.esig.dss.pades.signature.PAdESService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; /** * How to sign PDF Document with PAdES-BASELINE-B diff --git a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/SignPdfPadesBDetached.java b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/SignPdfPadesBDetached.java similarity index 85% rename from dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/SignPdfPadesBDetached.java rename to dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/SignPdfPadesBDetached.java index 4bf2fc4260..e94f3d480d 100644 --- a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/SignPdfPadesBDetached.java +++ b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/SignPdfPadesBDetached.java @@ -18,19 +18,19 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.cookbook.example.sign; +package eu.europa.esig.dss.cookbook.example.sign; import java.io.IOException; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.cookbook.example.Cookbook; -import eu.europa.ec.markt.dss.parameter.PAdESSignatureParameters; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.pades.PAdESService; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.cookbook.example.Cookbook; +import eu.europa.esig.dss.pades.PAdESSignatureParameters; +import eu.europa.esig.dss.pades.signature.PAdESService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; /** * How to sign PDF Document with PAdES-BASELINE-B diff --git a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/SignPdfPadesBVisible.java b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/SignPdfPadesBVisible.java similarity index 84% rename from dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/SignPdfPadesBVisible.java rename to dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/SignPdfPadesBVisible.java index 6961dd2c05..edc341e26c 100644 --- a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/SignPdfPadesBVisible.java +++ b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/SignPdfPadesBVisible.java @@ -18,23 +18,23 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.cookbook.example.sign; +package eu.europa.esig.dss.cookbook.example.sign; import java.awt.Color; import java.awt.Font; import java.io.IOException; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.cookbook.example.Cookbook; -import eu.europa.ec.markt.dss.parameter.PAdESSignatureParameters; -import eu.europa.ec.markt.dss.parameter.SignatureImageParameters; -import eu.europa.ec.markt.dss.parameter.SignatureImageTextParameters; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.pades.PAdESService; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.cookbook.example.Cookbook; +import eu.europa.esig.dss.pades.PAdESSignatureParameters; +import eu.europa.esig.dss.pades.SignatureImageParameters; +import eu.europa.esig.dss.pades.SignatureImageTextParameters; +import eu.europa.esig.dss.pades.signature.PAdESService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; /** * How to sign PDF Document with PAdES-BASELINE-B and include a visual representation diff --git a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/SignXmlCadesB.java b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/SignXmlCadesB.java similarity index 85% rename from dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/SignXmlCadesB.java rename to dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/SignXmlCadesB.java index 1154d67cb3..012db867ef 100644 --- a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/SignXmlCadesB.java +++ b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/SignXmlCadesB.java @@ -18,19 +18,19 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.cookbook.example.sign; +package eu.europa.esig.dss.cookbook.example.sign; import java.io.IOException; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.cookbook.example.Cookbook; -import eu.europa.ec.markt.dss.parameter.CAdESSignatureParameters; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.cades.CAdESService; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.cades.CAdESSignatureParameters; +import eu.europa.esig.dss.cades.signature.CAdESService; +import eu.europa.esig.dss.cookbook.example.Cookbook; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; /** * How to sign with CAdES-BASELINE-B enveloping signature. diff --git a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/SignXmlXadesB.java b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/SignXmlXadesB.java similarity index 83% rename from dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/SignXmlXadesB.java rename to dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/SignXmlXadesB.java index 150af3566e..e51ef7a250 100644 --- a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/SignXmlXadesB.java +++ b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/SignXmlXadesB.java @@ -18,20 +18,20 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.cookbook.example.sign; +package eu.europa.esig.dss.cookbook.example.sign; import java.io.IOException; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.cookbook.example.Cookbook; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.parameter.XAdESSignatureParameters; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.xades.XAdESService; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.cookbook.example.Cookbook; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.xades.XAdESSignatureParameters; +import eu.europa.esig.dss.xades.signature.XAdESService; /** * How to sign with XAdES-BASELINE-B diff --git a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/SignXmlXadesBAllDataObjectsTimestamp.java b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/SignXmlXadesBAllDataObjectsTimestamp.java similarity index 78% rename from dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/SignXmlXadesBAllDataObjectsTimestamp.java rename to dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/SignXmlXadesBAllDataObjectsTimestamp.java index b5f984484d..16c8bc03fd 100644 --- a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/SignXmlXadesBAllDataObjectsTimestamp.java +++ b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/SignXmlXadesBAllDataObjectsTimestamp.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.cookbook.example.sign; +package eu.europa.esig.dss.cookbook.example.sign; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -28,23 +28,23 @@ import javax.xml.crypto.dsig.CanonicalizationMethod; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.cookbook.example.Cookbook; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.mock.MockTSPSource; -import eu.europa.ec.markt.dss.parameter.DSSReference; -import eu.europa.ec.markt.dss.parameter.TimestampParameters; -import eu.europa.ec.markt.dss.parameter.XAdESSignatureParameters; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.timestamp.TimestampService; -import eu.europa.ec.markt.dss.signature.validation.TimestampToken; -import eu.europa.ec.markt.dss.signature.xades.XAdESService; -import eu.europa.ec.markt.dss.validation102853.CertificatePool; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.TimestampType; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.TimestampParameters; +import eu.europa.esig.dss.cookbook.example.Cookbook; +import eu.europa.esig.dss.cookbook.timestamp.TimestampService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.mock.MockTSPSource; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.TimestampToken; +import eu.europa.esig.dss.x509.CertificatePool; +import eu.europa.esig.dss.x509.TimestampType; +import eu.europa.esig.dss.xades.DSSReference; +import eu.europa.esig.dss.xades.XAdESSignatureParameters; +import eu.europa.esig.dss.xades.signature.XAdESService; /** * Shows how to generate an AllDataObjectsTimestamp diff --git a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/SignXmlXadesBExplicitPolicy.java b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/SignXmlXadesBExplicitPolicy.java similarity index 82% rename from dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/SignXmlXadesBExplicitPolicy.java rename to dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/SignXmlXadesBExplicitPolicy.java index f4b49a3423..5d0aa0c59d 100644 --- a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/SignXmlXadesBExplicitPolicy.java +++ b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/SignXmlXadesBExplicitPolicy.java @@ -18,23 +18,23 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.cookbook.example.sign; +package eu.europa.esig.dss.cookbook.example.sign; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.cookbook.example.Cookbook; -import eu.europa.ec.markt.dss.parameter.BLevelParameters; -import eu.europa.ec.markt.dss.parameter.Policy; -import eu.europa.ec.markt.dss.parameter.XAdESSignatureParameters; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.xades.XAdESService; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; +import eu.europa.esig.dss.BLevelParameters; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.Policy; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.cookbook.example.Cookbook; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.xades.XAdESSignatureParameters; +import eu.europa.esig.dss.xades.signature.XAdESService; /** * How to set explicit policy. diff --git a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/SignXmlXadesBImplicitPolicy.java b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/SignXmlXadesBImplicitPolicy.java similarity index 79% rename from dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/SignXmlXadesBImplicitPolicy.java rename to dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/SignXmlXadesBImplicitPolicy.java index 2244f1dd96..8b4602f689 100644 --- a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/SignXmlXadesBImplicitPolicy.java +++ b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/SignXmlXadesBImplicitPolicy.java @@ -18,23 +18,23 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.cookbook.example.sign; +package eu.europa.esig.dss.cookbook.example.sign; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.cookbook.example.Cookbook; -import eu.europa.ec.markt.dss.parameter.BLevelParameters; -import eu.europa.ec.markt.dss.parameter.Policy; -import eu.europa.ec.markt.dss.parameter.XAdESSignatureParameters; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.xades.XAdESService; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; +import eu.europa.esig.dss.BLevelParameters; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.Policy; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.cookbook.example.Cookbook; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.xades.XAdESSignatureParameters; +import eu.europa.esig.dss.xades.signature.XAdESService; /** * How to set implicit policy. diff --git a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/SignXmlXadesBWithMSCAPI.java b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/SignXmlXadesBWithMSCAPI.java similarity index 81% rename from dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/SignXmlXadesBWithMSCAPI.java rename to dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/SignXmlXadesBWithMSCAPI.java index ef9953cf5c..c834207c4a 100644 --- a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/SignXmlXadesBWithMSCAPI.java +++ b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/SignXmlXadesBWithMSCAPI.java @@ -18,23 +18,23 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.cookbook.example.sign; +package eu.europa.esig.dss.cookbook.example.sign; import java.io.IOException; import java.util.List; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.cookbook.example.Cookbook; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.parameter.XAdESSignatureParameters; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.signature.token.MSCAPISignatureToken; -import eu.europa.ec.markt.dss.signature.xades.XAdESService; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.cookbook.example.Cookbook; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.token.MSCAPISignatureToken; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.xades.XAdESSignatureParameters; +import eu.europa.esig.dss.xades.signature.XAdESService; /** * How to sign using MS-CAPI. diff --git a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/SignXmlXadesBWithSelfSignedCertificate.java b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/SignXmlXadesBWithSelfSignedCertificate.java similarity index 83% rename from dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/SignXmlXadesBWithSelfSignedCertificate.java rename to dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/SignXmlXadesBWithSelfSignedCertificate.java index 5a86e21c33..7dcf30a22f 100644 --- a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/SignXmlXadesBWithSelfSignedCertificate.java +++ b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/SignXmlXadesBWithSelfSignedCertificate.java @@ -18,20 +18,20 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.cookbook.example.sign; +package eu.europa.esig.dss.cookbook.example.sign; import java.io.IOException; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.cookbook.example.Cookbook; -import eu.europa.ec.markt.dss.parameter.XAdESSignatureParameters; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.token.Pkcs12SignatureToken; -import eu.europa.ec.markt.dss.signature.xades.XAdESService; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.cookbook.example.Cookbook; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.token.Pkcs12SignatureToken; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.xades.XAdESSignatureParameters; +import eu.europa.esig.dss.xades.signature.XAdESService; /** * How to sign with XAdES-BASELINE-B diff --git a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/SignXmlXadesLT.java b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/SignXmlXadesLT.java similarity index 81% rename from dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/SignXmlXadesLT.java rename to dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/SignXmlXadesLT.java index 7badbf686d..d0d14ab231 100644 --- a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/SignXmlXadesLT.java +++ b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/SignXmlXadesLT.java @@ -18,25 +18,25 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.cookbook.example.sign; +package eu.europa.esig.dss.cookbook.example.sign; import java.io.IOException; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.cookbook.example.Cookbook; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.parameter.XAdESSignatureParameters; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.xades.XAdESService; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.crl.OnlineCRLSource; -import eu.europa.ec.markt.dss.validation102853.https.CommonsDataLoader; -import eu.europa.ec.markt.dss.validation102853.ocsp.OnlineOCSPSource; -import eu.europa.ec.markt.dss.validation102853.tsl.TSLRefreshPolicy; -import eu.europa.ec.markt.dss.validation102853.tsl.TrustedListsCertificateSource; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.client.crl.OnlineCRLSource; +import eu.europa.esig.dss.client.http.commons.CommonsDataLoader; +import eu.europa.esig.dss.client.ocsp.OnlineOCSPSource; +import eu.europa.esig.dss.cookbook.example.Cookbook; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.tsl.TSLRefreshPolicy; +import eu.europa.esig.dss.tsl.TrustedListsCertificateSource; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.xades.XAdESSignatureParameters; +import eu.europa.esig.dss.xades.signature.XAdESService; /** * How to sign with XAdES-BASELINE-LT diff --git a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/SignXmlXadesT.java b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/SignXmlXadesT.java similarity index 81% rename from dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/SignXmlXadesT.java rename to dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/SignXmlXadesT.java index 50e4938794..960f681e02 100644 --- a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/SignXmlXadesT.java +++ b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/SignXmlXadesT.java @@ -18,24 +18,24 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.cookbook.example.sign; +package eu.europa.esig.dss.cookbook.example.sign; import java.io.IOException; import java.util.Date; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.cookbook.example.Cookbook; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.mock.MockTSPSource; -import eu.europa.ec.markt.dss.parameter.XAdESSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.xades.XAdESService; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.cookbook.example.Cookbook; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.test.mock.MockTSPSource; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.xades.XAdESSignatureParameters; +import eu.europa.esig.dss.xades.signature.XAdESService; /** * How to sign with XAdES-BASELINE-T diff --git a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/SignXmlXadesTWithOnlineSource.java b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/SignXmlXadesTWithOnlineSource.java similarity index 83% rename from dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/SignXmlXadesTWithOnlineSource.java rename to dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/SignXmlXadesTWithOnlineSource.java index e373157c30..ce8c6e766c 100644 --- a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/SignXmlXadesTWithOnlineSource.java +++ b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/SignXmlXadesTWithOnlineSource.java @@ -18,21 +18,21 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.cookbook.example.sign; +package eu.europa.esig.dss.cookbook.example.sign; import java.io.IOException; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.cookbook.example.Cookbook; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.parameter.XAdESSignatureParameters; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.xades.XAdESService; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.tsp.OnlineTSPSource; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.client.tsp.OnlineTSPSource; +import eu.europa.esig.dss.cookbook.example.Cookbook; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.xades.XAdESSignatureParameters; +import eu.europa.esig.dss.xades.signature.XAdESService; /** * How to sign with XAdES-BASELINE-T diff --git a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/SigningApplication.java b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/SigningApplication.java similarity index 77% rename from dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/SigningApplication.java rename to dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/SigningApplication.java index 2f7a701dca..6b5d2bccfe 100644 --- a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/SigningApplication.java +++ b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/SigningApplication.java @@ -18,23 +18,23 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.cookbook.example.sign; +package eu.europa.esig.dss.cookbook.example.sign; import java.io.IOException; import java.util.Date; import org.apache.commons.io.IOUtils; -import eu.europa.ec.markt.dss.cookbook.sources.JavaKeyStoreTool; -import eu.europa.ec.markt.dss.parameter.XAdESSignatureParameters; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.token.JKSSignatureToken; -import eu.europa.ec.markt.dss.signature.token.KSPrivateKeyEntry; -import eu.europa.ec.markt.dss.signature.xades.XAdESService; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.cookbook.sources.JavaKeyStoreTool; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.token.JKSSignatureToken; +import eu.europa.esig.dss.token.KSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.xades.XAdESSignatureParameters; +import eu.europa.esig.dss.xades.signature.XAdESService; public class SigningApplication { diff --git a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/signXmlXadesBProperties.java b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/signXmlXadesBProperties.java similarity index 80% rename from dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/signXmlXadesBProperties.java rename to dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/signXmlXadesBProperties.java index b57e28113b..207925efc2 100644 --- a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/sign/signXmlXadesBProperties.java +++ b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/sign/signXmlXadesBProperties.java @@ -18,23 +18,23 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.cookbook.example.sign; +package eu.europa.esig.dss.cookbook.example.sign; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.cookbook.example.Cookbook; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.parameter.BLevelParameters; -import eu.europa.ec.markt.dss.parameter.XAdESSignatureParameters; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.xades.XAdESService; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; +import eu.europa.esig.dss.BLevelParameters; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.cookbook.example.Cookbook; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.xades.XAdESSignatureParameters; +import eu.europa.esig.dss.xades.signature.XAdESService; /** * How to add signed properties to the signature. diff --git a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/validate/ValidateDetached.java b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/validate/ValidateDetached.java similarity index 76% rename from dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/validate/ValidateDetached.java rename to dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/validate/ValidateDetached.java index 3abf526e7a..239077200f 100644 --- a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/validate/ValidateDetached.java +++ b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/validate/ValidateDetached.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.cookbook.example.validate; +package eu.europa.esig.dss.cookbook.example.validate; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -26,19 +26,19 @@ import java.util.ArrayList; import java.util.List; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.cookbook.example.Cookbook; -import eu.europa.ec.markt.dss.mock.MockServiceInfo; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonTrustedCertificateSource; -import eu.europa.ec.markt.dss.validation102853.SignedDocumentValidator; -import eu.europa.ec.markt.dss.validation102853.condition.ServiceInfo; -import eu.europa.ec.markt.dss.validation102853.report.DiagnosticData; -import eu.europa.ec.markt.dss.validation102853.report.Reports; -import eu.europa.ec.markt.dss.validation102853.report.SimpleReport; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.cookbook.example.Cookbook; +import eu.europa.esig.dss.test.mock.MockServiceInfo; +import eu.europa.esig.dss.tsl.ServiceInfo; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.SignedDocumentValidator; +import eu.europa.esig.dss.validation.report.DiagnosticData; +import eu.europa.esig.dss.validation.report.Reports; +import eu.europa.esig.dss.validation.report.SimpleReport; +import eu.europa.esig.dss.x509.CertificateToken; +import eu.europa.esig.dss.x509.CommonTrustedCertificateSource; /** * How to validate a PADES-BASELINE-B DETACHED signature. diff --git a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/validate/ValidateExtendedSignedXmlXadesBtoT.java b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/validate/ValidateExtendedSignedXmlXadesBtoT.java similarity index 74% rename from dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/validate/ValidateExtendedSignedXmlXadesBtoT.java rename to dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/validate/ValidateExtendedSignedXmlXadesBtoT.java index 8586720b70..b8bd2a53bb 100644 --- a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/validate/ValidateExtendedSignedXmlXadesBtoT.java +++ b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/validate/ValidateExtendedSignedXmlXadesBtoT.java @@ -18,26 +18,26 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.cookbook.example.validate; +package eu.europa.esig.dss.cookbook.example.validate; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.cookbook.example.Cookbook; -import eu.europa.ec.markt.dss.cookbook.mock.MockTSLCertificateSource; -import eu.europa.ec.markt.dss.cookbook.sources.AlwaysValidOCSPSource; -import eu.europa.ec.markt.dss.mock.MockServiceInfo; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.SignedDocumentValidator; -import eu.europa.ec.markt.dss.validation102853.condition.ServiceInfo; -import eu.europa.ec.markt.dss.validation102853.report.DetailedReport; -import eu.europa.ec.markt.dss.validation102853.report.Reports; -import eu.europa.ec.markt.dss.validation102853.report.SimpleReport; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.cookbook.example.Cookbook; +import eu.europa.esig.dss.cookbook.mock.MockTSLCertificateSource; +import eu.europa.esig.dss.cookbook.sources.AlwaysValidOCSPSource; +import eu.europa.esig.dss.test.mock.MockServiceInfo; +import eu.europa.esig.dss.tsl.ServiceInfo; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.SignedDocumentValidator; +import eu.europa.esig.dss.validation.report.DetailedReport; +import eu.europa.esig.dss.validation.report.Reports; +import eu.europa.esig.dss.validation.report.SimpleReport; +import eu.europa.esig.dss.x509.CertificateToken; /** * How to validate a XAdES-BASELINE-B EXTENDED signature. diff --git a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/validate/ValidateSignedPdfPadesB.java b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/validate/ValidateSignedPdfPadesB.java similarity index 73% rename from dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/validate/ValidateSignedPdfPadesB.java rename to dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/validate/ValidateSignedPdfPadesB.java index bf7cbbf80c..78a346060a 100644 --- a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/validate/ValidateSignedPdfPadesB.java +++ b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/validate/ValidateSignedPdfPadesB.java @@ -18,25 +18,25 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.cookbook.example.validate; +package eu.europa.esig.dss.cookbook.example.validate; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.cookbook.example.Cookbook; -import eu.europa.ec.markt.dss.cookbook.mock.MockTSLCertificateSource; -import eu.europa.ec.markt.dss.cookbook.sources.AlwaysValidOCSPSource; -import eu.europa.ec.markt.dss.mock.MockServiceInfo; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.SignedDocumentValidator; -import eu.europa.ec.markt.dss.validation102853.condition.ServiceInfo; -import eu.europa.ec.markt.dss.validation102853.report.Reports; -import eu.europa.ec.markt.dss.validation102853.report.SimpleReport; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.cookbook.example.Cookbook; +import eu.europa.esig.dss.cookbook.mock.MockTSLCertificateSource; +import eu.europa.esig.dss.cookbook.sources.AlwaysValidOCSPSource; +import eu.europa.esig.dss.test.mock.MockServiceInfo; +import eu.europa.esig.dss.tsl.ServiceInfo; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.SignedDocumentValidator; +import eu.europa.esig.dss.validation.report.Reports; +import eu.europa.esig.dss.validation.report.SimpleReport; +import eu.europa.esig.dss.x509.CertificateToken; /** * How to validate a PADES-BASELINE-B signature. diff --git a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/validate/ValidateSignedXmlCadesB.java b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/validate/ValidateSignedXmlCadesB.java similarity index 74% rename from dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/validate/ValidateSignedXmlCadesB.java rename to dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/validate/ValidateSignedXmlCadesB.java index 2fa4438d8d..76844a47a6 100644 --- a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/validate/ValidateSignedXmlCadesB.java +++ b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/validate/ValidateSignedXmlCadesB.java @@ -18,26 +18,26 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.cookbook.example.validate; +package eu.europa.esig.dss.cookbook.example.validate; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.cookbook.example.Cookbook; -import eu.europa.ec.markt.dss.cookbook.mock.MockTSLCertificateSource; -import eu.europa.ec.markt.dss.cookbook.sources.AlwaysValidOCSPSource; -import eu.europa.ec.markt.dss.mock.MockServiceInfo; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.SignedDocumentValidator; -import eu.europa.ec.markt.dss.validation102853.condition.ServiceInfo; -import eu.europa.ec.markt.dss.validation102853.report.DetailedReport; -import eu.europa.ec.markt.dss.validation102853.report.Reports; -import eu.europa.ec.markt.dss.validation102853.report.SimpleReport; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.cookbook.example.Cookbook; +import eu.europa.esig.dss.cookbook.mock.MockTSLCertificateSource; +import eu.europa.esig.dss.cookbook.sources.AlwaysValidOCSPSource; +import eu.europa.esig.dss.test.mock.MockServiceInfo; +import eu.europa.esig.dss.tsl.ServiceInfo; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.SignedDocumentValidator; +import eu.europa.esig.dss.validation.report.DetailedReport; +import eu.europa.esig.dss.validation.report.Reports; +import eu.europa.esig.dss.validation.report.SimpleReport; +import eu.europa.esig.dss.x509.CertificateToken; /** * How to validate a CADES-BASELINE-B envelopping signature. diff --git a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/validate/ValidateSignedXmlXadesB.java b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/validate/ValidateSignedXmlXadesB.java similarity index 75% rename from dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/validate/ValidateSignedXmlXadesB.java rename to dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/validate/ValidateSignedXmlXadesB.java index 884f1426eb..1e2a8b815d 100644 --- a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/validate/ValidateSignedXmlXadesB.java +++ b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/validate/ValidateSignedXmlXadesB.java @@ -18,25 +18,25 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.cookbook.example.validate; +package eu.europa.esig.dss.cookbook.example.validate; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.cookbook.example.Cookbook; -import eu.europa.ec.markt.dss.cookbook.mock.MockTSLCertificateSource; -import eu.europa.ec.markt.dss.cookbook.sources.AlwaysValidOCSPSource; -import eu.europa.ec.markt.dss.mock.MockServiceInfo; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.SignedDocumentValidator; -import eu.europa.ec.markt.dss.validation102853.condition.ServiceInfo; -import eu.europa.ec.markt.dss.validation102853.report.Reports; -import eu.europa.ec.markt.dss.validation102853.report.SimpleReport; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.cookbook.example.Cookbook; +import eu.europa.esig.dss.cookbook.mock.MockTSLCertificateSource; +import eu.europa.esig.dss.cookbook.sources.AlwaysValidOCSPSource; +import eu.europa.esig.dss.test.mock.MockServiceInfo; +import eu.europa.esig.dss.tsl.ServiceInfo; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.SignedDocumentValidator; +import eu.europa.esig.dss.validation.report.Reports; +import eu.europa.esig.dss.validation.report.SimpleReport; +import eu.europa.esig.dss.x509.CertificateToken; /** * How to validate a XAdES-BASELINE-B signature. diff --git a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/validate/ValidateSignedXmlXadesBWithCustomPolicy.java b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/validate/ValidateSignedXmlXadesBWithCustomPolicy.java similarity index 75% rename from dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/validate/ValidateSignedXmlXadesBWithCustomPolicy.java rename to dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/validate/ValidateSignedXmlXadesBWithCustomPolicy.java index 69ae4c7321..8ebb3d1bbf 100644 --- a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/validate/ValidateSignedXmlXadesBWithCustomPolicy.java +++ b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/validate/ValidateSignedXmlXadesBWithCustomPolicy.java @@ -18,26 +18,26 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.cookbook.example.validate; +package eu.europa.esig.dss.cookbook.example.validate; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.cookbook.example.Cookbook; -import eu.europa.ec.markt.dss.cookbook.mock.MockTSLCertificateSource; -import eu.europa.ec.markt.dss.cookbook.sources.AlwaysValidOCSPSource; -import eu.europa.ec.markt.dss.mock.MockServiceInfo; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.SignedDocumentValidator; -import eu.europa.ec.markt.dss.validation102853.condition.ServiceInfo; -import eu.europa.ec.markt.dss.validation102853.report.DetailedReport; -import eu.europa.ec.markt.dss.validation102853.report.Reports; -import eu.europa.ec.markt.dss.validation102853.report.SimpleReport; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.cookbook.example.Cookbook; +import eu.europa.esig.dss.cookbook.mock.MockTSLCertificateSource; +import eu.europa.esig.dss.cookbook.sources.AlwaysValidOCSPSource; +import eu.europa.esig.dss.test.mock.MockServiceInfo; +import eu.europa.esig.dss.tsl.ServiceInfo; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.SignedDocumentValidator; +import eu.europa.esig.dss.validation.report.DetailedReport; +import eu.europa.esig.dss.validation.report.Reports; +import eu.europa.esig.dss.validation.report.SimpleReport; +import eu.europa.esig.dss.x509.CertificateToken; /** * How to validate a signature with a custom validation policy. diff --git a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/validate/ValidateSignedXmlXadesLT.java b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/validate/ValidateSignedXmlXadesLT.java similarity index 73% rename from dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/validate/ValidateSignedXmlXadesLT.java rename to dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/validate/ValidateSignedXmlXadesLT.java index 75de61cbe2..f0e700bdb1 100644 --- a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/validate/ValidateSignedXmlXadesLT.java +++ b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/validate/ValidateSignedXmlXadesLT.java @@ -18,26 +18,26 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.cookbook.example.validate; +package eu.europa.esig.dss.cookbook.example.validate; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.cookbook.example.Cookbook; -import eu.europa.ec.markt.dss.cookbook.mock.MockTSLCertificateSource; -import eu.europa.ec.markt.dss.cookbook.sources.AlwaysValidOCSPSource; -import eu.europa.ec.markt.dss.mock.MockServiceInfo; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.SignedDocumentValidator; -import eu.europa.ec.markt.dss.validation102853.condition.ServiceInfo; -import eu.europa.ec.markt.dss.validation102853.report.DetailedReport; -import eu.europa.ec.markt.dss.validation102853.report.Reports; -import eu.europa.ec.markt.dss.validation102853.report.SimpleReport; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.cookbook.example.Cookbook; +import eu.europa.esig.dss.cookbook.mock.MockTSLCertificateSource; +import eu.europa.esig.dss.cookbook.sources.AlwaysValidOCSPSource; +import eu.europa.esig.dss.test.mock.MockServiceInfo; +import eu.europa.esig.dss.tsl.ServiceInfo; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.SignedDocumentValidator; +import eu.europa.esig.dss.validation.report.DetailedReport; +import eu.europa.esig.dss.validation.report.Reports; +import eu.europa.esig.dss.validation.report.SimpleReport; +import eu.europa.esig.dss.x509.CertificateToken; /** * How to validate a XAdES-BASELINE-LT enveloped signature. diff --git a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/validate/ValidateXmlXadesLTWithOnlineSources.java b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/validate/ValidateXmlXadesLTWithOnlineSources.java similarity index 76% rename from dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/validate/ValidateXmlXadesLTWithOnlineSources.java rename to dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/validate/ValidateXmlXadesLTWithOnlineSources.java index e8e2bbd098..69c94e6fe6 100644 --- a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/example/validate/ValidateXmlXadesLTWithOnlineSources.java +++ b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/example/validate/ValidateXmlXadesLTWithOnlineSources.java @@ -18,30 +18,30 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.cookbook.example.validate; +package eu.europa.esig.dss.cookbook.example.validate; import java.io.ByteArrayInputStream; import java.io.File; import java.io.IOException; import java.io.InputStream; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.cookbook.example.Cookbook; -import eu.europa.ec.markt.dss.mock.MockServiceInfo; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.SignedDocumentValidator; -import eu.europa.ec.markt.dss.validation102853.crl.OnlineCRLSource; -import eu.europa.ec.markt.dss.validation102853.https.CommonsDataLoader; -import eu.europa.ec.markt.dss.validation102853.https.FileCacheDataLoader; -import eu.europa.ec.markt.dss.validation102853.ocsp.OnlineOCSPSource; -import eu.europa.ec.markt.dss.validation102853.report.DetailedReport; -import eu.europa.ec.markt.dss.validation102853.report.Reports; -import eu.europa.ec.markt.dss.validation102853.report.SimpleReport; -import eu.europa.ec.markt.dss.validation102853.tsl.TSLRefreshPolicy; -import eu.europa.ec.markt.dss.validation102853.tsl.TrustedListsCertificateSource; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.client.crl.OnlineCRLSource; +import eu.europa.esig.dss.client.http.commons.CommonsDataLoader; +import eu.europa.esig.dss.client.http.commons.FileCacheDataLoader; +import eu.europa.esig.dss.client.ocsp.OnlineOCSPSource; +import eu.europa.esig.dss.cookbook.example.Cookbook; +import eu.europa.esig.dss.test.mock.MockServiceInfo; +import eu.europa.esig.dss.tsl.TSLRefreshPolicy; +import eu.europa.esig.dss.tsl.TrustedListsCertificateSource; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.SignedDocumentValidator; +import eu.europa.esig.dss.validation.report.DetailedReport; +import eu.europa.esig.dss.validation.report.Reports; +import eu.europa.esig.dss.validation.report.SimpleReport; +import eu.europa.esig.dss.x509.CertificateToken; /** * How to validate a XAdES-BASELINE-LT enveloped signature with online sources. diff --git a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/mock/MockTSLCertificateSource.java b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/mock/MockTSLCertificateSource.java similarity index 87% rename from dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/mock/MockTSLCertificateSource.java rename to dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/mock/MockTSLCertificateSource.java index c8e0c953bc..6848170ba7 100644 --- a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/mock/MockTSLCertificateSource.java +++ b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/mock/MockTSLCertificateSource.java @@ -18,10 +18,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.cookbook.mock; +package eu.europa.esig.dss.cookbook.mock; -import eu.europa.ec.markt.dss.validation102853.tsl.TSLRefreshPolicy; -import eu.europa.ec.markt.dss.validation102853.tsl.TrustedListsCertificateSource; +import eu.europa.esig.dss.tsl.TSLRefreshPolicy; +import eu.europa.esig.dss.tsl.TrustedListsCertificateSource; /** * This is the MOCK source which can load any trusted list. diff --git a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/sources/AlwaysValidOCSPSource.java b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/sources/AlwaysValidOCSPSource.java similarity index 94% rename from dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/sources/AlwaysValidOCSPSource.java rename to dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/sources/AlwaysValidOCSPSource.java index 678f785133..789bcc9b31 100644 --- a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/sources/AlwaysValidOCSPSource.java +++ b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/sources/AlwaysValidOCSPSource.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.cookbook.sources; +package eu.europa.esig.dss.cookbook.sources; import java.io.FileInputStream; import java.io.IOException; @@ -56,13 +56,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.cookbook.example.Cookbook; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateSource; -import eu.europa.ec.markt.dss.validation102853.OCSPToken; -import eu.europa.ec.markt.dss.validation102853.ocsp.OCSPSource; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.cookbook.example.Cookbook; +import eu.europa.esig.dss.x509.CertificateToken; +import eu.europa.esig.dss.x509.CommonCertificateSource; +import eu.europa.esig.dss.x509.OCSPToken; +import eu.europa.esig.dss.x509.ocsp.OCSPSource; public class AlwaysValidOCSPSource implements OCSPSource { diff --git a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/sources/AppletView.java b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/sources/AppletView.java similarity index 97% rename from dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/sources/AppletView.java rename to dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/sources/AppletView.java index 9c68ec9110..a637b765d7 100644 --- a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/sources/AppletView.java +++ b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/sources/AppletView.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.cookbook.sources; +package eu.europa.esig.dss.cookbook.sources; import java.awt.Component; diff --git a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/sources/CheckCertificate.java b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/sources/CheckCertificate.java similarity index 81% rename from dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/sources/CheckCertificate.java rename to dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/sources/CheckCertificate.java index 0d2b5970e3..6965ace354 100644 --- a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/sources/CheckCertificate.java +++ b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/sources/CheckCertificate.java @@ -18,25 +18,25 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.cookbook.sources; +package eu.europa.esig.dss.cookbook.sources; import java.util.Set; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.cookbook.example.Cookbook; -import eu.europa.ec.markt.dss.mock.MockCRLSource; -import eu.europa.ec.markt.dss.mock.MockEmptyTSLCertificateSource; -import eu.europa.ec.markt.dss.mock.MockOCSPSource; -import eu.europa.ec.markt.dss.validation102853.CertificatePool; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateSource; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonTrustedCertificateSource; -import eu.europa.ec.markt.dss.validation102853.RevocationToken; -import eu.europa.ec.markt.dss.validation102853.SignatureValidationContext; -import eu.europa.ec.markt.dss.validation102853.crl.OnlineCRLSource; -import eu.europa.ec.markt.dss.validation102853.ocsp.OnlineOCSPSource; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.client.crl.OnlineCRLSource; +import eu.europa.esig.dss.client.ocsp.OnlineOCSPSource; +import eu.europa.esig.dss.cookbook.example.Cookbook; +import eu.europa.esig.dss.test.mock.MockCRLSource; +import eu.europa.esig.dss.test.mock.MockEmptyTSLCertificateSource; +import eu.europa.esig.dss.test.mock.MockOCSPSource; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.SignatureValidationContext; +import eu.europa.esig.dss.x509.CertificatePool; +import eu.europa.esig.dss.x509.CertificateToken; +import eu.europa.esig.dss.x509.CommonCertificateSource; +import eu.europa.esig.dss.x509.CommonTrustedCertificateSource; +import eu.europa.esig.dss.x509.RevocationToken; /** * How to check a certificate diff --git a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/sources/EidPrivateKeyEntry.java b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/sources/EidPrivateKeyEntry.java similarity index 86% rename from dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/sources/EidPrivateKeyEntry.java rename to dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/sources/EidPrivateKeyEntry.java index e9c94ae9ca..b05e13b674 100644 --- a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/sources/EidPrivateKeyEntry.java +++ b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/sources/EidPrivateKeyEntry.java @@ -18,16 +18,16 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.cookbook.sources; +package eu.europa.esig.dss.cookbook.sources; import java.security.PrivateKey; import java.security.cert.X509Certificate; import java.util.List; -import eu.europa.ec.markt.dss.EncryptionAlgorithm; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.EncryptionAlgorithm; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.x509.CertificateToken; /** * Sample for eID diff --git a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/sources/InitOnlineTSPSource.java b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/sources/InitOnlineTSPSource.java similarity index 86% rename from dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/sources/InitOnlineTSPSource.java rename to dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/sources/InitOnlineTSPSource.java index bdee6680a6..1b9dafd030 100644 --- a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/sources/InitOnlineTSPSource.java +++ b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/sources/InitOnlineTSPSource.java @@ -18,16 +18,16 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.cookbook.sources; +package eu.europa.esig.dss.cookbook.sources; import java.io.IOException; import org.bouncycastle.tsp.TimeStampToken; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.cookbook.example.Cookbook; -import eu.europa.ec.markt.dss.validation102853.tsp.OnlineTSPSource; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.client.tsp.OnlineTSPSource; +import eu.europa.esig.dss.cookbook.example.Cookbook; /** * How to initialize online TSP source. diff --git a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/sources/JavaKeyStoreTool.java b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/sources/JavaKeyStoreTool.java similarity index 95% rename from dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/sources/JavaKeyStoreTool.java rename to dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/sources/JavaKeyStoreTool.java index 66ec71bb61..7f7d963d55 100644 --- a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/sources/JavaKeyStoreTool.java +++ b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/sources/JavaKeyStoreTool.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.cookbook.sources; +package eu.europa.esig.dss.cookbook.sources; import java.io.IOException; import java.io.InputStream; @@ -35,8 +35,8 @@ import org.apache.commons.io.IOUtils; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.signature.token.KSPrivateKeyEntry; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.token.KSPrivateKeyEntry; public class JavaKeyStoreTool { diff --git a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/sources/JksCertificateInformation.java b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/sources/JksCertificateInformation.java similarity index 88% rename from dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/sources/JksCertificateInformation.java rename to dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/sources/JksCertificateInformation.java index f9bb9de881..791923a1f4 100644 --- a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/cookbook/sources/JksCertificateInformation.java +++ b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/sources/JksCertificateInformation.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.cookbook.sources; +package eu.europa.esig.dss.cookbook.sources; import java.io.File; import java.net.MalformedURLException; @@ -30,10 +30,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.cookbook.example.Cookbook; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.signature.token.JKSSignatureToken; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; +import eu.europa.esig.dss.cookbook.example.Cookbook; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.token.JKSSignatureToken; +import eu.europa.esig.dss.x509.CertificateToken; public class JksCertificateInformation { diff --git a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/signature/timestamp/ContentTimestampGenerator.java b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/timestamp/ContentTimestampGenerator.java similarity index 91% rename from dss-cookbook/src/main/java/eu/europa/ec/markt/dss/signature/timestamp/ContentTimestampGenerator.java rename to dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/timestamp/ContentTimestampGenerator.java index e70e381a5b..b6eb14b1fa 100644 --- a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/signature/timestamp/ContentTimestampGenerator.java +++ b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/timestamp/ContentTimestampGenerator.java @@ -18,18 +18,18 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.timestamp; +package eu.europa.esig.dss.cookbook.timestamp; import javax.xml.crypto.dsig.CanonicalizationMethod; import org.bouncycastle.tsp.TimeStampToken; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.parameter.TimestampParameters; -import eu.europa.ec.markt.dss.signature.validation.TimestampToken; -import eu.europa.ec.markt.dss.validation102853.CertificatePool; -import eu.europa.ec.markt.dss.validation102853.TimestampType; -import eu.europa.ec.markt.dss.validation102853.tsp.TSPSource; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.TimestampParameters; +import eu.europa.esig.dss.validation.TimestampToken; +import eu.europa.esig.dss.x509.CertificatePool; +import eu.europa.esig.dss.x509.TimestampType; +import eu.europa.esig.dss.x509.tsp.TSPSource; /** * From RFC 3216, section 3.12.4: diff --git a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/signature/timestamp/TimestampService.java b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/timestamp/TimestampService.java similarity index 89% rename from dss-cookbook/src/main/java/eu/europa/ec/markt/dss/signature/timestamp/TimestampService.java rename to dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/timestamp/TimestampService.java index f8b2c10344..6dd5ab7345 100644 --- a/dss-cookbook/src/main/java/eu/europa/ec/markt/dss/signature/timestamp/TimestampService.java +++ b/dss-cookbook/src/main/java/eu/europa/esig/dss/cookbook/timestamp/TimestampService.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.timestamp; +package eu.europa.esig.dss.cookbook.timestamp; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -32,28 +32,28 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.parameter.DSSReference; -import eu.europa.ec.markt.dss.parameter.TimestampParameters; -import eu.europa.ec.markt.dss.parameter.XAdESSignatureParameters; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.InMemoryDocument; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.validation.AdvancedSignature; -import eu.europa.ec.markt.dss.signature.validation.TimestampToken; -import eu.europa.ec.markt.dss.signature.xades.XAdESLevelBaselineB; -import eu.europa.ec.markt.dss.validation102853.CertificatePool; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.SignedDocumentValidator; -import eu.europa.ec.markt.dss.validation102853.TimestampInclude; -import eu.europa.ec.markt.dss.validation102853.TimestampType; -import eu.europa.ec.markt.dss.validation102853.tsp.TSPSource; -import eu.europa.ec.markt.dss.validation102853.xades.XAdESSignature; -import eu.europa.ec.markt.dss.validation102853.xades.XMLDocumentValidator; -import eu.europa.ec.markt.dss.validation102853.xades.XPathQueryHolder; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.InMemoryDocument; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.TimestampParameters; +import eu.europa.esig.dss.XPathQueryHolder; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.validation.AdvancedSignature; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.SignedDocumentValidator; +import eu.europa.esig.dss.validation.TimestampInclude; +import eu.europa.esig.dss.validation.TimestampToken; +import eu.europa.esig.dss.x509.CertificatePool; +import eu.europa.esig.dss.x509.TimestampType; +import eu.europa.esig.dss.x509.tsp.TSPSource; +import eu.europa.esig.dss.xades.DSSReference; +import eu.europa.esig.dss.xades.XAdESSignatureParameters; +import eu.europa.esig.dss.xades.signature.XAdESLevelBaselineB; +import eu.europa.esig.dss.xades.validation.XAdESSignature; +import eu.europa.esig.dss.xades.validation.XMLDocumentValidator; /** * Class providing (content) timestamp generating methods diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/util/MOCCAAdapter.java b/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/util/MOCCAAdapter.java deleted file mode 100644 index 78b5a114d5..0000000000 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/util/MOCCAAdapter.java +++ /dev/null @@ -1,64 +0,0 @@ -/** - * DSS - Digital Signature Services - * Copyright (C) 2015 European Commission, provided under the CEF programme - * - * This file is part of the "DSS - Digital Signature Services" project. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ -package eu.europa.ec.markt.dss.applet.util; - -import java.lang.reflect.Constructor; - -import eu.europa.ec.markt.dss.signature.token.PasswordInputCallback; -import eu.europa.ec.markt.dss.signature.token.SignatureTokenConnection; - -/** - * Creates MOCCA Signature Token Connection - * - * - */ - -public class MOCCAAdapter { - - private static final String CONNECTION_CLASS = "eu.europa.ec.markt.dss.mocca.MOCCASignatureTokenConnection"; - - private Class getSignatureTokenConnectionClass() { - try { - return Class.forName(CONNECTION_CLASS); - } catch (ClassNotFoundException e) { - return null; - } - } - - public boolean isMOCCAAvailable() { - return getSignatureTokenConnectionClass() != null; - } - - public SignatureTokenConnection createSignatureToken(PasswordInputCallback callback) { - Class clasz = getSignatureTokenConnectionClass(); - if (clasz == null) { - throw new NullPointerException(); - } else { - try { - Constructor c = clasz.getConstructor(PasswordInputCallback.class); - return (SignatureTokenConnection) c.newInstance(callback); - } catch (Exception e) { - throw new RuntimeException(e); - } - } - } - -} diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/DSSAppletView.java b/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/DSSAppletView.java deleted file mode 100644 index 31a8ed4985..0000000000 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/DSSAppletView.java +++ /dev/null @@ -1,93 +0,0 @@ -/** - * DSS - Digital Signature Services - * Copyright (C) 2015 European Commission, provided under the CEF programme - * - * This file is part of the "DSS - Digital Signature Services" project. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ -package eu.europa.ec.markt.dss.applet.view; - -import java.awt.Container; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; - -import com.jgoodies.binding.beans.BeanAdapter; - -import eu.europa.ec.markt.dss.applet.controller.DSSAppletController; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.AppletCore; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.AppletView; - -/** - * - * TODO - * - * - * - * - * - * - * @param - * @param - */ -public abstract class DSSAppletView> extends AppletView implements PropertyChangeListener { - /** - * - * The default constructor for DSSAppletView. - * - * @param core - * @param controller - * @param model - */ - public DSSAppletView(final AppletCore core, final C controller, final M model) { - super(core, controller, model); - final BeanAdapter beanAdapter = new BeanAdapter(model); - beanAdapter.addBeanPropertyChangeListener(this); - } - - public void doInit() { - } - - protected abstract Container doLayout(); - - /* - * (non-Javadoc) - * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.AppletView#layout() - */ - @Override - protected Container layout() { - doInit(); - return doLayout(); - } - - /** - * - * @param evt - */ - public void modelChanged(final PropertyChangeEvent evt) { - }; - - /* - * (non-Javadoc) - * - * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent) - */ - @Override - public void propertyChange(final PropertyChangeEvent evt) { - modelChanged(evt); - } - -} diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/commons/swing/RotatedIcon.java b/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/commons/swing/RotatedIcon.java deleted file mode 100644 index 54ee6129ad..0000000000 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/commons/swing/RotatedIcon.java +++ /dev/null @@ -1,193 +0,0 @@ -/** - * DSS - Digital Signature Services - * Copyright (C) 2015 European Commission, provided under the CEF programme - * - * This file is part of the "DSS - Digital Signature Services" project. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ -package eu.europa.ec.markt.dss.commons.swing; - -import java.awt.Component; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.Rectangle; -import java.awt.geom.AffineTransform; - -import javax.swing.Icon; - -/** - * The RotatedIcon allows you to change the orientation of an Icon by rotating the Icon before it is painted. This class - * supports the following orientations: - * - *
    - *
  • DOWN - rotated 90 degrees - *
  • UP (default) - rotated -90 degrees - *
  • UPSIDE_DOWN - rotated 180 degrees - *
  • ABOUT_CENTER - the icon is rotated a specfic angle about its center. The angle of rotation is specified when the - * class is created. - *
- */ -public class RotatedIcon implements Icon { - /** - * - * TODO - * - * - * - * - * - * - */ - public enum Rotate { - DOWN, UP, UPSIDE_DOWN, ABOUT_CENTER; - } - - private Icon icon; - - private Rotate rotate; - - private double angle; - - /** - * Convenience constructor to create a RotatedIcon that is rotated DOWN. - * - * @param icon the Icon to rotate - */ - public RotatedIcon(final Icon icon) { - this(icon, Rotate.UP); - } - - /** - * Create a RotatedIcon. The icon will rotate about its center. This constructor will automatically set the Rotate - * enum to ABOUT_CENTER. For rectangular icons the icon will be clipped before the rotation to make sure it doesn't - * paint over the rest of the component. - * - * @param icon the Icon to rotate - * @param angle the angle of rotation - */ - public RotatedIcon(final Icon icon, final double angle) { - this(icon, Rotate.ABOUT_CENTER); - this.angle = angle; - } - - /** - * Create a RotatedIcon - * - * @param icon the Icon to rotate - * @param rotate the direction of rotation - */ - public RotatedIcon(final Icon icon, final Rotate rotate) { - this.icon = icon; - this.rotate = rotate; - } - - /** - * Gets the angle of rotation. Only use for Rotate.ABOUT_CENTER. - * - * @return the angle of rotation - */ - public double getAngle() { - return angle; - } - - /** - * Gets the Icon to be rotated - * - * @return the Icon to be rotated - */ - public Icon getIcon() { - return icon; - } - - /** - * Gets the height of this icon. - * - * @return the height of the icon in pixels. - */ - @Override - public int getIconHeight() { - if (rotate == Rotate.UPSIDE_DOWN || rotate == Rotate.ABOUT_CENTER) { - return icon.getIconHeight(); - } else { - return icon.getIconWidth(); - } - } - - /** - * Gets the width of this icon. - * - * @return the width of the icon in pixels. - */ - @Override - public int getIconWidth() { - if (rotate == Rotate.UPSIDE_DOWN || rotate == Rotate.ABOUT_CENTER) { - return icon.getIconWidth(); - } else { - return icon.getIconHeight(); - } - } - - /** - * Gets the Rotate enum which indicates the direction of rotation - * - * @return the Rotate enum - */ - public Rotate getRotate() { - return rotate; - } - - /** - * Paint the icons of this compound icon at the specified location - * - * @param c The component on which the icon is painted - * @param g the graphics context - * @param x the X coordinate of the icon's top-left corner - * @param y the Y coordinate of the icon's top-left corner - */ - @Override - public void paintIcon(final Component c, final Graphics g, final int x, final int y) { - final Graphics2D g2 = (Graphics2D) g.create(); - - final int cWidth = icon.getIconWidth() / 2; - final int cHeight = icon.getIconHeight() / 2; - final int xAdjustment = (icon.getIconWidth() % 2) == 0 ? 0 : -1; - final int yAdjustment = (icon.getIconHeight() % 2) == 0 ? 0 : -1; - - if (rotate == Rotate.DOWN) { - g2.translate(x + cHeight, y + cWidth); - g2.rotate(Math.toRadians(90)); - icon.paintIcon(c, g2, -cWidth, yAdjustment - cHeight); - } else if (rotate == Rotate.UP) { - g2.translate(x + cHeight, y + cWidth); - g2.rotate(Math.toRadians(-90)); - icon.paintIcon(c, g2, xAdjustment - cWidth, -cHeight); - } else if (rotate == Rotate.UPSIDE_DOWN) { - g2.translate(x + cWidth, y + cHeight); - g2.rotate(Math.toRadians(180)); - icon.paintIcon(c, g2, xAdjustment - cWidth, yAdjustment - cHeight); - } else if (rotate == Rotate.ABOUT_CENTER) { - final Rectangle r = new Rectangle(x, y, icon.getIconWidth(), icon.getIconHeight()); - g2.setClip(r); - final AffineTransform original = g2.getTransform(); - final AffineTransform at = new AffineTransform(); - at.concatenate(original); - at.rotate(Math.toRadians(angle), x + cWidth, y + cHeight); - g2.setTransform(at); - icon.paintIcon(c, g2, x, y); - g2.setTransform(original); - } - } -} diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/commons/swing/mvc/applet/wizard/WizardView.java b/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/commons/swing/mvc/applet/wizard/WizardView.java deleted file mode 100644 index 133d8a2574..0000000000 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/commons/swing/mvc/applet/wizard/WizardView.java +++ /dev/null @@ -1,211 +0,0 @@ -/** - * DSS - Digital Signature Services - * Copyright (C) 2015 European Commission, provided under the CEF programme - * - * This file is part of the "DSS - Digital Signature Services" project. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ -package eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard; - -import java.awt.BorderLayout; -import java.awt.Container; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.beans.PropertyChangeEvent; - -import javax.swing.JButton; -import javax.swing.JPanel; - -import com.jgoodies.binding.beans.Model; - -import eu.europa.ec.markt.dss.applet.util.ComponentFactory; -import eu.europa.ec.markt.dss.applet.util.ResourceUtils; -import eu.europa.ec.markt.dss.applet.view.DSSAppletView; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.AppletCore; - -/** - * - * TODO - * - * - * - * - * - * - * @param - * @param - */ - -public abstract class WizardView> extends DSSAppletView { - - /** - * - * TODO - * - * - * - * - * - * - */ - private class BackActionListener implements ActionListener { - /* - * (non-Javadoc) - * - * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) - */ - @Override - public void actionPerformed(final ActionEvent event) { - getController().doBack(); - } - - } - - /** - * - * TODO - * - * - * - * - * - * - */ - private class CancelActionListener implements ActionListener { - /* - * (non-Javadoc) - * - * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) - */ - @Override - public void actionPerformed(final ActionEvent event) { - getController().doCancel(); - } - } - - /** - * - * TODO - * - * - * - * - * - * - */ - private class NextActionListener implements ActionListener { - /* - * (non-Javadoc) - * - * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) - */ - @Override - public void actionPerformed(final ActionEvent event) { - getController().doNext(); - } - - } - - private final JButton backButton; - private final JButton nextButton; - private final JButton cancelButton; - - /** - * - * The default constructor for WizardView. - * - * @param core - * @param controller - * @param model - */ - public WizardView(final AppletCore core, final C controller, final M model) { - super(core, controller, model); - - backButton = ComponentFactory.createBackButton(false, new BackActionListener()); - backButton.setName("back"); - nextButton = ComponentFactory.createNextButton(false, new NextActionListener()); - nextButton.setName("next"); - cancelButton = ComponentFactory.createCancelButton(true, new CancelActionListener()); - cancelButton.setName("cancel"); - } - - private JPanel doActionLayout() { - if (getController().hasNext()) { - return ComponentFactory.actionPanel(backButton, nextButton, cancelButton); - } else { - return ComponentFactory.actionPanel(backButton, cancelButton); - } - - } - - private JPanel doStepLayout() { - final int currentStep = getController().getStepNumber(); - final int maxStep = getController().getStepTotals(); - return ComponentFactory.createWizardStepPanel(currentStep, maxStep); - - } - - private void doWizardInit() { - final boolean backEnabled = getController().hasBack(); - final boolean nextEnabled = getController().hasNext() && getController().isValid(); - backButton.setEnabled(backEnabled); - nextButton.setEnabled(nextEnabled); - - if (getController().isLast()) { - nextButton.setText(ResourceUtils.getI18n("FINISH")); - } else { - nextButton.setText(ResourceUtils.getI18n("NEXT")); - } - } - - /* - * (non-Javadoc) - * - * @see eu.europa.ec.markt.dss.applet.view.DSSAppletView#layout() - */ - @Override - protected Container layout() { - - doWizardInit(); - - final JPanel panel = ComponentFactory.createPanel(new BorderLayout()); - - panel.add(doStepLayout(), BorderLayout.NORTH); - panel.add(super.layout(), BorderLayout.CENTER); - panel.add(doActionLayout(), BorderLayout.SOUTH); - - return panel; - } - - /* - * (non-Javadoc) - * - * @see eu.europa.ec.markt.dss.applet.view.DSSAppletView#modelChange(java.beans.PropertyChangeEvent) - */ - @Override - public void modelChanged(final PropertyChangeEvent evt) { - - final boolean enabled = getController().hasNext() && getController().isValid(); - - this.nextButton.setEnabled(enabled); - - wizardModelChange(evt); - } - - public void wizardModelChange(final PropertyChangeEvent evt) { - }; - -} diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/common/JavaPreferencesDAO.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/JavaPreferencesDAO.java similarity index 98% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/common/JavaPreferencesDAO.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/JavaPreferencesDAO.java index 3783bf94c7..e1e61fa524 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/common/JavaPreferencesDAO.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/JavaPreferencesDAO.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.common; +package eu.europa.esig.dss.applet; import java.util.prefs.Preferences; diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/common/PinInputDialog.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/PinInputDialog.java similarity index 98% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/common/PinInputDialog.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/PinInputDialog.java index 810f853116..c0bf65f831 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/common/PinInputDialog.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/PinInputDialog.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.common; +package eu.europa.esig.dss.applet; import java.awt.BorderLayout; import java.awt.Component; @@ -38,7 +38,7 @@ import javax.swing.JPanel; import javax.swing.JPasswordField; -import eu.europa.ec.markt.dss.signature.token.PasswordInputCallback; +import eu.europa.esig.dss.token.PasswordInputCallback; /** * Holds the implementation of some eID related dialogs. diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/common/SignatureTokenType.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/SignatureTokenType.java similarity index 96% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/common/SignatureTokenType.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/SignatureTokenType.java index d6e3ed150c..af057473c7 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/common/SignatureTokenType.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/SignatureTokenType.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.common; +package eu.europa.esig.dss.applet; /** * Type of API supported by the application diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/common/UserPreferencesDAO.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/UserPreferencesDAO.java similarity index 97% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/common/UserPreferencesDAO.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/UserPreferencesDAO.java index ad4d435039..e339bbde71 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/common/UserPreferencesDAO.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/UserPreferencesDAO.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.common; +package eu.europa.esig.dss.applet; /** * Abstraction used to retrieve preferences from user. diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/component/model/AbstractComboBoxModel.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/component/model/AbstractComboBoxModel.java similarity index 97% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/component/model/AbstractComboBoxModel.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/component/model/AbstractComboBoxModel.java index 6d0e9dd9c9..cd8a19dd32 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/component/model/AbstractComboBoxModel.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/component/model/AbstractComboBoxModel.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.component.model; +package eu.europa.esig.dss.applet.component.model; import java.util.ArrayList; import java.util.List; diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/component/model/AbstractTreeModel.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/component/model/AbstractTreeModel.java similarity index 98% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/component/model/AbstractTreeModel.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/component/model/AbstractTreeModel.java index 363e0c7e40..b862e75a44 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/component/model/AbstractTreeModel.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/component/model/AbstractTreeModel.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.component.model; +package eu.europa.esig.dss.applet.component.model; import java.util.ArrayList; import java.util.List; diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/component/model/CertificateListCellRenderer.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/component/model/CertificateListCellRenderer.java similarity index 91% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/component/model/CertificateListCellRenderer.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/component/model/CertificateListCellRenderer.java index f31c5f0548..ed0bf0bc96 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/component/model/CertificateListCellRenderer.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/component/model/CertificateListCellRenderer.java @@ -18,15 +18,15 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.component.model; +package eu.europa.esig.dss.applet.component.model; import java.awt.Component; import javax.swing.DefaultListCellRenderer; import javax.swing.JList; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.x509.CertificateToken; /** * diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/component/model/GenericListModel.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/component/model/GenericListModel.java similarity index 97% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/component/model/GenericListModel.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/component/model/GenericListModel.java index 84ca970fcd..9c79408b90 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/component/model/GenericListModel.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/component/model/GenericListModel.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.component.model; +package eu.europa.esig.dss.applet.component.model; import java.util.List; diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/component/model/TitledNode.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/component/model/TitledNode.java similarity index 97% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/component/model/TitledNode.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/component/model/TitledNode.java index 5652865583..6dc67360f4 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/component/model/TitledNode.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/component/model/TitledNode.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.component.model; +package eu.europa.esig.dss.applet.component.model; /** * diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/component/model/XMLTreeModel.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/component/model/XMLTreeModel.java similarity index 98% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/component/model/XMLTreeModel.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/component/model/XMLTreeModel.java index 3081943522..342ab5a454 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/component/model/XMLTreeModel.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/component/model/XMLTreeModel.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.component.model; +package eu.europa.esig.dss.applet.component.model; import java.util.Vector; diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/component/model/XmlDomAdapterNode.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/component/model/XmlDomAdapterNode.java similarity index 98% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/component/model/XmlDomAdapterNode.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/component/model/XmlDomAdapterNode.java index 580ac016b7..9c0a853ede 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/component/model/XmlDomAdapterNode.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/component/model/XmlDomAdapterNode.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.component.model; +package eu.europa.esig.dss.applet.component.model; import org.w3c.dom.Node; diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/component/model/XmlDomTreeModelAdapter.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/component/model/XmlDomTreeModelAdapter.java similarity index 99% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/component/model/XmlDomTreeModelAdapter.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/component/model/XmlDomTreeModelAdapter.java index c20ee6035f..d8046587d7 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/component/model/XmlDomTreeModelAdapter.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/component/model/XmlDomTreeModelAdapter.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.component.model; +package eu.europa.esig.dss.applet.component.model; import java.math.BigInteger; import java.net.URL; diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/component/model/XsdNode.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/component/model/XsdNode.java similarity index 97% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/component/model/XsdNode.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/component/model/XsdNode.java index 0b6d0efad5..e9cf6a84a2 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/component/model/XsdNode.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/component/model/XsdNode.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.component.model; +package eu.europa.esig.dss.applet.component.model; public class XsdNode { private final String name; diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/component/model/XsdNodeCardinality.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/component/model/XsdNodeCardinality.java similarity index 95% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/component/model/XsdNodeCardinality.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/component/model/XsdNodeCardinality.java index fdca1daa25..2067497ce1 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/component/model/XsdNodeCardinality.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/component/model/XsdNodeCardinality.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.component.model; +package eu.europa.esig.dss.applet.component.model; public enum XsdNodeCardinality { ONCE_EXACTLY, ONCE_OPTIONALY, ONCE_AT_LEAST, ZERO_OR_MORE diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/component/model/XsdNodeType.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/component/model/XsdNodeType.java similarity index 94% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/component/model/XsdNodeType.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/component/model/XsdNodeType.java index 54a8484822..764d729ae1 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/component/model/XsdNodeType.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/component/model/XsdNodeType.java @@ -18,6 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.component.model; +package eu.europa.esig.dss.applet.component.model; public enum XsdNodeType {ATTRIBUTE, ELEMENT, TEXT}; diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/component/model/validation/ValidationPolicyTreeModel.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/component/model/validation/ValidationPolicyTreeModel.java similarity index 92% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/component/model/validation/ValidationPolicyTreeModel.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/component/model/validation/ValidationPolicyTreeModel.java index bf1911ec92..66ceaca470 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/component/model/validation/ValidationPolicyTreeModel.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/component/model/validation/ValidationPolicyTreeModel.java @@ -18,14 +18,14 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.component.model.validation; +package eu.europa.esig.dss.applet.component.model.validation; import javax.swing.event.TreeModelEvent; import javax.swing.event.TreeModelListener; import javax.swing.tree.TreePath; -import eu.europa.ec.markt.dss.applet.component.model.XmlDomTreeModelAdapter; -import eu.europa.ec.markt.dss.validation102853.engine.rules.wrapper.constraint.ValidationPolicy; +import eu.europa.esig.dss.applet.component.model.XmlDomTreeModelAdapter; +import eu.europa.esig.dss.validation.model.ValidationPolicy; /** * Build the tree model of the validation policy diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/component/model/validation/XMLTreeCellRenderer.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/component/model/validation/XMLTreeCellRenderer.java similarity index 94% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/component/model/validation/XMLTreeCellRenderer.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/component/model/validation/XMLTreeCellRenderer.java index 9ea7eef907..592f3d3e10 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/component/model/validation/XMLTreeCellRenderer.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/component/model/validation/XMLTreeCellRenderer.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.component.model.validation; +package eu.europa.esig.dss.applet.component.model.validation; import java.awt.Color; import java.awt.Component; @@ -26,7 +26,7 @@ import javax.swing.JTree; import javax.swing.tree.DefaultTreeCellRenderer; -import eu.europa.ec.markt.dss.applet.component.model.XmlDomAdapterNode; +import eu.europa.esig.dss.applet.component.model.XmlDomAdapterNode; /** * Created by kaczmani on 10/04/2014. diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/controller/ActivityController.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/controller/ActivityController.java similarity index 78% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/controller/ActivityController.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/controller/ActivityController.java index 23533de83a..c8b48451de 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/controller/ActivityController.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/controller/ActivityController.java @@ -18,15 +18,15 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.controller; +package eu.europa.esig.dss.applet.controller; -import eu.europa.ec.markt.dss.applet.main.DSSAppletCore; -import eu.europa.ec.markt.dss.applet.model.ActivityModel; -import eu.europa.ec.markt.dss.applet.view.ActivityView; -import eu.europa.ec.markt.dss.applet.wizard.extension.ExtensionWizardController; -import eu.europa.ec.markt.dss.applet.wizard.signature.SignatureWizardController; -import eu.europa.ec.markt.dss.applet.wizard.validation.ValidationWizardController; -import eu.europa.ec.markt.dss.applet.wizard.validationpolicy.ValidationPolicyWizardController; +import eu.europa.esig.dss.applet.main.DSSAppletCore; +import eu.europa.esig.dss.applet.model.ActivityModel; +import eu.europa.esig.dss.applet.view.ActivityView; +import eu.europa.esig.dss.applet.wizard.extension.ExtensionWizardController; +import eu.europa.esig.dss.applet.wizard.signature.SignatureWizardController; +import eu.europa.esig.dss.applet.wizard.validation.ValidationWizardController; +import eu.europa.esig.dss.applet.wizard.validationpolicy.ValidationPolicyWizardController; /** * diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/controller/DSSAppletController.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/controller/DSSAppletController.java similarity index 88% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/controller/DSSAppletController.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/controller/DSSAppletController.java index 6d285afc4f..0df476c83e 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/controller/DSSAppletController.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/controller/DSSAppletController.java @@ -18,15 +18,15 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.controller; +package eu.europa.esig.dss.applet.controller; import java.security.Security; import org.bouncycastle.jce.provider.BouncyCastleProvider; -import eu.europa.ec.markt.dss.applet.main.DSSAppletCore; -import eu.europa.ec.markt.dss.applet.main.Parameters; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.AppletController; +import eu.europa.esig.dss.applet.main.DSSAppletCore; +import eu.europa.esig.dss.applet.main.Parameters; +import eu.europa.esig.dss.applet.swing.mvc.AppletController; /** * TODO diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/controller/DSSWizardController.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/controller/DSSWizardController.java similarity index 87% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/controller/DSSWizardController.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/controller/DSSWizardController.java index 208bc7245c..7a49a77b4f 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/controller/DSSWizardController.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/controller/DSSWizardController.java @@ -18,12 +18,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.controller; +package eu.europa.esig.dss.applet.controller; import com.jgoodies.binding.beans.Model; -import eu.europa.ec.markt.dss.applet.main.DSSAppletCore; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardController; +import eu.europa.esig.dss.applet.main.DSSAppletCore; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardController; /** * diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/converter/DSSTreeCellConverter.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/converter/DSSTreeCellConverter.java similarity index 90% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/converter/DSSTreeCellConverter.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/converter/DSSTreeCellConverter.java index e995b9d135..b0da0e6b0a 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/converter/DSSTreeCellConverter.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/converter/DSSTreeCellConverter.java @@ -18,10 +18,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.converter; +package eu.europa.esig.dss.applet.converter; -import eu.europa.ec.markt.dss.commons.swing.converter.TreeCellConverter; +import eu.europa.esig.dss.applet.swing.converter.TreeCellConverter; /** * TODO diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/converter/KeyUsageConditionConverter.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/converter/KeyUsageConditionConverter.java similarity index 91% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/converter/KeyUsageConditionConverter.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/converter/KeyUsageConditionConverter.java index 8403620074..d37150ad9f 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/converter/KeyUsageConditionConverter.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/converter/KeyUsageConditionConverter.java @@ -18,12 +18,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.converter; +package eu.europa.esig.dss.applet.converter; import java.util.Arrays; import java.util.List; -import eu.europa.ec.markt.dss.validation102853.condition.KeyUsageCondition; +import eu.europa.esig.dss.tsl.KeyUsageCondition; /** * TODO diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/converter/PolicyIdConditionConverter.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/converter/PolicyIdConditionConverter.java similarity index 91% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/converter/PolicyIdConditionConverter.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/converter/PolicyIdConditionConverter.java index ce4f574d77..af0fdb8b11 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/converter/PolicyIdConditionConverter.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/converter/PolicyIdConditionConverter.java @@ -18,12 +18,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.converter; +package eu.europa.esig.dss.applet.converter; import java.util.Arrays; import java.util.List; -import eu.europa.ec.markt.dss.validation102853.condition.PolicyIdCondition; +import eu.europa.esig.dss.tsl.PolicyIdCondition; /** * s TODO diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/main/DSSAppletCore.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/main/DSSAppletCore.java similarity index 86% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/main/DSSAppletCore.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/main/DSSAppletCore.java index 0d799b8a81..8a663cde75 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/main/DSSAppletCore.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/main/DSSAppletCore.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.main; +package eu.europa.esig.dss.applet.main; import java.io.File; import java.io.IOException; @@ -27,21 +27,21 @@ import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang.StringUtils; -import eu.europa.ec.markt.dss.applet.controller.ActivityController; -import eu.europa.ec.markt.dss.applet.main.Parameters.AppletUsage; -import eu.europa.ec.markt.dss.applet.model.ActivityModel; -import eu.europa.ec.markt.dss.applet.model.ExtendSignatureModel; -import eu.europa.ec.markt.dss.applet.model.SignatureModel; -import eu.europa.ec.markt.dss.applet.model.ValidationModel; -import eu.europa.ec.markt.dss.applet.model.ValidationPolicyModel; -import eu.europa.ec.markt.dss.applet.util.DSSStringUtils; -import eu.europa.ec.markt.dss.applet.wizard.extension.ExtensionWizardController; -import eu.europa.ec.markt.dss.applet.wizard.signature.SignatureWizardController; -import eu.europa.ec.markt.dss.applet.wizard.validation.ValidationWizardController; -import eu.europa.ec.markt.dss.applet.wizard.validationpolicy.ValidationPolicyWizardController; -import eu.europa.ec.markt.dss.common.SignatureTokenType; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.AppletCore; -import eu.europa.ec.markt.dss.ws.signature.SignaturePackaging; +import eu.europa.esig.dss.applet.SignatureTokenType; +import eu.europa.esig.dss.applet.controller.ActivityController; +import eu.europa.esig.dss.applet.main.Parameters.AppletUsage; +import eu.europa.esig.dss.applet.model.ActivityModel; +import eu.europa.esig.dss.applet.model.ExtendSignatureModel; +import eu.europa.esig.dss.applet.model.SignatureModel; +import eu.europa.esig.dss.applet.model.ValidationModel; +import eu.europa.esig.dss.applet.model.ValidationPolicyModel; +import eu.europa.esig.dss.applet.swing.mvc.AppletCore; +import eu.europa.esig.dss.applet.util.DSSStringUtils; +import eu.europa.esig.dss.applet.wizard.extension.ExtensionWizardController; +import eu.europa.esig.dss.applet.wizard.signature.SignatureWizardController; +import eu.europa.esig.dss.applet.wizard.validation.ValidationWizardController; +import eu.europa.esig.dss.applet.wizard.validationpolicy.ValidationPolicyWizardController; +import eu.europa.esig.dss.wsclient.signature.SignaturePackaging; /** * TODO diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/main/FileType.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/main/FileType.java similarity index 96% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/main/FileType.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/main/FileType.java index 514d9a77d9..eb2eea703f 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/main/FileType.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/main/FileType.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.main; +package eu.europa.esig.dss.applet.main; /** * Filetype supported by the application. diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/main/Parameters.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/main/Parameters.java similarity index 94% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/main/Parameters.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/main/Parameters.java index ef71ac62ac..e71492d2aa 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/main/Parameters.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/main/Parameters.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.main; +package eu.europa.esig.dss.applet.main; import java.io.File; import java.net.URL; @@ -26,12 +26,12 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.builder.ReflectionToStringBuilder; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.common.JavaPreferencesDAO; -import eu.europa.ec.markt.dss.common.SignatureTokenType; -import eu.europa.ec.markt.dss.common.UserPreferencesDAO; -import eu.europa.ec.markt.dss.validation102853.ValidationResourceManager; -import eu.europa.ec.markt.dss.ws.signature.SignaturePackaging; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.applet.JavaPreferencesDAO; +import eu.europa.esig.dss.applet.SignatureTokenType; +import eu.europa.esig.dss.applet.UserPreferencesDAO; +import eu.europa.esig.dss.validation.ValidationResourceManager; +import eu.europa.esig.dss.wsclient.signature.SignaturePackaging; /** * diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/model/ActivityModel.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/model/ActivityModel.java similarity index 97% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/model/ActivityModel.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/model/ActivityModel.java index e1229a4318..351ff908c2 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/model/ActivityModel.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/model/ActivityModel.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.model; +package eu.europa.esig.dss.applet.model; import com.jgoodies.binding.beans.Model; diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/model/ExtendSignatureModel.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/model/ExtendSignatureModel.java similarity index 94% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/model/ExtendSignatureModel.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/model/ExtendSignatureModel.java index 49a2aeb098..56d27b4abb 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/model/ExtendSignatureModel.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/model/ExtendSignatureModel.java @@ -18,15 +18,15 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.model; +package eu.europa.esig.dss.applet.model; import java.io.File; import com.jgoodies.binding.beans.Model; -import eu.europa.ec.markt.dss.applet.main.FileType; -import eu.europa.ec.markt.dss.applet.util.FileTypeDetectorUtils; -import eu.europa.ec.markt.dss.ws.signature.SignaturePackaging; +import eu.europa.esig.dss.applet.main.FileType; +import eu.europa.esig.dss.applet.util.FileTypeDetectorUtils; +import eu.europa.esig.dss.wsclient.signature.SignaturePackaging; /** * diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/model/FormatType.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/model/FormatType.java similarity index 96% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/model/FormatType.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/model/FormatType.java index cb2ab0ecad..0f4d8290c8 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/model/FormatType.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/model/FormatType.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.model; +package eu.europa.esig.dss.applet.model; public interface FormatType { public static final String CADES = "CAdES"; diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/model/SignatureModel.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/model/SignatureModel.java similarity index 96% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/model/SignatureModel.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/model/SignatureModel.java index b5aa5b4154..228857d982 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/model/SignatureModel.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/model/SignatureModel.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.model; +package eu.europa.esig.dss.applet.model; import java.io.File; import java.util.Collections; @@ -28,13 +28,13 @@ import com.jgoodies.binding.beans.Model; -import eu.europa.ec.markt.dss.applet.main.FileType; -import eu.europa.ec.markt.dss.applet.util.FileTypeDetectorUtils; -import eu.europa.ec.markt.dss.common.SignatureTokenType; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.signature.token.SignatureTokenConnection; -import eu.europa.ec.markt.dss.ws.signature.DigestAlgorithm; -import eu.europa.ec.markt.dss.ws.signature.SignaturePackaging; +import eu.europa.esig.dss.applet.SignatureTokenType; +import eu.europa.esig.dss.applet.main.FileType; +import eu.europa.esig.dss.applet.util.FileTypeDetectorUtils; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.token.SignatureTokenConnection; +import eu.europa.esig.dss.wsclient.signature.DigestAlgorithm; +import eu.europa.esig.dss.wsclient.signature.SignaturePackaging; /** * diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/model/ValidationModel.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/model/ValidationModel.java similarity index 98% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/model/ValidationModel.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/model/ValidationModel.java index 7a0c294096..63a2fe69c2 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/model/ValidationModel.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/model/ValidationModel.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.model; +package eu.europa.esig.dss.applet.model; import java.io.File; @@ -26,7 +26,7 @@ import com.jgoodies.binding.beans.Model; -import eu.europa.ec.markt.dss.validation102853.xml.XmlDom; +import eu.europa.esig.dss.XmlDom; /** * TODO diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/model/ValidationPolicyModel.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/model/ValidationPolicyModel.java similarity index 95% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/model/ValidationPolicyModel.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/model/ValidationPolicyModel.java index 4e844d9452..3b61a441db 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/model/ValidationPolicyModel.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/model/ValidationPolicyModel.java @@ -18,13 +18,13 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.model; +package eu.europa.esig.dss.applet.model; import java.io.File; import com.jgoodies.binding.beans.Model; -import eu.europa.ec.markt.dss.validation102853.engine.rules.wrapper.constraint.ValidationPolicy; +import eu.europa.esig.dss.validation.model.ValidationPolicy; /** * diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/commons/swing/converter/TreeCellConverter.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/swing/converter/TreeCellConverter.java similarity index 95% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/commons/swing/converter/TreeCellConverter.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/swing/converter/TreeCellConverter.java index 1f2d4b1c69..48a34e1c78 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/commons/swing/converter/TreeCellConverter.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/swing/converter/TreeCellConverter.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.commons.swing.converter; +package eu.europa.esig.dss.applet.swing.converter; import java.util.List; diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/commons/swing/mvc/applet/AppletController.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/swing/mvc/AppletController.java similarity index 96% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/commons/swing/mvc/applet/AppletController.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/swing/mvc/AppletController.java index df5c53f61c..b206f8860f 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/commons/swing/mvc/applet/AppletController.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/swing/mvc/AppletController.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.commons.swing.mvc.applet; +package eu.europa.esig.dss.applet.swing.mvc; /** diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/commons/swing/mvc/applet/AppletCore.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/swing/mvc/AppletCore.java similarity index 98% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/commons/swing/mvc/applet/AppletCore.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/swing/mvc/AppletCore.java index 304e077153..7ac8018666 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/commons/swing/mvc/applet/AppletCore.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/swing/mvc/AppletCore.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.commons.swing.mvc.applet; +package eu.europa.esig.dss.applet.swing.mvc; import java.applet.Applet; import java.util.HashMap; diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/commons/swing/mvc/applet/AppletView.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/swing/mvc/AppletView.java similarity index 95% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/commons/swing/mvc/applet/AppletView.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/swing/mvc/AppletView.java index 7f42b27346..d239f8ba7e 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/commons/swing/mvc/applet/AppletView.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/swing/mvc/AppletView.java @@ -18,11 +18,11 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.commons.swing.mvc.applet; +package eu.europa.esig.dss.applet.swing.mvc; import java.awt.Container; -import eu.europa.ec.markt.dss.applet.util.ComponentFactory; +import eu.europa.esig.dss.applet.util.ComponentFactory; /** * TODO diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/commons/swing/mvc/applet/ControllerException.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/swing/mvc/ControllerException.java similarity index 97% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/commons/swing/mvc/applet/ControllerException.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/swing/mvc/ControllerException.java index 8f1f6adcb2..179c95b614 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/commons/swing/mvc/applet/ControllerException.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/swing/mvc/ControllerException.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.commons.swing.mvc.applet; +package eu.europa.esig.dss.applet.swing.mvc; /** * TODO diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/commons/swing/mvc/applet/wizard/WizardController.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/swing/mvc/wizard/WizardController.java similarity index 96% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/commons/swing/mvc/applet/wizard/WizardController.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/swing/mvc/wizard/WizardController.java index 25c2ebf539..f68ddcbbf1 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/commons/swing/mvc/applet/wizard/WizardController.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/swing/mvc/wizard/WizardController.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard; +package eu.europa.esig.dss.applet.swing.mvc.wizard; import java.util.Map; @@ -28,9 +28,9 @@ import com.jgoodies.binding.beans.Model; -import eu.europa.ec.markt.dss.applet.controller.DSSAppletController; -import eu.europa.ec.markt.dss.applet.main.DSSAppletCore; -import eu.europa.ec.markt.dss.applet.view.WaitingGlassPanel; +import eu.europa.esig.dss.applet.controller.DSSAppletController; +import eu.europa.esig.dss.applet.main.DSSAppletCore; +import eu.europa.esig.dss.applet.view.WaitingGlassPanel; /** * diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/commons/swing/mvc/applet/wizard/WizardStep.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/swing/mvc/wizard/WizardStep.java similarity index 95% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/commons/swing/mvc/applet/wizard/WizardStep.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/swing/mvc/wizard/WizardStep.java index 4f9e97cc01..61e00bf906 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/commons/swing/mvc/applet/wizard/WizardStep.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/swing/mvc/wizard/WizardStep.java @@ -18,13 +18,13 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard; +package eu.europa.esig.dss.applet.swing.mvc.wizard; import org.apache.commons.lang.builder.ReflectionToStringBuilder; import com.jgoodies.binding.beans.Model; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.ControllerException; +import eu.europa.esig.dss.applet.swing.mvc.ControllerException; /** * diff --git a/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/swing/mvc/wizard/WizardView.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/swing/mvc/wizard/WizardView.java new file mode 100644 index 0000000000..d84b2f273c --- /dev/null +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/swing/mvc/wizard/WizardView.java @@ -0,0 +1,211 @@ +/** + * DSS - Digital Signature Services + * Copyright (C) 2015 European Commission, provided under the CEF programme + * + * This file is part of the "DSS - Digital Signature Services" project. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +package eu.europa.esig.dss.applet.swing.mvc.wizard; + +import java.awt.BorderLayout; +import java.awt.Container; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.beans.PropertyChangeEvent; + +import javax.swing.JButton; +import javax.swing.JPanel; + +import com.jgoodies.binding.beans.Model; + +import eu.europa.esig.dss.applet.swing.mvc.AppletCore; +import eu.europa.esig.dss.applet.util.ComponentFactory; +import eu.europa.esig.dss.applet.util.ResourceUtils; +import eu.europa.esig.dss.applet.view.DSSAppletView; + +/** + * + * TODO + * + * + * + * + * + * + * @param + * @param + */ + +public abstract class WizardView> extends DSSAppletView { + + /** + * + * TODO + * + * + * + * + * + * + */ + private class BackActionListener implements ActionListener { + /* + * (non-Javadoc) + * + * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) + */ + @Override + public void actionPerformed(final ActionEvent event) { + getController().doBack(); + } + + } + + /** + * + * TODO + * + * + * + * + * + * + */ + private class CancelActionListener implements ActionListener { + /* + * (non-Javadoc) + * + * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) + */ + @Override + public void actionPerformed(final ActionEvent event) { + getController().doCancel(); + } + } + + /** + * + * TODO + * + * + * + * + * + * + */ + private class NextActionListener implements ActionListener { + /* + * (non-Javadoc) + * + * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) + */ + @Override + public void actionPerformed(final ActionEvent event) { + getController().doNext(); + } + + } + + private final JButton backButton; + private final JButton nextButton; + private final JButton cancelButton; + + /** + * + * The default constructor for WizardView. + * + * @param core + * @param controller + * @param model + */ + public WizardView(final AppletCore core, final C controller, final M model) { + super(core, controller, model); + + backButton = ComponentFactory.createBackButton(false, new BackActionListener()); + backButton.setName("back"); + nextButton = ComponentFactory.createNextButton(false, new NextActionListener()); + nextButton.setName("next"); + cancelButton = ComponentFactory.createCancelButton(true, new CancelActionListener()); + cancelButton.setName("cancel"); + } + + private JPanel doActionLayout() { + if (getController().hasNext()) { + return ComponentFactory.actionPanel(backButton, nextButton, cancelButton); + } else { + return ComponentFactory.actionPanel(backButton, cancelButton); + } + + } + + private JPanel doStepLayout() { + final int currentStep = getController().getStepNumber(); + final int maxStep = getController().getStepTotals(); + return ComponentFactory.createWizardStepPanel(currentStep, maxStep); + + } + + private void doWizardInit() { + final boolean backEnabled = getController().hasBack(); + final boolean nextEnabled = getController().hasNext() && getController().isValid(); + backButton.setEnabled(backEnabled); + nextButton.setEnabled(nextEnabled); + + if (getController().isLast()) { + nextButton.setText(ResourceUtils.getI18n("FINISH")); + } else { + nextButton.setText(ResourceUtils.getI18n("NEXT")); + } + } + + /* + * (non-Javadoc) + * + * @see eu.europa.esig.dss.applet.view.DSSAppletView#layout() + */ + @Override + protected Container layout() { + + doWizardInit(); + + final JPanel panel = ComponentFactory.createPanel(new BorderLayout()); + + panel.add(doStepLayout(), BorderLayout.NORTH); + panel.add(super.layout(), BorderLayout.CENTER); + panel.add(doActionLayout(), BorderLayout.SOUTH); + + return panel; + } + + /* + * (non-Javadoc) + * + * @see eu.europa.esig.dss.applet.view.DSSAppletView#modelChange(java.beans.PropertyChangeEvent) + */ + @Override + public void modelChanged(final PropertyChangeEvent evt) { + + final boolean enabled = getController().hasNext() && getController().isValid(); + + this.nextButton.setEnabled(enabled); + + wizardModelChange(evt); + } + + public void wizardModelChange(final PropertyChangeEvent evt) { + }; + +} diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/util/ComponentFactory.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/util/ComponentFactory.java similarity index 99% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/util/ComponentFactory.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/util/ComponentFactory.java index c4aafdc8da..73fb49142a 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/util/ComponentFactory.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/util/ComponentFactory.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.util; +package eu.europa.esig.dss.applet.util; import java.awt.Color; import java.awt.Component; diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/util/DSSStringUtils.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/util/DSSStringUtils.java similarity index 96% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/util/DSSStringUtils.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/util/DSSStringUtils.java index 58abe9d927..94d1eef135 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/util/DSSStringUtils.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/util/DSSStringUtils.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.util; +package eu.europa.esig.dss.applet.util; import org.apache.commons.lang.StringUtils; diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/util/FileTypeDetectorUtils.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/util/FileTypeDetectorUtils.java similarity index 97% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/util/FileTypeDetectorUtils.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/util/FileTypeDetectorUtils.java index 2f6d3f2275..1078048167 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/util/FileTypeDetectorUtils.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/util/FileTypeDetectorUtils.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.util; +package eu.europa.esig.dss.applet.util; import java.io.File; import java.io.FileInputStream; @@ -29,7 +29,7 @@ import org.bouncycastle.cms.CMSException; import org.bouncycastle.cms.CMSSignedData; -import eu.europa.ec.markt.dss.applet.main.FileType; +import eu.europa.esig.dss.applet.main.FileType; /** * TODO diff --git a/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/util/MOCCAAdapter.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/util/MOCCAAdapter.java new file mode 100644 index 0000000000..726566668d --- /dev/null +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/util/MOCCAAdapter.java @@ -0,0 +1,64 @@ +/** + * DSS - Digital Signature Services + * Copyright (C) 2015 European Commission, provided under the CEF programme + * + * This file is part of the "DSS - Digital Signature Services" project. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +package eu.europa.esig.dss.applet.util; + +import java.lang.reflect.Constructor; + +import eu.europa.esig.dss.token.PasswordInputCallback; +import eu.europa.esig.dss.token.SignatureTokenConnection; + +/** + * Creates MOCCA Signature Token Connection + * + * + */ + +public class MOCCAAdapter { + + private static final String CONNECTION_CLASS = "eu.europa.esig.dss.token.mocca.MOCCASignatureTokenConnection"; + + private Class getSignatureTokenConnectionClass() { + try { + return Class.forName(CONNECTION_CLASS); + } catch (ClassNotFoundException e) { + return null; + } + } + + public boolean isMOCCAAvailable() { + return getSignatureTokenConnectionClass() != null; + } + + public SignatureTokenConnection createSignatureToken(PasswordInputCallback callback) { + Class clasz = getSignatureTokenConnectionClass(); + if (clasz == null) { + throw new NullPointerException(); + } else { + try { + Constructor c = clasz.getConstructor(PasswordInputCallback.class); + return (SignatureTokenConnection) c.newInstance(callback); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + } + +} diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/util/ResourceUtils.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/util/ResourceUtils.java similarity index 97% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/util/ResourceUtils.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/util/ResourceUtils.java index 6af7d12050..85dba13f58 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/util/ResourceUtils.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/util/ResourceUtils.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.util; +package eu.europa.esig.dss.applet.util; import java.io.IOException; import java.net.URI; diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/util/SigningUtils.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/util/SigningUtils.java similarity index 80% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/util/SigningUtils.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/util/SigningUtils.java index f55c3a859f..679aff8d54 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/util/SigningUtils.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/util/SigningUtils.java @@ -18,25 +18,25 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.util; +package eu.europa.esig.dss.applet.util; import java.io.File; import java.io.IOException; import java.security.NoSuchAlgorithmException; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.signature.InMemoryDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.signature.token.SignatureTokenConnection; -import eu.europa.ec.markt.dss.ws.signature.DigestAlgorithm; -import eu.europa.ec.markt.dss.ws.signature.ObjectFactory; -import eu.europa.ec.markt.dss.ws.signature.SignatureService; -import eu.europa.ec.markt.dss.ws.signature.SignatureService_Service; -import eu.europa.ec.markt.dss.ws.signature.WsDocument; -import eu.europa.ec.markt.dss.ws.signature.WsParameters; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.InMemoryDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.token.SignatureTokenConnection; +import eu.europa.esig.dss.wsclient.signature.DigestAlgorithm; +import eu.europa.esig.dss.wsclient.signature.ObjectFactory; +import eu.europa.esig.dss.wsclient.signature.SignatureService; +import eu.europa.esig.dss.wsclient.signature.SignatureService_Service; +import eu.europa.esig.dss.wsclient.signature.WsDocument; +import eu.europa.esig.dss.wsclient.signature.WsParameters; /** * TODO @@ -104,7 +104,7 @@ public static DSSDocument signDocument(final String serviceURL, final File file, final byte[] toBeSignedBytes = signatureServiceImplPort.getDataToSign(wsDocument, wsParameters); DigestAlgorithm wsDigestAlgo = wsParameters.getDigestAlgorithm(); - final byte[] encrypted = tokenConnection.sign(toBeSignedBytes, eu.europa.ec.markt.dss.DigestAlgorithm.forName(wsDigestAlgo.name()), privateKey); + final byte[] encrypted = tokenConnection.sign(toBeSignedBytes, eu.europa.esig.dss.DigestAlgorithm.forName(wsDigestAlgo.name()), privateKey); final WsDocument wsSignedDocument = signatureServiceImplPort.signDocument(wsDocument, wsParameters, encrypted); @@ -121,7 +121,7 @@ public static WsDocument toWsDocument(final DSSDocument dssDocument) { wsDocument.setName(dssDocument.getName()); wsDocument.setAbsolutePath(dssDocument.getAbsolutePath()); final MimeType mimeType = dssDocument.getMimeType(); - final eu.europa.ec.markt.dss.ws.signature.MimeType wsMimeType = FACTORY.createMimeType(); + final eu.europa.esig.dss.wsclient.signature.MimeType wsMimeType = FACTORY.createMimeType(); final String mimeTypeString = mimeType.getMimeTypeString(); wsMimeType.setMimeTypeString(mimeTypeString); wsDocument.setMimeType(wsMimeType); @@ -135,7 +135,7 @@ public static WsDocument toWsDocument(final File file) { wsDocument.setName(dssDocument.getName()); wsDocument.setAbsolutePath(dssDocument.getAbsolutePath()); final MimeType mimeType = dssDocument.getMimeType(); - final eu.europa.ec.markt.dss.ws.signature.MimeType wsMimeType = FACTORY.createMimeType(); + final eu.europa.esig.dss.wsclient.signature.MimeType wsMimeType = FACTORY.createMimeType(); final String mimeTypeString = mimeType.getMimeTypeString(); wsMimeType.setMimeTypeString(mimeTypeString); wsDocument.setMimeType(wsMimeType); @@ -146,7 +146,7 @@ public static InMemoryDocument toInMemoryDocument(final WsDocument wsSignedDocum final InMemoryDocument inMemoryDocument = new InMemoryDocument(wsSignedDocument.getBytes()); inMemoryDocument.setName(wsSignedDocument.getName()); inMemoryDocument.setAbsolutePath(wsSignedDocument.getAbsolutePath()); - final eu.europa.ec.markt.dss.ws.signature.MimeType wsMimeType = wsSignedDocument.getMimeType(); + final eu.europa.esig.dss.wsclient.signature.MimeType wsMimeType = wsSignedDocument.getMimeType(); final MimeType mimeType = MimeType.fromMimeTypeString(wsMimeType.getMimeTypeString()); inMemoryDocument.setMimeType(mimeType); return inMemoryDocument; diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/util/SimpleReportConverter.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/util/SimpleReportConverter.java similarity index 96% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/util/SimpleReportConverter.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/util/SimpleReportConverter.java index 975309aa48..a29d502ea8 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/util/SimpleReportConverter.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/util/SimpleReportConverter.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.util; +package eu.europa.esig.dss.applet.util; import java.io.InputStream; diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/util/ValidationPolicyDao.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/util/ValidationPolicyDao.java similarity index 93% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/util/ValidationPolicyDao.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/util/ValidationPolicyDao.java index 348a39e38f..5ff059e36d 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/util/ValidationPolicyDao.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/util/ValidationPolicyDao.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.util; +package eu.europa.esig.dss.applet.util; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -47,10 +47,10 @@ import org.w3c.dom.NodeList; import org.xml.sax.InputSource; -import eu.europa.ec.markt.dss.DSSXMLUtils; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.validation102853.engine.rules.wrapper.constraint.ValidationPolicy; -import eu.europa.ec.markt.dss.validation102853.xml.XmlDom; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSXMLUtils; +import eu.europa.esig.dss.XmlDom; +import eu.europa.esig.dss.validation.model.ValidationPolicy; /** * diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/util/ValidationReportConverter.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/util/ValidationReportConverter.java similarity index 96% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/util/ValidationReportConverter.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/util/ValidationReportConverter.java index d14ac55fdf..78ac4edda4 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/util/ValidationReportConverter.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/util/ValidationReportConverter.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.util; +package eu.europa.esig.dss.applet.util; import java.io.InputStream; diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/util/XsltConverter.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/util/XsltConverter.java similarity index 95% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/util/XsltConverter.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/util/XsltConverter.java index 99cb1fe662..d5a9e3f416 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/util/XsltConverter.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/util/XsltConverter.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.util; +package eu.europa.esig.dss.applet.util; import java.io.InputStream; @@ -31,7 +31,7 @@ import org.w3c.dom.Document; -import eu.europa.ec.markt.dss.validation102853.xml.XmlDom; +import eu.europa.esig.dss.XmlDom; /** * TODO diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/ActivityView.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/ActivityView.java similarity index 90% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/ActivityView.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/ActivityView.java index dca00951fc..08dc76be42 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/ActivityView.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/ActivityView.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.view; +package eu.europa.esig.dss.applet.view; import java.awt.BorderLayout; import java.awt.Container; @@ -36,13 +36,13 @@ import com.jgoodies.forms.builder.PanelBuilder; import com.jgoodies.forms.layout.CellConstraints; -import eu.europa.ec.markt.dss.applet.controller.ActivityController; -import eu.europa.ec.markt.dss.applet.main.Parameters.AppletUsage; -import eu.europa.ec.markt.dss.applet.model.ActivityModel; -import eu.europa.ec.markt.dss.applet.model.ActivityModel.ActivityAction; -import eu.europa.ec.markt.dss.applet.util.ComponentFactory; -import eu.europa.ec.markt.dss.applet.util.ResourceUtils; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.AppletCore; +import eu.europa.esig.dss.applet.controller.ActivityController; +import eu.europa.esig.dss.applet.main.Parameters.AppletUsage; +import eu.europa.esig.dss.applet.model.ActivityModel; +import eu.europa.esig.dss.applet.model.ActivityModel.ActivityAction; +import eu.europa.esig.dss.applet.swing.mvc.AppletCore; +import eu.europa.esig.dss.applet.util.ComponentFactory; +import eu.europa.esig.dss.applet.util.ResourceUtils; /** * @@ -156,7 +156,7 @@ public ActivityView(final AppletCore core, final ActivityController controller, /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.applet.view.DSSAppletView#doLayout() + * @see eu.europa.esig.dss.applet.view.DSSAppletView#doLayout() */ @Override protected Container doLayout() { diff --git a/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/DSSAppletView.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/DSSAppletView.java new file mode 100644 index 0000000000..a2c65a1968 --- /dev/null +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/DSSAppletView.java @@ -0,0 +1,93 @@ +/** + * DSS - Digital Signature Services + * Copyright (C) 2015 European Commission, provided under the CEF programme + * + * This file is part of the "DSS - Digital Signature Services" project. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +package eu.europa.esig.dss.applet.view; + +import java.awt.Container; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; + +import com.jgoodies.binding.beans.BeanAdapter; + +import eu.europa.esig.dss.applet.controller.DSSAppletController; +import eu.europa.esig.dss.applet.swing.mvc.AppletCore; +import eu.europa.esig.dss.applet.swing.mvc.AppletView; + +/** + * + * TODO + * + * + * + * + * + * + * @param + * @param + */ +public abstract class DSSAppletView> extends AppletView implements PropertyChangeListener { + /** + * + * The default constructor for DSSAppletView. + * + * @param core + * @param controller + * @param model + */ + public DSSAppletView(final AppletCore core, final C controller, final M model) { + super(core, controller, model); + final BeanAdapter beanAdapter = new BeanAdapter(model); + beanAdapter.addBeanPropertyChangeListener(this); + } + + public void doInit() { + } + + protected abstract Container doLayout(); + + /* + * (non-Javadoc) + * + * @see eu.europa.esig.dss.applet.swing.mvc.AppletView#layout() + */ + @Override + protected Container layout() { + doInit(); + return doLayout(); + } + + /** + * + * @param evt + */ + public void modelChanged(final PropertyChangeEvent evt) { + }; + + /* + * (non-Javadoc) + * + * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent) + */ + @Override + public void propertyChange(final PropertyChangeEvent evt) { + modelChanged(evt); + } + +} diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/WaitingGlassPanel.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/WaitingGlassPanel.java similarity index 92% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/WaitingGlassPanel.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/WaitingGlassPanel.java index ca587fa9c0..c7c1b380f7 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/WaitingGlassPanel.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/WaitingGlassPanel.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.view; +package eu.europa.esig.dss.applet.view; import java.awt.Cursor; import java.awt.Graphics; @@ -28,8 +28,8 @@ import javax.swing.JLabel; import javax.swing.JPanel; -import eu.europa.ec.markt.dss.applet.util.ComponentFactory; -import eu.europa.ec.markt.dss.applet.util.ResourceUtils; +import eu.europa.esig.dss.applet.util.ComponentFactory; +import eu.europa.esig.dss.applet.util.ResourceUtils; /** * diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/extension/FileView.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/extension/FileView.java similarity index 90% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/extension/FileView.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/extension/FileView.java index bc6652c499..f74e77517d 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/extension/FileView.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/extension/FileView.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.view.extension; +package eu.europa.esig.dss.applet.view.extension; import java.awt.Container; import java.awt.event.ActionEvent; @@ -34,12 +34,12 @@ import com.jgoodies.forms.layout.CellConstraints; import com.jgoodies.forms.layout.FormLayout; -import eu.europa.ec.markt.dss.applet.model.ExtendSignatureModel; -import eu.europa.ec.markt.dss.applet.util.ComponentFactory; -import eu.europa.ec.markt.dss.applet.util.ResourceUtils; -import eu.europa.ec.markt.dss.applet.wizard.extension.ExtensionWizardController; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.AppletCore; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardView; +import eu.europa.esig.dss.applet.model.ExtendSignatureModel; +import eu.europa.esig.dss.applet.swing.mvc.AppletCore; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardView; +import eu.europa.esig.dss.applet.util.ComponentFactory; +import eu.europa.esig.dss.applet.util.ResourceUtils; +import eu.europa.esig.dss.applet.wizard.extension.ExtensionWizardController; /** * @@ -166,7 +166,7 @@ public FileView(final AppletCore core, final ExtensionWizardController controlle /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.applet.view.DSSAppletView#doLayout() + * @see eu.europa.esig.dss.applet.view.DSSAppletView#doLayout() */ @Override protected Container doLayout() { @@ -190,7 +190,7 @@ protected Container doLayout() { * (non-Javadoc) * * @see - * eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardView#wizardModelChange(java.beans.PropertyChangeEvent + * eu.europa.esig.dss.applet.swing.mvc.wizard.WizardView#wizardModelChange(java.beans.PropertyChangeEvent * ) */ @Override diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/extension/FinishView.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/extension/FinishView.java similarity index 77% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/extension/FinishView.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/extension/FinishView.java index 58ea976ec2..c043827069 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/extension/FinishView.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/extension/FinishView.java @@ -18,19 +18,19 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.view.extension; +package eu.europa.esig.dss.applet.view.extension; import java.awt.Container; import javax.swing.JLabel; import javax.swing.JPanel; -import eu.europa.ec.markt.dss.applet.model.ExtendSignatureModel; -import eu.europa.ec.markt.dss.applet.util.ComponentFactory; -import eu.europa.ec.markt.dss.applet.util.ResourceUtils; -import eu.europa.ec.markt.dss.applet.wizard.extension.ExtensionWizardController; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.AppletCore; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardView; +import eu.europa.esig.dss.applet.model.ExtendSignatureModel; +import eu.europa.esig.dss.applet.swing.mvc.AppletCore; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardView; +import eu.europa.esig.dss.applet.util.ComponentFactory; +import eu.europa.esig.dss.applet.util.ResourceUtils; +import eu.europa.esig.dss.applet.wizard.extension.ExtensionWizardController; /** * @@ -62,7 +62,7 @@ public FinishView(final AppletCore core, final ExtensionWizardController control /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.applet.view.DSSAppletView#doLayout() + * @see eu.europa.esig.dss.applet.view.DSSAppletView#doLayout() */ @Override protected Container doLayout() { diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/extension/SaveView.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/extension/SaveView.java similarity index 86% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/extension/SaveView.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/extension/SaveView.java index 6720826666..06aa53977a 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/extension/SaveView.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/extension/SaveView.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.view.extension; +package eu.europa.esig.dss.applet.view.extension; import java.awt.Container; import java.awt.event.ActionEvent; @@ -34,12 +34,12 @@ import com.jgoodies.forms.layout.CellConstraints; import com.jgoodies.forms.layout.FormLayout; -import eu.europa.ec.markt.dss.applet.model.ExtendSignatureModel; -import eu.europa.ec.markt.dss.applet.util.ComponentFactory; -import eu.europa.ec.markt.dss.applet.util.ResourceUtils; -import eu.europa.ec.markt.dss.applet.wizard.extension.ExtensionWizardController; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.AppletCore; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardView; +import eu.europa.esig.dss.applet.model.ExtendSignatureModel; +import eu.europa.esig.dss.applet.swing.mvc.AppletCore; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardView; +import eu.europa.esig.dss.applet.util.ComponentFactory; +import eu.europa.esig.dss.applet.util.ResourceUtils; +import eu.europa.esig.dss.applet.wizard.extension.ExtensionWizardController; /** * @@ -108,7 +108,7 @@ public SaveView(final AppletCore core, final ExtensionWizardController controlle /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.applet.view.DSSAppletView#doInit() + * @see eu.europa.esig.dss.applet.view.DSSAppletView#doInit() */ @Override public void doInit() { @@ -119,7 +119,7 @@ public void doInit() { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.applet.view.DSSAppletView#doLayout() + * @see eu.europa.esig.dss.applet.view.DSSAppletView#doLayout() */ @Override protected Container doLayout() { @@ -136,7 +136,7 @@ protected Container doLayout() { * (non-Javadoc) * * @see - * eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardView#wizardModelChange(java.beans.PropertyChangeEvent + * eu.europa.esig.dss.applet.swing.mvc.wizard.WizardView#wizardModelChange(java.beans.PropertyChangeEvent * ) */ @Override diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/extension/SignatureView.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/extension/SignatureView.java similarity index 90% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/extension/SignatureView.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/extension/SignatureView.java index 3dd6dcfb5a..8d7f966a0f 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/extension/SignatureView.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/extension/SignatureView.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.view.extension; +package eu.europa.esig.dss.applet.view.extension; import java.awt.Container; import java.beans.PropertyChangeEvent; @@ -38,17 +38,17 @@ import com.jgoodies.forms.layout.CellConstraints; import com.jgoodies.forms.layout.FormLayout; -import eu.europa.ec.markt.dss.applet.component.model.AbstractComboBoxModel; -import eu.europa.ec.markt.dss.applet.main.FileType; -import eu.europa.ec.markt.dss.applet.model.ExtendSignatureModel; -import eu.europa.ec.markt.dss.applet.model.FormatType; -import eu.europa.ec.markt.dss.applet.util.ComponentFactory; -import eu.europa.ec.markt.dss.applet.util.ResourceUtils; -import eu.europa.ec.markt.dss.applet.wizard.extension.ExtensionWizardController; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.AppletCore; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardView; -import eu.europa.ec.markt.dss.ws.signature.SignatureLevel; -import eu.europa.ec.markt.dss.ws.signature.SignaturePackaging; +import eu.europa.esig.dss.applet.component.model.AbstractComboBoxModel; +import eu.europa.esig.dss.applet.main.FileType; +import eu.europa.esig.dss.applet.model.ExtendSignatureModel; +import eu.europa.esig.dss.applet.model.FormatType; +import eu.europa.esig.dss.applet.swing.mvc.AppletCore; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardView; +import eu.europa.esig.dss.applet.util.ComponentFactory; +import eu.europa.esig.dss.applet.util.ResourceUtils; +import eu.europa.esig.dss.applet.wizard.extension.ExtensionWizardController; +import eu.europa.esig.dss.wsclient.signature.SignatureLevel; +import eu.europa.esig.dss.wsclient.signature.SignaturePackaging; /** * TODO @@ -95,7 +95,7 @@ private class LevelComboBoxModel extends AbstractComboBoxModel { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.applet.model.AbstractComboBoxModel#getElements() + * @see eu.europa.esig.dss.applet.component.model.AbstractComboBoxModel#getElements() */ @Override protected List getElements() { @@ -210,7 +210,7 @@ private JPanel doFormatLayout() { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.applet.view.DSSAppletView#doInit() + * @see eu.europa.esig.dss.applet.view.DSSAppletView#doInit() */ @Override public void doInit() { @@ -232,7 +232,7 @@ public void doInit() { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.applet.view.DSSAppletView#doInit() + * @see eu.europa.esig.dss.applet.view.DSSAppletView#doInit() */ @Override protected Container doLayout() { @@ -275,7 +275,7 @@ private JPanel doPackagingLayout() { * (non-Javadoc) * * @see - * eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardView#wizardModelChange(java.beans.PropertyChangeEvent + * eu.europa.esig.dss.applet.swing.mvc.wizard.WizardView#wizardModelChange(java.beans.PropertyChangeEvent * ) */ @Override diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/signature/CertificateView.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/signature/CertificateView.java similarity index 85% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/signature/CertificateView.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/signature/CertificateView.java index 320aef8753..ad6df2bd84 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/signature/CertificateView.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/signature/CertificateView.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.view.signature; +package eu.europa.esig.dss.applet.view.signature; import java.awt.Container; import java.awt.event.ActionEvent; @@ -35,14 +35,14 @@ import com.jgoodies.forms.layout.CellConstraints; import com.jgoodies.forms.layout.FormLayout; -import eu.europa.ec.markt.dss.applet.component.model.CertificateListCellRenderer; -import eu.europa.ec.markt.dss.applet.model.SignatureModel; -import eu.europa.ec.markt.dss.applet.util.ComponentFactory; -import eu.europa.ec.markt.dss.applet.util.ResourceUtils; -import eu.europa.ec.markt.dss.applet.wizard.signature.SignatureWizardController; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.AppletCore; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardView; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.applet.component.model.CertificateListCellRenderer; +import eu.europa.esig.dss.applet.model.SignatureModel; +import eu.europa.esig.dss.applet.swing.mvc.AppletCore; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardView; +import eu.europa.esig.dss.applet.util.ComponentFactory; +import eu.europa.esig.dss.applet.util.ResourceUtils; +import eu.europa.esig.dss.applet.wizard.signature.SignatureWizardController; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; /** * @@ -111,7 +111,7 @@ public CertificateView(final AppletCore core, final SignatureWizardController co /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.applet.view.DSSAppletView#doLayout() + * @see eu.europa.esig.dss.applet.view.DSSAppletView#doLayout() */ @Override protected Container doLayout() { @@ -133,7 +133,7 @@ protected Container doLayout() { * (non-Javadoc) * * @see - * eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardView#wizardModelChange(java.beans.PropertyChangeEvent + * eu.europa.esig.dss.applet.swing.mvc.wizard.WizardView#wizardModelChange(java.beans.PropertyChangeEvent * ) */ @Override diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/signature/FileView.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/signature/FileView.java similarity index 86% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/signature/FileView.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/signature/FileView.java index 479b78f10b..ad186ff555 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/signature/FileView.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/signature/FileView.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.view.signature; +package eu.europa.esig.dss.applet.view.signature; import java.awt.Container; import java.awt.event.ActionEvent; @@ -34,12 +34,12 @@ import com.jgoodies.forms.layout.CellConstraints; import com.jgoodies.forms.layout.FormLayout; -import eu.europa.ec.markt.dss.applet.model.SignatureModel; -import eu.europa.ec.markt.dss.applet.util.ComponentFactory; -import eu.europa.ec.markt.dss.applet.util.ResourceUtils; -import eu.europa.ec.markt.dss.applet.wizard.signature.SignatureWizardController; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.AppletCore; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardView; +import eu.europa.esig.dss.applet.model.SignatureModel; +import eu.europa.esig.dss.applet.swing.mvc.AppletCore; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardView; +import eu.europa.esig.dss.applet.util.ComponentFactory; +import eu.europa.esig.dss.applet.util.ResourceUtils; +import eu.europa.esig.dss.applet.wizard.signature.SignatureWizardController; /** * @@ -106,7 +106,7 @@ public FileView(final AppletCore core, final SignatureWizardController controlle /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.applet.view.DSSAppletView#doInit() + * @see eu.europa.esig.dss.applet.view.DSSAppletView#doInit() */ @Override public void doInit() { @@ -117,7 +117,7 @@ public void doInit() { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.applet.view.DSSAppletView#doLayout() + * @see eu.europa.esig.dss.applet.view.DSSAppletView#doLayout() */ @Override protected Container doLayout() { @@ -134,7 +134,7 @@ protected Container doLayout() { * (non-Javadoc) * * @see - * eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardView#wizardModelChange(java.beans.PropertyChangeEvent + * eu.europa.esig.dss.applet.swing.mvc.wizard.WizardView#wizardModelChange(java.beans.PropertyChangeEvent * ) */ @Override diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/signature/FinishView.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/signature/FinishView.java similarity index 76% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/signature/FinishView.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/signature/FinishView.java index 75772d6cf1..281604586d 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/signature/FinishView.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/signature/FinishView.java @@ -18,19 +18,19 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.view.signature; +package eu.europa.esig.dss.applet.view.signature; import java.awt.Container; import javax.swing.JLabel; import javax.swing.JPanel; -import eu.europa.ec.markt.dss.applet.model.SignatureModel; -import eu.europa.ec.markt.dss.applet.util.ComponentFactory; -import eu.europa.ec.markt.dss.applet.util.ResourceUtils; -import eu.europa.ec.markt.dss.applet.wizard.signature.SignatureWizardController; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.AppletCore; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardView; +import eu.europa.esig.dss.applet.model.SignatureModel; +import eu.europa.esig.dss.applet.swing.mvc.AppletCore; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardView; +import eu.europa.esig.dss.applet.util.ComponentFactory; +import eu.europa.esig.dss.applet.util.ResourceUtils; +import eu.europa.esig.dss.applet.wizard.signature.SignatureWizardController; /** * @@ -62,7 +62,7 @@ public FinishView(final AppletCore core, final SignatureWizardController control /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.applet.view.DSSAppletView#doInit() + * @see eu.europa.esig.dss.applet.view.DSSAppletView#doInit() */ @Override public void doInit() { @@ -72,7 +72,7 @@ public void doInit() { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.applet.view.DSSAppletView#doLayout() + * @see eu.europa.esig.dss.applet.view.DSSAppletView#doLayout() */ @Override protected Container doLayout() { diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/signature/PKCS11View.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/signature/PKCS11View.java similarity index 87% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/signature/PKCS11View.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/signature/PKCS11View.java index 1aafba9b8b..8965307a68 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/signature/PKCS11View.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/signature/PKCS11View.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.view.signature; +package eu.europa.esig.dss.applet.view.signature; import java.awt.Container; import java.awt.event.ActionEvent; @@ -37,12 +37,12 @@ import com.jgoodies.forms.layout.CellConstraints; import com.jgoodies.forms.layout.FormLayout; -import eu.europa.ec.markt.dss.applet.model.SignatureModel; -import eu.europa.ec.markt.dss.applet.util.ComponentFactory; -import eu.europa.ec.markt.dss.applet.util.ResourceUtils; -import eu.europa.ec.markt.dss.applet.wizard.signature.SignatureWizardController; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.AppletCore; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardView; +import eu.europa.esig.dss.applet.model.SignatureModel; +import eu.europa.esig.dss.applet.swing.mvc.AppletCore; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardView; +import eu.europa.esig.dss.applet.util.ComponentFactory; +import eu.europa.esig.dss.applet.util.ResourceUtils; +import eu.europa.esig.dss.applet.wizard.signature.SignatureWizardController; /** * @@ -115,7 +115,7 @@ public PKCS11View(final AppletCore core, final SignatureWizardController control /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.applet.view.DSSAppletView#doInit() + * @see eu.europa.esig.dss.applet.view.DSSAppletView#doInit() */ @Override public void doInit() { @@ -126,7 +126,7 @@ public void doInit() { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.applet.view.DSSAppletView#doLayout() + * @see eu.europa.esig.dss.applet.view.DSSAppletView#doLayout() */ @Override protected Container doLayout() { @@ -145,7 +145,7 @@ protected Container doLayout() { * (non-Javadoc) * * @see - * eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardView#wizardModelChange(java.beans.PropertyChangeEvent + * eu.europa.esig.dss.applet.swing.mvc.wizard.WizardView#wizardModelChange(java.beans.PropertyChangeEvent * ) */ @Override diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/signature/PKCS12View.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/signature/PKCS12View.java similarity index 88% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/signature/PKCS12View.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/signature/PKCS12View.java index c3d68d95e0..268623b52d 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/signature/PKCS12View.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/signature/PKCS12View.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.view.signature; +package eu.europa.esig.dss.applet.view.signature; import java.awt.Container; import java.awt.event.ActionEvent; @@ -37,12 +37,12 @@ import com.jgoodies.forms.layout.CellConstraints; import com.jgoodies.forms.layout.FormLayout; -import eu.europa.ec.markt.dss.applet.model.SignatureModel; -import eu.europa.ec.markt.dss.applet.util.ComponentFactory; -import eu.europa.ec.markt.dss.applet.util.ResourceUtils; -import eu.europa.ec.markt.dss.applet.wizard.signature.SignatureWizardController; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.AppletCore; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardView; +import eu.europa.esig.dss.applet.model.SignatureModel; +import eu.europa.esig.dss.applet.swing.mvc.AppletCore; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardView; +import eu.europa.esig.dss.applet.util.ComponentFactory; +import eu.europa.esig.dss.applet.util.ResourceUtils; +import eu.europa.esig.dss.applet.wizard.signature.SignatureWizardController; /** * TODO @@ -141,7 +141,7 @@ public PKCS12View(final AppletCore core, final SignatureWizardController control /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.applet.view.DSSAppletView#doInit() + * @see eu.europa.esig.dss.applet.view.DSSAppletView#doInit() */ @Override public void doInit() { @@ -152,7 +152,7 @@ public void doInit() { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.applet.view.DSSAppletView#doLayout() + * @see eu.europa.esig.dss.applet.view.DSSAppletView#doLayout() */ @Override protected Container doLayout() { @@ -172,7 +172,7 @@ protected Container doLayout() { * (non-Javadoc) * * @see - * eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardView#wizardModelChange(java.beans.PropertyChangeEvent + * eu.europa.esig.dss.applet.swing.mvc.wizard.WizardView#wizardModelChange(java.beans.PropertyChangeEvent * ) */ @Override diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/signature/PersonalDataView.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/signature/PersonalDataView.java similarity index 90% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/signature/PersonalDataView.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/signature/PersonalDataView.java index c540752504..9778cd1166 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/signature/PersonalDataView.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/signature/PersonalDataView.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.view.signature; +package eu.europa.esig.dss.applet.view.signature; import java.awt.Container; import java.beans.PropertyChangeEvent; @@ -33,12 +33,12 @@ import com.jgoodies.forms.layout.CellConstraints; import com.jgoodies.forms.layout.FormLayout; -import eu.europa.ec.markt.dss.applet.model.SignatureModel; -import eu.europa.ec.markt.dss.applet.util.ComponentFactory; -import eu.europa.ec.markt.dss.applet.util.ResourceUtils; -import eu.europa.ec.markt.dss.applet.wizard.signature.SignatureWizardController; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.AppletCore; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardView; +import eu.europa.esig.dss.applet.model.SignatureModel; +import eu.europa.esig.dss.applet.swing.mvc.AppletCore; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardView; +import eu.europa.esig.dss.applet.util.ComponentFactory; +import eu.europa.esig.dss.applet.util.ResourceUtils; +import eu.europa.esig.dss.applet.wizard.signature.SignatureWizardController; /** * TODO @@ -126,7 +126,7 @@ private JPanel doExplicitLayout() { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.applet.view.DSSAppletView#doInit() + * @see eu.europa.esig.dss.applet.view.DSSAppletView#doInit() */ @Override public void doInit() { @@ -136,7 +136,7 @@ public void doInit() { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.applet.view.DSSAppletView#doLayout() + * @see eu.europa.esig.dss.applet.view.DSSAppletView#doLayout() */ @Override protected Container doLayout() { @@ -169,7 +169,7 @@ private void updateDisplay() { * (non-Javadoc) * * @see - * eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardView#wizardModelChange(java.beans.PropertyChangeEvent + * eu.europa.esig.dss.applet.swing.mvc.wizard.WizardView#wizardModelChange(java.beans.PropertyChangeEvent * ) */ @Override diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/signature/SaveView.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/signature/SaveView.java similarity index 86% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/signature/SaveView.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/signature/SaveView.java index 31e44deb7a..9d88a537d2 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/signature/SaveView.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/signature/SaveView.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.view.signature; +package eu.europa.esig.dss.applet.view.signature; import java.awt.Container; import java.awt.event.ActionEvent; @@ -34,12 +34,12 @@ import com.jgoodies.forms.layout.CellConstraints; import com.jgoodies.forms.layout.FormLayout; -import eu.europa.ec.markt.dss.applet.model.SignatureModel; -import eu.europa.ec.markt.dss.applet.util.ComponentFactory; -import eu.europa.ec.markt.dss.applet.util.ResourceUtils; -import eu.europa.ec.markt.dss.applet.wizard.signature.SignatureWizardController; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.AppletCore; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardView; +import eu.europa.esig.dss.applet.model.SignatureModel; +import eu.europa.esig.dss.applet.swing.mvc.AppletCore; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardView; +import eu.europa.esig.dss.applet.util.ComponentFactory; +import eu.europa.esig.dss.applet.util.ResourceUtils; +import eu.europa.esig.dss.applet.wizard.signature.SignatureWizardController; /** * @@ -107,7 +107,7 @@ public SaveView(final AppletCore core, final SignatureWizardController controlle /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.applet.view.DSSAppletView#doInit() + * @see eu.europa.esig.dss.applet.view.DSSAppletView#doInit() */ @Override public void doInit() { @@ -118,7 +118,7 @@ public void doInit() { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.applet.view.DSSAppletView#doLayout() + * @see eu.europa.esig.dss.applet.view.DSSAppletView#doLayout() */ @Override protected Container doLayout() { @@ -135,7 +135,7 @@ protected Container doLayout() { * (non-Javadoc) * * @see - * eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardView#wizardModelChange(java.beans.PropertyChangeEvent + * eu.europa.esig.dss.applet.swing.mvc.wizard.WizardView#wizardModelChange(java.beans.PropertyChangeEvent * ) */ @Override diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/signature/SignatureDigestAlgorithmView.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/signature/SignatureDigestAlgorithmView.java similarity index 84% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/signature/SignatureDigestAlgorithmView.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/signature/SignatureDigestAlgorithmView.java index 02391166b1..34dbfc05a2 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/signature/SignatureDigestAlgorithmView.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/signature/SignatureDigestAlgorithmView.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.view.signature; +package eu.europa.esig.dss.applet.view.signature; import java.awt.Container; @@ -30,13 +30,13 @@ import com.jgoodies.forms.builder.PanelBuilder; import com.jgoodies.forms.layout.CellConstraints; -import eu.europa.ec.markt.dss.applet.model.SignatureModel; -import eu.europa.ec.markt.dss.applet.util.ComponentFactory; -import eu.europa.ec.markt.dss.applet.util.ResourceUtils; -import eu.europa.ec.markt.dss.applet.wizard.signature.SignatureWizardController; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.AppletCore; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardView; -import eu.europa.ec.markt.dss.ws.signature.DigestAlgorithm; +import eu.europa.esig.dss.applet.model.SignatureModel; +import eu.europa.esig.dss.applet.swing.mvc.AppletCore; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardView; +import eu.europa.esig.dss.applet.util.ComponentFactory; +import eu.europa.esig.dss.applet.util.ResourceUtils; +import eu.europa.esig.dss.applet.wizard.signature.SignatureWizardController; +import eu.europa.esig.dss.wsclient.signature.DigestAlgorithm; public class SignatureDigestAlgorithmView extends WizardView { @@ -68,7 +68,7 @@ public SignatureDigestAlgorithmView(AppletCore core, SignatureWizardController c /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.applet.view.DSSAppletView#doLayout() + * @see eu.europa.esig.dss.applet.view.DSSAppletView#doLayout() */ @Override protected Container doLayout() { diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/signature/SignatureView.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/signature/SignatureView.java similarity index 90% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/signature/SignatureView.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/signature/SignatureView.java index 492653427e..9e2479322e 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/signature/SignatureView.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/signature/SignatureView.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.view.signature; +package eu.europa.esig.dss.applet.view.signature; import java.awt.Container; import java.beans.PropertyChangeEvent; @@ -38,17 +38,17 @@ import com.jgoodies.forms.layout.CellConstraints; import com.jgoodies.forms.layout.FormLayout; -import eu.europa.ec.markt.dss.applet.component.model.AbstractComboBoxModel; -import eu.europa.ec.markt.dss.applet.main.FileType; -import eu.europa.ec.markt.dss.applet.model.FormatType; -import eu.europa.ec.markt.dss.applet.model.SignatureModel; -import eu.europa.ec.markt.dss.applet.util.ComponentFactory; -import eu.europa.ec.markt.dss.applet.util.ResourceUtils; -import eu.europa.ec.markt.dss.applet.wizard.signature.SignatureWizardController; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.AppletCore; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardView; -import eu.europa.ec.markt.dss.ws.signature.SignatureLevel; -import eu.europa.ec.markt.dss.ws.signature.SignaturePackaging; +import eu.europa.esig.dss.applet.component.model.AbstractComboBoxModel; +import eu.europa.esig.dss.applet.main.FileType; +import eu.europa.esig.dss.applet.model.FormatType; +import eu.europa.esig.dss.applet.model.SignatureModel; +import eu.europa.esig.dss.applet.swing.mvc.AppletCore; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardView; +import eu.europa.esig.dss.applet.util.ComponentFactory; +import eu.europa.esig.dss.applet.util.ResourceUtils; +import eu.europa.esig.dss.applet.wizard.signature.SignatureWizardController; +import eu.europa.esig.dss.wsclient.signature.SignatureLevel; +import eu.europa.esig.dss.wsclient.signature.SignaturePackaging; /** * TODO @@ -96,7 +96,7 @@ private final class LevelComboBoxModel extends AbstractComboBoxModel { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.applet.model.AbstractComboBoxModel#getElements() + * @see eu.europa.esig.dss.applet.component.model.AbstractComboBoxModel#getElements() */ @Override protected List getElements() { @@ -213,7 +213,7 @@ private JPanel doFormatLayout() { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.applet.view.DSSAppletView#doInit() + * @see eu.europa.esig.dss.applet.view.DSSAppletView#doInit() */ @Override public void doInit() { @@ -233,7 +233,7 @@ public void doInit() { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.applet.view.DSSAppletView#doInit() + * @see eu.europa.esig.dss.applet.view.DSSAppletView#doInit() */ @Override protected Container doLayout() { @@ -270,7 +270,7 @@ private JPanel doPackagingLayout() { * (non-Javadoc) * * @see - * eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardView#wizardModelChange(java.beans.PropertyChangeEvent + * eu.europa.esig.dss.applet.swing.mvc.wizard.WizardView#wizardModelChange(java.beans.PropertyChangeEvent * ) */ @Override diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/signature/TokenView.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/signature/TokenView.java similarity index 85% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/signature/TokenView.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/signature/TokenView.java index 6747a45cff..6410b9d17a 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/signature/TokenView.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/signature/TokenView.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.view.signature; +package eu.europa.esig.dss.applet.view.signature; import java.awt.Container; @@ -29,14 +29,14 @@ import com.jgoodies.forms.builder.PanelBuilder; import com.jgoodies.forms.layout.CellConstraints; -import eu.europa.ec.markt.dss.applet.model.SignatureModel; -import eu.europa.ec.markt.dss.applet.util.ComponentFactory; -import eu.europa.ec.markt.dss.applet.util.MOCCAAdapter; -import eu.europa.ec.markt.dss.applet.util.ResourceUtils; -import eu.europa.ec.markt.dss.applet.wizard.signature.SignatureWizardController; -import eu.europa.ec.markt.dss.common.SignatureTokenType; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.AppletCore; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardView; +import eu.europa.esig.dss.applet.SignatureTokenType; +import eu.europa.esig.dss.applet.model.SignatureModel; +import eu.europa.esig.dss.applet.swing.mvc.AppletCore; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardView; +import eu.europa.esig.dss.applet.util.ComponentFactory; +import eu.europa.esig.dss.applet.util.MOCCAAdapter; +import eu.europa.esig.dss.applet.util.ResourceUtils; +import eu.europa.esig.dss.applet.wizard.signature.SignatureWizardController; /** * @@ -87,7 +87,7 @@ public TokenView(final AppletCore core, final SignatureWizardController controll /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.applet.view.DSSAppletView#doLayout() + * @see eu.europa.esig.dss.applet.view.DSSAppletView#doLayout() */ @Override protected Container doLayout() { diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/validation/ReportView.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/validation/ReportView.java similarity index 94% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/validation/ReportView.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/validation/ReportView.java index 9404233f7f..4a4222f6f0 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/validation/ReportView.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/validation/ReportView.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.view.validation; +package eu.europa.esig.dss.applet.view.validation; import java.awt.Container; import java.awt.event.ActionEvent; @@ -47,13 +47,13 @@ import com.jgoodies.forms.layout.CellConstraints; import com.lowagie.text.DocumentException; -import eu.europa.ec.markt.dss.applet.component.model.XMLTreeModel; -import eu.europa.ec.markt.dss.applet.model.ValidationModel; -import eu.europa.ec.markt.dss.applet.util.ComponentFactory; -import eu.europa.ec.markt.dss.applet.wizard.validation.ValidationWizardController; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.AppletCore; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardView; -import eu.europa.ec.markt.dss.validation102853.xml.XmlDom; +import eu.europa.esig.dss.XmlDom; +import eu.europa.esig.dss.applet.component.model.XMLTreeModel; +import eu.europa.esig.dss.applet.model.ValidationModel; +import eu.europa.esig.dss.applet.swing.mvc.AppletCore; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardView; +import eu.europa.esig.dss.applet.util.ComponentFactory; +import eu.europa.esig.dss.applet.wizard.validation.ValidationWizardController; /** * TODO @@ -117,7 +117,7 @@ public ReportView(final AppletCore core, final ValidationWizardController contro /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.applet.view.DSSAppletView#doInit() + * @see eu.europa.esig.dss.applet.view.DSSAppletView#doInit() */ @SuppressWarnings("unchecked") @@ -156,7 +156,7 @@ public void doInit() { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.applet.view.DSSAppletView#doLayout() + * @see eu.europa.esig.dss.applet.view.DSSAppletView#doLayout() */ @Override protected Container doLayout() { diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/validation/ValidationView.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/validation/ValidationView.java similarity index 94% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/validation/ValidationView.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/validation/ValidationView.java index 3ecad6734f..87241d025c 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/validation/ValidationView.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/validation/ValidationView.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.view.validation; +package eu.europa.esig.dss.applet.view.validation; import java.awt.Container; import java.awt.event.ActionEvent; @@ -37,12 +37,12 @@ import com.jgoodies.forms.layout.CellConstraints; import com.jgoodies.forms.layout.FormLayout; -import eu.europa.ec.markt.dss.applet.model.ValidationModel; -import eu.europa.ec.markt.dss.applet.util.ComponentFactory; -import eu.europa.ec.markt.dss.applet.util.ResourceUtils; -import eu.europa.ec.markt.dss.applet.wizard.validation.ValidationWizardController; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.AppletCore; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardView; +import eu.europa.esig.dss.applet.model.ValidationModel; +import eu.europa.esig.dss.applet.swing.mvc.AppletCore; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardView; +import eu.europa.esig.dss.applet.util.ComponentFactory; +import eu.europa.esig.dss.applet.util.ResourceUtils; +import eu.europa.esig.dss.applet.wizard.validation.ValidationWizardController; /** * TODO @@ -239,7 +239,7 @@ public ValidationView(final AppletCore core, final ValidationWizardController co /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.applet.view.DSSAppletView#doInit() + * @see eu.europa.esig.dss.applet.view.DSSAppletView#doInit() */ @Override public void doInit() { @@ -252,7 +252,7 @@ public void doInit() { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.applet.view.DSSAppletView#doLayout() + * @see eu.europa.esig.dss.applet.view.DSSAppletView#doLayout() */ @Override protected Container doLayout() { @@ -291,7 +291,7 @@ protected Container doLayout() { * (non-Javadoc) * * @see - * eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardView#wizardModelChange(java.beans.PropertyChangeEvent + * eu.europa.esig.dss.applet.swing.mvc.wizard.WizardView#wizardModelChange(java.beans.PropertyChangeEvent * ) */ @Override diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/validationpolicy/EditView.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/validationpolicy/EditView.java similarity index 92% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/validationpolicy/EditView.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/validationpolicy/EditView.java index 5774de4f2d..15f8da7a71 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/validationpolicy/EditView.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/validationpolicy/EditView.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.view.validationpolicy; +package eu.europa.esig.dss.applet.view.validationpolicy; import java.awt.Container; import java.awt.event.ActionEvent; @@ -51,19 +51,19 @@ import com.jgoodies.forms.layout.CellConstraints; import com.jgoodies.forms.layout.FormLayout; -import eu.europa.ec.markt.dss.applet.component.model.XmlDomAdapterNode; -import eu.europa.ec.markt.dss.applet.component.model.XsdNode; -import eu.europa.ec.markt.dss.applet.component.model.XsdNodeCardinality; -import eu.europa.ec.markt.dss.applet.component.model.XsdNodeType; -import eu.europa.ec.markt.dss.applet.component.model.validation.ValidationPolicyTreeModel; -import eu.europa.ec.markt.dss.applet.component.model.validation.XMLTreeCellRenderer; -import eu.europa.ec.markt.dss.applet.model.ValidationPolicyModel; -import eu.europa.ec.markt.dss.applet.util.ComponentFactory; -import eu.europa.ec.markt.dss.applet.util.ResourceUtils; -import eu.europa.ec.markt.dss.applet.wizard.validationpolicy.ValidationPolicyWizardController; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.AppletCore; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardView; -import eu.europa.ec.markt.dss.validation102853.xml.XmlDom; +import eu.europa.esig.dss.XmlDom; +import eu.europa.esig.dss.applet.component.model.XmlDomAdapterNode; +import eu.europa.esig.dss.applet.component.model.XsdNode; +import eu.europa.esig.dss.applet.component.model.XsdNodeCardinality; +import eu.europa.esig.dss.applet.component.model.XsdNodeType; +import eu.europa.esig.dss.applet.component.model.validation.ValidationPolicyTreeModel; +import eu.europa.esig.dss.applet.component.model.validation.XMLTreeCellRenderer; +import eu.europa.esig.dss.applet.model.ValidationPolicyModel; +import eu.europa.esig.dss.applet.swing.mvc.AppletCore; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardView; +import eu.europa.esig.dss.applet.util.ComponentFactory; +import eu.europa.esig.dss.applet.util.ResourceUtils; +import eu.europa.esig.dss.applet.wizard.validationpolicy.ValidationPolicyWizardController; /** * TODO diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/validationpolicy/FileView.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/validationpolicy/FileView.java similarity index 88% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/validationpolicy/FileView.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/validationpolicy/FileView.java index 7a29d57f4b..cf9c9f41f9 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/validationpolicy/FileView.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/validationpolicy/FileView.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.view.validationpolicy; +package eu.europa.esig.dss.applet.view.validationpolicy; import java.awt.Container; import java.awt.event.ActionEvent; @@ -37,12 +37,12 @@ import com.jgoodies.forms.layout.CellConstraints; import com.jgoodies.forms.layout.FormLayout; -import eu.europa.ec.markt.dss.applet.model.ValidationPolicyModel; -import eu.europa.ec.markt.dss.applet.util.ComponentFactory; -import eu.europa.ec.markt.dss.applet.util.ResourceUtils; -import eu.europa.ec.markt.dss.applet.wizard.validationpolicy.ValidationPolicyWizardController; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.AppletCore; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardView; +import eu.europa.esig.dss.applet.model.ValidationPolicyModel; +import eu.europa.esig.dss.applet.swing.mvc.AppletCore; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardView; +import eu.europa.esig.dss.applet.util.ComponentFactory; +import eu.europa.esig.dss.applet.util.ResourceUtils; +import eu.europa.esig.dss.applet.wizard.validationpolicy.ValidationPolicyWizardController; /** * @@ -128,7 +128,7 @@ public void propertyChange(PropertyChangeEvent evt) { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.applet.view.DSSAppletView#doInit() + * @see eu.europa.esig.dss.applet.view.DSSAppletView#doInit() */ @Override public void doInit() { @@ -139,7 +139,7 @@ public void doInit() { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.applet.view.DSSAppletView#doLayout() + * @see eu.europa.esig.dss.applet.view.DSSAppletView#doLayout() */ @Override protected Container doLayout() { @@ -161,7 +161,7 @@ protected Container doLayout() { * (non-Javadoc) * * @see - * eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardView#wizardModelChange(java.beans.PropertyChangeEvent + * eu.europa.esig.dss.applet.swing.mvc.wizard.WizardView#wizardModelChange(java.beans.PropertyChangeEvent * ) */ @Override diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/validationpolicy/FinishView.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/validationpolicy/FinishView.java similarity index 75% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/validationpolicy/FinishView.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/validationpolicy/FinishView.java index 35bf6b125d..0b268dfb96 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/validationpolicy/FinishView.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/validationpolicy/FinishView.java @@ -18,19 +18,19 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.view.validationpolicy; +package eu.europa.esig.dss.applet.view.validationpolicy; import java.awt.Container; import javax.swing.JLabel; import javax.swing.JPanel; -import eu.europa.ec.markt.dss.applet.model.ValidationPolicyModel; -import eu.europa.ec.markt.dss.applet.util.ComponentFactory; -import eu.europa.ec.markt.dss.applet.util.ResourceUtils; -import eu.europa.ec.markt.dss.applet.wizard.validationpolicy.ValidationPolicyWizardController; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.AppletCore; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardView; +import eu.europa.esig.dss.applet.model.ValidationPolicyModel; +import eu.europa.esig.dss.applet.swing.mvc.AppletCore; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardView; +import eu.europa.esig.dss.applet.util.ComponentFactory; +import eu.europa.esig.dss.applet.util.ResourceUtils; +import eu.europa.esig.dss.applet.wizard.validationpolicy.ValidationPolicyWizardController; /** * @@ -62,7 +62,7 @@ public FinishView(final AppletCore core, final ValidationPolicyWizardController /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.applet.view.DSSAppletView#doInit() + * @see eu.europa.esig.dss.applet.view.DSSAppletView#doInit() */ @Override public void doInit() { @@ -72,7 +72,7 @@ public void doInit() { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.applet.view.DSSAppletView#doLayout() + * @see eu.europa.esig.dss.applet.view.DSSAppletView#doLayout() */ @Override protected Container doLayout() { diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/validationpolicy/SaveView.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/validationpolicy/SaveView.java similarity index 89% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/validationpolicy/SaveView.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/validationpolicy/SaveView.java index ac7f48a1c8..230fa73a0b 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/view/validationpolicy/SaveView.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/view/validationpolicy/SaveView.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.view.validationpolicy; +package eu.europa.esig.dss.applet.view.validationpolicy; import java.awt.Color; import java.awt.Container; @@ -51,13 +51,13 @@ import com.jgoodies.forms.layout.CellConstraints; import com.jgoodies.forms.layout.FormLayout; -import eu.europa.ec.markt.dss.applet.model.ValidationPolicyModel; -import eu.europa.ec.markt.dss.applet.util.ComponentFactory; -import eu.europa.ec.markt.dss.applet.util.ResourceUtils; -import eu.europa.ec.markt.dss.applet.wizard.validationpolicy.ValidationPolicyWizardController; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.AppletCore; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardView; -import eu.europa.ec.markt.dss.validation102853.engine.rules.wrapper.constraint.ValidationPolicy; +import eu.europa.esig.dss.applet.model.ValidationPolicyModel; +import eu.europa.esig.dss.applet.swing.mvc.AppletCore; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardView; +import eu.europa.esig.dss.applet.util.ComponentFactory; +import eu.europa.esig.dss.applet.util.ResourceUtils; +import eu.europa.esig.dss.applet.wizard.validationpolicy.ValidationPolicyWizardController; +import eu.europa.esig.dss.validation.model.ValidationPolicy; /** * @@ -159,7 +159,7 @@ public void approveSelection() { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.applet.view.DSSAppletView#doInit() + * @see eu.europa.esig.dss.applet.view.DSSAppletView#doInit() */ @Override public void doInit() { @@ -191,7 +191,7 @@ public void doInit() { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.applet.view.DSSAppletView#doLayout() + * @see eu.europa.esig.dss.applet.view.DSSAppletView#doLayout() */ @Override protected Container doLayout() { @@ -210,7 +210,7 @@ protected Container doLayout() { * (non-Javadoc) * * @see - * eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardView#wizardModelChange(java.beans.PropertyChangeEvent + * eu.europa.esig.dss.applet.swing.mvc.wizard.WizardView#wizardModelChange(java.beans.PropertyChangeEvent * ) */ @Override diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/extension/ExtensionWizardController.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/extension/ExtensionWizardController.java similarity index 74% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/extension/ExtensionWizardController.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/extension/ExtensionWizardController.java index a6bf2fe377..7893d038c8 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/extension/ExtensionWizardController.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/extension/ExtensionWizardController.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.wizard.extension; +package eu.europa.esig.dss.applet.wizard.extension; import java.io.File; import java.io.FileOutputStream; @@ -30,20 +30,20 @@ import org.apache.commons.io.IOUtils; -import eu.europa.ec.markt.dss.DSSXMLUtils; -import eu.europa.ec.markt.dss.applet.controller.ActivityController; -import eu.europa.ec.markt.dss.applet.main.DSSAppletCore; -import eu.europa.ec.markt.dss.applet.model.ExtendSignatureModel; -import eu.europa.ec.markt.dss.applet.util.SigningUtils; -import eu.europa.ec.markt.dss.applet.view.extension.FileView; -import eu.europa.ec.markt.dss.applet.view.extension.FinishView; -import eu.europa.ec.markt.dss.applet.view.extension.SaveView; -import eu.europa.ec.markt.dss.applet.view.extension.SignatureView; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardController; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.ws.signature.SignatureLevel; -import eu.europa.ec.markt.dss.ws.signature.WsParameters; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSXMLUtils; +import eu.europa.esig.dss.applet.controller.ActivityController; +import eu.europa.esig.dss.applet.main.DSSAppletCore; +import eu.europa.esig.dss.applet.model.ExtendSignatureModel; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardController; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep; +import eu.europa.esig.dss.applet.util.SigningUtils; +import eu.europa.esig.dss.applet.view.extension.FileView; +import eu.europa.esig.dss.applet.view.extension.FinishView; +import eu.europa.esig.dss.applet.view.extension.SaveView; +import eu.europa.esig.dss.applet.view.extension.SignatureView; +import eu.europa.esig.dss.wsclient.signature.SignatureLevel; +import eu.europa.esig.dss.wsclient.signature.WsParameters; /** * TODO @@ -74,7 +74,7 @@ public ExtensionWizardController(final DSSAppletCore core, final ExtendSignature /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardController#doCancel() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardController#doCancel() */ @Override protected void doCancel() { @@ -84,7 +84,7 @@ protected void doCancel() { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardController#doStart() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardController#doStart() */ @Override protected Class>> doStart() { @@ -117,7 +117,7 @@ public void extendAndSave() throws IOException { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardController#registerViews() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardController#registerViews() */ @Override protected void registerViews() { @@ -130,7 +130,7 @@ protected void registerViews() { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardController#registerWizardStep() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardController#registerWizardStep() */ @Override protected Map>>, ? extends WizardStep>> registerWizardStep() { diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/extension/FileStep.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/extension/FileStep.java similarity index 74% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/extension/FileStep.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/extension/FileStep.java index e08af05423..75a206e8e3 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/extension/FileStep.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/extension/FileStep.java @@ -18,14 +18,14 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.wizard.extension; +package eu.europa.esig.dss.applet.wizard.extension; import java.io.File; -import eu.europa.ec.markt.dss.applet.model.ExtendSignatureModel; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.ControllerException; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardView; +import eu.europa.esig.dss.applet.model.ExtendSignatureModel; +import eu.europa.esig.dss.applet.swing.mvc.ControllerException; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardView; /** * @@ -59,7 +59,7 @@ protected void finish() throws ControllerException { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep#execute() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep#execute() */ @Override protected void init() throws ControllerException { @@ -69,7 +69,7 @@ protected void init() throws ControllerException { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep#getBackStep() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep#getBackStep() */ @Override protected Class> getBackStep() { @@ -79,7 +79,7 @@ protected Class> getNextStep() { @@ -89,7 +89,7 @@ protected Class> getBackStep() { @@ -68,7 +68,7 @@ protected Class> getNextStep() { @@ -78,7 +78,7 @@ protected Class> getBackStep() { @@ -76,7 +76,7 @@ protected Class> getNextStep() { @@ -86,7 +86,7 @@ protected Class> getBackStep() { @@ -74,7 +74,7 @@ protected Class> getNextStep() { @@ -84,7 +84,7 @@ protected Class> getBackStep() { @@ -79,7 +79,7 @@ protected Class> /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep#getNextStep() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep#getNextStep() */ @Override protected Class> getNextStep() { @@ -89,7 +89,7 @@ protected Class> /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep#getStepProgression() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep#getStepProgression() */ @Override protected int getStepProgression() { @@ -99,7 +99,7 @@ protected int getStepProgression() { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep#execute() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep#execute() */ @Override protected void init() throws ControllerException { @@ -142,7 +142,7 @@ protected void init() throws ControllerException { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep#isValid() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep#isValid() */ @Override protected boolean isValid() { diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/signature/FileStep.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/signature/FileStep.java similarity index 75% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/signature/FileStep.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/signature/FileStep.java index 3cb91860ff..67e9df2fa7 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/signature/FileStep.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/signature/FileStep.java @@ -18,14 +18,14 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.wizard.signature; +package eu.europa.esig.dss.applet.wizard.signature; import java.io.File; -import eu.europa.ec.markt.dss.applet.model.SignatureModel; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.ControllerException; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardView; +import eu.europa.esig.dss.applet.model.SignatureModel; +import eu.europa.esig.dss.applet.swing.mvc.ControllerException; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardView; /** * @@ -59,7 +59,7 @@ protected void finish() throws ControllerException { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep#execute() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep#execute() */ @Override protected void init() throws ControllerException { @@ -69,7 +69,7 @@ protected void init() throws ControllerException { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep#getBackStep() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep#getBackStep() */ @Override protected Class> getBackStep() { @@ -79,7 +79,7 @@ protected Class> /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep#getNextStep() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep#getNextStep() */ @Override protected Class> getNextStep() { @@ -89,7 +89,7 @@ protected Class> /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep#getStepProgression() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep#getStepProgression() */ @Override protected int getStepProgression() { @@ -99,7 +99,7 @@ protected int getStepProgression() { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep#isValid() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep#isValid() */ @Override protected boolean isValid() { diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/signature/FinishStep.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/signature/FinishStep.java similarity index 78% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/signature/FinishStep.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/signature/FinishStep.java index ccc74aa1f8..443f79c3b3 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/signature/FinishStep.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/signature/FinishStep.java @@ -18,18 +18,18 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.wizard.signature; +package eu.europa.esig.dss.applet.wizard.signature; import java.io.IOException; import java.security.NoSuchAlgorithmException; import java.security.SignatureException; -import eu.europa.ec.markt.dss.applet.model.SignatureModel; -import eu.europa.ec.markt.dss.common.SignatureTokenType; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.ControllerException; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardView; -import eu.europa.ec.markt.dss.exception.DSSException; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.applet.SignatureTokenType; +import eu.europa.esig.dss.applet.model.SignatureModel; +import eu.europa.esig.dss.applet.swing.mvc.ControllerException; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardView; /** * TODO @@ -65,7 +65,7 @@ protected void finish() throws ControllerException { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep#execute() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep#execute() */ @Override protected void init() throws ControllerException { @@ -92,7 +92,7 @@ protected void init() throws ControllerException { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep#getBackStep() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep#getBackStep() */ @Override protected Class> getBackStep() { @@ -103,7 +103,7 @@ protected Class> /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep#getNextStep() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep#getNextStep() */ @Override protected Class> getNextStep() { @@ -114,7 +114,7 @@ protected Class> /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep#getStepProgression() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep#getStepProgression() */ @Override protected int getStepProgression() { @@ -125,7 +125,7 @@ protected int getStepProgression() { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep#isValid() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep#isValid() */ @Override protected boolean isValid() { diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/signature/PKCS11Step.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/signature/PKCS11Step.java similarity index 75% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/signature/PKCS11Step.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/signature/PKCS11Step.java index 15dbd81738..832a42e497 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/signature/PKCS11Step.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/signature/PKCS11Step.java @@ -18,17 +18,17 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.wizard.signature; +package eu.europa.esig.dss.applet.wizard.signature; import java.io.File; import org.apache.commons.lang.StringUtils; -import eu.europa.ec.markt.dss.applet.main.Parameters; -import eu.europa.ec.markt.dss.applet.model.SignatureModel; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.ControllerException; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardView; +import eu.europa.esig.dss.applet.main.Parameters; +import eu.europa.esig.dss.applet.model.SignatureModel; +import eu.europa.esig.dss.applet.swing.mvc.ControllerException; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardView; /** * @@ -62,7 +62,7 @@ protected void finish() throws ControllerException { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep#getBackStep() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep#getBackStep() */ @Override protected Class> getBackStep() { @@ -78,7 +78,7 @@ protected Class> /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep#getNextStep() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep#getNextStep() */ @Override protected Class> getNextStep() { @@ -88,7 +88,7 @@ protected Class> /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep#getStepProgression() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep#getStepProgression() */ @Override protected int getStepProgression() { @@ -98,7 +98,7 @@ protected int getStepProgression() { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep#execute() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep#execute() */ @Override protected void init() { @@ -107,7 +107,7 @@ protected void init() { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep#isValid() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep#isValid() */ @Override protected boolean isValid() { diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/signature/PKCS12Step.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/signature/PKCS12Step.java similarity index 75% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/signature/PKCS12Step.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/signature/PKCS12Step.java index 914890f680..b5aaf94128 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/signature/PKCS12Step.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/signature/PKCS12Step.java @@ -18,17 +18,17 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.wizard.signature; +package eu.europa.esig.dss.applet.wizard.signature; import java.io.File; import org.apache.commons.lang.StringUtils; -import eu.europa.ec.markt.dss.applet.main.Parameters; -import eu.europa.ec.markt.dss.applet.model.SignatureModel; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.ControllerException; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardView; +import eu.europa.esig.dss.applet.main.Parameters; +import eu.europa.esig.dss.applet.model.SignatureModel; +import eu.europa.esig.dss.applet.swing.mvc.ControllerException; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardView; /** * @@ -62,7 +62,7 @@ protected void finish() throws ControllerException { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep#execute() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep#execute() */ @Override protected void init() { @@ -72,7 +72,7 @@ protected void init() { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep#getBackStep() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep#getBackStep() */ @Override protected Class> getBackStep() { @@ -87,7 +87,7 @@ protected Class> /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep#getNextStep() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep#getNextStep() */ @Override protected Class> getNextStep() { @@ -97,7 +97,7 @@ protected Class> /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep#getStepProgression() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep#getStepProgression() */ @Override protected int getStepProgression() { @@ -107,7 +107,7 @@ protected int getStepProgression() { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep#isValid() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep#isValid() */ @Override protected boolean isValid() { diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/signature/PersonalDataStep.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/signature/PersonalDataStep.java similarity index 77% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/signature/PersonalDataStep.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/signature/PersonalDataStep.java index 6abb5c80e2..357ac970f2 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/signature/PersonalDataStep.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/signature/PersonalDataStep.java @@ -18,16 +18,16 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.wizard.signature; +package eu.europa.esig.dss.applet.wizard.signature; import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang.StringUtils; -import eu.europa.ec.markt.dss.applet.main.Parameters; -import eu.europa.ec.markt.dss.applet.model.SignatureModel; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.ControllerException; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardView; +import eu.europa.esig.dss.applet.main.Parameters; +import eu.europa.esig.dss.applet.model.SignatureModel; +import eu.europa.esig.dss.applet.swing.mvc.ControllerException; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardView; /** * @@ -55,7 +55,7 @@ public PersonalDataStep(final SignatureModel model, final WizardView> getBackStep() { @@ -75,7 +75,7 @@ protected Class> /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep#getNextStep() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep#getNextStep() */ @Override protected Class> getNextStep() { @@ -85,7 +85,7 @@ protected Class> /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep#getStepProgression() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep#getStepProgression() */ @Override protected int getStepProgression() { @@ -95,7 +95,7 @@ protected int getStepProgression() { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep#execute() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep#execute() */ @Override protected void init() { @@ -120,7 +120,7 @@ protected void init() { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep#isValid() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep#isValid() */ @Override protected boolean isValid() { diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/signature/SaveStep.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/signature/SaveStep.java similarity index 81% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/signature/SaveStep.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/signature/SaveStep.java index c8099ab822..4c46eef2c2 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/signature/SaveStep.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/signature/SaveStep.java @@ -18,18 +18,18 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.wizard.signature; +package eu.europa.esig.dss.applet.wizard.signature; import java.io.File; import org.apache.commons.lang.StringUtils; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.applet.model.SignatureModel; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.ControllerException; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardView; -import eu.europa.ec.markt.dss.ws.signature.SignaturePackaging; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.applet.model.SignatureModel; +import eu.europa.esig.dss.applet.swing.mvc.ControllerException; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardView; +import eu.europa.esig.dss.wsclient.signature.SignaturePackaging; /** * TODO @@ -61,7 +61,7 @@ protected void finish() throws ControllerException { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep#getBackStep() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep#getBackStep() */ @Override protected Class> getBackStep() { @@ -71,7 +71,7 @@ protected Class> /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep#getNextStep() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep#getNextStep() */ @Override protected Class> getNextStep() { @@ -81,7 +81,7 @@ protected Class> /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep#getStepProgression() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep#getStepProgression() */ @Override protected int getStepProgression() { @@ -91,7 +91,7 @@ protected int getStepProgression() { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep#execute() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep#execute() */ @Override protected void init() { @@ -110,7 +110,7 @@ protected void init() { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep#isValid() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep#isValid() */ @Override protected boolean isValid() { diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/signature/SignatureDigestAlgorithmStep.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/signature/SignatureDigestAlgorithmStep.java similarity index 75% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/signature/SignatureDigestAlgorithmStep.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/signature/SignatureDigestAlgorithmStep.java index bee83d5e87..3ec053ed40 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/signature/SignatureDigestAlgorithmStep.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/signature/SignatureDigestAlgorithmStep.java @@ -18,14 +18,14 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.wizard.signature; +package eu.europa.esig.dss.applet.wizard.signature; -import eu.europa.ec.markt.dss.applet.main.Parameters; -import eu.europa.ec.markt.dss.applet.model.SignatureModel; -import eu.europa.ec.markt.dss.common.SignatureTokenType; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.ControllerException; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardView; +import eu.europa.esig.dss.applet.SignatureTokenType; +import eu.europa.esig.dss.applet.main.Parameters; +import eu.europa.esig.dss.applet.model.SignatureModel; +import eu.europa.esig.dss.applet.swing.mvc.ControllerException; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardView; /** * @@ -53,7 +53,7 @@ public SignatureDigestAlgorithmStep(SignatureModel model, WizardView> getBackStep() { @@ -79,7 +79,7 @@ protected Class> /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep#getNextStep() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep#getNextStep() */ @Override protected Class> getNextStep() { @@ -105,7 +105,7 @@ protected Class> /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep#getStepProgression() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep#getStepProgression() */ @Override protected int getStepProgression() { @@ -115,7 +115,7 @@ protected int getStepProgression() { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep#init() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep#init() */ @Override protected void init() throws ControllerException { @@ -125,7 +125,7 @@ protected void init() throws ControllerException { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep#isValid() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep#isValid() */ @Override protected boolean isValid() { diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/signature/SignatureStep.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/signature/SignatureStep.java similarity index 76% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/signature/SignatureStep.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/signature/SignatureStep.java index 1a9479dfc6..d22a805b07 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/signature/SignatureStep.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/signature/SignatureStep.java @@ -18,17 +18,17 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.wizard.signature; +package eu.europa.esig.dss.applet.wizard.signature; import org.apache.commons.lang.StringUtils; -import eu.europa.ec.markt.dss.applet.main.Parameters; -import eu.europa.ec.markt.dss.applet.model.SignatureModel; -import eu.europa.ec.markt.dss.common.SignatureTokenType; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.ControllerException; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardView; -import eu.europa.ec.markt.dss.ws.signature.SignaturePackaging; +import eu.europa.esig.dss.applet.SignatureTokenType; +import eu.europa.esig.dss.applet.main.Parameters; +import eu.europa.esig.dss.applet.model.SignatureModel; +import eu.europa.esig.dss.applet.swing.mvc.ControllerException; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardView; +import eu.europa.esig.dss.wsclient.signature.SignaturePackaging; /** * @@ -56,7 +56,7 @@ public SignatureStep(final SignatureModel model, final WizardView> getBackStep() { @@ -76,7 +76,7 @@ protected Class> /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep#getNextStep() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep#getNextStep() */ @Override protected Class> getNextStep() { @@ -107,7 +107,7 @@ protected Class> /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep#getStepProgression() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep#getStepProgression() */ @Override protected int getStepProgression() { @@ -117,7 +117,7 @@ protected int getStepProgression() { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep#execute() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep#execute() */ @Override protected void init() { @@ -142,7 +142,7 @@ protected void init() { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep#isValid() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep#isValid() */ @Override protected boolean isValid() { diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/signature/SignatureWizardController.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/signature/SignatureWizardController.java similarity index 77% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/signature/SignatureWizardController.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/signature/SignatureWizardController.java index c015a7b832..c48a8caf6f 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/signature/SignatureWizardController.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/signature/SignatureWizardController.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.wizard.signature; +package eu.europa.esig.dss.applet.wizard.signature; import java.io.File; import java.io.FileOutputStream; @@ -37,39 +37,39 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.lang.ArrayUtils; -import eu.europa.ec.markt.dss.DSSXMLUtils; -import eu.europa.ec.markt.dss.applet.controller.ActivityController; -import eu.europa.ec.markt.dss.applet.controller.DSSWizardController; -import eu.europa.ec.markt.dss.applet.main.DSSAppletCore; -import eu.europa.ec.markt.dss.applet.model.SignatureModel; -import eu.europa.ec.markt.dss.applet.util.SigningUtils; -import eu.europa.ec.markt.dss.applet.view.signature.CertificateView; -import eu.europa.ec.markt.dss.applet.view.signature.FileView; -import eu.europa.ec.markt.dss.applet.view.signature.FinishView; -import eu.europa.ec.markt.dss.applet.view.signature.PKCS11View; -import eu.europa.ec.markt.dss.applet.view.signature.PKCS12View; -import eu.europa.ec.markt.dss.applet.view.signature.PersonalDataView; -import eu.europa.ec.markt.dss.applet.view.signature.SaveView; -import eu.europa.ec.markt.dss.applet.view.signature.SignatureDigestAlgorithmView; -import eu.europa.ec.markt.dss.applet.view.signature.SignatureView; -import eu.europa.ec.markt.dss.applet.view.signature.TokenView; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardController; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.signature.token.SignatureTokenConnection; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.ws.signature.DigestAlgorithm; -import eu.europa.ec.markt.dss.ws.signature.DssTransform; -import eu.europa.ec.markt.dss.ws.signature.EncryptionAlgorithm; -import eu.europa.ec.markt.dss.ws.signature.Policy; -import eu.europa.ec.markt.dss.ws.signature.SignatureLevel; -import eu.europa.ec.markt.dss.ws.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.ws.signature.WsChainCertificate; -import eu.europa.ec.markt.dss.ws.signature.WsParameters; -import eu.europa.ec.markt.dss.ws.signature.WsdssReference; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSXMLUtils; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.applet.controller.ActivityController; +import eu.europa.esig.dss.applet.controller.DSSWizardController; +import eu.europa.esig.dss.applet.main.DSSAppletCore; +import eu.europa.esig.dss.applet.model.SignatureModel; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardController; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep; +import eu.europa.esig.dss.applet.util.SigningUtils; +import eu.europa.esig.dss.applet.view.signature.CertificateView; +import eu.europa.esig.dss.applet.view.signature.FileView; +import eu.europa.esig.dss.applet.view.signature.FinishView; +import eu.europa.esig.dss.applet.view.signature.PKCS11View; +import eu.europa.esig.dss.applet.view.signature.PKCS12View; +import eu.europa.esig.dss.applet.view.signature.PersonalDataView; +import eu.europa.esig.dss.applet.view.signature.SaveView; +import eu.europa.esig.dss.applet.view.signature.SignatureDigestAlgorithmView; +import eu.europa.esig.dss.applet.view.signature.SignatureView; +import eu.europa.esig.dss.applet.view.signature.TokenView; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.token.SignatureTokenConnection; +import eu.europa.esig.dss.wsclient.signature.DigestAlgorithm; +import eu.europa.esig.dss.wsclient.signature.DssTransform; +import eu.europa.esig.dss.wsclient.signature.EncryptionAlgorithm; +import eu.europa.esig.dss.wsclient.signature.Policy; +import eu.europa.esig.dss.wsclient.signature.SignatureLevel; +import eu.europa.esig.dss.wsclient.signature.SignaturePackaging; +import eu.europa.esig.dss.wsclient.signature.WsChainCertificate; +import eu.europa.esig.dss.wsclient.signature.WsParameters; +import eu.europa.esig.dss.wsclient.signature.WsdssReference; +import eu.europa.esig.dss.x509.CertificateToken; /** * TODO @@ -106,7 +106,7 @@ public SignatureWizardController(final DSSAppletCore core, final SignatureModel /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardController#doCancel() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardController#doCancel() */ @Override protected void doCancel() { @@ -132,7 +132,7 @@ public void doRefreshPrivateKeys() { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardController#doStart() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardController#doStart() */ @Override protected Class>> doStart() { @@ -143,7 +143,7 @@ public void doRefreshPrivateKeys() { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardController#registerViews() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardController#registerViews() */ @Override protected void registerViews() { @@ -163,7 +163,7 @@ protected void registerViews() { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardController#registerWizardStep() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardController#registerWizardStep() */ @Override protected Map>>, ? extends WizardStep>> registerWizardStep() { diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/signature/TokenStep.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/signature/TokenStep.java similarity index 72% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/signature/TokenStep.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/signature/TokenStep.java index 3f540a4738..963450e0ee 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/signature/TokenStep.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/signature/TokenStep.java @@ -18,12 +18,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.wizard.signature; +package eu.europa.esig.dss.applet.wizard.signature; -import eu.europa.ec.markt.dss.applet.model.SignatureModel; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.ControllerException; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardView; +import eu.europa.esig.dss.applet.model.SignatureModel; +import eu.europa.esig.dss.applet.swing.mvc.ControllerException; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardView; /** * @@ -52,7 +52,7 @@ public TokenStep(final SignatureModel model, final WizardView> getBackStep() { @@ -82,7 +82,7 @@ protected Class> /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep#getNextStep() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep#getNextStep() */ @Override protected Class> getNextStep() { @@ -93,7 +93,7 @@ protected Class> /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep#getStepProgression() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep#getStepProgression() */ @Override protected int getStepProgression() { @@ -103,7 +103,7 @@ protected int getStepProgression() { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep#isValid() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep#isValid() */ @Override protected boolean isValid() { diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/validation/FormStep.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/validation/FormStep.java similarity index 77% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/validation/FormStep.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/validation/FormStep.java index 4a901787bb..e3d23323ef 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/validation/FormStep.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/validation/FormStep.java @@ -18,14 +18,14 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.wizard.validation; +package eu.europa.esig.dss.applet.wizard.validation; import java.io.File; -import eu.europa.ec.markt.dss.applet.model.ValidationModel; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.ControllerException; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardView; +import eu.europa.esig.dss.applet.model.ValidationModel; +import eu.europa.esig.dss.applet.swing.mvc.ControllerException; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardView; /** * @@ -52,7 +52,7 @@ public FormStep(final ValidationModel model, final WizardView> getBackStep() { @@ -72,7 +72,7 @@ protected Class> getNextStep() { @@ -82,7 +82,7 @@ protected Class> getBackStep() { @@ -70,7 +70,7 @@ protected Class> getNextStep() { @@ -80,7 +80,7 @@ protected Class>> doStart() { @@ -122,7 +122,7 @@ protected void doCancel() { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardController#registerViews() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardController#registerViews() */ @Override protected void registerViews() { @@ -133,7 +133,7 @@ protected void registerViews() { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardController#registerWizardStep() + * @see eu.europa.esig.dss.applet.swing.mvc.wizard.WizardController#registerWizardStep() */ @Override protected Map>>, ? extends WizardStep>> registerWizardStep() { @@ -222,7 +222,7 @@ private WsDocument toWsDocument(final File detachedFile) { wsDocument.setName(dssDocument.getName()); wsDocument.setAbsolutePath(dssDocument.getAbsolutePath()); final MimeType mimeType = dssDocument.getMimeType(); - final eu.europa.ec.markt.dss.ws.validation.MimeType wsMimeType = FACTORY.createMimeType(); + final eu.europa.esig.dss.wsclient.validation.MimeType wsMimeType = FACTORY.createMimeType(); final String mimeTypeString = mimeType.getMimeTypeString(); wsMimeType.setMimeTypeString(mimeTypeString); wsDocument.setMimeType(wsMimeType); diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/validationpolicy/EditStep.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/validationpolicy/EditStep.java similarity index 85% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/validationpolicy/EditStep.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/validationpolicy/EditStep.java index 886c6396d0..88179f0fca 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/validationpolicy/EditStep.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/validationpolicy/EditStep.java @@ -18,12 +18,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.wizard.validationpolicy; +package eu.europa.esig.dss.applet.wizard.validationpolicy; -import eu.europa.ec.markt.dss.applet.model.ValidationPolicyModel; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.ControllerException; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardView; +import eu.europa.esig.dss.applet.model.ValidationPolicyModel; +import eu.europa.esig.dss.applet.swing.mvc.ControllerException; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardView; /** * diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/validationpolicy/FileStep.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/validationpolicy/FileStep.java similarity index 86% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/validationpolicy/FileStep.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/validationpolicy/FileStep.java index 09000df2fd..dafeedf07c 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/validationpolicy/FileStep.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/validationpolicy/FileStep.java @@ -18,19 +18,19 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.wizard.validationpolicy; +package eu.europa.esig.dss.applet.wizard.validationpolicy; import java.io.File; import java.net.MalformedURLException; import java.net.URL; -import eu.europa.ec.markt.dss.applet.model.ValidationPolicyModel; -import eu.europa.ec.markt.dss.applet.util.ValidationPolicyDao; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.ControllerException; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardView; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.validation102853.engine.rules.wrapper.constraint.ValidationPolicy; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.applet.model.ValidationPolicyModel; +import eu.europa.esig.dss.applet.swing.mvc.ControllerException; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardView; +import eu.europa.esig.dss.applet.util.ValidationPolicyDao; +import eu.europa.esig.dss.validation.model.ValidationPolicy; /** * TODO diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/validationpolicy/FinishStep.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/validationpolicy/FinishStep.java similarity index 85% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/validationpolicy/FinishStep.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/validationpolicy/FinishStep.java index 9f7e389f13..80509cab16 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/validationpolicy/FinishStep.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/validationpolicy/FinishStep.java @@ -18,12 +18,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.wizard.validationpolicy; +package eu.europa.esig.dss.applet.wizard.validationpolicy; -import eu.europa.ec.markt.dss.applet.model.ValidationPolicyModel; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.ControllerException; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardView; +import eu.europa.esig.dss.applet.model.ValidationPolicyModel; +import eu.europa.esig.dss.applet.swing.mvc.ControllerException; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardView; /** * diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/validationpolicy/SaveStep.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/validationpolicy/SaveStep.java similarity index 84% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/validationpolicy/SaveStep.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/validationpolicy/SaveStep.java index 9b986e02d6..81ce220129 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/validationpolicy/SaveStep.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/validationpolicy/SaveStep.java @@ -18,17 +18,17 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.wizard.validationpolicy; +package eu.europa.esig.dss.applet.wizard.validationpolicy; import java.io.FileNotFoundException; import java.io.FileOutputStream; -import eu.europa.ec.markt.dss.applet.model.ValidationPolicyModel; -import eu.europa.ec.markt.dss.applet.util.ValidationPolicyDao; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.ControllerException; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardView; -import eu.europa.ec.markt.dss.validation102853.engine.rules.wrapper.constraint.ValidationPolicy; +import eu.europa.esig.dss.applet.model.ValidationPolicyModel; +import eu.europa.esig.dss.applet.swing.mvc.ControllerException; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardView; +import eu.europa.esig.dss.applet.util.ValidationPolicyDao; +import eu.europa.esig.dss.validation.model.ValidationPolicy; /** * diff --git a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/validationpolicy/ValidationPolicyWizardController.java b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/validationpolicy/ValidationPolicyWizardController.java similarity index 80% rename from dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/validationpolicy/ValidationPolicyWizardController.java rename to dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/validationpolicy/ValidationPolicyWizardController.java index 243e759bd9..26de6dedc9 100644 --- a/dss-demo-applet/src/main/java/eu/europa/ec/markt/dss/applet/wizard/validationpolicy/ValidationPolicyWizardController.java +++ b/dss-demo-applet/src/main/java/eu/europa/esig/dss/applet/wizard/validationpolicy/ValidationPolicyWizardController.java @@ -18,20 +18,20 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.applet.wizard.validationpolicy; +package eu.europa.esig.dss.applet.wizard.validationpolicy; import java.util.HashMap; import java.util.Map; -import eu.europa.ec.markt.dss.applet.controller.ActivityController; -import eu.europa.ec.markt.dss.applet.main.DSSAppletCore; -import eu.europa.ec.markt.dss.applet.model.ValidationPolicyModel; -import eu.europa.ec.markt.dss.applet.view.validationpolicy.EditView; -import eu.europa.ec.markt.dss.applet.view.validationpolicy.FileView; -import eu.europa.ec.markt.dss.applet.view.validationpolicy.FinishView; -import eu.europa.ec.markt.dss.applet.view.validationpolicy.SaveView; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardController; -import eu.europa.ec.markt.dss.commons.swing.mvc.applet.wizard.WizardStep; +import eu.europa.esig.dss.applet.controller.ActivityController; +import eu.europa.esig.dss.applet.main.DSSAppletCore; +import eu.europa.esig.dss.applet.model.ValidationPolicyModel; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardController; +import eu.europa.esig.dss.applet.swing.mvc.wizard.WizardStep; +import eu.europa.esig.dss.applet.view.validationpolicy.EditView; +import eu.europa.esig.dss.applet.view.validationpolicy.FileView; +import eu.europa.esig.dss.applet.view.validationpolicy.FinishView; +import eu.europa.esig.dss.applet.view.validationpolicy.SaveView; /** * diff --git a/dss-demo-webapp/src/main/java/eu/europa/ec/markt/dss/web/controller/HomeController.java b/dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/controller/HomeController.java similarity index 96% rename from dss-demo-webapp/src/main/java/eu/europa/ec/markt/dss/web/controller/HomeController.java rename to dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/controller/HomeController.java index dc7873d895..4c87548066 100644 --- a/dss-demo-webapp/src/main/java/eu/europa/ec/markt/dss/web/controller/HomeController.java +++ b/dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/controller/HomeController.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.web.controller; +package eu.europa.esig.dss.web.controller; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; diff --git a/dss-demo-webapp/src/main/java/eu/europa/ec/markt/dss/web/controller/LoginController.java b/dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/controller/LoginController.java similarity index 97% rename from dss-demo-webapp/src/main/java/eu/europa/ec/markt/dss/web/controller/LoginController.java rename to dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/controller/LoginController.java index 2674a548b8..db831e8d4d 100644 --- a/dss-demo-webapp/src/main/java/eu/europa/ec/markt/dss/web/controller/LoginController.java +++ b/dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/controller/LoginController.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.web.controller; +package eu.europa.esig.dss.web.controller; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; diff --git a/dss-demo-webapp/src/main/java/eu/europa/ec/markt/dss/web/controller/SignatureController.java b/dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/controller/SignatureController.java similarity index 91% rename from dss-demo-webapp/src/main/java/eu/europa/ec/markt/dss/web/controller/SignatureController.java rename to dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/controller/SignatureController.java index fe338f3dca..cb679a45d4 100644 --- a/dss-demo-webapp/src/main/java/eu/europa/ec/markt/dss/web/controller/SignatureController.java +++ b/dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/controller/SignatureController.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.web.controller; +package eu.europa.esig.dss.web.controller; import java.io.IOException; import java.io.InputStream; @@ -36,10 +36,10 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; -import eu.europa.ec.markt.dss.dao.PreferencesDao; -import eu.europa.ec.markt.dss.model.Preference; -import eu.europa.ec.markt.dss.model.PreferenceKey; -import eu.europa.ec.markt.dss.validation102853.ValidationResourceManager; +import eu.europa.esig.dss.validation.ValidationResourceManager; +import eu.europa.esig.dss.web.dao.PreferencesDao; +import eu.europa.esig.dss.web.model.Preference; +import eu.europa.esig.dss.web.model.PreferenceKey; /** * diff --git a/dss-demo-webapp/src/main/java/eu/europa/ec/markt/dss/web/controller/preferences/AdministrationController.java b/dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/controller/preferences/AdministrationController.java similarity index 87% rename from dss-demo-webapp/src/main/java/eu/europa/ec/markt/dss/web/controller/preferences/AdministrationController.java rename to dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/controller/preferences/AdministrationController.java index 738323c10e..0abec5dc03 100644 --- a/dss-demo-webapp/src/main/java/eu/europa/ec/markt/dss/web/controller/preferences/AdministrationController.java +++ b/dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/controller/preferences/AdministrationController.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.web.controller.preferences; +package eu.europa.esig.dss.web.controller.preferences; import java.util.List; @@ -29,10 +29,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -import eu.europa.ec.markt.dss.dao.PreferencesDao; -import eu.europa.ec.markt.dss.manager.ProxyPreferenceManager; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.validation102853.tsl.ReloadableTrustedListCertificateSource; +import eu.europa.esig.dss.client.http.proxy.ProxyPreferenceManager; +import eu.europa.esig.dss.tsl.ReloadableTrustedListCertificateSource; +import eu.europa.esig.dss.web.dao.PreferencesDao; +import eu.europa.esig.dss.x509.CertificateToken; /** * Administration controller @@ -47,7 +47,7 @@ @RequestMapping(value = "/admin") public class AdministrationController { /** - * @see eu.europa.ec.markt.dss.validation102853.tsl.ReloadableTrustedListCertificateSource + * @see eu.europa.esig.dss.tsl.ReloadableTrustedListCertificateSource */ @Autowired private ReloadableTrustedListCertificateSource reloadableTrustedListCertificateSource; diff --git a/dss-demo-webapp/src/main/java/eu/europa/ec/markt/dss/web/controller/preferences/GeneralEditController.java b/dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/controller/preferences/GeneralEditController.java similarity index 92% rename from dss-demo-webapp/src/main/java/eu/europa/ec/markt/dss/web/controller/preferences/GeneralEditController.java rename to dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/controller/preferences/GeneralEditController.java index d12a4a588b..77cf84b5c2 100644 --- a/dss-demo-webapp/src/main/java/eu/europa/ec/markt/dss/web/controller/preferences/GeneralEditController.java +++ b/dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/controller/preferences/GeneralEditController.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.web.controller.preferences; +package eu.europa.esig.dss.web.controller.preferences; import javax.validation.Valid; @@ -33,10 +33,10 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.context.request.WebRequest; -import eu.europa.ec.markt.dss.dao.PreferencesDao; -import eu.europa.ec.markt.dss.model.Preference; -import eu.europa.ec.markt.dss.model.PreferenceKey; -import eu.europa.ec.markt.dss.web.model.PreferenceForm; +import eu.europa.esig.dss.web.dao.PreferencesDao; +import eu.europa.esig.dss.web.model.Preference; +import eu.europa.esig.dss.web.model.PreferenceForm; +import eu.europa.esig.dss.web.model.PreferenceKey; /** * diff --git a/dss-demo-webapp/src/main/java/eu/europa/ec/markt/dss/web/controller/preferences/PreferenceFormValidator.java b/dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/controller/preferences/PreferenceFormValidator.java similarity index 91% rename from dss-demo-webapp/src/main/java/eu/europa/ec/markt/dss/web/controller/preferences/PreferenceFormValidator.java rename to dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/controller/preferences/PreferenceFormValidator.java index 13a9c5eeb8..a0779dfbab 100644 --- a/dss-demo-webapp/src/main/java/eu/europa/ec/markt/dss/web/controller/preferences/PreferenceFormValidator.java +++ b/dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/controller/preferences/PreferenceFormValidator.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.web.controller.preferences; +package eu.europa.esig.dss.web.controller.preferences; import java.net.URL; @@ -28,8 +28,8 @@ import org.springframework.validation.Errors; import org.springframework.validation.Validator; -import eu.europa.ec.markt.dss.model.PreferenceKey; -import eu.europa.ec.markt.dss.web.model.PreferenceForm; +import eu.europa.esig.dss.web.model.PreferenceForm; +import eu.europa.esig.dss.web.model.PreferenceKey; /** * TODO diff --git a/dss-demo-webapp/src/main/java/eu/europa/ec/markt/dss/web/controller/preferences/ProxyEditController.java b/dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/controller/preferences/ProxyEditController.java similarity index 91% rename from dss-demo-webapp/src/main/java/eu/europa/ec/markt/dss/web/controller/preferences/ProxyEditController.java rename to dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/controller/preferences/ProxyEditController.java index de6dc1e535..1053ebc03b 100644 --- a/dss-demo-webapp/src/main/java/eu/europa/ec/markt/dss/web/controller/preferences/ProxyEditController.java +++ b/dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/controller/preferences/ProxyEditController.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.web.controller.preferences; +package eu.europa.esig.dss.web.controller.preferences; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,10 +30,10 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.context.request.WebRequest; -import eu.europa.ec.markt.dss.dao.ProxyKey; -import eu.europa.ec.markt.dss.dao.ProxyPreference; -import eu.europa.ec.markt.dss.manager.ProxyPreferenceManager; -import eu.europa.ec.markt.dss.web.model.PreferenceForm; +import eu.europa.esig.dss.client.http.proxy.ProxyKey; +import eu.europa.esig.dss.client.http.proxy.ProxyPreference; +import eu.europa.esig.dss.client.http.proxy.ProxyPreferenceManager; +import eu.europa.esig.dss.web.model.PreferenceForm; /** * TODO diff --git a/dss-demo-webapp/src/main/java/eu/europa/ec/markt/dss/dao/GenericDao.java b/dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/dao/GenericDao.java similarity index 97% rename from dss-demo-webapp/src/main/java/eu/europa/ec/markt/dss/dao/GenericDao.java rename to dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/dao/GenericDao.java index 4192cce369..11eda3fad3 100644 --- a/dss-demo-webapp/src/main/java/eu/europa/ec/markt/dss/dao/GenericDao.java +++ b/dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/dao/GenericDao.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.dao; +package eu.europa.esig.dss.web.dao; import java.util.List; diff --git a/dss-demo-webapp/src/main/java/eu/europa/ec/markt/dss/dao/PreferencesDao.java b/dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/dao/PreferencesDao.java similarity index 88% rename from dss-demo-webapp/src/main/java/eu/europa/ec/markt/dss/dao/PreferencesDao.java rename to dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/dao/PreferencesDao.java index f955b67185..cab907aff3 100644 --- a/dss-demo-webapp/src/main/java/eu/europa/ec/markt/dss/dao/PreferencesDao.java +++ b/dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/dao/PreferencesDao.java @@ -18,10 +18,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.dao; +package eu.europa.esig.dss.web.dao; -import eu.europa.ec.markt.dss.model.Preference; -import eu.europa.ec.markt.dss.model.PreferenceKey; +import eu.europa.esig.dss.web.model.Preference; +import eu.europa.esig.dss.web.model.PreferenceKey; /** * diff --git a/dss-demo-webapp/src/main/java/eu/europa/ec/markt/dss/dao/PreferencesJdbcDao.java b/dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/dao/PreferencesJdbcDao.java similarity index 92% rename from dss-demo-webapp/src/main/java/eu/europa/ec/markt/dss/dao/PreferencesJdbcDao.java rename to dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/dao/PreferencesJdbcDao.java index 133010a1da..c5a1b33946 100644 --- a/dss-demo-webapp/src/main/java/eu/europa/ec/markt/dss/dao/PreferencesJdbcDao.java +++ b/dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/dao/PreferencesJdbcDao.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.dao; +package eu.europa.esig.dss.web.dao; import java.sql.ResultSet; import java.sql.SQLException; @@ -35,8 +35,8 @@ import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; import org.springframework.jdbc.core.namedparam.SqlParameterSource; -import eu.europa.ec.markt.dss.model.Preference; -import eu.europa.ec.markt.dss.model.PreferenceKey; +import eu.europa.esig.dss.web.model.Preference; +import eu.europa.esig.dss.web.model.PreferenceKey; /** * @@ -91,7 +91,7 @@ public Preference mapRow(ResultSet rs, int row) throws SQLException { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.dao.GenericDao#get(java.lang.Object) + * @see eu.europa.esig.dss.web.dao.GenericDao#get(java.lang.Object) */ @Override public Preference get(PreferenceKey id) { @@ -103,7 +103,7 @@ public Preference get(PreferenceKey id) { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.dao.GenericDao#getAll() + * @see eu.europa.esig.dss.web.dao.GenericDao#getAll() */ @Override public List getAll() { @@ -125,7 +125,7 @@ public void setDataSource(final DataSource dataSource) { /* * (non-Javadoc) * - * @see eu.europa.ec.markt.dss.dao.GenericDao#update(java.lang.Object) + * @see eu.europa.esig.dss.web.dao.GenericDao#update(java.lang.Object) */ @Override public void update(Preference entity) { diff --git a/dss-demo-webapp/src/main/java/eu/europa/ec/markt/dss/web/interceptor/LoggerInterceptor.java b/dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/interceptor/LoggerInterceptor.java similarity index 98% rename from dss-demo-webapp/src/main/java/eu/europa/ec/markt/dss/web/interceptor/LoggerInterceptor.java rename to dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/interceptor/LoggerInterceptor.java index bc33126cb6..7e15eb7aab 100644 --- a/dss-demo-webapp/src/main/java/eu/europa/ec/markt/dss/web/interceptor/LoggerInterceptor.java +++ b/dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/interceptor/LoggerInterceptor.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.web.interceptor; +package eu.europa.esig.dss.web.interceptor; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/dss-demo-webapp/src/main/java/eu/europa/ec/markt/dss/model/Preference.java b/dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/model/Preference.java similarity index 97% rename from dss-demo-webapp/src/main/java/eu/europa/ec/markt/dss/model/Preference.java rename to dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/model/Preference.java index 961cb2b4cf..59010d3f78 100644 --- a/dss-demo-webapp/src/main/java/eu/europa/ec/markt/dss/model/Preference.java +++ b/dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/model/Preference.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.model; +package eu.europa.esig.dss.web.model; /** * diff --git a/dss-demo-webapp/src/main/java/eu/europa/ec/markt/dss/web/model/PreferenceForm.java b/dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/model/PreferenceForm.java similarity index 97% rename from dss-demo-webapp/src/main/java/eu/europa/ec/markt/dss/web/model/PreferenceForm.java rename to dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/model/PreferenceForm.java index e68dc3d1dd..a140eed583 100644 --- a/dss-demo-webapp/src/main/java/eu/europa/ec/markt/dss/web/model/PreferenceForm.java +++ b/dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/model/PreferenceForm.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.web.model; +package eu.europa.esig.dss.web.model; /** * diff --git a/dss-demo-webapp/src/main/java/eu/europa/ec/markt/dss/model/PreferenceKey.java b/dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/model/PreferenceKey.java similarity index 97% rename from dss-demo-webapp/src/main/java/eu/europa/ec/markt/dss/model/PreferenceKey.java rename to dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/model/PreferenceKey.java index 5c63118848..d27cf1131d 100644 --- a/dss-demo-webapp/src/main/java/eu/europa/ec/markt/dss/model/PreferenceKey.java +++ b/dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/model/PreferenceKey.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.model; +package eu.europa.esig.dss.web.model; /** * diff --git a/dss-demo-webapp/src/main/java/eu/europa/ec/markt/dss/web/tiles/bean/MenuBean.java b/dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/tiles/bean/MenuBean.java similarity index 97% rename from dss-demo-webapp/src/main/java/eu/europa/ec/markt/dss/web/tiles/bean/MenuBean.java rename to dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/tiles/bean/MenuBean.java index b0752f57c9..09b943419e 100644 --- a/dss-demo-webapp/src/main/java/eu/europa/ec/markt/dss/web/tiles/bean/MenuBean.java +++ b/dss-demo-webapp/src/main/java/eu/europa/esig/dss/web/tiles/bean/MenuBean.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.web.tiles.bean; +package eu.europa.esig.dss.web.tiles.bean; /** * diff --git a/dss-demo-webapp/src/main/resources/load.sql b/dss-demo-webapp/src/main/resources/load.sql index 1baf8bb7ef..aa4ec750a6 100644 --- a/dss-demo-webapp/src/main/resources/load.sql +++ b/dss-demo-webapp/src/main/resources/load.sql @@ -9,11 +9,4 @@ INSERT INTO PROXY_PREFERENCES (PROXY_KEY , PROXY_VALUE) values ( 'proxy.https.ho INSERT INTO PROXY_PREFERENCES (PROXY_KEY , PROXY_VALUE) values ( 'proxy.https.port', '8008'); INSERT INTO PROXY_PREFERENCES (PROXY_KEY , PROXY_VALUE) values ( 'proxy.https.user', ''); INSERT INTO PROXY_PREFERENCES (PROXY_KEY , PROXY_VALUE) values ( 'proxy.https.password', ''); -INSERT INTO PROXY_PREFERENCES (PROXY_KEY , PROXY_VALUE) values ( 'proxy.https.enabled', 'false'); -INSERT INTO POLICIES (POLICY_KEY , POLICY_LEVEL) values ( 'eu.europa.ec.markt.dss.checks.policy.LinkedLOTLChecker', 'YELLOW'); -INSERT INTO POLICIES (POLICY_KEY , POLICY_LEVEL) values ( 'eu.europa.ec.markt.dss.checks.policy.ProducedWithSSCDChecker', 'RED'); -INSERT INTO POLICIES (POLICY_KEY , POLICY_LEVEL) values ( 'eu.europa.ec.markt.dss.checks.policy.QualifiedCertificateChecker', 'YELLOW'); -INSERT INTO POLICIES (POLICY_KEY , POLICY_LEVEL) values ( 'eu.europa.ec.markt.dss.checks.policy.RevocationInformationChecker', 'RED'); -INSERT INTO POLICIES (POLICY_KEY , POLICY_LEVEL) values ( 'eu.europa.ec.markt.dss.checks.policy.TSLDownloadChecker', 'YELLOW'); -INSERT INTO CONSTRAINTS(CONSTRAINT_TYPE, CONSTRAINT_DIGEST, CONSTRAINT_SIGNATURE, CONSTRAINT_KEY_LENGTH) values('VALIDATION' , 'SHA1','ECDSA_SHA1', 10); -INSERT INTO CONSTRAINTS(CONSTRAINT_TYPE, CONSTRAINT_DIGEST, CONSTRAINT_SIGNATURE, CONSTRAINT_KEY_LENGTH) values('SIGNATURE' , 'SHA512','RSA', 20); +INSERT INTO PROXY_PREFERENCES (PROXY_KEY , PROXY_VALUE) values ( 'proxy.https.enabled', 'false'); \ No newline at end of file diff --git a/dss-demo-webapp/src/main/resources/spring/applicationContext-core.xml b/dss-demo-webapp/src/main/resources/spring/applicationContext-core.xml index f38e0aadc4..2cb29a1046 100644 --- a/dss-demo-webapp/src/main/resources/spring/applicationContext-core.xml +++ b/dss-demo-webapp/src/main/resources/spring/applicationContext-core.xml @@ -8,43 +8,41 @@ - + - + - + - + - + - + - + - + - + @@ -52,7 +50,7 @@ - + diff --git a/dss-demo-webapp/src/main/resources/spring/applicationContext-dao.xml b/dss-demo-webapp/src/main/resources/spring/applicationContext-dao.xml index 664f1b0644..bab8a0b7ab 100644 --- a/dss-demo-webapp/src/main/resources/spring/applicationContext-dao.xml +++ b/dss-demo-webapp/src/main/resources/spring/applicationContext-dao.xml @@ -8,19 +8,19 @@ - + - + - + - + diff --git a/dss-demo-webapp/src/main/resources/spring/applicationContext-datasource.xml b/dss-demo-webapp/src/main/resources/spring/applicationContext-datasource.xml index 58d17cf70f..0a05771ec0 100644 --- a/dss-demo-webapp/src/main/resources/spring/applicationContext-datasource.xml +++ b/dss-demo-webapp/src/main/resources/spring/applicationContext-datasource.xml @@ -6,7 +6,7 @@ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> - + diff --git a/dss-demo-webapp/src/main/resources/spring/applicationContext-servlet.xml b/dss-demo-webapp/src/main/resources/spring/applicationContext-servlet.xml index 3706c94864..35bdf37b4f 100644 --- a/dss-demo-webapp/src/main/resources/spring/applicationContext-servlet.xml +++ b/dss-demo-webapp/src/main/resources/spring/applicationContext-servlet.xml @@ -7,7 +7,8 @@ http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd"> - + + diff --git a/dss-demo-webapp/src/main/resources/spring/applicationContext.xml b/dss-demo-webapp/src/main/resources/spring/applicationContext.xml index c1d8f82dbb..9f9a253627 100644 --- a/dss-demo-webapp/src/main/resources/spring/applicationContext.xml +++ b/dss-demo-webapp/src/main/resources/spring/applicationContext.xml @@ -12,7 +12,8 @@ - + + diff --git a/dss-demo-webapp/src/main/resources/structure.sql b/dss-demo-webapp/src/main/resources/structure.sql index 7b09fabb12..bd6e83b6f2 100644 --- a/dss-demo-webapp/src/main/resources/structure.sql +++ b/dss-demo-webapp/src/main/resources/structure.sql @@ -1,4 +1,2 @@ CREATE TABLE PREFERENCES ( PREF_KEY VARCHAR(50) NOT NULL, PREF_VALUE VARCHAR(200), PRIMARY KEY (PREF_KEY)); -CREATE TABLE PROXY_PREFERENCES ( PROXY_KEY VARCHAR(50) NOT NULL, PROXY_VALUE VARCHAR(200), PRIMARY KEY (PROXY_KEY)); -CREATE TABLE POLICIES (POLICY_KEY VARCHAR(200) NOT NULL, POLICY_LEVEL VARCHAR(20), PRIMARY KEY(POLICY_KEY)); -CREATE TABLE CONSTRAINTS (CONSTRAINT_TYPE VARCHAR(15) NOT NULL, CONSTRAINT_DIGEST VARCHAR(50) , CONSTRAINT_SIGNATURE VARCHAR(50), CONSTRAINT_KEY_LENGTH TINYINT, PRIMARY KEY(CONSTRAINT_TYPE)); \ No newline at end of file +CREATE TABLE PROXY_PREFERENCES ( PROXY_KEY VARCHAR(50) NOT NULL, PROXY_VALUE VARCHAR(200), PRIMARY KEY (PROXY_KEY)); \ No newline at end of file diff --git a/dss-demo-webapp/src/main/resources/tiles.xml b/dss-demo-webapp/src/main/resources/tiles.xml index e015470df2..b23e5591d4 100644 --- a/dss-demo-webapp/src/main/resources/tiles.xml +++ b/dss-demo-webapp/src/main/resources/tiles.xml @@ -19,12 +19,12 @@ - + - + @@ -34,17 +34,17 @@ - + - + - + diff --git a/dss-demo-webapp/src/main/webapp/applet.jnlp b/dss-demo-webapp/src/main/webapp/applet.jnlp index 66290ab3ff..497117e89c 100644 --- a/dss-demo-webapp/src/main/webapp/applet.jnlp +++ b/dss-demo-webapp/src/main/webapp/applet.jnlp @@ -13,7 +13,7 @@ \ No newline at end of file diff --git a/dss-demo-webapp/src/test/java/eu/europa/ec/markt/dss/web/controller/WebappIT.java b/dss-demo-webapp/src/test/java/eu/europa/esig/dss/web/WebappIT.java similarity index 97% rename from dss-demo-webapp/src/test/java/eu/europa/ec/markt/dss/web/controller/WebappIT.java rename to dss-demo-webapp/src/test/java/eu/europa/esig/dss/web/WebappIT.java index 60c5169850..4806e8882b 100644 --- a/dss-demo-webapp/src/test/java/eu/europa/ec/markt/dss/web/controller/WebappIT.java +++ b/dss-demo-webapp/src/test/java/eu/europa/esig/dss/web/WebappIT.java @@ -1,4 +1,4 @@ -package eu.europa.ec.markt.dss.web.controller; +package eu.europa.esig.dss.web; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/dss-document/src/main/java/eu/europa/ec/markt/dss/parameter/AbstractSignatureParameters.java b/dss-document/src/main/java/eu/europa/esig/dss/AbstractSignatureParameters.java similarity index 95% rename from dss-document/src/main/java/eu/europa/ec/markt/dss/parameter/AbstractSignatureParameters.java rename to dss-document/src/main/java/eu/europa/esig/dss/AbstractSignatureParameters.java index 855bebf523..5414f9327b 100644 --- a/dss-document/src/main/java/eu/europa/ec/markt/dss/parameter/AbstractSignatureParameters.java +++ b/dss-document/src/main/java/eu/europa/esig/dss/AbstractSignatureParameters.java @@ -18,21 +18,15 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.parameter; +package eu.europa.esig.dss; import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.EncryptionAlgorithm; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.validation.TimestampToken; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.validation.TimestampToken; +import eu.europa.esig.dss.x509.CertificateToken; /** * Parameters for a Signature creation/extension diff --git a/dss-document/src/main/java/eu/europa/ec/markt/dss/parameter/BLevelParameters.java b/dss-document/src/main/java/eu/europa/esig/dss/BLevelParameters.java similarity index 97% rename from dss-document/src/main/java/eu/europa/ec/markt/dss/parameter/BLevelParameters.java rename to dss-document/src/main/java/eu/europa/esig/dss/BLevelParameters.java index 9ebe1db601..11ab440bdf 100644 --- a/dss-document/src/main/java/eu/europa/ec/markt/dss/parameter/BLevelParameters.java +++ b/dss-document/src/main/java/eu/europa/esig/dss/BLevelParameters.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.parameter; +package eu.europa.esig.dss; import java.io.Serializable; import java.util.ArrayList; @@ -27,9 +27,6 @@ import org.apache.commons.lang.StringUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.exception.DSSNotYetImplementedMethodException; - public class BLevelParameters implements Serializable { /** @@ -318,7 +315,7 @@ public List getCertifiedSignerRoles() { */ public void addCertifiedSignerRole(final String certifiedSignerRole) { - throw new DSSNotYetImplementedMethodException("eu.europa.ec.markt.dss.parameter.BLevelParameters.addCertifiedSignerRole"); + throw new DSSNotYetImplementedMethodException("eu.europa.esig.dss.BLevelParameters.addCertifiedSignerRole"); /* if (certifiedSignerRoles == null) { diff --git a/dss-document/src/main/java/eu/europa/ec/markt/dss/parameter/ChainCertificate.java b/dss-document/src/main/java/eu/europa/esig/dss/ChainCertificate.java similarity index 96% rename from dss-document/src/main/java/eu/europa/ec/markt/dss/parameter/ChainCertificate.java rename to dss-document/src/main/java/eu/europa/esig/dss/ChainCertificate.java index 002fedc82f..b8548b31d3 100644 --- a/dss-document/src/main/java/eu/europa/ec/markt/dss/parameter/ChainCertificate.java +++ b/dss-document/src/main/java/eu/europa/esig/dss/ChainCertificate.java @@ -18,11 +18,11 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.parameter; +package eu.europa.esig.dss; import java.io.Serializable; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; +import eu.europa.esig.dss.x509.CertificateToken; /** * This class represent an element of the certificate chain. Each element is composed of a {@code X509Certificate} and a {@code boolean} value idicating if the certificate must be diff --git a/dss-document/src/main/java/eu/europa/ec/markt/dss/parameter/Policy.java b/dss-document/src/main/java/eu/europa/esig/dss/Policy.java similarity index 95% rename from dss-document/src/main/java/eu/europa/ec/markt/dss/parameter/Policy.java rename to dss-document/src/main/java/eu/europa/esig/dss/Policy.java index 88105f942b..4e977ebffc 100644 --- a/dss-document/src/main/java/eu/europa/ec/markt/dss/parameter/Policy.java +++ b/dss-document/src/main/java/eu/europa/esig/dss/Policy.java @@ -1,9 +1,7 @@ -package eu.europa.ec.markt.dss.parameter; +package eu.europa.esig.dss; import java.io.Serializable; -import eu.europa.ec.markt.dss.DigestAlgorithm; - /** * This class allows to define the signature policy. */ diff --git a/dss-document/src/main/java/eu/europa/ec/markt/dss/parameter/TimestampParameters.java b/dss-document/src/main/java/eu/europa/esig/dss/TimestampParameters.java similarity index 96% rename from dss-document/src/main/java/eu/europa/ec/markt/dss/parameter/TimestampParameters.java rename to dss-document/src/main/java/eu/europa/esig/dss/TimestampParameters.java index 28cca3d484..dfd6a6de1d 100644 --- a/dss-document/src/main/java/eu/europa/ec/markt/dss/parameter/TimestampParameters.java +++ b/dss-document/src/main/java/eu/europa/esig/dss/TimestampParameters.java @@ -18,14 +18,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.parameter; +package eu.europa.esig.dss; import javax.xml.crypto.dsig.CanonicalizationMethod; import org.apache.commons.lang.StringUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; - /** * This class represents the parameters provided when generating specific timestamps in a signature, such as an AllDataObjectsTimestamp or an * IndividualDataObjectsTimestamp. diff --git a/dss-document/src/main/java/eu/europa/ec/markt/dss/signature/AbstractSignatureService.java b/dss-document/src/main/java/eu/europa/esig/dss/signature/AbstractSignatureService.java similarity index 88% rename from dss-document/src/main/java/eu/europa/ec/markt/dss/signature/AbstractSignatureService.java rename to dss-document/src/main/java/eu/europa/esig/dss/signature/AbstractSignatureService.java index 52591dbb93..22fea18788 100644 --- a/dss-document/src/main/java/eu/europa/ec/markt/dss/signature/AbstractSignatureService.java +++ b/dss-document/src/main/java/eu/europa/esig/dss/signature/AbstractSignatureService.java @@ -18,18 +18,18 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature; +package eu.europa.esig.dss.signature; import java.security.Security; import java.util.Date; import org.bouncycastle.jce.provider.BouncyCastleProvider; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.parameter.AbstractSignatureParameters; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.tsp.TSPSource; +import eu.europa.esig.dss.AbstractSignatureParameters; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.x509.CertificateToken; +import eu.europa.esig.dss.x509.tsp.TSPSource; /** * diff --git a/dss-document/src/main/java/eu/europa/ec/markt/dss/signature/DocumentSignatureService.java b/dss-document/src/main/java/eu/europa/esig/dss/signature/DocumentSignatureService.java similarity index 93% rename from dss-document/src/main/java/eu/europa/ec/markt/dss/signature/DocumentSignatureService.java rename to dss-document/src/main/java/eu/europa/esig/dss/signature/DocumentSignatureService.java index 8e370358f6..79fda4a41a 100644 --- a/dss-document/src/main/java/eu/europa/ec/markt/dss/signature/DocumentSignatureService.java +++ b/dss-document/src/main/java/eu/europa/esig/dss/signature/DocumentSignatureService.java @@ -18,13 +18,14 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature; +package eu.europa.esig.dss.signature; import java.io.Serializable; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.parameter.AbstractSignatureParameters; -import eu.europa.ec.markt.dss.validation102853.tsp.TSPSource; +import eu.europa.esig.dss.AbstractSignatureParameters; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.x509.tsp.TSPSource; /** * This interface {@code DocumentSignatureService} provides operations for the signature creation and for its extension. diff --git a/dss-document/src/main/java/eu/europa/ec/markt/dss/signature/SignatureExtension.java b/dss-document/src/main/java/eu/europa/esig/dss/signature/SignatureExtension.java similarity index 89% rename from dss-document/src/main/java/eu/europa/ec/markt/dss/signature/SignatureExtension.java rename to dss-document/src/main/java/eu/europa/esig/dss/signature/SignatureExtension.java index 74184ec07d..be7a212104 100644 --- a/dss-document/src/main/java/eu/europa/ec/markt/dss/signature/SignatureExtension.java +++ b/dss-document/src/main/java/eu/europa/esig/dss/signature/SignatureExtension.java @@ -18,10 +18,11 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature; +package eu.europa.esig.dss.signature; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.parameter.AbstractSignatureParameters; +import eu.europa.esig.dss.AbstractSignatureParameters; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSException; /** * Extends the level of AdES signature of a document. After level -B, going upper in the signature format level diff --git a/dss-document/src/main/java/eu/europa/ec/markt/dss/signature/SignaturePackaging.java b/dss-document/src/main/java/eu/europa/esig/dss/signature/SignaturePackaging.java similarity index 96% rename from dss-document/src/main/java/eu/europa/ec/markt/dss/signature/SignaturePackaging.java rename to dss-document/src/main/java/eu/europa/esig/dss/signature/SignaturePackaging.java index 9bc345a1d3..4da4279079 100644 --- a/dss-document/src/main/java/eu/europa/ec/markt/dss/signature/SignaturePackaging.java +++ b/dss-document/src/main/java/eu/europa/esig/dss/signature/SignaturePackaging.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature; +package eu.europa.esig.dss.signature; /** * Packaging method of the signature diff --git a/dss-document/src/main/java/eu/europa/ec/markt/dss/signature/validation/AdvancedSignature.java b/dss-document/src/main/java/eu/europa/esig/dss/validation/AdvancedSignature.java similarity index 90% rename from dss-document/src/main/java/eu/europa/ec/markt/dss/signature/validation/AdvancedSignature.java rename to dss-document/src/main/java/eu/europa/esig/dss/validation/AdvancedSignature.java index e69d43d76b..ea5211ff43 100644 --- a/dss-document/src/main/java/eu/europa/ec/markt/dss/signature/validation/AdvancedSignature.java +++ b/dss-document/src/main/java/eu/europa/esig/dss/validation/AdvancedSignature.java @@ -18,32 +18,23 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.validation; +package eu.europa.esig.dss.validation; import java.io.Serializable; import java.util.Date; import java.util.List; import java.util.Set; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.EncryptionAlgorithm; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.validation102853.SignatureCertificateSource; -import eu.europa.ec.markt.dss.validation102853.SignatureForm; -import eu.europa.ec.markt.dss.validation102853.SignaturePolicy; -import eu.europa.ec.markt.dss.validation102853.TimestampReference; -import eu.europa.ec.markt.dss.validation102853.bean.CandidatesForSigningCertificate; -import eu.europa.ec.markt.dss.validation102853.bean.CertifiedRole; -import eu.europa.ec.markt.dss.validation102853.bean.CommitmentType; -import eu.europa.ec.markt.dss.validation102853.bean.SignatureCryptographicVerification; -import eu.europa.ec.markt.dss.validation102853.bean.SignatureProductionPlace; -import eu.europa.ec.markt.dss.validation102853.certificate.CertificateRef; -import eu.europa.ec.markt.dss.validation102853.crl.CRLRef; -import eu.europa.ec.markt.dss.validation102853.crl.OfflineCRLSource; -import eu.europa.ec.markt.dss.validation102853.ocsp.OCSPRef; -import eu.europa.ec.markt.dss.validation102853.ocsp.OfflineOCSPSource; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.EncryptionAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.x509.CertificateToken; +import eu.europa.esig.dss.x509.SignatureCertificateSource; +import eu.europa.esig.dss.x509.SignatureForm; +import eu.europa.esig.dss.x509.SignaturePolicy; +import eu.europa.esig.dss.x509.crl.OfflineCRLSource; +import eu.europa.esig.dss.x509.ocsp.OfflineOCSPSource; /** * Provides an abstraction for an Advanced Electronic Signature. This ease the validation process. Every signature diff --git a/dss-document/src/main/java/eu/europa/ec/markt/dss/signature/validation/cades/CAdESCertificateSource.java b/dss-document/src/main/java/eu/europa/esig/dss/validation/CAdESCertificateSource.java similarity index 93% rename from dss-document/src/main/java/eu/europa/ec/markt/dss/signature/validation/cades/CAdESCertificateSource.java rename to dss-document/src/main/java/eu/europa/esig/dss/validation/CAdESCertificateSource.java index 87db272606..ed7773a80e 100644 --- a/dss-document/src/main/java/eu/europa/ec/markt/dss/signature/validation/cades/CAdESCertificateSource.java +++ b/dss-document/src/main/java/eu/europa/esig/dss/validation/CAdESCertificateSource.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.validation.cades; +package eu.europa.esig.dss.validation; import java.security.cert.CertificateParsingException; import java.security.cert.X509Certificate; @@ -39,11 +39,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.validation102853.CertificatePool; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.validation102853.SignatureCertificateSource; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.x509.CertificatePool; +import eu.europa.esig.dss.x509.CertificateToken; +import eu.europa.esig.dss.x509.SignatureCertificateSource; /** * CertificateSource that retrieves items from a CAdES Signature @@ -100,7 +100,7 @@ public List getEncapsulatedCertificates() throws DSSException } /** - * @throws eu.europa.ec.markt.dss.exception.DSSException + * @throws eu.europa.esig.dss.DSSException */ private ArrayList extractEncapsulatedCertificates() throws DSSException { @@ -155,7 +155,7 @@ public List getKeyInfoCertificates() throws DSSException { /** * @throws org.bouncycastle.util.StoreException - * @throws eu.europa.ec.markt.dss.exception.DSSException + * @throws eu.europa.esig.dss.DSSException */ @SuppressWarnings("unchecked") private ArrayList extractIdSignedDataCertificates() throws StoreException, DSSException { diff --git a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/CRLCertificateVerifier.java b/dss-document/src/main/java/eu/europa/esig/dss/validation/CRLCertificateVerifier.java similarity index 91% rename from dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/CRLCertificateVerifier.java rename to dss-document/src/main/java/eu/europa/esig/dss/validation/CRLCertificateVerifier.java index 3102605a5a..a28883b555 100644 --- a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/CRLCertificateVerifier.java +++ b/dss-document/src/main/java/eu/europa/esig/dss/validation/CRLCertificateVerifier.java @@ -18,13 +18,15 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853; +package eu.europa.esig.dss.validation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.validation102853.crl.CRLSource; -import eu.europa.ec.markt.dss.validation102853.crl.CRLToken; +import eu.europa.esig.dss.x509.CertificateToken; +import eu.europa.esig.dss.x509.RevocationToken; +import eu.europa.esig.dss.x509.crl.CRLSource; +import eu.europa.esig.dss.x509.crl.CRLToken; /** * Verifier based on CRL diff --git a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/crl/CRLRef.java b/dss-document/src/main/java/eu/europa/esig/dss/validation/CRLRef.java similarity index 94% rename from dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/crl/CRLRef.java rename to dss-document/src/main/java/eu/europa/esig/dss/validation/CRLRef.java index 96163d9c92..3d5b02e387 100644 --- a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/crl/CRLRef.java +++ b/dss-document/src/main/java/eu/europa/esig/dss/validation/CRLRef.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.crl; +package eu.europa.esig.dss.validation; import java.math.BigInteger; import java.security.MessageDigest; @@ -33,9 +33,9 @@ import org.bouncycastle.asn1.esf.OtherHash; import org.bouncycastle.asn1.x500.X500Name; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.exception.DSSException; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DigestAlgorithm; /** * Reference to a X509CRL diff --git a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/bean/CandidatesForSigningCertificate.java b/dss-document/src/main/java/eu/europa/esig/dss/validation/CandidatesForSigningCertificate.java similarity index 96% rename from dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/bean/CandidatesForSigningCertificate.java rename to dss-document/src/main/java/eu/europa/esig/dss/validation/CandidatesForSigningCertificate.java index b91acd803d..3a8effdb38 100644 --- a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/bean/CandidatesForSigningCertificate.java +++ b/dss-document/src/main/java/eu/europa/esig/dss/validation/CandidatesForSigningCertificate.java @@ -18,14 +18,14 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.bean; +package eu.europa.esig.dss.validation; import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.x509.CertificateToken; /** * This class holds the list of the candidates for the signing certificate of the main signature. diff --git a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/certificate/CertificateRef.java b/dss-document/src/main/java/eu/europa/esig/dss/validation/CertificateRef.java similarity index 97% rename from dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/certificate/CertificateRef.java rename to dss-document/src/main/java/eu/europa/esig/dss/validation/CertificateRef.java index ed88bab5d6..f4afc0f4e6 100644 --- a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/certificate/CertificateRef.java +++ b/dss-document/src/main/java/eu/europa/esig/dss/validation/CertificateRef.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.certificate; +package eu.europa.esig.dss.validation; import org.apache.commons.codec.binary.Hex; diff --git a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/CertificateStatusVerifier.java b/dss-document/src/main/java/eu/europa/esig/dss/validation/CertificateStatusVerifier.java similarity index 91% rename from dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/CertificateStatusVerifier.java rename to dss-document/src/main/java/eu/europa/esig/dss/validation/CertificateStatusVerifier.java index 5e501343a8..c566f0b3a1 100644 --- a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/CertificateStatusVerifier.java +++ b/dss-document/src/main/java/eu/europa/esig/dss/validation/CertificateStatusVerifier.java @@ -18,7 +18,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853; +package eu.europa.esig.dss.validation; + +import eu.europa.esig.dss.x509.CertificateToken; +import eu.europa.esig.dss.x509.RevocationToken; /** diff --git a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/bean/CertificateValidity.java b/dss-document/src/main/java/eu/europa/esig/dss/validation/CertificateValidity.java similarity index 94% rename from dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/bean/CertificateValidity.java rename to dss-document/src/main/java/eu/europa/esig/dss/validation/CertificateValidity.java index 9255806361..6e53f1e7a8 100644 --- a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/bean/CertificateValidity.java +++ b/dss-document/src/main/java/eu/europa/esig/dss/validation/CertificateValidity.java @@ -18,17 +18,17 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.bean; +package eu.europa.esig.dss.validation; import java.io.Serializable; import java.security.PublicKey; import org.apache.commons.lang.StringUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.validation102853.xades.XPathQueryHolder; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.XPathQueryHolder; +import eu.europa.esig.dss.x509.CertificateToken; /** * This class stores the information about the validity of the signing certificate. diff --git a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/CertificateVerifier.java b/dss-document/src/main/java/eu/europa/esig/dss/validation/CertificateVerifier.java similarity index 90% rename from dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/CertificateVerifier.java rename to dss-document/src/main/java/eu/europa/esig/dss/validation/CertificateVerifier.java index 759f03e768..8480e85ea2 100644 --- a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/CertificateVerifier.java +++ b/dss-document/src/main/java/eu/europa/esig/dss/validation/CertificateVerifier.java @@ -18,13 +18,15 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853; - -import eu.europa.ec.markt.dss.validation102853.crl.CRLSource; -import eu.europa.ec.markt.dss.validation102853.crl.ListCRLSource; -import eu.europa.ec.markt.dss.validation102853.loader.DataLoader; -import eu.europa.ec.markt.dss.validation102853.ocsp.ListOCSPSource; -import eu.europa.ec.markt.dss.validation102853.ocsp.OCSPSource; +package eu.europa.esig.dss.validation; + +import eu.europa.esig.dss.client.http.DataLoader; +import eu.europa.esig.dss.x509.CertificatePool; +import eu.europa.esig.dss.x509.CertificateSource; +import eu.europa.esig.dss.x509.crl.CRLSource; +import eu.europa.esig.dss.x509.crl.ListCRLSource; +import eu.europa.esig.dss.x509.ocsp.ListOCSPSource; +import eu.europa.esig.dss.x509.ocsp.OCSPSource; /** * Provides information on the sources to be used in the validation process in diff --git a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/bean/CertifiedRole.java b/dss-document/src/main/java/eu/europa/esig/dss/validation/CertifiedRole.java similarity index 96% rename from dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/bean/CertifiedRole.java rename to dss-document/src/main/java/eu/europa/esig/dss/validation/CertifiedRole.java index ee543012a6..eb7f516eb3 100644 --- a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/bean/CertifiedRole.java +++ b/dss-document/src/main/java/eu/europa/esig/dss/validation/CertifiedRole.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.bean; +package eu.europa.esig.dss.validation; import java.util.Date; diff --git a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/bean/CommitmentType.java b/dss-document/src/main/java/eu/europa/esig/dss/validation/CommitmentType.java similarity index 96% rename from dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/bean/CommitmentType.java rename to dss-document/src/main/java/eu/europa/esig/dss/validation/CommitmentType.java index 210468f8b7..b41e32e9b5 100644 --- a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/bean/CommitmentType.java +++ b/dss-document/src/main/java/eu/europa/esig/dss/validation/CommitmentType.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.bean; +package eu.europa.esig.dss.validation; import java.util.ArrayList; import java.util.List; diff --git a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/CommonCertificateVerifier.java b/dss-document/src/main/java/eu/europa/esig/dss/validation/CommonCertificateVerifier.java similarity index 93% rename from dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/CommonCertificateVerifier.java rename to dss-document/src/main/java/eu/europa/esig/dss/validation/CommonCertificateVerifier.java index 6a58a5cda9..de1fc1b68f 100644 --- a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/CommonCertificateVerifier.java +++ b/dss-document/src/main/java/eu/europa/esig/dss/validation/CommonCertificateVerifier.java @@ -18,17 +18,19 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853; +package eu.europa.esig.dss.validation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.validation102853.crl.CRLSource; -import eu.europa.ec.markt.dss.validation102853.crl.ListCRLSource; -import eu.europa.ec.markt.dss.validation102853.loader.DataLoader; -import eu.europa.ec.markt.dss.validation102853.loader.NativeHTTPDataLoader; -import eu.europa.ec.markt.dss.validation102853.ocsp.ListOCSPSource; -import eu.europa.ec.markt.dss.validation102853.ocsp.OCSPSource; +import eu.europa.esig.dss.client.http.DataLoader; +import eu.europa.esig.dss.client.http.NativeHTTPDataLoader; +import eu.europa.esig.dss.x509.CertificatePool; +import eu.europa.esig.dss.x509.CertificateSource; +import eu.europa.esig.dss.x509.crl.CRLSource; +import eu.europa.esig.dss.x509.crl.ListCRLSource; +import eu.europa.esig.dss.x509.ocsp.ListOCSPSource; +import eu.europa.esig.dss.x509.ocsp.OCSPSource; /** * This class provides the different sources used to verify the status of a certificate using the trust model. There are four different types of sources to be defined:
- diff --git a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/DefaultAdvancedSignature.java b/dss-document/src/main/java/eu/europa/esig/dss/validation/DefaultAdvancedSignature.java similarity index 92% rename from dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/DefaultAdvancedSignature.java rename to dss-document/src/main/java/eu/europa/esig/dss/validation/DefaultAdvancedSignature.java index 216dfd4a93..b18b3a42c3 100644 --- a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/DefaultAdvancedSignature.java +++ b/dss-document/src/main/java/eu/europa/esig/dss/validation/DefaultAdvancedSignature.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853; +package eu.europa.esig.dss.validation; import java.security.cert.X509CRL; import java.util.ArrayList; @@ -28,21 +28,19 @@ import org.bouncycastle.cert.ocsp.BasicOCSPResp; -import eu.europa.ec.markt.dss.DSSRevocationUtils; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.validation.AdvancedSignature; -import eu.europa.ec.markt.dss.signature.validation.TimestampToken; -import eu.europa.ec.markt.dss.signature.validation.ValidationContext; -import eu.europa.ec.markt.dss.validation102853.bean.CandidatesForSigningCertificate; -import eu.europa.ec.markt.dss.validation102853.bean.CertificateValidity; -import eu.europa.ec.markt.dss.validation102853.bean.SignatureCryptographicVerification; -import eu.europa.ec.markt.dss.validation102853.crl.CRLToken; -import eu.europa.ec.markt.dss.validation102853.crl.ListCRLSource; -import eu.europa.ec.markt.dss.validation102853.crl.OfflineCRLSource; -import eu.europa.ec.markt.dss.validation102853.ocsp.ListOCSPSource; -import eu.europa.ec.markt.dss.validation102853.ocsp.OfflineOCSPSource; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSRevocationUtils; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.x509.CertificatePool; +import eu.europa.esig.dss.x509.CertificateToken; +import eu.europa.esig.dss.x509.OCSPToken; +import eu.europa.esig.dss.x509.RevocationToken; +import eu.europa.esig.dss.x509.crl.CRLToken; +import eu.europa.esig.dss.x509.crl.ListCRLSource; +import eu.europa.esig.dss.x509.crl.OfflineCRLSource; +import eu.europa.esig.dss.x509.ocsp.ListOCSPSource; +import eu.europa.esig.dss.x509.ocsp.OfflineOCSPSource; /** * TODO

DISCLAIMER: Project owner DG-MARKT. @@ -54,7 +52,7 @@ public abstract class DefaultAdvancedSignature implements AdvancedSignature { /** * This is the reference to the global (external) pool of certificates. All encapsulated certificates in the signature are added to this pool. See {@link - * eu.europa.ec.markt.dss.validation102853.CertificatePool} + * eu.europa.esig.dss.x509.CertificatePool} */ protected final CertificatePool certPool; diff --git a/dss-document/src/main/java/eu/europa/ec/markt/dss/signature/validation/DocumentValidator.java b/dss-document/src/main/java/eu/europa/esig/dss/validation/DocumentValidator.java similarity index 92% rename from dss-document/src/main/java/eu/europa/ec/markt/dss/signature/validation/DocumentValidator.java rename to dss-document/src/main/java/eu/europa/esig/dss/validation/DocumentValidator.java index 967f7b02e8..f2d183de31 100644 --- a/dss-document/src/main/java/eu/europa/ec/markt/dss/signature/validation/DocumentValidator.java +++ b/dss-document/src/main/java/eu/europa/esig/dss/validation/DocumentValidator.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.validation; +package eu.europa.esig.dss.validation; import java.io.File; import java.io.InputStream; @@ -27,13 +27,12 @@ import org.w3c.dom.Document; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.ProcessExecutor; -import eu.europa.ec.markt.dss.validation102853.policy.ValidationPolicy; -import eu.europa.ec.markt.dss.validation102853.report.Reports; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.validation.policy.ProcessExecutor; +import eu.europa.esig.dss.validation.policy.ValidationPolicy; +import eu.europa.esig.dss.validation.report.Reports; +import eu.europa.esig.dss.x509.CertificateToken; /** * This is the interface to be used when implementing different signature validators. diff --git a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/scope/FullSignatureScope.java b/dss-document/src/main/java/eu/europa/esig/dss/validation/FullSignatureScope.java similarity index 95% rename from dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/scope/FullSignatureScope.java rename to dss-document/src/main/java/eu/europa/esig/dss/validation/FullSignatureScope.java index 28948f641b..170efe98f1 100644 --- a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/scope/FullSignatureScope.java +++ b/dss-document/src/main/java/eu/europa/esig/dss/validation/FullSignatureScope.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.scope; +package eu.europa.esig.dss.validation; /** * Marker class meaning that the signature covers the whole document. diff --git a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/OCSPAndCRLCertificateVerifier.java b/dss-document/src/main/java/eu/europa/esig/dss/validation/OCSPAndCRLCertificateVerifier.java similarity index 93% rename from dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/OCSPAndCRLCertificateVerifier.java rename to dss-document/src/main/java/eu/europa/esig/dss/validation/OCSPAndCRLCertificateVerifier.java index 2bc6e48a86..ddd71847fc 100644 --- a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/OCSPAndCRLCertificateVerifier.java +++ b/dss-document/src/main/java/eu/europa/esig/dss/validation/OCSPAndCRLCertificateVerifier.java @@ -18,13 +18,16 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853; +package eu.europa.esig.dss.validation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.validation102853.crl.CRLSource; -import eu.europa.ec.markt.dss.validation102853.ocsp.OCSPSource; +import eu.europa.esig.dss.x509.CertificatePool; +import eu.europa.esig.dss.x509.CertificateToken; +import eu.europa.esig.dss.x509.RevocationToken; +import eu.europa.esig.dss.x509.crl.CRLSource; +import eu.europa.esig.dss.x509.ocsp.OCSPSource; /** * Fetchs revocation data from a certificate by querying an OCSP server first and then a CRL server if no OCSP response diff --git a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/OCSPCertificateVerifier.java b/dss-document/src/main/java/eu/europa/esig/dss/validation/OCSPCertificateVerifier.java similarity index 90% rename from dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/OCSPCertificateVerifier.java rename to dss-document/src/main/java/eu/europa/esig/dss/validation/OCSPCertificateVerifier.java index 171284abba..1bf0fd52b3 100644 --- a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/OCSPCertificateVerifier.java +++ b/dss-document/src/main/java/eu/europa/esig/dss/validation/OCSPCertificateVerifier.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853; +package eu.europa.esig.dss.validation; import java.util.List; @@ -32,11 +32,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.DSSASN1Utils; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.validation102853.certificate.CertificateSourceType; -import eu.europa.ec.markt.dss.validation102853.ocsp.OCSPSource; +import eu.europa.esig.dss.DSSASN1Utils; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.x509.CertificatePool; +import eu.europa.esig.dss.x509.CertificateSourceType; +import eu.europa.esig.dss.x509.CertificateToken; +import eu.europa.esig.dss.x509.OCSPToken; +import eu.europa.esig.dss.x509.RevocationToken; +import eu.europa.esig.dss.x509.ocsp.OCSPSource; /** * Check the status of the certificate using an OCSPSource diff --git a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/ocsp/OCSPRef.java b/dss-document/src/main/java/eu/europa/esig/dss/validation/OCSPRef.java similarity index 92% rename from dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/ocsp/OCSPRef.java rename to dss-document/src/main/java/eu/europa/esig/dss/validation/OCSPRef.java index 48dc129405..4ba969600c 100644 --- a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/ocsp/OCSPRef.java +++ b/dss-document/src/main/java/eu/europa/esig/dss/validation/OCSPRef.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.ocsp; +package eu.europa.esig.dss.validation; import java.io.IOException; import java.security.MessageDigest; @@ -30,10 +30,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.DSSRevocationUtils; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.exception.DSSException; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSRevocationUtils; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DigestAlgorithm; /** * Reference an OCSPResponse diff --git a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/scope/PartialSignatureScope.java b/dss-document/src/main/java/eu/europa/esig/dss/validation/PartialSignatureScope.java similarity index 95% rename from dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/scope/PartialSignatureScope.java rename to dss-document/src/main/java/eu/europa/esig/dss/validation/PartialSignatureScope.java index 4b9167184b..84b91673a4 100644 --- a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/scope/PartialSignatureScope.java +++ b/dss-document/src/main/java/eu/europa/esig/dss/validation/PartialSignatureScope.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.scope; +package eu.europa.esig.dss.validation; public class PartialSignatureScope extends SignatureScope { diff --git a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/bean/SignatureCryptographicVerification.java b/dss-document/src/main/java/eu/europa/esig/dss/validation/SignatureCryptographicVerification.java similarity index 97% rename from dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/bean/SignatureCryptographicVerification.java rename to dss-document/src/main/java/eu/europa/esig/dss/validation/SignatureCryptographicVerification.java index a9f1f3ff2b..30fc4ee57d 100644 --- a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/bean/SignatureCryptographicVerification.java +++ b/dss-document/src/main/java/eu/europa/esig/dss/validation/SignatureCryptographicVerification.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.bean; +package eu.europa.esig.dss.validation; import java.io.Serializable; diff --git a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/bean/SignatureProductionPlace.java b/dss-document/src/main/java/eu/europa/esig/dss/validation/SignatureProductionPlace.java similarity index 97% rename from dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/bean/SignatureProductionPlace.java rename to dss-document/src/main/java/eu/europa/esig/dss/validation/SignatureProductionPlace.java index bc52119bee..e4d3c1b408 100644 --- a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/bean/SignatureProductionPlace.java +++ b/dss-document/src/main/java/eu/europa/esig/dss/validation/SignatureProductionPlace.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.bean; +package eu.europa.esig.dss.validation; import java.io.Serializable; diff --git a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/scope/SignatureScope.java b/dss-document/src/main/java/eu/europa/esig/dss/validation/SignatureScope.java similarity index 96% rename from dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/scope/SignatureScope.java rename to dss-document/src/main/java/eu/europa/esig/dss/validation/SignatureScope.java index 1946748bce..0675c40c2c 100644 --- a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/scope/SignatureScope.java +++ b/dss-document/src/main/java/eu/europa/esig/dss/validation/SignatureScope.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.scope; +package eu.europa.esig.dss.validation; /** * This class describes the scope of the signature diff --git a/dss-document/src/main/java/eu/europa/ec/markt/dss/signature/validation/scope/SignatureScopeFinder.java b/dss-document/src/main/java/eu/europa/esig/dss/validation/SignatureScopeFinder.java similarity index 84% rename from dss-document/src/main/java/eu/europa/ec/markt/dss/signature/validation/scope/SignatureScopeFinder.java rename to dss-document/src/main/java/eu/europa/esig/dss/validation/SignatureScopeFinder.java index adbc202598..5067a60fbb 100644 --- a/dss-document/src/main/java/eu/europa/ec/markt/dss/signature/validation/scope/SignatureScopeFinder.java +++ b/dss-document/src/main/java/eu/europa/esig/dss/validation/SignatureScopeFinder.java @@ -18,13 +18,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.validation.scope; +package eu.europa.esig.dss.validation; import java.util.List; -import eu.europa.ec.markt.dss.signature.validation.AdvancedSignature; -import eu.europa.ec.markt.dss.validation102853.scope.SignatureScope; - public interface SignatureScopeFinder { List findSignatureScope(final T advancedSignature); diff --git a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/SignatureValidationContext.java b/dss-document/src/main/java/eu/europa/esig/dss/validation/SignatureValidationContext.java similarity index 96% rename from dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/SignatureValidationContext.java rename to dss-document/src/main/java/eu/europa/esig/dss/validation/SignatureValidationContext.java index 6aa76696b6..9fd892a38a 100644 --- a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/SignatureValidationContext.java +++ b/dss-document/src/main/java/eu/europa/esig/dss/validation/SignatureValidationContext.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853; +package eu.europa.esig.dss.validation; import java.util.Collections; import java.util.Date; @@ -34,15 +34,17 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.signature.validation.TimestampToken; -import eu.europa.ec.markt.dss.signature.validation.ValidationContext; -import eu.europa.ec.markt.dss.validation102853.certificate.CertificateSourceType; -import eu.europa.ec.markt.dss.validation102853.condition.ServiceInfo; -import eu.europa.ec.markt.dss.validation102853.crl.CRLSource; -import eu.europa.ec.markt.dss.validation102853.loader.DataLoader; -import eu.europa.ec.markt.dss.validation102853.ocsp.OCSPSource; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.client.http.DataLoader; +import eu.europa.esig.dss.tsl.ServiceInfo; +import eu.europa.esig.dss.x509.CertificatePool; +import eu.europa.esig.dss.x509.CertificateSourceType; +import eu.europa.esig.dss.x509.CertificateToken; +import eu.europa.esig.dss.x509.RevocationToken; +import eu.europa.esig.dss.x509.Token; +import eu.europa.esig.dss.x509.crl.CRLSource; +import eu.europa.esig.dss.x509.ocsp.OCSPSource; /** * During the validation of a signature, the software retrieves different X509 artifacts like Certificate, CRL and OCSP Response. The SignatureValidationContext is a "cache" for @@ -176,7 +178,7 @@ private Token getNotYetVerifiedToken() { * * @param token the token for which the issuer must be obtained. * @return the issuer certificate token of the given token or null if not found. - * @throws eu.europa.ec.markt.dss.exception.DSSException + * @throws eu.europa.esig.dss.DSSException */ private CertificateToken getIssuerCertificate(final Token token) throws DSSException { diff --git a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/SignedDocumentValidator.java b/dss-document/src/main/java/eu/europa/esig/dss/validation/SignedDocumentValidator.java similarity index 95% rename from dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/SignedDocumentValidator.java rename to dss-document/src/main/java/eu/europa/esig/dss/validation/SignedDocumentValidator.java index b49edae918..2627329c5d 100644 --- a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/SignedDocumentValidator.java +++ b/dss-document/src/main/java/eu/europa/esig/dss/validation/SignedDocumentValidator.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853; +package eu.europa.esig.dss.validation; import java.io.File; import java.io.IOException; @@ -47,36 +47,6 @@ import org.slf4j.LoggerFactory; import org.w3c.dom.Document; -import eu.europa.ec.markt.dss.DSSASN1Utils; -import eu.europa.ec.markt.dss.DSSPKUtils; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DSSXMLUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.EncryptionAlgorithm; -import eu.europa.ec.markt.dss.OID; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.TokenIdentifier; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.exception.DSSUnsupportedOperationException; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.validation.AdvancedSignature; -import eu.europa.ec.markt.dss.signature.validation.DocumentValidator; -import eu.europa.ec.markt.dss.signature.validation.TimestampToken; -import eu.europa.ec.markt.dss.signature.validation.ValidationContext; -import eu.europa.ec.markt.dss.signature.validation.scope.SignatureScopeFinder; -import eu.europa.ec.markt.dss.validation102853.bean.CandidatesForSigningCertificate; -import eu.europa.ec.markt.dss.validation102853.bean.CertificateValidity; -import eu.europa.ec.markt.dss.validation102853.bean.CertifiedRole; -import eu.europa.ec.markt.dss.validation102853.bean.CommitmentType; -import eu.europa.ec.markt.dss.validation102853.bean.SignatureCryptographicVerification; -import eu.europa.ec.markt.dss.validation102853.bean.SignatureProductionPlace; -import eu.europa.ec.markt.dss.validation102853.certificate.CertificateSourceType; -import eu.europa.ec.markt.dss.validation102853.condition.Condition; -import eu.europa.ec.markt.dss.validation102853.condition.PolicyIdCondition; -import eu.europa.ec.markt.dss.validation102853.condition.QcStatementCondition; -import eu.europa.ec.markt.dss.validation102853.condition.ServiceInfo; -import eu.europa.ec.markt.dss.validation102853.crl.ListCRLSource; import eu.europa.ec.markt.dss.validation102853.data.diagnostic.ObjectFactory; import eu.europa.ec.markt.dss.validation102853.data.diagnostic.XmlBasicSignatureType; import eu.europa.ec.markt.dss.validation102853.data.diagnostic.XmlCertificate; @@ -106,13 +76,38 @@ import eu.europa.ec.markt.dss.validation102853.data.diagnostic.XmlTimestamps; import eu.europa.ec.markt.dss.validation102853.data.diagnostic.XmlTrustedServiceProviderType; import eu.europa.ec.markt.dss.validation102853.data.diagnostic.XmlUsedCertificates; -import eu.europa.ec.markt.dss.validation102853.loader.DataLoader; -import eu.europa.ec.markt.dss.validation102853.ocsp.ListOCSPSource; -import eu.europa.ec.markt.dss.validation102853.policy.EtsiValidationPolicy; -import eu.europa.ec.markt.dss.validation102853.policy.ValidationPolicy; -import eu.europa.ec.markt.dss.validation102853.report.Reports; -import eu.europa.ec.markt.dss.validation102853.rules.AttributeValue; -import eu.europa.ec.markt.dss.validation102853.scope.SignatureScope; +import eu.europa.esig.dss.DSSASN1Utils; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSPKUtils; +import eu.europa.esig.dss.DSSUnsupportedOperationException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DSSXMLUtils; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.EncryptionAlgorithm; +import eu.europa.esig.dss.OID; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.TokenIdentifier; +import eu.europa.esig.dss.client.http.DataLoader; +import eu.europa.esig.dss.tsl.Condition; +import eu.europa.esig.dss.tsl.PolicyIdCondition; +import eu.europa.esig.dss.tsl.QcStatementCondition; +import eu.europa.esig.dss.tsl.ServiceInfo; +import eu.europa.esig.dss.validation.policy.CustomProcessExecutor; +import eu.europa.esig.dss.validation.policy.EtsiValidationPolicy; +import eu.europa.esig.dss.validation.policy.ProcessExecutor; +import eu.europa.esig.dss.validation.policy.ValidationPolicy; +import eu.europa.esig.dss.validation.policy.rules.AttributeValue; +import eu.europa.esig.dss.validation.report.Reports; +import eu.europa.esig.dss.x509.CertificatePool; +import eu.europa.esig.dss.x509.CertificateSourceType; +import eu.europa.esig.dss.x509.CertificateToken; +import eu.europa.esig.dss.x509.RevocationToken; +import eu.europa.esig.dss.x509.SignaturePolicy; +import eu.europa.esig.dss.x509.TimestampType; +import eu.europa.esig.dss.x509.crl.ListCRLSource; +import eu.europa.esig.dss.x509.ocsp.ListOCSPSource; /** @@ -155,7 +150,7 @@ public abstract class SignedDocumentValidator implements DocumentValidator { private ValidationPolicy countersignatureValidationPolicy; /** - * The reference to the certificate verifier. The current DSS implementation proposes {@link eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier}. This verifier + * The reference to the certificate verifier. The current DSS implementation proposes {@link eu.europa.esig.dss.validation.CommonCertificateVerifier}. This verifier * encapsulates the references to different sources used in the signature validation process. */ protected CertificateVerifier certificateVerifier; diff --git a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/TimestampInclude.java b/dss-document/src/main/java/eu/europa/esig/dss/validation/TimestampInclude.java similarity index 97% rename from dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/TimestampInclude.java rename to dss-document/src/main/java/eu/europa/esig/dss/validation/TimestampInclude.java index ec50c92ee7..cfcde4bc1b 100644 --- a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/TimestampInclude.java +++ b/dss-document/src/main/java/eu/europa/esig/dss/validation/TimestampInclude.java @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853; +package eu.europa.esig.dss.validation; /** * This class represents diff --git a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/TimestampReference.java b/dss-document/src/main/java/eu/europa/esig/dss/validation/TimestampReference.java similarity index 95% rename from dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/TimestampReference.java rename to dss-document/src/main/java/eu/europa/esig/dss/validation/TimestampReference.java index 4fbf6a4a35..dd718a72d0 100644 --- a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/TimestampReference.java +++ b/dss-document/src/main/java/eu/europa/esig/dss/validation/TimestampReference.java @@ -18,12 +18,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853; +package eu.europa.esig.dss.validation; import org.apache.commons.codec.binary.Base64; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DigestAlgorithm; /** * This class stocks the timestamp reference, which is composed of: diff --git a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/TimestampReferenceCategory.java b/dss-document/src/main/java/eu/europa/esig/dss/validation/TimestampReferenceCategory.java similarity index 96% rename from dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/TimestampReferenceCategory.java rename to dss-document/src/main/java/eu/europa/esig/dss/validation/TimestampReferenceCategory.java index 1db8bd29e2..fde3aa8181 100644 --- a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/TimestampReferenceCategory.java +++ b/dss-document/src/main/java/eu/europa/esig/dss/validation/TimestampReferenceCategory.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853; +package eu.europa.esig.dss.validation; public enum TimestampReferenceCategory { diff --git a/dss-document/src/main/java/eu/europa/ec/markt/dss/signature/validation/TimestampToken.java b/dss-document/src/main/java/eu/europa/esig/dss/validation/TimestampToken.java similarity index 93% rename from dss-document/src/main/java/eu/europa/ec/markt/dss/signature/validation/TimestampToken.java rename to dss-document/src/main/java/eu/europa/esig/dss/validation/TimestampToken.java index 603fae777a..87428fe02e 100644 --- a/dss-document/src/main/java/eu/europa/ec/markt/dss/signature/validation/TimestampToken.java +++ b/dss-document/src/main/java/eu/europa/esig/dss/validation/TimestampToken.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.validation; +package eu.europa.esig.dss.validation; import java.io.IOException; import java.security.cert.X509Certificate; @@ -46,22 +46,19 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.EncryptionAlgorithm; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.signature.validation.cades.CAdESCertificateSource; -import eu.europa.ec.markt.dss.validation102853.ArchiveTimestampType; -import eu.europa.ec.markt.dss.validation102853.CertificatePool; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.validation102853.TimestampInclude; -import eu.europa.ec.markt.dss.validation102853.TimestampReference; -import eu.europa.ec.markt.dss.validation102853.TimestampType; -import eu.europa.ec.markt.dss.validation102853.TimestampValidation; -import eu.europa.ec.markt.dss.validation102853.TimestampValidity; -import eu.europa.ec.markt.dss.validation102853.Token; -import eu.europa.ec.markt.dss.validation102853.TokenValidationExtraInfo; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.EncryptionAlgorithm; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.x509.ArchiveTimestampType; +import eu.europa.esig.dss.x509.CertificatePool; +import eu.europa.esig.dss.x509.CertificateToken; +import eu.europa.esig.dss.x509.TimestampType; +import eu.europa.esig.dss.x509.TimestampValidation; +import eu.europa.esig.dss.x509.TimestampValidity; +import eu.europa.esig.dss.x509.Token; +import eu.europa.esig.dss.x509.TokenValidationExtraInfo; /** * SignedToken containing a TimeStamp. diff --git a/dss-document/src/main/java/eu/europa/ec/markt/dss/signature/validation/ValidationContext.java b/dss-document/src/main/java/eu/europa/esig/dss/validation/ValidationContext.java similarity index 91% rename from dss-document/src/main/java/eu/europa/ec/markt/dss/signature/validation/ValidationContext.java rename to dss-document/src/main/java/eu/europa/esig/dss/validation/ValidationContext.java index a198e7884a..b69ed8b715 100644 --- a/dss-document/src/main/java/eu/europa/ec/markt/dss/signature/validation/ValidationContext.java +++ b/dss-document/src/main/java/eu/europa/esig/dss/validation/ValidationContext.java @@ -18,15 +18,14 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.validation; +package eu.europa.esig.dss.validation; import java.util.Date; import java.util.Set; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.RevocationToken; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.x509.CertificateToken; +import eu.europa.esig.dss.x509.RevocationToken; /** * This interface allows the implementation of the validators for: certificates, timestamps and revocation data. diff --git a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/ValidationResourceManager.java b/dss-document/src/main/java/eu/europa/esig/dss/validation/ValidationResourceManager.java similarity index 97% rename from dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/ValidationResourceManager.java rename to dss-document/src/main/java/eu/europa/esig/dss/validation/ValidationResourceManager.java index 0d952c7c5c..533853541e 100644 --- a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/ValidationResourceManager.java +++ b/dss-document/src/main/java/eu/europa/esig/dss/validation/ValidationResourceManager.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853; +package eu.europa.esig.dss.validation; import java.io.InputStream; @@ -30,10 +30,10 @@ import org.slf4j.LoggerFactory; import org.w3c.dom.Document; -import eu.europa.ec.markt.dss.DSSXMLUtils; -import eu.europa.ec.markt.dss.exception.DSSException; import eu.europa.ec.markt.dss.validation102853.data.diagnostic.DiagnosticData; import eu.europa.ec.markt.dss.validation102853.data.diagnostic.ObjectFactory; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSXMLUtils; public class ValidationResourceManager { diff --git a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/X500PrincipalMatcher.java b/dss-document/src/main/java/eu/europa/esig/dss/validation/X500PrincipalMatcher.java similarity index 99% rename from dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/X500PrincipalMatcher.java rename to dss-document/src/main/java/eu/europa/esig/dss/validation/X500PrincipalMatcher.java index dc5f5da359..8e4d7e0c82 100644 --- a/dss-document/src/main/java/eu/europa/ec/markt/dss/validation102853/X500PrincipalMatcher.java +++ b/dss-document/src/main/java/eu/europa/esig/dss/validation/X500PrincipalMatcher.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853; +package eu.europa.esig.dss.validation; import javax.security.auth.x500.X500Principal; diff --git a/dss-document/src/main/resources/document-validators.properties b/dss-document/src/main/resources/document-validators.properties index bfaa4ecc17..0b55371608 100644 --- a/dss-document/src/main/resources/document-validators.properties +++ b/dss-document/src/main/resources/document-validators.properties @@ -1,4 +1,4 @@ -ASiC=eu.europa.ec.markt.dss.validation102853.asic.ASiCContainerValidator -PAdES=eu.europa.ec.markt.dss.validation102853.pades.PDFDocumentValidator -XAdES=eu.europa.ec.markt.dss.validation102853.xades.XMLDocumentValidator -CAdES=eu.europa.ec.markt.dss.validation102853.cades.CMSDocumentValidator \ No newline at end of file +ASiC=eu.europa.esig.dss.asic.validation.ASiCContainerValidator +PAdES=eu.europa.esig.dss.pades.validation.PDFDocumentValidator +XAdES=eu.europa.esig.dss.xades.validation.XMLDocumentValidator +CAdES=eu.europa.esig.dss.cades.validation.CMSDocumentValidator \ No newline at end of file diff --git a/dss-document/src/test/java/eu/europa/ec/markt/dss/AbstractSignatureParametersTest.java b/dss-document/src/test/java/eu/europa/esig/dss/AbstractSignatureParametersTest.java similarity index 85% rename from dss-document/src/test/java/eu/europa/ec/markt/dss/AbstractSignatureParametersTest.java rename to dss-document/src/test/java/eu/europa/esig/dss/AbstractSignatureParametersTest.java index 062bc43c54..a4dd49ab64 100644 --- a/dss-document/src/test/java/eu/europa/ec/markt/dss/AbstractSignatureParametersTest.java +++ b/dss-document/src/test/java/eu/europa/esig/dss/AbstractSignatureParametersTest.java @@ -1,10 +1,10 @@ -package eu.europa.ec.markt.dss; +package eu.europa.esig.dss; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.parameter.AbstractSignatureParameters; +import eu.europa.esig.dss.AbstractSignatureParameters; /** * Unit test to fix https://esig-dss.atlassian.net/browse/DSS-672 diff --git a/dss-document/src/test/java/eu/europa/ec/markt/dss/DeterministicIdGenerationTest.java b/dss-document/src/test/java/eu/europa/esig/dss/DeterministicIdGenerationTest.java similarity index 91% rename from dss-document/src/test/java/eu/europa/ec/markt/dss/DeterministicIdGenerationTest.java rename to dss-document/src/test/java/eu/europa/esig/dss/DeterministicIdGenerationTest.java index 572a3c3d41..d09a84e2a3 100644 --- a/dss-document/src/test/java/eu/europa/ec/markt/dss/DeterministicIdGenerationTest.java +++ b/dss-document/src/test/java/eu/europa/esig/dss/DeterministicIdGenerationTest.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss; +package eu.europa.esig.dss; import static org.junit.Assert.assertNotEquals; @@ -31,9 +31,9 @@ import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -import eu.europa.ec.markt.dss.parameter.AbstractSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.AbstractSignatureParameters; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; @RunWith(Parameterized.class) public class DeterministicIdGenerationTest { diff --git a/dss-document/src/test/java/eu/europa/ec/markt/dss/extension/AbstractTestExtension.java b/dss-document/src/test/java/eu/europa/esig/dss/extension/AbstractTestExtension.java similarity index 87% rename from dss-document/src/test/java/eu/europa/ec/markt/dss/extension/AbstractTestExtension.java rename to dss-document/src/test/java/eu/europa/esig/dss/extension/AbstractTestExtension.java index 4b19d2cf45..6526ffb8c2 100644 --- a/dss-document/src/test/java/eu/europa/ec/markt/dss/extension/AbstractTestExtension.java +++ b/dss-document/src/test/java/eu/europa/esig/dss/extension/AbstractTestExtension.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.extension; +package eu.europa.esig.dss.extension; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -30,15 +30,15 @@ import org.junit.Test; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.parameter.AbstractSignatureParameters; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.SignedDocumentValidator; -import eu.europa.ec.markt.dss.validation102853.report.DiagnosticData; -import eu.europa.ec.markt.dss.validation102853.report.Reports; +import eu.europa.esig.dss.AbstractSignatureParameters; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.SignedDocumentValidator; +import eu.europa.esig.dss.validation.report.DiagnosticData; +import eu.europa.esig.dss.validation.report.Reports; public abstract class AbstractTestExtension { diff --git a/dss-document/src/test/java/eu/europa/ec/markt/dss/signature/AbstractTestSignature.java b/dss-document/src/test/java/eu/europa/esig/dss/signature/AbstractTestSignature.java similarity index 92% rename from dss-document/src/test/java/eu/europa/ec/markt/dss/signature/AbstractTestSignature.java rename to dss-document/src/test/java/eu/europa/esig/dss/signature/AbstractTestSignature.java index f28925e643..cc504f3bd2 100644 --- a/dss-document/src/test/java/eu/europa/ec/markt/dss/signature/AbstractTestSignature.java +++ b/dss-document/src/test/java/eu/europa/esig/dss/signature/AbstractTestSignature.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature; +package eu.europa.esig.dss.signature; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -38,16 +38,19 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.parameter.AbstractSignatureParameters; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.utils.TestUtils; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.SignedDocumentValidator; -import eu.europa.ec.markt.dss.validation102853.TimestampType; -import eu.europa.ec.markt.dss.validation102853.report.DiagnosticData; -import eu.europa.ec.markt.dss.validation102853.report.Reports; -import eu.europa.ec.markt.dss.validation102853.report.SimpleReport; +import eu.europa.esig.dss.AbstractSignatureParameters; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.test.TestUtils; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.SignedDocumentValidator; +import eu.europa.esig.dss.validation.report.DiagnosticData; +import eu.europa.esig.dss.validation.report.Reports; +import eu.europa.esig.dss.validation.report.SimpleReport; +import eu.europa.esig.dss.x509.CertificateToken; +import eu.europa.esig.dss.x509.TimestampType; public abstract class AbstractTestSignature { diff --git a/dss-document/src/test/resources/logback.xml b/dss-document/src/test/resources/logback.xml index c92be4172b..41b25f0447 100644 --- a/dss-document/src/test/resources/logback.xml +++ b/dss-document/src/test/resources/logback.xml @@ -7,7 +7,7 @@ - + diff --git a/dss-pades/src/main/java/eu/europa/ec/markt/dss/parameter/PAdESSignatureParameters.java b/dss-pades/src/main/java/eu/europa/esig/dss/pades/PAdESSignatureParameters.java similarity index 91% rename from dss-pades/src/main/java/eu/europa/ec/markt/dss/parameter/PAdESSignatureParameters.java rename to dss-pades/src/main/java/eu/europa/esig/dss/pades/PAdESSignatureParameters.java index 5431b213ca..69df43f2e6 100644 --- a/dss-pades/src/main/java/eu/europa/ec/markt/dss/parameter/PAdESSignatureParameters.java +++ b/dss-pades/src/main/java/eu/europa/esig/dss/pades/PAdESSignatureParameters.java @@ -1,4 +1,6 @@ -package eu.europa.ec.markt.dss.parameter; +package eu.europa.esig.dss.pades; + +import eu.europa.esig.dss.cades.CAdESSignatureParameters; public class PAdESSignatureParameters extends CAdESSignatureParameters { diff --git a/dss-pades/src/main/java/eu/europa/ec/markt/dss/parameter/SignatureImageParameters.java b/dss-pades/src/main/java/eu/europa/esig/dss/pades/SignatureImageParameters.java similarity index 98% rename from dss-pades/src/main/java/eu/europa/ec/markt/dss/parameter/SignatureImageParameters.java rename to dss-pades/src/main/java/eu/europa/esig/dss/pades/SignatureImageParameters.java index e4e3e45c6d..58b8bdc6d4 100644 --- a/dss-pades/src/main/java/eu/europa/ec/markt/dss/parameter/SignatureImageParameters.java +++ b/dss-pades/src/main/java/eu/europa/esig/dss/pades/SignatureImageParameters.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.parameter; +package eu.europa.esig.dss.pades; import java.io.File; diff --git a/dss-pades/src/main/java/eu/europa/ec/markt/dss/parameter/SignatureImageTextParameters.java b/dss-pades/src/main/java/eu/europa/esig/dss/pades/SignatureImageTextParameters.java similarity index 98% rename from dss-pades/src/main/java/eu/europa/ec/markt/dss/parameter/SignatureImageTextParameters.java rename to dss-pades/src/main/java/eu/europa/esig/dss/pades/SignatureImageTextParameters.java index 2f3ec2aa32..551e8a1675 100644 --- a/dss-pades/src/main/java/eu/europa/ec/markt/dss/parameter/SignatureImageTextParameters.java +++ b/dss-pades/src/main/java/eu/europa/esig/dss/pades/SignatureImageTextParameters.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.parameter; +package eu.europa.esig.dss.pades; import java.awt.Color; import java.awt.Font; diff --git a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/DSSPDFUtils.java b/dss-pades/src/main/java/eu/europa/esig/dss/pades/signature/DSSPDFUtils.java similarity index 95% rename from dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/DSSPDFUtils.java rename to dss-pades/src/main/java/eu/europa/esig/dss/pades/signature/DSSPDFUtils.java index 950e5f2572..ad347af5bc 100644 --- a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/DSSPDFUtils.java +++ b/dss-pades/src/main/java/eu/europa/esig/dss/pades/signature/DSSPDFUtils.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature; +package eu.europa.esig.dss.pades.signature; import java.io.File; import java.io.FileInputStream; @@ -28,8 +28,8 @@ import org.apache.commons.io.IOUtils; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.signature.pdf.PdfArray; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.pdf.PdfArray; /** * This class proposes some utility methods to manipulate PDF files. diff --git a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pades/PAdESLevelBaselineB.java b/dss-pades/src/main/java/eu/europa/esig/dss/pades/signature/PAdESLevelBaselineB.java similarity index 93% rename from dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pades/PAdESLevelBaselineB.java rename to dss-pades/src/main/java/eu/europa/esig/dss/pades/signature/PAdESLevelBaselineB.java index 4f6b40dc40..91192b7ac9 100644 --- a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pades/PAdESLevelBaselineB.java +++ b/dss-pades/src/main/java/eu/europa/esig/dss/pades/signature/PAdESLevelBaselineB.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.pades; +package eu.europa.esig.dss.pades.signature; import java.util.Hashtable; import java.util.Map; @@ -31,8 +31,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.parameter.PAdESSignatureParameters; -import eu.europa.ec.markt.dss.signature.cades.CAdESLevelBaselineB; +import eu.europa.esig.dss.cades.signature.CAdESLevelBaselineB; +import eu.europa.esig.dss.pades.PAdESSignatureParameters; /** * EPES profile for PAdES signature diff --git a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pades/PAdESLevelBaselineLT.java b/dss-pades/src/main/java/eu/europa/esig/dss/pades/signature/PAdESLevelBaselineLT.java similarity index 82% rename from dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pades/PAdESLevelBaselineLT.java rename to dss-pades/src/main/java/eu/europa/esig/dss/pades/signature/PAdESLevelBaselineLT.java index 6b40115d85..59500506ca 100644 --- a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pades/PAdESLevelBaselineLT.java +++ b/dss-pades/src/main/java/eu/europa/esig/dss/pades/signature/PAdESLevelBaselineLT.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.pades; +package eu.europa.esig.dss.pades.signature; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -31,32 +31,32 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.parameter.PAdESSignatureParameters; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.InMemoryDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.SignatureExtension; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.pdf.PDFTimestampService; -import eu.europa.ec.markt.dss.signature.pdf.PdfArray; -import eu.europa.ec.markt.dss.signature.pdf.PdfDict; -import eu.europa.ec.markt.dss.signature.pdf.PdfObjFactory; -import eu.europa.ec.markt.dss.signature.pdf.PdfStream; -import eu.europa.ec.markt.dss.signature.validation.AdvancedSignature; -import eu.europa.ec.markt.dss.signature.validation.ValidationContext; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.DefaultAdvancedSignature; -import eu.europa.ec.markt.dss.validation102853.OCSPToken; -import eu.europa.ec.markt.dss.validation102853.Token; -import eu.europa.ec.markt.dss.validation102853.cades.CAdESSignature; -import eu.europa.ec.markt.dss.validation102853.crl.CRLToken; -import eu.europa.ec.markt.dss.validation102853.pades.PAdESSignature; -import eu.europa.ec.markt.dss.validation102853.pades.PDFDocumentValidator; -import eu.europa.ec.markt.dss.validation102853.tsp.TSPSource; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.InMemoryDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.cades.validation.CAdESSignature; +import eu.europa.esig.dss.pades.PAdESSignatureParameters; +import eu.europa.esig.dss.pades.validation.PAdESSignature; +import eu.europa.esig.dss.pades.validation.PDFDocumentValidator; +import eu.europa.esig.dss.pdf.PDFTimestampService; +import eu.europa.esig.dss.pdf.PdfArray; +import eu.europa.esig.dss.pdf.PdfDict; +import eu.europa.esig.dss.pdf.PdfObjFactory; +import eu.europa.esig.dss.pdf.PdfStream; +import eu.europa.esig.dss.signature.SignatureExtension; +import eu.europa.esig.dss.validation.AdvancedSignature; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.DefaultAdvancedSignature; +import eu.europa.esig.dss.validation.ValidationContext; +import eu.europa.esig.dss.x509.CertificateToken; +import eu.europa.esig.dss.x509.OCSPToken; +import eu.europa.esig.dss.x509.Token; +import eu.europa.esig.dss.x509.crl.CRLToken; +import eu.europa.esig.dss.x509.tsp.TSPSource; /** * Extend a PAdES extension up to LTV. diff --git a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pades/PAdESLevelBaselineLTA.java b/dss-pades/src/main/java/eu/europa/esig/dss/pades/signature/PAdESLevelBaselineLTA.java similarity index 79% rename from dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pades/PAdESLevelBaselineLTA.java rename to dss-pades/src/main/java/eu/europa/esig/dss/pades/signature/PAdESLevelBaselineLTA.java index 6e79fb8ed3..d075f3d067 100644 --- a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pades/PAdESLevelBaselineLTA.java +++ b/dss-pades/src/main/java/eu/europa/esig/dss/pades/signature/PAdESLevelBaselineLTA.java @@ -18,19 +18,19 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.pades; +package eu.europa.esig.dss.pades.signature; import java.util.List; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.parameter.PAdESSignatureParameters; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.SignatureExtension; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.validation.AdvancedSignature; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.pades.PDFDocumentValidator; -import eu.europa.ec.markt.dss.validation102853.tsp.TSPSource; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.pades.PAdESSignatureParameters; +import eu.europa.esig.dss.pades.validation.PDFDocumentValidator; +import eu.europa.esig.dss.signature.SignatureExtension; +import eu.europa.esig.dss.validation.AdvancedSignature; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.x509.tsp.TSPSource; /** * TODO diff --git a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pades/PAdESLevelBaselineT.java b/dss-pades/src/main/java/eu/europa/esig/dss/pades/signature/PAdESLevelBaselineT.java similarity index 76% rename from dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pades/PAdESLevelBaselineT.java rename to dss-pades/src/main/java/eu/europa/esig/dss/pades/signature/PAdESLevelBaselineT.java index 9b7babdf94..e82820ae1b 100644 --- a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pades/PAdESLevelBaselineT.java +++ b/dss-pades/src/main/java/eu/europa/esig/dss/pades/signature/PAdESLevelBaselineT.java @@ -18,20 +18,20 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.pades; +package eu.europa.esig.dss.pades.signature; import java.io.ByteArrayOutputStream; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.parameter.PAdESSignatureParameters; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.InMemoryDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.SignatureExtension; -import eu.europa.ec.markt.dss.signature.pdf.PDFTimestampService; -import eu.europa.ec.markt.dss.signature.pdf.PdfObjFactory; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.tsp.TSPSource; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.InMemoryDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.pades.PAdESSignatureParameters; +import eu.europa.esig.dss.pdf.PDFTimestampService; +import eu.europa.esig.dss.pdf.PdfObjFactory; +import eu.europa.esig.dss.signature.SignatureExtension; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.x509.tsp.TSPSource; /** * TODO diff --git a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pades/PAdESService.java b/dss-pades/src/main/java/eu/europa/esig/dss/pades/signature/PAdESService.java similarity index 88% rename from dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pades/PAdESService.java rename to dss-pades/src/main/java/eu/europa/esig/dss/pades/signature/PAdESService.java index 2c4acd2ac4..9fe90edee2 100644 --- a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pades/PAdESService.java +++ b/dss-pades/src/main/java/eu/europa/esig/dss/pades/signature/PAdESService.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.pades; +package eu.europa.esig.dss.pades.signature; import java.io.ByteArrayOutputStream; import java.io.InputStream; @@ -33,21 +33,21 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.DSSASN1Utils; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.parameter.PAdESSignatureParameters; -import eu.europa.ec.markt.dss.signature.AbstractSignatureService; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.InMemoryDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.SignatureExtension; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.cades.CAdESLevelBaselineT; -import eu.europa.ec.markt.dss.signature.cades.CustomContentSigner; -import eu.europa.ec.markt.dss.signature.pdf.PDFSignatureService; -import eu.europa.ec.markt.dss.signature.pdf.PdfObjFactory; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; +import eu.europa.esig.dss.DSSASN1Utils; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.InMemoryDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.cades.signature.CAdESLevelBaselineT; +import eu.europa.esig.dss.cades.signature.CustomContentSigner; +import eu.europa.esig.dss.pades.PAdESSignatureParameters; +import eu.europa.esig.dss.pdf.PDFSignatureService; +import eu.europa.esig.dss.pdf.PdfObjFactory; +import eu.europa.esig.dss.signature.AbstractSignatureService; +import eu.europa.esig.dss.signature.SignatureExtension; +import eu.europa.esig.dss.validation.CertificateVerifier; /** * PAdES implementation of the DocumentSignatureService diff --git a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pades/PadesCMSSignedDataBuilder.java b/dss-pades/src/main/java/eu/europa/esig/dss/pades/signature/PadesCMSSignedDataBuilder.java similarity index 89% rename from dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pades/PadesCMSSignedDataBuilder.java rename to dss-pades/src/main/java/eu/europa/esig/dss/pades/signature/PadesCMSSignedDataBuilder.java index 6b6b68f363..032b0e0cf7 100644 --- a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pades/PadesCMSSignedDataBuilder.java +++ b/dss-pades/src/main/java/eu/europa/esig/dss/pades/signature/PadesCMSSignedDataBuilder.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.pades; +package eu.europa.esig.dss.pades.signature; import java.util.Map; @@ -32,12 +32,12 @@ import org.bouncycastle.operator.DigestCalculatorProvider; import org.bouncycastle.operator.bc.BcDigestCalculatorProvider; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.parameter.CAdESSignatureParameters; -import eu.europa.ec.markt.dss.parameter.PAdESSignatureParameters; -import eu.europa.ec.markt.dss.signature.cades.CAdESLevelBaselineB; -import eu.europa.ec.markt.dss.signature.cades.CMSSignedDataBuilder; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.cades.CAdESSignatureParameters; +import eu.europa.esig.dss.cades.signature.CAdESLevelBaselineB; +import eu.europa.esig.dss.cades.signature.CMSSignedDataBuilder; +import eu.europa.esig.dss.pades.PAdESSignatureParameters; +import eu.europa.esig.dss.validation.CertificateVerifier; /** * TODO diff --git a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pades/visible/ImageFactory.java b/dss-pades/src/main/java/eu/europa/esig/dss/pades/signature/visible/ImageFactory.java similarity index 95% rename from dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pades/visible/ImageFactory.java rename to dss-pades/src/main/java/eu/europa/esig/dss/pades/signature/visible/ImageFactory.java index 63e05663ef..34249169fb 100644 --- a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pades/visible/ImageFactory.java +++ b/dss-pades/src/main/java/eu/europa/esig/dss/pades/signature/visible/ImageFactory.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.pades.visible; +package eu.europa.esig.dss.pades.signature.visible; import java.awt.Dimension; import java.awt.image.BufferedImage; @@ -41,9 +41,9 @@ import org.apache.commons.lang.StringUtils; import org.w3c.dom.Element; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.parameter.SignatureImageParameters; -import eu.europa.ec.markt.dss.parameter.SignatureImageTextParameters; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.pades.SignatureImageParameters; +import eu.europa.esig.dss.pades.SignatureImageTextParameters; public class ImageFactory { diff --git a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pades/visible/ImageTextWriter.java b/dss-pades/src/main/java/eu/europa/esig/dss/pades/signature/visible/ImageTextWriter.java similarity index 98% rename from dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pades/visible/ImageTextWriter.java rename to dss-pades/src/main/java/eu/europa/esig/dss/pades/signature/visible/ImageTextWriter.java index f26a3d42a9..25754cd51f 100644 --- a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pades/visible/ImageTextWriter.java +++ b/dss-pades/src/main/java/eu/europa/esig/dss/pades/signature/visible/ImageTextWriter.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.pades.visible; +package eu.europa.esig.dss.pades.signature.visible; import java.awt.Color; import java.awt.Dimension; diff --git a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pades/visible/ImagesMerger.java b/dss-pades/src/main/java/eu/europa/esig/dss/pades/signature/visible/ImagesMerger.java similarity index 98% rename from dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pades/visible/ImagesMerger.java rename to dss-pades/src/main/java/eu/europa/esig/dss/pades/signature/visible/ImagesMerger.java index 031ea50394..a8bd800f3f 100644 --- a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pades/visible/ImagesMerger.java +++ b/dss-pades/src/main/java/eu/europa/esig/dss/pades/signature/visible/ImagesMerger.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.pades.visible; +package eu.europa.esig.dss.pades.signature.visible; import java.awt.Color; import java.awt.Graphics; diff --git a/dss-pades/src/main/java/eu/europa/ec/markt/dss/validation102853/pades/PAdESCRLSource.java b/dss-pades/src/main/java/eu/europa/esig/dss/pades/validation/PAdESCRLSource.java similarity index 89% rename from dss-pades/src/main/java/eu/europa/ec/markt/dss/validation102853/pades/PAdESCRLSource.java rename to dss-pades/src/main/java/eu/europa/esig/dss/pades/validation/PAdESCRLSource.java index 651bb650b2..ca6e484abd 100644 --- a/dss-pades/src/main/java/eu/europa/ec/markt/dss/validation102853/pades/PAdESCRLSource.java +++ b/dss-pades/src/main/java/eu/europa/esig/dss/pades/validation/PAdESCRLSource.java @@ -18,16 +18,16 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.pades; +package eu.europa.esig.dss.pades.validation; import java.security.cert.X509CRL; import java.util.ArrayList; import java.util.List; import java.util.Set; -import eu.europa.ec.markt.dss.signature.pdf.pdfbox.PdfDssDict; -import eu.europa.ec.markt.dss.validation102853.cades.CAdESSignature; -import eu.europa.ec.markt.dss.validation102853.crl.OfflineCRLSource; +import eu.europa.esig.dss.cades.validation.CAdESSignature; +import eu.europa.esig.dss.pdf.pdfbox.PdfDssDict; +import eu.europa.esig.dss.x509.crl.OfflineCRLSource; /** * CRLSource that will retrieve the CRL from a PAdES Signature diff --git a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/validation/pades/PAdESCertificateSource.java b/dss-pades/src/main/java/eu/europa/esig/dss/pades/validation/PAdESCertificateSource.java similarity index 87% rename from dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/validation/pades/PAdESCertificateSource.java rename to dss-pades/src/main/java/eu/europa/esig/dss/pades/validation/PAdESCertificateSource.java index eb4cd7603a..53e88024b4 100644 --- a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/validation/pades/PAdESCertificateSource.java +++ b/dss-pades/src/main/java/eu/europa/esig/dss/pades/validation/PAdESCertificateSource.java @@ -18,17 +18,17 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.validation.pades; +package eu.europa.esig.dss.pades.validation; import java.util.ArrayList; import java.util.List; import java.util.Set; -import eu.europa.ec.markt.dss.signature.pdf.pdfbox.PdfDssDict; -import eu.europa.ec.markt.dss.signature.validation.cades.CAdESCertificateSource; -import eu.europa.ec.markt.dss.validation102853.CertificatePool; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.validation102853.SignatureCertificateSource; +import eu.europa.esig.dss.pdf.pdfbox.PdfDssDict; +import eu.europa.esig.dss.validation.CAdESCertificateSource; +import eu.europa.esig.dss.x509.CertificatePool; +import eu.europa.esig.dss.x509.CertificateToken; +import eu.europa.esig.dss.x509.SignatureCertificateSource; /** * CertificateSource that will retrieve the certificate from a PAdES Signature diff --git a/dss-pades/src/main/java/eu/europa/ec/markt/dss/validation102853/pades/PAdESOCSPSource.java b/dss-pades/src/main/java/eu/europa/esig/dss/pades/validation/PAdESOCSPSource.java similarity index 90% rename from dss-pades/src/main/java/eu/europa/ec/markt/dss/validation102853/pades/PAdESOCSPSource.java rename to dss-pades/src/main/java/eu/europa/esig/dss/pades/validation/PAdESOCSPSource.java index f0a60c0df9..db5283a06a 100644 --- a/dss-pades/src/main/java/eu/europa/ec/markt/dss/validation102853/pades/PAdESOCSPSource.java +++ b/dss-pades/src/main/java/eu/europa/esig/dss/pades/validation/PAdESOCSPSource.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.pades; +package eu.europa.esig.dss.pades.validation; import java.util.ArrayList; import java.util.List; @@ -28,9 +28,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.signature.pdf.pdfbox.PdfDssDict; -import eu.europa.ec.markt.dss.validation102853.cades.CAdESSignature; -import eu.europa.ec.markt.dss.validation102853.ocsp.OfflineOCSPSource; +import eu.europa.esig.dss.cades.validation.CAdESSignature; +import eu.europa.esig.dss.pdf.pdfbox.PdfDssDict; +import eu.europa.esig.dss.x509.ocsp.OfflineOCSPSource; /** * OCSPSource that retrieves the OCSPResp from a PAdES Signature diff --git a/dss-pades/src/main/java/eu/europa/ec/markt/dss/validation102853/pades/PAdESSignature.java b/dss-pades/src/main/java/eu/europa/esig/dss/pades/validation/PAdESSignature.java similarity index 87% rename from dss-pades/src/main/java/eu/europa/ec/markt/dss/validation102853/pades/PAdESSignature.java rename to dss-pades/src/main/java/eu/europa/esig/dss/pades/validation/PAdESSignature.java index 8226a8e42f..6e14c3b874 100644 --- a/dss-pades/src/main/java/eu/europa/ec/markt/dss/validation102853/pades/PAdESSignature.java +++ b/dss-pades/src/main/java/eu/europa/esig/dss/pades/validation/PAdESSignature.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.pades; +package eu.europa.esig.dss.pades.validation; import java.io.ByteArrayOutputStream; import java.util.ArrayList; @@ -33,38 +33,37 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.EncryptionAlgorithm; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.pdf.PdfDocTimestampInfo; -import eu.europa.ec.markt.dss.signature.pdf.PdfSignatureInfo; -import eu.europa.ec.markt.dss.signature.pdf.PdfSignatureOrDocTimestampInfo; -import eu.europa.ec.markt.dss.signature.pdf.pdfbox.PdfDssDict; -import eu.europa.ec.markt.dss.signature.validation.AdvancedSignature; -import eu.europa.ec.markt.dss.signature.validation.TimestampToken; -import eu.europa.ec.markt.dss.signature.validation.cades.CAdESCertificateSource; -import eu.europa.ec.markt.dss.signature.validation.pades.PAdESCertificateSource; -import eu.europa.ec.markt.dss.validation102853.CertificatePool; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.validation102853.DefaultAdvancedSignature; -import eu.europa.ec.markt.dss.validation102853.SignatureForm; -import eu.europa.ec.markt.dss.validation102853.SignaturePolicy; -import eu.europa.ec.markt.dss.validation102853.TimestampReference; -import eu.europa.ec.markt.dss.validation102853.TimestampType; -import eu.europa.ec.markt.dss.validation102853.bean.CandidatesForSigningCertificate; -import eu.europa.ec.markt.dss.validation102853.bean.CertifiedRole; -import eu.europa.ec.markt.dss.validation102853.bean.CommitmentType; -import eu.europa.ec.markt.dss.validation102853.bean.SignatureCryptographicVerification; -import eu.europa.ec.markt.dss.validation102853.bean.SignatureProductionPlace; -import eu.europa.ec.markt.dss.validation102853.cades.CAdESSignature; -import eu.europa.ec.markt.dss.validation102853.certificate.CertificateRef; -import eu.europa.ec.markt.dss.validation102853.crl.CRLRef; -import eu.europa.ec.markt.dss.validation102853.crl.OfflineCRLSource; -import eu.europa.ec.markt.dss.validation102853.ocsp.OCSPRef; -import eu.europa.ec.markt.dss.validation102853.ocsp.OfflineOCSPSource; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.EncryptionAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.cades.validation.CAdESSignature; +import eu.europa.esig.dss.pdf.PdfDocTimestampInfo; +import eu.europa.esig.dss.pdf.PdfSignatureInfo; +import eu.europa.esig.dss.pdf.PdfSignatureOrDocTimestampInfo; +import eu.europa.esig.dss.pdf.pdfbox.PdfDssDict; +import eu.europa.esig.dss.validation.AdvancedSignature; +import eu.europa.esig.dss.validation.CAdESCertificateSource; +import eu.europa.esig.dss.validation.CRLRef; +import eu.europa.esig.dss.validation.CandidatesForSigningCertificate; +import eu.europa.esig.dss.validation.CertificateRef; +import eu.europa.esig.dss.validation.CertifiedRole; +import eu.europa.esig.dss.validation.CommitmentType; +import eu.europa.esig.dss.validation.DefaultAdvancedSignature; +import eu.europa.esig.dss.validation.OCSPRef; +import eu.europa.esig.dss.validation.SignatureCryptographicVerification; +import eu.europa.esig.dss.validation.SignatureProductionPlace; +import eu.europa.esig.dss.validation.TimestampReference; +import eu.europa.esig.dss.validation.TimestampToken; +import eu.europa.esig.dss.x509.CertificatePool; +import eu.europa.esig.dss.x509.CertificateToken; +import eu.europa.esig.dss.x509.SignatureForm; +import eu.europa.esig.dss.x509.SignaturePolicy; +import eu.europa.esig.dss.x509.TimestampType; +import eu.europa.esig.dss.x509.crl.OfflineCRLSource; +import eu.europa.esig.dss.x509.ocsp.OfflineOCSPSource; /** * Implementation of AdvancedSignature for PAdES diff --git a/dss-pades/src/main/java/eu/europa/ec/markt/dss/validation102853/scope/PAdESSignatureScopeFinder.java b/dss-pades/src/main/java/eu/europa/esig/dss/pades/validation/PAdESSignatureScopeFinder.java similarity index 86% rename from dss-pades/src/main/java/eu/europa/ec/markt/dss/validation102853/scope/PAdESSignatureScopeFinder.java rename to dss-pades/src/main/java/eu/europa/esig/dss/pades/validation/PAdESSignatureScopeFinder.java index 599481a8dd..c1fd851407 100644 --- a/dss-pades/src/main/java/eu/europa/ec/markt/dss/validation102853/scope/PAdESSignatureScopeFinder.java +++ b/dss-pades/src/main/java/eu/europa/esig/dss/pades/validation/PAdESSignatureScopeFinder.java @@ -18,14 +18,15 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.scope; +package eu.europa.esig.dss.pades.validation; import java.util.ArrayList; import java.util.List; -import eu.europa.ec.markt.dss.signature.pdf.PdfSignatureInfo; -import eu.europa.ec.markt.dss.signature.validation.scope.SignatureScopeFinder; -import eu.europa.ec.markt.dss.validation102853.pades.PAdESSignature; +import eu.europa.esig.dss.pdf.PdfSignatureInfo; +import eu.europa.esig.dss.validation.FullSignatureScope; +import eu.europa.esig.dss.validation.SignatureScope; +import eu.europa.esig.dss.validation.SignatureScopeFinder; /** * diff --git a/dss-pades/src/main/java/eu/europa/ec/markt/dss/validation102853/pades/PDFDocumentValidator.java b/dss-pades/src/main/java/eu/europa/esig/dss/pades/validation/PDFDocumentValidator.java similarity index 80% rename from dss-pades/src/main/java/eu/europa/ec/markt/dss/validation102853/pades/PDFDocumentValidator.java rename to dss-pades/src/main/java/eu/europa/esig/dss/pades/validation/PDFDocumentValidator.java index 2ad17b6877..2f3d55f9de 100644 --- a/dss-pades/src/main/java/eu/europa/ec/markt/dss/validation102853/pades/PDFDocumentValidator.java +++ b/dss-pades/src/main/java/eu/europa/esig/dss/pades/validation/PDFDocumentValidator.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.pades; +package eu.europa.esig.dss.pades.validation; import java.io.InputStream; import java.util.ArrayList; @@ -26,17 +26,16 @@ import org.apache.commons.io.IOUtils; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.exception.DSSUnsupportedOperationException; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.pdf.PDFSignatureService; -import eu.europa.ec.markt.dss.signature.pdf.PdfObjFactory; -import eu.europa.ec.markt.dss.signature.pdf.PdfSignatureInfo; -import eu.europa.ec.markt.dss.signature.pdf.PdfSignatureValidationCallback; -import eu.europa.ec.markt.dss.signature.validation.AdvancedSignature; -import eu.europa.ec.markt.dss.validation102853.SignedDocumentValidator; -import eu.europa.ec.markt.dss.validation102853.scope.PAdESSignatureScopeFinder; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUnsupportedOperationException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.pdf.PDFSignatureService; +import eu.europa.esig.dss.pdf.PdfObjFactory; +import eu.europa.esig.dss.pdf.PdfSignatureInfo; +import eu.europa.esig.dss.pdf.PdfSignatureValidationCallback; +import eu.europa.esig.dss.validation.AdvancedSignature; +import eu.europa.esig.dss.validation.SignedDocumentValidator; /** * Validation of PDF document. diff --git a/dss-pades/src/main/java/eu/europa/ec/markt/dss/validation102853/scope/PdfByteRangeSignatureScope.java b/dss-pades/src/main/java/eu/europa/esig/dss/pades/validation/PdfByteRangeSignatureScope.java similarity index 92% rename from dss-pades/src/main/java/eu/europa/ec/markt/dss/validation102853/scope/PdfByteRangeSignatureScope.java rename to dss-pades/src/main/java/eu/europa/esig/dss/pades/validation/PdfByteRangeSignatureScope.java index 2f57d9ce16..242bd75a27 100644 --- a/dss-pades/src/main/java/eu/europa/ec/markt/dss/validation102853/scope/PdfByteRangeSignatureScope.java +++ b/dss-pades/src/main/java/eu/europa/esig/dss/pades/validation/PdfByteRangeSignatureScope.java @@ -18,10 +18,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.scope; +package eu.europa.esig.dss.pades.validation; import java.util.Arrays; +import eu.europa.esig.dss.validation.PartialSignatureScope; + public class PdfByteRangeSignatureScope extends PartialSignatureScope { private final int[] byteRange; diff --git a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/PDFSignatureService.java b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/PDFSignatureService.java similarity index 90% rename from dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/PDFSignatureService.java rename to dss-pades/src/main/java/eu/europa/esig/dss/pdf/PDFSignatureService.java index 655053eb3b..12328f2a48 100644 --- a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/PDFSignatureService.java +++ b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/PDFSignatureService.java @@ -18,17 +18,17 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.pdf; +package eu.europa.esig.dss.pdf; import java.io.InputStream; import java.io.OutputStream; import java.security.SignatureException; import java.util.Map; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.parameter.PAdESSignatureParameters; -import eu.europa.ec.markt.dss.validation102853.CertificatePool; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.pades.PAdESSignatureParameters; +import eu.europa.esig.dss.x509.CertificatePool; /** * The usage of this interface permits the user to choose the underlying PDF library use to created PDF signatures. diff --git a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/PDFTimestampService.java b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/PDFTimestampService.java similarity index 82% rename from dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/PDFTimestampService.java rename to dss-pades/src/main/java/eu/europa/esig/dss/pdf/PDFTimestampService.java index 8b22d45156..d8ef598906 100644 --- a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/PDFTimestampService.java +++ b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/PDFTimestampService.java @@ -18,15 +18,15 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.pdf; +package eu.europa.esig.dss.pdf; import java.io.OutputStream; import java.util.Map; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.parameter.PAdESSignatureParameters; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.validation102853.tsp.TSPSource; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.pades.PAdESSignatureParameters; +import eu.europa.esig.dss.x509.tsp.TSPSource; /** * TODO diff --git a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/PdfArray.java b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/PdfArray.java similarity index 96% rename from dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/PdfArray.java rename to dss-pades/src/main/java/eu/europa/esig/dss/pdf/PdfArray.java index 0f80df3c44..ffd5ed240d 100644 --- a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/PdfArray.java +++ b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/PdfArray.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.pdf; +package eu.europa.esig.dss.pdf; import java.io.IOException; diff --git a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/PdfDict.java b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/PdfDict.java similarity index 97% rename from dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/PdfDict.java rename to dss-pades/src/main/java/eu/europa/esig/dss/pdf/PdfDict.java index f7e9ec13d0..90fa585131 100644 --- a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/PdfDict.java +++ b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/PdfDict.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.pdf; +package eu.europa.esig.dss.pdf; import java.io.IOException; import java.util.Calendar; diff --git a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/PdfDocTimestampInfo.java b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/PdfDocTimestampInfo.java similarity index 90% rename from dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/PdfDocTimestampInfo.java rename to dss-pades/src/main/java/eu/europa/esig/dss/pdf/PdfDocTimestampInfo.java index 728c47d9a2..4c180f42fb 100644 --- a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/PdfDocTimestampInfo.java +++ b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/PdfDocTimestampInfo.java @@ -18,9 +18,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.pdf; +package eu.europa.esig.dss.pdf; -import eu.europa.ec.markt.dss.signature.validation.TimestampToken; +import eu.europa.esig.dss.validation.TimestampToken; /** * TODO diff --git a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/PdfDocTimestampValidationCallback.java b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/PdfDocTimestampValidationCallback.java similarity index 97% rename from dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/PdfDocTimestampValidationCallback.java rename to dss-pades/src/main/java/eu/europa/esig/dss/pdf/PdfDocTimestampValidationCallback.java index 987cf5bad1..62e6ba67a2 100644 --- a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/PdfDocTimestampValidationCallback.java +++ b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/PdfDocTimestampValidationCallback.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.pdf; +package eu.europa.esig.dss.pdf; /** * Use this callback to be called only for Doc Timestamp, not for Signatures diff --git a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/PdfObjFactory.java b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/PdfObjFactory.java similarity index 96% rename from dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/PdfObjFactory.java rename to dss-pades/src/main/java/eu/europa/esig/dss/pdf/PdfObjFactory.java index 2321e541d5..169bc1a3b1 100644 --- a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/PdfObjFactory.java +++ b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/PdfObjFactory.java @@ -18,13 +18,13 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.pdf; +package eu.europa.esig.dss.pdf; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import eu.europa.ec.markt.dss.signature.pdf.pdfbox.PdfBoxObjectFactory; +import eu.europa.esig.dss.pdf.pdfbox.PdfBoxObjectFactory; /** * The usage of this interface permit the user to choose the underlying PDF library use to created PDF signatures. diff --git a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/PdfReader.java b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/PdfReader.java similarity index 96% rename from dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/PdfReader.java rename to dss-pades/src/main/java/eu/europa/esig/dss/pdf/PdfReader.java index 82c15be252..91f3f9e8c6 100644 --- a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/PdfReader.java +++ b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/PdfReader.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.pdf; +package eu.europa.esig.dss.pdf; /** * The usage of this interface permit the user to choose the underlying PDF library use to created PDF signatures. diff --git a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/PdfSignatureInfo.java b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/PdfSignatureInfo.java similarity index 90% rename from dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/PdfSignatureInfo.java rename to dss-pades/src/main/java/eu/europa/esig/dss/pdf/PdfSignatureInfo.java index f42355ed64..263ab7d9c1 100644 --- a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/PdfSignatureInfo.java +++ b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/PdfSignatureInfo.java @@ -18,9 +18,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.pdf; +package eu.europa.esig.dss.pdf; -import eu.europa.ec.markt.dss.validation102853.cades.CAdESSignature; +import eu.europa.esig.dss.cades.validation.CAdESSignature; /** * TODO diff --git a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/PdfSignatureOrDocTimestampInfo.java b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/PdfSignatureOrDocTimestampInfo.java similarity index 89% rename from dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/PdfSignatureOrDocTimestampInfo.java rename to dss-pades/src/main/java/eu/europa/esig/dss/pdf/PdfSignatureOrDocTimestampInfo.java index 42b36a944c..d06ba21269 100644 --- a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/PdfSignatureOrDocTimestampInfo.java +++ b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/PdfSignatureOrDocTimestampInfo.java @@ -18,15 +18,15 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.pdf; +package eu.europa.esig.dss.pdf; import java.security.cert.X509Certificate; import java.util.Date; import java.util.Set; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.signature.pdf.pdfbox.PdfDssDict; -import eu.europa.ec.markt.dss.validation102853.bean.SignatureCryptographicVerification; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.pdf.pdfbox.PdfDssDict; +import eu.europa.esig.dss.validation.SignatureCryptographicVerification; /** * The usage of this interface permit the user to choose the underlying PDF library use to created PDF signatures. diff --git a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/PdfSignatureValidationCallback.java b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/PdfSignatureValidationCallback.java similarity index 97% rename from dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/PdfSignatureValidationCallback.java rename to dss-pades/src/main/java/eu/europa/esig/dss/pdf/PdfSignatureValidationCallback.java index 1d974cf964..e1528d083a 100644 --- a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/PdfSignatureValidationCallback.java +++ b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/PdfSignatureValidationCallback.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.pdf; +package eu.europa.esig.dss.pdf; /** * Use this callback to be called only for Signatures, not for Doc Timestamp diff --git a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/PdfStream.java b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/PdfStream.java similarity index 96% rename from dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/PdfStream.java rename to dss-pades/src/main/java/eu/europa/esig/dss/pdf/PdfStream.java index b3ac5549a9..c276602610 100644 --- a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/PdfStream.java +++ b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/PdfStream.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.pdf; +package eu.europa.esig.dss.pdf; /** * The usage of this interface permit the user to choose the underlying PDF library use to created PDF signatures. diff --git a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/PdfWriter.java b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/PdfWriter.java similarity index 96% rename from dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/PdfWriter.java rename to dss-pades/src/main/java/eu/europa/esig/dss/pdf/PdfWriter.java index f9c9fa2cf4..ede5348825 100644 --- a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/PdfWriter.java +++ b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/PdfWriter.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.pdf; +package eu.europa.esig.dss.pdf; import java.io.IOException; diff --git a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/SignatureValidationCallback.java b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/SignatureValidationCallback.java similarity index 96% rename from dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/SignatureValidationCallback.java rename to dss-pades/src/main/java/eu/europa/esig/dss/pdf/SignatureValidationCallback.java index a438b189e3..916f2f97d2 100644 --- a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/SignatureValidationCallback.java +++ b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/SignatureValidationCallback.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.pdf; +package eu.europa.esig.dss.pdf; /** * diff --git a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/pdfbox/PdfBoxArray.java b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/pdfbox/PdfBoxArray.java similarity index 92% rename from dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/pdfbox/PdfBoxArray.java rename to dss-pades/src/main/java/eu/europa/esig/dss/pdf/pdfbox/PdfBoxArray.java index 6d167c2411..403120066b 100644 --- a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/pdfbox/PdfBoxArray.java +++ b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/pdfbox/PdfBoxArray.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.pdf.pdfbox; +package eu.europa.esig.dss.pdf.pdfbox; import java.io.IOException; @@ -28,9 +28,9 @@ import org.apache.pdfbox.cos.COSStream; import org.apache.pdfbox.pdmodel.PDDocument; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.signature.pdf.PdfArray; -import eu.europa.ec.markt.dss.signature.pdf.PdfStream; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.pdf.PdfArray; +import eu.europa.esig.dss.pdf.PdfStream; class PdfBoxArray implements PdfArray { diff --git a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/pdfbox/PdfBoxCMSInfo.java b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/pdfbox/PdfBoxCMSInfo.java similarity index 91% rename from dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/pdfbox/PdfBoxCMSInfo.java rename to dss-pades/src/main/java/eu/europa/esig/dss/pdf/pdfbox/PdfBoxCMSInfo.java index 1921d2c459..2ac405837f 100644 --- a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/pdfbox/PdfBoxCMSInfo.java +++ b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/pdfbox/PdfBoxCMSInfo.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.pdf.pdfbox; +package eu.europa.esig.dss.pdf.pdfbox; import java.io.IOException; import java.io.InputStream; @@ -36,14 +36,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.signature.pdf.PdfDict; -import eu.europa.ec.markt.dss.signature.pdf.PdfSignatureOrDocTimestampInfo; -import eu.europa.ec.markt.dss.validation102853.CertificatePool; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.validation102853.bean.SignatureCryptographicVerification; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.pdf.PdfDict; +import eu.europa.esig.dss.pdf.PdfSignatureOrDocTimestampInfo; +import eu.europa.esig.dss.validation.SignatureCryptographicVerification; +import eu.europa.esig.dss.x509.CertificatePool; +import eu.europa.esig.dss.x509.CertificateToken; abstract class PdfBoxCMSInfo implements PdfSignatureOrDocTimestampInfo { diff --git a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/pdfbox/PdfBoxDict.java b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/pdfbox/PdfBoxDict.java similarity index 96% rename from dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/pdfbox/PdfBoxDict.java rename to dss-pades/src/main/java/eu/europa/esig/dss/pdf/pdfbox/PdfBoxDict.java index e64fa96b75..47f79fcc20 100644 --- a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/pdfbox/PdfBoxDict.java +++ b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/pdfbox/PdfBoxDict.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.pdf.pdfbox; +package eu.europa.esig.dss.pdf.pdfbox; import java.io.IOException; import java.util.ArrayList; @@ -33,8 +33,8 @@ import org.apache.pdfbox.cos.COSString; import org.apache.pdfbox.pdmodel.PDDocument; -import eu.europa.ec.markt.dss.signature.pdf.PdfArray; -import eu.europa.ec.markt.dss.signature.pdf.PdfDict; +import eu.europa.esig.dss.pdf.PdfArray; +import eu.europa.esig.dss.pdf.PdfDict; class PdfBoxDict implements PdfDict { diff --git a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/pdfbox/PdfBoxDocTimeStampService.java b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/pdfbox/PdfBoxDocTimeStampService.java similarity index 80% rename from dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/pdfbox/PdfBoxDocTimeStampService.java rename to dss-pades/src/main/java/eu/europa/esig/dss/pdf/pdfbox/PdfBoxDocTimeStampService.java index 458dc9f2f5..5bd2aea821 100644 --- a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/pdfbox/PdfBoxDocTimeStampService.java +++ b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/pdfbox/PdfBoxDocTimeStampService.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.pdf.pdfbox; +package eu.europa.esig.dss.pdf.pdfbox; import java.io.InputStream; import java.io.OutputStream; @@ -28,15 +28,15 @@ import org.apache.pdfbox.cos.COSName; import org.bouncycastle.tsp.TimeStampToken; -import eu.europa.ec.markt.dss.DSSASN1Utils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.parameter.PAdESSignatureParameters; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.pdf.PDFSignatureService; -import eu.europa.ec.markt.dss.signature.pdf.PDFTimestampService; -import eu.europa.ec.markt.dss.signature.pdf.PdfDict; -import eu.europa.ec.markt.dss.validation102853.tsp.TSPSource; +import eu.europa.esig.dss.DSSASN1Utils; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.pades.PAdESSignatureParameters; +import eu.europa.esig.dss.pdf.PDFSignatureService; +import eu.europa.esig.dss.pdf.PDFTimestampService; +import eu.europa.esig.dss.pdf.PdfDict; +import eu.europa.esig.dss.x509.tsp.TSPSource; class PdfBoxDocTimeStampService extends PdfBoxSignatureService implements PDFSignatureService, PDFTimestampService { diff --git a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/pdfbox/PdfBoxDocTimestampInfo.java b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/pdfbox/PdfBoxDocTimestampInfo.java similarity index 88% rename from dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/pdfbox/PdfBoxDocTimestampInfo.java rename to dss-pades/src/main/java/eu/europa/esig/dss/pdf/pdfbox/PdfBoxDocTimestampInfo.java index d52934be22..7c588a2e21 100644 --- a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/pdfbox/PdfBoxDocTimestampInfo.java +++ b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/pdfbox/PdfBoxDocTimestampInfo.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.pdf.pdfbox; +package eu.europa.esig.dss.pdf.pdfbox; import java.io.IOException; import java.io.InputStream; @@ -34,14 +34,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.signature.pdf.PdfDict; -import eu.europa.ec.markt.dss.signature.pdf.PdfDocTimestampInfo; -import eu.europa.ec.markt.dss.signature.validation.TimestampToken; -import eu.europa.ec.markt.dss.validation102853.CertificatePool; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.validation102853.TimestampType; -import eu.europa.ec.markt.dss.validation102853.bean.SignatureCryptographicVerification; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.pdf.PdfDict; +import eu.europa.esig.dss.pdf.PdfDocTimestampInfo; +import eu.europa.esig.dss.validation.SignatureCryptographicVerification; +import eu.europa.esig.dss.validation.TimestampToken; +import eu.europa.esig.dss.x509.CertificatePool; +import eu.europa.esig.dss.x509.CertificateToken; +import eu.europa.esig.dss.x509.TimestampType; /** * TODO diff --git a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/pdfbox/PdfBoxObjectFactory.java b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/pdfbox/PdfBoxObjectFactory.java similarity index 79% rename from dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/pdfbox/PdfBoxObjectFactory.java rename to dss-pades/src/main/java/eu/europa/esig/dss/pdf/pdfbox/PdfBoxObjectFactory.java index 6b56fe9f85..c7335d696f 100644 --- a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/pdfbox/PdfBoxObjectFactory.java +++ b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/pdfbox/PdfBoxObjectFactory.java @@ -18,20 +18,20 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.pdf.pdfbox; +package eu.europa.esig.dss.pdf.pdfbox; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import eu.europa.ec.markt.dss.signature.pdf.PDFSignatureService; -import eu.europa.ec.markt.dss.signature.pdf.PDFTimestampService; -import eu.europa.ec.markt.dss.signature.pdf.PdfArray; -import eu.europa.ec.markt.dss.signature.pdf.PdfDict; -import eu.europa.ec.markt.dss.signature.pdf.PdfObjFactory; -import eu.europa.ec.markt.dss.signature.pdf.PdfReader; -import eu.europa.ec.markt.dss.signature.pdf.PdfStream; -import eu.europa.ec.markt.dss.signature.pdf.PdfWriter; +import eu.europa.esig.dss.pdf.PDFSignatureService; +import eu.europa.esig.dss.pdf.PDFTimestampService; +import eu.europa.esig.dss.pdf.PdfArray; +import eu.europa.esig.dss.pdf.PdfDict; +import eu.europa.esig.dss.pdf.PdfObjFactory; +import eu.europa.esig.dss.pdf.PdfReader; +import eu.europa.esig.dss.pdf.PdfStream; +import eu.europa.esig.dss.pdf.PdfWriter; public class PdfBoxObjectFactory extends PdfObjFactory { diff --git a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/pdfbox/PdfBoxReader.java b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/pdfbox/PdfBoxReader.java similarity index 94% rename from dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/pdfbox/PdfBoxReader.java rename to dss-pades/src/main/java/eu/europa/esig/dss/pdf/pdfbox/PdfBoxReader.java index d320bf0fab..b02d935304 100644 --- a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/pdfbox/PdfBoxReader.java +++ b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/pdfbox/PdfBoxReader.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.pdf.pdfbox; +package eu.europa.esig.dss.pdf.pdfbox; import java.io.IOException; import java.io.InputStream; @@ -27,7 +27,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.signature.pdf.PdfReader; +import eu.europa.esig.dss.pdf.PdfReader; class PdfBoxReader implements PdfReader { diff --git a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/pdfbox/PdfBoxSignatureInfo.java b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/pdfbox/PdfBoxSignatureInfo.java similarity index 87% rename from dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/pdfbox/PdfBoxSignatureInfo.java rename to dss-pades/src/main/java/eu/europa/esig/dss/pdf/pdfbox/PdfBoxSignatureInfo.java index 696121230a..4980e58e07 100644 --- a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/pdfbox/PdfBoxSignatureInfo.java +++ b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/pdfbox/PdfBoxSignatureInfo.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.pdf.pdfbox; +package eu.europa.esig.dss.pdf.pdfbox; import java.io.IOException; import java.io.InputStream; @@ -31,13 +31,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.signature.InMemoryDocument; -import eu.europa.ec.markt.dss.signature.pdf.PdfDict; -import eu.europa.ec.markt.dss.signature.pdf.PdfSignatureInfo; -import eu.europa.ec.markt.dss.validation102853.CertificatePool; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.validation102853.bean.SignatureCryptographicVerification; -import eu.europa.ec.markt.dss.validation102853.cades.CAdESSignature; +import eu.europa.esig.dss.InMemoryDocument; +import eu.europa.esig.dss.cades.validation.CAdESSignature; +import eu.europa.esig.dss.pdf.PdfDict; +import eu.europa.esig.dss.pdf.PdfSignatureInfo; +import eu.europa.esig.dss.validation.SignatureCryptographicVerification; +import eu.europa.esig.dss.x509.CertificatePool; +import eu.europa.esig.dss.x509.CertificateToken; class PdfBoxSignatureInfo extends PdfBoxCMSInfo implements PdfSignatureInfo { diff --git a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/pdfbox/PdfBoxSignatureService.java b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/pdfbox/PdfBoxSignatureService.java similarity index 94% rename from dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/pdfbox/PdfBoxSignatureService.java rename to dss-pades/src/main/java/eu/europa/esig/dss/pdf/pdfbox/PdfBoxSignatureService.java index ca1b33a8c4..694e6b6efb 100644 --- a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/pdfbox/PdfBoxSignatureService.java +++ b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/pdfbox/PdfBoxSignatureService.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.pdf.pdfbox; +package eu.europa.esig.dss.pdf.pdfbox; import java.awt.Dimension; import java.io.ByteArrayInputStream; @@ -55,20 +55,20 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.parameter.PAdESSignatureParameters; -import eu.europa.ec.markt.dss.parameter.SignatureImageParameters; -import eu.europa.ec.markt.dss.signature.DSSPDFUtils; -import eu.europa.ec.markt.dss.signature.pades.visible.ImageFactory; -import eu.europa.ec.markt.dss.signature.pdf.PDFSignatureService; -import eu.europa.ec.markt.dss.signature.pdf.PdfDict; -import eu.europa.ec.markt.dss.signature.pdf.PdfDocTimestampInfo; -import eu.europa.ec.markt.dss.signature.pdf.PdfSignatureOrDocTimestampInfo; -import eu.europa.ec.markt.dss.signature.pdf.SignatureValidationCallback; -import eu.europa.ec.markt.dss.validation102853.CertificatePool; -import eu.europa.ec.markt.dss.validation102853.TimestampType; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.pades.PAdESSignatureParameters; +import eu.europa.esig.dss.pades.SignatureImageParameters; +import eu.europa.esig.dss.pades.signature.DSSPDFUtils; +import eu.europa.esig.dss.pades.signature.visible.ImageFactory; +import eu.europa.esig.dss.pdf.PDFSignatureService; +import eu.europa.esig.dss.pdf.PdfDict; +import eu.europa.esig.dss.pdf.PdfDocTimestampInfo; +import eu.europa.esig.dss.pdf.PdfSignatureOrDocTimestampInfo; +import eu.europa.esig.dss.pdf.SignatureValidationCallback; +import eu.europa.esig.dss.x509.CertificatePool; +import eu.europa.esig.dss.x509.TimestampType; class PdfBoxSignatureService implements PDFSignatureService { diff --git a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/pdfbox/PdfBoxStream.java b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/pdfbox/PdfBoxStream.java similarity index 93% rename from dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/pdfbox/PdfBoxStream.java rename to dss-pades/src/main/java/eu/europa/esig/dss/pdf/pdfbox/PdfBoxStream.java index 7b8f0fcf05..c825b0a42c 100644 --- a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/pdfbox/PdfBoxStream.java +++ b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/pdfbox/PdfBoxStream.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.pdf.pdfbox; +package eu.europa.esig.dss.pdf.pdfbox; import java.io.IOException; import java.io.OutputStream; @@ -26,7 +26,7 @@ import org.apache.pdfbox.cos.COSStream; import org.apache.pdfbox.io.RandomAccessBuffer; -import eu.europa.ec.markt.dss.signature.pdf.PdfStream; +import eu.europa.esig.dss.pdf.PdfStream; class PdfBoxStream implements PdfStream { diff --git a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/pdfbox/PdfBoxWriter.java b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/pdfbox/PdfBoxWriter.java similarity index 95% rename from dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/pdfbox/PdfBoxWriter.java rename to dss-pades/src/main/java/eu/europa/esig/dss/pdf/pdfbox/PdfBoxWriter.java index ab66626229..7d64536ee6 100644 --- a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/pdfbox/PdfBoxWriter.java +++ b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/pdfbox/PdfBoxWriter.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.pdf.pdfbox; +package eu.europa.esig.dss.pdf.pdfbox; import java.io.File; import java.io.FileInputStream; @@ -30,7 +30,7 @@ import org.apache.pdfbox.exceptions.COSVisitorException; import org.apache.pdfbox.pdmodel.PDDocument; -import eu.europa.ec.markt.dss.signature.pdf.PdfWriter; +import eu.europa.esig.dss.pdf.PdfWriter; class PdfBoxWriter implements PdfWriter { diff --git a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/pdfbox/PdfDssDict.java b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/pdfbox/PdfDssDict.java similarity index 93% rename from dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/pdfbox/PdfDssDict.java rename to dss-pades/src/main/java/eu/europa/esig/dss/pdf/pdfbox/PdfDssDict.java index b6356a9dad..f4ddd391a7 100644 --- a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/pdfbox/PdfDssDict.java +++ b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/pdfbox/PdfDssDict.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.pdf.pdfbox; +package eu.europa.esig.dss.pdf.pdfbox; import java.io.IOException; import java.security.cert.X509CRL; @@ -33,11 +33,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.signature.DSSPDFUtils; -import eu.europa.ec.markt.dss.signature.pdf.PdfArray; -import eu.europa.ec.markt.dss.signature.pdf.PdfDict; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.pades.signature.DSSPDFUtils; +import eu.europa.esig.dss.pdf.PdfArray; +import eu.europa.esig.dss.pdf.PdfDict; +import eu.europa.esig.dss.x509.CertificateToken; public class PdfDssDict { diff --git a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/pdfbox/PdfSignatureFactory.java b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/pdfbox/PdfSignatureFactory.java similarity index 88% rename from dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/pdfbox/PdfSignatureFactory.java rename to dss-pades/src/main/java/eu/europa/esig/dss/pdf/pdfbox/PdfSignatureFactory.java index 7d50ed37d2..e93572c7e3 100644 --- a/dss-pades/src/main/java/eu/europa/ec/markt/dss/signature/pdf/pdfbox/PdfSignatureFactory.java +++ b/dss-pades/src/main/java/eu/europa/esig/dss/pdf/pdfbox/PdfSignatureFactory.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.pdf.pdfbox; +package eu.europa.esig.dss.pdf.pdfbox; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -27,10 +27,10 @@ import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.interactive.digitalsignature.PDSignature; -import eu.europa.ec.markt.dss.signature.pdf.PdfDict; -import eu.europa.ec.markt.dss.signature.pdf.PdfDocTimestampInfo; -import eu.europa.ec.markt.dss.signature.pdf.PdfSignatureInfo; -import eu.europa.ec.markt.dss.validation102853.CertificatePool; +import eu.europa.esig.dss.pdf.PdfDict; +import eu.europa.esig.dss.pdf.PdfDocTimestampInfo; +import eu.europa.esig.dss.pdf.PdfSignatureInfo; +import eu.europa.esig.dss.x509.CertificatePool; /** * TODO diff --git a/dss-pades/src/test/java/eu/europa/ec/markt/dss/DigestStabilityTest.java b/dss-pades/src/test/java/eu/europa/esig/dss/pades/DigestStabilityTest.java similarity index 88% rename from dss-pades/src/test/java/eu/europa/ec/markt/dss/DigestStabilityTest.java rename to dss-pades/src/test/java/eu/europa/esig/dss/pades/DigestStabilityTest.java index b58495eb91..6d829c522a 100644 --- a/dss-pades/src/test/java/eu/europa/ec/markt/dss/DigestStabilityTest.java +++ b/dss-pades/src/test/java/eu/europa/esig/dss/pades/DigestStabilityTest.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss; +package eu.europa.esig.dss.pades; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; @@ -30,16 +30,18 @@ import org.apache.commons.codec.binary.Base64; import org.junit.Test; -import eu.europa.ec.markt.dss.parameter.PAdESSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.pades.PAdESService; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.pades.PAdESSignatureParameters; +import eu.europa.esig.dss.pades.signature.PAdESService; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; /** * This class checks if the getDataToSign result is equals when passing the same diff --git a/dss-pades/src/test/java/eu/europa/ec/markt/dss/PAdESDoubleSignatureTest.java b/dss-pades/src/test/java/eu/europa/esig/dss/pades/PAdESDoubleSignatureTest.java similarity index 82% rename from dss-pades/src/test/java/eu/europa/ec/markt/dss/PAdESDoubleSignatureTest.java rename to dss-pades/src/test/java/eu/europa/esig/dss/pades/PAdESDoubleSignatureTest.java index 471d70a3b2..562ade4a9b 100644 --- a/dss-pades/src/test/java/eu/europa/ec/markt/dss/PAdESDoubleSignatureTest.java +++ b/dss-pades/src/test/java/eu/europa/esig/dss/pades/PAdESDoubleSignatureTest.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss; +package eu.europa.esig.dss.pades; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -34,19 +34,20 @@ import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -import eu.europa.ec.markt.dss.mock.MockTSPSource; -import eu.europa.ec.markt.dss.parameter.PAdESSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.pades.PAdESService; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.utils.TestUtils; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.SignedDocumentValidator; -import eu.europa.ec.markt.dss.validation102853.report.DiagnosticData; -import eu.europa.ec.markt.dss.validation102853.report.Reports; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.pades.PAdESSignatureParameters; +import eu.europa.esig.dss.pades.signature.PAdESService; +import eu.europa.esig.dss.test.TestUtils; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.test.mock.MockTSPSource; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.SignedDocumentValidator; +import eu.europa.esig.dss.validation.report.DiagnosticData; +import eu.europa.esig.dss.validation.report.Reports; @RunWith(Parameterized.class) public class PAdESDoubleSignatureTest { diff --git a/dss-pades/src/test/java/eu/europa/ec/markt/dss/extension/pades/AbstractTestPAdESExtension.java b/dss-pades/src/test/java/eu/europa/esig/dss/pades/extension/AbstractTestPAdESExtension.java similarity index 78% rename from dss-pades/src/test/java/eu/europa/ec/markt/dss/extension/pades/AbstractTestPAdESExtension.java rename to dss-pades/src/test/java/eu/europa/esig/dss/pades/extension/AbstractTestPAdESExtension.java index b4817c4cb5..955185ac3f 100644 --- a/dss-pades/src/test/java/eu/europa/ec/markt/dss/extension/pades/AbstractTestPAdESExtension.java +++ b/dss-pades/src/test/java/eu/europa/esig/dss/pades/extension/AbstractTestPAdESExtension.java @@ -18,24 +18,24 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.extension.pades; +package eu.europa.esig.dss.pades.extension; import java.io.File; import java.util.Date; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.extension.AbstractTestExtension; -import eu.europa.ec.markt.dss.mock.MockTSPSource; -import eu.europa.ec.markt.dss.parameter.PAdESSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.pades.PAdESService; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.extension.AbstractTestExtension; +import eu.europa.esig.dss.pades.PAdESSignatureParameters; +import eu.europa.esig.dss.pades.signature.PAdESService; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.test.mock.MockTSPSource; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; public abstract class AbstractTestPAdESExtension extends AbstractTestExtension { diff --git a/dss-pades/src/test/java/eu/europa/ec/markt/dss/extension/pades/PAdESExtensionBToLTATest.java b/dss-pades/src/test/java/eu/europa/esig/dss/pades/extension/PAdESExtensionBToLTATest.java similarity index 92% rename from dss-pades/src/test/java/eu/europa/ec/markt/dss/extension/pades/PAdESExtensionBToLTATest.java rename to dss-pades/src/test/java/eu/europa/esig/dss/pades/extension/PAdESExtensionBToLTATest.java index 97ab1630b4..ed58195f67 100644 --- a/dss-pades/src/test/java/eu/europa/ec/markt/dss/extension/pades/PAdESExtensionBToLTATest.java +++ b/dss-pades/src/test/java/eu/europa/esig/dss/pades/extension/PAdESExtensionBToLTATest.java @@ -18,9 +18,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.extension.pades; +package eu.europa.esig.dss.pades.extension; -import eu.europa.ec.markt.dss.signature.SignatureLevel; +import eu.europa.esig.dss.SignatureLevel; public class PAdESExtensionBToLTATest extends AbstractTestPAdESExtension { diff --git a/dss-pades/src/test/java/eu/europa/ec/markt/dss/extension/pades/PAdESExtensionBToTTest.java b/dss-pades/src/test/java/eu/europa/esig/dss/pades/extension/PAdESExtensionBToTTest.java similarity index 92% rename from dss-pades/src/test/java/eu/europa/ec/markt/dss/extension/pades/PAdESExtensionBToTTest.java rename to dss-pades/src/test/java/eu/europa/esig/dss/pades/extension/PAdESExtensionBToTTest.java index 84cc35d07f..fa5e7a5c89 100644 --- a/dss-pades/src/test/java/eu/europa/ec/markt/dss/extension/pades/PAdESExtensionBToTTest.java +++ b/dss-pades/src/test/java/eu/europa/esig/dss/pades/extension/PAdESExtensionBToTTest.java @@ -18,9 +18,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.extension.pades; +package eu.europa.esig.dss.pades.extension; -import eu.europa.ec.markt.dss.signature.SignatureLevel; +import eu.europa.esig.dss.SignatureLevel; public class PAdESExtensionBToTTest extends AbstractTestPAdESExtension { diff --git a/dss-pades/src/test/java/eu/europa/ec/markt/dss/extension/pades/PAdESExtensionLTAToLTATest.java b/dss-pades/src/test/java/eu/europa/esig/dss/pades/extension/PAdESExtensionLTAToLTATest.java similarity index 74% rename from dss-pades/src/test/java/eu/europa/ec/markt/dss/extension/pades/PAdESExtensionLTAToLTATest.java rename to dss-pades/src/test/java/eu/europa/esig/dss/pades/extension/PAdESExtensionLTAToLTATest.java index 9ba741580f..9f3d0135b2 100644 --- a/dss-pades/src/test/java/eu/europa/ec/markt/dss/extension/pades/PAdESExtensionLTAToLTATest.java +++ b/dss-pades/src/test/java/eu/europa/esig/dss/pades/extension/PAdESExtensionLTAToLTATest.java @@ -1,6 +1,6 @@ -package eu.europa.ec.markt.dss.extension.pades; +package eu.europa.esig.dss.pades.extension; -import eu.europa.ec.markt.dss.signature.SignatureLevel; +import eu.europa.esig.dss.SignatureLevel; public class PAdESExtensionLTAToLTATest extends AbstractTestPAdESExtension { diff --git a/dss-pades/src/test/java/eu/europa/ec/markt/dss/extension/pades/PAdESExtensionTToLTATest.java b/dss-pades/src/test/java/eu/europa/esig/dss/pades/extension/PAdESExtensionTToLTATest.java similarity index 92% rename from dss-pades/src/test/java/eu/europa/ec/markt/dss/extension/pades/PAdESExtensionTToLTATest.java rename to dss-pades/src/test/java/eu/europa/esig/dss/pades/extension/PAdESExtensionTToLTATest.java index 58fbc8939c..c6b76c4f56 100644 --- a/dss-pades/src/test/java/eu/europa/ec/markt/dss/extension/pades/PAdESExtensionTToLTATest.java +++ b/dss-pades/src/test/java/eu/europa/esig/dss/pades/extension/PAdESExtensionTToLTATest.java @@ -18,9 +18,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.extension.pades; +package eu.europa.esig.dss.pades.extension; -import eu.europa.ec.markt.dss.signature.SignatureLevel; +import eu.europa.esig.dss.SignatureLevel; public class PAdESExtensionTToLTATest extends AbstractTestPAdESExtension { diff --git a/dss-pades/src/test/java/eu/europa/ec/markt/dss/signature/pades/PAdESLevelBTest.java b/dss-pades/src/test/java/eu/europa/esig/dss/pades/signature/PAdESLevelBTest.java similarity index 89% rename from dss-pades/src/test/java/eu/europa/ec/markt/dss/signature/pades/PAdESLevelBTest.java rename to dss-pades/src/test/java/eu/europa/esig/dss/pades/signature/PAdESLevelBTest.java index 8bc003200a..c9dd652e99 100644 --- a/dss-pades/src/test/java/eu/europa/ec/markt/dss/signature/pades/PAdESLevelBTest.java +++ b/dss-pades/src/test/java/eu/europa/esig/dss/pades/signature/PAdESLevelBTest.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.pades; +package eu.europa.esig.dss.pades.signature; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -32,7 +32,6 @@ import java.security.cert.X509Certificate; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.Date; import java.util.List; @@ -66,23 +65,22 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.ASN1ObjectIdentifierComparator; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.EncryptionAlgorithm; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.parameter.PAdESSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.AbstractTestSignature; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.EncryptionAlgorithm; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.pades.PAdESSignatureParameters; +import eu.europa.esig.dss.signature.AbstractTestSignature; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; public class PAdESLevelBTest extends AbstractTestSignature { @@ -168,11 +166,6 @@ protected void onDocumentSigned(byte[] byteArray) { } logger.info("List of OID for Auth Attrb : " + attributeOids); - List attributeOidsSorted = new ArrayList(attributeOids); - Collections.sort(attributeOidsSorted, new ASN1ObjectIdentifierComparator()); - - assertEquals(attributeOids, attributeOidsSorted); - Attribute attributeDigest = Attribute.getInstance(authenticatedAttributeSet.getObjectAt(1)); assertEquals(PKCSObjectIdentifiers.pkcs_9_at_messageDigest, attributeDigest.getAttrType()); diff --git a/dss-pades/src/test/java/eu/europa/ec/markt/dss/signature/pades/PAdESLevelLTATest.java b/dss-pades/src/test/java/eu/europa/esig/dss/pades/signature/PAdESLevelLTATest.java similarity index 75% rename from dss-pades/src/test/java/eu/europa/ec/markt/dss/signature/pades/PAdESLevelLTATest.java rename to dss-pades/src/test/java/eu/europa/esig/dss/pades/signature/PAdESLevelLTATest.java index c74981bc18..a020d63cc6 100644 --- a/dss-pades/src/test/java/eu/europa/ec/markt/dss/signature/pades/PAdESLevelLTATest.java +++ b/dss-pades/src/test/java/eu/europa/esig/dss/pades/signature/PAdESLevelLTATest.java @@ -18,28 +18,29 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.pades; +package eu.europa.esig.dss.pades.signature; import java.io.File; import java.util.Date; import org.junit.Before; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.mock.MockTSPSource; -import eu.europa.ec.markt.dss.parameter.AbstractSignatureParameters; -import eu.europa.ec.markt.dss.parameter.PAdESSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.AbstractTestSignature; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; +import eu.europa.esig.dss.AbstractSignatureParameters; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.pades.PAdESSignatureParameters; +import eu.europa.esig.dss.pades.signature.PAdESService; +import eu.europa.esig.dss.signature.AbstractTestSignature; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.test.mock.MockTSPSource; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; public class PAdESLevelLTATest extends AbstractTestSignature { diff --git a/dss-pades/src/test/java/eu/europa/ec/markt/dss/signature/pades/PAdESLevelTTest.java b/dss-pades/src/test/java/eu/europa/esig/dss/pades/signature/PAdESLevelTTest.java similarity index 75% rename from dss-pades/src/test/java/eu/europa/ec/markt/dss/signature/pades/PAdESLevelTTest.java rename to dss-pades/src/test/java/eu/europa/esig/dss/pades/signature/PAdESLevelTTest.java index 9316ff86ad..df4c6378da 100644 --- a/dss-pades/src/test/java/eu/europa/ec/markt/dss/signature/pades/PAdESLevelTTest.java +++ b/dss-pades/src/test/java/eu/europa/esig/dss/pades/signature/PAdESLevelTTest.java @@ -18,28 +18,29 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.pades; +package eu.europa.esig.dss.pades.signature; import java.io.File; import java.util.Date; import org.junit.Before; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.mock.MockTSPSource; -import eu.europa.ec.markt.dss.parameter.AbstractSignatureParameters; -import eu.europa.ec.markt.dss.parameter.PAdESSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.AbstractTestSignature; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; +import eu.europa.esig.dss.AbstractSignatureParameters; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.pades.PAdESSignatureParameters; +import eu.europa.esig.dss.pades.signature.PAdESService; +import eu.europa.esig.dss.signature.AbstractTestSignature; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.test.mock.MockTSPSource; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; public class PAdESLevelTTest extends AbstractTestSignature { diff --git a/dss-pades/src/test/java/eu/europa/ec/markt/dss/signature/pades/PAdESVisibleSignatureTest.java b/dss-pades/src/test/java/eu/europa/esig/dss/pades/signature/PAdESVisibleSignatureTest.java similarity index 81% rename from dss-pades/src/test/java/eu/europa/ec/markt/dss/signature/pades/PAdESVisibleSignatureTest.java rename to dss-pades/src/test/java/eu/europa/esig/dss/pades/signature/PAdESVisibleSignatureTest.java index 2e3c8a3f0b..003f78c7d8 100644 --- a/dss-pades/src/test/java/eu/europa/ec/markt/dss/signature/pades/PAdESVisibleSignatureTest.java +++ b/dss-pades/src/test/java/eu/europa/esig/dss/pades/signature/PAdESVisibleSignatureTest.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.pades; +package eu.europa.esig.dss.pades.signature; import static org.junit.Assert.assertTrue; @@ -31,24 +31,25 @@ import org.junit.Before; import org.junit.Test; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.parameter.PAdESSignatureParameters; -import eu.europa.ec.markt.dss.parameter.SignatureImageParameters; -import eu.europa.ec.markt.dss.parameter.SignatureImageTextParameters; -import eu.europa.ec.markt.dss.parameter.SignatureImageTextParameters.SignerPosition; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.utils.TestUtils; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.SignedDocumentValidator; -import eu.europa.ec.markt.dss.validation102853.report.DiagnosticData; -import eu.europa.ec.markt.dss.validation102853.report.Reports; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.pades.PAdESSignatureParameters; +import eu.europa.esig.dss.pades.SignatureImageParameters; +import eu.europa.esig.dss.pades.SignatureImageTextParameters; +import eu.europa.esig.dss.pades.SignatureImageTextParameters.SignerPosition; +import eu.europa.esig.dss.pades.signature.PAdESService; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.TestUtils; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.SignedDocumentValidator; +import eu.europa.esig.dss.validation.report.DiagnosticData; +import eu.europa.esig.dss.validation.report.Reports; public class PAdESVisibleSignatureTest { diff --git a/dss-pades/src/test/java/known/issues/DSS667/InfiniteLoopDSS621Test.java b/dss-pades/src/test/java/known/issues/DSS667/InfiniteLoopDSS621Test.java index 2624348e7f..807dd75ad4 100644 --- a/dss-pades/src/test/java/known/issues/DSS667/InfiniteLoopDSS621Test.java +++ b/dss-pades/src/test/java/known/issues/DSS667/InfiniteLoopDSS621Test.java @@ -67,16 +67,16 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.EncryptionAlgorithm; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.signature.validation.AdvancedSignature; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.SignedDocumentValidator; -import eu.europa.ec.markt.dss.validation102853.bean.SignatureCryptographicVerification; -import eu.europa.ec.markt.dss.validation102853.report.Reports; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.EncryptionAlgorithm; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.validation.AdvancedSignature; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.SignatureCryptographicVerification; +import eu.europa.esig.dss.validation.SignedDocumentValidator; +import eu.europa.esig.dss.validation.report.Reports; public class InfiniteLoopDSS621Test { diff --git a/dss-pades/src/test/java/plugtests/ETSISamplesValidationTest.java b/dss-pades/src/test/java/plugtests/ETSISamplesValidationTest.java index e385d3e382..354ca0b9e9 100644 --- a/dss-pades/src/test/java/plugtests/ETSISamplesValidationTest.java +++ b/dss-pades/src/test/java/plugtests/ETSISamplesValidationTest.java @@ -12,13 +12,13 @@ import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.SignedDocumentValidator; -import eu.europa.ec.markt.dss.validation102853.report.DetailedReport; -import eu.europa.ec.markt.dss.validation102853.report.DiagnosticData; -import eu.europa.ec.markt.dss.validation102853.report.Reports; -import eu.europa.ec.markt.dss.validation102853.report.SimpleReport; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.SignedDocumentValidator; +import eu.europa.esig.dss.validation.report.DetailedReport; +import eu.europa.esig.dss.validation.report.DiagnosticData; +import eu.europa.esig.dss.validation.report.Reports; +import eu.europa.esig.dss.validation.report.SimpleReport; /** * This test is only to ensure that we don't have exception with valid? files diff --git a/dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/NonceSource.java b/dss-service/src/main/java/eu/europa/esig/dss/client/NonceSource.java similarity index 96% rename from dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/NonceSource.java rename to dss-service/src/main/java/eu/europa/esig/dss/client/NonceSource.java index c7124ff344..72e8dc9cd6 100644 --- a/dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/NonceSource.java +++ b/dss-service/src/main/java/eu/europa/esig/dss/client/NonceSource.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853; +package eu.europa.esig.dss.client; import java.math.BigInteger; diff --git a/dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/crl/CachedCRL.java b/dss-service/src/main/java/eu/europa/esig/dss/client/crl/CachedCRL.java similarity index 96% rename from dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/crl/CachedCRL.java rename to dss-service/src/main/java/eu/europa/esig/dss/client/crl/CachedCRL.java index e9795f8dcc..08cce5184a 100644 --- a/dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/crl/CachedCRL.java +++ b/dss-service/src/main/java/eu/europa/esig/dss/client/crl/CachedCRL.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.crl; +package eu.europa.esig.dss.client.crl; /** * Represent CRL stored in the cache. diff --git a/dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/crl/JdbcCacheCRLSource.java b/dss-service/src/main/java/eu/europa/esig/dss/client/crl/JdbcCacheCRLSource.java similarity index 97% rename from dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/crl/JdbcCacheCRLSource.java rename to dss-service/src/main/java/eu/europa/esig/dss/client/crl/JdbcCacheCRLSource.java index 4c0ed4b3c7..c6212a4d9f 100644 --- a/dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/crl/JdbcCacheCRLSource.java +++ b/dss-service/src/main/java/eu/europa/esig/dss/client/crl/JdbcCacheCRLSource.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.crl; +package eu.europa.esig.dss.client.crl; import java.security.cert.X509CRL; import java.sql.Connection; @@ -35,9 +35,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.x509.CertificateToken; +import eu.europa.esig.dss.x509.crl.CRLSource; +import eu.europa.esig.dss.x509.crl.CRLToken; +import eu.europa.esig.dss.x509.crl.CRLUtils; +import eu.europa.esig.dss.x509.crl.CRLValidity; /** * CRLSource that retrieve information from a JDBC datasource diff --git a/dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/crl/OnlineCRLSource.java b/dss-service/src/main/java/eu/europa/esig/dss/client/crl/OnlineCRLSource.java similarity index 93% rename from dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/crl/OnlineCRLSource.java rename to dss-service/src/main/java/eu/europa/esig/dss/client/crl/OnlineCRLSource.java index 25b45a0a03..0fe454b450 100644 --- a/dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/crl/OnlineCRLSource.java +++ b/dss-service/src/main/java/eu/europa/esig/dss/client/crl/OnlineCRLSource.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.crl; +package eu.europa.esig.dss.client.crl; import java.security.cert.X509CRL; import java.util.ArrayList; @@ -37,13 +37,17 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.DSSASN1Utils; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.validation102853.https.CommonsDataLoader; -import eu.europa.ec.markt.dss.validation102853.loader.DataLoader; -import eu.europa.ec.markt.dss.validation102853.loader.Protocol; +import eu.europa.esig.dss.DSSASN1Utils; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.client.http.DataLoader; +import eu.europa.esig.dss.client.http.Protocol; +import eu.europa.esig.dss.client.http.commons.CommonsDataLoader; +import eu.europa.esig.dss.x509.CertificateToken; +import eu.europa.esig.dss.x509.crl.CRLSource; +import eu.europa.esig.dss.x509.crl.CRLToken; +import eu.europa.esig.dss.x509.crl.CRLUtils; +import eu.europa.esig.dss.x509.crl.CRLValidity; /** * Online CRL repository. This CRL repository implementation will download the CRLs from the given CRL URIs. diff --git a/dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/https/CommonsDataLoader.java b/dss-service/src/main/java/eu/europa/esig/dss/client/http/commons/CommonsDataLoader.java similarity index 98% rename from dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/https/CommonsDataLoader.java rename to dss-service/src/main/java/eu/europa/esig/dss/client/http/commons/CommonsDataLoader.java index 22c68f66c1..7e90b6703a 100644 --- a/dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/https/CommonsDataLoader.java +++ b/dss-service/src/main/java/eu/europa/esig/dss/client/http/commons/CommonsDataLoader.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.https; +package eu.europa.esig.dss.client.http.commons; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -74,11 +74,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.manager.ProxyPreferenceManager; -import eu.europa.ec.markt.dss.validation102853.loader.DataLoader; -import eu.europa.ec.markt.dss.validation102853.loader.Protocol; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.client.http.DataLoader; +import eu.europa.esig.dss.client.http.Protocol; +import eu.europa.esig.dss.client.http.proxy.ProxyPreferenceManager; /** * Implementation of DataLoader for any protocol.

diff --git a/dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/https/DSSNotifier.java b/dss-service/src/main/java/eu/europa/esig/dss/client/http/commons/DSSNotifier.java similarity index 95% rename from dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/https/DSSNotifier.java rename to dss-service/src/main/java/eu/europa/esig/dss/client/http/commons/DSSNotifier.java index 9f49ac6454..b7c15d983b 100644 --- a/dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/https/DSSNotifier.java +++ b/dss-service/src/main/java/eu/europa/esig/dss/client/http/commons/DSSNotifier.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.https; +package eu.europa.esig.dss.client.http.commons; /** * This interface defines the common way to send events. diff --git a/dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/https/DefaultTrustManager.java b/dss-service/src/main/java/eu/europa/esig/dss/client/http/commons/DefaultTrustManager.java similarity index 96% rename from dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/https/DefaultTrustManager.java rename to dss-service/src/main/java/eu/europa/esig/dss/client/http/commons/DefaultTrustManager.java index de208a4d86..764fa9a64e 100644 --- a/dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/https/DefaultTrustManager.java +++ b/dss-service/src/main/java/eu/europa/esig/dss/client/http/commons/DefaultTrustManager.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.https; +package eu.europa.esig.dss.client.http.commons; import java.security.cert.CertificateException; import java.security.cert.X509Certificate; diff --git a/dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/https/FileCacheDataLoader.java b/dss-service/src/main/java/eu/europa/esig/dss/client/http/commons/FileCacheDataLoader.java similarity index 95% rename from dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/https/FileCacheDataLoader.java rename to dss-service/src/main/java/eu/europa/esig/dss/client/http/commons/FileCacheDataLoader.java index 484d42618c..f5cb61b7ac 100644 --- a/dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/https/FileCacheDataLoader.java +++ b/dss-service/src/main/java/eu/europa/esig/dss/client/http/commons/FileCacheDataLoader.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.https; +package eu.europa.esig.dss.client.http.commons; import java.io.ByteArrayInputStream; import java.io.File; @@ -37,12 +37,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.ResourceLoader; -import eu.europa.ec.markt.dss.exception.DSSCannotFetchDataException; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.validation102853.loader.Protocol; +import eu.europa.esig.dss.DSSCannotFetchDataException; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.ResourceLoader; +import eu.europa.esig.dss.client.http.Protocol; /** * This class provides some caching features to handle the resources. The default cache folder is set to {@code java.io.tmpdir}. The urls of the resources is transformed to the diff --git a/dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/https/OCSPDataLoader.java b/dss-service/src/main/java/eu/europa/esig/dss/client/http/commons/OCSPDataLoader.java similarity index 97% rename from dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/https/OCSPDataLoader.java rename to dss-service/src/main/java/eu/europa/esig/dss/client/http/commons/OCSPDataLoader.java index b43db538c4..3543904dc0 100644 --- a/dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/https/OCSPDataLoader.java +++ b/dss-service/src/main/java/eu/europa/esig/dss/client/http/commons/OCSPDataLoader.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.https; +package eu.europa.esig.dss.client.http.commons; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dss-service/src/main/java/eu/europa/ec/markt/dss/dao/ProxyDao.java b/dss-service/src/main/java/eu/europa/esig/dss/client/http/proxy/ProxyDao.java similarity index 97% rename from dss-service/src/main/java/eu/europa/ec/markt/dss/dao/ProxyDao.java rename to dss-service/src/main/java/eu/europa/esig/dss/client/http/proxy/ProxyDao.java index 76faf0f5d2..5ff3e1f1de 100644 --- a/dss-service/src/main/java/eu/europa/ec/markt/dss/dao/ProxyDao.java +++ b/dss-service/src/main/java/eu/europa/esig/dss/client/http/proxy/ProxyDao.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.dao; +package eu.europa.esig.dss.client.http.proxy; import java.util.Collection; diff --git a/dss-service/src/main/java/eu/europa/ec/markt/dss/dao/ProxyDaoException.java b/dss-service/src/main/java/eu/europa/esig/dss/client/http/proxy/ProxyDaoException.java similarity index 96% rename from dss-service/src/main/java/eu/europa/ec/markt/dss/dao/ProxyDaoException.java rename to dss-service/src/main/java/eu/europa/esig/dss/client/http/proxy/ProxyDaoException.java index 0261e819d3..0c1dea3d8e 100644 --- a/dss-service/src/main/java/eu/europa/ec/markt/dss/dao/ProxyDaoException.java +++ b/dss-service/src/main/java/eu/europa/esig/dss/client/http/proxy/ProxyDaoException.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.dao; +package eu.europa.esig.dss.client.http.proxy; /** * * Exception thrown for errors in the ProxyDao diff --git a/dss-service/src/main/java/eu/europa/ec/markt/dss/dao/ProxyFileDao.java b/dss-service/src/main/java/eu/europa/esig/dss/client/http/proxy/ProxyFileDao.java similarity index 95% rename from dss-service/src/main/java/eu/europa/ec/markt/dss/dao/ProxyFileDao.java rename to dss-service/src/main/java/eu/europa/esig/dss/client/http/proxy/ProxyFileDao.java index 7e63b9e257..29ccc93060 100644 --- a/dss-service/src/main/java/eu/europa/ec/markt/dss/dao/ProxyFileDao.java +++ b/dss-service/src/main/java/eu/europa/esig/dss/client/http/proxy/ProxyFileDao.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.dao; +package eu.europa.esig.dss.client.http.proxy; import java.io.IOException; import java.io.InputStream; @@ -32,8 +32,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.exception.DSSException; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; /** * This class uses a property file to read the proxy preferences. diff --git a/dss-service/src/main/java/eu/europa/ec/markt/dss/dao/ProxyJdbcDao.java b/dss-service/src/main/java/eu/europa/esig/dss/client/http/proxy/ProxyJdbcDao.java similarity index 99% rename from dss-service/src/main/java/eu/europa/ec/markt/dss/dao/ProxyJdbcDao.java rename to dss-service/src/main/java/eu/europa/esig/dss/client/http/proxy/ProxyJdbcDao.java index 1437a7b04b..db8c59542b 100644 --- a/dss-service/src/main/java/eu/europa/ec/markt/dss/dao/ProxyJdbcDao.java +++ b/dss-service/src/main/java/eu/europa/esig/dss/client/http/proxy/ProxyJdbcDao.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.dao; +package eu.europa.esig.dss.client.http.proxy; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/dss-service/src/main/java/eu/europa/ec/markt/dss/dao/ProxyKey.java b/dss-service/src/main/java/eu/europa/esig/dss/client/http/proxy/ProxyKey.java similarity index 98% rename from dss-service/src/main/java/eu/europa/ec/markt/dss/dao/ProxyKey.java rename to dss-service/src/main/java/eu/europa/esig/dss/client/http/proxy/ProxyKey.java index 4c3eb0548a..a856ae73d0 100644 --- a/dss-service/src/main/java/eu/europa/ec/markt/dss/dao/ProxyKey.java +++ b/dss-service/src/main/java/eu/europa/esig/dss/client/http/proxy/ProxyKey.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.dao; +package eu.europa.esig.dss.client.http.proxy; /** * Keys for retrieving Proxy preferences information diff --git a/dss-service/src/main/java/eu/europa/ec/markt/dss/dao/ProxyPreference.java b/dss-service/src/main/java/eu/europa/esig/dss/client/http/proxy/ProxyPreference.java similarity index 97% rename from dss-service/src/main/java/eu/europa/ec/markt/dss/dao/ProxyPreference.java rename to dss-service/src/main/java/eu/europa/esig/dss/client/http/proxy/ProxyPreference.java index 50f80d2a77..4e56d23348 100644 --- a/dss-service/src/main/java/eu/europa/ec/markt/dss/dao/ProxyPreference.java +++ b/dss-service/src/main/java/eu/europa/esig/dss/client/http/proxy/ProxyPreference.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.dao; +package eu.europa.esig.dss.client.http.proxy; /** * Preference information for Proxy diff --git a/dss-service/src/main/java/eu/europa/ec/markt/dss/manager/ProxyPreferenceManager.java b/dss-service/src/main/java/eu/europa/esig/dss/client/http/proxy/ProxyPreferenceManager.java similarity index 96% rename from dss-service/src/main/java/eu/europa/ec/markt/dss/manager/ProxyPreferenceManager.java rename to dss-service/src/main/java/eu/europa/esig/dss/client/http/proxy/ProxyPreferenceManager.java index 5f1395ecca..7231f649e9 100644 --- a/dss-service/src/main/java/eu/europa/ec/markt/dss/manager/ProxyPreferenceManager.java +++ b/dss-service/src/main/java/eu/europa/esig/dss/client/http/proxy/ProxyPreferenceManager.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.manager; +package eu.europa.esig.dss.client.http.proxy; import java.util.Collection; import java.util.HashSet; @@ -28,11 +28,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.dao.ProxyDao; -import eu.europa.ec.markt.dss.dao.ProxyKey; -import eu.europa.ec.markt.dss.dao.ProxyPreference; -import eu.europa.ec.markt.dss.validation102853.https.DSSNotifier; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.client.http.commons.DSSNotifier; /** * A proxy preference manager. diff --git a/dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/ocsp/OnlineOCSPSource.java b/dss-service/src/main/java/eu/europa/esig/dss/client/ocsp/OnlineOCSPSource.java similarity index 95% rename from dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/ocsp/OnlineOCSPSource.java rename to dss-service/src/main/java/eu/europa/esig/dss/client/ocsp/OnlineOCSPSource.java index d66be02443..713606d347 100644 --- a/dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/ocsp/OnlineOCSPSource.java +++ b/dss-service/src/main/java/eu/europa/esig/dss/client/ocsp/OnlineOCSPSource.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.ocsp; +package eu.europa.esig.dss.client.ocsp; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -52,13 +52,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.DSSRevocationUtils; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.validation102853.NonceSource; -import eu.europa.ec.markt.dss.validation102853.OCSPToken; -import eu.europa.ec.markt.dss.validation102853.https.OCSPDataLoader; -import eu.europa.ec.markt.dss.validation102853.loader.DataLoader; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSRevocationUtils; +import eu.europa.esig.dss.client.NonceSource; +import eu.europa.esig.dss.client.http.DataLoader; +import eu.europa.esig.dss.client.http.commons.OCSPDataLoader; +import eu.europa.esig.dss.x509.CertificateToken; +import eu.europa.esig.dss.x509.OCSPToken; +import eu.europa.esig.dss.x509.ocsp.OCSPSource; /** * Online OCSP repository. This implementation will contact the OCSP Responder to retrieve the OCSP response. diff --git a/dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/tsp/OnlineTSPSource.java b/dss-service/src/main/java/eu/europa/esig/dss/client/tsp/OnlineTSPSource.java similarity index 93% rename from dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/tsp/OnlineTSPSource.java rename to dss-service/src/main/java/eu/europa/esig/dss/client/tsp/OnlineTSPSource.java index 37e3e08661..8ebbf9481a 100644 --- a/dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/tsp/OnlineTSPSource.java +++ b/dss-service/src/main/java/eu/europa/esig/dss/client/tsp/OnlineTSPSource.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.tsp; +package eu.europa.esig.dss.client.tsp; import java.io.IOException; @@ -32,11 +32,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.validation102853.NonceSource; -import eu.europa.ec.markt.dss.validation102853.loader.DataLoader; -import eu.europa.ec.markt.dss.validation102853.loader.NativeHTTPDataLoader; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.client.NonceSource; +import eu.europa.esig.dss.client.http.DataLoader; +import eu.europa.esig.dss.client.http.NativeHTTPDataLoader; +import eu.europa.esig.dss.x509.tsp.TSPSource; /** * Class encompassing a RFC 3161 TSA, accessed through HTTP(S) to a given URI diff --git a/dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/tsl/AbstractTrustService.java b/dss-service/src/main/java/eu/europa/esig/dss/tsl/AbstractTrustService.java similarity index 92% rename from dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/tsl/AbstractTrustService.java rename to dss-service/src/main/java/eu/europa/esig/dss/tsl/AbstractTrustService.java index a23caab391..6bf2882f63 100644 --- a/dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/tsl/AbstractTrustService.java +++ b/dss-service/src/main/java/eu/europa/esig/dss/tsl/AbstractTrustService.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.tsl; +package eu.europa.esig.dss.tsl; import java.util.ArrayList; import java.util.Date; @@ -32,18 +32,6 @@ import org.slf4j.LoggerFactory; import org.w3c.dom.Element; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.TSLConstant; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.exception.DSSNotETSICompliantException; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.validation102853.condition.CompositeCondition; -import eu.europa.ec.markt.dss.validation102853.condition.Condition; -import eu.europa.ec.markt.dss.validation102853.condition.CriteriaListCondition; -import eu.europa.ec.markt.dss.validation102853.condition.KeyUsageCondition; -import eu.europa.ec.markt.dss.validation102853.condition.MatchingCriteriaIndicator; -import eu.europa.ec.markt.dss.validation102853.condition.PolicyIdCondition; -import eu.europa.ec.markt.dss.validation102853.condition.ServiceInfo; import eu.europa.ec.markt.tsl.jaxb.ecc.CriteriaListType; import eu.europa.ec.markt.tsl.jaxb.ecc.KeyUsageBitType; import eu.europa.ec.markt.tsl.jaxb.ecc.KeyUsageType; @@ -59,6 +47,11 @@ import eu.europa.ec.markt.tsl.jaxb.tslx.TakenOverByType; import eu.europa.ec.markt.tsl.jaxb.xades.IdentifierType; import eu.europa.ec.markt.tsl.jaxb.xades.ObjectIdentifierType; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSNotETSICompliantException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.TSLConstant; +import eu.europa.esig.dss.x509.CertificateToken; /** * Service information from current status and TrustedList shares some common information. diff --git a/dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/tsl/CurrentTrustService.java b/dss-service/src/main/java/eu/europa/esig/dss/tsl/CurrentTrustService.java similarity index 98% rename from dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/tsl/CurrentTrustService.java rename to dss-service/src/main/java/eu/europa/esig/dss/tsl/CurrentTrustService.java index 20f3c6804d..2195c817df 100644 --- a/dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/tsl/CurrentTrustService.java +++ b/dss-service/src/main/java/eu/europa/esig/dss/tsl/CurrentTrustService.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.tsl; +package eu.europa.esig.dss.tsl; import java.util.Collections; import java.util.Date; diff --git a/dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/tsl/HistoricalTrustService.java b/dss-service/src/main/java/eu/europa/esig/dss/tsl/HistoricalTrustService.java similarity index 98% rename from dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/tsl/HistoricalTrustService.java rename to dss-service/src/main/java/eu/europa/esig/dss/tsl/HistoricalTrustService.java index d3c1699365..ec78f47ac2 100644 --- a/dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/tsl/HistoricalTrustService.java +++ b/dss-service/src/main/java/eu/europa/esig/dss/tsl/HistoricalTrustService.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.tsl; +package eu.europa.esig.dss.tsl; import java.util.Collections; import java.util.Date; diff --git a/dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/tsl/PointerToOtherTSL.java b/dss-service/src/main/java/eu/europa/esig/dss/tsl/PointerToOtherTSL.java similarity index 95% rename from dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/tsl/PointerToOtherTSL.java rename to dss-service/src/main/java/eu/europa/esig/dss/tsl/PointerToOtherTSL.java index 383780ce5a..c563842bb4 100644 --- a/dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/tsl/PointerToOtherTSL.java +++ b/dss-service/src/main/java/eu/europa/esig/dss/tsl/PointerToOtherTSL.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.tsl; +package eu.europa.esig.dss.tsl; import java.util.ArrayList; import java.util.HashMap; @@ -29,14 +29,14 @@ import org.w3c.dom.Element; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; import eu.europa.ec.markt.tsl.jaxb.tsl.AnyType; import eu.europa.ec.markt.tsl.jaxb.tsl.DigitalIdentityListType; import eu.europa.ec.markt.tsl.jaxb.tsl.DigitalIdentityType; import eu.europa.ec.markt.tsl.jaxb.tsl.OtherTSLPointerType; import eu.europa.ec.markt.tsl.jaxb.tsl.ServiceDigitalIdentityListType; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.x509.CertificateToken; /** * Wrapper for the tag OtherTSLPointer diff --git a/dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/tsl/ReloadableTrustedListCertificateSource.java b/dss-service/src/main/java/eu/europa/esig/dss/tsl/ReloadableTrustedListCertificateSource.java similarity index 93% rename from dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/tsl/ReloadableTrustedListCertificateSource.java rename to dss-service/src/main/java/eu/europa/esig/dss/tsl/ReloadableTrustedListCertificateSource.java index 8235f40469..b1dfc2a7bd 100644 --- a/dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/tsl/ReloadableTrustedListCertificateSource.java +++ b/dss-service/src/main/java/eu/europa/esig/dss/tsl/ReloadableTrustedListCertificateSource.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.tsl; +package eu.europa.esig.dss.tsl; import java.util.List; import java.util.Map; @@ -26,9 +26,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.exception.DSSEncodingException; -import eu.europa.ec.markt.dss.validation102853.CertificatePool; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; +import eu.europa.esig.dss.DSSEncodingException; +import eu.europa.esig.dss.x509.CertificatePool; +import eu.europa.esig.dss.x509.CertificateToken; /** * This CertificateSource keep a list of trusted certificates extracted from the trusted list. To populate this list {@link diff --git a/dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/tsl/TSLRefreshPolicy.java b/dss-service/src/main/java/eu/europa/esig/dss/tsl/TSLRefreshPolicy.java similarity index 96% rename from dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/tsl/TSLRefreshPolicy.java rename to dss-service/src/main/java/eu/europa/esig/dss/tsl/TSLRefreshPolicy.java index 7ba8aa0a52..e1700f67ed 100644 --- a/dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/tsl/TSLRefreshPolicy.java +++ b/dss-service/src/main/java/eu/europa/esig/dss/tsl/TSLRefreshPolicy.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.tsl; +package eu.europa.esig.dss.tsl; /** * This enumeration represents different refresh policies. diff --git a/dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/tsl/TrustServiceListFactory.java b/dss-service/src/main/java/eu/europa/esig/dss/tsl/TrustServiceListFactory.java similarity index 96% rename from dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/tsl/TrustServiceListFactory.java rename to dss-service/src/main/java/eu/europa/esig/dss/tsl/TrustServiceListFactory.java index 8eacea3e99..e5bed2da6a 100644 --- a/dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/tsl/TrustServiceListFactory.java +++ b/dss-service/src/main/java/eu/europa/esig/dss/tsl/TrustServiceListFactory.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.tsl; +package eu.europa.esig.dss.tsl; import java.io.IOException; import java.io.InputStream; @@ -30,9 +30,9 @@ import org.w3c.dom.Document; -import eu.europa.ec.markt.dss.exception.DSSException; import eu.europa.ec.markt.tsl.jaxb.tsl.ObjectFactory; import eu.europa.ec.markt.tsl.jaxb.tsl.TrustStatusListType; +import eu.europa.esig.dss.DSSException; /** * Utility class for parsing Trusted List diff --git a/dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/tsl/TrustServiceProvider.java b/dss-service/src/main/java/eu/europa/esig/dss/tsl/TrustServiceProvider.java similarity index 98% rename from dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/tsl/TrustServiceProvider.java rename to dss-service/src/main/java/eu/europa/esig/dss/tsl/TrustServiceProvider.java index b79b886850..948d1fd241 100644 --- a/dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/tsl/TrustServiceProvider.java +++ b/dss-service/src/main/java/eu/europa/esig/dss/tsl/TrustServiceProvider.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.tsl; +package eu.europa.esig.dss.tsl; import java.util.ArrayList; import java.util.Collections; diff --git a/dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/tsl/TrustStatusList.java b/dss-service/src/main/java/eu/europa/esig/dss/tsl/TrustStatusList.java similarity index 96% rename from dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/tsl/TrustStatusList.java rename to dss-service/src/main/java/eu/europa/esig/dss/tsl/TrustStatusList.java index dfebd83f8e..e86b54f042 100644 --- a/dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/tsl/TrustStatusList.java +++ b/dss-service/src/main/java/eu/europa/esig/dss/tsl/TrustStatusList.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.tsl; +package eu.europa.esig.dss.tsl; import java.util.ArrayList; import java.util.Date; @@ -124,7 +124,7 @@ public List getOtherTSLPointers() { /** * Returns the next update of the trusted list. This information can be used to implement an automatic TSL - * certificates reloader (based on {@link eu.europa.ec.markt.dss.validation102853.CertificateSource}). + * certificates reloader (based on {@link eu.europa.esig.dss.x509.CertificateSource}). * * @return */ diff --git a/dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/tsl/TrustedListsCertificateSource.java b/dss-service/src/main/java/eu/europa/esig/dss/tsl/TrustedListsCertificateSource.java similarity index 93% rename from dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/tsl/TrustedListsCertificateSource.java rename to dss-service/src/main/java/eu/europa/esig/dss/tsl/TrustedListsCertificateSource.java index daa9fe2365..856a2fa27e 100644 --- a/dss-service/src/main/java/eu/europa/ec/markt/dss/validation102853/tsl/TrustedListsCertificateSource.java +++ b/dss-service/src/main/java/eu/europa/esig/dss/tsl/TrustedListsCertificateSource.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.tsl; +package eu.europa.esig.dss.tsl; import java.io.File; import java.io.FileOutputStream; @@ -44,26 +44,25 @@ import org.slf4j.LoggerFactory; import org.w3c.dom.Document; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DSSXMLUtils; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.exception.DSSNotApplicableMethodException; -import eu.europa.ec.markt.dss.exception.DSSNotETSICompliantException; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.InMemoryDocument; -import eu.europa.ec.markt.dss.signature.validation.AdvancedSignature; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonTrustedCertificateSource; -import eu.europa.ec.markt.dss.validation102853.certificate.CertificateSourceType; -import eu.europa.ec.markt.dss.validation102853.condition.ServiceInfo; -import eu.europa.ec.markt.dss.validation102853.https.CommonsDataLoader; -import eu.europa.ec.markt.dss.validation102853.loader.DataLoader; -import eu.europa.ec.markt.dss.validation102853.report.Reports; -import eu.europa.ec.markt.dss.validation102853.report.SimpleReport; -import eu.europa.ec.markt.dss.validation102853.xades.XMLDocumentValidator; -import eu.europa.ec.markt.dss.validation102853.xades.XPathQueryHolder; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSNotApplicableMethodException; +import eu.europa.esig.dss.DSSNotETSICompliantException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DSSXMLUtils; +import eu.europa.esig.dss.InMemoryDocument; +import eu.europa.esig.dss.XPathQueryHolder; +import eu.europa.esig.dss.client.http.DataLoader; +import eu.europa.esig.dss.client.http.commons.CommonsDataLoader; +import eu.europa.esig.dss.validation.AdvancedSignature; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.report.Reports; +import eu.europa.esig.dss.validation.report.SimpleReport; +import eu.europa.esig.dss.x509.CertificateSourceType; +import eu.europa.esig.dss.x509.CertificateToken; +import eu.europa.esig.dss.x509.CommonTrustedCertificateSource; +import eu.europa.esig.dss.xades.validation.XMLDocumentValidator; /** * This class allows to extract all the trust anchors defined by the trusted lists. The LOTL is used as the entry point of the process. @@ -138,7 +137,7 @@ protected CertificateSourceType getCertificateSourceType() { /** * This method is not applicable for this kind of certificate source. You should use {@link - * #addCertificate(java.security.cert.X509Certificate, eu.europa.ec.markt.dss.validation102853.condition.ServiceInfo)} + * #addCertificate(java.security.cert.X509Certificate, eu.europa.esig.dss.tsl.ServiceInfo)} * * @param x509Certificate the certificate you have to trust * @return the corresponding certificate token diff --git a/dss-service/src/test/java/eu/europa/ec/markt/dss/validation102853/ocsp/OnlineOCSPSourceTest.java b/dss-service/src/test/java/eu/europa/esig/dss/client/ocsp/OnlineOCSPSourceTest.java similarity index 74% rename from dss-service/src/test/java/eu/europa/ec/markt/dss/validation102853/ocsp/OnlineOCSPSourceTest.java rename to dss-service/src/test/java/eu/europa/esig/dss/client/ocsp/OnlineOCSPSourceTest.java index da9e9ab457..3144c3e81f 100644 --- a/dss-service/src/test/java/eu/europa/ec/markt/dss/validation102853/ocsp/OnlineOCSPSourceTest.java +++ b/dss-service/src/test/java/eu/europa/esig/dss/client/ocsp/OnlineOCSPSourceTest.java @@ -1,4 +1,4 @@ -package eu.europa.ec.markt.dss.validation102853.ocsp; +package eu.europa.esig.dss.client.ocsp; import static org.junit.Assert.assertNotNull; @@ -7,11 +7,12 @@ import org.junit.Before; import org.junit.Test; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.validation102853.NonceSource; -import eu.europa.ec.markt.dss.validation102853.OCSPToken; -import eu.europa.ec.markt.dss.validation102853.loader.NativeHTTPDataLoader; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.client.NonceSource; +import eu.europa.esig.dss.client.http.NativeHTTPDataLoader; +import eu.europa.esig.dss.client.ocsp.OnlineOCSPSource; +import eu.europa.esig.dss.x509.CertificateToken; +import eu.europa.esig.dss.x509.OCSPToken; public class OnlineOCSPSourceTest { diff --git a/dss-service/src/test/java/eu/europa/ec/markt/dss/validation102853/tsp/OnlineTSPSourceTest.java b/dss-service/src/test/java/eu/europa/esig/dss/client/tsp/OnlineTSPSourceTest.java similarity index 83% rename from dss-service/src/test/java/eu/europa/ec/markt/dss/validation102853/tsp/OnlineTSPSourceTest.java rename to dss-service/src/test/java/eu/europa/esig/dss/client/tsp/OnlineTSPSourceTest.java index 2fd72fcbbf..1cd132d80b 100644 --- a/dss-service/src/test/java/eu/europa/ec/markt/dss/validation102853/tsp/OnlineTSPSourceTest.java +++ b/dss-service/src/test/java/eu/europa/esig/dss/client/tsp/OnlineTSPSourceTest.java @@ -1,15 +1,16 @@ -package eu.europa.ec.markt.dss.validation102853.tsp; +package eu.europa.esig.dss.client.tsp; import static org.junit.Assert.assertNotNull; import org.bouncycastle.tsp.TimeStampToken; import org.junit.Test; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.validation102853.NonceSource; -import eu.europa.ec.markt.dss.validation102853.https.CommonsDataLoader; -import eu.europa.ec.markt.dss.validation102853.loader.NativeHTTPDataLoader; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.client.NonceSource; +import eu.europa.esig.dss.client.http.NativeHTTPDataLoader; +import eu.europa.esig.dss.client.http.commons.CommonsDataLoader; +import eu.europa.esig.dss.client.tsp.OnlineTSPSource; public class OnlineTSPSourceTest { diff --git a/dss-service/src/test/java/eu/europa/ec/markt/dss/validation102853/tsl/TrustedListCertificateSourceTest.java b/dss-service/src/test/java/eu/europa/esig/dss/tsl/TrustedListCertificateSourceTest.java similarity index 79% rename from dss-service/src/test/java/eu/europa/ec/markt/dss/validation102853/tsl/TrustedListCertificateSourceTest.java rename to dss-service/src/test/java/eu/europa/esig/dss/tsl/TrustedListCertificateSourceTest.java index 101b448639..6abbbb79f6 100644 --- a/dss-service/src/test/java/eu/europa/ec/markt/dss/validation102853/tsl/TrustedListCertificateSourceTest.java +++ b/dss-service/src/test/java/eu/europa/esig/dss/tsl/TrustedListCertificateSourceTest.java @@ -1,11 +1,13 @@ -package eu.europa.ec.markt.dss.validation102853.tsl; +package eu.europa.esig.dss.tsl; import java.net.UnknownHostException; import org.junit.Assert; import org.junit.Test; -import eu.europa.ec.markt.dss.validation102853.https.CommonsDataLoader; +import eu.europa.esig.dss.client.http.commons.CommonsDataLoader; +import eu.europa.esig.dss.tsl.TSLRefreshPolicy; +import eu.europa.esig.dss.tsl.TrustedListsCertificateSource; public class TrustedListCertificateSourceTest { diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/ASN1ObjectIdentifierComparator.java b/dss-spi/src/main/java/eu/europa/ec/markt/dss/ASN1ObjectIdentifierComparator.java deleted file mode 100644 index 257055f619..0000000000 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/ASN1ObjectIdentifierComparator.java +++ /dev/null @@ -1,65 +0,0 @@ -/** - * DSS - Digital Signature Services - * Copyright (C) 2015 European Commission, provided under the CEF programme - * - * This file is part of the "DSS - Digital Signature Services" project. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ -package eu.europa.ec.markt.dss; - -import java.util.Comparator; - -import org.bouncycastle.asn1.ASN1ObjectIdentifier; - -/** - * This class is a Comparator implementation for ASN1ObjectIdentifiers - * - */ -public class ASN1ObjectIdentifierComparator implements Comparator { - - private static final String REGEX_DOT = "\\."; - - @Override - public int compare(ASN1ObjectIdentifier o1, ASN1ObjectIdentifier o2) { - String id1 = o1.getId(); - String id2 = o2.getId(); - - String[] split1 = id1.split(REGEX_DOT); - String[] split2 = id2.split(REGEX_DOT); - - int maxLenght = Math.max(split1.length, split2.length); - - for (int i = 0; i < maxLenght; i++) { - if (split1.length == i) { - return -1; - } - if (split2.length == i) { - return 1; - } - - Integer part1 = Integer.parseInt(split1[i]); - Integer part2 = Integer.parseInt(split2[i]); - - int compare = part1.compareTo(part2); - - if (compare != 0) { - return compare; - } - } - return 0; - } - -} diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/ASiCNamespaces.java b/dss-spi/src/main/java/eu/europa/esig/dss/ASiCNamespaces.java similarity index 97% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/ASiCNamespaces.java rename to dss-spi/src/main/java/eu/europa/esig/dss/ASiCNamespaces.java index 15c90163cf..ed08406929 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/ASiCNamespaces.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/ASiCNamespaces.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss; +package eu.europa.esig.dss; /** * This enum contains all known ASiC version with their namespace. diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/AsicManifestDocument.java b/dss-spi/src/main/java/eu/europa/esig/dss/AsicManifestDocument.java similarity index 93% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/AsicManifestDocument.java rename to dss-spi/src/main/java/eu/europa/esig/dss/AsicManifestDocument.java index 1c5334638d..fcf0e91548 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/AsicManifestDocument.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/AsicManifestDocument.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature; +package eu.europa.esig.dss; import java.io.ByteArrayInputStream; import java.io.FileNotFoundException; @@ -30,11 +30,6 @@ import org.apache.commons.lang.StringUtils; import org.w3c.dom.Document; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DSSXMLUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.exception.DSSException; - /** * AsicManifest file representation * diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/CommonDocument.java b/dss-spi/src/main/java/eu/europa/esig/dss/CommonDocument.java similarity index 97% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/CommonDocument.java rename to dss-spi/src/main/java/eu/europa/esig/dss/CommonDocument.java index b114c86fe1..5e2e12f873 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/CommonDocument.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/CommonDocument.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature; +package eu.europa.esig.dss; import java.io.StringWriter; diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/DSSASN1Utils.java b/dss-spi/src/main/java/eu/europa/esig/dss/DSSASN1Utils.java similarity index 99% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/DSSASN1Utils.java rename to dss-spi/src/main/java/eu/europa/esig/dss/DSSASN1Utils.java index aa95c863c0..194e918601 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/DSSASN1Utils.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/DSSASN1Utils.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss; +package eu.europa.esig.dss; import java.io.IOException; import java.security.cert.CertificateParsingException; @@ -58,8 +58,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.exception.DSSException; - /** * Utility class that contains some XML related method. * diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/exception/DSSBadPasswordException.java b/dss-spi/src/main/java/eu/europa/esig/dss/DSSBadPasswordException.java similarity index 97% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/exception/DSSBadPasswordException.java rename to dss-spi/src/main/java/eu/europa/esig/dss/DSSBadPasswordException.java index 49e083b273..1ae004c211 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/exception/DSSBadPasswordException.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/DSSBadPasswordException.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.exception; +package eu.europa.esig.dss; import java.util.ResourceBundle; diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/exception/DSSCannotFetchDataException.java b/dss-spi/src/main/java/eu/europa/esig/dss/DSSCannotFetchDataException.java similarity index 98% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/exception/DSSCannotFetchDataException.java rename to dss-spi/src/main/java/eu/europa/esig/dss/DSSCannotFetchDataException.java index d8097dbcd0..610d8472a1 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/exception/DSSCannotFetchDataException.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/DSSCannotFetchDataException.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.exception; +package eu.europa.esig.dss; import java.io.IOException; import java.net.UnknownHostException; diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/exception/DSSConfigurationException.java b/dss-spi/src/main/java/eu/europa/esig/dss/DSSConfigurationException.java similarity index 98% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/exception/DSSConfigurationException.java rename to dss-spi/src/main/java/eu/europa/esig/dss/DSSConfigurationException.java index 136afe14ff..5902b945f1 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/exception/DSSConfigurationException.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/DSSConfigurationException.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.exception; +package eu.europa.esig.dss; import java.util.ResourceBundle; diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/DSSDocument.java b/dss-spi/src/main/java/eu/europa/esig/dss/DSSDocument.java similarity index 95% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/DSSDocument.java rename to dss-spi/src/main/java/eu/europa/esig/dss/DSSDocument.java index 5978ffb8b2..407a363082 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/DSSDocument.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/DSSDocument.java @@ -18,15 +18,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature; +package eu.europa.esig.dss; import java.io.IOException; import java.io.InputStream; import java.io.Serializable; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.exception.DSSException; - /** * Interface representing a DSS document. * diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/exception/DSSEncodingException.java b/dss-spi/src/main/java/eu/europa/esig/dss/DSSEncodingException.java similarity index 98% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/exception/DSSEncodingException.java rename to dss-spi/src/main/java/eu/europa/esig/dss/DSSEncodingException.java index 7458b25732..59c466b365 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/exception/DSSEncodingException.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/DSSEncodingException.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.exception; +package eu.europa.esig.dss; import java.util.ResourceBundle; diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/exception/DSSException.java b/dss-spi/src/main/java/eu/europa/esig/dss/DSSException.java similarity index 97% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/exception/DSSException.java rename to dss-spi/src/main/java/eu/europa/esig/dss/DSSException.java index d81b0d458f..1192f3c504 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/exception/DSSException.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/DSSException.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.exception; +package eu.europa.esig.dss; public class DSSException extends RuntimeException { diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/exception/DSSNotApplicableMethodException.java b/dss-spi/src/main/java/eu/europa/esig/dss/DSSNotApplicableMethodException.java similarity index 97% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/exception/DSSNotApplicableMethodException.java rename to dss-spi/src/main/java/eu/europa/esig/dss/DSSNotApplicableMethodException.java index 276200167a..5bec596751 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/exception/DSSNotApplicableMethodException.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/DSSNotApplicableMethodException.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.exception; +package eu.europa.esig.dss; /** * TODO diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/exception/DSSNotETSICompliantException.java b/dss-spi/src/main/java/eu/europa/esig/dss/DSSNotETSICompliantException.java similarity index 98% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/exception/DSSNotETSICompliantException.java rename to dss-spi/src/main/java/eu/europa/esig/dss/DSSNotETSICompliantException.java index cf6f03466c..b8f0b45749 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/exception/DSSNotETSICompliantException.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/DSSNotETSICompliantException.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.exception; +package eu.europa.esig.dss; import java.util.ResourceBundle; diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/exception/DSSNotYetImplementedMethodException.java b/dss-spi/src/main/java/eu/europa/esig/dss/DSSNotYetImplementedMethodException.java similarity index 96% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/exception/DSSNotYetImplementedMethodException.java rename to dss-spi/src/main/java/eu/europa/esig/dss/DSSNotYetImplementedMethodException.java index 858e08a1d9..dabf496584 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/exception/DSSNotYetImplementedMethodException.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/DSSNotYetImplementedMethodException.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.exception; +package eu.europa.esig.dss; /** * TODO diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/DSSPKUtils.java b/dss-spi/src/main/java/eu/europa/esig/dss/DSSPKUtils.java similarity index 97% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/DSSPKUtils.java rename to dss-spi/src/main/java/eu/europa/esig/dss/DSSPKUtils.java index 2b7af15ba1..a45295fbce 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/DSSPKUtils.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/DSSPKUtils.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss; +package eu.europa.esig.dss; import java.security.Key; import java.security.PublicKey; @@ -31,8 +31,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.exception.DSSException; - @SuppressWarnings("restriction") public final class DSSPKUtils { diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/DSSRevocationUtils.java b/dss-spi/src/main/java/eu/europa/esig/dss/DSSRevocationUtils.java similarity index 95% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/DSSRevocationUtils.java rename to dss-spi/src/main/java/eu/europa/esig/dss/DSSRevocationUtils.java index bb889bf190..a0ef5e698b 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/DSSRevocationUtils.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/DSSRevocationUtils.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss; +package eu.europa.esig.dss; import java.io.IOException; import java.math.BigInteger; @@ -45,10 +45,9 @@ import org.bouncycastle.util.Arrays; import org.bouncycastle.x509.extension.X509ExtensionUtil; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.validation102853.OCSPToken; -import eu.europa.ec.markt.dss.validation102853.RevocationToken; -import eu.europa.ec.markt.dss.validation102853.crl.CRLReasonEnum; +import eu.europa.esig.dss.x509.OCSPToken; +import eu.europa.esig.dss.x509.RevocationToken; +import eu.europa.esig.dss.x509.crl.CRLReasonEnum; /** * Utility class used to convert OCSPResp to BasicOCSPResp @@ -197,7 +196,7 @@ public static boolean matches(final CertificateID certId, final SingleResp singl * @param issuerCert * {@code X509Certificate} issuer certificate of the {@code cert} * @return {@code CertificateID} - * @throws eu.europa.ec.markt.dss.exception.DSSException + * @throws eu.europa.esig.dss.DSSException */ public static CertificateID getOCSPCertificateID(final X509Certificate cert, final X509Certificate issuerCert) throws DSSException { diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/exception/DSSUnsupportedOperationException.java b/dss-spi/src/main/java/eu/europa/esig/dss/DSSUnsupportedOperationException.java similarity index 96% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/exception/DSSUnsupportedOperationException.java rename to dss-spi/src/main/java/eu/europa/esig/dss/DSSUnsupportedOperationException.java index 32ccd77592..6f2629f2d6 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/exception/DSSUnsupportedOperationException.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/DSSUnsupportedOperationException.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.exception; +package eu.europa.esig.dss; /** * TODO diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/DSSUtils.java b/dss-spi/src/main/java/eu/europa/esig/dss/DSSUtils.java similarity index 99% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/DSSUtils.java rename to dss-spi/src/main/java/eu/europa/esig/dss/DSSUtils.java index 5198eb406f..9044ae6be8 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/DSSUtils.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/DSSUtils.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss; +package eu.europa.esig.dss; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -111,11 +111,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.validation102853.loader.DataLoader; -import eu.europa.ec.markt.dss.validation102853.loader.Protocol; +import eu.europa.esig.dss.client.http.DataLoader; +import eu.europa.esig.dss.client.http.Protocol; +import eu.europa.esig.dss.x509.CertificateToken; public final class DSSUtils { diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/DSSXMLUtils.java b/dss-spi/src/main/java/eu/europa/esig/dss/DSSXMLUtils.java similarity index 99% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/DSSXMLUtils.java rename to dss-spi/src/main/java/eu/europa/esig/dss/DSSXMLUtils.java index c6b06617d8..4e15a17948 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/DSSXMLUtils.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/DSSXMLUtils.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss; +package eu.europa.esig.dss; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -84,9 +84,6 @@ import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.signature.DSSDocument; - /** * Utility class that contains some XML related method. * @@ -577,7 +574,7 @@ public static Document buildDOM(final InputStream inputStream) throws DSSExcepti } /** - * This method returns the {@link org.w3c.dom.Document} created based on the {@link eu.europa.ec.markt.dss.signature.DSSDocument}. + * This method returns the {@link org.w3c.dom.Document} created based on the {@link eu.europa.esig.dss.DSSDocument}. * * @param dssDocument The DSS representation of the document from which the dssDocument is created. * @return diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/Digest.java b/dss-spi/src/main/java/eu/europa/esig/dss/Digest.java similarity index 98% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/Digest.java rename to dss-spi/src/main/java/eu/europa/esig/dss/Digest.java index 5ee94b2632..056b413530 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/Digest.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/Digest.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss; +package eu.europa.esig.dss; import java.io.Serializable; import java.util.Arrays; diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/DigestAlgorithm.java b/dss-spi/src/main/java/eu/europa/esig/dss/DigestAlgorithm.java similarity index 98% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/DigestAlgorithm.java rename to dss-spi/src/main/java/eu/europa/esig/dss/DigestAlgorithm.java index 42e8387d1a..6497541ae3 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/DigestAlgorithm.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/DigestAlgorithm.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss; +package eu.europa.esig.dss; import java.util.HashMap; import java.util.Map; @@ -29,8 +29,6 @@ import org.bouncycastle.asn1.DERNull; import org.bouncycastle.asn1.x509.AlgorithmIdentifier; -import eu.europa.ec.markt.dss.exception.DSSException; - /** * Supported Algorithms * diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/DigestDocument.java b/dss-spi/src/main/java/eu/europa/esig/dss/DigestDocument.java similarity index 92% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/DigestDocument.java rename to dss-spi/src/main/java/eu/europa/esig/dss/DigestDocument.java index fa05b5b74a..9dff9d6513 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/DigestDocument.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/DigestDocument.java @@ -18,15 +18,11 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature; +package eu.europa.esig.dss; import java.io.File; import java.util.HashMap; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.exception.DSSUnsupportedOperationException; - /** * Digest representation of a {@code FileDocument}. It can be used to handle a large file to be signed. The computation of the digest associated to the file can be done externally. * diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/EncryptionAlgorithm.java b/dss-spi/src/main/java/eu/europa/esig/dss/EncryptionAlgorithm.java similarity index 97% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/EncryptionAlgorithm.java rename to dss-spi/src/main/java/eu/europa/esig/dss/EncryptionAlgorithm.java index 713ad0716d..0ae372bca5 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/EncryptionAlgorithm.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/EncryptionAlgorithm.java @@ -18,13 +18,11 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss; +package eu.europa.esig.dss; import java.util.HashMap; import java.util.Map; -import eu.europa.ec.markt.dss.exception.DSSException; - /** * Supported signature encryption algorithms. * diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/FileDocument.java b/dss-spi/src/main/java/eu/europa/esig/dss/FileDocument.java similarity index 94% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/FileDocument.java rename to dss-spi/src/main/java/eu/europa/esig/dss/FileDocument.java index 1efb63d13f..eb68db6b07 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/FileDocument.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/FileDocument.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature; +package eu.europa.esig.dss; import java.io.File; import java.io.IOException; @@ -27,10 +27,6 @@ import org.apache.commons.codec.binary.Base64; import org.apache.commons.io.IOUtils; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.exception.DSSException; - /** * Document implementation stored on file-system. * diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/InMemoryDocument.java b/dss-spi/src/main/java/eu/europa/esig/dss/InMemoryDocument.java similarity index 96% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/InMemoryDocument.java rename to dss-spi/src/main/java/eu/europa/esig/dss/InMemoryDocument.java index d08205099d..80aba4058b 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/InMemoryDocument.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/InMemoryDocument.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature; +package eu.europa.esig.dss; import java.io.ByteArrayInputStream; import java.io.FileNotFoundException; @@ -28,10 +28,6 @@ import org.apache.commons.codec.binary.Base64; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.exception.DSSException; - /** * In memory representation of a document * diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/MimeType.java b/dss-spi/src/main/java/eu/europa/esig/dss/MimeType.java similarity index 97% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/MimeType.java rename to dss-spi/src/main/java/eu/europa/esig/dss/MimeType.java index 64117cd0b8..a55d88e38b 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/MimeType.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/MimeType.java @@ -18,16 +18,13 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature; +package eu.europa.esig.dss; import java.io.File; import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.exception.DSSException; - /** * This class allows to handle different mime types. It also allows to add (define) new mime-type. * diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/NamespaceContextMap.java b/dss-spi/src/main/java/eu/europa/esig/dss/NamespaceContextMap.java similarity index 98% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/NamespaceContextMap.java rename to dss-spi/src/main/java/eu/europa/esig/dss/NamespaceContextMap.java index 60e723e933..3aeae14c02 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/NamespaceContextMap.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/NamespaceContextMap.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss; +package eu.europa.esig.dss; import java.util.HashMap; import java.util.HashSet; diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/OID.java b/dss-spi/src/main/java/eu/europa/esig/dss/OID.java similarity index 99% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/OID.java rename to dss-spi/src/main/java/eu/europa/esig/dss/OID.java index 7a71ce2f05..0e09449082 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/OID.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/OID.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss; +package eu.europa.esig.dss; import org.bouncycastle.asn1.ASN1ObjectIdentifier; import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers; diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/ResourceLoader.java b/dss-spi/src/main/java/eu/europa/esig/dss/ResourceLoader.java similarity index 96% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/ResourceLoader.java rename to dss-spi/src/main/java/eu/europa/esig/dss/ResourceLoader.java index 9356185555..c0c4cb3d44 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/ResourceLoader.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/ResourceLoader.java @@ -18,17 +18,13 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss; +package eu.europa.esig.dss; import java.io.InputStream; import java.io.UnsupportedEncodingException; import java.net.URL; import java.net.URLDecoder; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.FileDocument; - /** * TODO * diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/SignatureAlgorithm.java b/dss-spi/src/main/java/eu/europa/esig/dss/SignatureAlgorithm.java similarity index 99% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/SignatureAlgorithm.java rename to dss-spi/src/main/java/eu/europa/esig/dss/SignatureAlgorithm.java index 9816cdc2a3..a3d7bbd5ec 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/SignatureAlgorithm.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/SignatureAlgorithm.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss; +package eu.europa.esig.dss; import java.util.HashMap; import java.util.Map; @@ -28,8 +28,6 @@ import org.bouncycastle.asn1.DERNull; import org.bouncycastle.asn1.x509.AlgorithmIdentifier; -import eu.europa.ec.markt.dss.exception.DSSException; - /** * Supported signature algorithms. * diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/SignatureLevel.java b/dss-spi/src/main/java/eu/europa/esig/dss/SignatureLevel.java similarity index 96% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/SignatureLevel.java rename to dss-spi/src/main/java/eu/europa/esig/dss/SignatureLevel.java index 1c8aef3df5..6d05cd8bc5 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/SignatureLevel.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/SignatureLevel.java @@ -18,9 +18,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature; +package eu.europa.esig.dss; -import eu.europa.ec.markt.dss.validation102853.SignatureForm; +import eu.europa.esig.dss.x509.SignatureForm; /** * Signature profiles (form+level) handled by the SD-DSS framework. diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/SignatureValue.java b/dss-spi/src/main/java/eu/europa/esig/dss/SignatureValue.java similarity index 97% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/SignatureValue.java rename to dss-spi/src/main/java/eu/europa/esig/dss/SignatureValue.java index f3f17012ec..5bc81f9716 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/SignatureValue.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/SignatureValue.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss; +package eu.europa.esig.dss; import java.io.Serializable; diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/SignatureVerificationResult.java b/dss-spi/src/main/java/eu/europa/esig/dss/SignatureVerificationResult.java similarity index 96% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/SignatureVerificationResult.java rename to dss-spi/src/main/java/eu/europa/esig/dss/SignatureVerificationResult.java index 1c54b68787..a3cd0f390e 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/SignatureVerificationResult.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/SignatureVerificationResult.java @@ -18,9 +18,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss; +package eu.europa.esig.dss; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; +import eu.europa.esig.dss.x509.CertificateToken; public class SignatureVerificationResult { diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/TSLConstant.java b/dss-spi/src/main/java/eu/europa/esig/dss/TSLConstant.java similarity index 99% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/TSLConstant.java rename to dss-spi/src/main/java/eu/europa/esig/dss/TSLConstant.java index c6288a2b40..be1b3be496 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/TSLConstant.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/TSLConstant.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss; +package eu.europa.esig.dss; public interface TSLConstant { diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/ToBeSigned.java b/dss-spi/src/main/java/eu/europa/esig/dss/ToBeSigned.java similarity index 86% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/ToBeSigned.java rename to dss-spi/src/main/java/eu/europa/esig/dss/ToBeSigned.java index 3c6c2c69e7..655f4f41cd 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/ToBeSigned.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/ToBeSigned.java @@ -1,4 +1,4 @@ -package eu.europa.ec.markt.dss; +package eu.europa.esig.dss; /** * Data unit for signing diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/TokenIdentifier.java b/dss-spi/src/main/java/eu/europa/esig/dss/TokenIdentifier.java similarity index 95% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/TokenIdentifier.java rename to dss-spi/src/main/java/eu/europa/esig/dss/TokenIdentifier.java index 76ac810a92..a772d5c19d 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/TokenIdentifier.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/TokenIdentifier.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss; +package eu.europa.esig.dss; import java.security.MessageDigest; import java.security.cert.CertificateEncodingException; @@ -26,8 +26,7 @@ import org.apache.commons.codec.binary.Hex; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.validation102853.Token; +import eu.europa.esig.dss.x509.Token; /** * This class is used to obtain a unique id for Token diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/XAdESNamespaces.java b/dss-spi/src/main/java/eu/europa/esig/dss/XAdESNamespaces.java similarity index 98% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/XAdESNamespaces.java rename to dss-spi/src/main/java/eu/europa/esig/dss/XAdESNamespaces.java index b567b265cc..2e9c4db411 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/XAdESNamespaces.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/XAdESNamespaces.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss; +package eu.europa.esig.dss; /** * This enum contains all known XAdES version with their namespace. diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/xades/XPathQueryHolder.java b/dss-spi/src/main/java/eu/europa/esig/dss/XPathQueryHolder.java similarity index 99% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/xades/XPathQueryHolder.java rename to dss-spi/src/main/java/eu/europa/esig/dss/XPathQueryHolder.java index 64beaf81b8..079942f457 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/xades/XPathQueryHolder.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/XPathQueryHolder.java @@ -18,12 +18,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.xades; +package eu.europa.esig.dss; import java.io.Serializable; -import eu.europa.ec.markt.dss.XAdESNamespaces; - /** * This class hold all XPath queries schema-dependent. It was created to cope with old signatures bases on http://uri.etsi.org/01903/v1.1.1. * diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/xml/XmlDom.java b/dss-spi/src/main/java/eu/europa/esig/dss/XmlDom.java similarity index 98% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/xml/XmlDom.java rename to dss-spi/src/main/java/eu/europa/esig/dss/XmlDom.java index ae7ff0c1d1..b18350d8af 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/xml/XmlDom.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/XmlDom.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.xml; +package eu.europa.esig.dss; import java.io.ByteArrayOutputStream; import java.io.OutputStream; @@ -51,10 +51,6 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.NamespaceContextMap; -import eu.europa.ec.markt.dss.exception.DSSException; - /** * This class encapsulates an org.w3c.dom.Document. Its integrates the ability to execute XPath queries on XML * documents. @@ -81,7 +77,7 @@ public class XmlDom { nsContext.registerNamespace(NS_PREFIX, NAMESPACE); } - final Element rootElement; + public final Element rootElement; String nameSpace; diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/loader/DataLoader.java b/dss-spi/src/main/java/eu/europa/esig/dss/client/http/DataLoader.java similarity index 98% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/loader/DataLoader.java rename to dss-spi/src/main/java/eu/europa/esig/dss/client/http/DataLoader.java index 014e0df864..c97cfe1015 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/loader/DataLoader.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/client/http/DataLoader.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.loader; +package eu.europa.esig.dss.client.http; import java.io.Serializable; import java.util.List; diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/loader/NativeHTTPDataLoader.java b/dss-spi/src/main/java/eu/europa/esig/dss/client/http/NativeHTTPDataLoader.java similarity index 94% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/loader/NativeHTTPDataLoader.java rename to dss-spi/src/main/java/eu/europa/esig/dss/client/http/NativeHTTPDataLoader.java index ceb1180d20..5ed0aa5f58 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/loader/NativeHTTPDataLoader.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/client/http/NativeHTTPDataLoader.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.loader; +package eu.europa.esig.dss.client.http; import java.io.IOException; import java.io.InputStream; @@ -32,9 +32,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.exception.DSSCannotFetchDataException; -import eu.europa.ec.markt.dss.exception.DSSCannotFetchDataException.MSG; -import eu.europa.ec.markt.dss.exception.DSSException; +import eu.europa.esig.dss.DSSCannotFetchDataException; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSCannotFetchDataException.MSG; /** * Implementation of HTTPDataLoader that use the java.net.URL class. diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/loader/Protocol.java b/dss-spi/src/main/java/eu/europa/esig/dss/client/http/Protocol.java similarity index 98% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/loader/Protocol.java rename to dss-spi/src/main/java/eu/europa/esig/dss/client/http/Protocol.java index a03ace7462..078ab7cf25 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/loader/Protocol.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/client/http/Protocol.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.loader; +package eu.europa.esig.dss.client.http; /** * This enum lists all network protocols that can be used during the signature creation or validation: OCSP, CRL, AIA, TSL... diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/token/AbstractSignatureTokenConnection.java b/dss-spi/src/main/java/eu/europa/esig/dss/token/AbstractSignatureTokenConnection.java similarity index 87% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/token/AbstractSignatureTokenConnection.java rename to dss-spi/src/main/java/eu/europa/esig/dss/token/AbstractSignatureTokenConnection.java index 56084aea12..75f1d7446d 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/token/AbstractSignatureTokenConnection.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/token/AbstractSignatureTokenConnection.java @@ -18,19 +18,19 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.token; +package eu.europa.esig.dss.token; import java.security.Signature; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.EncryptionAlgorithm; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.SignatureValue; -import eu.europa.ec.markt.dss.ToBeSigned; -import eu.europa.ec.markt.dss.exception.DSSException; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.EncryptionAlgorithm; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureValue; +import eu.europa.esig.dss.ToBeSigned; /** * diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/token/DSSPrivateKeyEntry.java b/dss-spi/src/main/java/eu/europa/esig/dss/token/DSSPrivateKeyEntry.java similarity index 87% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/token/DSSPrivateKeyEntry.java rename to dss-spi/src/main/java/eu/europa/esig/dss/token/DSSPrivateKeyEntry.java index ba4e5d3b25..aa81e5549d 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/token/DSSPrivateKeyEntry.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/token/DSSPrivateKeyEntry.java @@ -18,13 +18,13 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.token; +package eu.europa.esig.dss.token; import java.security.PrivateKey; -import eu.europa.ec.markt.dss.EncryptionAlgorithm; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.EncryptionAlgorithm; +import eu.europa.esig.dss.x509.CertificateToken; /** * Interface for a PrivateKey. diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/token/JKSSignatureToken.java b/dss-spi/src/main/java/eu/europa/esig/dss/token/JKSSignatureToken.java similarity index 96% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/token/JKSSignatureToken.java rename to dss-spi/src/main/java/eu/europa/esig/dss/token/JKSSignatureToken.java index 1f2bfb9c93..c64987e2fb 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/token/JKSSignatureToken.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/token/JKSSignatureToken.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.token; +package eu.europa.esig.dss.token; import java.io.InputStream; import java.net.URL; @@ -31,7 +31,7 @@ import org.apache.commons.io.IOUtils; -import eu.europa.ec.markt.dss.exception.DSSException; +import eu.europa.esig.dss.DSSException; /** * Class holding all Java KeyStore file access logic. diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/token/KSPrivateKeyEntry.java b/dss-spi/src/main/java/eu/europa/esig/dss/token/KSPrivateKeyEntry.java similarity index 94% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/token/KSPrivateKeyEntry.java rename to dss-spi/src/main/java/eu/europa/esig/dss/token/KSPrivateKeyEntry.java index b876044b37..8893670659 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/token/KSPrivateKeyEntry.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/token/KSPrivateKeyEntry.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.token; +package eu.europa.esig.dss.token; import java.security.KeyStore.PrivateKeyEntry; import java.security.PrivateKey; @@ -30,9 +30,9 @@ import java.util.ArrayList; import java.util.List; -import eu.europa.ec.markt.dss.EncryptionAlgorithm; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.EncryptionAlgorithm; +import eu.europa.esig.dss.x509.CertificateToken; /** * Wrapper of a PrivateKeyEntry coming from a KeyStore. diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/token/MSCAPISignatureToken.java b/dss-spi/src/main/java/eu/europa/esig/dss/token/MSCAPISignatureToken.java similarity index 98% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/token/MSCAPISignatureToken.java rename to dss-spi/src/main/java/eu/europa/esig/dss/token/MSCAPISignatureToken.java index cb9397c5d2..a53ff0d9b9 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/token/MSCAPISignatureToken.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/token/MSCAPISignatureToken.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.token; +package eu.europa.esig.dss.token; import java.lang.reflect.Field; import java.security.KeyStore; @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.exception.DSSException; +import eu.europa.esig.dss.DSSException; /** * Class holding all MS CAPI API access logic. diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/token/PasswordInputCallback.java b/dss-spi/src/main/java/eu/europa/esig/dss/token/PasswordInputCallback.java similarity index 96% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/token/PasswordInputCallback.java rename to dss-spi/src/main/java/eu/europa/esig/dss/token/PasswordInputCallback.java index 633722997a..fa7b72c9b0 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/token/PasswordInputCallback.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/token/PasswordInputCallback.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.token; +package eu.europa.esig.dss.token; /** * This Callback is created in order to retrieve the password from the user when accessing the Key Store. diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/token/Pkcs11SignatureToken.java b/dss-spi/src/main/java/eu/europa/esig/dss/token/Pkcs11SignatureToken.java similarity index 96% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/token/Pkcs11SignatureToken.java rename to dss-spi/src/main/java/eu/europa/esig/dss/token/Pkcs11SignatureToken.java index 6580db8773..676ba2380d 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/token/Pkcs11SignatureToken.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/token/Pkcs11SignatureToken.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.token; +package eu.europa.esig.dss.token; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -38,10 +38,10 @@ import javax.security.auth.callback.PasswordCallback; import javax.security.auth.callback.UnsupportedCallbackException; -import eu.europa.ec.markt.dss.exception.DSSBadPasswordException; -import eu.europa.ec.markt.dss.exception.DSSBadPasswordException.MSG; -import eu.europa.ec.markt.dss.exception.DSSConfigurationException; -import eu.europa.ec.markt.dss.exception.DSSException; +import eu.europa.esig.dss.DSSBadPasswordException; +import eu.europa.esig.dss.DSSConfigurationException; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSBadPasswordException.MSG; /** * PKCS11 token with callback diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/token/Pkcs12SignatureToken.java b/dss-spi/src/main/java/eu/europa/esig/dss/token/Pkcs12SignatureToken.java similarity index 95% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/token/Pkcs12SignatureToken.java rename to dss-spi/src/main/java/eu/europa/esig/dss/token/Pkcs12SignatureToken.java index 7bc869e545..ea5976e077 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/token/Pkcs12SignatureToken.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/token/Pkcs12SignatureToken.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.token; +package eu.europa.esig.dss.token; import java.io.ByteArrayInputStream; import java.io.File; @@ -35,10 +35,10 @@ import org.apache.commons.io.IOUtils; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.exception.DSSBadPasswordException; -import eu.europa.ec.markt.dss.exception.DSSBadPasswordException.MSG; -import eu.europa.ec.markt.dss.exception.DSSException; +import eu.europa.esig.dss.DSSBadPasswordException; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DSSBadPasswordException.MSG; /** * Class holding all PKCS#12 file access logic. diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/token/PrefilledPasswordCallback.java b/dss-spi/src/main/java/eu/europa/esig/dss/token/PrefilledPasswordCallback.java similarity index 96% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/token/PrefilledPasswordCallback.java rename to dss-spi/src/main/java/eu/europa/esig/dss/token/PrefilledPasswordCallback.java index 9accbc6d2d..e19c13b613 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/token/PrefilledPasswordCallback.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/token/PrefilledPasswordCallback.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.token; +package eu.europa.esig.dss.token; /** * Class that hold a simple password. diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/token/RemoteSignatureToken.java b/dss-spi/src/main/java/eu/europa/esig/dss/token/RemoteSignatureToken.java similarity index 92% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/token/RemoteSignatureToken.java rename to dss-spi/src/main/java/eu/europa/esig/dss/token/RemoteSignatureToken.java index d7461f3a2f..8ed1286e9f 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/token/RemoteSignatureToken.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/token/RemoteSignatureToken.java @@ -18,12 +18,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.token; +package eu.europa.esig.dss.token; import java.util.List; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.exception.DSSException; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DigestAlgorithm; /** * TODO diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/token/SignatureTokenConnection.java b/dss-spi/src/main/java/eu/europa/esig/dss/token/SignatureTokenConnection.java similarity index 91% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/token/SignatureTokenConnection.java rename to dss-spi/src/main/java/eu/europa/esig/dss/token/SignatureTokenConnection.java index b0bd9fed1c..65979ea4d4 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/signature/token/SignatureTokenConnection.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/token/SignatureTokenConnection.java @@ -18,14 +18,14 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.token; +package eu.europa.esig.dss.token; import java.util.List; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.SignatureValue; -import eu.europa.ec.markt.dss.ToBeSigned; -import eu.europa.ec.markt.dss.exception.DSSException; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.SignatureValue; +import eu.europa.esig.dss.ToBeSigned; /** * Connection through available API to the SSCD (SmartCard, MSCAPI, PKCS#12) diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/condition/CompositeCondition.java b/dss-spi/src/main/java/eu/europa/esig/dss/tsl/CompositeCondition.java similarity index 95% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/condition/CompositeCondition.java rename to dss-spi/src/main/java/eu/europa/esig/dss/tsl/CompositeCondition.java index 4f7162422a..3d9eebf6ab 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/condition/CompositeCondition.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/tsl/CompositeCondition.java @@ -18,12 +18,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.condition; +package eu.europa.esig.dss.tsl; import java.util.ArrayList; import java.util.List; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; +import eu.europa.esig.dss.x509.CertificateToken; /** * Checks if a certificate has a specific policy OID.
diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/condition/Condition.java b/dss-spi/src/main/java/eu/europa/esig/dss/tsl/Condition.java similarity index 92% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/condition/Condition.java rename to dss-spi/src/main/java/eu/europa/esig/dss/tsl/Condition.java index 690bb38a09..6cfebcc05c 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/condition/Condition.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/tsl/Condition.java @@ -18,11 +18,11 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.condition; +package eu.europa.esig.dss.tsl; import java.io.Serializable; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; +import eu.europa.esig.dss.x509.CertificateToken; /** * Represents a condition defined in the trusted list on a certificate. diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/condition/CriteriaListCondition.java b/dss-spi/src/main/java/eu/europa/esig/dss/tsl/CriteriaListCondition.java similarity index 96% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/condition/CriteriaListCondition.java rename to dss-spi/src/main/java/eu/europa/esig/dss/tsl/CriteriaListCondition.java index 2fb4c27e8f..c86d35b039 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/condition/CriteriaListCondition.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/tsl/CriteriaListCondition.java @@ -18,9 +18,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.condition; +package eu.europa.esig.dss.tsl; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; +import eu.europa.esig.dss.x509.CertificateToken; /** * Condition resulting of the matchingCriteriaIndicator of other Conditions diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/condition/KeyUsageCondition.java b/dss-spi/src/main/java/eu/europa/esig/dss/tsl/KeyUsageCondition.java similarity index 96% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/condition/KeyUsageCondition.java rename to dss-spi/src/main/java/eu/europa/esig/dss/tsl/KeyUsageCondition.java index 7eb9e224bc..b4dadb4a84 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/condition/KeyUsageCondition.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/tsl/KeyUsageCondition.java @@ -18,9 +18,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.condition; +package eu.europa.esig.dss.tsl; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; +import eu.europa.esig.dss.x509.CertificateToken; /** * Test if the certificate has a Key usage diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/condition/MatchingCriteriaIndicator.java b/dss-spi/src/main/java/eu/europa/esig/dss/tsl/MatchingCriteriaIndicator.java similarity index 94% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/condition/MatchingCriteriaIndicator.java rename to dss-spi/src/main/java/eu/europa/esig/dss/tsl/MatchingCriteriaIndicator.java index 5c8866668f..ac543de816 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/condition/MatchingCriteriaIndicator.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/tsl/MatchingCriteriaIndicator.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.condition; +package eu.europa.esig.dss.tsl; /** * How the conditions are aggregated. diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/condition/PolicyIdCondition.java b/dss-spi/src/main/java/eu/europa/esig/dss/tsl/PolicyIdCondition.java similarity index 95% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/condition/PolicyIdCondition.java rename to dss-spi/src/main/java/eu/europa/esig/dss/tsl/PolicyIdCondition.java index 1e5164c20c..5c7a5219bf 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/condition/PolicyIdCondition.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/tsl/PolicyIdCondition.java @@ -18,11 +18,11 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.condition; +package eu.europa.esig.dss.tsl; import java.util.List; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; +import eu.europa.esig.dss.x509.CertificateToken; /** * Checks if a certificate has a specific policy OID.
diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/condition/QcStatementCondition.java b/dss-spi/src/main/java/eu/europa/esig/dss/tsl/QcStatementCondition.java similarity index 94% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/condition/QcStatementCondition.java rename to dss-spi/src/main/java/eu/europa/esig/dss/tsl/QcStatementCondition.java index d0654dd7d8..6b657c6a25 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/condition/QcStatementCondition.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/tsl/QcStatementCondition.java @@ -18,13 +18,13 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.condition; +package eu.europa.esig.dss.tsl; import java.util.List; import org.bouncycastle.asn1.ASN1ObjectIdentifier; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; +import eu.europa.esig.dss.x509.CertificateToken; /** * Condition that check a specific QCStatement diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/condition/QualificationElement.java b/dss-spi/src/main/java/eu/europa/esig/dss/tsl/QualificationElement.java similarity index 97% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/condition/QualificationElement.java rename to dss-spi/src/main/java/eu/europa/esig/dss/tsl/QualificationElement.java index d8069274a2..8c7ceb3785 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/condition/QualificationElement.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/tsl/QualificationElement.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.condition; +package eu.europa.esig.dss.tsl; /** * This class represents a qualification element defined in the trusted list. It associates the qualification and its condition. diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/condition/ServiceInfo.java b/dss-spi/src/main/java/eu/europa/esig/dss/tsl/ServiceInfo.java similarity index 98% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/condition/ServiceInfo.java rename to dss-spi/src/main/java/eu/europa/esig/dss/tsl/ServiceInfo.java index d77ef22dbe..89d716d552 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/condition/ServiceInfo.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/tsl/ServiceInfo.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.condition; +package eu.europa.esig.dss.tsl; import java.io.Serializable; import java.util.ArrayList; @@ -31,8 +31,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.x509.CertificateToken; /** * From a validation point of view, a Service is a set of pair ("Qualification Statement", "Condition"). diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/ArchiveTimestampType.java b/dss-spi/src/main/java/eu/europa/esig/dss/x509/ArchiveTimestampType.java similarity index 95% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/ArchiveTimestampType.java rename to dss-spi/src/main/java/eu/europa/esig/dss/x509/ArchiveTimestampType.java index ae6e6203e5..a83ff7dd6d 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/ArchiveTimestampType.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/x509/ArchiveTimestampType.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853; +package eu.europa.esig.dss.x509; /** * Different types of archive timestamps. diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/CertificatePool.java b/dss-spi/src/main/java/eu/europa/esig/dss/x509/CertificatePool.java similarity index 97% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/CertificatePool.java rename to dss-spi/src/main/java/eu/europa/esig/dss/x509/CertificatePool.java index 182785d9e7..b3359bda6f 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/CertificatePool.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/x509/CertificatePool.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853; +package eu.europa.esig.dss.x509; import java.io.Serializable; import java.security.cert.X509Certificate; @@ -35,9 +35,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.TokenIdentifier; -import eu.europa.ec.markt.dss.validation102853.certificate.CertificateSourceType; -import eu.europa.ec.markt.dss.validation102853.condition.ServiceInfo; +import eu.europa.esig.dss.TokenIdentifier; +import eu.europa.esig.dss.tsl.ServiceInfo; /** * This class hosts the set of certificates which is used during the validation process. A certificate can be found in diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/CertificateSource.java b/dss-spi/src/main/java/eu/europa/esig/dss/x509/CertificateSource.java similarity index 97% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/CertificateSource.java rename to dss-spi/src/main/java/eu/europa/esig/dss/x509/CertificateSource.java index 88e816c37c..9738e5b521 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/CertificateSource.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/x509/CertificateSource.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853; +package eu.europa.esig.dss.x509; import java.io.Serializable; import java.util.List; diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/certificate/CertificateSourceType.java b/dss-spi/src/main/java/eu/europa/esig/dss/x509/CertificateSourceType.java similarity index 94% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/certificate/CertificateSourceType.java rename to dss-spi/src/main/java/eu/europa/esig/dss/x509/CertificateSourceType.java index 45f81d0390..bc60f9e768 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/certificate/CertificateSourceType.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/x509/CertificateSourceType.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.certificate; +package eu.europa.esig.dss.x509; /** * Standard sources for a certificate diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/CertificateToken.java b/dss-spi/src/main/java/eu/europa/esig/dss/x509/CertificateToken.java similarity index 97% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/CertificateToken.java rename to dss-spi/src/main/java/eu/europa/esig/dss/x509/CertificateToken.java index cc5983e9c8..ceada60b68 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/CertificateToken.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/x509/CertificateToken.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853; +package eu.europa.esig.dss.x509; import java.io.IOException; import java.math.BigInteger; @@ -50,15 +50,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.DSSASN1Utils; -import eu.europa.ec.markt.dss.DSSPKUtils; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.OID; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.validation102853.certificate.CertificateSourceType; -import eu.europa.ec.markt.dss.validation102853.condition.ServiceInfo; +import eu.europa.esig.dss.DSSASN1Utils; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSPKUtils; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.OID; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.tsl.ServiceInfo; /** * Whenever the signature validation process encounters an {@link java.security.cert.X509Certificate} a certificateToken is created.
@@ -135,7 +134,7 @@ public class CertificateToken extends Token { private String xmlId; /** - * This method returns an instance of {@link eu.europa.ec.markt.dss.validation102853.CertificateToken}. + * This method returns an instance of {@link eu.europa.esig.dss.x509.CertificateToken}. * * @param cert X509Certificate * @return @@ -398,7 +397,7 @@ public List getSources() { } /** - * Gets information about the trusted context of the certificate. See {@link eu.europa.ec.markt.dss.validation102853.condition.ServiceInfo} for more information. + * Gets information about the trusted context of the certificate. See {@link eu.europa.esig.dss.tsl.ServiceInfo} for more information. * * @return */ diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/CertificateTokenValidationExtraInfo.java b/dss-spi/src/main/java/eu/europa/esig/dss/x509/CertificateTokenValidationExtraInfo.java similarity index 97% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/CertificateTokenValidationExtraInfo.java rename to dss-spi/src/main/java/eu/europa/esig/dss/x509/CertificateTokenValidationExtraInfo.java index 002de5ff2b..eabba89739 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/CertificateTokenValidationExtraInfo.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/x509/CertificateTokenValidationExtraInfo.java @@ -18,11 +18,11 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853; +package eu.europa.esig.dss.x509; import java.util.Date; -import eu.europa.ec.markt.dss.DSSUtils; +import eu.europa.esig.dss.DSSUtils; public class CertificateTokenValidationExtraInfo extends TokenValidationExtraInfo { diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/CommonCertificateSource.java b/dss-spi/src/main/java/eu/europa/esig/dss/x509/CommonCertificateSource.java similarity index 96% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/CommonCertificateSource.java rename to dss-spi/src/main/java/eu/europa/esig/dss/x509/CommonCertificateSource.java index 044d82ff0c..880cad325e 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/CommonCertificateSource.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/x509/CommonCertificateSource.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853; +package eu.europa.esig.dss.x509; import java.util.ArrayList; import java.util.Collections; @@ -26,8 +26,7 @@ import javax.security.auth.x500.X500Principal; -import eu.europa.ec.markt.dss.validation102853.certificate.CertificateSourceType; -import eu.europa.ec.markt.dss.validation102853.condition.ServiceInfo; +import eu.europa.esig.dss.tsl.ServiceInfo; /** * This source of certificates handles any non trusted certificates. (ex: intermediate certificates used in building certification chain) diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/CommonTrustedCertificateSource.java b/dss-spi/src/main/java/eu/europa/esig/dss/x509/CommonTrustedCertificateSource.java similarity index 94% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/CommonTrustedCertificateSource.java rename to dss-spi/src/main/java/eu/europa/esig/dss/x509/CommonTrustedCertificateSource.java index 09774991d1..3f08cec7ee 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/CommonTrustedCertificateSource.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/x509/CommonTrustedCertificateSource.java @@ -18,14 +18,13 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853; +package eu.europa.esig.dss.x509; import java.util.List; import javax.security.auth.x500.X500Principal; -import eu.europa.ec.markt.dss.validation102853.certificate.CertificateSourceType; -import eu.europa.ec.markt.dss.validation102853.condition.ServiceInfo; +import eu.europa.esig.dss.tsl.ServiceInfo; /** * This class represents the simple list of trusted certificates. diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/KeyStoreCertificateSource.java b/dss-spi/src/main/java/eu/europa/esig/dss/x509/KeyStoreCertificateSource.java similarity index 96% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/KeyStoreCertificateSource.java rename to dss-spi/src/main/java/eu/europa/esig/dss/x509/KeyStoreCertificateSource.java index 64e9006a93..dfd7751c5e 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/KeyStoreCertificateSource.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/x509/KeyStoreCertificateSource.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853; +package eu.europa.esig.dss.x509; import java.io.File; import java.io.FileInputStream; @@ -34,9 +34,8 @@ import java.util.Enumeration; import java.util.List; -import eu.europa.ec.markt.dss.exception.DSSEncodingException; -import eu.europa.ec.markt.dss.exception.DSSEncodingException.MSG; -import eu.europa.ec.markt.dss.validation102853.certificate.CertificateSourceType; +import eu.europa.esig.dss.DSSEncodingException; +import eu.europa.esig.dss.DSSEncodingException.MSG; /** * Implements a CertificateSource using a JKS KeyStore. diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/OCSPToken.java b/dss-spi/src/main/java/eu/europa/esig/dss/x509/OCSPToken.java similarity index 96% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/OCSPToken.java rename to dss-spi/src/main/java/eu/europa/esig/dss/x509/OCSPToken.java index f400126ff5..6a7c740063 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/OCSPToken.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/x509/OCSPToken.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853; +package eu.europa.esig.dss.x509; import java.io.IOException; import java.io.StringWriter; @@ -39,10 +39,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.DSSRevocationUtils; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.exception.DSSException; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSRevocationUtils; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.SignatureAlgorithm; /** * OCSP Signed Token which encapsulate BasicOCSPResp (BC). diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/RevocationToken.java b/dss-spi/src/main/java/eu/europa/esig/dss/x509/RevocationToken.java similarity index 97% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/RevocationToken.java rename to dss-spi/src/main/java/eu/europa/esig/dss/x509/RevocationToken.java index 4d3a8863dc..a03a4fdad3 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/RevocationToken.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/x509/RevocationToken.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853; +package eu.europa.esig.dss.x509; import java.util.Date; diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/SignatureCertificateSource.java b/dss-spi/src/main/java/eu/europa/esig/dss/x509/SignatureCertificateSource.java similarity index 94% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/SignatureCertificateSource.java rename to dss-spi/src/main/java/eu/europa/esig/dss/x509/SignatureCertificateSource.java index 07cf8d053f..432c1863ab 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/SignatureCertificateSource.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/x509/SignatureCertificateSource.java @@ -18,12 +18,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853; +package eu.europa.esig.dss.x509; import java.util.List; -import eu.europa.ec.markt.dss.validation102853.certificate.CertificateSourceType; - /** * The advanced signature contains a list of certificate that was needed to validate the signature. This class is a * basic skeleton that is able to retrieve the needed certificate from a list. The child need to retrieve the list of diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/SignatureForm.java b/dss-spi/src/main/java/eu/europa/esig/dss/x509/SignatureForm.java similarity index 95% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/SignatureForm.java rename to dss-spi/src/main/java/eu/europa/esig/dss/x509/SignatureForm.java index 186ab16cb1..a4f04259de 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/SignatureForm.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/x509/SignatureForm.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853; +package eu.europa.esig.dss.x509; /** * Different signature forms.
diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/SignaturePolicy.java b/dss-spi/src/main/java/eu/europa/esig/dss/x509/SignaturePolicy.java similarity index 97% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/SignaturePolicy.java rename to dss-spi/src/main/java/eu/europa/esig/dss/x509/SignaturePolicy.java index 8884d0d6f2..719f7c3f23 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/SignaturePolicy.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/x509/SignaturePolicy.java @@ -18,9 +18,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853; +package eu.europa.esig.dss.x509; -import eu.europa.ec.markt.dss.DigestAlgorithm; +import eu.europa.esig.dss.DigestAlgorithm; /** * Represents the value of a SignaturePolicy diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/TimestampType.java b/dss-spi/src/main/java/eu/europa/esig/dss/x509/TimestampType.java similarity index 97% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/TimestampType.java rename to dss-spi/src/main/java/eu/europa/esig/dss/x509/TimestampType.java index 2918357b07..f7cbae8013 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/TimestampType.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/x509/TimestampType.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853; +package eu.europa.esig.dss.x509; /** * Source of the timestamp diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/TimestampValidation.java b/dss-spi/src/main/java/eu/europa/esig/dss/x509/TimestampValidation.java similarity index 97% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/TimestampValidation.java rename to dss-spi/src/main/java/eu/europa/esig/dss/x509/TimestampValidation.java index 8186bb84a0..7c78e460f3 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/TimestampValidation.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/x509/TimestampValidation.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853; +package eu.europa.esig.dss.x509; /** * This class holds the result of the timestamp's signature validation. diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/TimestampValidity.java b/dss-spi/src/main/java/eu/europa/esig/dss/x509/TimestampValidity.java similarity index 96% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/TimestampValidity.java rename to dss-spi/src/main/java/eu/europa/esig/dss/x509/TimestampValidity.java index fc065d23cb..cbf8471c84 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/TimestampValidity.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/x509/TimestampValidity.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853; +package eu.europa.esig.dss.x509; /** * TODO diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/Token.java b/dss-spi/src/main/java/eu/europa/esig/dss/x509/Token.java similarity index 94% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/Token.java rename to dss-spi/src/main/java/eu/europa/esig/dss/x509/Token.java index dc9da924a0..34058c9ea5 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/Token.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/x509/Token.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853; +package eu.europa.esig.dss.x509; import java.io.Serializable; import java.security.PublicKey; @@ -26,9 +26,9 @@ import javax.security.auth.x500.X500Principal; -import eu.europa.ec.markt.dss.DSSPKUtils; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.TokenIdentifier; +import eu.europa.esig.dss.DSSPKUtils; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.TokenIdentifier; /** * This is the base class for the different types of tokens (certificate, OCSP, CRL, Timestamp) used in the process of @@ -73,19 +73,19 @@ public final boolean equals(Object obj) { if (this == obj) { return true; } - if (obj == null || !(obj instanceof Token)) { + if ((obj == null) || !(obj instanceof Token)) { return false; } Token o2 = (Token) obj; return getDSSId().equals(o2.getDSSId()); } - + @Override public final int hashCode() { return getDSSId().hashCode(); } - + /** * Checks if the certificate is provided by the trusted list. For all tokens different from CertificateToken this * method always returns false. This method was introduced in order to manage in a uniform manner the different @@ -159,7 +159,7 @@ public TokenIdentifier getIssuerTokenDSSId() { * @param issuerToken * @return */ - protected abstract boolean isSignedBy(CertificateToken issuerToken); + public abstract boolean isSignedBy(CertificateToken issuerToken); /** * Returns the additional information gathered during the validation process. @@ -207,7 +207,7 @@ public boolean isSignatureValid() { * * @return */ - TokenValidationExtraInfo extraInfo() { + public TokenValidationExtraInfo extraInfo() { return extraInfo; } diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/TokenValidationExtraInfo.java b/dss-spi/src/main/java/eu/europa/esig/dss/x509/TokenValidationExtraInfo.java similarity index 97% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/TokenValidationExtraInfo.java rename to dss-spi/src/main/java/eu/europa/esig/dss/x509/TokenValidationExtraInfo.java index 7fdb91b941..efe6b3c1a9 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/TokenValidationExtraInfo.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/x509/TokenValidationExtraInfo.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853; +package eu.europa.esig.dss.x509; import java.io.Serializable; import java.util.ArrayList; diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/crl/CRLReasonEnum.java b/dss-spi/src/main/java/eu/europa/esig/dss/x509/crl/CRLReasonEnum.java similarity index 97% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/crl/CRLReasonEnum.java rename to dss-spi/src/main/java/eu/europa/esig/dss/x509/crl/CRLReasonEnum.java index ec0c4c21ba..a7cc286ae4 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/crl/CRLReasonEnum.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/x509/crl/CRLReasonEnum.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.crl; +package eu.europa.esig.dss.x509.crl; /** diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/crl/CRLSource.java b/dss-spi/src/main/java/eu/europa/esig/dss/x509/crl/CRLSource.java similarity index 91% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/crl/CRLSource.java rename to dss-spi/src/main/java/eu/europa/esig/dss/x509/crl/CRLSource.java index 124905dbf2..f9a8073a96 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/crl/CRLSource.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/x509/crl/CRLSource.java @@ -18,10 +18,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.crl; +package eu.europa.esig.dss.x509.crl; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.x509.CertificateToken; /** * The validation of a certificate requires the access to some CRLs. This information can be found online, in a cache or even in diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/crl/CRLToken.java b/dss-spi/src/main/java/eu/europa/esig/dss/x509/crl/CRLToken.java similarity index 92% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/crl/CRLToken.java rename to dss-spi/src/main/java/eu/europa/esig/dss/x509/crl/CRLToken.java index 4548afcc1f..e9e4ddb345 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/crl/CRLToken.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/x509/crl/CRLToken.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.crl; +package eu.europa.esig.dss.x509.crl; import java.math.BigInteger; import java.security.cert.CRLException; @@ -38,14 +38,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.DSSRevocationUtils; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.exception.DSSNotApplicableMethodException; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.validation102853.RevocationToken; -import eu.europa.ec.markt.dss.validation102853.TokenValidationExtraInfo; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSNotApplicableMethodException; +import eu.europa.esig.dss.DSSRevocationUtils; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.x509.CertificateToken; +import eu.europa.esig.dss.x509.RevocationToken; +import eu.europa.esig.dss.x509.TokenValidationExtraInfo; /** * This class represents a CRL and provides the information about its validity. @@ -186,8 +186,7 @@ public void setSourceURL(final String sourceURL) { } @Override - protected boolean isSignedBy(final CertificateToken issuerToken) { - + public boolean isSignedBy(final CertificateToken issuerToken) { throw new DSSNotApplicableMethodException(this.getClass()); } @@ -244,7 +243,7 @@ public String toString(String indentStr) { out.append(indentStr).append("Version: ").append(crlValidity.getX509CRL().getVersion()).append('\n'); out.append(indentStr).append("Issuing time: ").append(issuingTime == null ? "?" : DSSUtils.formatInternal(issuingTime)).append('\n'); out.append(indentStr).append("Signature algorithm: ").append(algorithmUsedToSignToken == null ? "?" : algorithmUsedToSignToken) - .append('\n'); + .append('\n'); out.append(indentStr).append("Status: ").append(getStatus()).append('\n'); if (issuerToken != null) { out.append(indentStr).append("Issuer's certificate: ").append(issuerToken.getDSSIdAsString()).append('\n'); diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/crl/CRLUtils.java b/dss-spi/src/main/java/eu/europa/esig/dss/x509/crl/CRLUtils.java similarity index 96% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/crl/CRLUtils.java rename to dss-spi/src/main/java/eu/europa/esig/dss/x509/crl/CRLUtils.java index 27bcc50972..2e7cbbfea2 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/crl/CRLUtils.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/x509/crl/CRLUtils.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.crl; +package eu.europa.esig.dss.x509.crl; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; @@ -38,9 +38,9 @@ import org.bouncycastle.asn1.x509.IssuingDistributionPoint; import org.bouncycastle.asn1.x509.ReasonFlags; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.x509.CertificateToken; /** * This is the representation of simple (common) CRL source, this is the base diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/crl/CRLValidity.java b/dss-spi/src/main/java/eu/europa/esig/dss/x509/crl/CRLValidity.java similarity index 96% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/crl/CRLValidity.java rename to dss-spi/src/main/java/eu/europa/esig/dss/x509/crl/CRLValidity.java index 2e8b4e46c9..6c8aa7a0d3 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/crl/CRLValidity.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/x509/crl/CRLValidity.java @@ -18,11 +18,11 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.crl; +package eu.europa.esig.dss.x509.crl; import java.security.cert.X509CRL; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; +import eu.europa.esig.dss.x509.CertificateToken; /** * This class encapsulates all information related to the validity of a CRL. It diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/crl/ListCRLSource.java b/dss-spi/src/main/java/eu/europa/esig/dss/x509/crl/ListCRLSource.java similarity index 97% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/crl/ListCRLSource.java rename to dss-spi/src/main/java/eu/europa/esig/dss/x509/crl/ListCRLSource.java index c18fabe401..51aca67892 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/crl/ListCRLSource.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/x509/crl/ListCRLSource.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.crl; +package eu.europa.esig.dss.x509.crl; import java.security.cert.X509CRL; import java.util.ArrayList; diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/crl/OfflineCRLSource.java b/dss-spi/src/main/java/eu/europa/esig/dss/x509/crl/OfflineCRLSource.java similarity index 97% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/crl/OfflineCRLSource.java rename to dss-spi/src/main/java/eu/europa/esig/dss/x509/crl/OfflineCRLSource.java index d38102f754..966313cccf 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/crl/OfflineCRLSource.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/x509/crl/OfflineCRLSource.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.crl; +package eu.europa.esig.dss.x509.crl; import java.security.cert.X509CRL; import java.util.Collections; @@ -30,7 +30,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; +import eu.europa.esig.dss.x509.CertificateToken; /** * This class if a basic skeleton that is able to retrieve needed CRL data from diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/ocsp/ListOCSPSource.java b/dss-spi/src/main/java/eu/europa/esig/dss/x509/ocsp/ListOCSPSource.java similarity index 97% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/ocsp/ListOCSPSource.java rename to dss-spi/src/main/java/eu/europa/esig/dss/x509/ocsp/ListOCSPSource.java index a08c7bcc84..0d26789bdd 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/ocsp/ListOCSPSource.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/x509/ocsp/ListOCSPSource.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.ocsp; +package eu.europa.esig.dss.x509.ocsp; import java.util.ArrayList; import java.util.List; diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/ocsp/OCSPSource.java b/dss-spi/src/main/java/eu/europa/esig/dss/x509/ocsp/OCSPSource.java similarity index 91% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/ocsp/OCSPSource.java rename to dss-spi/src/main/java/eu/europa/esig/dss/x509/ocsp/OCSPSource.java index 2769209a37..8a302471b6 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/ocsp/OCSPSource.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/x509/ocsp/OCSPSource.java @@ -18,12 +18,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.ocsp; +package eu.europa.esig.dss.x509.ocsp; import java.io.Serializable; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.validation102853.OCSPToken; +import eu.europa.esig.dss.x509.CertificateToken; +import eu.europa.esig.dss.x509.OCSPToken; /** * The validation of a certificate may require the use of OCSP information. Theses information can be provided by multiple sources diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/ocsp/OfflineOCSPSource.java b/dss-spi/src/main/java/eu/europa/esig/dss/x509/ocsp/OfflineOCSPSource.java similarity index 94% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/ocsp/OfflineOCSPSource.java rename to dss-spi/src/main/java/eu/europa/esig/dss/x509/ocsp/OfflineOCSPSource.java index 0665e6e6a4..15b0ba6e52 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/ocsp/OfflineOCSPSource.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/x509/ocsp/OfflineOCSPSource.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.ocsp; +package eu.europa.esig.dss.x509.ocsp; import java.security.cert.X509Certificate; import java.util.Date; @@ -30,9 +30,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.DSSRevocationUtils; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.validation102853.OCSPToken; +import eu.europa.esig.dss.DSSRevocationUtils; +import eu.europa.esig.dss.x509.CertificateToken; +import eu.europa.esig.dss.x509.OCSPToken; /** * Abstract class that helps to implement an OCSPSource with an already loaded list of BasicOCSPResp diff --git a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/tsp/TSPSource.java b/dss-spi/src/main/java/eu/europa/esig/dss/x509/tsp/TSPSource.java similarity index 90% rename from dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/tsp/TSPSource.java rename to dss-spi/src/main/java/eu/europa/esig/dss/x509/tsp/TSPSource.java index fe1a221910..3a9719e0c1 100644 --- a/dss-spi/src/main/java/eu/europa/ec/markt/dss/validation102853/tsp/TSPSource.java +++ b/dss-spi/src/main/java/eu/europa/esig/dss/x509/tsp/TSPSource.java @@ -18,14 +18,14 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.tsp; +package eu.europa.esig.dss.x509.tsp; import java.io.Serializable; import org.bouncycastle.tsp.TimeStampToken; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.exception.DSSException; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DigestAlgorithm; /** * Abstraction of a Time Stamping authority which delivers RFC 3161 Time Stamp Responses containing tokens, from Time diff --git a/dss-spi/src/test/java/eu/europa/ec/markt/dss/ASN1ObjectIdentifierComparatorTest.java b/dss-spi/src/test/java/eu/europa/ec/markt/dss/ASN1ObjectIdentifierComparatorTest.java deleted file mode 100644 index 56fa22023e..0000000000 --- a/dss-spi/src/test/java/eu/europa/ec/markt/dss/ASN1ObjectIdentifierComparatorTest.java +++ /dev/null @@ -1,75 +0,0 @@ -/** - * DSS - Digital Signature Services - * Copyright (C) 2015 European Commission, provided under the CEF programme - * - * This file is part of the "DSS - Digital Signature Services" project. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ -package eu.europa.ec.markt.dss; - -import static org.junit.Assert.assertEquals; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.bouncycastle.asn1.ASN1ObjectIdentifier; -import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers; -import org.junit.Test; - -public class ASN1ObjectIdentifierComparatorTest { - - @Test - public void test1() { - List oids = new ArrayList(); - oids.add(PKCSObjectIdentifiers.id_aa_receiptRequest); //1.2.840.113549.1.9.16.2.1 - oids.add(PKCSObjectIdentifiers.id_aa); // 1.2.840.113549.1.9.16.2 - - Collections.sort(oids, new ASN1ObjectIdentifierComparator()); - - assertEquals(PKCSObjectIdentifiers.id_aa, oids.get(0)); - assertEquals(PKCSObjectIdentifiers.id_aa_receiptRequest, oids.get(1)); - } - - @Test - public void test2() { - List oids = new ArrayList(); - oids.add(PKCSObjectIdentifiers.id_aa); // 1.2.840.113549.1.9.16.6.2 - oids.add(PKCSObjectIdentifiers.id_aa_receiptRequest); //1.2.840.113549.1.9.16.2.1 - - Collections.sort(oids, new ASN1ObjectIdentifierComparator()); - - assertEquals(PKCSObjectIdentifiers.id_aa, oids.get(0)); - assertEquals(PKCSObjectIdentifiers.id_aa_receiptRequest, oids.get(1)); - } - - @Test - public void test3() { - List oids = new ArrayList(); - oids.add(PKCSObjectIdentifiers.id_aa); // 1.2.840.113549.1.9.16.2 - oids.add(PKCSObjectIdentifiers.id_alg); // 1.2.840.113549.1.9.16.3 - oids.add(PKCSObjectIdentifiers.id_aa_receiptRequest); // 1.2.840.113549.1.9.16.2.1 - oids.add(PKCSObjectIdentifiers.pkcs_9); // 1.2.840.113549.1.9 - - Collections.sort(oids, new ASN1ObjectIdentifierComparator()); - - assertEquals(PKCSObjectIdentifiers.pkcs_9, oids.get(0)); - assertEquals(PKCSObjectIdentifiers.id_aa, oids.get(1)); - assertEquals(PKCSObjectIdentifiers.id_aa_receiptRequest, oids.get(2)); - assertEquals(PKCSObjectIdentifiers.id_alg, oids.get(3)); - } - -} diff --git a/dss-spi/src/test/java/eu/europa/ec/markt/dss/DigestTest.java b/dss-spi/src/test/java/eu/europa/esig/dss/DigestTest.java similarity index 95% rename from dss-spi/src/test/java/eu/europa/ec/markt/dss/DigestTest.java rename to dss-spi/src/test/java/eu/europa/esig/dss/DigestTest.java index 7e9076c986..fc703d8787 100644 --- a/dss-spi/src/test/java/eu/europa/ec/markt/dss/DigestTest.java +++ b/dss-spi/src/test/java/eu/europa/esig/dss/DigestTest.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss; +package eu.europa.esig.dss; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -29,6 +29,9 @@ import org.junit.Assert; import org.junit.Test; +import eu.europa.esig.dss.Digest; +import eu.europa.esig.dss.DigestAlgorithm; + public class DigestTest { @Test diff --git a/dss-test/src/main/java/eu/europa/ec/markt/dss/utils/TestUtils.java b/dss-test/src/main/java/eu/europa/esig/dss/test/TestUtils.java similarity index 91% rename from dss-test/src/main/java/eu/europa/ec/markt/dss/utils/TestUtils.java rename to dss-test/src/main/java/eu/europa/esig/dss/test/TestUtils.java index 23dce23162..98447d9c9c 100644 --- a/dss-test/src/main/java/eu/europa/ec/markt/dss/utils/TestUtils.java +++ b/dss-test/src/main/java/eu/europa/esig/dss/test/TestUtils.java @@ -18,14 +18,14 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.utils; +package eu.europa.esig.dss.test; import java.security.GeneralSecurityException; import java.security.PrivateKey; import java.security.Signature; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.exception.DSSException; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.SignatureAlgorithm; public final class TestUtils { diff --git a/dss-test/src/main/java/eu/europa/ec/markt/dss/service/CRLGenerator.java b/dss-test/src/main/java/eu/europa/esig/dss/test/gen/CRLGenerator.java similarity index 96% rename from dss-test/src/main/java/eu/europa/ec/markt/dss/service/CRLGenerator.java rename to dss-test/src/main/java/eu/europa/esig/dss/test/gen/CRLGenerator.java index 9868b27a9b..c9fa5b3a64 100644 --- a/dss-test/src/main/java/eu/europa/ec/markt/dss/service/CRLGenerator.java +++ b/dss-test/src/main/java/eu/europa/esig/dss/test/gen/CRLGenerator.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.service; +package eu.europa.esig.dss.test.gen; import java.security.Security; import java.security.cert.X509CRL; @@ -35,7 +35,7 @@ import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; public class CRLGenerator { diff --git a/dss-test/src/main/java/eu/europa/ec/markt/dss/service/CertificateService.java b/dss-test/src/main/java/eu/europa/esig/dss/test/gen/CertificateService.java similarity index 96% rename from dss-test/src/main/java/eu/europa/ec/markt/dss/service/CertificateService.java rename to dss-test/src/main/java/eu/europa/esig/dss/test/gen/CertificateService.java index 687521fe6f..a1c604935d 100644 --- a/dss-test/src/main/java/eu/europa/ec/markt/dss/service/CertificateService.java +++ b/dss-test/src/main/java/eu/europa/esig/dss/test/gen/CertificateService.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.service; +package eu.europa.esig.dss.test.gen; import java.io.ByteArrayInputStream; import java.math.BigInteger; @@ -48,11 +48,11 @@ import org.bouncycastle.operator.ContentSigner; import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder; -import eu.europa.ec.markt.dss.EncryptionAlgorithm; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.mock.MockPrivateKeyEntry; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; +import eu.europa.esig.dss.EncryptionAlgorithm; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.test.mock.MockPrivateKeyEntry; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.x509.CertificateToken; public class CertificateService { diff --git a/dss-test/src/main/java/eu/europa/ec/markt/dss/mock/MockCRLSource.java b/dss-test/src/main/java/eu/europa/esig/dss/test/mock/MockCRLSource.java similarity index 94% rename from dss-test/src/main/java/eu/europa/ec/markt/dss/mock/MockCRLSource.java rename to dss-test/src/main/java/eu/europa/esig/dss/test/mock/MockCRLSource.java index f6ed2457bb..2a752ba12a 100644 --- a/dss-test/src/main/java/eu/europa/ec/markt/dss/mock/MockCRLSource.java +++ b/dss-test/src/main/java/eu/europa/esig/dss/test/mock/MockCRLSource.java @@ -18,14 +18,14 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.mock; +package eu.europa.esig.dss.test.mock; import java.io.InputStream; import java.security.cert.X509CRL; import java.util.ArrayList; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.validation102853.crl.OfflineCRLSource; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.x509.crl.OfflineCRLSource; /** * This class allows to provide a mock CRL source based on the list of diff --git a/dss-test/src/main/java/eu/europa/ec/markt/dss/mock/MockEmptyTSLCertificateSource.java b/dss-test/src/main/java/eu/europa/esig/dss/test/mock/MockEmptyTSLCertificateSource.java similarity index 86% rename from dss-test/src/main/java/eu/europa/ec/markt/dss/mock/MockEmptyTSLCertificateSource.java rename to dss-test/src/main/java/eu/europa/esig/dss/test/mock/MockEmptyTSLCertificateSource.java index 6d3bdddc6e..90eb18bc6c 100644 --- a/dss-test/src/main/java/eu/europa/ec/markt/dss/mock/MockEmptyTSLCertificateSource.java +++ b/dss-test/src/main/java/eu/europa/esig/dss/test/mock/MockEmptyTSLCertificateSource.java @@ -18,15 +18,15 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.mock; +package eu.europa.esig.dss.test.mock; import java.util.Calendar; -import eu.europa.ec.markt.dss.TSLConstant; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.validation102853.CommonTrustedCertificateSource; -import eu.europa.ec.markt.dss.validation102853.certificate.CertificateSourceType; -import eu.europa.ec.markt.dss.validation102853.condition.ServiceInfo; +import eu.europa.esig.dss.TSLConstant; +import eu.europa.esig.dss.tsl.ServiceInfo; +import eu.europa.esig.dss.x509.CertificateSourceType; +import eu.europa.esig.dss.x509.CertificateToken; +import eu.europa.esig.dss.x509.CommonTrustedCertificateSource; public class MockEmptyTSLCertificateSource extends CommonTrustedCertificateSource { diff --git a/dss-test/src/main/java/eu/europa/ec/markt/dss/mock/MockOCSPSource.java b/dss-test/src/main/java/eu/europa/esig/dss/test/mock/MockOCSPSource.java similarity index 93% rename from dss-test/src/main/java/eu/europa/ec/markt/dss/mock/MockOCSPSource.java rename to dss-test/src/main/java/eu/europa/esig/dss/test/mock/MockOCSPSource.java index 5a6a9d4a6c..6ae838ea7c 100644 --- a/dss-test/src/main/java/eu/europa/ec/markt/dss/mock/MockOCSPSource.java +++ b/dss-test/src/main/java/eu/europa/esig/dss/test/mock/MockOCSPSource.java @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.mock; +package eu.europa.esig.dss.test.mock; import java.io.InputStream; import java.util.ArrayList; @@ -28,8 +28,8 @@ import org.bouncycastle.cert.ocsp.BasicOCSPResp; import org.bouncycastle.cert.ocsp.OCSPResp; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.validation102853.ocsp.OfflineOCSPSource; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.x509.ocsp.OfflineOCSPSource; public class MockOCSPSource extends OfflineOCSPSource { diff --git a/dss-test/src/main/java/eu/europa/ec/markt/dss/mock/MockPrivateKeyEntry.java b/dss-test/src/main/java/eu/europa/esig/dss/test/mock/MockPrivateKeyEntry.java similarity index 88% rename from dss-test/src/main/java/eu/europa/ec/markt/dss/mock/MockPrivateKeyEntry.java rename to dss-test/src/main/java/eu/europa/esig/dss/test/mock/MockPrivateKeyEntry.java index 638818438b..68145dae4e 100644 --- a/dss-test/src/main/java/eu/europa/ec/markt/dss/mock/MockPrivateKeyEntry.java +++ b/dss-test/src/main/java/eu/europa/esig/dss/test/mock/MockPrivateKeyEntry.java @@ -18,14 +18,14 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.mock; +package eu.europa.esig.dss.test.mock; import java.security.PrivateKey; -import eu.europa.ec.markt.dss.EncryptionAlgorithm; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.EncryptionAlgorithm; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.x509.CertificateToken; public class MockPrivateKeyEntry implements DSSPrivateKeyEntry { diff --git a/dss-test/src/main/java/eu/europa/ec/markt/dss/mock/MockServiceInfo.java b/dss-test/src/main/java/eu/europa/esig/dss/test/mock/MockServiceInfo.java similarity index 90% rename from dss-test/src/main/java/eu/europa/ec/markt/dss/mock/MockServiceInfo.java rename to dss-test/src/main/java/eu/europa/esig/dss/test/mock/MockServiceInfo.java index 9a0269632c..5f12dc8f09 100644 --- a/dss-test/src/main/java/eu/europa/ec/markt/dss/mock/MockServiceInfo.java +++ b/dss-test/src/main/java/eu/europa/esig/dss/test/mock/MockServiceInfo.java @@ -18,12 +18,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.mock; +package eu.europa.esig.dss.test.mock; import java.util.Calendar; -import eu.europa.ec.markt.dss.TSLConstant; -import eu.europa.ec.markt.dss.validation102853.condition.ServiceInfo; +import eu.europa.esig.dss.TSLConstant; +import eu.europa.esig.dss.tsl.ServiceInfo; public class MockServiceInfo extends ServiceInfo { diff --git a/dss-test/src/main/java/eu/europa/ec/markt/dss/mock/MockSignatureTokenConnection.java b/dss-test/src/main/java/eu/europa/esig/dss/test/mock/MockSignatureTokenConnection.java similarity index 84% rename from dss-test/src/main/java/eu/europa/ec/markt/dss/mock/MockSignatureTokenConnection.java rename to dss-test/src/main/java/eu/europa/esig/dss/test/mock/MockSignatureTokenConnection.java index eedeea40e1..53ae12cb42 100644 --- a/dss-test/src/main/java/eu/europa/ec/markt/dss/mock/MockSignatureTokenConnection.java +++ b/dss-test/src/main/java/eu/europa/esig/dss/test/mock/MockSignatureTokenConnection.java @@ -18,13 +18,13 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.mock; +package eu.europa.esig.dss.test.mock; import java.util.List; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.signature.token.AbstractSignatureTokenConnection; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.token.AbstractSignatureTokenConnection; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; public class MockSignatureTokenConnection extends AbstractSignatureTokenConnection { diff --git a/dss-test/src/main/java/eu/europa/ec/markt/dss/mock/MockTSPSource.java b/dss-test/src/main/java/eu/europa/esig/dss/test/mock/MockTSPSource.java similarity index 95% rename from dss-test/src/main/java/eu/europa/ec/markt/dss/mock/MockTSPSource.java rename to dss-test/src/main/java/eu/europa/esig/dss/test/mock/MockTSPSource.java index 1a0e483a1d..ae002ba7f9 100644 --- a/dss-test/src/main/java/eu/europa/ec/markt/dss/mock/MockTSPSource.java +++ b/dss-test/src/main/java/eu/europa/esig/dss/test/mock/MockTSPSource.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.mock; +package eu.europa.esig.dss.test.mock; import java.math.BigInteger; import java.security.PrivateKey; @@ -58,12 +58,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.validation102853.tsp.TSPSource; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.x509.CertificateToken; +import eu.europa.esig.dss.x509.tsp.TSPSource; public class MockTSPSource implements TSPSource { diff --git a/dss-test/src/test/java/eu/europa/ec/markt/dss/service/CRLGeneratorTest.java b/dss-test/src/test/java/eu/europa/esig/dss/test/gen/CRLGeneratorTest.java similarity index 89% rename from dss-test/src/test/java/eu/europa/ec/markt/dss/service/CRLGeneratorTest.java rename to dss-test/src/test/java/eu/europa/esig/dss/test/gen/CRLGeneratorTest.java index 6d12f20462..aa85d14177 100644 --- a/dss-test/src/test/java/eu/europa/ec/markt/dss/service/CRLGeneratorTest.java +++ b/dss-test/src/test/java/eu/europa/esig/dss/test/gen/CRLGeneratorTest.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.service; +package eu.europa.esig.dss.test.gen; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -30,8 +30,10 @@ import org.bouncycastle.asn1.x509.CRLReason; import org.junit.Test; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.test.gen.CRLGenerator; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; public class CRLGeneratorTest { diff --git a/dss-test/src/test/java/eu/europa/ec/markt/dss/service/CertificateServiceTest.java b/dss-test/src/test/java/eu/europa/esig/dss/test/gen/CertificateServiceTest.java similarity index 90% rename from dss-test/src/test/java/eu/europa/ec/markt/dss/service/CertificateServiceTest.java rename to dss-test/src/test/java/eu/europa/esig/dss/test/gen/CertificateServiceTest.java index 3bf7779fb9..3366a665d0 100644 --- a/dss-test/src/test/java/eu/europa/ec/markt/dss/service/CertificateServiceTest.java +++ b/dss-test/src/test/java/eu/europa/esig/dss/test/gen/CertificateServiceTest.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.service; +package eu.europa.esig.dss.test.gen; import static org.junit.Assert.assertNotNull; @@ -29,9 +29,10 @@ import org.bouncycastle.tsp.TSPUtil; import org.junit.Test; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.x509.CertificateToken; public class CertificateServiceTest { diff --git a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/SignatureService.java b/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/SignatureService.java deleted file mode 100644 index a697dd89cd..0000000000 --- a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/SignatureService.java +++ /dev/null @@ -1,119 +0,0 @@ - -/** - * DSS - Digital Signature Services - * Copyright (C) 2015 European Commission, provided under the CEF programme - * - * This file is part of the "DSS - Digital Signature Services" project. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ -package eu.europa.ec.markt.dss.ws.signature; - -import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebResult; -import javax.jws.WebService; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.ws.RequestWrapper; -import javax.xml.ws.ResponseWrapper; - - -/** - * The signing web service allows to create a new signature or to extend existing one. Different forms of signature:XAdES, CAdES, PAdES, ASiC-S are accepted. - * The digital signature of a document in a web environment is performed in three steps: - * 1. Creating a byte stream representing the data to be signed. - * 2. Hashing of the data previously obtained and its encryption. This step is performed locally (not by the web service). - * 3. The creation of the envelope containing all the elements of a digital signature. - * The process is controlled by a set of parameters. - * - * This class was generated by the JAX-WS RI. - * JAX-WS RI 2.2.4-b01 - * Generated source version: 2.2 - * - */ -@WebService(name = "SignatureService", targetNamespace = "http://ws.dss.markt.ec.europa.eu/") -@XmlSeeAlso({ - ObjectFactory.class -}) -public interface SignatureService { - - - /** - * This method Extends the level of the signature(s) linked to the given document. It takes two parameters: the document with the signature(s), the set of driving parameters. - * - * @param signedDocument - * @param wsParameters - * @return - * returns eu.europa.ec.markt.dss.ws.signature.WsDocument - * @throws DSSException_Exception - */ - @WebMethod - @WebResult(name = "response", targetNamespace = "") - @RequestWrapper(localName = "extendSignature", targetNamespace = "http://ws.dss.markt.ec.europa.eu/", className = "eu.europa.ec.markt.dss.ws.signature.ExtendSignature") - @ResponseWrapper(localName = "extendSignatureResponse", targetNamespace = "http://ws.dss.markt.ec.europa.eu/", className = "eu.europa.ec.markt.dss.ws.signature.ExtendSignatureResponse") - public WsDocument extendSignature( - @WebParam(name = "signedDocument", targetNamespace = "") - WsDocument signedDocument, - @WebParam(name = "wsParameters", targetNamespace = "") - WsParameters wsParameters) - throws DSSException_Exception - ; - - /** - * This method creates the signature containing the provided encrypted hash value and all requested elements. It requests three parameters: the document to sign, the set of driving parameters and the encrypted hash value of bytes that need to be protected by the digital signature. - * - * @param document - * @param signatureValue - * @param wsParameters - * @return - * returns eu.europa.ec.markt.dss.ws.signature.WsDocument - * @throws DSSException_Exception - */ - @WebMethod - @WebResult(name = "response", targetNamespace = "") - @RequestWrapper(localName = "signDocument", targetNamespace = "http://ws.dss.markt.ec.europa.eu/", className = "eu.europa.ec.markt.dss.ws.signature.SignDocument") - @ResponseWrapper(localName = "signDocumentResponse", targetNamespace = "http://ws.dss.markt.ec.europa.eu/", className = "eu.europa.ec.markt.dss.ws.signature.SignDocumentResponse") - public WsDocument signDocument( - @WebParam(name = "document", targetNamespace = "") - WsDocument document, - @WebParam(name = "wsParameters", targetNamespace = "") - WsParameters wsParameters, - @WebParam(name = "signatureValue", targetNamespace = "") - byte[] signatureValue) - throws DSSException_Exception - ; - - /** - * This method retrieves the stream of data that need to be hashed and encrypted. It takes two parameters: the document to sign and the set of parameters. - * - * @param document - * @param wsParameters - * @return - * returns byte[] - * @throws DSSException_Exception - */ - @WebMethod - @WebResult(name = "response", targetNamespace = "") - @RequestWrapper(localName = "getDataToSign", targetNamespace = "http://ws.dss.markt.ec.europa.eu/", className = "eu.europa.ec.markt.dss.ws.signature.GetDataToSign") - @ResponseWrapper(localName = "getDataToSignResponse", targetNamespace = "http://ws.dss.markt.ec.europa.eu/", className = "eu.europa.ec.markt.dss.ws.signature.GetDataToSignResponse") - public byte[] getDataToSign( - @WebParam(name = "document", targetNamespace = "") - WsDocument document, - @WebParam(name = "wsParameters", targetNamespace = "") - WsParameters wsParameters) - throws DSSException_Exception - ; - -} diff --git a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/validation/ObjectFactory.java b/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/validation/ObjectFactory.java deleted file mode 100644 index 9bd3f70fde..0000000000 --- a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/validation/ObjectFactory.java +++ /dev/null @@ -1,133 +0,0 @@ - -/** - * DSS - Digital Signature Services - * Copyright (C) 2015 European Commission, provided under the CEF programme - * - * This file is part of the "DSS - Digital Signature Services" project. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ -package eu.europa.ec.markt.dss.ws.validation; - -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlElementDecl; -import javax.xml.bind.annotation.XmlRegistry; -import javax.xml.namespace.QName; - - -/** - * This object contains factory methods for each - * Java content interface and Java element interface - * generated in the eu.europa.ec.markt.dss.ws.validation package. - * - * construct new instances of the Java representation - * for XML content. The Java representation of XML - * content can consist of schema derived interfaces - * and classes representing the binding of schema - * type definitions, element declarations and model - * groups. Factory methods for each of these are - * provided in this class. - * - */ -@XmlRegistry -public class ObjectFactory { - - private final static QName _ValidateDocumentResponse_QNAME = new QName("http://ws.dss.markt.ec.europa.eu/", "validateDocumentResponse"); - private final static QName _DSSException_QNAME = new QName("http://ws.dss.markt.ec.europa.eu/", "DSSException"); - private final static QName _ValidateDocument_QNAME = new QName("http://ws.dss.markt.ec.europa.eu/", "validateDocument"); - - /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: eu.europa.ec.markt.dss.ws.validation - * - */ - public ObjectFactory() { - } - - /** - * Create an instance of {@link MimeType } - * - */ - public MimeType createMimeType() { - return new MimeType(); - } - - /** - * Create an instance of {@link ValidateDocument } - * - */ - public ValidateDocument createValidateDocument() { - return new ValidateDocument(); - } - - /** - * Create an instance of {@link DSSException } - * - */ - public DSSException createDSSException() { - return new DSSException(); - } - - /** - * Create an instance of {@link WsDocument } - * - */ - public WsDocument createWsDocument() { - return new WsDocument(); - } - - /** - * Create an instance of {@link WsValidationReport } - * - */ - public WsValidationReport createWsValidationReport() { - return new WsValidationReport(); - } - - /** - * Create an instance of {@link ValidateDocumentResponse } - * - */ - public ValidateDocumentResponse createValidateDocumentResponse() { - return new ValidateDocumentResponse(); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ValidateDocumentResponse }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://ws.dss.markt.ec.europa.eu/", name = "validateDocumentResponse") - public JAXBElement createValidateDocumentResponse(ValidateDocumentResponse value) { - return new JAXBElement(_ValidateDocumentResponse_QNAME, ValidateDocumentResponse.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link DSSException }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://ws.dss.markt.ec.europa.eu/", name = "DSSException") - public JAXBElement createDSSException(DSSException value) { - return new JAXBElement(_DSSException_QNAME, DSSException.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ValidateDocument }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://ws.dss.markt.ec.europa.eu/", name = "validateDocument") - public JAXBElement createValidateDocument(ValidateDocument value) { - return new JAXBElement(_ValidateDocument_QNAME, ValidateDocument.class, null, value); - } - -} diff --git a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/DSSException.java b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/DSSException.java similarity index 97% rename from dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/DSSException.java rename to dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/DSSException.java index c99feab9a8..36203560f0 100644 --- a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/DSSException.java +++ b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/DSSException.java @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.ws.signature; +package eu.europa.esig.dss.wsclient.signature; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/DSSException_Exception.java b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/DSSException_Exception.java similarity index 92% rename from dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/DSSException_Exception.java rename to dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/DSSException_Exception.java index fd33798dd9..4f8091d8f8 100644 --- a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/DSSException_Exception.java +++ b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/DSSException_Exception.java @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.ws.signature; +package eu.europa.esig.dss.wsclient.signature; import javax.xml.ws.WebFault; @@ -30,7 +30,7 @@ * Generated source version: 2.2 * */ -@WebFault(name = "DSSException", targetNamespace = "http://ws.dss.markt.ec.europa.eu/") +@WebFault(name = "DSSException", targetNamespace = "http://ws.dss.esig.europa.eu/") public class DSSException_Exception extends Exception { @@ -65,7 +65,7 @@ public DSSException_Exception(String message, DSSException faultInfo, Throwable /** * * @return - * returns fault bean: eu.europa.ec.markt.dss.ws.signature.DSSException + * returns fault bean: eu.europa.esig.dss.wsclient.signature.DSSException */ public DSSException getFaultInfo() { return faultInfo; diff --git a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/DigestAlgorithm.java b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/DigestAlgorithm.java similarity index 98% rename from dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/DigestAlgorithm.java rename to dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/DigestAlgorithm.java index a9761c59a5..71d40e367a 100644 --- a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/DigestAlgorithm.java +++ b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/DigestAlgorithm.java @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.ws.signature; +package eu.europa.esig.dss.wsclient.signature; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; diff --git a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/DssReference.java b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/DssReference.java similarity index 96% rename from dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/DssReference.java rename to dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/DssReference.java index 994bf20732..c04b4501e5 100644 --- a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/DssReference.java +++ b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/DssReference.java @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.ws.signature; +package eu.europa.esig.dss.wsclient.signature; import java.util.ArrayList; import java.util.List; @@ -42,7 +42,7 @@ * <sequence> * <element name="digestMethod" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <element name="id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> - * <element name="transforms" type="{http://ws.dss.markt.ec.europa.eu/}dssTransform" maxOccurs="unbounded" minOccurs="0"/> + * <element name="transforms" type="{http://ws.dss.esig.europa.eu/}dssTransform" maxOccurs="unbounded" minOccurs="0"/> * <element name="type" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <element name="uri" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * </sequence> diff --git a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/DssTransform.java b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/DssTransform.java similarity index 98% rename from dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/DssTransform.java rename to dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/DssTransform.java index be3fbc6b5f..ee24e43f5f 100644 --- a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/DssTransform.java +++ b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/DssTransform.java @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.ws.signature; +package eu.europa.esig.dss.wsclient.signature; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/EncryptionAlgorithm.java b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/EncryptionAlgorithm.java similarity index 97% rename from dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/EncryptionAlgorithm.java rename to dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/EncryptionAlgorithm.java index ea23f9c12b..9b089c851d 100644 --- a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/EncryptionAlgorithm.java +++ b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/EncryptionAlgorithm.java @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.ws.signature; +package eu.europa.esig.dss.wsclient.signature; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlType; diff --git a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/ExtendSignature.java b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/ExtendSignature.java similarity index 95% rename from dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/ExtendSignature.java rename to dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/ExtendSignature.java index 18b0f6fde1..01c5e0eace 100644 --- a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/ExtendSignature.java +++ b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/ExtendSignature.java @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.ws.signature; +package eu.europa.esig.dss.wsclient.signature; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -36,8 +36,8 @@ * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="signedDocument" type="{http://ws.dss.markt.ec.europa.eu/}wsDocument" minOccurs="0"/> - * <element name="wsParameters" type="{http://ws.dss.markt.ec.europa.eu/}wsParameters" minOccurs="0"/> + * <element name="signedDocument" type="{http://ws.dss.esig.europa.eu/}wsDocument" minOccurs="0"/> + * <element name="wsParameters" type="{http://ws.dss.esig.europa.eu/}wsParameters" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> diff --git a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/ExtendSignatureResponse.java b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/ExtendSignatureResponse.java similarity index 93% rename from dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/ExtendSignatureResponse.java rename to dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/ExtendSignatureResponse.java index f01e7dae21..27981cb217 100644 --- a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/ExtendSignatureResponse.java +++ b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/ExtendSignatureResponse.java @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.ws.signature; +package eu.europa.esig.dss.wsclient.signature; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -36,7 +36,7 @@ * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="response" type="{http://ws.dss.markt.ec.europa.eu/}wsDocument" minOccurs="0"/> + * <element name="response" type="{http://ws.dss.esig.europa.eu/}wsDocument" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> diff --git a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/GetDataToSign.java b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/GetDataToSign.java similarity index 92% rename from dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/GetDataToSign.java rename to dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/GetDataToSign.java index 190829caee..e4dacd619e 100644 --- a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/GetDataToSign.java +++ b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/GetDataToSign.java @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.ws.signature; +package eu.europa.esig.dss.wsclient.signature; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -36,8 +36,8 @@ * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="document" type="{http://ws.dss.markt.ec.europa.eu/}wsDocument" minOccurs="0"/> - * <element name="wsParameters" type="{http://ws.dss.markt.ec.europa.eu/}wsParameters" minOccurs="0"/> + * <element name="document" type="{http://ws.dss.esig.europa.eu/}wsDocument" minOccurs="0"/> + * <element name="wsParameters" type="{http://ws.dss.esig.europa.eu/}wsParameters" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> diff --git a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/GetDataToSignResponse.java b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/GetDataToSignResponse.java similarity index 97% rename from dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/GetDataToSignResponse.java rename to dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/GetDataToSignResponse.java index c9670fa7d5..a34c20227a 100644 --- a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/GetDataToSignResponse.java +++ b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/GetDataToSignResponse.java @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.ws.signature; +package eu.europa.esig.dss.wsclient.signature; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/MimeType.java b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/MimeType.java similarity index 97% rename from dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/MimeType.java rename to dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/MimeType.java index 00a8d3a7ae..f811eba315 100644 --- a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/MimeType.java +++ b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/MimeType.java @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.ws.signature; +package eu.europa.esig.dss.wsclient.signature; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/ObjectFactory.java b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/ObjectFactory.java similarity index 83% rename from dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/ObjectFactory.java rename to dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/ObjectFactory.java index 87261130ba..a38f0ca351 100644 --- a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/ObjectFactory.java +++ b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/ObjectFactory.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.ws.signature; +package eu.europa.esig.dss.wsclient.signature; import javax.xml.bind.JAXBElement; import javax.xml.bind.annotation.XmlElementDecl; @@ -28,7 +28,7 @@ /** * This object contains factory methods for each * Java content interface and Java element interface - * generated in the eu.europa.ec.markt.dss.ws.signature package. + * generated in the eu.europa.esig.dss.wsclient.signature package. * * construct new instances of the Java representation * for XML content. The Java representation of XML @@ -41,16 +41,16 @@ @XmlRegistry public class ObjectFactory { - private final static QName _SignDocument_QNAME = new QName("http://ws.dss.markt.ec.europa.eu/", "signDocument"); - private final static QName _ExtendSignature_QNAME = new QName("http://ws.dss.markt.ec.europa.eu/", "extendSignature"); - private final static QName _DSSException_QNAME = new QName("http://ws.dss.markt.ec.europa.eu/", "DSSException"); - private final static QName _GetDataToSignResponse_QNAME = new QName("http://ws.dss.markt.ec.europa.eu/", "getDataToSignResponse"); - private final static QName _SignDocumentResponse_QNAME = new QName("http://ws.dss.markt.ec.europa.eu/", "signDocumentResponse"); - private final static QName _GetDataToSign_QNAME = new QName("http://ws.dss.markt.ec.europa.eu/", "getDataToSign"); - private final static QName _ExtendSignatureResponse_QNAME = new QName("http://ws.dss.markt.ec.europa.eu/", "extendSignatureResponse"); + private final static QName _SignDocument_QNAME = new QName("http://ws.dss.esig.europa.eu/", "signDocument"); + private final static QName _ExtendSignature_QNAME = new QName("http://ws.dss.esig.europa.eu/", "extendSignature"); + private final static QName _DSSException_QNAME = new QName("http://ws.dss.esig.europa.eu/", "DSSException"); + private final static QName _GetDataToSignResponse_QNAME = new QName("http://ws.dss.esig.europa.eu/", "getDataToSignResponse"); + private final static QName _SignDocumentResponse_QNAME = new QName("http://ws.dss.esig.europa.eu/", "signDocumentResponse"); + private final static QName _GetDataToSign_QNAME = new QName("http://ws.dss.esig.europa.eu/", "getDataToSign"); + private final static QName _ExtendSignatureResponse_QNAME = new QName("http://ws.dss.esig.europa.eu/", "extendSignatureResponse"); /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: eu.europa.ec.markt.dss.ws.signature + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: eu.europa.esig.dss.wsclient.signature */ public ObjectFactory() { } @@ -163,7 +163,7 @@ public WsdssReference createWsdssReference() { /** * Create an instance of {@link JAXBElement }{@code <}{@link SignDocument }{@code >}} */ - @XmlElementDecl(namespace = "http://ws.dss.markt.ec.europa.eu/", name = "signDocument") + @XmlElementDecl(namespace = "http://ws.dss.esig.europa.eu/", name = "signDocument") public JAXBElement createSignDocument(SignDocument value) { return new JAXBElement(_SignDocument_QNAME, SignDocument.class, null, value); } @@ -171,7 +171,7 @@ public JAXBElement createSignDocument(SignDocument value) { /** * Create an instance of {@link JAXBElement }{@code <}{@link ExtendSignature }{@code >}} */ - @XmlElementDecl(namespace = "http://ws.dss.markt.ec.europa.eu/", name = "extendSignature") + @XmlElementDecl(namespace = "http://ws.dss.esig.europa.eu/", name = "extendSignature") public JAXBElement createExtendSignature(ExtendSignature value) { return new JAXBElement(_ExtendSignature_QNAME, ExtendSignature.class, null, value); } @@ -179,7 +179,7 @@ public JAXBElement createExtendSignature(ExtendSignature value) /** * Create an instance of {@link JAXBElement }{@code <}{@link DSSException }{@code >}} */ - @XmlElementDecl(namespace = "http://ws.dss.markt.ec.europa.eu/", name = "DSSException") + @XmlElementDecl(namespace = "http://ws.dss.esig.europa.eu/", name = "DSSException") public JAXBElement createDSSException(DSSException value) { return new JAXBElement(_DSSException_QNAME, DSSException.class, null, value); } @@ -187,7 +187,7 @@ public JAXBElement createDSSException(DSSException value) { /** * Create an instance of {@link JAXBElement }{@code <}{@link GetDataToSignResponse }{@code >}} */ - @XmlElementDecl(namespace = "http://ws.dss.markt.ec.europa.eu/", name = "getDataToSignResponse") + @XmlElementDecl(namespace = "http://ws.dss.esig.europa.eu/", name = "getDataToSignResponse") public JAXBElement createGetDataToSignResponse(GetDataToSignResponse value) { return new JAXBElement(_GetDataToSignResponse_QNAME, GetDataToSignResponse.class, null, value); } @@ -195,7 +195,7 @@ public JAXBElement createGetDataToSignResponse(GetDataToS /** * Create an instance of {@link JAXBElement }{@code <}{@link SignDocumentResponse }{@code >}} */ - @XmlElementDecl(namespace = "http://ws.dss.markt.ec.europa.eu/", name = "signDocumentResponse") + @XmlElementDecl(namespace = "http://ws.dss.esig.europa.eu/", name = "signDocumentResponse") public JAXBElement createSignDocumentResponse(SignDocumentResponse value) { return new JAXBElement(_SignDocumentResponse_QNAME, SignDocumentResponse.class, null, value); } @@ -203,7 +203,7 @@ public JAXBElement createSignDocumentResponse(SignDocument /** * Create an instance of {@link JAXBElement }{@code <}{@link GetDataToSign }{@code >}} */ - @XmlElementDecl(namespace = "http://ws.dss.markt.ec.europa.eu/", name = "getDataToSign") + @XmlElementDecl(namespace = "http://ws.dss.esig.europa.eu/", name = "getDataToSign") public JAXBElement createGetDataToSign(GetDataToSign value) { return new JAXBElement(_GetDataToSign_QNAME, GetDataToSign.class, null, value); } @@ -211,7 +211,7 @@ public JAXBElement createGetDataToSign(GetDataToSign value) { /** * Create an instance of {@link JAXBElement }{@code <}{@link ExtendSignatureResponse }{@code >}} */ - @XmlElementDecl(namespace = "http://ws.dss.markt.ec.europa.eu/", name = "extendSignatureResponse") + @XmlElementDecl(namespace = "http://ws.dss.esig.europa.eu/", name = "extendSignatureResponse") public JAXBElement createExtendSignatureResponse(ExtendSignatureResponse value) { return new JAXBElement(_ExtendSignatureResponse_QNAME, ExtendSignatureResponse.class, null, value); } diff --git a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/Policy.java b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/Policy.java similarity index 97% rename from dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/Policy.java rename to dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/Policy.java index 293c743c78..05f05b1e51 100644 --- a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/Policy.java +++ b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/Policy.java @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.ws.signature; +package eu.europa.esig.dss.wsclient.signature; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -36,7 +36,7 @@ * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="digestAlgorithm" type="{http://ws.dss.markt.ec.europa.eu/}digestAlgorithm" minOccurs="0"/> + * <element name="digestAlgorithm" type="{http://ws.dss.esig.europa.eu/}digestAlgorithm" minOccurs="0"/> * <element name="digestValue" type="{http://www.w3.org/2001/XMLSchema}base64Binary" minOccurs="0"/> * <element name="id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * </sequence> diff --git a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/SignDocument.java b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/SignDocument.java similarity index 94% rename from dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/SignDocument.java rename to dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/SignDocument.java index 15a5d4c904..5ce2fed071 100644 --- a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/SignDocument.java +++ b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/SignDocument.java @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.ws.signature; +package eu.europa.esig.dss.wsclient.signature; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -36,8 +36,8 @@ * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="document" type="{http://ws.dss.markt.ec.europa.eu/}wsDocument" minOccurs="0"/> - * <element name="wsParameters" type="{http://ws.dss.markt.ec.europa.eu/}wsParameters" minOccurs="0"/> + * <element name="document" type="{http://ws.dss.esig.europa.eu/}wsDocument" minOccurs="0"/> + * <element name="wsParameters" type="{http://ws.dss.esig.europa.eu/}wsParameters" minOccurs="0"/> * <element name="signatureValue" type="{http://www.w3.org/2001/XMLSchema}base64Binary" minOccurs="0"/> * </sequence> * </restriction> diff --git a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/SignDocumentResponse.java b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/SignDocumentResponse.java similarity index 93% rename from dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/SignDocumentResponse.java rename to dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/SignDocumentResponse.java index c6605bc5b1..82a247b840 100644 --- a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/SignDocumentResponse.java +++ b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/SignDocumentResponse.java @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.ws.signature; +package eu.europa.esig.dss.wsclient.signature; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -36,7 +36,7 @@ * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="response" type="{http://ws.dss.markt.ec.europa.eu/}wsDocument" minOccurs="0"/> + * <element name="response" type="{http://ws.dss.esig.europa.eu/}wsDocument" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> diff --git a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/SignatureForm.java b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/SignatureForm.java similarity index 97% rename from dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/SignatureForm.java rename to dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/SignatureForm.java index 1d193654cc..0cc5d0a7b1 100644 --- a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/SignatureForm.java +++ b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/SignatureForm.java @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.ws.signature; +package eu.europa.esig.dss.wsclient.signature; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; diff --git a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/SignatureLevel.java b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/SignatureLevel.java similarity index 99% rename from dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/SignatureLevel.java rename to dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/SignatureLevel.java index db91a66f12..6b38cd190e 100644 --- a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/SignatureLevel.java +++ b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/SignatureLevel.java @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.ws.signature; +package eu.europa.esig.dss.wsclient.signature; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; diff --git a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/SignaturePackaging.java b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/SignaturePackaging.java similarity index 97% rename from dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/SignaturePackaging.java rename to dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/SignaturePackaging.java index 4345a21fb0..15d02ed1bd 100644 --- a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/SignaturePackaging.java +++ b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/SignaturePackaging.java @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.ws.signature; +package eu.europa.esig.dss.wsclient.signature; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlType; diff --git a/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/SignatureService.java b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/SignatureService.java new file mode 100644 index 0000000000..d177afbc37 --- /dev/null +++ b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/SignatureService.java @@ -0,0 +1,119 @@ + +/** + * DSS - Digital Signature Services + * Copyright (C) 2015 European Commission, provided under the CEF programme + * + * This file is part of the "DSS - Digital Signature Services" project. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +package eu.europa.esig.dss.wsclient.signature; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + + +/** + * The signing web service allows to create a new signature or to extend existing one. Different forms of signature:XAdES, CAdES, PAdES, ASiC-S are accepted. + * The digital signature of a document in a web environment is performed in three steps: + * 1. Creating a byte stream representing the data to be signed. + * 2. Hashing of the data previously obtained and its encryption. This step is performed locally (not by the web service). + * 3. The creation of the envelope containing all the elements of a digital signature. + * The process is controlled by a set of parameters. + * + * This class was generated by the JAX-WS RI. + * JAX-WS RI 2.2.4-b01 + * Generated source version: 2.2 + * + */ +@WebService(name = "SignatureService", targetNamespace = "http://ws.dss.esig.europa.eu/") +@XmlSeeAlso({ + ObjectFactory.class +}) +public interface SignatureService { + + + /** + * This method Extends the level of the signature(s) linked to the given document. It takes two parameters: the document with the signature(s), the set of driving parameters. + * + * @param signedDocument + * @param wsParameters + * @return + * returns eu.europa.esig.dss.wsclient.signature.WsDocument + * @throws DSSException_Exception + */ + @WebMethod + @WebResult(name = "response", targetNamespace = "") + @RequestWrapper(localName = "extendSignature", targetNamespace = "http://ws.dss.esig.europa.eu/", className = "eu.europa.esig.dss.wsclient.signature.ExtendSignature") + @ResponseWrapper(localName = "extendSignatureResponse", targetNamespace = "http://ws.dss.esig.europa.eu/", className = "eu.europa.esig.dss.wsclient.signature.ExtendSignatureResponse") + public WsDocument extendSignature( + @WebParam(name = "signedDocument", targetNamespace = "") + WsDocument signedDocument, + @WebParam(name = "wsParameters", targetNamespace = "") + WsParameters wsParameters) + throws DSSException_Exception + ; + + /** + * This method creates the signature containing the provided encrypted hash value and all requested elements. It requests three parameters: the document to sign, the set of driving parameters and the encrypted hash value of bytes that need to be protected by the digital signature. + * + * @param document + * @param signatureValue + * @param wsParameters + * @return + * returns eu.europa.esig.dss.wsclient.signature.WsDocument + * @throws DSSException_Exception + */ + @WebMethod + @WebResult(name = "response", targetNamespace = "") + @RequestWrapper(localName = "signDocument", targetNamespace = "http://ws.dss.esig.europa.eu/", className = "eu.europa.esig.dss.wsclient.signature.SignDocument") + @ResponseWrapper(localName = "signDocumentResponse", targetNamespace = "http://ws.dss.esig.europa.eu/", className = "eu.europa.esig.dss.wsclient.signature.SignDocumentResponse") + public WsDocument signDocument( + @WebParam(name = "document", targetNamespace = "") + WsDocument document, + @WebParam(name = "wsParameters", targetNamespace = "") + WsParameters wsParameters, + @WebParam(name = "signatureValue", targetNamespace = "") + byte[] signatureValue) + throws DSSException_Exception + ; + + /** + * This method retrieves the stream of data that need to be hashed and encrypted. It takes two parameters: the document to sign and the set of parameters. + * + * @param document + * @param wsParameters + * @return + * returns byte[] + * @throws DSSException_Exception + */ + @WebMethod + @WebResult(name = "response", targetNamespace = "") + @RequestWrapper(localName = "getDataToSign", targetNamespace = "http://ws.dss.esig.europa.eu/", className = "eu.europa.esig.dss.wsclient.signature.GetDataToSign") + @ResponseWrapper(localName = "getDataToSignResponse", targetNamespace = "http://ws.dss.esig.europa.eu/", className = "eu.europa.esig.dss.wsclient.signature.GetDataToSignResponse") + public byte[] getDataToSign( + @WebParam(name = "document", targetNamespace = "") + WsDocument document, + @WebParam(name = "wsParameters", targetNamespace = "") + WsParameters wsParameters) + throws DSSException_Exception + ; + +} diff --git a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/SignatureService_Service.java b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/SignatureService_Service.java similarity index 70% rename from dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/SignatureService_Service.java rename to dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/SignatureService_Service.java index 2fce461b78..13427ed3e5 100644 --- a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/SignatureService_Service.java +++ b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/SignatureService_Service.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.ws.signature; +package eu.europa.esig.dss.wsclient.signature; import java.net.MalformedURLException; import java.net.URL; @@ -35,30 +35,15 @@ * JAX-WS RI 2.1.6 in JDK 6 * Generated source version: 2.1 */ -@WebServiceClient(name = "SignatureService", targetNamespace = "http://impl.ws.dss.markt.ec.europa.eu/", - wsdlLocation = "http://localhost:8080/wservice/signatureService?wsdl") +@WebServiceClient(name = "SignatureService", targetNamespace = "http://impl.ws.dss.esig.europa.eu/", +wsdlLocation = "http://localhost:8080/wservice/signatureService?wsdl") public class SignatureService_Service extends Service { private static final String METHOD_URL = "/signatureService?wsdl"; private static URL SIGNATURESERVICE_WSDL_LOCATION; - private final static Logger logger = Logger.getLogger(eu.europa.ec.markt.dss.ws.signature.SignatureService_Service.class.getName()); + private final static Logger logger = Logger.getLogger(eu.europa.esig.dss.wsclient.signature.SignatureService_Service.class.getName()); - /* - static { - URL url = null; - try { - URL baseUrl; - baseUrl = eu.europa.ec.markt.dss.ws.signature.SignatureService_Service.class.getResource("."); - url = new URL(baseUrl, "http://localhost:8080/wservice/signatureService?wsdl"); - } catch (MalformedURLException e) { - logger.warning("Failed to create URL for the wsdl Location: 'http://localhost:8080/wservice/signatureService?wsdl', retrying as a local file"); - logger.warning(e.getMessage()); - } - SIGNATURESERVICE_WSDL_LOCATION = url; - } -*/ public static void setROOT_SERVICE_URL(String ROOT_SERVICE_URL) { - try { SIGNATURESERVICE_WSDL_LOCATION = new URL(ROOT_SERVICE_URL + METHOD_URL); } catch (MalformedURLException e) { @@ -72,7 +57,7 @@ public SignatureService_Service(URL wsdlLocation, QName serviceName) { } public SignatureService_Service() { - super(SIGNATURESERVICE_WSDL_LOCATION, new QName("http://impl.ws.dss.markt.ec.europa.eu/", "SignatureService")); + super(SIGNATURESERVICE_WSDL_LOCATION, new QName("http://impl.ws.dss.esig.europa.eu/", "SignatureService")); } /** @@ -80,7 +65,7 @@ public SignatureService_Service() { */ @WebEndpoint(name = "SignatureServiceImplPort") public SignatureService getSignatureServiceImplPort() { - return super.getPort(new QName("http://impl.ws.dss.markt.ec.europa.eu/", "SignatureServiceImplPort"), SignatureService.class); + return super.getPort(new QName("http://impl.ws.dss.esig.europa.eu/", "SignatureServiceImplPort"), SignatureService.class); } /** @@ -90,7 +75,7 @@ public SignatureService getSignatureServiceImplPort() { */ @WebEndpoint(name = "SignatureServiceImplPort") public SignatureService getSignatureServiceImplPort(WebServiceFeature... features) { - return super.getPort(new QName("http://impl.ws.dss.markt.ec.europa.eu/", "SignatureServiceImplPort"), SignatureService.class, features); + return super.getPort(new QName("http://impl.ws.dss.esig.europa.eu/", "SignatureServiceImplPort"), SignatureService.class, features); } } diff --git a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/SignerLocation.java b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/SignerLocation.java similarity index 99% rename from dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/SignerLocation.java rename to dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/SignerLocation.java index fb6507f80d..ea954ac0df 100644 --- a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/SignerLocation.java +++ b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/SignerLocation.java @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.ws.signature; +package eu.europa.esig.dss.wsclient.signature; import java.util.ArrayList; import java.util.List; diff --git a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/WsChainCertificate.java b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/WsChainCertificate.java similarity index 98% rename from dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/WsChainCertificate.java rename to dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/WsChainCertificate.java index eebdd66d90..14b3397efe 100644 --- a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/WsChainCertificate.java +++ b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/WsChainCertificate.java @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.ws.signature; +package eu.europa.esig.dss.wsclient.signature; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/WsDocument.java b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/WsDocument.java similarity index 95% rename from dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/WsDocument.java rename to dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/WsDocument.java index 30be586806..4f458fe541 100644 --- a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/WsDocument.java +++ b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/WsDocument.java @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.ws.signature; +package eu.europa.esig.dss.wsclient.signature; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -38,9 +38,9 @@ * <sequence> * <element name="absolutePath" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <element name="bytes" type="{http://www.w3.org/2001/XMLSchema}base64Binary" minOccurs="0"/> - * <element name="mimeType" type="{http://ws.dss.markt.ec.europa.eu/}mimeType" minOccurs="0"/> + * <element name="mimeType" type="{http://ws.dss.esig.europa.eu/}mimeType" minOccurs="0"/> * <element name="name" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> - * <element name="nextDocument" type="{http://ws.dss.markt.ec.europa.eu/}wsDocument" minOccurs="0"/> + * <element name="nextDocument" type="{http://ws.dss.esig.europa.eu/}wsDocument" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> diff --git a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/WsParameters.java b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/WsParameters.java similarity index 95% rename from dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/WsParameters.java rename to dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/WsParameters.java index e719b61274..3b62a070b6 100644 --- a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/WsParameters.java +++ b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/WsParameters.java @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.ws.signature; +package eu.europa.esig.dss.wsclient.signature; import java.util.ArrayList; import java.util.List; @@ -43,27 +43,27 @@ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> * <element name="asicMimeType" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> - * <element name="asicSignatureForm" type="{http://ws.dss.markt.ec.europa.eu/}signatureForm" minOccurs="0"/> + * <element name="asicSignatureForm" type="{http://ws.dss.esig.europa.eu/}signatureForm" minOccurs="0"/> * <element name="asicZipComment" type="{http://www.w3.org/2001/XMLSchema}boolean"/> * <element name="certifiedSignerRoles" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/> - * <element name="chainCertificateList" type="{http://ws.dss.markt.ec.europa.eu/}wsChainCertificate" maxOccurs="unbounded" minOccurs="0"/> + * <element name="chainCertificateList" type="{http://ws.dss.esig.europa.eu/}wsChainCertificate" maxOccurs="unbounded" minOccurs="0"/> * <element name="claimedSignerRole" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/> * <element name="commitmentTypeIndication" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/> * <element name="contentIdentifierPrefix" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <element name="contentIdentifierSuffix" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> - * <element name="digestAlgorithm" type="{http://ws.dss.markt.ec.europa.eu/}digestAlgorithm" minOccurs="0"/> - * <element name="encryptionAlgorithm" type="{http://ws.dss.markt.ec.europa.eu/}encryptionAlgorithm" minOccurs="0"/> - * <element name="references" type="{http://ws.dss.markt.ec.europa.eu/}wsdssReference" maxOccurs="unbounded" minOccurs="0"/> + * <element name="digestAlgorithm" type="{http://ws.dss.esig.europa.eu/}digestAlgorithm" minOccurs="0"/> + * <element name="encryptionAlgorithm" type="{http://ws.dss.esig.europa.eu/}encryptionAlgorithm" minOccurs="0"/> + * <element name="references" type="{http://ws.dss.esig.europa.eu/}wsdssReference" maxOccurs="unbounded" minOccurs="0"/> * <element name="signWithExpiredCertificate" type="{http://www.w3.org/2001/XMLSchema}boolean"/> - * <element name="signatureLevel" type="{http://ws.dss.markt.ec.europa.eu/}signatureLevel" minOccurs="0"/> - * <element name="signaturePackaging" type="{http://ws.dss.markt.ec.europa.eu/}signaturePackaging" minOccurs="0"/> - * <element name="signaturePolicy" type="{http://ws.dss.markt.ec.europa.eu/}policy" minOccurs="0"/> + * <element name="signatureLevel" type="{http://ws.dss.esig.europa.eu/}signatureLevel" minOccurs="0"/> + * <element name="signaturePackaging" type="{http://ws.dss.esig.europa.eu/}signaturePackaging" minOccurs="0"/> + * <element name="signaturePolicy" type="{http://ws.dss.esig.europa.eu/}policy" minOccurs="0"/> * <element name="signedInfoCanonicalizationMethod" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> - * <element name="signerLocation" type="{http://ws.dss.markt.ec.europa.eu/}signerLocation" minOccurs="0"/> + * <element name="signerLocation" type="{http://ws.dss.esig.europa.eu/}signerLocation" minOccurs="0"/> * <element name="signingCertificateBytes" type="{http://www.w3.org/2001/XMLSchema}base64Binary" minOccurs="0"/> - * <element name="signingCertificateDigestAlgorithm" type="{http://ws.dss.markt.ec.europa.eu/}digestAlgorithm" minOccurs="0"/> + * <element name="signingCertificateDigestAlgorithm" type="{http://ws.dss.esig.europa.eu/}digestAlgorithm" minOccurs="0"/> * <element name="signingDate" type="{http://www.w3.org/2001/XMLSchema}dateTime" minOccurs="0"/> - * <element name="timestampDigestAlgorithm" type="{http://ws.dss.markt.ec.europa.eu/}digestAlgorithm" minOccurs="0"/> + * <element name="timestampDigestAlgorithm" type="{http://ws.dss.esig.europa.eu/}digestAlgorithm" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> diff --git a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/WsdssReference.java b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/WsdssReference.java similarity index 94% rename from dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/WsdssReference.java rename to dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/WsdssReference.java index 6b372b4004..1a61f2c04e 100644 --- a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/WsdssReference.java +++ b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/WsdssReference.java @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.ws.signature; +package eu.europa.esig.dss.wsclient.signature; import java.util.ArrayList; import java.util.List; @@ -40,10 +40,10 @@ * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="contents" type="{http://ws.dss.markt.ec.europa.eu/}wsDocument" minOccurs="0"/> - * <element name="digestMethodAlgorithm" type="{http://ws.dss.markt.ec.europa.eu/}digestAlgorithm" minOccurs="0"/> + * <element name="contents" type="{http://ws.dss.esig.europa.eu/}wsDocument" minOccurs="0"/> + * <element name="digestMethodAlgorithm" type="{http://ws.dss.esig.europa.eu/}digestAlgorithm" minOccurs="0"/> * <element name="id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> - * <element name="transforms" type="{http://ws.dss.markt.ec.europa.eu/}dssTransform" maxOccurs="unbounded" minOccurs="0"/> + * <element name="transforms" type="{http://ws.dss.esig.europa.eu/}dssTransform" maxOccurs="unbounded" minOccurs="0"/> * <element name="type" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <element name="uri" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * </sequence> diff --git a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/package-info.java b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/package-info.java similarity index 93% rename from dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/package-info.java rename to dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/package-info.java index a454cbd02b..7560f4db3e 100644 --- a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/package-info.java +++ b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/package-info.java @@ -1,4 +1,4 @@ -@javax.xml.bind.annotation.XmlSchema(namespace = "http://ws.dss.markt.ec.europa.eu/") +@javax.xml.bind.annotation.XmlSchema(namespace = "http://ws.dss.esig.europa.eu/") /** * DSS - Digital Signature Services * Copyright (C) 2015 European Commission, provided under the CEF programme @@ -19,4 +19,4 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.ws.signature; +package eu.europa.esig.dss.wsclient.signature; diff --git a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/signatureService.wsdl b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/signatureService.wsdl similarity index 83% rename from dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/signatureService.wsdl rename to dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/signatureService.wsdl index 483b4b0e46..ee969118e1 100644 --- a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/signature/signatureService.wsdl +++ b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/signature/signatureService.wsdl @@ -1,5 +1,5 @@ - - + + diff --git a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/validation/DSSException.java b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/validation/DSSException.java similarity index 97% rename from dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/validation/DSSException.java rename to dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/validation/DSSException.java index 7aad385f8b..85157ec7f4 100644 --- a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/validation/DSSException.java +++ b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/validation/DSSException.java @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.ws.validation; +package eu.europa.esig.dss.wsclient.validation; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/validation/DSSException_Exception.java b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/validation/DSSException_Exception.java similarity index 57% rename from dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/validation/DSSException_Exception.java rename to dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/validation/DSSException_Exception.java index 4de25301ed..3b08174db5 100644 --- a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/validation/DSSException_Exception.java +++ b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/validation/DSSException_Exception.java @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.ws.validation; +package eu.europa.esig.dss.wsclient.validation; import javax.xml.ws.WebFault; @@ -28,47 +28,47 @@ * This class was generated by the JAX-WS RI. * JAX-WS RI 2.1.6 in JDK 6 * Generated source version: 2.1 - * + * */ -@WebFault(name = "DSSException", targetNamespace = "http://ws.dss.markt.ec.europa.eu/") +@WebFault(name = "DSSException", targetNamespace = "http://ws.dss.esig.europa.eu/") public class DSSException_Exception - extends Exception +extends Exception { - /** - * Java type that goes as soapenv:Fault detail element. - * - */ - private DSSException faultInfo; + /** + * Java type that goes as soapenv:Fault detail element. + * + */ + private DSSException faultInfo; - /** - * - * @param message - * @param faultInfo - */ - public DSSException_Exception(String message, DSSException faultInfo) { - super(message); - this.faultInfo = faultInfo; - } + /** + * + * @param message + * @param faultInfo + */ + public DSSException_Exception(String message, DSSException faultInfo) { + super(message); + this.faultInfo = faultInfo; + } - /** - * - * @param message - * @param faultInfo - * @param cause - */ - public DSSException_Exception(String message, DSSException faultInfo, Throwable cause) { - super(message, cause); - this.faultInfo = faultInfo; - } + /** + * + * @param message + * @param faultInfo + * @param cause + */ + public DSSException_Exception(String message, DSSException faultInfo, Throwable cause) { + super(message, cause); + this.faultInfo = faultInfo; + } - /** - * - * @return - * returns fault bean: eu.europa.ec.markt.dss.ws.validation.DSSException - */ - public DSSException getFaultInfo() { - return faultInfo; - } + /** + * + * @return + * returns fault bean: e eu.europa.esig.dss.wsclient.validation.DSSException + */ + public DSSException getFaultInfo() { + return faultInfo; + } } diff --git a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/validation/MimeType.java b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/validation/MimeType.java similarity index 97% rename from dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/validation/MimeType.java rename to dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/validation/MimeType.java index 43104b1ddf..5e070e9b96 100644 --- a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/validation/MimeType.java +++ b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/validation/MimeType.java @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.ws.validation; +package eu.europa.esig.dss.wsclient.validation; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/validation/ObjectFactory.java b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/validation/ObjectFactory.java new file mode 100644 index 0000000000..beb8979189 --- /dev/null +++ b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/validation/ObjectFactory.java @@ -0,0 +1,133 @@ + +/** + * DSS - Digital Signature Services + * Copyright (C) 2015 European Commission, provided under the CEF programme + * + * This file is part of the "DSS - Digital Signature Services" project. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +package eu.europa.esig.dss.wsclient.validation; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the eu.europa.esig.dss.wsclient.validation package. + * + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _ValidateDocumentResponse_QNAME = new QName("http://ws.dss.esig.europa.eu/", "validateDocumentResponse"); + private final static QName _DSSException_QNAME = new QName("http://ws.dss.esig.europa.eu/", "DSSException"); + private final static QName _ValidateDocument_QNAME = new QName("http://ws.dss.esig.europa.eu/", "validateDocument"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: eu.europa.esig.dss.wsclient.validation + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link MimeType } + * + */ + public MimeType createMimeType() { + return new MimeType(); + } + + /** + * Create an instance of {@link ValidateDocument } + * + */ + public ValidateDocument createValidateDocument() { + return new ValidateDocument(); + } + + /** + * Create an instance of {@link DSSException } + * + */ + public DSSException createDSSException() { + return new DSSException(); + } + + /** + * Create an instance of {@link WsDocument } + * + */ + public WsDocument createWsDocument() { + return new WsDocument(); + } + + /** + * Create an instance of {@link WsValidationReport } + * + */ + public WsValidationReport createWsValidationReport() { + return new WsValidationReport(); + } + + /** + * Create an instance of {@link ValidateDocumentResponse } + * + */ + public ValidateDocumentResponse createValidateDocumentResponse() { + return new ValidateDocumentResponse(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link ValidateDocumentResponse }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://ws.dss.esig.europa.eu/", name = "validateDocumentResponse") + public JAXBElement createValidateDocumentResponse(ValidateDocumentResponse value) { + return new JAXBElement(_ValidateDocumentResponse_QNAME, ValidateDocumentResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link DSSException }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://ws.dss.esig.europa.eu/", name = "DSSException") + public JAXBElement createDSSException(DSSException value) { + return new JAXBElement(_DSSException_QNAME, DSSException.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link ValidateDocument }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://ws.dss.esig.europa.eu/", name = "validateDocument") + public JAXBElement createValidateDocument(ValidateDocument value) { + return new JAXBElement(_ValidateDocument_QNAME, ValidateDocument.class, null, value); + } + +} diff --git a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/validation/ValidateDocument.java b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/validation/ValidateDocument.java similarity index 92% rename from dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/validation/ValidateDocument.java rename to dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/validation/ValidateDocument.java index 09426ac965..83420d8234 100644 --- a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/validation/ValidateDocument.java +++ b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/validation/ValidateDocument.java @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.ws.validation; +package eu.europa.esig.dss.wsclient.validation; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -36,9 +36,9 @@ * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="document" type="{http://ws.dss.markt.ec.europa.eu/}wsDocument" minOccurs="0"/> - * <element name="detachedContent" type="{http://ws.dss.markt.ec.europa.eu/}wsDocument" minOccurs="0"/> - * <element name="policy" type="{http://ws.dss.markt.ec.europa.eu/}wsDocument" minOccurs="0"/> + * <element name="document" type="{http://ws.dss.esig.europa.eu/}wsDocument" minOccurs="0"/> + * <element name="detachedContent" type="{http://ws.dss.esig.europa.eu/}wsDocument" minOccurs="0"/> + * <element name="policy" type="{http://ws.dss.esig.europa.eu/}wsDocument" minOccurs="0"/> * <element name="diagnosticDataToBeReturned" type="{http://www.w3.org/2001/XMLSchema}boolean"/> * </sequence> * </restriction> diff --git a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/validation/ValidateDocumentResponse.java b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/validation/ValidateDocumentResponse.java similarity index 92% rename from dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/validation/ValidateDocumentResponse.java rename to dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/validation/ValidateDocumentResponse.java index d5ee7f0271..f2df72a1f9 100644 --- a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/validation/ValidateDocumentResponse.java +++ b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/validation/ValidateDocumentResponse.java @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.ws.validation; +package eu.europa.esig.dss.wsclient.validation; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -36,7 +36,7 @@ * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="response" type="{http://ws.dss.markt.ec.europa.eu/}wsValidationReport" minOccurs="0"/> + * <element name="response" type="{http://ws.dss.esig.europa.eu/}wsValidationReport" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> diff --git a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/validation/ValidationService.java b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/validation/ValidationService.java similarity index 53% rename from dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/validation/ValidationService.java rename to dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/validation/ValidationService.java index 0ac5761cc9..d0147f8254 100644 --- a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/validation/ValidationService.java +++ b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/validation/ValidationService.java @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.ws.validation; +package eu.europa.esig.dss.wsclient.validation; import javax.jws.WebMethod; import javax.jws.WebParam; @@ -32,44 +32,44 @@ /** * The validation web service allows to validate any kind of signature form. The validation process is based on ETSI TS 102853 and is driven by the validation policy containing a set of rules. As result three states can be returned: VALID, INDETERMINATE OR INVALID. These states are accompanied by sub-indications and some other information. The result is represented through three reports: simple validation report with the final result, detailed validation report with the result of each rule and the diagnostic data. - * + * * This class was generated by the JAX-WS RI. * JAX-WS RI 2.1.6 in JDK 6 * Generated source version: 2.1 - * + * */ -@WebService(name = "ValidationService", targetNamespace = "http://ws.dss.markt.ec.europa.eu/") +@WebService(name = "ValidationService", targetNamespace = "http://ws.dss.esig.europa.eu/") @XmlSeeAlso({ - ObjectFactory.class + ObjectFactory.class }) public interface ValidationService { - /** - * This method validates the document containing the signature(s). It takes four parameters: document with signature(s), the signed document in case of detached signature (can be null), the document containing the specific validation policy (default policy is used when null) and a flag to say if diagnostic data must be returned by the method. - * - * @param document - * @param diagnosticDataToBeReturned - * @param detachedContent - * @param policy - * @return - * returns eu.europa.ec.markt.dss.ws.validation.WsValidationReport - * @throws DSSException_Exception - */ - @WebMethod - @WebResult(name = "response", targetNamespace = "") - @RequestWrapper(localName = "validateDocument", targetNamespace = "http://ws.dss.markt.ec.europa.eu/", className = "eu.europa.ec.markt.dss.ws.validation.ValidateDocument") - @ResponseWrapper(localName = "validateDocumentResponse", targetNamespace = "http://ws.dss.markt.ec.europa.eu/", className = "eu.europa.ec.markt.dss.ws.validation.ValidateDocumentResponse") - public WsValidationReport validateDocument( - @WebParam(name = "document", targetNamespace = "") - WsDocument document, - @WebParam(name = "detachedContent", targetNamespace = "") - WsDocument detachedContent, - @WebParam(name = "policy", targetNamespace = "") - WsDocument policy, - @WebParam(name = "diagnosticDataToBeReturned", targetNamespace = "") - boolean diagnosticDataToBeReturned) - throws DSSException_Exception - ; + /** + * This method validates the document containing the signature(s). It takes four parameters: document with signature(s), the signed document in case of detached signature (can be null), the document containing the specific validation policy (default policy is used when null) and a flag to say if diagnostic data must be returned by the method. + * + * @param document + * @param diagnosticDataToBeReturned + * @param detachedContent + * @param policy + * @return + * returns eu.europa.esig.dss.wsclient.validation.WsValidationReport + * @throws DSSException_Exception + */ + @WebMethod + @WebResult(name = "response", targetNamespace = "") + @RequestWrapper(localName = "validateDocument", targetNamespace = "http://ws.dss.esig.europa.eu/", className = "eu.europa.esig.dss.wsclient.validation.ValidateDocument") + @ResponseWrapper(localName = "validateDocumentResponse", targetNamespace = "http://ws.dss.esig.europa.eu/", className = "eu.europa.esig.dss.wsclient.validation.ValidateDocumentResponse") + public WsValidationReport validateDocument( + @WebParam(name = "document", targetNamespace = "") + WsDocument document, + @WebParam(name = "detachedContent", targetNamespace = "") + WsDocument detachedContent, + @WebParam(name = "policy", targetNamespace = "") + WsDocument policy, + @WebParam(name = "diagnosticDataToBeReturned", targetNamespace = "") + boolean diagnosticDataToBeReturned) + throws DSSException_Exception + ; } diff --git a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/validation/ValidationService_Service.java b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/validation/ValidationService_Service.java similarity index 65% rename from dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/validation/ValidationService_Service.java rename to dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/validation/ValidationService_Service.java index d2f46fc63f..273695fca6 100644 --- a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/validation/ValidationService_Service.java +++ b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/validation/ValidationService_Service.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.ws.validation; +package eu.europa.esig.dss.wsclient.validation; import java.net.MalformedURLException; import java.net.URL; @@ -35,45 +35,30 @@ * JAX-WS RI 2.1.6 in JDK 6 * Generated source version: 2.1 */ -@WebServiceClient(name = "ValidationService", targetNamespace = "http://impl.ws.dss.markt.ec.europa.eu/", - wsdlLocation = "http://localhost:8080/wservice/validationService?wsdl") +@WebServiceClient(name = "ValidationService", targetNamespace = "http://impl.ws.dss.esig.europa.eu/", +wsdlLocation = "http://localhost:8080/wservice/validationService?wsdl") public class ValidationService_Service extends Service { private static final String METHOD_URL = "/validationService?wsdl"; private static URL VALIDATIONSERVICE_WSDL_LOCATION; - private final static Logger logger = Logger.getLogger(eu.europa.ec.markt.dss.ws.validation.ValidationService_Service.class.getName()); + private final static Logger logger = Logger.getLogger(eu.europa.esig.dss.wsclient.validation.ValidationService_Service.class.getName()); + + public static void setROOT_SERVICE_URL(String ROOT_SERVICE_URL) { -/* - static { - URL url = null; try { - URL baseUrl; - baseUrl = eu.europa.ec.markt.dss.ws.validation.ValidationService_Service.class.getResource("."); - url = new URL(baseUrl, "http://localhost:8080/wservice/validationService?wsdl"); + VALIDATIONSERVICE_WSDL_LOCATION = new URL(ROOT_SERVICE_URL + METHOD_URL); } catch (MalformedURLException e) { - logger.warning("Failed to create URL for the wsdl Location: 'http://localhost:8080/wservice/validationService?wsdl', retrying as a local file"); + logger.warning("Failed to create URL for the wsdl Location: '" + VALIDATIONSERVICE_WSDL_LOCATION + "', retrying as a local file"); logger.warning(e.getMessage()); } - VALIDATIONSERVICE_WSDL_LOCATION = url; } -*/ - - public static void setROOT_SERVICE_URL(String ROOT_SERVICE_URL) { - - try { - VALIDATIONSERVICE_WSDL_LOCATION = new URL(ROOT_SERVICE_URL + METHOD_URL); - } catch (MalformedURLException e) { - logger.warning("Failed to create URL for the wsdl Location: '" + VALIDATIONSERVICE_WSDL_LOCATION + "', retrying as a local file"); - logger.warning(e.getMessage()); - } - } public ValidationService_Service(URL wsdlLocation, QName serviceName) { super(wsdlLocation, serviceName); } public ValidationService_Service() { - super(VALIDATIONSERVICE_WSDL_LOCATION, new QName("http://impl.ws.dss.markt.ec.europa.eu/", "ValidationService")); + super(VALIDATIONSERVICE_WSDL_LOCATION, new QName("http://impl.ws.dss.esig.europa.eu/", "ValidationService")); } /** @@ -81,7 +66,7 @@ public ValidationService_Service() { */ @WebEndpoint(name = "ValidationServiceImplPort") public ValidationService getValidationServiceImplPort() { - return super.getPort(new QName("http://impl.ws.dss.markt.ec.europa.eu/", "ValidationServiceImplPort"), ValidationService.class); + return super.getPort(new QName("http://impl.ws.dss.esig.europa.eu/", "ValidationServiceImplPort"), ValidationService.class); } /** @@ -91,7 +76,7 @@ public ValidationService getValidationServiceImplPort() { */ @WebEndpoint(name = "ValidationServiceImplPort") public ValidationService getValidationServiceImplPort(WebServiceFeature... features) { - return super.getPort(new QName("http://impl.ws.dss.markt.ec.europa.eu/", "ValidationServiceImplPort"), ValidationService.class, features); + return super.getPort(new QName("http://impl.ws.dss.esig.europa.eu/", "ValidationServiceImplPort"), ValidationService.class, features); } } diff --git a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/validation/WsDocument.java b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/validation/WsDocument.java similarity index 95% rename from dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/validation/WsDocument.java rename to dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/validation/WsDocument.java index 421a67de91..aaff1024c2 100644 --- a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/validation/WsDocument.java +++ b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/validation/WsDocument.java @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.ws.validation; +package eu.europa.esig.dss.wsclient.validation; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -38,9 +38,9 @@ * <sequence> * <element name="absolutePath" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <element name="bytes" type="{http://www.w3.org/2001/XMLSchema}base64Binary" minOccurs="0"/> - * <element name="mimeType" type="{http://ws.dss.markt.ec.europa.eu/}mimeType" minOccurs="0"/> + * <element name="mimeType" type="{http://ws.dss.esig.europa.eu/}mimeType" minOccurs="0"/> * <element name="name" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> - * <element name="nextDocument" type="{http://ws.dss.markt.ec.europa.eu/}wsDocument" minOccurs="0"/> + * <element name="nextDocument" type="{http://ws.dss.esig.europa.eu/}wsDocument" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> diff --git a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/validation/WsValidationReport.java b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/validation/WsValidationReport.java similarity index 98% rename from dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/validation/WsValidationReport.java rename to dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/validation/WsValidationReport.java index 78dee03750..9c7f90e800 100644 --- a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/validation/WsValidationReport.java +++ b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/validation/WsValidationReport.java @@ -19,7 +19,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.ws.validation; +package eu.europa.esig.dss.wsclient.validation; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/validation/package-info.java b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/validation/package-info.java similarity index 93% rename from dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/validation/package-info.java rename to dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/validation/package-info.java index 24fc42ef76..b2378c8523 100644 --- a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/validation/package-info.java +++ b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/validation/package-info.java @@ -1,4 +1,4 @@ -@javax.xml.bind.annotation.XmlSchema(namespace = "http://ws.dss.markt.ec.europa.eu/") +@javax.xml.bind.annotation.XmlSchema(namespace = "http://ws.dss.esig.europa.eu/") /** * DSS - Digital Signature Services * Copyright (C) 2015 European Commission, provided under the CEF programme @@ -19,4 +19,4 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.ws.validation; +package eu.europa.esig.dss.wsclient.validation; diff --git a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/validation/validationService.wsdl b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/validation/validationService.wsdl similarity index 78% rename from dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/validation/validationService.wsdl rename to dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/validation/validationService.wsdl index 8001237fb9..7150efb173 100644 --- a/dss-webservices-client/src/main/java/eu/europa/ec/markt/dss/ws/validation/validationService.wsdl +++ b/dss-webservices-client/src/main/java/eu/europa/esig/dss/wsclient/validation/validationService.wsdl @@ -1,5 +1,5 @@ - - + + diff --git a/dss-webservices/src/main/java/eu/europa/ec/markt/dss/ws/DSSWSUtils.java b/dss-webservices/src/main/java/eu/europa/esig/dss/ws/DSSWSUtils.java similarity index 89% rename from dss-webservices/src/main/java/eu/europa/ec/markt/dss/ws/DSSWSUtils.java rename to dss-webservices/src/main/java/eu/europa/esig/dss/ws/DSSWSUtils.java index f62bebe29e..f3a8d5decc 100644 --- a/dss-webservices/src/main/java/eu/europa/ec/markt/dss/ws/DSSWSUtils.java +++ b/dss-webservices/src/main/java/eu/europa/esig/dss/ws/DSSWSUtils.java @@ -18,11 +18,11 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.ws; +package eu.europa.esig.dss.ws; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.InMemoryDocument; -import eu.europa.ec.markt.dss.signature.MimeType; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.InMemoryDocument; +import eu.europa.esig.dss.MimeType; /** * This is the utility class to handle web services. diff --git a/dss-webservices/src/main/java/eu/europa/ec/markt/dss/ws/SignatureService.java b/dss-webservices/src/main/java/eu/europa/esig/dss/ws/SignatureService.java similarity index 98% rename from dss-webservices/src/main/java/eu/europa/ec/markt/dss/ws/SignatureService.java rename to dss-webservices/src/main/java/eu/europa/esig/dss/ws/SignatureService.java index 77f7674297..29470cf369 100644 --- a/dss-webservices/src/main/java/eu/europa/ec/markt/dss/ws/SignatureService.java +++ b/dss-webservices/src/main/java/eu/europa/esig/dss/ws/SignatureService.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.ws; +package eu.europa.esig.dss.ws; import javax.jws.WebParam; import javax.jws.WebResult; @@ -26,7 +26,7 @@ import org.apache.cxf.annotations.WSDLDocumentation; -import eu.europa.ec.markt.dss.exception.DSSException; +import eu.europa.esig.dss.DSSException; /** * Interface for the Contract of the Signature Web Service. The signing web service allows to create a new signature or to extend existing one. Different forms of signature: diff --git a/dss-webservices/src/main/java/eu/europa/ec/markt/dss/ws/ValidationService.java b/dss-webservices/src/main/java/eu/europa/esig/dss/ws/ValidationService.java similarity index 95% rename from dss-webservices/src/main/java/eu/europa/ec/markt/dss/ws/ValidationService.java rename to dss-webservices/src/main/java/eu/europa/esig/dss/ws/ValidationService.java index a7a07f6598..d4afbfa4f3 100644 --- a/dss-webservices/src/main/java/eu/europa/ec/markt/dss/ws/ValidationService.java +++ b/dss-webservices/src/main/java/eu/europa/esig/dss/ws/ValidationService.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.ws; +package eu.europa.esig.dss.ws; import javax.jws.WebParam; import javax.jws.WebResult; @@ -26,8 +26,8 @@ import org.apache.cxf.annotations.WSDLDocumentation; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.ws.report.WSValidationReport; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.ws.report.WSValidationReport; /** * Interface for the Contract of the Validation Web Service. diff --git a/dss-webservices/src/main/java/eu/europa/ec/markt/dss/ws/WSChainCertificate.java b/dss-webservices/src/main/java/eu/europa/esig/dss/ws/WSChainCertificate.java similarity index 97% rename from dss-webservices/src/main/java/eu/europa/ec/markt/dss/ws/WSChainCertificate.java rename to dss-webservices/src/main/java/eu/europa/esig/dss/ws/WSChainCertificate.java index fa398032d1..65100babb4 100644 --- a/dss-webservices/src/main/java/eu/europa/ec/markt/dss/ws/WSChainCertificate.java +++ b/dss-webservices/src/main/java/eu/europa/esig/dss/ws/WSChainCertificate.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.ws; +package eu.europa.esig.dss.ws; import java.util.Arrays; diff --git a/dss-webservices/src/main/java/eu/europa/ec/markt/dss/ws/WSDSSReference.java b/dss-webservices/src/main/java/eu/europa/esig/dss/ws/WSDSSReference.java similarity index 95% rename from dss-webservices/src/main/java/eu/europa/ec/markt/dss/ws/WSDSSReference.java rename to dss-webservices/src/main/java/eu/europa/esig/dss/ws/WSDSSReference.java index d729bda639..d8dc822ba1 100644 --- a/dss-webservices/src/main/java/eu/europa/ec/markt/dss/ws/WSDSSReference.java +++ b/dss-webservices/src/main/java/eu/europa/esig/dss/ws/WSDSSReference.java @@ -18,13 +18,13 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.ws; +package eu.europa.esig.dss.ws; import java.util.ArrayList; import java.util.List; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.parameter.DSSTransform; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.xades.DSSTransform; /** * TODO diff --git a/dss-webservices/src/main/java/eu/europa/ec/markt/dss/ws/WSDocument.java b/dss-webservices/src/main/java/eu/europa/esig/dss/ws/WSDocument.java similarity index 94% rename from dss-webservices/src/main/java/eu/europa/ec/markt/dss/ws/WSDocument.java rename to dss-webservices/src/main/java/eu/europa/esig/dss/ws/WSDocument.java index 81ce9872b7..ad52d753a3 100644 --- a/dss-webservices/src/main/java/eu/europa/ec/markt/dss/ws/WSDocument.java +++ b/dss-webservices/src/main/java/eu/europa/esig/dss/ws/WSDocument.java @@ -18,16 +18,16 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.ws; +package eu.europa.esig.dss.ws; import java.io.ByteArrayInputStream; import java.io.InputStream; import java.io.StringWriter; import java.util.Arrays; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.MimeType; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.MimeType; /** * Container for any kind of document that is to be transferred to and from web service endpoints. diff --git a/dss-webservices/src/main/java/eu/europa/ec/markt/dss/ws/WSParameters.java b/dss-webservices/src/main/java/eu/europa/esig/dss/ws/WSParameters.java similarity index 94% rename from dss-webservices/src/main/java/eu/europa/ec/markt/dss/ws/WSParameters.java rename to dss-webservices/src/main/java/eu/europa/esig/dss/ws/WSParameters.java index 762885e01b..781e7a3f10 100644 --- a/dss-webservices/src/main/java/eu/europa/ec/markt/dss/ws/WSParameters.java +++ b/dss-webservices/src/main/java/eu/europa/esig/dss/ws/WSParameters.java @@ -18,20 +18,20 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.ws; +package eu.europa.esig.dss.ws; import java.util.ArrayList; import java.util.Date; import java.util.List; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.EncryptionAlgorithm; -import eu.europa.ec.markt.dss.parameter.BLevelParameters; -import eu.europa.ec.markt.dss.parameter.Policy; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.validation102853.SignatureForm; +import eu.europa.esig.dss.BLevelParameters; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.EncryptionAlgorithm; +import eu.europa.esig.dss.Policy; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.x509.SignatureForm; /** * Representation of a SignedProperties Element. diff --git a/dss-webservices/src/main/java/eu/europa/ec/markt/dss/ws/impl/SignatureServiceImpl.java b/dss-webservices/src/main/java/eu/europa/esig/dss/ws/impl/SignatureServiceImpl.java similarity index 90% rename from dss-webservices/src/main/java/eu/europa/ec/markt/dss/ws/impl/SignatureServiceImpl.java rename to dss-webservices/src/main/java/eu/europa/esig/dss/ws/impl/SignatureServiceImpl.java index 3e2bae7ac3..206f17d131 100644 --- a/dss-webservices/src/main/java/eu/europa/ec/markt/dss/ws/impl/SignatureServiceImpl.java +++ b/dss-webservices/src/main/java/eu/europa/esig/dss/ws/impl/SignatureServiceImpl.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.ws.impl; +package eu.europa.esig.dss.ws.impl; import java.util.ArrayList; import java.util.Date; @@ -30,31 +30,31 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.EncryptionAlgorithm; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.parameter.ASiCSignatureParameters; -import eu.europa.ec.markt.dss.parameter.AbstractSignatureParameters; -import eu.europa.ec.markt.dss.parameter.BLevelParameters; -import eu.europa.ec.markt.dss.parameter.CAdESSignatureParameters; -import eu.europa.ec.markt.dss.parameter.ChainCertificate; -import eu.europa.ec.markt.dss.parameter.DSSReference; -import eu.europa.ec.markt.dss.parameter.PAdESSignatureParameters; -import eu.europa.ec.markt.dss.parameter.Policy; -import eu.europa.ec.markt.dss.parameter.XAdESSignatureParameters; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.validation102853.SignatureForm; -import eu.europa.ec.markt.dss.ws.DSSWSUtils; -import eu.europa.ec.markt.dss.ws.SignatureService; -import eu.europa.ec.markt.dss.ws.WSChainCertificate; -import eu.europa.ec.markt.dss.ws.WSDSSReference; -import eu.europa.ec.markt.dss.ws.WSDocument; -import eu.europa.ec.markt.dss.ws.WSParameters; +import eu.europa.esig.dss.AbstractSignatureParameters; +import eu.europa.esig.dss.BLevelParameters; +import eu.europa.esig.dss.ChainCertificate; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.EncryptionAlgorithm; +import eu.europa.esig.dss.Policy; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.asic.ASiCSignatureParameters; +import eu.europa.esig.dss.cades.CAdESSignatureParameters; +import eu.europa.esig.dss.pades.PAdESSignatureParameters; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.ws.DSSWSUtils; +import eu.europa.esig.dss.ws.SignatureService; +import eu.europa.esig.dss.ws.WSChainCertificate; +import eu.europa.esig.dss.ws.WSDSSReference; +import eu.europa.esig.dss.ws.WSDocument; +import eu.europa.esig.dss.ws.WSParameters; +import eu.europa.esig.dss.x509.CertificateToken; +import eu.europa.esig.dss.x509.SignatureForm; +import eu.europa.esig.dss.xades.DSSReference; +import eu.europa.esig.dss.xades.XAdESSignatureParameters; /** * Implementation of the Interface for the Contract of the Signature Web Service. @@ -62,7 +62,7 @@ * */ -@WebService(endpointInterface = "eu.europa.ec.markt.dss.ws.SignatureService", serviceName = "SignatureService") +@WebService(endpointInterface = "eu.europa.esig.dss.ws.SignatureService", serviceName = "SignatureService") public class SignatureServiceImpl implements SignatureService { private static final Logger LOG = LoggerFactory.getLogger(SignatureServiceImpl.class); diff --git a/dss-webservices/src/main/java/eu/europa/ec/markt/dss/ws/impl/ValidationServiceImpl.java b/dss-webservices/src/main/java/eu/europa/esig/dss/ws/impl/ValidationServiceImpl.java similarity index 80% rename from dss-webservices/src/main/java/eu/europa/ec/markt/dss/ws/impl/ValidationServiceImpl.java rename to dss-webservices/src/main/java/eu/europa/esig/dss/ws/impl/ValidationServiceImpl.java index e04814ce2a..6c90f91cbc 100644 --- a/dss-webservices/src/main/java/eu/europa/ec/markt/dss/ws/impl/ValidationServiceImpl.java +++ b/dss-webservices/src/main/java/eu/europa/esig/dss/ws/impl/ValidationServiceImpl.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.ws.impl; +package eu.europa.esig.dss.ws.impl; import java.io.InputStream; import java.util.ArrayList; @@ -29,23 +29,23 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.SignedDocumentValidator; -import eu.europa.ec.markt.dss.validation102853.report.DetailedReport; -import eu.europa.ec.markt.dss.validation102853.report.DiagnosticData; -import eu.europa.ec.markt.dss.validation102853.report.Reports; -import eu.europa.ec.markt.dss.validation102853.report.SimpleReport; -import eu.europa.ec.markt.dss.ws.DSSWSUtils; -import eu.europa.ec.markt.dss.ws.ValidationService; -import eu.europa.ec.markt.dss.ws.WSDocument; -import eu.europa.ec.markt.dss.ws.report.WSValidationReport; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.SignedDocumentValidator; +import eu.europa.esig.dss.validation.report.DetailedReport; +import eu.europa.esig.dss.validation.report.DiagnosticData; +import eu.europa.esig.dss.validation.report.Reports; +import eu.europa.esig.dss.validation.report.SimpleReport; +import eu.europa.esig.dss.ws.DSSWSUtils; +import eu.europa.esig.dss.ws.ValidationService; +import eu.europa.esig.dss.ws.WSDocument; +import eu.europa.esig.dss.ws.report.WSValidationReport; /** * Implementation of the Interface for the Contract of the Validation Web Service. */ -@WebService(endpointInterface = "eu.europa.ec.markt.dss.ws.ValidationService", serviceName = "ValidationService") +@WebService(endpointInterface = "eu.europa.esig.dss.ws.ValidationService", serviceName = "ValidationService") public class ValidationServiceImpl implements ValidationService { private static final Logger logger = LoggerFactory.getLogger(SignatureServiceImpl.class); diff --git a/dss-webservices/src/main/java/eu/europa/ec/markt/dss/ws/report/WSValidationReport.java b/dss-webservices/src/main/java/eu/europa/esig/dss/ws/report/WSValidationReport.java similarity index 97% rename from dss-webservices/src/main/java/eu/europa/ec/markt/dss/ws/report/WSValidationReport.java rename to dss-webservices/src/main/java/eu/europa/esig/dss/ws/report/WSValidationReport.java index eb58e64a13..d4e65fd822 100644 --- a/dss-webservices/src/main/java/eu/europa/ec/markt/dss/ws/report/WSValidationReport.java +++ b/dss-webservices/src/main/java/eu/europa/esig/dss/ws/report/WSValidationReport.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.ws.report; +package eu.europa.esig.dss.ws.report; /** * Wrap data of DetailedReport. Used to expose the information in the Webservice. diff --git a/dss-webservices/src/main/resources/dss_applicationContext_cxf.xml b/dss-webservices/src/main/resources/dss_applicationContext_cxf.xml index bd3e38c8f7..f6b77f867b 100644 --- a/dss-webservices/src/main/resources/dss_applicationContext_cxf.xml +++ b/dss-webservices/src/main/resources/dss_applicationContext_cxf.xml @@ -10,29 +10,29 @@ - + - + - + - + - + @@ -40,7 +40,7 @@ - + @@ -48,7 +48,7 @@ + class="eu.europa.esig.dss.validation.CommonCertificateVerifier"> diff --git a/dss-xades/src/main/java/eu/europa/ec/markt/dss/parameter/DSSReference.java b/dss-xades/src/main/java/eu/europa/esig/dss/xades/DSSReference.java similarity index 95% rename from dss-xades/src/main/java/eu/europa/ec/markt/dss/parameter/DSSReference.java rename to dss-xades/src/main/java/eu/europa/esig/dss/xades/DSSReference.java index 80eda2ff07..7db267c602 100644 --- a/dss-xades/src/main/java/eu/europa/ec/markt/dss/parameter/DSSReference.java +++ b/dss-xades/src/main/java/eu/europa/esig/dss/xades/DSSReference.java @@ -18,13 +18,13 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.parameter; +package eu.europa.esig.dss.xades; import java.util.ArrayList; import java.util.List; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.signature.DSSDocument; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DigestAlgorithm; /** * TODO diff --git a/dss-xades/src/main/java/eu/europa/ec/markt/dss/parameter/DSSTransform.java b/dss-xades/src/main/java/eu/europa/esig/dss/xades/DSSTransform.java similarity index 98% rename from dss-xades/src/main/java/eu/europa/ec/markt/dss/parameter/DSSTransform.java rename to dss-xades/src/main/java/eu/europa/esig/dss/xades/DSSTransform.java index 60fec590bd..0402fb9f53 100644 --- a/dss-xades/src/main/java/eu/europa/ec/markt/dss/parameter/DSSTransform.java +++ b/dss-xades/src/main/java/eu/europa/esig/dss/xades/DSSTransform.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.parameter; +package eu.europa.esig.dss.xades; /** * TODO diff --git a/dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/ProfileParameters.java b/dss-xades/src/main/java/eu/europa/esig/dss/xades/ProfileParameters.java similarity index 95% rename from dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/ProfileParameters.java rename to dss-xades/src/main/java/eu/europa/esig/dss/xades/ProfileParameters.java index 7dd130977e..d5b53f83dc 100644 --- a/dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/ProfileParameters.java +++ b/dss-xades/src/main/java/eu/europa/esig/dss/xades/ProfileParameters.java @@ -18,12 +18,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature; +package eu.europa.esig.dss.xades; import java.io.Serializable; -import eu.europa.ec.markt.dss.parameter.SignatureProfile; - /** * This class This class manages the internal variables used in the process of creating of a signature and which allows to * accelerate the generation.
diff --git a/dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/SignatureBuilder.java b/dss-xades/src/main/java/eu/europa/esig/dss/xades/SignatureBuilder.java similarity index 55% rename from dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/SignatureBuilder.java rename to dss-xades/src/main/java/eu/europa/esig/dss/xades/SignatureBuilder.java index 649b775999..6c61de45c1 100644 --- a/dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/SignatureBuilder.java +++ b/dss-xades/src/main/java/eu/europa/esig/dss/xades/SignatureBuilder.java @@ -1,4 +1,6 @@ -package eu.europa.ec.markt.dss.signature; +package eu.europa.esig.dss.xades; + +import eu.europa.esig.dss.DSSDocument; public interface SignatureBuilder { diff --git a/dss-xades/src/main/java/eu/europa/ec/markt/dss/parameter/SignatureProfile.java b/dss-xades/src/main/java/eu/europa/esig/dss/xades/SignatureProfile.java similarity index 62% rename from dss-xades/src/main/java/eu/europa/ec/markt/dss/parameter/SignatureProfile.java rename to dss-xades/src/main/java/eu/europa/esig/dss/xades/SignatureProfile.java index 7ec92737ea..0d8d96031c 100644 --- a/dss-xades/src/main/java/eu/europa/ec/markt/dss/parameter/SignatureProfile.java +++ b/dss-xades/src/main/java/eu/europa/esig/dss/xades/SignatureProfile.java @@ -1,6 +1,6 @@ -package eu.europa.ec.markt.dss.parameter; +package eu.europa.esig.dss.xades; -import eu.europa.ec.markt.dss.signature.DSSDocument; +import eu.europa.esig.dss.DSSDocument; public interface SignatureProfile { diff --git a/dss-xades/src/main/java/eu/europa/ec/markt/dss/parameter/XAdESSignatureParameters.java b/dss-xades/src/main/java/eu/europa/esig/dss/xades/XAdESSignatureParameters.java similarity index 97% rename from dss-xades/src/main/java/eu/europa/ec/markt/dss/parameter/XAdESSignatureParameters.java rename to dss-xades/src/main/java/eu/europa/esig/dss/xades/XAdESSignatureParameters.java index f15b8712ca..f7b1a74316 100644 --- a/dss-xades/src/main/java/eu/europa/ec/markt/dss/parameter/XAdESSignatureParameters.java +++ b/dss-xades/src/main/java/eu/europa/esig/dss/xades/XAdESSignatureParameters.java @@ -1,10 +1,10 @@ -package eu.europa.ec.markt.dss.parameter; +package eu.europa.esig.dss.xades; import java.util.List; import org.w3c.dom.Document; -import eu.europa.ec.markt.dss.signature.ProfileParameters; +import eu.europa.esig.dss.AbstractSignatureParameters; public class XAdESSignatureParameters extends AbstractSignatureParameters { diff --git a/dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/CounterSignatureBuilder.java b/dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/CounterSignatureBuilder.java similarity index 88% rename from dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/CounterSignatureBuilder.java rename to dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/CounterSignatureBuilder.java index ffcac25701..5e951404bf 100644 --- a/dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/CounterSignatureBuilder.java +++ b/dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/CounterSignatureBuilder.java @@ -18,9 +18,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.xades; +package eu.europa.esig.dss.xades.signature; -import static eu.europa.ec.markt.dss.XAdESNamespaces.XAdES; +import static eu.europa.esig.dss.XAdESNamespaces.XAdES; import java.util.ArrayList; import java.util.List; @@ -33,15 +33,15 @@ import org.w3c.dom.Node; import org.w3c.dom.Text; -import eu.europa.ec.markt.dss.DSSXMLUtils; -import eu.europa.ec.markt.dss.parameter.DSSReference; -import eu.europa.ec.markt.dss.parameter.DSSTransform; -import eu.europa.ec.markt.dss.parameter.XAdESSignatureParameters; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.InMemoryDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.xades.XAdESSignature; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSXMLUtils; +import eu.europa.esig.dss.InMemoryDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.xades.DSSReference; +import eu.europa.esig.dss.xades.DSSTransform; +import eu.europa.esig.dss.xades.XAdESSignatureParameters; +import eu.europa.esig.dss.xades.validation.XAdESSignature; /** * This class provides the methods required to countersign a given signature and extend the existing signature with the generated diff --git a/dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/DSSSignatureUtils.java b/dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/DSSSignatureUtils.java similarity index 97% rename from dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/DSSSignatureUtils.java rename to dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/DSSSignatureUtils.java index d368066c3c..dc7cc84721 100644 --- a/dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/DSSSignatureUtils.java +++ b/dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/DSSSignatureUtils.java @@ -18,12 +18,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.xades; +package eu.europa.esig.dss.xades.signature; import java.io.IOException; -import eu.europa.ec.markt.dss.EncryptionAlgorithm; -import eu.europa.ec.markt.dss.exception.DSSException; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.EncryptionAlgorithm; /** * This is the utility class to manipulate different signature types. diff --git a/dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/DSSTransformXPath.java b/dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/DSSTransformXPath.java similarity index 92% rename from dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/DSSTransformXPath.java rename to dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/DSSTransformXPath.java index a992c15782..93ac0a0a82 100644 --- a/dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/DSSTransformXPath.java +++ b/dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/DSSTransformXPath.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.xades; +package eu.europa.esig.dss.xades.signature; import javax.xml.crypto.dsig.XMLSignature; @@ -29,10 +29,10 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import eu.europa.ec.markt.dss.DSSXMLUtils; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.parameter.DSSTransform; -import eu.europa.ec.markt.dss.signature.DSSDocument; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSXMLUtils; +import eu.europa.esig.dss.xades.DSSTransform; /** * This class implement the logic of {@code Transforms.TRANSFORM_XPATH}. diff --git a/dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/DetachedSignatureBuilder.java b/dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/DetachedSignatureBuilder.java similarity index 90% rename from dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/DetachedSignatureBuilder.java rename to dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/DetachedSignatureBuilder.java index e0fff56a05..4f6b9c7e0f 100644 --- a/dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/DetachedSignatureBuilder.java +++ b/dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/DetachedSignatureBuilder.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.xades; +package eu.europa.esig.dss.xades.signature; import java.util.ArrayList; import java.util.List; @@ -28,12 +28,12 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; -import eu.europa.ec.markt.dss.DSSXMLUtils; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.parameter.DSSReference; -import eu.europa.ec.markt.dss.parameter.XAdESSignatureParameters; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSXMLUtils; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.xades.DSSReference; +import eu.europa.esig.dss.xades.XAdESSignatureParameters; /** * This class handles the specifics of the detached XML signature. diff --git a/dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/EnvelopedSignatureBuilder.java b/dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/EnvelopedSignatureBuilder.java similarity index 93% rename from dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/EnvelopedSignatureBuilder.java rename to dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/EnvelopedSignatureBuilder.java index 5a6b5356b0..eba5b104ce 100644 --- a/dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/EnvelopedSignatureBuilder.java +++ b/dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/EnvelopedSignatureBuilder.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.xades; +package eu.europa.esig.dss.xades.signature; import java.util.ArrayList; import java.util.List; @@ -34,16 +34,16 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import eu.europa.ec.markt.dss.DSSXMLUtils; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.parameter.DSSReference; -import eu.europa.ec.markt.dss.parameter.DSSTransform; -import eu.europa.ec.markt.dss.parameter.XAdESSignatureParameters; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.InMemoryDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.xades.XPathQueryHolder; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSXMLUtils; +import eu.europa.esig.dss.InMemoryDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.XPathQueryHolder; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.xades.DSSReference; +import eu.europa.esig.dss.xades.DSSTransform; +import eu.europa.esig.dss.xades.XAdESSignatureParameters; /** * This class handles the specifics of the enveloped XML signature diff --git a/dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/EnvelopingSignatureBuilder.java b/dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/EnvelopingSignatureBuilder.java similarity index 88% rename from dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/EnvelopingSignatureBuilder.java rename to dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/EnvelopingSignatureBuilder.java index 76a30193f0..998cab98fb 100644 --- a/dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/EnvelopingSignatureBuilder.java +++ b/dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/EnvelopingSignatureBuilder.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.xades; +package eu.europa.esig.dss.xades.signature; import java.util.ArrayList; import java.util.List; @@ -30,17 +30,17 @@ import org.w3c.dom.Element; import org.w3c.dom.Text; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DSSXMLUtils; -import eu.europa.ec.markt.dss.EncryptionAlgorithm; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.parameter.DSSReference; -import eu.europa.ec.markt.dss.parameter.DSSTransform; -import eu.europa.ec.markt.dss.parameter.XAdESSignatureParameters; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.InMemoryDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DSSXMLUtils; +import eu.europa.esig.dss.EncryptionAlgorithm; +import eu.europa.esig.dss.InMemoryDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.xades.DSSReference; +import eu.europa.esig.dss.xades.DSSTransform; +import eu.europa.esig.dss.xades.XAdESSignatureParameters; /** * This class handles the specifics of the enveloping XML signature diff --git a/dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/ExtensionBuilder.java b/dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/ExtensionBuilder.java similarity index 93% rename from dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/ExtensionBuilder.java rename to dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/ExtensionBuilder.java index d11b30e58e..4a5ba00fc1 100644 --- a/dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/ExtensionBuilder.java +++ b/dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/ExtensionBuilder.java @@ -18,16 +18,16 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.xades; +package eu.europa.esig.dss.xades.signature; import org.w3c.dom.Element; import org.w3c.dom.NodeList; -import eu.europa.ec.markt.dss.DSSXMLUtils; -import eu.europa.ec.markt.dss.XAdESNamespaces; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.xades.XAdESSignature; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSXMLUtils; +import eu.europa.esig.dss.XAdESNamespaces; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.xades.validation.XAdESSignature; public abstract class ExtensionBuilder extends XAdESBuilder { diff --git a/dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/ExternalFileURIDereferencer.java b/dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/ExternalFileURIDereferencer.java similarity index 97% rename from dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/ExternalFileURIDereferencer.java rename to dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/ExternalFileURIDereferencer.java index 92dc36e898..23a025bf18 100644 --- a/dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/ExternalFileURIDereferencer.java +++ b/dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/ExternalFileURIDereferencer.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.xades; +package eu.europa.esig.dss.xades.signature; import java.io.InputStream; @@ -34,7 +34,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.signature.DSSDocument; +import eu.europa.esig.dss.DSSDocument; //import org.apache.jcp.xml.dsig.internal.dom.XMLDSigRI; diff --git a/dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/XAdESBuilder.java b/dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/XAdESBuilder.java similarity index 94% rename from dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/XAdESBuilder.java rename to dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/XAdESBuilder.java index 0f22ea5cc3..64eb7fd398 100644 --- a/dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/XAdESBuilder.java +++ b/dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/XAdESBuilder.java @@ -18,9 +18,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.xades; +package eu.europa.esig.dss.xades.signature; -import static eu.europa.ec.markt.dss.XAdESNamespaces.XAdES; +import static eu.europa.esig.dss.XAdESNamespaces.XAdES; import static javax.xml.crypto.dsig.XMLSignature.XMLNS; import java.math.BigInteger; @@ -32,16 +32,16 @@ import org.w3c.dom.Element; import org.w3c.dom.Text; -import eu.europa.ec.markt.dss.DSSXMLUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.parameter.XAdESSignatureParameters; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.InMemoryDocument; -import eu.europa.ec.markt.dss.validation102853.CertificatePool; -import eu.europa.ec.markt.dss.validation102853.CertificateSource; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.xades.XPathQueryHolder; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSXMLUtils; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.InMemoryDocument; +import eu.europa.esig.dss.XPathQueryHolder; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.x509.CertificatePool; +import eu.europa.esig.dss.x509.CertificateSource; +import eu.europa.esig.dss.x509.CertificateToken; +import eu.europa.esig.dss.xades.XAdESSignatureParameters; public abstract class XAdESBuilder { diff --git a/dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelA.java b/dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/XAdESLevelA.java similarity index 85% rename from dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelA.java rename to dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/XAdESLevelA.java index 4cad124031..854fe9ae0f 100644 --- a/dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelA.java +++ b/dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/XAdESLevelA.java @@ -18,14 +18,14 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.xades; +package eu.europa.esig.dss.xades.signature; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.parameter.TimestampParameters; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.TimestampType; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.TimestampParameters; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.x509.TimestampType; /** * Holds level A aspects of XAdES diff --git a/dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelBaselineB.java b/dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/XAdESLevelBaselineB.java similarity index 88% rename from dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelBaselineB.java rename to dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/XAdESLevelBaselineB.java index 27c7a55cfe..c177111d45 100644 --- a/dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelBaselineB.java +++ b/dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/XAdESLevelBaselineB.java @@ -18,16 +18,16 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.xades; +package eu.europa.esig.dss.xades.signature; import org.apache.xml.security.Init; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.parameter.SignatureProfile; -import eu.europa.ec.markt.dss.parameter.XAdESSignatureParameters; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.SignatureBuilder; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.xades.SignatureBuilder; +import eu.europa.esig.dss.xades.SignatureProfile; +import eu.europa.esig.dss.xades.XAdESSignatureParameters; /** * Contains B level baseline profile for XAdES signature. diff --git a/dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelBaselineLT.java b/dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/XAdESLevelBaselineLT.java similarity index 88% rename from dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelBaselineLT.java rename to dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/XAdESLevelBaselineLT.java index d5ebc11526..927b318a31 100644 --- a/dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelBaselineLT.java +++ b/dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/XAdESLevelBaselineLT.java @@ -18,25 +18,25 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.xades; +package eu.europa.esig.dss.xades.signature; import java.util.List; import org.apache.commons.codec.binary.Base64; import org.w3c.dom.Element; -import eu.europa.ec.markt.dss.DSSXMLUtils; -import eu.europa.ec.markt.dss.XAdESNamespaces; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.validation.ValidationContext; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.DefaultAdvancedSignature; -import eu.europa.ec.markt.dss.validation102853.OCSPToken; -import eu.europa.ec.markt.dss.validation102853.RevocationToken; -import eu.europa.ec.markt.dss.validation102853.bean.SignatureCryptographicVerification; -import eu.europa.ec.markt.dss.validation102853.crl.CRLToken; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSXMLUtils; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.XAdESNamespaces; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.DefaultAdvancedSignature; +import eu.europa.esig.dss.validation.SignatureCryptographicVerification; +import eu.europa.esig.dss.validation.ValidationContext; +import eu.europa.esig.dss.x509.CertificateToken; +import eu.europa.esig.dss.x509.OCSPToken; +import eu.europa.esig.dss.x509.RevocationToken; +import eu.europa.esig.dss.x509.crl.CRLToken; /** * LT profile of XAdES signature @@ -93,7 +93,7 @@ protected void extendSignatureTag() throws DSSException { /** * This method checks the signature integrity and throws a {@code DSSException} if the signature is broken. * - * @throws eu.europa.ec.markt.dss.exception.DSSException + * @throws eu.europa.esig.dss.DSSException */ protected void checkSignatureIntegrity() throws DSSException { diff --git a/dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelBaselineLTA.java b/dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/XAdESLevelBaselineLTA.java similarity index 86% rename from dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelBaselineLTA.java rename to dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/XAdESLevelBaselineLTA.java index 6ea7dd38e6..59770fb2e5 100644 --- a/dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelBaselineLTA.java +++ b/dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/XAdESLevelBaselineLTA.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.xades; +package eu.europa.esig.dss.xades.signature; import java.util.ArrayList; import java.util.List; @@ -26,17 +26,17 @@ import org.w3c.dom.Element; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DSSXMLUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.XAdESNamespaces; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.parameter.TimestampParameters; -import eu.europa.ec.markt.dss.signature.validation.TimestampToken; -import eu.europa.ec.markt.dss.signature.validation.ValidationContext; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.TimestampType; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DSSXMLUtils; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.TimestampParameters; +import eu.europa.esig.dss.XAdESNamespaces; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.TimestampToken; +import eu.europa.esig.dss.validation.ValidationContext; +import eu.europa.esig.dss.x509.CertificateToken; +import eu.europa.esig.dss.x509.TimestampType; /** * Holds level LTA aspects of XAdES diff --git a/dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelBaselineT.java b/dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/XAdESLevelBaselineT.java similarity index 87% rename from dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelBaselineT.java rename to dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/XAdESLevelBaselineT.java index 125940937e..ed5ae98220 100644 --- a/dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelBaselineT.java +++ b/dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/XAdESLevelBaselineT.java @@ -18,14 +18,14 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.xades; - -import static eu.europa.ec.markt.dss.XAdESNamespaces.XAdES; -import static eu.europa.ec.markt.dss.XAdESNamespaces.XAdES141; -import static eu.europa.ec.markt.dss.signature.ProfileParameters.Operation.SIGNING; -import static eu.europa.ec.markt.dss.signature.SignatureLevel.XAdES_BASELINE_T; -import static eu.europa.ec.markt.dss.signature.SignaturePackaging.ENVELOPED; -import static eu.europa.ec.markt.dss.validation102853.TimestampType.SIGNATURE_TIMESTAMP; +package eu.europa.esig.dss.xades.signature; + +import static eu.europa.esig.dss.SignatureLevel.XAdES_BASELINE_T; +import static eu.europa.esig.dss.XAdESNamespaces.XAdES; +import static eu.europa.esig.dss.XAdESNamespaces.XAdES141; +import static eu.europa.esig.dss.signature.SignaturePackaging.ENVELOPED; +import static eu.europa.esig.dss.x509.TimestampType.SIGNATURE_TIMESTAMP; +import static eu.europa.esig.dss.xades.ProfileParameters.Operation.SIGNING; import static javax.xml.crypto.dsig.XMLSignature.XMLNS; import java.io.IOException; @@ -42,27 +42,27 @@ import org.w3c.dom.Element; import org.w3c.dom.NodeList; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DSSXMLUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.parameter.TimestampParameters; -import eu.europa.ec.markt.dss.parameter.XAdESSignatureParameters; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.InMemoryDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.ProfileParameters; -import eu.europa.ec.markt.dss.signature.ProfileParameters.Operation; -import eu.europa.ec.markt.dss.signature.SignatureExtension; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.validation.ValidationContext; -import eu.europa.ec.markt.dss.validation102853.CertificatePool; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.TimestampType; -import eu.europa.ec.markt.dss.validation102853.tsp.TSPSource; -import eu.europa.ec.markt.dss.validation102853.xades.XAdESSignature; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DSSXMLUtils; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.InMemoryDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.TimestampParameters; +import eu.europa.esig.dss.signature.SignatureExtension; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.ValidationContext; +import eu.europa.esig.dss.x509.CertificatePool; +import eu.europa.esig.dss.x509.CertificateToken; +import eu.europa.esig.dss.x509.TimestampType; +import eu.europa.esig.dss.x509.tsp.TSPSource; +import eu.europa.esig.dss.xades.ProfileParameters; +import eu.europa.esig.dss.xades.XAdESSignatureParameters; +import eu.europa.esig.dss.xades.ProfileParameters.Operation; +import eu.europa.esig.dss.xades.validation.XAdESSignature; /** * -T profile of XAdES signature @@ -149,7 +149,7 @@ public InMemoryDocument extendSignatures(final DSSDocument dssDocument, final XA * ds:SignatureValue element of the [XMLDSIG] signature. The timestamp token is obtained from TSP source.
* Adds segment into element. * - * @throws eu.europa.ec.markt.dss.exception.DSSException + * @throws eu.europa.esig.dss.DSSException */ protected void extendSignatureTag() throws DSSException { diff --git a/dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelC.java b/dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/XAdESLevelC.java similarity index 91% rename from dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelC.java rename to dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/XAdESLevelC.java index c1d3418fcc..9747d95187 100644 --- a/dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelC.java +++ b/dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/XAdESLevelC.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.xades; +package eu.europa.esig.dss.xades.signature; import java.security.cert.X509CRL; import java.util.ArrayList; @@ -38,18 +38,18 @@ import org.bouncycastle.cert.ocsp.RespID; import org.w3c.dom.Element; -import eu.europa.ec.markt.dss.DSSXMLUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.XAdESNamespaces; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.signature.InMemoryDocument; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.validation.ValidationContext; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.OCSPToken; -import eu.europa.ec.markt.dss.validation102853.RevocationToken; -import eu.europa.ec.markt.dss.validation102853.crl.CRLToken; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSXMLUtils; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.InMemoryDocument; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.XAdESNamespaces; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.ValidationContext; +import eu.europa.esig.dss.x509.CertificateToken; +import eu.europa.esig.dss.x509.OCSPToken; +import eu.europa.esig.dss.x509.RevocationToken; +import eu.europa.esig.dss.x509.crl.CRLToken; /** * Contains XAdES-C profile aspects @@ -99,7 +99,7 @@ private void incorporateCRLRefs(Element completeRevocationRefsDom, final Set processedRevocationTokens) throws DSSException { @@ -180,7 +180,7 @@ private void incorporateOCSPRefs(final Element completeRevocationRefsDom, final DSSXMLUtils.addTextElement(documentDom, ocspIdentifierDom, XAdESNamespaces.XAdES, "xades:ProducedAt", producedAtXmlEncoded); final Element digestAlgAndValueDom = DSSXMLUtils.addElement(documentDom, ocspRefDom, XAdESNamespaces.XAdES, "xades:DigestAlgAndValue"); - // TODO: to be added as field to eu.europa.ec.markt.dss.parameter.AbstractSignatureParameters. + // TODO: to be added as field to eu.europa.esig.dss.AbstractSignatureParameters. DigestAlgorithm digestAlgorithm = DigestAlgorithm.SHA1; incorporateDigestMethod(digestAlgAndValueDom, digestAlgorithm); diff --git a/dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelX.java b/dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/XAdESLevelX.java similarity index 88% rename from dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelX.java rename to dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/XAdESLevelX.java index 2b254c4b92..ba6d46971f 100644 --- a/dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelX.java +++ b/dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/XAdESLevelX.java @@ -18,18 +18,18 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.xades; +package eu.europa.esig.dss.xades.signature; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.parameter.TimestampParameters; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.TimestampType; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.TimestampParameters; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.x509.TimestampType; /** * This class represents the implementation of XAdES level -X extension. diff --git a/dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelXL.java b/dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/XAdESLevelXL.java similarity index 88% rename from dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelXL.java rename to dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/XAdESLevelXL.java index 516ea334c3..6098e9d333 100644 --- a/dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelXL.java +++ b/dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/XAdESLevelXL.java @@ -18,24 +18,24 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.xades; +package eu.europa.esig.dss.xades.signature; import java.util.List; import org.apache.commons.codec.binary.Base64; import org.w3c.dom.Element; -import eu.europa.ec.markt.dss.DSSXMLUtils; -import eu.europa.ec.markt.dss.XAdESNamespaces; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.validation.ValidationContext; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.DefaultAdvancedSignature; -import eu.europa.ec.markt.dss.validation102853.OCSPToken; -import eu.europa.ec.markt.dss.validation102853.RevocationToken; -import eu.europa.ec.markt.dss.validation102853.crl.CRLToken; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSXMLUtils; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.XAdESNamespaces; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.DefaultAdvancedSignature; +import eu.europa.esig.dss.validation.ValidationContext; +import eu.europa.esig.dss.x509.CertificateToken; +import eu.europa.esig.dss.x509.OCSPToken; +import eu.europa.esig.dss.x509.RevocationToken; +import eu.europa.esig.dss.x509.crl.CRLToken; /** * XL profile of XAdES signature diff --git a/dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/XAdESService.java b/dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/XAdESService.java similarity index 88% rename from dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/XAdESService.java rename to dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/XAdESService.java index 60eaf6b428..9ed0e9897e 100644 --- a/dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/XAdESService.java +++ b/dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/XAdESService.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.xades; +package eu.europa.esig.dss.xades.signature; import java.util.List; @@ -29,24 +29,24 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; -import eu.europa.ec.markt.dss.DSSXMLUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.parameter.SignatureProfile; -import eu.europa.ec.markt.dss.parameter.XAdESSignatureParameters; -import eu.europa.ec.markt.dss.signature.AbstractSignatureService; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.ProfileParameters; -import eu.europa.ec.markt.dss.signature.ProfileParameters.Operation; -import eu.europa.ec.markt.dss.signature.SignatureExtension; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.signature.token.SignatureTokenConnection; -import eu.europa.ec.markt.dss.signature.validation.AdvancedSignature; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.SignedDocumentValidator; -import eu.europa.ec.markt.dss.validation102853.xades.XAdESSignature; -import eu.europa.ec.markt.dss.validation102853.xades.XMLDocumentValidator; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSXMLUtils; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.signature.AbstractSignatureService; +import eu.europa.esig.dss.signature.SignatureExtension; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.token.SignatureTokenConnection; +import eu.europa.esig.dss.validation.AdvancedSignature; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.SignedDocumentValidator; +import eu.europa.esig.dss.xades.ProfileParameters; +import eu.europa.esig.dss.xades.SignatureProfile; +import eu.europa.esig.dss.xades.XAdESSignatureParameters; +import eu.europa.esig.dss.xades.ProfileParameters.Operation; +import eu.europa.esig.dss.xades.validation.XAdESSignature; +import eu.europa.esig.dss.xades.validation.XMLDocumentValidator; /** * XAdES implementation of DocumentSignatureService diff --git a/dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/XAdESSignatureBuilder.java b/dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/XAdESSignatureBuilder.java similarity index 95% rename from dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/XAdESSignatureBuilder.java rename to dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/XAdESSignatureBuilder.java index 5577855903..b916638d6f 100644 --- a/dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/xades/XAdESSignatureBuilder.java +++ b/dss-xades/src/main/java/eu/europa/esig/dss/xades/signature/XAdESSignatureBuilder.java @@ -18,9 +18,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.xades; +package eu.europa.esig.dss.xades.signature; -import static eu.europa.ec.markt.dss.XAdESNamespaces.XAdES; +import static eu.europa.esig.dss.XAdESNamespaces.XAdES; import static javax.xml.crypto.dsig.XMLSignature.XMLNS; import java.util.ArrayList; @@ -37,30 +37,30 @@ import org.w3c.dom.Node; import org.w3c.dom.Text; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DSSXMLUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.EncryptionAlgorithm; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.XAdESNamespaces; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.parameter.BLevelParameters; -import eu.europa.ec.markt.dss.parameter.ChainCertificate; -import eu.europa.ec.markt.dss.parameter.DSSReference; -import eu.europa.ec.markt.dss.parameter.DSSTransform; -import eu.europa.ec.markt.dss.parameter.Policy; -import eu.europa.ec.markt.dss.parameter.XAdESSignatureParameters; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.InMemoryDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.SignatureBuilder; -import eu.europa.ec.markt.dss.signature.validation.TimestampToken; -import eu.europa.ec.markt.dss.validation102853.CertificatePool; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.TimestampInclude; -import eu.europa.ec.markt.dss.validation102853.TimestampType; -import eu.europa.ec.markt.dss.validation102853.tsp.TSPSource; +import eu.europa.esig.dss.BLevelParameters; +import eu.europa.esig.dss.ChainCertificate; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DSSXMLUtils; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.EncryptionAlgorithm; +import eu.europa.esig.dss.InMemoryDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.Policy; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.XAdESNamespaces; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.TimestampInclude; +import eu.europa.esig.dss.validation.TimestampToken; +import eu.europa.esig.dss.x509.CertificatePool; +import eu.europa.esig.dss.x509.CertificateToken; +import eu.europa.esig.dss.x509.TimestampType; +import eu.europa.esig.dss.x509.tsp.TSPSource; +import eu.europa.esig.dss.xades.DSSReference; +import eu.europa.esig.dss.xades.DSSTransform; +import eu.europa.esig.dss.xades.SignatureBuilder; +import eu.europa.esig.dss.xades.XAdESSignatureParameters; /** * This class implements all the necessary mechanisms to build each form of the XML signature. diff --git a/dss-xades/src/main/java/eu/europa/ec/markt/dss/validation102853/toolbox/DSigNamespaceContext.java b/dss-xades/src/main/java/eu/europa/esig/dss/xades/validation/DSigNamespaceContext.java similarity index 97% rename from dss-xades/src/main/java/eu/europa/ec/markt/dss/validation102853/toolbox/DSigNamespaceContext.java rename to dss-xades/src/main/java/eu/europa/esig/dss/xades/validation/DSigNamespaceContext.java index 2b9e236c38..aface783aa 100644 --- a/dss-xades/src/main/java/eu/europa/ec/markt/dss/validation102853/toolbox/DSigNamespaceContext.java +++ b/dss-xades/src/main/java/eu/europa/esig/dss/xades/validation/DSigNamespaceContext.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.toolbox; +package eu.europa.esig.dss.xades.validation; import java.util.HashMap; import java.util.Iterator; diff --git a/dss-xades/src/main/java/eu/europa/ec/markt/dss/validation102853/xades/OfflineResolver.java b/dss-xades/src/main/java/eu/europa/esig/dss/xades/validation/OfflineResolver.java similarity index 97% rename from dss-xades/src/main/java/eu/europa/ec/markt/dss/validation102853/xades/OfflineResolver.java rename to dss-xades/src/main/java/eu/europa/esig/dss/xades/validation/OfflineResolver.java index 022f4cdc3d..bffa1d9524 100644 --- a/dss-xades/src/main/java/eu/europa/ec/markt/dss/validation102853/xades/OfflineResolver.java +++ b/dss-xades/src/main/java/eu/europa/esig/dss/xades/validation/OfflineResolver.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.xades; +package eu.europa.esig.dss.xades.validation; import java.io.InputStream; import java.io.UnsupportedEncodingException; @@ -35,8 +35,8 @@ import org.slf4j.LoggerFactory; import org.w3c.dom.Attr; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.MimeType; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.MimeType; /** * This class helps us home users to resolve http URIs without a network connection diff --git a/dss-xades/src/main/java/eu/europa/ec/markt/dss/validation102853/xades/SignatureECDSARIPEMD160.java b/dss-xades/src/main/java/eu/europa/esig/dss/xades/validation/SignatureECDSARIPEMD160.java similarity index 93% rename from dss-xades/src/main/java/eu/europa/ec/markt/dss/validation102853/xades/SignatureECDSARIPEMD160.java rename to dss-xades/src/main/java/eu/europa/esig/dss/xades/validation/SignatureECDSARIPEMD160.java index 53e836e533..0f13bb0dbb 100644 --- a/dss-xades/src/main/java/eu/europa/ec/markt/dss/validation102853/xades/SignatureECDSARIPEMD160.java +++ b/dss-xades/src/main/java/eu/europa/esig/dss/xades/validation/SignatureECDSARIPEMD160.java @@ -18,12 +18,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.xades; +package eu.europa.esig.dss.xades.validation; import org.apache.xml.security.algorithms.implementations.SignatureECDSA; import org.apache.xml.security.signature.XMLSignatureException; -import eu.europa.ec.markt.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureAlgorithm; /** * Class SignatureECDSARIPEMD160 diff --git a/dss-xades/src/main/java/eu/europa/ec/markt/dss/validation102853/xades/SignatureRSARIPEMD160AT.java b/dss-xades/src/main/java/eu/europa/esig/dss/xades/validation/SignatureRSARIPEMD160AT.java similarity index 96% rename from dss-xades/src/main/java/eu/europa/ec/markt/dss/validation102853/xades/SignatureRSARIPEMD160AT.java rename to dss-xades/src/main/java/eu/europa/esig/dss/xades/validation/SignatureRSARIPEMD160AT.java index 817183f4bf..795204ed66 100644 --- a/dss-xades/src/main/java/eu/europa/ec/markt/dss/validation102853/xades/SignatureRSARIPEMD160AT.java +++ b/dss-xades/src/main/java/eu/europa/esig/dss/xades/validation/SignatureRSARIPEMD160AT.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.xades; +package eu.europa.esig.dss.xades.validation; import org.apache.xml.security.algorithms.implementations.SignatureBaseRSA; import org.apache.xml.security.signature.XMLSignatureException; diff --git a/dss-xades/src/main/java/eu/europa/ec/markt/dss/validation102853/xades/XAdES111XPathQueryHolder.java b/dss-xades/src/main/java/eu/europa/esig/dss/xades/validation/XAdES111XPathQueryHolder.java similarity index 96% rename from dss-xades/src/main/java/eu/europa/ec/markt/dss/validation102853/xades/XAdES111XPathQueryHolder.java rename to dss-xades/src/main/java/eu/europa/esig/dss/xades/validation/XAdES111XPathQueryHolder.java index dec2564535..aa4528bfe2 100644 --- a/dss-xades/src/main/java/eu/europa/ec/markt/dss/validation102853/xades/XAdES111XPathQueryHolder.java +++ b/dss-xades/src/main/java/eu/europa/esig/dss/xades/validation/XAdES111XPathQueryHolder.java @@ -18,9 +18,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.xades; +package eu.europa.esig.dss.xades.validation; -import eu.europa.ec.markt.dss.XAdESNamespaces; +import eu.europa.esig.dss.XAdESNamespaces; +import eu.europa.esig.dss.XPathQueryHolder; /** * TODO diff --git a/dss-xades/src/main/java/eu/europa/ec/markt/dss/validation102853/xades/XAdES122XPathQueryHolder.java b/dss-xades/src/main/java/eu/europa/esig/dss/xades/validation/XAdES122XPathQueryHolder.java similarity index 96% rename from dss-xades/src/main/java/eu/europa/ec/markt/dss/validation102853/xades/XAdES122XPathQueryHolder.java rename to dss-xades/src/main/java/eu/europa/esig/dss/xades/validation/XAdES122XPathQueryHolder.java index a3530a9cd1..d534ded6b8 100644 --- a/dss-xades/src/main/java/eu/europa/ec/markt/dss/validation102853/xades/XAdES122XPathQueryHolder.java +++ b/dss-xades/src/main/java/eu/europa/esig/dss/xades/validation/XAdES122XPathQueryHolder.java @@ -18,9 +18,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.xades; +package eu.europa.esig.dss.xades.validation; -import eu.europa.ec.markt.dss.XAdESNamespaces; +import eu.europa.esig.dss.XAdESNamespaces; +import eu.europa.esig.dss.XPathQueryHolder; /** * TODO diff --git a/dss-xades/src/main/java/eu/europa/ec/markt/dss/validation102853/xades/XAdESCRLSource.java b/dss-xades/src/main/java/eu/europa/esig/dss/xades/validation/XAdESCRLSource.java similarity index 92% rename from dss-xades/src/main/java/eu/europa/ec/markt/dss/validation102853/xades/XAdESCRLSource.java rename to dss-xades/src/main/java/eu/europa/esig/dss/xades/validation/XAdESCRLSource.java index 5254cc618e..97d9fcc42e 100644 --- a/dss-xades/src/main/java/eu/europa/ec/markt/dss/validation102853/xades/XAdESCRLSource.java +++ b/dss-xades/src/main/java/eu/europa/esig/dss/xades/validation/XAdESCRLSource.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.xades; +package eu.europa.esig.dss.xades.validation; import java.security.cert.X509CRL; import java.util.ArrayList; @@ -26,9 +26,10 @@ import org.w3c.dom.Element; import org.w3c.dom.NodeList; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DSSXMLUtils; -import eu.europa.ec.markt.dss.validation102853.crl.OfflineCRLSource; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DSSXMLUtils; +import eu.europa.esig.dss.XPathQueryHolder; +import eu.europa.esig.dss.x509.crl.OfflineCRLSource; /** * Retrieves CRL values from an XAdES (-XL) signature. diff --git a/dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/validation/xades/XAdESCertificateSource.java b/dss-xades/src/main/java/eu/europa/esig/dss/xades/validation/XAdESCertificateSource.java similarity index 89% rename from dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/validation/xades/XAdESCertificateSource.java rename to dss-xades/src/main/java/eu/europa/esig/dss/xades/validation/XAdESCertificateSource.java index 24b681db21..95142cbe1d 100644 --- a/dss-xades/src/main/java/eu/europa/ec/markt/dss/signature/validation/xades/XAdESCertificateSource.java +++ b/dss-xades/src/main/java/eu/europa/esig/dss/xades/validation/XAdESCertificateSource.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.validation.xades; +package eu.europa.esig.dss.xades.validation; import java.util.ArrayList; import java.util.List; @@ -29,13 +29,13 @@ import org.w3c.dom.Element; import org.w3c.dom.NodeList; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DSSXMLUtils; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.validation102853.CertificatePool; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.validation102853.SignatureCertificateSource; -import eu.europa.ec.markt.dss.validation102853.xades.XPathQueryHolder; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DSSXMLUtils; +import eu.europa.esig.dss.XPathQueryHolder; +import eu.europa.esig.dss.x509.CertificatePool; +import eu.europa.esig.dss.x509.CertificateToken; +import eu.europa.esig.dss.x509.SignatureCertificateSource; /** * This class provides the mechanism to retrieve certificates contained in a XAdES signature. @@ -141,7 +141,7 @@ public List getKeyInfoCertificates() throws DSSException { * Returns the list of certificates included in "xades141:TimeStampValidationData/xades132:CertificateValues" node * * @return - * @throws eu.europa.ec.markt.dss.exception.DSSException + * @throws eu.europa.esig.dss.DSSException */ public List getTimestampCertificates() throws DSSException { diff --git a/dss-xades/src/main/java/eu/europa/ec/markt/dss/validation102853/xades/XAdESOCSPSource.java b/dss-xades/src/main/java/eu/europa/esig/dss/xades/validation/XAdESOCSPSource.java similarity index 92% rename from dss-xades/src/main/java/eu/europa/ec/markt/dss/validation102853/xades/XAdESOCSPSource.java rename to dss-xades/src/main/java/eu/europa/esig/dss/xades/validation/XAdESOCSPSource.java index cb7026efa8..8af445c4fb 100644 --- a/dss-xades/src/main/java/eu/europa/ec/markt/dss/validation102853/xades/XAdESOCSPSource.java +++ b/dss-xades/src/main/java/eu/europa/esig/dss/xades/validation/XAdESOCSPSource.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.xades; +package eu.europa.esig.dss.xades.validation; import java.util.ArrayList; import java.util.List; @@ -29,9 +29,10 @@ import org.w3c.dom.Element; import org.w3c.dom.NodeList; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DSSXMLUtils; -import eu.europa.ec.markt.dss.validation102853.ocsp.OfflineOCSPSource; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DSSXMLUtils; +import eu.europa.esig.dss.XPathQueryHolder; +import eu.europa.esig.dss.x509.ocsp.OfflineOCSPSource; /** * Retrieves OCSP values from an XAdES (>XL) signature. diff --git a/dss-xades/src/main/java/eu/europa/ec/markt/dss/validation102853/xades/XAdESSignature.java b/dss-xades/src/main/java/eu/europa/esig/dss/xades/validation/XAdESSignature.java similarity index 96% rename from dss-xades/src/main/java/eu/europa/ec/markt/dss/validation102853/xades/XAdESSignature.java rename to dss-xades/src/main/java/eu/europa/esig/dss/xades/validation/XAdESSignature.java index e833f60084..6ba7f85194 100644 --- a/dss-xades/src/main/java/eu/europa/ec/markt/dss/validation102853/xades/XAdESSignature.java +++ b/dss-xades/src/main/java/eu/europa/esig/dss/xades/validation/XAdESSignature.java @@ -18,12 +18,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.xades; +package eu.europa.esig.dss.xades.validation; -import static eu.europa.ec.markt.dss.validation102853.xades.XPathQueryHolder.XMLE_ALGORITHM; -import static eu.europa.ec.markt.dss.validation102853.xades.XPathQueryHolder.XMLE_REFS_ONLY_TIME_STAMP; -import static eu.europa.ec.markt.dss.validation102853.xades.XPathQueryHolder.XMLE_SIGNATURE_TIME_STAMP; -import static eu.europa.ec.markt.dss.validation102853.xades.XPathQueryHolder.XMLE_SIG_AND_REFS_TIME_STAMP; +import static eu.europa.esig.dss.XPathQueryHolder.XMLE_ALGORITHM; +import static eu.europa.esig.dss.XPathQueryHolder.XMLE_REFS_ONLY_TIME_STAMP; +import static eu.europa.esig.dss.XPathQueryHolder.XMLE_SIGNATURE_TIME_STAMP; +import static eu.europa.esig.dss.XPathQueryHolder.XMLE_SIG_AND_REFS_TIME_STAMP; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -62,40 +62,39 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import eu.europa.ec.markt.dss.DSSASN1Utils; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DSSXMLUtils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.EncryptionAlgorithm; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.XAdESNamespaces; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.exception.DSSNotETSICompliantException; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.validation.AdvancedSignature; -import eu.europa.ec.markt.dss.signature.validation.TimestampToken; -import eu.europa.ec.markt.dss.signature.validation.xades.XAdESCertificateSource; -import eu.europa.ec.markt.dss.validation102853.ArchiveTimestampType; -import eu.europa.ec.markt.dss.validation102853.CertificatePool; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; -import eu.europa.ec.markt.dss.validation102853.DefaultAdvancedSignature; -import eu.europa.ec.markt.dss.validation102853.SignatureForm; -import eu.europa.ec.markt.dss.validation102853.SignaturePolicy; -import eu.europa.ec.markt.dss.validation102853.TimestampInclude; -import eu.europa.ec.markt.dss.validation102853.TimestampReference; -import eu.europa.ec.markt.dss.validation102853.TimestampType; -import eu.europa.ec.markt.dss.validation102853.bean.CandidatesForSigningCertificate; -import eu.europa.ec.markt.dss.validation102853.bean.CertificateValidity; -import eu.europa.ec.markt.dss.validation102853.bean.CertifiedRole; -import eu.europa.ec.markt.dss.validation102853.bean.CommitmentType; -import eu.europa.ec.markt.dss.validation102853.bean.SignatureCryptographicVerification; -import eu.europa.ec.markt.dss.validation102853.bean.SignatureProductionPlace; -import eu.europa.ec.markt.dss.validation102853.certificate.CertificateRef; -import eu.europa.ec.markt.dss.validation102853.crl.CRLRef; -import eu.europa.ec.markt.dss.validation102853.crl.OfflineCRLSource; -import eu.europa.ec.markt.dss.validation102853.ocsp.OCSPRef; -import eu.europa.ec.markt.dss.validation102853.ocsp.OfflineOCSPSource; -import eu.europa.ec.markt.dss.validation102853.toolbox.XPointerResourceResolver; +import eu.europa.esig.dss.DSSASN1Utils; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSNotETSICompliantException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DSSXMLUtils; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.EncryptionAlgorithm; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.XAdESNamespaces; +import eu.europa.esig.dss.XPathQueryHolder; +import eu.europa.esig.dss.validation.AdvancedSignature; +import eu.europa.esig.dss.validation.CRLRef; +import eu.europa.esig.dss.validation.CandidatesForSigningCertificate; +import eu.europa.esig.dss.validation.CertificateRef; +import eu.europa.esig.dss.validation.CertificateValidity; +import eu.europa.esig.dss.validation.CertifiedRole; +import eu.europa.esig.dss.validation.CommitmentType; +import eu.europa.esig.dss.validation.DefaultAdvancedSignature; +import eu.europa.esig.dss.validation.OCSPRef; +import eu.europa.esig.dss.validation.SignatureCryptographicVerification; +import eu.europa.esig.dss.validation.SignatureProductionPlace; +import eu.europa.esig.dss.validation.TimestampInclude; +import eu.europa.esig.dss.validation.TimestampReference; +import eu.europa.esig.dss.validation.TimestampToken; +import eu.europa.esig.dss.x509.ArchiveTimestampType; +import eu.europa.esig.dss.x509.CertificatePool; +import eu.europa.esig.dss.x509.CertificateToken; +import eu.europa.esig.dss.x509.SignatureForm; +import eu.europa.esig.dss.x509.SignaturePolicy; +import eu.europa.esig.dss.x509.TimestampType; +import eu.europa.esig.dss.x509.crl.OfflineCRLSource; +import eu.europa.esig.dss.x509.ocsp.OfflineOCSPSource; /** * Parse an XAdES signature structure. Note that for each signature to be validated a new instance of this object must be created. @@ -1246,7 +1245,7 @@ private void setTimestampCanonicalizationMethod(final Element timestampElement, /* * Returns an unmodifiable list of all certificate tokens encapsulated in the signature * - * @see eu.europa.ec.markt.dss.validation.AdvancedSignature#getCertificates() + * @see eu.europa.esig.dss.validation.AdvancedSignature#getCertificates() */ @Override public List getCertificates() { @@ -1945,7 +1944,7 @@ public List getSignedDataObjectProperties() { * * @param element * @return - * @throws eu.europa.ec.markt.dss.exception.DSSException + * @throws eu.europa.esig.dss.DSSException */ private TimestampReference createCertificateTimestampReference(final Element element) throws DSSException { @@ -2074,7 +2073,7 @@ public CommitmentType getCommitmentTypeIndication() { } /** - * // TODO (11/09/2014): to be deleted, eu.europa.ec.markt.dss.validation102853 .xades.XAdESSignature#getReferences() to be used + * // TODO (11/09/2014): to be deleted, eu.europa.esig.dss.xades.validation.XAdESSignature#getReferences() to be used * * @return */ diff --git a/dss-xades/src/main/java/eu/europa/ec/markt/dss/validation102853/scope/XAdESSignatureScopeFinder.java b/dss-xades/src/main/java/eu/europa/esig/dss/xades/validation/XAdESSignatureScopeFinder.java similarity index 93% rename from dss-xades/src/main/java/eu/europa/ec/markt/dss/validation102853/scope/XAdESSignatureScopeFinder.java rename to dss-xades/src/main/java/eu/europa/esig/dss/xades/validation/XAdESSignatureScopeFinder.java index ae720f3fe5..dac9fe12d1 100644 --- a/dss-xades/src/main/java/eu/europa/ec/markt/dss/validation102853/scope/XAdESSignatureScopeFinder.java +++ b/dss-xades/src/main/java/eu/europa/esig/dss/xades/validation/XAdESSignatureScopeFinder.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.scope; +package eu.europa.esig.dss.xades.validation; import java.util.ArrayList; @@ -34,12 +34,12 @@ import org.w3c.dom.Element; import org.w3c.dom.NodeList; -import eu.europa.ec.markt.dss.DSSXMLUtils; -import eu.europa.ec.markt.dss.XAdESNamespaces; -import eu.europa.ec.markt.dss.signature.validation.scope.SignatureScopeFinder; -import eu.europa.ec.markt.dss.validation102853.toolbox.XPointerResourceResolver; -import eu.europa.ec.markt.dss.validation102853.xades.XAdESSignature; -import eu.europa.ec.markt.dss.validation102853.xades.XPathQueryHolder; +import eu.europa.esig.dss.DSSXMLUtils; +import eu.europa.esig.dss.XAdESNamespaces; +import eu.europa.esig.dss.XPathQueryHolder; +import eu.europa.esig.dss.validation.FullSignatureScope; +import eu.europa.esig.dss.validation.SignatureScope; +import eu.europa.esig.dss.validation.SignatureScopeFinder; /** * diff --git a/dss-xades/src/main/java/eu/europa/ec/markt/dss/validation102853/xades/XMLDocumentValidator.java b/dss-xades/src/main/java/eu/europa/esig/dss/xades/validation/XMLDocumentValidator.java similarity index 92% rename from dss-xades/src/main/java/eu/europa/ec/markt/dss/validation102853/xades/XMLDocumentValidator.java rename to dss-xades/src/main/java/eu/europa/esig/dss/xades/validation/XMLDocumentValidator.java index b36e332fbd..371c3c4829 100644 --- a/dss-xades/src/main/java/eu/europa/ec/markt/dss/validation102853/xades/XMLDocumentValidator.java +++ b/dss-xades/src/main/java/eu/europa/esig/dss/xades/validation/XMLDocumentValidator.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.xades; +package eu.europa.esig.dss.xades.validation; import java.util.ArrayList; import java.util.Arrays; @@ -33,15 +33,15 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.DSSXMLUtils; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.InMemoryDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.validation.AdvancedSignature; -import eu.europa.ec.markt.dss.validation102853.SignedDocumentValidator; -import eu.europa.ec.markt.dss.validation102853.scope.XAdESSignatureScopeFinder; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.DSSXMLUtils; +import eu.europa.esig.dss.InMemoryDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.XPathQueryHolder; +import eu.europa.esig.dss.validation.AdvancedSignature; +import eu.europa.esig.dss.validation.SignedDocumentValidator; /** * Validator of XML Signed document diff --git a/dss-xades/src/main/java/eu/europa/ec/markt/dss/validation102853/toolbox/XPointerResourceResolver.java b/dss-xades/src/main/java/eu/europa/esig/dss/xades/validation/XPointerResourceResolver.java similarity index 99% rename from dss-xades/src/main/java/eu/europa/ec/markt/dss/validation102853/toolbox/XPointerResourceResolver.java rename to dss-xades/src/main/java/eu/europa/esig/dss/xades/validation/XPointerResourceResolver.java index c82a96cc8c..a55d0f2acc 100644 --- a/dss-xades/src/main/java/eu/europa/ec/markt/dss/validation102853/toolbox/XPointerResourceResolver.java +++ b/dss-xades/src/main/java/eu/europa/esig/dss/xades/validation/XPointerResourceResolver.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.toolbox; +package eu.europa.esig.dss.xades.validation; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; diff --git a/dss-xades/src/main/java/eu/europa/ec/markt/dss/validation102853/scope/XPointerSignatureScope.java b/dss-xades/src/main/java/eu/europa/esig/dss/xades/validation/XPointerSignatureScope.java similarity index 93% rename from dss-xades/src/main/java/eu/europa/ec/markt/dss/validation102853/scope/XPointerSignatureScope.java rename to dss-xades/src/main/java/eu/europa/esig/dss/xades/validation/XPointerSignatureScope.java index 08ef7f9e42..7d162614d8 100644 --- a/dss-xades/src/main/java/eu/europa/ec/markt/dss/validation102853/scope/XPointerSignatureScope.java +++ b/dss-xades/src/main/java/eu/europa/esig/dss/xades/validation/XPointerSignatureScope.java @@ -18,7 +18,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.scope; +package eu.europa.esig.dss.xades.validation; + +import eu.europa.esig.dss.validation.SignatureScope; /** * diff --git a/dss-xades/src/main/java/eu/europa/ec/markt/dss/validation102853/scope/XmlElementSignatureScope.java b/dss-xades/src/main/java/eu/europa/esig/dss/xades/validation/XmlElementSignatureScope.java similarity index 95% rename from dss-xades/src/main/java/eu/europa/ec/markt/dss/validation102853/scope/XmlElementSignatureScope.java rename to dss-xades/src/main/java/eu/europa/esig/dss/xades/validation/XmlElementSignatureScope.java index 4dcc18b284..ba90ffd1e0 100644 --- a/dss-xades/src/main/java/eu/europa/ec/markt/dss/validation102853/scope/XmlElementSignatureScope.java +++ b/dss-xades/src/main/java/eu/europa/esig/dss/xades/validation/XmlElementSignatureScope.java @@ -18,10 +18,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.scope; +package eu.europa.esig.dss.xades.validation; import java.util.List; +import eu.europa.esig.dss.validation.SignatureScope; + /** * */ diff --git a/dss-xades/src/main/java/eu/europa/ec/markt/dss/validation102853/scope/XmlRootSignatureScope.java b/dss-xades/src/main/java/eu/europa/esig/dss/xades/validation/XmlRootSignatureScope.java similarity index 96% rename from dss-xades/src/main/java/eu/europa/ec/markt/dss/validation102853/scope/XmlRootSignatureScope.java rename to dss-xades/src/main/java/eu/europa/esig/dss/xades/validation/XmlRootSignatureScope.java index 686997767d..43f989b11a 100644 --- a/dss-xades/src/main/java/eu/europa/ec/markt/dss/validation102853/scope/XmlRootSignatureScope.java +++ b/dss-xades/src/main/java/eu/europa/esig/dss/xades/validation/XmlRootSignatureScope.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.scope; +package eu.europa.esig.dss.xades.validation; import java.util.List; diff --git a/dss-xades/src/test/java/eu/europa/ec/markt/dss/countersignature/XAdESCounterSignatureTest.java b/dss-xades/src/test/java/eu/europa/esig/dss/xades/countersignature/XAdESCounterSignatureTest.java similarity index 80% rename from dss-xades/src/test/java/eu/europa/ec/markt/dss/countersignature/XAdESCounterSignatureTest.java rename to dss-xades/src/test/java/eu/europa/esig/dss/xades/countersignature/XAdESCounterSignatureTest.java index 485280e91b..e9f1687c08 100644 --- a/dss-xades/src/test/java/eu/europa/ec/markt/dss/countersignature/XAdESCounterSignatureTest.java +++ b/dss-xades/src/test/java/eu/europa/esig/dss/xades/countersignature/XAdESCounterSignatureTest.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.countersignature; +package eu.europa.esig.dss.xades.countersignature; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -38,26 +38,26 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; -import eu.europa.ec.markt.dss.DSSXMLUtils; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.mock.MockPrivateKeyEntry; -import eu.europa.ec.markt.dss.mock.MockSignatureTokenConnection; -import eu.europa.ec.markt.dss.parameter.XAdESSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.signature.xades.XAdESService; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.SignedDocumentValidator; -import eu.europa.ec.markt.dss.validation102853.report.DiagnosticData; -import eu.europa.ec.markt.dss.validation102853.report.Reports; -import eu.europa.ec.markt.dss.validation102853.rules.AttributeValue; -import eu.europa.ec.markt.dss.validation102853.xades.XPathQueryHolder; -import eu.europa.ec.markt.dss.validation102853.xml.XmlDom; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DSSXMLUtils; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.XPathQueryHolder; +import eu.europa.esig.dss.XmlDom; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.test.mock.MockPrivateKeyEntry; +import eu.europa.esig.dss.test.mock.MockSignatureTokenConnection; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.SignedDocumentValidator; +import eu.europa.esig.dss.validation.policy.rules.AttributeValue; +import eu.europa.esig.dss.validation.report.DiagnosticData; +import eu.europa.esig.dss.validation.report.Reports; +import eu.europa.esig.dss.xades.XAdESSignatureParameters; +import eu.europa.esig.dss.xades.signature.XAdESService; public class XAdESCounterSignatureTest { diff --git a/dss-xades/src/test/java/eu/europa/ec/markt/dss/extension/xades/AbstractTestXAdESExtension.java b/dss-xades/src/test/java/eu/europa/esig/dss/xades/extension/AbstractTestXAdESExtension.java similarity index 78% rename from dss-xades/src/test/java/eu/europa/ec/markt/dss/extension/xades/AbstractTestXAdESExtension.java rename to dss-xades/src/test/java/eu/europa/esig/dss/xades/extension/AbstractTestXAdESExtension.java index ee1d8feb02..265bf13fc6 100644 --- a/dss-xades/src/test/java/eu/europa/ec/markt/dss/extension/xades/AbstractTestXAdESExtension.java +++ b/dss-xades/src/test/java/eu/europa/esig/dss/xades/extension/AbstractTestXAdESExtension.java @@ -18,24 +18,24 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.extension.xades; +package eu.europa.esig.dss.xades.extension; import java.io.File; import java.util.Date; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.extension.AbstractTestExtension; -import eu.europa.ec.markt.dss.mock.MockTSPSource; -import eu.europa.ec.markt.dss.parameter.XAdESSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.signature.xades.XAdESService; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.extension.AbstractTestExtension; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.test.mock.MockTSPSource; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.xades.XAdESSignatureParameters; +import eu.europa.esig.dss.xades.signature.XAdESService; public abstract class AbstractTestXAdESExtension extends AbstractTestExtension { diff --git a/dss-xades/src/test/java/eu/europa/ec/markt/dss/extension/xades/XAdESExtensionBToLTATest.java b/dss-xades/src/test/java/eu/europa/esig/dss/xades/extension/XAdESExtensionBToLTATest.java similarity index 92% rename from dss-xades/src/test/java/eu/europa/ec/markt/dss/extension/xades/XAdESExtensionBToLTATest.java rename to dss-xades/src/test/java/eu/europa/esig/dss/xades/extension/XAdESExtensionBToLTATest.java index caacdcef36..525cef5681 100644 --- a/dss-xades/src/test/java/eu/europa/ec/markt/dss/extension/xades/XAdESExtensionBToLTATest.java +++ b/dss-xades/src/test/java/eu/europa/esig/dss/xades/extension/XAdESExtensionBToLTATest.java @@ -18,9 +18,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.extension.xades; +package eu.europa.esig.dss.xades.extension; -import eu.europa.ec.markt.dss.signature.SignatureLevel; +import eu.europa.esig.dss.SignatureLevel; public class XAdESExtensionBToLTATest extends AbstractTestXAdESExtension { diff --git a/dss-xades/src/test/java/eu/europa/ec/markt/dss/extension/xades/XAdESExtensionBToLTTest.java b/dss-xades/src/test/java/eu/europa/esig/dss/xades/extension/XAdESExtensionBToLTTest.java similarity index 92% rename from dss-xades/src/test/java/eu/europa/ec/markt/dss/extension/xades/XAdESExtensionBToLTTest.java rename to dss-xades/src/test/java/eu/europa/esig/dss/xades/extension/XAdESExtensionBToLTTest.java index ecb37152cf..57e3009d93 100644 --- a/dss-xades/src/test/java/eu/europa/ec/markt/dss/extension/xades/XAdESExtensionBToLTTest.java +++ b/dss-xades/src/test/java/eu/europa/esig/dss/xades/extension/XAdESExtensionBToLTTest.java @@ -18,9 +18,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.extension.xades; +package eu.europa.esig.dss.xades.extension; -import eu.europa.ec.markt.dss.signature.SignatureLevel; +import eu.europa.esig.dss.SignatureLevel; public class XAdESExtensionBToLTTest extends AbstractTestXAdESExtension { diff --git a/dss-xades/src/test/java/eu/europa/ec/markt/dss/extension/xades/XAdESExtensionBToTTest.java b/dss-xades/src/test/java/eu/europa/esig/dss/xades/extension/XAdESExtensionBToTTest.java similarity index 92% rename from dss-xades/src/test/java/eu/europa/ec/markt/dss/extension/xades/XAdESExtensionBToTTest.java rename to dss-xades/src/test/java/eu/europa/esig/dss/xades/extension/XAdESExtensionBToTTest.java index 2b91999a7b..91778ad5c2 100644 --- a/dss-xades/src/test/java/eu/europa/ec/markt/dss/extension/xades/XAdESExtensionBToTTest.java +++ b/dss-xades/src/test/java/eu/europa/esig/dss/xades/extension/XAdESExtensionBToTTest.java @@ -18,9 +18,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.extension.xades; +package eu.europa.esig.dss.xades.extension; -import eu.europa.ec.markt.dss.signature.SignatureLevel; +import eu.europa.esig.dss.SignatureLevel; public class XAdESExtensionBToTTest extends AbstractTestXAdESExtension { diff --git a/dss-xades/src/test/java/eu/europa/ec/markt/dss/extension/xades/XAdESExtensionLTToLTATest.java b/dss-xades/src/test/java/eu/europa/esig/dss/xades/extension/XAdESExtensionLTToLTATest.java similarity index 92% rename from dss-xades/src/test/java/eu/europa/ec/markt/dss/extension/xades/XAdESExtensionLTToLTATest.java rename to dss-xades/src/test/java/eu/europa/esig/dss/xades/extension/XAdESExtensionLTToLTATest.java index 7ede51a613..5f83e37d01 100644 --- a/dss-xades/src/test/java/eu/europa/ec/markt/dss/extension/xades/XAdESExtensionLTToLTATest.java +++ b/dss-xades/src/test/java/eu/europa/esig/dss/xades/extension/XAdESExtensionLTToLTATest.java @@ -18,9 +18,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.extension.xades; +package eu.europa.esig.dss.xades.extension; -import eu.europa.ec.markt.dss.signature.SignatureLevel; +import eu.europa.esig.dss.SignatureLevel; public class XAdESExtensionLTToLTATest extends AbstractTestXAdESExtension { diff --git a/dss-xades/src/test/java/eu/europa/ec/markt/dss/extension/xades/XAdESExtensionTToLTATest.java b/dss-xades/src/test/java/eu/europa/esig/dss/xades/extension/XAdESExtensionTToLTATest.java similarity index 92% rename from dss-xades/src/test/java/eu/europa/ec/markt/dss/extension/xades/XAdESExtensionTToLTATest.java rename to dss-xades/src/test/java/eu/europa/esig/dss/xades/extension/XAdESExtensionTToLTATest.java index a21fd2ba29..ef41ba88f4 100644 --- a/dss-xades/src/test/java/eu/europa/ec/markt/dss/extension/xades/XAdESExtensionTToLTATest.java +++ b/dss-xades/src/test/java/eu/europa/esig/dss/xades/extension/XAdESExtensionTToLTATest.java @@ -18,9 +18,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.extension.xades; +package eu.europa.esig.dss.xades.extension; -import eu.europa.ec.markt.dss.signature.SignatureLevel; +import eu.europa.esig.dss.SignatureLevel; public class XAdESExtensionTToLTATest extends AbstractTestXAdESExtension { diff --git a/dss-xades/src/test/java/eu/europa/ec/markt/dss/extension/xades/XAdESExtensionTToLTTest.java b/dss-xades/src/test/java/eu/europa/esig/dss/xades/extension/XAdESExtensionTToLTTest.java similarity index 92% rename from dss-xades/src/test/java/eu/europa/ec/markt/dss/extension/xades/XAdESExtensionTToLTTest.java rename to dss-xades/src/test/java/eu/europa/esig/dss/xades/extension/XAdESExtensionTToLTTest.java index 9fcdcb67e5..13c962199e 100644 --- a/dss-xades/src/test/java/eu/europa/ec/markt/dss/extension/xades/XAdESExtensionTToLTTest.java +++ b/dss-xades/src/test/java/eu/europa/esig/dss/xades/extension/XAdESExtensionTToLTTest.java @@ -18,9 +18,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.extension.xades; +package eu.europa.esig.dss.xades.extension; -import eu.europa.ec.markt.dss.signature.SignatureLevel; +import eu.europa.esig.dss.SignatureLevel; public class XAdESExtensionTToLTTest extends AbstractTestXAdESExtension { diff --git a/dss-xades/src/test/java/eu/europa/ec/markt/dss/signature/xades/XAdESDoubleSignatureTest.java b/dss-xades/src/test/java/eu/europa/esig/dss/xades/signature/XAdESDoubleSignatureTest.java similarity index 81% rename from dss-xades/src/test/java/eu/europa/ec/markt/dss/signature/xades/XAdESDoubleSignatureTest.java rename to dss-xades/src/test/java/eu/europa/esig/dss/xades/signature/XAdESDoubleSignatureTest.java index dfe229d28f..5c21b0ca08 100644 --- a/dss-xades/src/test/java/eu/europa/ec/markt/dss/signature/xades/XAdESDoubleSignatureTest.java +++ b/dss-xades/src/test/java/eu/europa/esig/dss/xades/signature/XAdESDoubleSignatureTest.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.xades; +package eu.europa.esig.dss.xades.signature; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -33,19 +33,20 @@ import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.parameter.XAdESSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.utils.TestUtils; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.SignedDocumentValidator; -import eu.europa.ec.markt.dss.validation102853.report.DiagnosticData; -import eu.europa.ec.markt.dss.validation102853.report.Reports; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.TestUtils; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.SignedDocumentValidator; +import eu.europa.esig.dss.validation.report.DiagnosticData; +import eu.europa.esig.dss.validation.report.Reports; +import eu.europa.esig.dss.xades.XAdESSignatureParameters; +import eu.europa.esig.dss.xades.signature.XAdESService; @RunWith(Parameterized.class) public class XAdESDoubleSignatureTest { diff --git a/dss-xades/src/test/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelATest.java b/dss-xades/src/test/java/eu/europa/esig/dss/xades/signature/XAdESLevelATest.java similarity index 76% rename from dss-xades/src/test/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelATest.java rename to dss-xades/src/test/java/eu/europa/esig/dss/xades/signature/XAdESLevelATest.java index 2f2c7dede5..44612a1d17 100644 --- a/dss-xades/src/test/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelATest.java +++ b/dss-xades/src/test/java/eu/europa/esig/dss/xades/signature/XAdESLevelATest.java @@ -18,27 +18,28 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.xades; +package eu.europa.esig.dss.xades.signature; import java.io.File; import java.util.Date; import org.junit.Before; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.mock.MockTSPSource; -import eu.europa.ec.markt.dss.parameter.XAdESSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.AbstractTestSignature; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.signature.AbstractTestSignature; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.test.mock.MockTSPSource; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.xades.XAdESSignatureParameters; +import eu.europa.esig.dss.xades.signature.XAdESService; public class XAdESLevelATest extends AbstractTestSignature { diff --git a/dss-xades/src/test/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelBDetachedInclusiveCanonicalizationTest.java b/dss-xades/src/test/java/eu/europa/esig/dss/xades/signature/XAdESLevelBDetachedInclusiveCanonicalizationTest.java similarity index 77% rename from dss-xades/src/test/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelBDetachedInclusiveCanonicalizationTest.java rename to dss-xades/src/test/java/eu/europa/esig/dss/xades/signature/XAdESLevelBDetachedInclusiveCanonicalizationTest.java index 13ecf1d0b2..4f86511275 100644 --- a/dss-xades/src/test/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelBDetachedInclusiveCanonicalizationTest.java +++ b/dss-xades/src/test/java/eu/europa/esig/dss/xades/signature/XAdESLevelBDetachedInclusiveCanonicalizationTest.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.xades; +package eu.europa.esig.dss.xades.signature; import java.io.File; import java.util.ArrayList; @@ -29,22 +29,23 @@ import org.junit.Before; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.parameter.AbstractSignatureParameters; -import eu.europa.ec.markt.dss.parameter.XAdESSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.AbstractTestSignature; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.SignedDocumentValidator; -import eu.europa.ec.markt.dss.validation102853.report.Reports; +import eu.europa.esig.dss.AbstractSignatureParameters; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.signature.AbstractTestSignature; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.SignedDocumentValidator; +import eu.europa.esig.dss.validation.report.Reports; +import eu.europa.esig.dss.xades.XAdESSignatureParameters; +import eu.europa.esig.dss.xades.signature.XAdESService; public class XAdESLevelBDetachedInclusiveCanonicalizationTest extends AbstractTestSignature { diff --git a/dss-xades/src/test/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelBDetachedTest.java b/dss-xades/src/test/java/eu/europa/esig/dss/xades/signature/XAdESLevelBDetachedTest.java similarity index 77% rename from dss-xades/src/test/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelBDetachedTest.java rename to dss-xades/src/test/java/eu/europa/esig/dss/xades/signature/XAdESLevelBDetachedTest.java index e08897da04..a8bd116e06 100644 --- a/dss-xades/src/test/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelBDetachedTest.java +++ b/dss-xades/src/test/java/eu/europa/esig/dss/xades/signature/XAdESLevelBDetachedTest.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.xades; +package eu.europa.esig.dss.xades.signature; import java.io.File; import java.util.ArrayList; @@ -27,21 +27,22 @@ import org.junit.Before; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.parameter.XAdESSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.AbstractTestSignature; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.SignedDocumentValidator; -import eu.europa.ec.markt.dss.validation102853.report.Reports; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.signature.AbstractTestSignature; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.SignedDocumentValidator; +import eu.europa.esig.dss.validation.report.Reports; +import eu.europa.esig.dss.xades.XAdESSignatureParameters; +import eu.europa.esig.dss.xades.signature.XAdESService; public class XAdESLevelBDetachedTest extends AbstractTestSignature { diff --git a/dss-xades/src/test/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelBEnvelopedInclusiveCanonicalizationTest.java b/dss-xades/src/test/java/eu/europa/esig/dss/xades/signature/XAdESLevelBEnvelopedInclusiveCanonicalizationTest.java similarity index 77% rename from dss-xades/src/test/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelBEnvelopedInclusiveCanonicalizationTest.java rename to dss-xades/src/test/java/eu/europa/esig/dss/xades/signature/XAdESLevelBEnvelopedInclusiveCanonicalizationTest.java index 181c4f0cc8..31c660301e 100644 --- a/dss-xades/src/test/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelBEnvelopedInclusiveCanonicalizationTest.java +++ b/dss-xades/src/test/java/eu/europa/esig/dss/xades/signature/XAdESLevelBEnvelopedInclusiveCanonicalizationTest.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.xades; +package eu.europa.esig.dss.xades.signature; import java.io.File; import java.util.Date; @@ -27,20 +27,21 @@ import org.junit.Before; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.parameter.AbstractSignatureParameters; -import eu.europa.ec.markt.dss.parameter.XAdESSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.AbstractTestSignature; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; +import eu.europa.esig.dss.AbstractSignatureParameters; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.signature.AbstractTestSignature; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.xades.XAdESSignatureParameters; +import eu.europa.esig.dss.xades.signature.XAdESService; public class XAdESLevelBEnvelopedInclusiveCanonicalizationTest extends AbstractTestSignature { diff --git a/dss-xades/src/test/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelBEnvelopedInclusiveCanonicalizationWithXPathTest.java b/dss-xades/src/test/java/eu/europa/esig/dss/xades/signature/XAdESLevelBEnvelopedInclusiveCanonicalizationWithXPathTest.java similarity index 77% rename from dss-xades/src/test/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelBEnvelopedInclusiveCanonicalizationWithXPathTest.java rename to dss-xades/src/test/java/eu/europa/esig/dss/xades/signature/XAdESLevelBEnvelopedInclusiveCanonicalizationWithXPathTest.java index fac4f53ce6..8684254976 100644 --- a/dss-xades/src/test/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelBEnvelopedInclusiveCanonicalizationWithXPathTest.java +++ b/dss-xades/src/test/java/eu/europa/esig/dss/xades/signature/XAdESLevelBEnvelopedInclusiveCanonicalizationWithXPathTest.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.xades; +package eu.europa.esig.dss.xades.signature; import java.io.File; import java.util.Date; @@ -27,20 +27,21 @@ import org.junit.Before; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.parameter.AbstractSignatureParameters; -import eu.europa.ec.markt.dss.parameter.XAdESSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.AbstractTestSignature; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; +import eu.europa.esig.dss.AbstractSignatureParameters; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.signature.AbstractTestSignature; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.xades.XAdESSignatureParameters; +import eu.europa.esig.dss.xades.signature.XAdESService; public class XAdESLevelBEnvelopedInclusiveCanonicalizationWithXPathTest extends AbstractTestSignature { diff --git a/dss-xades/src/test/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelBEnvelopedTest.java b/dss-xades/src/test/java/eu/europa/esig/dss/xades/signature/XAdESLevelBEnvelopedTest.java similarity index 76% rename from dss-xades/src/test/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelBEnvelopedTest.java rename to dss-xades/src/test/java/eu/europa/esig/dss/xades/signature/XAdESLevelBEnvelopedTest.java index 88132aa94b..473b12c90f 100644 --- a/dss-xades/src/test/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelBEnvelopedTest.java +++ b/dss-xades/src/test/java/eu/europa/esig/dss/xades/signature/XAdESLevelBEnvelopedTest.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.xades; +package eu.europa.esig.dss.xades.signature; import java.io.File; import java.util.Date; @@ -26,20 +26,21 @@ import org.apache.xml.security.utils.Base64; import org.junit.Before; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.parameter.AbstractSignatureParameters; -import eu.europa.ec.markt.dss.parameter.XAdESSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.AbstractTestSignature; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; +import eu.europa.esig.dss.AbstractSignatureParameters; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.signature.AbstractTestSignature; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.xades.XAdESSignatureParameters; +import eu.europa.esig.dss.xades.signature.XAdESService; public class XAdESLevelBEnvelopedTest extends AbstractTestSignature { diff --git a/dss-xades/src/test/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelBEnvelopedWithXPathTest.java b/dss-xades/src/test/java/eu/europa/esig/dss/xades/signature/XAdESLevelBEnvelopedWithXPathTest.java similarity index 76% rename from dss-xades/src/test/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelBEnvelopedWithXPathTest.java rename to dss-xades/src/test/java/eu/europa/esig/dss/xades/signature/XAdESLevelBEnvelopedWithXPathTest.java index f52b8ec0c0..712c75c59b 100644 --- a/dss-xades/src/test/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelBEnvelopedWithXPathTest.java +++ b/dss-xades/src/test/java/eu/europa/esig/dss/xades/signature/XAdESLevelBEnvelopedWithXPathTest.java @@ -18,27 +18,28 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.xades; +package eu.europa.esig.dss.xades.signature; import java.io.File; import java.util.Date; import org.junit.Before; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.parameter.AbstractSignatureParameters; -import eu.europa.ec.markt.dss.parameter.XAdESSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.AbstractTestSignature; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; +import eu.europa.esig.dss.AbstractSignatureParameters; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.signature.AbstractTestSignature; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.xades.XAdESSignatureParameters; +import eu.europa.esig.dss.xades.signature.XAdESService; public class XAdESLevelBEnvelopedWithXPathTest extends AbstractTestSignature { diff --git a/dss-xades/src/test/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelBInclusiveCanonicalizationTest.java b/dss-xades/src/test/java/eu/europa/esig/dss/xades/signature/XAdESLevelBInclusiveCanonicalizationTest.java similarity index 77% rename from dss-xades/src/test/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelBInclusiveCanonicalizationTest.java rename to dss-xades/src/test/java/eu/europa/esig/dss/xades/signature/XAdESLevelBInclusiveCanonicalizationTest.java index 2f7497707a..dac6f8ac51 100644 --- a/dss-xades/src/test/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelBInclusiveCanonicalizationTest.java +++ b/dss-xades/src/test/java/eu/europa/esig/dss/xades/signature/XAdESLevelBInclusiveCanonicalizationTest.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.xades; +package eu.europa.esig.dss.xades.signature; import java.io.File; import java.util.Date; @@ -27,20 +27,21 @@ import org.junit.Before; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.parameter.AbstractSignatureParameters; -import eu.europa.ec.markt.dss.parameter.XAdESSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.AbstractTestSignature; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; +import eu.europa.esig.dss.AbstractSignatureParameters; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.signature.AbstractTestSignature; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.xades.XAdESSignatureParameters; +import eu.europa.esig.dss.xades.signature.XAdESService; public class XAdESLevelBInclusiveCanonicalizationTest extends AbstractTestSignature { diff --git a/dss-xades/src/test/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelBTest.java b/dss-xades/src/test/java/eu/europa/esig/dss/xades/signature/XAdESLevelBTest.java similarity index 78% rename from dss-xades/src/test/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelBTest.java rename to dss-xades/src/test/java/eu/europa/esig/dss/xades/signature/XAdESLevelBTest.java index 35ab19ae02..ee9f3c3b00 100644 --- a/dss-xades/src/test/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelBTest.java +++ b/dss-xades/src/test/java/eu/europa/esig/dss/xades/signature/XAdESLevelBTest.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.xades; +package eu.europa.esig.dss.xades.signature; import java.io.File; import java.util.Date; @@ -27,19 +27,20 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.parameter.XAdESSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.AbstractTestSignature; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.signature.AbstractTestSignature; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.xades.XAdESSignatureParameters; +import eu.europa.esig.dss.xades.signature.XAdESService; public class XAdESLevelBTest extends AbstractTestSignature { diff --git a/dss-xades/src/test/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelBWithMockCrlTest.java b/dss-xades/src/test/java/eu/europa/esig/dss/xades/signature/XAdESLevelBWithMockCrlTest.java similarity index 77% rename from dss-xades/src/test/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelBWithMockCrlTest.java rename to dss-xades/src/test/java/eu/europa/esig/dss/xades/signature/XAdESLevelBWithMockCrlTest.java index 134498e49f..6dce000fc0 100644 --- a/dss-xades/src/test/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelBWithMockCrlTest.java +++ b/dss-xades/src/test/java/eu/europa/esig/dss/xades/signature/XAdESLevelBWithMockCrlTest.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.xades; +package eu.europa.esig.dss.xades.signature; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -30,26 +30,27 @@ import org.bouncycastle.asn1.x509.CRLReason; import org.junit.Before; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.mock.MockCRLSource; -import eu.europa.ec.markt.dss.parameter.AbstractSignatureParameters; -import eu.europa.ec.markt.dss.parameter.XAdESSignatureParameters; -import eu.europa.ec.markt.dss.service.CRLGenerator; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.AbstractTestSignature; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.SignedDocumentValidator; -import eu.europa.ec.markt.dss.validation102853.crl.CRLReasonEnum; -import eu.europa.ec.markt.dss.validation102853.report.DiagnosticData; -import eu.europa.ec.markt.dss.validation102853.report.Reports; +import eu.europa.esig.dss.AbstractSignatureParameters; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.signature.AbstractTestSignature; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.gen.CRLGenerator; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.test.mock.MockCRLSource; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.SignedDocumentValidator; +import eu.europa.esig.dss.validation.report.DiagnosticData; +import eu.europa.esig.dss.validation.report.Reports; +import eu.europa.esig.dss.x509.crl.CRLReasonEnum; +import eu.europa.esig.dss.xades.XAdESSignatureParameters; +import eu.europa.esig.dss.xades.signature.XAdESService; public class XAdESLevelBWithMockCrlTest extends AbstractTestSignature { diff --git a/dss-xades/src/test/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelBWithPolicyTest.java b/dss-xades/src/test/java/eu/europa/esig/dss/xades/signature/XAdESLevelBWithPolicyTest.java similarity index 79% rename from dss-xades/src/test/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelBWithPolicyTest.java rename to dss-xades/src/test/java/eu/europa/esig/dss/xades/signature/XAdESLevelBWithPolicyTest.java index 64a7862c67..9091812fe2 100644 --- a/dss-xades/src/test/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelBWithPolicyTest.java +++ b/dss-xades/src/test/java/eu/europa/esig/dss/xades/signature/XAdESLevelBWithPolicyTest.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.xades; +package eu.europa.esig.dss.xades.signature; import static org.junit.Assert.assertTrue; @@ -29,21 +29,22 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.parameter.Policy; -import eu.europa.ec.markt.dss.parameter.XAdESSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.AbstractTestSignature; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.Policy; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.signature.AbstractTestSignature; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.xades.XAdESSignatureParameters; +import eu.europa.esig.dss.xades.signature.XAdESService; public class XAdESLevelBWithPolicyTest extends AbstractTestSignature { diff --git a/dss-xades/src/test/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelCTest.java b/dss-xades/src/test/java/eu/europa/esig/dss/xades/signature/XAdESLevelCTest.java similarity index 76% rename from dss-xades/src/test/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelCTest.java rename to dss-xades/src/test/java/eu/europa/esig/dss/xades/signature/XAdESLevelCTest.java index 9f11407d06..a5b70dd990 100644 --- a/dss-xades/src/test/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelCTest.java +++ b/dss-xades/src/test/java/eu/europa/esig/dss/xades/signature/XAdESLevelCTest.java @@ -18,27 +18,28 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.xades; +package eu.europa.esig.dss.xades.signature; import java.io.File; import java.util.Date; import org.junit.Before; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.mock.MockTSPSource; -import eu.europa.ec.markt.dss.parameter.XAdESSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.AbstractTestSignature; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.signature.AbstractTestSignature; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.test.mock.MockTSPSource; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.xades.XAdESSignatureParameters; +import eu.europa.esig.dss.xades.signature.XAdESService; public class XAdESLevelCTest extends AbstractTestSignature { diff --git a/dss-xades/src/test/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelLTTest.java b/dss-xades/src/test/java/eu/europa/esig/dss/xades/signature/XAdESLevelLTTest.java similarity index 75% rename from dss-xades/src/test/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelLTTest.java rename to dss-xades/src/test/java/eu/europa/esig/dss/xades/signature/XAdESLevelLTTest.java index dc262594f0..77aea29467 100644 --- a/dss-xades/src/test/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelLTTest.java +++ b/dss-xades/src/test/java/eu/europa/esig/dss/xades/signature/XAdESLevelLTTest.java @@ -18,28 +18,29 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.xades; +package eu.europa.esig.dss.xades.signature; import java.io.File; import java.util.Date; import org.junit.Before; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.mock.MockTSPSource; -import eu.europa.ec.markt.dss.parameter.AbstractSignatureParameters; -import eu.europa.ec.markt.dss.parameter.XAdESSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.AbstractTestSignature; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; +import eu.europa.esig.dss.AbstractSignatureParameters; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.signature.AbstractTestSignature; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.test.mock.MockTSPSource; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.xades.XAdESSignatureParameters; +import eu.europa.esig.dss.xades.signature.XAdESService; public class XAdESLevelLTTest extends AbstractTestSignature { diff --git a/dss-xades/src/test/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelTTest.java b/dss-xades/src/test/java/eu/europa/esig/dss/xades/signature/XAdESLevelTTest.java similarity index 75% rename from dss-xades/src/test/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelTTest.java rename to dss-xades/src/test/java/eu/europa/esig/dss/xades/signature/XAdESLevelTTest.java index abd7d3a962..0d495cf0a9 100644 --- a/dss-xades/src/test/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelTTest.java +++ b/dss-xades/src/test/java/eu/europa/esig/dss/xades/signature/XAdESLevelTTest.java @@ -18,28 +18,29 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.xades; +package eu.europa.esig.dss.xades.signature; import java.io.File; import java.util.Date; import org.junit.Before; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.mock.MockTSPSource; -import eu.europa.ec.markt.dss.parameter.AbstractSignatureParameters; -import eu.europa.ec.markt.dss.parameter.XAdESSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.AbstractTestSignature; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; +import eu.europa.esig.dss.AbstractSignatureParameters; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.signature.AbstractTestSignature; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.test.mock.MockTSPSource; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.xades.XAdESSignatureParameters; +import eu.europa.esig.dss.xades.signature.XAdESService; public class XAdESLevelTTest extends AbstractTestSignature { diff --git a/dss-xades/src/test/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelXTest.java b/dss-xades/src/test/java/eu/europa/esig/dss/xades/signature/XAdESLevelXTest.java similarity index 75% rename from dss-xades/src/test/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelXTest.java rename to dss-xades/src/test/java/eu/europa/esig/dss/xades/signature/XAdESLevelXTest.java index 18eff7b251..7eeb760724 100644 --- a/dss-xades/src/test/java/eu/europa/ec/markt/dss/signature/xades/XAdESLevelXTest.java +++ b/dss-xades/src/test/java/eu/europa/esig/dss/xades/signature/XAdESLevelXTest.java @@ -18,28 +18,29 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.signature.xades; +package eu.europa.esig.dss.xades.signature; import java.io.File; import java.util.Date; import org.junit.Before; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.mock.MockTSPSource; -import eu.europa.ec.markt.dss.parameter.AbstractSignatureParameters; -import eu.europa.ec.markt.dss.parameter.XAdESSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.AbstractTestSignature; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; +import eu.europa.esig.dss.AbstractSignatureParameters; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.signature.AbstractTestSignature; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.test.mock.MockTSPSource; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.xades.XAdESSignatureParameters; +import eu.europa.esig.dss.xades.signature.XAdESService; public class XAdESLevelXTest extends AbstractTestSignature { diff --git a/dss-xades/src/test/java/eu/europa/ec/markt/dss/validation/SignedDocumentValidatorForDocumentTest.java b/dss-xades/src/test/java/eu/europa/esig/dss/xades/validation/SignedDocumentValidatorForDocumentTest.java similarity index 82% rename from dss-xades/src/test/java/eu/europa/ec/markt/dss/validation/SignedDocumentValidatorForDocumentTest.java rename to dss-xades/src/test/java/eu/europa/esig/dss/xades/validation/SignedDocumentValidatorForDocumentTest.java index 54de8d57af..e37821ed02 100644 --- a/dss-xades/src/test/java/eu/europa/ec/markt/dss/validation/SignedDocumentValidatorForDocumentTest.java +++ b/dss-xades/src/test/java/eu/europa/esig/dss/xades/validation/SignedDocumentValidatorForDocumentTest.java @@ -1,4 +1,4 @@ -package eu.europa.ec.markt.dss.validation; +package eu.europa.esig.dss.xades.validation; import static org.junit.Assert.assertTrue; @@ -9,11 +9,11 @@ import org.apache.commons.io.IOUtils; import org.junit.Test; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.signature.InMemoryDocument; -import eu.europa.ec.markt.dss.validation102853.SignedDocumentValidator; -import eu.europa.ec.markt.dss.validation102853.xades.XMLDocumentValidator; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.InMemoryDocument; +import eu.europa.esig.dss.validation.SignedDocumentValidator; +import eu.europa.esig.dss.xades.validation.XMLDocumentValidator; public class SignedDocumentValidatorForDocumentTest { diff --git a/dss-xades/src/test/java/eu/europa/ec/markt/dss/validation/SignedPropertiesNotCheckedTest.java b/dss-xades/src/test/java/eu/europa/esig/dss/xades/validation/SignedPropertiesNotCheckedTest.java similarity index 83% rename from dss-xades/src/test/java/eu/europa/ec/markt/dss/validation/SignedPropertiesNotCheckedTest.java rename to dss-xades/src/test/java/eu/europa/esig/dss/xades/validation/SignedPropertiesNotCheckedTest.java index 6575f0dbce..f02be0d42e 100644 --- a/dss-xades/src/test/java/eu/europa/ec/markt/dss/validation/SignedPropertiesNotCheckedTest.java +++ b/dss-xades/src/test/java/eu/europa/esig/dss/xades/validation/SignedPropertiesNotCheckedTest.java @@ -18,18 +18,18 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation; +package eu.europa.esig.dss.xades.validation; import static org.junit.Assert.assertTrue; import org.junit.Test; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.SignedDocumentValidator; -import eu.europa.ec.markt.dss.validation102853.report.DiagnosticData; -import eu.europa.ec.markt.dss.validation102853.report.Reports; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.SignedDocumentValidator; +import eu.europa.esig.dss.validation.report.DiagnosticData; +import eu.europa.esig.dss.validation.report.Reports; /** * Unit test added to fix : https://joinup.ec.europa.eu/asset/sd-dss/issue/xades-signedproperties-reference diff --git a/dss-xades/src/test/java/known/issues/DSS631/XAdESLevelLTATest.java b/dss-xades/src/test/java/known/issues/DSS631/XAdESLevelLTATest.java index 59d5913b59..a96f06ca7f 100644 --- a/dss-xades/src/test/java/known/issues/DSS631/XAdESLevelLTATest.java +++ b/dss-xades/src/test/java/known/issues/DSS631/XAdESLevelLTATest.java @@ -25,22 +25,22 @@ import org.junit.Before; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.mock.MockTSPSource; -import eu.europa.ec.markt.dss.parameter.AbstractSignatureParameters; -import eu.europa.ec.markt.dss.parameter.XAdESSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.AbstractTestSignature; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.signature.xades.XAdESService; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; +import eu.europa.esig.dss.AbstractSignatureParameters; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.signature.AbstractTestSignature; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.test.mock.MockTSPSource; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.xades.XAdESSignatureParameters; +import eu.europa.esig.dss.xades.signature.XAdESService; public class XAdESLevelLTATest extends AbstractTestSignature { diff --git a/dss-xades/src/test/java/known/issues/DSS631/XAdESLevelXLTest.java b/dss-xades/src/test/java/known/issues/DSS631/XAdESLevelXLTest.java index bfeadb2b2b..98da542bc7 100644 --- a/dss-xades/src/test/java/known/issues/DSS631/XAdESLevelXLTest.java +++ b/dss-xades/src/test/java/known/issues/DSS631/XAdESLevelXLTest.java @@ -25,22 +25,22 @@ import org.junit.Before; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.mock.MockTSPSource; -import eu.europa.ec.markt.dss.parameter.AbstractSignatureParameters; -import eu.europa.ec.markt.dss.parameter.XAdESSignatureParameters; -import eu.europa.ec.markt.dss.service.CertificateService; -import eu.europa.ec.markt.dss.signature.AbstractTestSignature; -import eu.europa.ec.markt.dss.signature.DSSDocument; -import eu.europa.ec.markt.dss.signature.DocumentSignatureService; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.signature.MimeType; -import eu.europa.ec.markt.dss.signature.SignatureLevel; -import eu.europa.ec.markt.dss.signature.SignaturePackaging; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.signature.xades.XAdESService; -import eu.europa.ec.markt.dss.validation102853.CertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; +import eu.europa.esig.dss.AbstractSignatureParameters; +import eu.europa.esig.dss.DSSDocument; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.MimeType; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureLevel; +import eu.europa.esig.dss.signature.AbstractTestSignature; +import eu.europa.esig.dss.signature.DocumentSignatureService; +import eu.europa.esig.dss.signature.SignaturePackaging; +import eu.europa.esig.dss.test.gen.CertificateService; +import eu.europa.esig.dss.test.mock.MockTSPSource; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.validation.CertificateVerifier; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.xades.XAdESSignatureParameters; +import eu.europa.esig.dss.xades.signature.XAdESService; public class XAdESLevelXLTest extends AbstractTestSignature { diff --git a/dss-xades/src/test/java/plugtests/ETSISamplesValidationTest.java b/dss-xades/src/test/java/plugtests/ETSISamplesValidationTest.java index 55dff5ab7a..ba08743541 100644 --- a/dss-xades/src/test/java/plugtests/ETSISamplesValidationTest.java +++ b/dss-xades/src/test/java/plugtests/ETSISamplesValidationTest.java @@ -12,13 +12,13 @@ import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -import eu.europa.ec.markt.dss.signature.FileDocument; -import eu.europa.ec.markt.dss.validation102853.CommonCertificateVerifier; -import eu.europa.ec.markt.dss.validation102853.SignedDocumentValidator; -import eu.europa.ec.markt.dss.validation102853.report.DetailedReport; -import eu.europa.ec.markt.dss.validation102853.report.DiagnosticData; -import eu.europa.ec.markt.dss.validation102853.report.Reports; -import eu.europa.ec.markt.dss.validation102853.report.SimpleReport; +import eu.europa.esig.dss.FileDocument; +import eu.europa.esig.dss.validation.CommonCertificateVerifier; +import eu.europa.esig.dss.validation.SignedDocumentValidator; +import eu.europa.esig.dss.validation.report.DetailedReport; +import eu.europa.esig.dss.validation.report.DiagnosticData; +import eu.europa.esig.dss.validation.report.Reports; +import eu.europa.esig.dss.validation.report.SimpleReport; /** * This test is only to ensure that we don't have exception with valid? files diff --git a/sscd-mocca-adapter/src/main/java/eu/europa/ec/markt/dss/mocca/MOCCAPrivateKeyEntry.java b/sscd-mocca-adapter/src/main/java/eu/europa/esig/dss/token/mocca/MOCCAPrivateKeyEntry.java similarity index 91% rename from sscd-mocca-adapter/src/main/java/eu/europa/ec/markt/dss/mocca/MOCCAPrivateKeyEntry.java rename to sscd-mocca-adapter/src/main/java/eu/europa/esig/dss/token/mocca/MOCCAPrivateKeyEntry.java index 8aea58e4be..dd9136895d 100644 --- a/sscd-mocca-adapter/src/main/java/eu/europa/ec/markt/dss/mocca/MOCCAPrivateKeyEntry.java +++ b/sscd-mocca-adapter/src/main/java/eu/europa/esig/dss/token/mocca/MOCCAPrivateKeyEntry.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.mocca; +package eu.europa.esig.dss.token.mocca; import java.security.PrivateKey; import java.security.cert.CertificateException; @@ -27,12 +27,12 @@ import org.slf4j.LoggerFactory; import at.gv.egiz.smcc.SignatureCard.KeyboxName; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.EncryptionAlgorithm; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.exception.DSSNotApplicableMethodException; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.validation102853.CertificateToken; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSNotApplicableMethodException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.EncryptionAlgorithm; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.x509.CertificateToken; /** * A DSSPrivateKeyEntry implementation for the MOCCA framework diff --git a/sscd-mocca-adapter/src/main/java/eu/europa/ec/markt/dss/mocca/MOCCASignatureTokenConnection.java b/sscd-mocca-adapter/src/main/java/eu/europa/esig/dss/token/mocca/MOCCASignatureTokenConnection.java similarity index 92% rename from sscd-mocca-adapter/src/main/java/eu/europa/ec/markt/dss/mocca/MOCCASignatureTokenConnection.java rename to sscd-mocca-adapter/src/main/java/eu/europa/esig/dss/token/mocca/MOCCASignatureTokenConnection.java index e7ba1dc4f4..afa4946fa0 100644 --- a/sscd-mocca-adapter/src/main/java/eu/europa/ec/markt/dss/mocca/MOCCASignatureTokenConnection.java +++ b/sscd-mocca-adapter/src/main/java/eu/europa/esig/dss/token/mocca/MOCCASignatureTokenConnection.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.mocca; +package eu.europa.esig.dss.token.mocca; import java.io.ByteArrayInputStream; import java.io.InputStream; @@ -41,16 +41,16 @@ import at.gv.egiz.smcc.SignatureCard.KeyboxName; import at.gv.egiz.smcc.SignatureCardFactory; import at.gv.egiz.smcc.util.SmartCardIO; -import eu.europa.ec.markt.dss.DSSASN1Utils; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.EncryptionAlgorithm; -import eu.europa.ec.markt.dss.SignatureAlgorithm; -import eu.europa.ec.markt.dss.SignatureValue; -import eu.europa.ec.markt.dss.ToBeSigned; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.signature.token.DSSPrivateKeyEntry; -import eu.europa.ec.markt.dss.signature.token.PasswordInputCallback; -import eu.europa.ec.markt.dss.signature.token.SignatureTokenConnection; +import eu.europa.esig.dss.DSSASN1Utils; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.EncryptionAlgorithm; +import eu.europa.esig.dss.SignatureAlgorithm; +import eu.europa.esig.dss.SignatureValue; +import eu.europa.esig.dss.ToBeSigned; +import eu.europa.esig.dss.token.DSSPrivateKeyEntry; +import eu.europa.esig.dss.token.PasswordInputCallback; +import eu.europa.esig.dss.token.SignatureTokenConnection; /** * @@ -215,7 +215,7 @@ public byte[] sign(byte[] bytes, DigestAlgorithm digestAlgo, DSSPrivateKeyEntry * * @param signedStream * @return - * @throws eu.europa.ec.markt.dss.exception.DSSException + * @throws eu.europa.esig.dss.DSSException */ private static byte[] encode(byte[] signedStream) throws DSSException { diff --git a/sscd-mocca-adapter/src/main/java/eu/europa/ec/markt/dss/mocca/PINGUIAdapter.java b/sscd-mocca-adapter/src/main/java/eu/europa/esig/dss/token/mocca/PINGUIAdapter.java similarity index 96% rename from sscd-mocca-adapter/src/main/java/eu/europa/ec/markt/dss/mocca/PINGUIAdapter.java rename to sscd-mocca-adapter/src/main/java/eu/europa/esig/dss/token/mocca/PINGUIAdapter.java index e21c37ec96..5637faf9f7 100644 --- a/sscd-mocca-adapter/src/main/java/eu/europa/ec/markt/dss/mocca/PINGUIAdapter.java +++ b/sscd-mocca-adapter/src/main/java/eu/europa/esig/dss/token/mocca/PINGUIAdapter.java @@ -18,12 +18,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.mocca; +package eu.europa.esig.dss.token.mocca; import at.gv.egiz.smcc.CancelledException; import at.gv.egiz.smcc.PinInfo; import at.gv.egiz.smcc.pin.gui.PINGUI; -import eu.europa.ec.markt.dss.signature.token.PasswordInputCallback; +import eu.europa.esig.dss.token.PasswordInputCallback; /** * This class provides automatically the PIN code. Only one call can be done. This protects the card against its diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/AcceptablePolicies.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/model/AcceptablePolicies.java similarity index 94% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/AcceptablePolicies.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/model/AcceptablePolicies.java index 9c4849b0aa..2540e4ade4 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/AcceptablePolicies.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/model/AcceptablePolicies.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.engine.rules.wrapper.constraint; +package eu.europa.esig.dss.validation.model; import java.util.ArrayList; import java.util.List; diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/Algo.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/model/Algo.java similarity index 95% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/Algo.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/model/Algo.java index 38d3b913e9..dd76166abf 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/Algo.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/model/Algo.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.engine.rules.wrapper.constraint; +package eu.europa.esig.dss.validation.model; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/AlgoExpirationDate.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/model/AlgoExpirationDate.java similarity index 96% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/AlgoExpirationDate.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/model/AlgoExpirationDate.java index c5d0d736da..1d1dcbd939 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/AlgoExpirationDate.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/model/AlgoExpirationDate.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.engine.rules.wrapper.constraint; +package eu.europa.esig.dss.validation.model; import java.util.Date; diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/AlgoExpirationDateList.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/model/AlgoExpirationDateList.java similarity index 96% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/AlgoExpirationDateList.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/model/AlgoExpirationDateList.java index a9d632603c..5ea4a9d72d 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/AlgoExpirationDateList.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/model/AlgoExpirationDateList.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.engine.rules.wrapper.constraint; +package eu.europa.esig.dss.validation.model; import java.util.ArrayList; import java.util.List; diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/AlgoList.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/model/AlgoList.java similarity index 95% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/AlgoList.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/model/AlgoList.java index 414693c309..54b475a538 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/AlgoList.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/model/AlgoList.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.engine.rules.wrapper.constraint; +package eu.europa.esig.dss.validation.model; import java.util.ArrayList; import java.util.List; diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/AlgoSize.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/model/AlgoSize.java similarity index 95% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/AlgoSize.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/model/AlgoSize.java index a9afd68fd3..76789c36f5 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/AlgoSize.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/model/AlgoSize.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.engine.rules.wrapper.constraint; +package eu.europa.esig.dss.validation.model; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/AlgoSizeList.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/model/AlgoSizeList.java similarity index 95% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/AlgoSizeList.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/model/AlgoSizeList.java index e373f68b93..177f08c3bf 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/AlgoSizeList.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/model/AlgoSizeList.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.engine.rules.wrapper.constraint; +package eu.europa.esig.dss.validation.model; import java.util.ArrayList; import java.util.List; diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/Certificate.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/model/Certificate.java similarity index 96% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/Certificate.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/model/Certificate.java index b7ac4a1c85..6a8e26c9cb 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/Certificate.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/model/Certificate.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.engine.rules.wrapper.constraint; +package eu.europa.esig.dss.validation.model; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/CertificateAlgorithms.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/model/CertificateAlgorithms.java similarity index 96% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/CertificateAlgorithms.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/model/CertificateAlgorithms.java index 9794f08fd9..44c8adfa74 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/CertificateAlgorithms.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/model/CertificateAlgorithms.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.engine.rules.wrapper.constraint; +package eu.europa.esig.dss.validation.model; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/CertificateChain.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/model/CertificateChain.java similarity index 95% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/CertificateChain.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/model/CertificateChain.java index 60814db8e2..9042bf792a 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/CertificateChain.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/model/CertificateChain.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.engine.rules.wrapper.constraint; +package eu.europa.esig.dss.validation.model; import java.util.ArrayList; import java.util.List; diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/Cryptographic.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/model/Cryptographic.java similarity index 97% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/Cryptographic.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/model/Cryptographic.java index 90b52d7cb7..57012f3d25 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/Cryptographic.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/model/Cryptographic.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.engine.rules.wrapper.constraint; +package eu.europa.esig.dss.validation.model; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/DateAdapter.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/model/DateAdapter.java similarity index 94% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/DateAdapter.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/model/DateAdapter.java index 6e6f79de9c..694dc6688f 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/DateAdapter.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/model/DateAdapter.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.engine.rules.wrapper.constraint; +package eu.europa.esig.dss.validation.model; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/DurationValue.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/model/DurationValue.java similarity index 95% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/DurationValue.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/model/DurationValue.java index 1cff5380ac..3e004fe9dd 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/DurationValue.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/model/DurationValue.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.engine.rules.wrapper.constraint; +package eu.europa.esig.dss.validation.model; import java.util.concurrent.TimeUnit; diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/EmptyTag.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/model/EmptyTag.java similarity index 93% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/EmptyTag.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/model/EmptyTag.java index ed202cec73..6a93f064e3 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/EmptyTag.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/model/EmptyTag.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.engine.rules.wrapper.constraint; +package eu.europa.esig.dss.validation.model; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/MandatedSignedQProperties.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/model/MandatedSignedQProperties.java similarity index 97% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/MandatedSignedQProperties.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/model/MandatedSignedQProperties.java index 082913530e..76249722a1 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/MandatedSignedQProperties.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/model/MandatedSignedQProperties.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.engine.rules.wrapper.constraint; +package eu.europa.esig.dss.validation.model; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/MandatedUnsignedQProperties.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/model/MandatedUnsignedQProperties.java similarity index 97% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/MandatedUnsignedQProperties.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/model/MandatedUnsignedQProperties.java index 4ac5cdf743..7f7c773b88 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/MandatedUnsignedQProperties.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/model/MandatedUnsignedQProperties.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.engine.rules.wrapper.constraint; +package eu.europa.esig.dss.validation.model; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/MiniPublicKeySize.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/model/MiniPublicKeySize.java similarity index 95% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/MiniPublicKeySize.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/model/MiniPublicKeySize.java index 50db23d0b0..b6b2f1d85a 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/MiniPublicKeySize.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/model/MiniPublicKeySize.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.engine.rules.wrapper.constraint; +package eu.europa.esig.dss.validation.model; import java.util.ArrayList; import java.util.List; diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/NonVisual.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/model/NonVisual.java similarity index 93% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/NonVisual.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/model/NonVisual.java index 7087fc4c63..6e4bb7229d 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/NonVisual.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/model/NonVisual.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.engine.rules.wrapper.constraint; +package eu.europa.esig.dss.validation.model; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/OnRoles.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/model/OnRoles.java similarity index 96% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/OnRoles.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/model/OnRoles.java index 85589d8afd..750c45306b 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/OnRoles.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/model/OnRoles.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.engine.rules.wrapper.constraint; +package eu.europa.esig.dss.validation.model; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/SigningCertificate.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/model/SigningCertificate.java similarity index 96% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/SigningCertificate.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/model/SigningCertificate.java index a3c4966ee0..bde24dd57b 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/SigningCertificate.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/model/SigningCertificate.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.engine.rules.wrapper.constraint; +package eu.europa.esig.dss.validation.model; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/SigningCertificateChain.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/model/SigningCertificateChain.java similarity index 95% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/SigningCertificateChain.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/model/SigningCertificateChain.java index 4ed0df5b7c..382af6f822 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/SigningCertificateChain.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/model/SigningCertificateChain.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.engine.rules.wrapper.constraint; +package eu.europa.esig.dss.validation.model; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/ValidationPolicy.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/model/ValidationPolicy.java similarity index 91% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/ValidationPolicy.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/model/ValidationPolicy.java index 54c60065b2..e185eb6788 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/engine/rules/wrapper/constraint/ValidationPolicy.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/model/ValidationPolicy.java @@ -18,13 +18,13 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.engine.rules.wrapper.constraint; +package eu.europa.esig.dss.validation.model; import java.net.URL; import org.w3c.dom.Document; -import eu.europa.ec.markt.dss.validation102853.xml.XmlDom; +import eu.europa.esig.dss.XmlDom; /** * In memory representation on the XML Validation Policy Constraint document and XSD diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/policy/BasicValidationProcessValidConstraint.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/BasicValidationProcessValidConstraint.java similarity index 91% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/policy/BasicValidationProcessValidConstraint.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/BasicValidationProcessValidConstraint.java index f25d9f3eea..8a71a819f1 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/policy/BasicValidationProcessValidConstraint.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/BasicValidationProcessValidConstraint.java @@ -18,14 +18,14 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.policy; +package eu.europa.esig.dss.validation.policy; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.validation102853.rules.NodeName; -import eu.europa.ec.markt.dss.validation102853.rules.NodeValue; -import eu.europa.ec.markt.dss.validation102853.xml.XmlDom; +import eu.europa.esig.dss.XmlDom; +import eu.europa.esig.dss.validation.policy.rules.NodeName; +import eu.europa.esig.dss.validation.policy.rules.NodeValue; /** * This class represents the basic validation process validity constraints. diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/policy/CertificateExpirationConstraint.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/CertificateExpirationConstraint.java similarity index 91% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/policy/CertificateExpirationConstraint.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/CertificateExpirationConstraint.java index 158e14d6c6..9adeb9c034 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/policy/CertificateExpirationConstraint.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/CertificateExpirationConstraint.java @@ -18,18 +18,18 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.policy; +package eu.europa.esig.dss.validation.policy; import java.util.Date; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.validation102853.report.Conclusion; -import eu.europa.ec.markt.dss.validation102853.rules.AttributeValue; -import eu.europa.ec.markt.dss.validation102853.rules.NodeName; -import eu.europa.ec.markt.dss.validation102853.rules.NodeValue; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.validation.policy.rules.AttributeValue; +import eu.europa.esig.dss.validation.policy.rules.NodeName; +import eu.europa.esig.dss.validation.policy.rules.NodeValue; +import eu.europa.esig.dss.validation.report.Conclusion; /** * This class represents a signing certificate validity constraints. The validation is composed of: @@ -56,7 +56,7 @@ public class CertificateExpirationConstraint extends Constraint { protected Date expiredCertsRevocationInfo; /** - * This is the See {@link eu.europa.ec.markt.dss.validation102853.engine.rules.ProcessParameters#getCurrentTime()} + * This is the See {@link eu.eu.europa.esig.dss.validation.policy.ProcessParameters#getCurrentTime()} */ protected Date currentTime; diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/CertificateQualification.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/CertificateQualification.java similarity index 96% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/CertificateQualification.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/CertificateQualification.java index 35089623be..62554bb191 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/CertificateQualification.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/CertificateQualification.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853; +package eu.europa.esig.dss.validation.policy; public class CertificateQualification { diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/policy/Constraint.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/Constraint.java similarity index 95% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/policy/Constraint.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/Constraint.java index efe411da43..b82dec758b 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/policy/Constraint.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/Constraint.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.policy; +package eu.europa.esig.dss.validation.policy; import java.util.HashMap; import java.util.List; @@ -29,15 +29,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.validation102853.RuleUtils; -import eu.europa.ec.markt.dss.validation102853.report.Conclusion; -import eu.europa.ec.markt.dss.validation102853.rules.AttributeName; -import eu.europa.ec.markt.dss.validation102853.rules.MessageTag; -import eu.europa.ec.markt.dss.validation102853.rules.NodeName; -import eu.europa.ec.markt.dss.validation102853.rules.NodeValue; -import eu.europa.ec.markt.dss.validation102853.xml.XmlDom; -import eu.europa.ec.markt.dss.validation102853.xml.XmlNode; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.XmlDom; +import eu.europa.esig.dss.validation.policy.rules.AttributeName; +import eu.europa.esig.dss.validation.policy.rules.MessageTag; +import eu.europa.esig.dss.validation.policy.rules.NodeName; +import eu.europa.esig.dss.validation.policy.rules.NodeValue; +import eu.europa.esig.dss.validation.report.Conclusion; /** * This class represents a constraint and indicates its level: IGNORE, INFORM, WARN, FAIL. diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/CustomDateProcessExecutor.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/CustomDateProcessExecutor.java similarity index 95% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/CustomDateProcessExecutor.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/CustomDateProcessExecutor.java index 7011e6ac12..4d4f78c400 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/CustomDateProcessExecutor.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/CustomDateProcessExecutor.java @@ -18,11 +18,11 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853; +package eu.europa.esig.dss.validation.policy; import java.util.Date; -import eu.europa.ec.markt.dss.DSSUtils; +import eu.europa.esig.dss.DSSUtils; /** * This class allows to associate a specific date to the validation process. diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/CustomProcessExecutor.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/CustomProcessExecutor.java similarity index 82% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/CustomProcessExecutor.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/CustomProcessExecutor.java index 4c2a883971..08992247e8 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/CustomProcessExecutor.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/CustomProcessExecutor.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853; +package eu.europa.esig.dss.validation.policy; import java.util.Date; @@ -26,17 +26,14 @@ import org.slf4j.LoggerFactory; import org.w3c.dom.Document; -import eu.europa.ec.markt.dss.validation102853.policy.ProcessParameters; -import eu.europa.ec.markt.dss.validation102853.policy.ValidationPolicy; -import eu.europa.ec.markt.dss.validation102853.processes.LongTermValidation; -import eu.europa.ec.markt.dss.validation102853.report.DetailedReport; -import eu.europa.ec.markt.dss.validation102853.report.DiagnosticData; -import eu.europa.ec.markt.dss.validation102853.report.Reports; -import eu.europa.ec.markt.dss.validation102853.report.SimpleReport; -import eu.europa.ec.markt.dss.validation102853.report.SimpleReportBuilder; -import eu.europa.ec.markt.dss.validation102853.rules.NodeName; -import eu.europa.ec.markt.dss.validation102853.xml.XmlDom; -import eu.europa.ec.markt.dss.validation102853.xml.XmlNode; +import eu.europa.esig.dss.XmlDom; +import eu.europa.esig.dss.validation.policy.rules.NodeName; +import eu.europa.esig.dss.validation.process.LongTermValidation; +import eu.europa.esig.dss.validation.report.DetailedReport; +import eu.europa.esig.dss.validation.report.DiagnosticData; +import eu.europa.esig.dss.validation.report.Reports; +import eu.europa.esig.dss.validation.report.SimpleReport; +import eu.europa.esig.dss.validation.report.SimpleReportBuilder; /** * This class allows to carry out the validation process with in a specific context. @@ -76,7 +73,7 @@ public class CustomProcessExecutor implements ProcessExecutor { protected DetailedReport detailedReport; /** - * See {@link eu.europa.ec.markt.dss.validation102853.policy.ProcessParameters#getCurrentTime()} + * See {@link eu.europa.esig.dss.validation.policy.ProcessParameters#getCurrentTime()} */ protected Date currentTime = new Date(); diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/policy/EtsiValidationPolicy.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/EtsiValidationPolicy.java similarity index 98% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/policy/EtsiValidationPolicy.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/EtsiValidationPolicy.java index b4788d0f25..b6da61d51c 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/policy/EtsiValidationPolicy.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/EtsiValidationPolicy.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.policy; +package eu.europa.esig.dss.validation.policy; import java.util.Date; import java.util.HashMap; @@ -28,11 +28,10 @@ import org.apache.commons.lang.StringUtils; import org.w3c.dom.Document; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.validation102853.RuleUtils; -import eu.europa.ec.markt.dss.validation102853.rules.AttributeName; -import eu.europa.ec.markt.dss.validation102853.xml.XmlDom; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.XmlDom; +import eu.europa.esig.dss.validation.policy.rules.AttributeName; /** * This class encapsulates the constraint file that controls the policy to be used during the validation process. It diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/ProcessExecutor.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/ProcessExecutor.java similarity index 86% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/ProcessExecutor.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/ProcessExecutor.java index c01559979d..5b0719c3e2 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/ProcessExecutor.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/ProcessExecutor.java @@ -18,14 +18,13 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853; +package eu.europa.esig.dss.validation.policy; import java.util.Date; import org.w3c.dom.Document; -import eu.europa.ec.markt.dss.validation102853.policy.ValidationPolicy; -import eu.europa.ec.markt.dss.validation102853.report.Reports; +import eu.europa.esig.dss.validation.report.Reports; /** * This interface allows to define how the validation process should be carried out. @@ -40,7 +39,7 @@ public interface ProcessExecutor { Date getCurrentTime(); /** - * This method allows to set the {@code eu.europa.ec.markt.dss.validation102853.report.DiagnosticData} that is used during the validation process execution. + * This method allows to set the {@code eu.europa.esig.dss.validation.report.DiagnosticData} that is used during the validation process execution. * * @param diagnosticDataDom */ diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/policy/ProcessParameters.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/ProcessParameters.java similarity index 96% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/policy/ProcessParameters.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/ProcessParameters.java index dc5c6eff38..e12556429a 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/policy/ProcessParameters.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/ProcessParameters.java @@ -18,15 +18,15 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.policy; +package eu.europa.esig.dss.validation.policy; import java.util.Date; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.validation102853.process.POEExtraction; -import eu.europa.ec.markt.dss.validation102853.report.DiagnosticData; -import eu.europa.ec.markt.dss.validation102853.rules.ExceptionMessage; -import eu.europa.ec.markt.dss.validation102853.xml.XmlDom; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.XmlDom; +import eu.europa.esig.dss.validation.policy.rules.ExceptionMessage; +import eu.europa.esig.dss.validation.process.POEExtraction; +import eu.europa.esig.dss.validation.report.DiagnosticData; /** * This class stores the references to data exchanged and manipulated by different sub validation processes. diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/RuleUtils.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/RuleUtils.java similarity index 96% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/RuleUtils.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/RuleUtils.java index c1144c8ec9..cd8130d064 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/RuleUtils.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/RuleUtils.java @@ -18,14 +18,14 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853; +package eu.europa.esig.dss.validation.policy; import java.util.Arrays; import java.util.List; import java.util.concurrent.TimeUnit; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.validation102853.xml.XmlDom; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.XmlDom; public final class RuleUtils { diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/policy/SignatureCryptographicConstraint.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/SignatureCryptographicConstraint.java similarity index 94% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/policy/SignatureCryptographicConstraint.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/SignatureCryptographicConstraint.java index e2f1bf671a..c6746d4252 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/policy/SignatureCryptographicConstraint.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/SignatureCryptographicConstraint.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.policy; +package eu.europa.esig.dss.validation.policy; import java.util.Date; import java.util.List; @@ -28,15 +28,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.exception.DSSNotApplicableMethodException; -import eu.europa.ec.markt.dss.validation102853.RuleUtils; -import eu.europa.ec.markt.dss.validation102853.report.Conclusion; -import eu.europa.ec.markt.dss.validation102853.rules.AttributeName; -import eu.europa.ec.markt.dss.validation102853.rules.AttributeValue; -import eu.europa.ec.markt.dss.validation102853.rules.MessageTag; -import eu.europa.ec.markt.dss.validation102853.rules.NodeName; -import eu.europa.ec.markt.dss.validation102853.rules.NodeValue; +import eu.europa.esig.dss.DSSNotApplicableMethodException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.validation.policy.rules.AttributeName; +import eu.europa.esig.dss.validation.policy.rules.AttributeValue; +import eu.europa.esig.dss.validation.policy.rules.MessageTag; +import eu.europa.esig.dss.validation.policy.rules.NodeName; +import eu.europa.esig.dss.validation.policy.rules.NodeValue; +import eu.europa.esig.dss.validation.report.Conclusion; /** * This class represents a signature cryptographic constraints and indicates their level: IGNORE, INFORM, WARN, FAIL. @@ -97,7 +96,7 @@ public class SignatureCryptographicConstraint extends Constraint { private String keyLength; /** - * This is the See {@link eu.europa.ec.markt.dss.validation102853.engine.rules.ProcessParameters#getCurrentTime()} + * This is the See {@link eu.eu.europa.esig.dss.validation.policy.ProcessParameters#getCurrentTime()} */ protected Date currentTime; diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/policy/SignaturePolicyConstraint.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/SignaturePolicyConstraint.java similarity index 90% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/policy/SignaturePolicyConstraint.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/SignaturePolicyConstraint.java index 65d1a8b613..564a8a38f4 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/policy/SignaturePolicyConstraint.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/SignaturePolicyConstraint.java @@ -18,21 +18,20 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.policy; +package eu.europa.esig.dss.validation.policy; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.validation102853.SignaturePolicy; -import eu.europa.ec.markt.dss.validation102853.report.Conclusion; -import eu.europa.ec.markt.dss.validation102853.rules.AttributeName; -import eu.europa.ec.markt.dss.validation102853.rules.Indication; -import eu.europa.ec.markt.dss.validation102853.rules.MessageTag; -import eu.europa.ec.markt.dss.validation102853.rules.NodeName; -import eu.europa.ec.markt.dss.validation102853.rules.NodeValue; -import eu.europa.ec.markt.dss.validation102853.rules.RuleConstant; -import eu.europa.ec.markt.dss.validation102853.rules.SubIndication; -import eu.europa.ec.markt.dss.validation102853.xml.XmlNode; +import eu.europa.esig.dss.validation.policy.rules.AttributeName; +import eu.europa.esig.dss.validation.policy.rules.Indication; +import eu.europa.esig.dss.validation.policy.rules.MessageTag; +import eu.europa.esig.dss.validation.policy.rules.NodeName; +import eu.europa.esig.dss.validation.policy.rules.NodeValue; +import eu.europa.esig.dss.validation.policy.rules.RuleConstant; +import eu.europa.esig.dss.validation.policy.rules.SubIndication; +import eu.europa.esig.dss.validation.report.Conclusion; +import eu.europa.esig.dss.x509.SignaturePolicy; /** * This class represents a signature policy constraint. diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/SignatureQualification.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/SignatureQualification.java similarity index 98% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/SignatureQualification.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/SignatureQualification.java index 73fc3f19ef..f1c298d5e1 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/SignatureQualification.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/SignatureQualification.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853; +package eu.europa.esig.dss.validation.policy; public class SignatureQualification { diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/SignatureType.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/SignatureType.java similarity index 95% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/SignatureType.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/SignatureType.java index 3035122fcb..501271be60 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/SignatureType.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/SignatureType.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853; +package eu.europa.esig.dss.validation.policy; /** * TODO diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/TLQualification.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/TLQualification.java similarity index 97% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/TLQualification.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/TLQualification.java index 91d46d79f4..aafdb96ea2 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/TLQualification.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/TLQualification.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853; +package eu.europa.esig.dss.validation.policy; public class TLQualification { diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/policy/TimestampValidationProcessValidConstraint.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/TimestampValidationProcessValidConstraint.java similarity index 94% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/policy/TimestampValidationProcessValidConstraint.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/TimestampValidationProcessValidConstraint.java index 48c1298c20..87de65f751 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/policy/TimestampValidationProcessValidConstraint.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/TimestampValidationProcessValidConstraint.java @@ -18,13 +18,13 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.policy; +package eu.europa.esig.dss.validation.policy; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.validation102853.rules.NodeName; -import eu.europa.ec.markt.dss.validation102853.rules.NodeValue; +import eu.europa.esig.dss.validation.policy.rules.NodeName; +import eu.europa.esig.dss.validation.policy.rules.NodeValue; /** * This class represents the timestamp validation process validity constraints. diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/policy/ValidationPolicy.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/ValidationPolicy.java similarity index 99% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/policy/ValidationPolicy.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/ValidationPolicy.java index 43d48ad5e1..3bb342288d 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/policy/ValidationPolicy.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/ValidationPolicy.java @@ -18,14 +18,14 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.policy; +package eu.europa.esig.dss.validation.policy; import java.util.Date; import java.util.List; import org.w3c.dom.Document; -import eu.europa.ec.markt.dss.validation102853.xml.XmlDom; +import eu.europa.esig.dss.XmlDom; /** * This class encapsulates the constraint file that controls the policy to be used during the validation process. This is the base class used to implement a specific validation diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/xml/XmlNode.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/XmlNode.java similarity index 98% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/xml/XmlNode.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/XmlNode.java index 1938895c2f..6c9c8d2c39 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/xml/XmlNode.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/XmlNode.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.xml; +package eu.europa.esig.dss.validation.policy; import java.io.ByteArrayInputStream; import java.io.InputStream; @@ -37,9 +37,10 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import eu.europa.ec.markt.dss.DSSXMLUtils; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.validation102853.rules.MessageTag; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSXMLUtils; +import eu.europa.esig.dss.XmlDom; +import eu.europa.esig.dss.validation.policy.rules.MessageTag; public class XmlNode { diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/rules/AttributeName.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/rules/AttributeName.java similarity index 97% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/rules/AttributeName.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/rules/AttributeName.java index f33192b17c..6fffac9e97 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/rules/AttributeName.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/rules/AttributeName.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.rules; +package eu.europa.esig.dss.validation.policy.rules; public interface AttributeName { diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/rules/AttributeValue.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/rules/AttributeValue.java similarity index 97% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/rules/AttributeValue.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/rules/AttributeValue.java index 950f2ffb31..2a58c5ced5 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/rules/AttributeValue.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/rules/AttributeValue.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.rules; +package eu.europa.esig.dss.validation.policy.rules; public interface AttributeValue { diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/rules/ExceptionMessage.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/rules/ExceptionMessage.java similarity index 96% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/rules/ExceptionMessage.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/rules/ExceptionMessage.java index 43fb3820bf..f077b0dc9b 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/rules/ExceptionMessage.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/rules/ExceptionMessage.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.rules; +package eu.europa.esig.dss.validation.policy.rules; public interface ExceptionMessage { diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/rules/Indication.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/rules/Indication.java similarity index 95% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/rules/Indication.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/rules/Indication.java index a313d13d04..d2d3327e5c 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/rules/Indication.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/rules/Indication.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.rules; +package eu.europa.esig.dss.validation.policy.rules; /** * The list of possible values for indications. diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/rules/MessageTag.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/rules/MessageTag.java similarity index 99% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/rules/MessageTag.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/rules/MessageTag.java index fb835e7c7c..851b515779 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/rules/MessageTag.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/rules/MessageTag.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.rules; +package eu.europa.esig.dss.validation.policy.rules; /** * diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/rules/NodeName.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/rules/NodeName.java similarity index 98% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/rules/NodeName.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/rules/NodeName.java index 55f428e926..b6d8584e37 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/rules/NodeName.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/rules/NodeName.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.rules; +package eu.europa.esig.dss.validation.policy.rules; public interface NodeName { diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/rules/NodeValue.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/rules/NodeValue.java similarity index 99% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/rules/NodeValue.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/rules/NodeValue.java index 3e09710d1c..519e15e3cb 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/rules/NodeValue.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/rules/NodeValue.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.rules; +package eu.europa.esig.dss.validation.policy.rules; public interface NodeValue { diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/rules/RuleConstant.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/rules/RuleConstant.java similarity index 92% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/rules/RuleConstant.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/rules/RuleConstant.java index 00016672dc..ff5f55e745 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/rules/RuleConstant.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/rules/RuleConstant.java @@ -18,9 +18,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.rules; +package eu.europa.esig.dss.validation.policy.rules; -import eu.europa.ec.markt.dss.TSLConstant; +import eu.europa.esig.dss.TSLConstant; public interface RuleConstant extends TSLConstant { diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/rules/SubIndication.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/rules/SubIndication.java similarity index 98% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/rules/SubIndication.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/rules/SubIndication.java index b13bc1fbc6..ce9743604b 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/rules/SubIndication.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/policy/rules/SubIndication.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.rules; +package eu.europa.esig.dss.validation.policy.rules; public interface SubIndication { diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/AdESTValidation.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/process/AdESTValidation.java similarity index 95% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/AdESTValidation.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/process/AdESTValidation.java index ef772337ad..702966184f 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/AdESTValidation.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/process/AdESTValidation.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.processes; +package eu.europa.esig.dss.validation.process; import java.util.ArrayList; import java.util.Date; @@ -28,26 +28,26 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.validation102853.RuleUtils; -import eu.europa.ec.markt.dss.validation102853.TimestampType; -import eu.europa.ec.markt.dss.validation102853.policy.BasicValidationProcessValidConstraint; -import eu.europa.ec.markt.dss.validation102853.policy.Constraint; -import eu.europa.ec.markt.dss.validation102853.policy.ProcessParameters; -import eu.europa.ec.markt.dss.validation102853.policy.TimestampValidationProcessValidConstraint; -import eu.europa.ec.markt.dss.validation102853.policy.ValidationPolicy; -import eu.europa.ec.markt.dss.validation102853.report.Conclusion; -import eu.europa.ec.markt.dss.validation102853.rules.AttributeName; -import eu.europa.ec.markt.dss.validation102853.rules.AttributeValue; -import eu.europa.ec.markt.dss.validation102853.rules.ExceptionMessage; -import eu.europa.ec.markt.dss.validation102853.rules.Indication; -import eu.europa.ec.markt.dss.validation102853.rules.MessageTag; -import eu.europa.ec.markt.dss.validation102853.rules.NodeName; -import eu.europa.ec.markt.dss.validation102853.rules.NodeValue; -import eu.europa.ec.markt.dss.validation102853.rules.SubIndication; -import eu.europa.ec.markt.dss.validation102853.xml.XmlDom; -import eu.europa.ec.markt.dss.validation102853.xml.XmlNode; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.XmlDom; +import eu.europa.esig.dss.validation.policy.BasicValidationProcessValidConstraint; +import eu.europa.esig.dss.validation.policy.Constraint; +import eu.europa.esig.dss.validation.policy.ProcessParameters; +import eu.europa.esig.dss.validation.policy.RuleUtils; +import eu.europa.esig.dss.validation.policy.TimestampValidationProcessValidConstraint; +import eu.europa.esig.dss.validation.policy.ValidationPolicy; +import eu.europa.esig.dss.validation.policy.XmlNode; +import eu.europa.esig.dss.validation.policy.rules.AttributeName; +import eu.europa.esig.dss.validation.policy.rules.AttributeValue; +import eu.europa.esig.dss.validation.policy.rules.ExceptionMessage; +import eu.europa.esig.dss.validation.policy.rules.Indication; +import eu.europa.esig.dss.validation.policy.rules.MessageTag; +import eu.europa.esig.dss.validation.policy.rules.NodeName; +import eu.europa.esig.dss.validation.policy.rules.NodeValue; +import eu.europa.esig.dss.validation.policy.rules.SubIndication; +import eu.europa.esig.dss.validation.report.Conclusion; +import eu.europa.esig.dss.x509.TimestampType; /** * This class implements:
@@ -73,14 +73,14 @@ public class AdESTValidation implements Indication, SubIndication, NodeValue, At // Primary inputs /** - * See {@link eu.europa.ec.markt.dss.validation102853.policy.ProcessParameters#getDiagnosticData()} + * See {@link eu.europa.esig.dss.validation.policy.ProcessParameters#getDiagnosticData()} * * @return */ private XmlDom diagnosticData; /** - * See {@link eu.europa.ec.markt.dss.validation102853.policy.ProcessParameters#getValidationPolicy()} + * See {@link eu.europa.esig.dss.validation.policy.ProcessParameters#getValidationPolicy()} * * @return */ @@ -88,14 +88,14 @@ public class AdESTValidation implements Indication, SubIndication, NodeValue, At // Secondary inputs /** - * See {@link eu.europa.ec.markt.dss.validation102853.policy.ProcessParameters#getCurrentTime()} + * See {@link eu.europa.esig.dss.validation.policy.ProcessParameters#getCurrentTime()} * * @return */ private Date currentTime; /** - * See {@link eu.europa.ec.markt.dss.validation102853.policy.ProcessParameters#getBvData()} + * See {@link eu.europa.esig.dss.validation.policy.ProcessParameters#getBvData()} * * @return */ diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/BasicBuildingBlocks.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/process/BasicBuildingBlocks.java similarity index 82% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/BasicBuildingBlocks.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/process/BasicBuildingBlocks.java index 6c1618822a..df54ada3a0 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/BasicBuildingBlocks.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/process/BasicBuildingBlocks.java @@ -18,29 +18,29 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.processes; +package eu.europa.esig.dss.validation.process; import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.validation102853.policy.ProcessParameters; -import eu.europa.ec.markt.dss.validation102853.processes.subprocesses.CryptographicVerification; -import eu.europa.ec.markt.dss.validation102853.processes.subprocesses.IdentificationOfTheSignersCertificate; -import eu.europa.ec.markt.dss.validation102853.processes.subprocesses.SignatureAcceptanceValidation; -import eu.europa.ec.markt.dss.validation102853.processes.subprocesses.ValidationContextInitialisation; -import eu.europa.ec.markt.dss.validation102853.processes.subprocesses.X509CertificateValidation; -import eu.europa.ec.markt.dss.validation102853.report.Conclusion; -import eu.europa.ec.markt.dss.validation102853.rules.AttributeName; -import eu.europa.ec.markt.dss.validation102853.rules.AttributeValue; -import eu.europa.ec.markt.dss.validation102853.rules.ExceptionMessage; -import eu.europa.ec.markt.dss.validation102853.rules.Indication; -import eu.europa.ec.markt.dss.validation102853.rules.NodeName; -import eu.europa.ec.markt.dss.validation102853.rules.NodeValue; -import eu.europa.ec.markt.dss.validation102853.xml.XmlDom; -import eu.europa.ec.markt.dss.validation102853.xml.XmlNode; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.XmlDom; +import eu.europa.esig.dss.validation.policy.ProcessParameters; +import eu.europa.esig.dss.validation.policy.XmlNode; +import eu.europa.esig.dss.validation.policy.rules.AttributeName; +import eu.europa.esig.dss.validation.policy.rules.AttributeValue; +import eu.europa.esig.dss.validation.policy.rules.ExceptionMessage; +import eu.europa.esig.dss.validation.policy.rules.Indication; +import eu.europa.esig.dss.validation.policy.rules.NodeName; +import eu.europa.esig.dss.validation.policy.rules.NodeValue; +import eu.europa.esig.dss.validation.process.subprocess.CryptographicVerification; +import eu.europa.esig.dss.validation.process.subprocess.IdentificationOfTheSignersCertificate; +import eu.europa.esig.dss.validation.process.subprocess.SignatureAcceptanceValidation; +import eu.europa.esig.dss.validation.process.subprocess.ValidationContextInitialisation; +import eu.europa.esig.dss.validation.process.subprocess.X509CertificateValidation; +import eu.europa.esig.dss.validation.report.Conclusion; /** * This class creates the validation data (Basic Building Blocks) for all signatures. diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/BasicValidation.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/process/BasicValidation.java similarity index 94% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/BasicValidation.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/process/BasicValidation.java index 31580ec253..cdbfb1ff69 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/BasicValidation.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/process/BasicValidation.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.processes; +package eu.europa.esig.dss.validation.process; import java.util.Date; import java.util.List; @@ -26,18 +26,18 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.validation102853.policy.ProcessParameters; -import eu.europa.ec.markt.dss.validation102853.rules.AttributeName; -import eu.europa.ec.markt.dss.validation102853.rules.AttributeValue; -import eu.europa.ec.markt.dss.validation102853.rules.ExceptionMessage; -import eu.europa.ec.markt.dss.validation102853.rules.Indication; -import eu.europa.ec.markt.dss.validation102853.rules.NodeName; -import eu.europa.ec.markt.dss.validation102853.rules.NodeValue; -import eu.europa.ec.markt.dss.validation102853.rules.SubIndication; -import eu.europa.ec.markt.dss.validation102853.xml.XmlDom; -import eu.europa.ec.markt.dss.validation102853.xml.XmlNode; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.XmlDom; +import eu.europa.esig.dss.validation.policy.ProcessParameters; +import eu.europa.esig.dss.validation.policy.XmlNode; +import eu.europa.esig.dss.validation.policy.rules.AttributeName; +import eu.europa.esig.dss.validation.policy.rules.AttributeValue; +import eu.europa.esig.dss.validation.policy.rules.ExceptionMessage; +import eu.europa.esig.dss.validation.policy.rules.Indication; +import eu.europa.esig.dss.validation.policy.rules.NodeName; +import eu.europa.esig.dss.validation.policy.rules.NodeValue; +import eu.europa.esig.dss.validation.policy.rules.SubIndication; /** * 6 Basic Validation Process
@@ -53,7 +53,7 @@ public class BasicValidation implements Indication, SubIndication, NodeName, Nod // Secondary inputs /** - * See {@link eu.europa.ec.markt.dss.validation102853.policy.ProcessParameters#getBasicBuildingBlocksReport()} + * See {@link eu.europa.esig.dss.validation.policy.ProcessParameters#getBasicBuildingBlocksReport()} * * @return */ diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/LongTermValidation.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/process/LongTermValidation.java similarity index 94% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/LongTermValidation.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/process/LongTermValidation.java index 1a556c8849..ccdb6cdca4 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/LongTermValidation.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/process/LongTermValidation.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.processes; +package eu.europa.esig.dss.validation.process; import java.util.Collections; import java.util.Date; @@ -27,23 +27,23 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.validation102853.RuleUtils; -import eu.europa.ec.markt.dss.validation102853.TimestampType; -import eu.europa.ec.markt.dss.validation102853.policy.ProcessParameters; -import eu.europa.ec.markt.dss.validation102853.processes.ltv.PastSignatureValidation; -import eu.europa.ec.markt.dss.validation102853.processes.ltv.PastSignatureValidationConclusion; -import eu.europa.ec.markt.dss.validation102853.processes.subprocesses.EtsiPOEExtraction; -import eu.europa.ec.markt.dss.validation102853.rules.AttributeName; -import eu.europa.ec.markt.dss.validation102853.rules.AttributeValue; -import eu.europa.ec.markt.dss.validation102853.rules.ExceptionMessage; -import eu.europa.ec.markt.dss.validation102853.rules.Indication; -import eu.europa.ec.markt.dss.validation102853.rules.MessageTag; -import eu.europa.ec.markt.dss.validation102853.rules.NodeName; -import eu.europa.ec.markt.dss.validation102853.rules.NodeValue; -import eu.europa.ec.markt.dss.validation102853.rules.SubIndication; -import eu.europa.ec.markt.dss.validation102853.xml.XmlDom; -import eu.europa.ec.markt.dss.validation102853.xml.XmlNode; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.XmlDom; +import eu.europa.esig.dss.validation.policy.ProcessParameters; +import eu.europa.esig.dss.validation.policy.RuleUtils; +import eu.europa.esig.dss.validation.policy.XmlNode; +import eu.europa.esig.dss.validation.policy.rules.AttributeName; +import eu.europa.esig.dss.validation.policy.rules.AttributeValue; +import eu.europa.esig.dss.validation.policy.rules.ExceptionMessage; +import eu.europa.esig.dss.validation.policy.rules.Indication; +import eu.europa.esig.dss.validation.policy.rules.MessageTag; +import eu.europa.esig.dss.validation.policy.rules.NodeName; +import eu.europa.esig.dss.validation.policy.rules.NodeValue; +import eu.europa.esig.dss.validation.policy.rules.SubIndication; +import eu.europa.esig.dss.validation.process.ltv.PastSignatureValidation; +import eu.europa.esig.dss.validation.process.ltv.PastSignatureValidationConclusion; +import eu.europa.esig.dss.validation.process.subprocess.EtsiPOEExtraction; +import eu.europa.esig.dss.x509.TimestampType; /** * 9.3 Long Term Validation Process
@@ -86,7 +86,7 @@ public class LongTermValidation implements Indication, SubIndication, NodeName, // Primary inputs /** - * See {@link eu.europa.ec.markt.dss.validation102853.policy.ProcessParameters#getDiagnosticData()} + * See {@link eu.europa.esig.dss.validation.policy.ProcessParameters#getDiagnosticData()} * * @return */ @@ -407,7 +407,7 @@ private boolean process(ProcessParameters params, XmlDom signature, XmlDom signa * @param processNode * @param signatureTimestampValidationData * @param timestamps - * @throws eu.europa.ec.markt.dss.exception.DSSException + * @throws eu.europa.esig.dss.DSSException */ private void dealWithTimestamp(final XmlNode processNode, final XmlDom signatureTimestampValidationData, final List timestamps) throws DSSException { @@ -514,7 +514,7 @@ private void dealWithTimestamp(final XmlNode processNode, final XmlDom signature /** * @param timestamp * @return - * @throws eu.europa.ec.markt.dss.exception.DSSException + * @throws eu.europa.esig.dss.DSSException */ private boolean extractPOEs(final XmlDom timestamp) throws DSSException { diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/process/POEExtraction.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/process/POEExtraction.java similarity index 99% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/process/POEExtraction.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/process/POEExtraction.java index 405731ae66..0b55c2073d 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/process/POEExtraction.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/process/POEExtraction.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.process; +package eu.europa.esig.dss.validation.process; /** diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/TimestampComparator.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/process/TimestampComparator.java similarity index 91% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/TimestampComparator.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/process/TimestampComparator.java index 02208a1af1..3de42f340f 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/TimestampComparator.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/process/TimestampComparator.java @@ -18,11 +18,11 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.processes; +package eu.europa.esig.dss.validation.process; import java.util.Comparator; -import eu.europa.ec.markt.dss.validation102853.xml.XmlDom; +import eu.europa.esig.dss.XmlDom; public class TimestampComparator implements Comparator { diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/TimestampValidation.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/process/TimestampValidation.java similarity index 89% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/TimestampValidation.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/process/TimestampValidation.java index 7ecd8b3fee..97c9eae5a2 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/TimestampValidation.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/process/TimestampValidation.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.processes; +package eu.europa.esig.dss.validation.process; import java.util.ArrayList; import java.util.Date; @@ -27,25 +27,25 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.validation102853.TimestampType; -import eu.europa.ec.markt.dss.validation102853.policy.ProcessParameters; -import eu.europa.ec.markt.dss.validation102853.policy.SignatureCryptographicConstraint; -import eu.europa.ec.markt.dss.validation102853.policy.ValidationPolicy; -import eu.europa.ec.markt.dss.validation102853.processes.subprocesses.CryptographicVerification; -import eu.europa.ec.markt.dss.validation102853.processes.subprocesses.IdentificationOfTheSignersCertificate; -import eu.europa.ec.markt.dss.validation102853.processes.subprocesses.X509CertificateValidation; -import eu.europa.ec.markt.dss.validation102853.report.Conclusion; -import eu.europa.ec.markt.dss.validation102853.rules.AttributeName; -import eu.europa.ec.markt.dss.validation102853.rules.AttributeValue; -import eu.europa.ec.markt.dss.validation102853.rules.ExceptionMessage; -import eu.europa.ec.markt.dss.validation102853.rules.Indication; -import eu.europa.ec.markt.dss.validation102853.rules.MessageTag; -import eu.europa.ec.markt.dss.validation102853.rules.NodeName; -import eu.europa.ec.markt.dss.validation102853.rules.NodeValue; -import eu.europa.ec.markt.dss.validation102853.rules.SubIndication; -import eu.europa.ec.markt.dss.validation102853.xml.XmlDom; -import eu.europa.ec.markt.dss.validation102853.xml.XmlNode; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.XmlDom; +import eu.europa.esig.dss.validation.policy.ProcessParameters; +import eu.europa.esig.dss.validation.policy.SignatureCryptographicConstraint; +import eu.europa.esig.dss.validation.policy.ValidationPolicy; +import eu.europa.esig.dss.validation.policy.XmlNode; +import eu.europa.esig.dss.validation.policy.rules.AttributeName; +import eu.europa.esig.dss.validation.policy.rules.AttributeValue; +import eu.europa.esig.dss.validation.policy.rules.ExceptionMessage; +import eu.europa.esig.dss.validation.policy.rules.Indication; +import eu.europa.esig.dss.validation.policy.rules.MessageTag; +import eu.europa.esig.dss.validation.policy.rules.NodeName; +import eu.europa.esig.dss.validation.policy.rules.NodeValue; +import eu.europa.esig.dss.validation.policy.rules.SubIndication; +import eu.europa.esig.dss.validation.process.subprocess.CryptographicVerification; +import eu.europa.esig.dss.validation.process.subprocess.IdentificationOfTheSignersCertificate; +import eu.europa.esig.dss.validation.process.subprocess.X509CertificateValidation; +import eu.europa.esig.dss.validation.report.Conclusion; +import eu.europa.esig.dss.x509.TimestampType; /** * 7 Validation Process for Time-Stamps
diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/ValidationXPathQueryHolder.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/process/ValidationXPathQueryHolder.java similarity index 97% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/ValidationXPathQueryHolder.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/process/ValidationXPathQueryHolder.java index 7c8b83b12c..68b405bbe1 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/ValidationXPathQueryHolder.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/process/ValidationXPathQueryHolder.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.processes; +package eu.europa.esig.dss.validation.process; /** * diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/dss/ForLegalPerson.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/process/dss/ForLegalPerson.java similarity index 82% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/dss/ForLegalPerson.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/process/dss/ForLegalPerson.java index bc620c12af..18126aae78 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/dss/ForLegalPerson.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/process/dss/ForLegalPerson.java @@ -18,17 +18,17 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.processes.dss; +package eu.europa.esig.dss.validation.process.dss; import java.util.List; -import eu.europa.ec.markt.dss.validation102853.policy.ValidationPolicy; -import eu.europa.ec.markt.dss.validation102853.rules.AttributeName; -import eu.europa.ec.markt.dss.validation102853.rules.AttributeValue; -import eu.europa.ec.markt.dss.validation102853.rules.NodeName; -import eu.europa.ec.markt.dss.validation102853.rules.NodeValue; -import eu.europa.ec.markt.dss.validation102853.rules.RuleConstant; -import eu.europa.ec.markt.dss.validation102853.xml.XmlDom; +import eu.europa.esig.dss.XmlDom; +import eu.europa.esig.dss.validation.policy.ValidationPolicy; +import eu.europa.esig.dss.validation.policy.rules.AttributeName; +import eu.europa.esig.dss.validation.policy.rules.AttributeValue; +import eu.europa.esig.dss.validation.policy.rules.NodeName; +import eu.europa.esig.dss.validation.policy.rules.NodeValue; +import eu.europa.esig.dss.validation.policy.rules.RuleConstant; /** * This class checks if the signer's certificate used in validating the signature is mandated to be issued by a diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/dss/InvolvedServiceInfo.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/process/dss/InvolvedServiceInfo.java similarity index 96% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/dss/InvolvedServiceInfo.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/process/dss/InvolvedServiceInfo.java index 1c90e8cfb0..3a7d287df9 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/dss/InvolvedServiceInfo.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/process/dss/InvolvedServiceInfo.java @@ -18,14 +18,14 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.processes.dss; +package eu.europa.esig.dss.validation.process.dss; import java.util.ArrayList; import java.util.Date; import java.util.List; -import eu.europa.ec.markt.dss.TSLConstant; -import eu.europa.ec.markt.dss.validation102853.xml.XmlDom; +import eu.europa.esig.dss.TSLConstant; +import eu.europa.esig.dss.XmlDom; /** * This class allows to retrieve the appropriated TSP service (current or historical) for the given certificate and the given date time. diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/dss/QualifiedCertificate.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/process/dss/QualifiedCertificate.java similarity index 93% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/dss/QualifiedCertificate.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/process/dss/QualifiedCertificate.java index dcd71dd0b3..f71311aebd 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/dss/QualifiedCertificate.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/process/dss/QualifiedCertificate.java @@ -18,13 +18,13 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.processes.dss; +package eu.europa.esig.dss.validation.process.dss; import java.util.List; -import eu.europa.ec.markt.dss.validation102853.policy.ValidationPolicy; -import eu.europa.ec.markt.dss.validation102853.rules.RuleConstant; -import eu.europa.ec.markt.dss.validation102853.xml.XmlDom; +import eu.europa.esig.dss.XmlDom; +import eu.europa.esig.dss.validation.policy.ValidationPolicy; +import eu.europa.esig.dss.validation.policy.rules.RuleConstant; /** * A.2 Constraints on X.509 Certificate meta-data diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/dss/SSCD.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/process/dss/SSCD.java similarity index 87% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/dss/SSCD.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/process/dss/SSCD.java index e436fe292b..6594187933 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/dss/SSCD.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/process/dss/SSCD.java @@ -18,17 +18,17 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.processes.dss; +package eu.europa.esig.dss.validation.process.dss; import java.util.List; -import eu.europa.ec.markt.dss.validation102853.policy.ValidationPolicy; -import eu.europa.ec.markt.dss.validation102853.rules.AttributeName; -import eu.europa.ec.markt.dss.validation102853.rules.AttributeValue; -import eu.europa.ec.markt.dss.validation102853.rules.NodeName; -import eu.europa.ec.markt.dss.validation102853.rules.NodeValue; -import eu.europa.ec.markt.dss.validation102853.rules.RuleConstant; -import eu.europa.ec.markt.dss.validation102853.xml.XmlDom; +import eu.europa.esig.dss.XmlDom; +import eu.europa.esig.dss.validation.policy.ValidationPolicy; +import eu.europa.esig.dss.validation.policy.rules.AttributeName; +import eu.europa.esig.dss.validation.policy.rules.AttributeValue; +import eu.europa.esig.dss.validation.policy.rules.NodeName; +import eu.europa.esig.dss.validation.policy.rules.NodeValue; +import eu.europa.esig.dss.validation.policy.rules.RuleConstant; /** * This class checks if the signing certificate is mandated to be supported by SSCD device. diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/ltv/ControlTimeSliding.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/process/ltv/ControlTimeSliding.java similarity index 93% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/ltv/ControlTimeSliding.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/process/ltv/ControlTimeSliding.java index e4cc82411a..9d9e76a1cf 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/ltv/ControlTimeSliding.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/process/ltv/ControlTimeSliding.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.processes.ltv; +package eu.europa.esig.dss.validation.process.ltv; import java.util.Collections; import java.util.Date; @@ -26,22 +26,22 @@ import org.apache.commons.lang.StringUtils; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.validation102853.RuleUtils; -import eu.europa.ec.markt.dss.validation102853.policy.ProcessParameters; -import eu.europa.ec.markt.dss.validation102853.policy.ValidationPolicy; -import eu.europa.ec.markt.dss.validation102853.processes.ValidationXPathQueryHolder; -import eu.europa.ec.markt.dss.validation102853.processes.dss.InvolvedServiceInfo; -import eu.europa.ec.markt.dss.validation102853.processes.subprocesses.EtsiPOEExtraction; -import eu.europa.ec.markt.dss.validation102853.rules.AttributeName; -import eu.europa.ec.markt.dss.validation102853.rules.AttributeValue; -import eu.europa.ec.markt.dss.validation102853.rules.Indication; -import eu.europa.ec.markt.dss.validation102853.rules.MessageTag; -import eu.europa.ec.markt.dss.validation102853.rules.NodeName; -import eu.europa.ec.markt.dss.validation102853.rules.NodeValue; -import eu.europa.ec.markt.dss.validation102853.rules.SubIndication; -import eu.europa.ec.markt.dss.validation102853.xml.XmlDom; -import eu.europa.ec.markt.dss.validation102853.xml.XmlNode; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.XmlDom; +import eu.europa.esig.dss.validation.policy.ProcessParameters; +import eu.europa.esig.dss.validation.policy.RuleUtils; +import eu.europa.esig.dss.validation.policy.ValidationPolicy; +import eu.europa.esig.dss.validation.policy.XmlNode; +import eu.europa.esig.dss.validation.policy.rules.AttributeName; +import eu.europa.esig.dss.validation.policy.rules.AttributeValue; +import eu.europa.esig.dss.validation.policy.rules.Indication; +import eu.europa.esig.dss.validation.policy.rules.MessageTag; +import eu.europa.esig.dss.validation.policy.rules.NodeName; +import eu.europa.esig.dss.validation.policy.rules.NodeValue; +import eu.europa.esig.dss.validation.policy.rules.SubIndication; +import eu.europa.esig.dss.validation.process.ValidationXPathQueryHolder; +import eu.europa.esig.dss.validation.process.dss.InvolvedServiceInfo; +import eu.europa.esig.dss.validation.process.subprocess.EtsiPOEExtraction; /** * 9.2.2 Control-time sliding process
diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/ltv/ControlTimeSlidingConclusion.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/process/ltv/ControlTimeSlidingConclusion.java similarity index 90% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/ltv/ControlTimeSlidingConclusion.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/process/ltv/ControlTimeSlidingConclusion.java index 54622260fb..8abc35ca86 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/ltv/ControlTimeSlidingConclusion.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/process/ltv/ControlTimeSlidingConclusion.java @@ -18,11 +18,11 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.processes.ltv; +package eu.europa.esig.dss.validation.process.ltv; import java.util.Date; -import eu.europa.ec.markt.dss.validation102853.report.Conclusion; +import eu.europa.esig.dss.validation.report.Conclusion; /** * diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/ltv/PastCertificateValidation.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/process/ltv/PastCertificateValidation.java similarity index 95% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/ltv/PastCertificateValidation.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/process/ltv/PastCertificateValidation.java index 8192685d60..a21f53e53e 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/ltv/PastCertificateValidation.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/process/ltv/PastCertificateValidation.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.processes.ltv; +package eu.europa.esig.dss.validation.process.ltv; import java.util.Date; import java.util.List; @@ -26,17 +26,17 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.validation102853.policy.ProcessParameters; -import eu.europa.ec.markt.dss.validation102853.processes.dss.ForLegalPerson; -import eu.europa.ec.markt.dss.validation102853.processes.dss.QualifiedCertificate; -import eu.europa.ec.markt.dss.validation102853.processes.dss.SSCD; -import eu.europa.ec.markt.dss.validation102853.processes.subprocesses.X509CertificateValidation; -import eu.europa.ec.markt.dss.validation102853.report.Conclusion.Info; -import eu.europa.ec.markt.dss.validation102853.rules.MessageTag; -import eu.europa.ec.markt.dss.validation102853.xml.XmlDom; -import eu.europa.ec.markt.dss.validation102853.xml.XmlNode; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.XmlDom; +import eu.europa.esig.dss.validation.policy.ProcessParameters; +import eu.europa.esig.dss.validation.policy.XmlNode; +import eu.europa.esig.dss.validation.policy.rules.MessageTag; +import eu.europa.esig.dss.validation.process.dss.ForLegalPerson; +import eu.europa.esig.dss.validation.process.dss.QualifiedCertificate; +import eu.europa.esig.dss.validation.process.dss.SSCD; +import eu.europa.esig.dss.validation.process.subprocess.X509CertificateValidation; +import eu.europa.esig.dss.validation.report.Conclusion.Info; /** * 9.2 Additional Building blocks
diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/ltv/PastCertificateValidationConclusion.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/process/ltv/PastCertificateValidationConclusion.java similarity index 90% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/ltv/PastCertificateValidationConclusion.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/process/ltv/PastCertificateValidationConclusion.java index a306e94989..46e4ad5dd9 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/ltv/PastCertificateValidationConclusion.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/process/ltv/PastCertificateValidationConclusion.java @@ -18,11 +18,11 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.processes.ltv; +package eu.europa.esig.dss.validation.process.ltv; import java.util.Date; -import eu.europa.ec.markt.dss.validation102853.report.Conclusion; +import eu.europa.esig.dss.validation.report.Conclusion; /** * diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/ltv/PastSignatureValidation.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/process/ltv/PastSignatureValidation.java similarity index 91% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/ltv/PastSignatureValidation.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/process/ltv/PastSignatureValidation.java index 6151c4d1e6..88f27748e5 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/ltv/PastSignatureValidation.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/process/ltv/PastSignatureValidation.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.processes.ltv; +package eu.europa.esig.dss.validation.process.ltv; import java.util.Date; import java.util.List; @@ -26,19 +26,19 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.validation102853.policy.ProcessParameters; -import eu.europa.ec.markt.dss.validation102853.processes.subprocesses.EtsiPOEExtraction; -import eu.europa.ec.markt.dss.validation102853.rules.AttributeName; -import eu.europa.ec.markt.dss.validation102853.rules.AttributeValue; -import eu.europa.ec.markt.dss.validation102853.rules.ExceptionMessage; -import eu.europa.ec.markt.dss.validation102853.rules.Indication; -import eu.europa.ec.markt.dss.validation102853.rules.MessageTag; -import eu.europa.ec.markt.dss.validation102853.rules.NodeName; -import eu.europa.ec.markt.dss.validation102853.rules.NodeValue; -import eu.europa.ec.markt.dss.validation102853.rules.SubIndication; -import eu.europa.ec.markt.dss.validation102853.xml.XmlDom; -import eu.europa.ec.markt.dss.validation102853.xml.XmlNode; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.XmlDom; +import eu.europa.esig.dss.validation.policy.ProcessParameters; +import eu.europa.esig.dss.validation.policy.XmlNode; +import eu.europa.esig.dss.validation.policy.rules.AttributeName; +import eu.europa.esig.dss.validation.policy.rules.AttributeValue; +import eu.europa.esig.dss.validation.policy.rules.ExceptionMessage; +import eu.europa.esig.dss.validation.policy.rules.Indication; +import eu.europa.esig.dss.validation.policy.rules.MessageTag; +import eu.europa.esig.dss.validation.policy.rules.NodeName; +import eu.europa.esig.dss.validation.policy.rules.NodeValue; +import eu.europa.esig.dss.validation.policy.rules.SubIndication; +import eu.europa.esig.dss.validation.process.subprocess.EtsiPOEExtraction; /** * 9.2.4 Past signature validation process
diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/ltv/PastSignatureValidationConclusion.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/process/ltv/PastSignatureValidationConclusion.java similarity index 90% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/ltv/PastSignatureValidationConclusion.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/process/ltv/PastSignatureValidationConclusion.java index df3fd239d7..f3be776be6 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/ltv/PastSignatureValidationConclusion.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/process/ltv/PastSignatureValidationConclusion.java @@ -18,11 +18,11 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.processes.ltv; +package eu.europa.esig.dss.validation.process.ltv; import java.util.Date; -import eu.europa.ec.markt.dss.validation102853.report.Conclusion; +import eu.europa.esig.dss.validation.report.Conclusion; /** * diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/subprocesses/CryptographicVerification.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/process/subprocess/CryptographicVerification.java similarity index 88% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/subprocesses/CryptographicVerification.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/process/subprocess/CryptographicVerification.java index b040539442..92aea9b760 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/subprocesses/CryptographicVerification.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/process/subprocess/CryptographicVerification.java @@ -18,24 +18,24 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.processes.subprocesses; - -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.validation102853.policy.Constraint; -import eu.europa.ec.markt.dss.validation102853.policy.ProcessParameters; -import eu.europa.ec.markt.dss.validation102853.policy.ValidationPolicy; -import eu.europa.ec.markt.dss.validation102853.processes.ValidationXPathQueryHolder; -import eu.europa.ec.markt.dss.validation102853.report.Conclusion; -import eu.europa.ec.markt.dss.validation102853.rules.AttributeName; -import eu.europa.ec.markt.dss.validation102853.rules.AttributeValue; -import eu.europa.ec.markt.dss.validation102853.rules.ExceptionMessage; -import eu.europa.ec.markt.dss.validation102853.rules.Indication; -import eu.europa.ec.markt.dss.validation102853.rules.MessageTag; -import eu.europa.ec.markt.dss.validation102853.rules.NodeName; -import eu.europa.ec.markt.dss.validation102853.rules.NodeValue; -import eu.europa.ec.markt.dss.validation102853.rules.SubIndication; -import eu.europa.ec.markt.dss.validation102853.xml.XmlDom; -import eu.europa.ec.markt.dss.validation102853.xml.XmlNode; +package eu.europa.esig.dss.validation.process.subprocess; + +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.XmlDom; +import eu.europa.esig.dss.validation.policy.Constraint; +import eu.europa.esig.dss.validation.policy.ProcessParameters; +import eu.europa.esig.dss.validation.policy.ValidationPolicy; +import eu.europa.esig.dss.validation.policy.XmlNode; +import eu.europa.esig.dss.validation.policy.rules.AttributeName; +import eu.europa.esig.dss.validation.policy.rules.AttributeValue; +import eu.europa.esig.dss.validation.policy.rules.ExceptionMessage; +import eu.europa.esig.dss.validation.policy.rules.Indication; +import eu.europa.esig.dss.validation.policy.rules.MessageTag; +import eu.europa.esig.dss.validation.policy.rules.NodeName; +import eu.europa.esig.dss.validation.policy.rules.NodeValue; +import eu.europa.esig.dss.validation.policy.rules.SubIndication; +import eu.europa.esig.dss.validation.process.ValidationXPathQueryHolder; +import eu.europa.esig.dss.validation.report.Conclusion; /** * This class executes the cryptographic signature verification. It can be for the document signatures or timestamp diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/subprocesses/EtsiPOEExtraction.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/process/subprocess/EtsiPOEExtraction.java similarity index 95% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/subprocesses/EtsiPOEExtraction.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/process/subprocess/EtsiPOEExtraction.java index 0a5399093f..019a1e3a43 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/subprocesses/EtsiPOEExtraction.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/process/subprocess/EtsiPOEExtraction.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.processes.subprocesses; +package eu.europa.esig.dss.validation.process.subprocess; import java.util.ArrayList; import java.util.Date; @@ -29,13 +29,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.validation102853.process.POEExtraction; -import eu.europa.ec.markt.dss.validation102853.rules.AttributeName; -import eu.europa.ec.markt.dss.validation102853.rules.AttributeValue; -import eu.europa.ec.markt.dss.validation102853.rules.ExceptionMessage; -import eu.europa.ec.markt.dss.validation102853.rules.NodeName; -import eu.europa.ec.markt.dss.validation102853.xml.XmlDom; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.XmlDom; +import eu.europa.esig.dss.validation.policy.rules.AttributeName; +import eu.europa.esig.dss.validation.policy.rules.AttributeValue; +import eu.europa.esig.dss.validation.policy.rules.ExceptionMessage; +import eu.europa.esig.dss.validation.policy.rules.NodeName; +import eu.europa.esig.dss.validation.process.POEExtraction; /** * 9.2.3 POE extraction
diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/subprocesses/IdentificationOfTheSignersCertificate.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/process/subprocess/IdentificationOfTheSignersCertificate.java similarity index 93% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/subprocesses/IdentificationOfTheSignersCertificate.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/process/subprocess/IdentificationOfTheSignersCertificate.java index 2fb9547e7e..ae83ba20ca 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/subprocesses/IdentificationOfTheSignersCertificate.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/process/subprocess/IdentificationOfTheSignersCertificate.java @@ -18,25 +18,25 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.processes.subprocesses; +package eu.europa.esig.dss.validation.process.subprocess; import org.apache.commons.lang.StringUtils; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.validation102853.policy.Constraint; -import eu.europa.ec.markt.dss.validation102853.policy.ProcessParameters; -import eu.europa.ec.markt.dss.validation102853.report.Conclusion; -import eu.europa.ec.markt.dss.validation102853.rules.AttributeName; -import eu.europa.ec.markt.dss.validation102853.rules.AttributeValue; -import eu.europa.ec.markt.dss.validation102853.rules.ExceptionMessage; -import eu.europa.ec.markt.dss.validation102853.rules.Indication; -import eu.europa.ec.markt.dss.validation102853.rules.MessageTag; -import eu.europa.ec.markt.dss.validation102853.rules.NodeName; -import eu.europa.ec.markt.dss.validation102853.rules.NodeValue; -import eu.europa.ec.markt.dss.validation102853.rules.SubIndication; -import eu.europa.ec.markt.dss.validation102853.xades.XPathQueryHolder; -import eu.europa.ec.markt.dss.validation102853.xml.XmlDom; -import eu.europa.ec.markt.dss.validation102853.xml.XmlNode; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.XPathQueryHolder; +import eu.europa.esig.dss.XmlDom; +import eu.europa.esig.dss.validation.policy.Constraint; +import eu.europa.esig.dss.validation.policy.ProcessParameters; +import eu.europa.esig.dss.validation.policy.XmlNode; +import eu.europa.esig.dss.validation.policy.rules.AttributeName; +import eu.europa.esig.dss.validation.policy.rules.AttributeValue; +import eu.europa.esig.dss.validation.policy.rules.ExceptionMessage; +import eu.europa.esig.dss.validation.policy.rules.Indication; +import eu.europa.esig.dss.validation.policy.rules.MessageTag; +import eu.europa.esig.dss.validation.policy.rules.NodeName; +import eu.europa.esig.dss.validation.policy.rules.NodeValue; +import eu.europa.esig.dss.validation.policy.rules.SubIndication; +import eu.europa.esig.dss.validation.report.Conclusion; /** * 5.1 Identification of the Signer's Certificate (ISC) diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/subprocesses/SignatureAcceptanceValidation.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/process/subprocess/SignatureAcceptanceValidation.java similarity index 95% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/subprocesses/SignatureAcceptanceValidation.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/process/subprocess/SignatureAcceptanceValidation.java index 6af8065487..614ee3328a 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/subprocesses/SignatureAcceptanceValidation.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/process/subprocess/SignatureAcceptanceValidation.java @@ -18,32 +18,32 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.processes.subprocesses; +package eu.europa.esig.dss.validation.process.subprocess; import java.util.Date; import java.util.List; import org.apache.commons.lang.StringUtils; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.validation102853.RuleUtils; -import eu.europa.ec.markt.dss.validation102853.TimestampType; -import eu.europa.ec.markt.dss.validation102853.policy.Constraint; -import eu.europa.ec.markt.dss.validation102853.policy.ProcessParameters; -import eu.europa.ec.markt.dss.validation102853.policy.SignatureCryptographicConstraint; -import eu.europa.ec.markt.dss.validation102853.policy.ValidationPolicy; -import eu.europa.ec.markt.dss.validation102853.processes.ValidationXPathQueryHolder; -import eu.europa.ec.markt.dss.validation102853.report.Conclusion; -import eu.europa.ec.markt.dss.validation102853.rules.AttributeName; -import eu.europa.ec.markt.dss.validation102853.rules.AttributeValue; -import eu.europa.ec.markt.dss.validation102853.rules.ExceptionMessage; -import eu.europa.ec.markt.dss.validation102853.rules.Indication; -import eu.europa.ec.markt.dss.validation102853.rules.MessageTag; -import eu.europa.ec.markt.dss.validation102853.rules.NodeName; -import eu.europa.ec.markt.dss.validation102853.rules.NodeValue; -import eu.europa.ec.markt.dss.validation102853.rules.SubIndication; -import eu.europa.ec.markt.dss.validation102853.xml.XmlDom; -import eu.europa.ec.markt.dss.validation102853.xml.XmlNode; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.XmlDom; +import eu.europa.esig.dss.validation.policy.Constraint; +import eu.europa.esig.dss.validation.policy.ProcessParameters; +import eu.europa.esig.dss.validation.policy.RuleUtils; +import eu.europa.esig.dss.validation.policy.SignatureCryptographicConstraint; +import eu.europa.esig.dss.validation.policy.ValidationPolicy; +import eu.europa.esig.dss.validation.policy.XmlNode; +import eu.europa.esig.dss.validation.policy.rules.AttributeName; +import eu.europa.esig.dss.validation.policy.rules.AttributeValue; +import eu.europa.esig.dss.validation.policy.rules.ExceptionMessage; +import eu.europa.esig.dss.validation.policy.rules.Indication; +import eu.europa.esig.dss.validation.policy.rules.MessageTag; +import eu.europa.esig.dss.validation.policy.rules.NodeName; +import eu.europa.esig.dss.validation.policy.rules.NodeValue; +import eu.europa.esig.dss.validation.policy.rules.SubIndication; +import eu.europa.esig.dss.validation.process.ValidationXPathQueryHolder; +import eu.europa.esig.dss.validation.report.Conclusion; +import eu.europa.esig.dss.x509.TimestampType; /** diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/subprocesses/ValidationContextInitialisation.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/process/subprocess/ValidationContextInitialisation.java similarity index 90% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/subprocesses/ValidationContextInitialisation.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/process/subprocess/ValidationContextInitialisation.java index 17a142f839..44e54c20d5 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/subprocesses/ValidationContextInitialisation.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/process/subprocess/ValidationContextInitialisation.java @@ -18,27 +18,27 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.processes.subprocesses; +package eu.europa.esig.dss.validation.process.subprocess; import org.apache.commons.lang.StringUtils; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.validation102853.SignaturePolicy; -import eu.europa.ec.markt.dss.validation102853.policy.ProcessParameters; -import eu.europa.ec.markt.dss.validation102853.policy.SignaturePolicyConstraint; -import eu.europa.ec.markt.dss.validation102853.policy.ValidationPolicy; -import eu.europa.ec.markt.dss.validation102853.report.Conclusion; -import eu.europa.ec.markt.dss.validation102853.rules.AttributeName; -import eu.europa.ec.markt.dss.validation102853.rules.AttributeValue; -import eu.europa.ec.markt.dss.validation102853.rules.ExceptionMessage; -import eu.europa.ec.markt.dss.validation102853.rules.Indication; -import eu.europa.ec.markt.dss.validation102853.rules.MessageTag; -import eu.europa.ec.markt.dss.validation102853.rules.NodeName; -import eu.europa.ec.markt.dss.validation102853.rules.NodeValue; -import eu.europa.ec.markt.dss.validation102853.rules.RuleConstant; -import eu.europa.ec.markt.dss.validation102853.rules.SubIndication; -import eu.europa.ec.markt.dss.validation102853.xml.XmlDom; -import eu.europa.ec.markt.dss.validation102853.xml.XmlNode; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.XmlDom; +import eu.europa.esig.dss.validation.policy.ProcessParameters; +import eu.europa.esig.dss.validation.policy.SignaturePolicyConstraint; +import eu.europa.esig.dss.validation.policy.ValidationPolicy; +import eu.europa.esig.dss.validation.policy.XmlNode; +import eu.europa.esig.dss.validation.policy.rules.AttributeName; +import eu.europa.esig.dss.validation.policy.rules.AttributeValue; +import eu.europa.esig.dss.validation.policy.rules.ExceptionMessage; +import eu.europa.esig.dss.validation.policy.rules.Indication; +import eu.europa.esig.dss.validation.policy.rules.MessageTag; +import eu.europa.esig.dss.validation.policy.rules.NodeName; +import eu.europa.esig.dss.validation.policy.rules.NodeValue; +import eu.europa.esig.dss.validation.policy.rules.RuleConstant; +import eu.europa.esig.dss.validation.policy.rules.SubIndication; +import eu.europa.esig.dss.validation.report.Conclusion; +import eu.europa.esig.dss.x509.SignaturePolicy; /** * 5.2 Validation Context Initialization (VCI)
diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/subprocesses/X509CertificateValidation.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/process/subprocess/X509CertificateValidation.java similarity index 95% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/subprocesses/X509CertificateValidation.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/process/subprocess/X509CertificateValidation.java index 8fe66dba9c..1052fac722 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/processes/subprocesses/X509CertificateValidation.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/process/subprocess/X509CertificateValidation.java @@ -18,39 +18,39 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.processes.subprocesses; +package eu.europa.esig.dss.validation.process.subprocess; import java.util.Date; import java.util.List; import org.apache.commons.lang.StringUtils; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.TSLConstant; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.validation102853.certificate.CertificateSourceType; -import eu.europa.ec.markt.dss.validation102853.crl.CRLReasonEnum; -import eu.europa.ec.markt.dss.validation102853.policy.CertificateExpirationConstraint; -import eu.europa.ec.markt.dss.validation102853.policy.Constraint; -import eu.europa.ec.markt.dss.validation102853.policy.ProcessParameters; -import eu.europa.ec.markt.dss.validation102853.policy.SignatureCryptographicConstraint; -import eu.europa.ec.markt.dss.validation102853.policy.ValidationPolicy; -import eu.europa.ec.markt.dss.validation102853.processes.ValidationXPathQueryHolder; -import eu.europa.ec.markt.dss.validation102853.processes.dss.ForLegalPerson; -import eu.europa.ec.markt.dss.validation102853.processes.dss.QualifiedCertificate; -import eu.europa.ec.markt.dss.validation102853.processes.dss.SSCD; -import eu.europa.ec.markt.dss.validation102853.report.Conclusion; -import eu.europa.ec.markt.dss.validation102853.rules.AttributeName; -import eu.europa.ec.markt.dss.validation102853.rules.AttributeValue; -import eu.europa.ec.markt.dss.validation102853.rules.ExceptionMessage; -import eu.europa.ec.markt.dss.validation102853.rules.Indication; -import eu.europa.ec.markt.dss.validation102853.rules.MessageTag; -import eu.europa.ec.markt.dss.validation102853.rules.NodeName; -import eu.europa.ec.markt.dss.validation102853.rules.NodeValue; -import eu.europa.ec.markt.dss.validation102853.rules.RuleConstant; -import eu.europa.ec.markt.dss.validation102853.rules.SubIndication; -import eu.europa.ec.markt.dss.validation102853.xml.XmlDom; -import eu.europa.ec.markt.dss.validation102853.xml.XmlNode; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.TSLConstant; +import eu.europa.esig.dss.XmlDom; +import eu.europa.esig.dss.validation.policy.CertificateExpirationConstraint; +import eu.europa.esig.dss.validation.policy.Constraint; +import eu.europa.esig.dss.validation.policy.ProcessParameters; +import eu.europa.esig.dss.validation.policy.SignatureCryptographicConstraint; +import eu.europa.esig.dss.validation.policy.ValidationPolicy; +import eu.europa.esig.dss.validation.policy.XmlNode; +import eu.europa.esig.dss.validation.policy.rules.AttributeName; +import eu.europa.esig.dss.validation.policy.rules.AttributeValue; +import eu.europa.esig.dss.validation.policy.rules.ExceptionMessage; +import eu.europa.esig.dss.validation.policy.rules.Indication; +import eu.europa.esig.dss.validation.policy.rules.MessageTag; +import eu.europa.esig.dss.validation.policy.rules.NodeName; +import eu.europa.esig.dss.validation.policy.rules.NodeValue; +import eu.europa.esig.dss.validation.policy.rules.RuleConstant; +import eu.europa.esig.dss.validation.policy.rules.SubIndication; +import eu.europa.esig.dss.validation.process.ValidationXPathQueryHolder; +import eu.europa.esig.dss.validation.process.dss.ForLegalPerson; +import eu.europa.esig.dss.validation.process.dss.QualifiedCertificate; +import eu.europa.esig.dss.validation.process.dss.SSCD; +import eu.europa.esig.dss.validation.report.Conclusion; +import eu.europa.esig.dss.x509.CertificateSourceType; +import eu.europa.esig.dss.x509.crl.CRLReasonEnum; public class X509CertificateValidation implements Indication, SubIndication, NodeName, NodeValue, AttributeName, AttributeValue, ExceptionMessage, RuleConstant, ValidationXPathQueryHolder { diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/report/Conclusion.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/report/Conclusion.java similarity index 97% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/report/Conclusion.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/report/Conclusion.java index 6f3450f987..c5bd181810 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/report/Conclusion.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/report/Conclusion.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.report; +package eu.europa.esig.dss.validation.report; import java.util.ArrayList; import java.util.HashMap; @@ -29,14 +29,14 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.validation102853.rules.AttributeName; -import eu.europa.ec.markt.dss.validation102853.rules.Indication; -import eu.europa.ec.markt.dss.validation102853.rules.MessageTag; -import eu.europa.ec.markt.dss.validation102853.rules.NodeName; -import eu.europa.ec.markt.dss.validation102853.rules.SubIndication; -import eu.europa.ec.markt.dss.validation102853.xml.XmlDom; -import eu.europa.ec.markt.dss.validation102853.xml.XmlNode; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.XmlDom; +import eu.europa.esig.dss.validation.policy.XmlNode; +import eu.europa.esig.dss.validation.policy.rules.AttributeName; +import eu.europa.esig.dss.validation.policy.rules.Indication; +import eu.europa.esig.dss.validation.policy.rules.MessageTag; +import eu.europa.esig.dss.validation.policy.rules.NodeName; +import eu.europa.esig.dss.validation.policy.rules.SubIndication; /** * This class represents the conclusion (result) of the process, with at least the Indication, SubIndication (if any)... diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/report/DetailedReport.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/report/DetailedReport.java similarity index 97% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/report/DetailedReport.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/report/DetailedReport.java index 77ef01287b..c20486237b 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/report/DetailedReport.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/report/DetailedReport.java @@ -18,17 +18,17 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.report; +package eu.europa.esig.dss.validation.report; import java.util.ArrayList; import java.util.List; import org.w3c.dom.Document; -import eu.europa.ec.markt.dss.validation102853.TimestampType; -import eu.europa.ec.markt.dss.validation102853.rules.Indication; -import eu.europa.ec.markt.dss.validation102853.rules.MessageTag; -import eu.europa.ec.markt.dss.validation102853.xml.XmlDom; +import eu.europa.esig.dss.XmlDom; +import eu.europa.esig.dss.validation.policy.rules.Indication; +import eu.europa.esig.dss.validation.policy.rules.MessageTag; +import eu.europa.esig.dss.x509.TimestampType; /** * This class represents the detailed report built during the validation process. It contains information on each executed constraint. It is composed among other of the diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/report/DiagnosticData.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/report/DiagnosticData.java similarity index 98% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/report/DiagnosticData.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/report/DiagnosticData.java index 68c387d9dd..5d30dae631 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/report/DiagnosticData.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/report/DiagnosticData.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.report; +package eu.europa.esig.dss.validation.report; import java.util.ArrayList; import java.util.Date; @@ -27,12 +27,12 @@ import org.w3c.dom.Document; import org.w3c.dom.NodeList; -import eu.europa.ec.markt.dss.DigestAlgorithm; -import eu.europa.ec.markt.dss.EncryptionAlgorithm; -import eu.europa.ec.markt.dss.TSLConstant; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.validation102853.TimestampType; -import eu.europa.ec.markt.dss.validation102853.xml.XmlDom; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DigestAlgorithm; +import eu.europa.esig.dss.EncryptionAlgorithm; +import eu.europa.esig.dss.TSLConstant; +import eu.europa.esig.dss.XmlDom; +import eu.europa.esig.dss.x509.TimestampType; /** * This class represents all static data extracted by the process analysing the signature. They are independent from the validation policy to be applied. diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/report/Reports.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/report/Reports.java similarity index 98% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/report/Reports.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/report/Reports.java index 91af724657..db0f71f642 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/report/Reports.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/report/Reports.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.report; +package eu.europa.esig.dss.validation.report; /** * This class is a container for all reports generated by the validation process: diagnostic data, detailed report and simple report. diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/report/SimpleReport.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/report/SimpleReport.java similarity index 95% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/report/SimpleReport.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/report/SimpleReport.java index 2f970f8348..9a1cf03656 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/report/SimpleReport.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/report/SimpleReport.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.report; +package eu.europa.esig.dss.validation.report; import java.util.ArrayList; import java.util.Date; @@ -28,9 +28,9 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; -import eu.europa.ec.markt.dss.validation102853.SignatureType; -import eu.europa.ec.markt.dss.validation102853.rules.Indication; -import eu.europa.ec.markt.dss.validation102853.xml.XmlDom; +import eu.europa.esig.dss.XmlDom; +import eu.europa.esig.dss.validation.policy.SignatureType; +import eu.europa.esig.dss.validation.policy.rules.Indication; /** * A SimpleReport holder to fetch properties from a XmlDom simpleReport. diff --git a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/report/SimpleReportBuilder.java b/validation-policy/src/main/java/eu/europa/esig/dss/validation/report/SimpleReportBuilder.java similarity index 91% rename from validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/report/SimpleReportBuilder.java rename to validation-policy/src/main/java/eu/europa/esig/dss/validation/report/SimpleReportBuilder.java index d5f6a8bdd2..f4d1ac9c08 100644 --- a/validation-policy/src/main/java/eu/europa/ec/markt/dss/validation102853/report/SimpleReportBuilder.java +++ b/validation-policy/src/main/java/eu/europa/esig/dss/validation/report/SimpleReportBuilder.java @@ -18,7 +18,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package eu.europa.ec.markt.dss.validation102853.report; +package eu.europa.esig.dss.validation.report; import java.util.ArrayList; import java.util.Date; @@ -33,24 +33,24 @@ import org.slf4j.LoggerFactory; import org.w3c.dom.Document; -import eu.europa.ec.markt.dss.DSSUtils; -import eu.europa.ec.markt.dss.TSLConstant; -import eu.europa.ec.markt.dss.exception.DSSException; -import eu.europa.ec.markt.dss.validation102853.CertificateQualification; -import eu.europa.ec.markt.dss.validation102853.SignatureQualification; -import eu.europa.ec.markt.dss.validation102853.SignatureType; -import eu.europa.ec.markt.dss.validation102853.TLQualification; -import eu.europa.ec.markt.dss.validation102853.policy.ProcessParameters; -import eu.europa.ec.markt.dss.validation102853.policy.ValidationPolicy; -import eu.europa.ec.markt.dss.validation102853.processes.dss.InvolvedServiceInfo; -import eu.europa.ec.markt.dss.validation102853.rules.AttributeName; -import eu.europa.ec.markt.dss.validation102853.rules.AttributeValue; -import eu.europa.ec.markt.dss.validation102853.rules.Indication; -import eu.europa.ec.markt.dss.validation102853.rules.MessageTag; -import eu.europa.ec.markt.dss.validation102853.rules.NodeName; -import eu.europa.ec.markt.dss.validation102853.rules.SubIndication; -import eu.europa.ec.markt.dss.validation102853.xml.XmlDom; -import eu.europa.ec.markt.dss.validation102853.xml.XmlNode; +import eu.europa.esig.dss.DSSException; +import eu.europa.esig.dss.DSSUtils; +import eu.europa.esig.dss.TSLConstant; +import eu.europa.esig.dss.XmlDom; +import eu.europa.esig.dss.validation.policy.CertificateQualification; +import eu.europa.esig.dss.validation.policy.ProcessParameters; +import eu.europa.esig.dss.validation.policy.SignatureQualification; +import eu.europa.esig.dss.validation.policy.SignatureType; +import eu.europa.esig.dss.validation.policy.TLQualification; +import eu.europa.esig.dss.validation.policy.ValidationPolicy; +import eu.europa.esig.dss.validation.policy.XmlNode; +import eu.europa.esig.dss.validation.policy.rules.AttributeName; +import eu.europa.esig.dss.validation.policy.rules.AttributeValue; +import eu.europa.esig.dss.validation.policy.rules.Indication; +import eu.europa.esig.dss.validation.policy.rules.MessageTag; +import eu.europa.esig.dss.validation.policy.rules.NodeName; +import eu.europa.esig.dss.validation.policy.rules.SubIndication; +import eu.europa.esig.dss.validation.process.dss.InvolvedServiceInfo; /** * This class builds a SimpleReport XmlDom from the diagnostic data and detailed validation report. diff --git a/validation-policy/src/test/java/eu/europa/ec/markt/dss/validation102853/policy/ValidationPolicyTest.java b/validation-policy/src/test/java/eu/europa/esig/dss/validation/policy/ValidationPolicyTest.java similarity index 82% rename from validation-policy/src/test/java/eu/europa/ec/markt/dss/validation102853/policy/ValidationPolicyTest.java rename to validation-policy/src/test/java/eu/europa/esig/dss/validation/policy/ValidationPolicyTest.java index 3ff307ae05..2916cbbf2d 100644 --- a/validation-policy/src/test/java/eu/europa/ec/markt/dss/validation102853/policy/ValidationPolicyTest.java +++ b/validation-policy/src/test/java/eu/europa/esig/dss/validation/policy/ValidationPolicyTest.java @@ -1,4 +1,6 @@ -package eu.europa.ec.markt.dss.validation102853.policy; +package eu.europa.esig.dss.validation.policy; + +import static org.junit.Assert.assertNotNull; import java.io.ByteArrayInputStream; @@ -18,6 +20,7 @@ public void test1() throws Exception { EtsiValidationPolicy policy = new EtsiValidationPolicy(dbf.newDocumentBuilder().parse(new ByteArrayInputStream(data))); + assertNotNull(policy); } }