Rename root package from "eu.europa.ec.markt.dss" to "eu.europa.esig.…

…dss"
Houpert · Apr 9, 2015 · 9b2c99e · 9b2c99e
1 parent c406903
commit 9b2c99e
Show file tree

Hide file tree

Showing 700 changed files with 5,059 additions and 5,498 deletions.
diff --git a/...c/markt/dss/parameter/ASiCParameters.java → .../europa/esig/dss/asic/ASiCParameters.java b/...c/markt/dss/parameter/ASiCParameters.java → .../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/...ss/parameter/ASiCSignatureParameters.java → ...sig/dss/asic/ASiCSignatureParameters.java b/...ss/parameter/ASiCSignatureParameters.java → ...sig/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/...markt/dss/signature/asic/ASiCService.java → .../esig/dss/asic/signature/ASiCService.java b/...markt/dss/signature/asic/ASiCService.java → .../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/...102853/asic/ASiCCMSDocumentValidator.java → .../validation/ASiCCMSDocumentValidator.java b/...102853/asic/ASiCCMSDocumentValidator.java → .../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/...on102853/asic/ASiCContainerValidator.java → ...ic/validation/ASiCContainerValidator.java b/...on102853/asic/ASiCContainerValidator.java → ...ic/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/.../asic/ASiCTimestampDocumentValidator.java → ...ation/ASiCTimestampDocumentValidator.java b/.../asic/ASiCTimestampDocumentValidator.java → ...ation/ASiCTimestampDocumentValidator.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.asic;
+package eu.europa.esig.dss.asic.validation;
 
 import java.io.IOException;
 import java.util.List;
 
 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<DSSDocument> detachedContents) throws DSSException {
 

diff --git a/...102853/asic/ASiCXMLDocumentValidator.java → .../validation/ASiCXMLDocumentValidator.java b/...102853/asic/ASiCXMLDocumentValidator.java → .../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/...c/AbstractTestASiCwithCAdESExtension.java → ...n/AbstractTestASiCwithCAdESExtension.java b/...c/AbstractTestASiCwithCAdESExtension.java → ...n/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/...c/AbstractTestASiCwithXAdESExtension.java → ...n/AbstractTestASiCwithXAdESExtension.java b/...c/AbstractTestASiCwithXAdESExtension.java → ...n/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/...ice/ASiCeExtensionWithXAdESBToLTTest.java → ...ice/ASiCeExtensionWithXAdESBToLTTest.java b/...ice/ASiCeExtensionWithXAdESBToLTTest.java → ...ice/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/...sice/ASiCeExtensionWithXAdESBToTTest.java → ...sice/ASiCeExtensionWithXAdESBToTTest.java b/...sice/ASiCeExtensionWithXAdESBToTTest.java → ...sice/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/...ice/ASiCeExtensionWithXAdESTToLTTest.java → ...ice/ASiCeExtensionWithXAdESTToLTTest.java b/...ice/ASiCeExtensionWithXAdESTToLTTest.java → ...ice/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/...sics/ASiCsExtensionWithCAdESBToTTest.java → ...sics/ASiCsExtensionWithCAdESBToTTest.java b/...sics/ASiCsExtensionWithCAdESBToTTest.java → ...sics/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/...ics/ASiCsExtensionWithXAdESBToLTTest.java → ...ics/ASiCsExtensionWithXAdESBToLTTest.java b/...ics/ASiCsExtensionWithXAdESBToLTTest.java → ...ics/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/...sics/ASiCsExtensionWithXAdESBToTTest.java → ...sics/ASiCsExtensionWithXAdESBToTTest.java b/...sics/ASiCsExtensionWithXAdESBToTTest.java → ...sics/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/...ics/ASiCsExtensionWithXAdESTToLTTest.java → ...ics/ASiCsExtensionWithXAdESTToLTTest.java b/...ics/ASiCsExtensionWithXAdESTToLTTest.java → ...ics/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 {