From f8ce5f7332bd79b584ddd45ed8062cfdb5a938f3 Mon Sep 17 00:00:00 2001 From: Jan Malkiewicz Date: Fri, 18 Sep 2020 09:53:12 +0200 Subject: [PATCH] [OOM-CMPv2] Rename module folder truststoreMerger -> certServicePostProcessor Issue-ID: DCAEGEN2-2253 Signed-off-by: Jan Malkiewicz Change-Id: I975f37507f7f79c238f1eac15f375fe64761c80c --- {trustStoreMerger => certServicePostProcessor}/Dockerfile | 0 {trustStoreMerger => certServicePostProcessor}/README.md | 0 {trustStoreMerger => certServicePostProcessor}/pom.xml | 0 .../org/onap/oom/certservice/postprocessor/AppExecutor.java | 0 .../onap/oom/certservice/postprocessor/AppExitHandler.java | 0 .../certservice/postprocessor/CertificatePostProcessor.java | 0 .../org/onap/oom/certservice/postprocessor/MainApp.java | 0 .../certservice/postprocessor/api/CertificateConstants.java | 0 .../onap/oom/certservice/postprocessor/api/ExitStatus.java | 0 .../certservice/postprocessor/api/ExitableException.java | 0 .../certservice/postprocessor/common/ExtensionResolver.java | 0 .../oom/certservice/postprocessor/common/FileTools.java | 0 .../certservice/postprocessor/common/PasswordReader.java | 0 .../postprocessor/configuration/AppConfigurationLoader.java | 0 .../configuration/AppConfigurationProvider.java | 0 .../exception/CertificatesPathsValidationException.java | 0 .../configuration/exception/ConfigurationException.java | 0 .../postprocessor/configuration/model/AppConfiguration.java | 0 .../postprocessor/configuration/model/EnvVariable.java | 0 .../configuration/path/DelimitedPathsSplitter.java | 0 .../postprocessor/configuration/path/env/EnvReader.java | 0 .../configuration/path/validation/ValidationFunctions.java | 0 .../certservice/postprocessor/copier/KeystoreCopier.java | 0 .../copier/exception/KeystoreFileCopyException.java | 0 .../copier/exception/KeystoreNotExistException.java | 0 .../postprocessor/merger/TruststoreFilesProvider.java | 0 .../certservice/postprocessor/merger/TruststoreMerger.java | 0 .../merger/exception/AliasConflictException.java | 0 .../merger/exception/CreateBackupException.java | 0 .../merger/exception/KeystoreInstanceException.java | 0 .../merger/exception/LoadTruststoreException.java | 0 .../merger/exception/MissingTruststoreException.java | 0 .../merger/exception/PasswordReaderException.java | 0 .../merger/exception/TruststoreDataOperationException.java | 0 .../merger/exception/TruststoreFileFactoryException.java | 0 .../merger/exception/WriteTruststoreFileException.java | 0 .../postprocessor/merger/model/JavaTruststore.java | 0 .../postprocessor/merger/model/JavaTruststoreFactory.java | 0 .../postprocessor/merger/model/PemTruststore.java | 0 .../certservice/postprocessor/merger/model/Truststore.java | 0 .../postprocessor/merger/model/TruststoreFactory.java | 0 .../merger/model/certificate/CertificateWithAlias.java | 0 .../model/certificate/CertificateWithAliasFactory.java | 0 .../merger/model/certificate/PemAliasGenerator.java | 0 .../src/main/resources/log4j2.xml | 0 .../onap/oom/certservice/postprocessor/AppExecutorTest.java | 0 .../postprocessor/common/ExtensionResolverTest.java | 0 .../oom/certservice/postprocessor/common/FileToolsTest.java | 0 .../postprocessor/common/PasswordReaderTest.java | 0 .../configuration/AppConfigurationProviderTest.java | 0 .../configuration/path/DelimitedPathsSplitterTest.java | 0 .../postprocessor/configuration/path/env/EnvReaderTest.java | 0 .../path/validation/ValidationFunctionsTest.java | 0 .../postprocessor/copier/KeystoreCopierTest.java | 0 .../postprocessor/merger/TruststoreFilesProviderTest.java | 0 .../postprocessor/merger/model/JavaTruststoreTest.java | 0 .../postprocessor/merger/model/PemTruststoreTest.java | 0 .../postprocessor/merger/model/TestCertificateProvider.java | 0 .../postprocessor/merger/model/TruststoreFactoryTest.java | 0 .../postprocessor/merger/model/TruststoreTest.java | 0 .../merger/model/certificate/PemAliasGeneratorTest.java | 0 .../src/test/resources/empty-truststore.pem | 0 .../src/test/resources/keystore.p12 | Bin .../src/test/resources/keystore.pass | 0 .../src/test/resources/truststore-jks-uniq.jks | Bin .../src/test/resources/truststore-jks.jks | Bin .../src/test/resources/truststore-jks.pass | 0 .../src/test/resources/truststore-p12.p12 | Bin .../src/test/resources/truststore-p12.pass | 0 .../src/test/resources/truststore-with-private-key.pem | 0 .../src/test/resources/truststore.pem | 0 pom.xml | 2 +- 72 files changed, 1 insertion(+), 1 deletion(-) rename {trustStoreMerger => certServicePostProcessor}/Dockerfile (100%) rename {trustStoreMerger => certServicePostProcessor}/README.md (100%) rename {trustStoreMerger => certServicePostProcessor}/pom.xml (100%) rename {trustStoreMerger => certServicePostProcessor}/src/main/java/org/onap/oom/certservice/postprocessor/AppExecutor.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/main/java/org/onap/oom/certservice/postprocessor/AppExitHandler.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/main/java/org/onap/oom/certservice/postprocessor/CertificatePostProcessor.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/main/java/org/onap/oom/certservice/postprocessor/MainApp.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/main/java/org/onap/oom/certservice/postprocessor/api/CertificateConstants.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/main/java/org/onap/oom/certservice/postprocessor/api/ExitStatus.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/main/java/org/onap/oom/certservice/postprocessor/api/ExitableException.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/main/java/org/onap/oom/certservice/postprocessor/common/ExtensionResolver.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/main/java/org/onap/oom/certservice/postprocessor/common/FileTools.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/main/java/org/onap/oom/certservice/postprocessor/common/PasswordReader.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/main/java/org/onap/oom/certservice/postprocessor/configuration/AppConfigurationLoader.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/main/java/org/onap/oom/certservice/postprocessor/configuration/AppConfigurationProvider.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/main/java/org/onap/oom/certservice/postprocessor/configuration/exception/CertificatesPathsValidationException.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/main/java/org/onap/oom/certservice/postprocessor/configuration/exception/ConfigurationException.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/main/java/org/onap/oom/certservice/postprocessor/configuration/model/AppConfiguration.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/main/java/org/onap/oom/certservice/postprocessor/configuration/model/EnvVariable.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/main/java/org/onap/oom/certservice/postprocessor/configuration/path/DelimitedPathsSplitter.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/main/java/org/onap/oom/certservice/postprocessor/configuration/path/env/EnvReader.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/main/java/org/onap/oom/certservice/postprocessor/configuration/path/validation/ValidationFunctions.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/main/java/org/onap/oom/certservice/postprocessor/copier/KeystoreCopier.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/main/java/org/onap/oom/certservice/postprocessor/copier/exception/KeystoreFileCopyException.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/main/java/org/onap/oom/certservice/postprocessor/copier/exception/KeystoreNotExistException.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/main/java/org/onap/oom/certservice/postprocessor/merger/TruststoreFilesProvider.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/main/java/org/onap/oom/certservice/postprocessor/merger/TruststoreMerger.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/AliasConflictException.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/CreateBackupException.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/KeystoreInstanceException.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/LoadTruststoreException.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/MissingTruststoreException.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/PasswordReaderException.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/TruststoreDataOperationException.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/TruststoreFileFactoryException.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/WriteTruststoreFileException.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/JavaTruststore.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/JavaTruststoreFactory.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/PemTruststore.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/Truststore.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/TruststoreFactory.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/certificate/CertificateWithAlias.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/certificate/CertificateWithAliasFactory.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/certificate/PemAliasGenerator.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/main/resources/log4j2.xml (100%) rename {trustStoreMerger => certServicePostProcessor}/src/test/java/org/onap/oom/certservice/postprocessor/AppExecutorTest.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/test/java/org/onap/oom/certservice/postprocessor/common/ExtensionResolverTest.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/test/java/org/onap/oom/certservice/postprocessor/common/FileToolsTest.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/test/java/org/onap/oom/certservice/postprocessor/common/PasswordReaderTest.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/test/java/org/onap/oom/certservice/postprocessor/configuration/AppConfigurationProviderTest.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/test/java/org/onap/oom/certservice/postprocessor/configuration/path/DelimitedPathsSplitterTest.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/test/java/org/onap/oom/certservice/postprocessor/configuration/path/env/EnvReaderTest.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/test/java/org/onap/oom/certservice/postprocessor/configuration/path/validation/ValidationFunctionsTest.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/test/java/org/onap/oom/certservice/postprocessor/copier/KeystoreCopierTest.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/test/java/org/onap/oom/certservice/postprocessor/merger/TruststoreFilesProviderTest.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/JavaTruststoreTest.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/PemTruststoreTest.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/TestCertificateProvider.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/TruststoreFactoryTest.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/TruststoreTest.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/certificate/PemAliasGeneratorTest.java (100%) rename {trustStoreMerger => certServicePostProcessor}/src/test/resources/empty-truststore.pem (100%) rename {trustStoreMerger => certServicePostProcessor}/src/test/resources/keystore.p12 (100%) rename {trustStoreMerger => certServicePostProcessor}/src/test/resources/keystore.pass (100%) rename {trustStoreMerger => certServicePostProcessor}/src/test/resources/truststore-jks-uniq.jks (100%) rename {trustStoreMerger => certServicePostProcessor}/src/test/resources/truststore-jks.jks (100%) rename {trustStoreMerger => certServicePostProcessor}/src/test/resources/truststore-jks.pass (100%) rename {trustStoreMerger => certServicePostProcessor}/src/test/resources/truststore-p12.p12 (100%) rename {trustStoreMerger => certServicePostProcessor}/src/test/resources/truststore-p12.pass (100%) rename {trustStoreMerger => certServicePostProcessor}/src/test/resources/truststore-with-private-key.pem (100%) rename {trustStoreMerger => certServicePostProcessor}/src/test/resources/truststore.pem (100%) diff --git a/trustStoreMerger/Dockerfile b/certServicePostProcessor/Dockerfile similarity index 100% rename from trustStoreMerger/Dockerfile rename to certServicePostProcessor/Dockerfile diff --git a/trustStoreMerger/README.md b/certServicePostProcessor/README.md similarity index 100% rename from trustStoreMerger/README.md rename to certServicePostProcessor/README.md diff --git a/trustStoreMerger/pom.xml b/certServicePostProcessor/pom.xml similarity index 100% rename from trustStoreMerger/pom.xml rename to certServicePostProcessor/pom.xml diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/AppExecutor.java b/certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/AppExecutor.java similarity index 100% rename from trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/AppExecutor.java rename to certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/AppExecutor.java diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/AppExitHandler.java b/certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/AppExitHandler.java similarity index 100% rename from trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/AppExitHandler.java rename to certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/AppExitHandler.java diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/CertificatePostProcessor.java b/certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/CertificatePostProcessor.java similarity index 100% rename from trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/CertificatePostProcessor.java rename to certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/CertificatePostProcessor.java diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/MainApp.java b/certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/MainApp.java similarity index 100% rename from trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/MainApp.java rename to certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/MainApp.java diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/api/CertificateConstants.java b/certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/api/CertificateConstants.java similarity index 100% rename from trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/api/CertificateConstants.java rename to certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/api/CertificateConstants.java diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/api/ExitStatus.java b/certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/api/ExitStatus.java similarity index 100% rename from trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/api/ExitStatus.java rename to certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/api/ExitStatus.java diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/api/ExitableException.java b/certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/api/ExitableException.java similarity index 100% rename from trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/api/ExitableException.java rename to certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/api/ExitableException.java diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/common/ExtensionResolver.java b/certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/common/ExtensionResolver.java similarity index 100% rename from trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/common/ExtensionResolver.java rename to certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/common/ExtensionResolver.java diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/common/FileTools.java b/certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/common/FileTools.java similarity index 100% rename from trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/common/FileTools.java rename to certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/common/FileTools.java diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/common/PasswordReader.java b/certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/common/PasswordReader.java similarity index 100% rename from trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/common/PasswordReader.java rename to certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/common/PasswordReader.java diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/configuration/AppConfigurationLoader.java b/certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/configuration/AppConfigurationLoader.java similarity index 100% rename from trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/configuration/AppConfigurationLoader.java rename to certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/configuration/AppConfigurationLoader.java diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/configuration/AppConfigurationProvider.java b/certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/configuration/AppConfigurationProvider.java similarity index 100% rename from trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/configuration/AppConfigurationProvider.java rename to certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/configuration/AppConfigurationProvider.java diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/configuration/exception/CertificatesPathsValidationException.java b/certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/configuration/exception/CertificatesPathsValidationException.java similarity index 100% rename from trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/configuration/exception/CertificatesPathsValidationException.java rename to certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/configuration/exception/CertificatesPathsValidationException.java diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/configuration/exception/ConfigurationException.java b/certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/configuration/exception/ConfigurationException.java similarity index 100% rename from trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/configuration/exception/ConfigurationException.java rename to certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/configuration/exception/ConfigurationException.java diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/configuration/model/AppConfiguration.java b/certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/configuration/model/AppConfiguration.java similarity index 100% rename from trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/configuration/model/AppConfiguration.java rename to certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/configuration/model/AppConfiguration.java diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/configuration/model/EnvVariable.java b/certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/configuration/model/EnvVariable.java similarity index 100% rename from trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/configuration/model/EnvVariable.java rename to certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/configuration/model/EnvVariable.java diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/configuration/path/DelimitedPathsSplitter.java b/certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/configuration/path/DelimitedPathsSplitter.java similarity index 100% rename from trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/configuration/path/DelimitedPathsSplitter.java rename to certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/configuration/path/DelimitedPathsSplitter.java diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/configuration/path/env/EnvReader.java b/certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/configuration/path/env/EnvReader.java similarity index 100% rename from trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/configuration/path/env/EnvReader.java rename to certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/configuration/path/env/EnvReader.java diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/configuration/path/validation/ValidationFunctions.java b/certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/configuration/path/validation/ValidationFunctions.java similarity index 100% rename from trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/configuration/path/validation/ValidationFunctions.java rename to certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/configuration/path/validation/ValidationFunctions.java diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/copier/KeystoreCopier.java b/certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/copier/KeystoreCopier.java similarity index 100% rename from trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/copier/KeystoreCopier.java rename to certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/copier/KeystoreCopier.java diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/copier/exception/KeystoreFileCopyException.java b/certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/copier/exception/KeystoreFileCopyException.java similarity index 100% rename from trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/copier/exception/KeystoreFileCopyException.java rename to certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/copier/exception/KeystoreFileCopyException.java diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/copier/exception/KeystoreNotExistException.java b/certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/copier/exception/KeystoreNotExistException.java similarity index 100% rename from trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/copier/exception/KeystoreNotExistException.java rename to certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/copier/exception/KeystoreNotExistException.java diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/TruststoreFilesProvider.java b/certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/merger/TruststoreFilesProvider.java similarity index 100% rename from trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/TruststoreFilesProvider.java rename to certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/merger/TruststoreFilesProvider.java diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/TruststoreMerger.java b/certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/merger/TruststoreMerger.java similarity index 100% rename from trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/TruststoreMerger.java rename to certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/merger/TruststoreMerger.java diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/AliasConflictException.java b/certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/AliasConflictException.java similarity index 100% rename from trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/AliasConflictException.java rename to certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/AliasConflictException.java diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/CreateBackupException.java b/certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/CreateBackupException.java similarity index 100% rename from trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/CreateBackupException.java rename to certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/CreateBackupException.java diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/KeystoreInstanceException.java b/certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/KeystoreInstanceException.java similarity index 100% rename from trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/KeystoreInstanceException.java rename to certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/KeystoreInstanceException.java diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/LoadTruststoreException.java b/certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/LoadTruststoreException.java similarity index 100% rename from trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/LoadTruststoreException.java rename to certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/LoadTruststoreException.java diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/MissingTruststoreException.java b/certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/MissingTruststoreException.java similarity index 100% rename from trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/MissingTruststoreException.java rename to certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/MissingTruststoreException.java diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/PasswordReaderException.java b/certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/PasswordReaderException.java similarity index 100% rename from trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/PasswordReaderException.java rename to certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/PasswordReaderException.java diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/TruststoreDataOperationException.java b/certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/TruststoreDataOperationException.java similarity index 100% rename from trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/TruststoreDataOperationException.java rename to certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/TruststoreDataOperationException.java diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/TruststoreFileFactoryException.java b/certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/TruststoreFileFactoryException.java similarity index 100% rename from trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/TruststoreFileFactoryException.java rename to certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/TruststoreFileFactoryException.java diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/WriteTruststoreFileException.java b/certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/WriteTruststoreFileException.java similarity index 100% rename from trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/WriteTruststoreFileException.java rename to certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/merger/exception/WriteTruststoreFileException.java diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/JavaTruststore.java b/certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/JavaTruststore.java similarity index 100% rename from trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/JavaTruststore.java rename to certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/JavaTruststore.java diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/JavaTruststoreFactory.java b/certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/JavaTruststoreFactory.java similarity index 100% rename from trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/JavaTruststoreFactory.java rename to certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/JavaTruststoreFactory.java diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/PemTruststore.java b/certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/PemTruststore.java similarity index 100% rename from trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/PemTruststore.java rename to certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/PemTruststore.java diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/Truststore.java b/certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/Truststore.java similarity index 100% rename from trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/Truststore.java rename to certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/Truststore.java diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/TruststoreFactory.java b/certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/TruststoreFactory.java similarity index 100% rename from trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/TruststoreFactory.java rename to certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/TruststoreFactory.java diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/certificate/CertificateWithAlias.java b/certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/certificate/CertificateWithAlias.java similarity index 100% rename from trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/certificate/CertificateWithAlias.java rename to certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/certificate/CertificateWithAlias.java diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/certificate/CertificateWithAliasFactory.java b/certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/certificate/CertificateWithAliasFactory.java similarity index 100% rename from trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/certificate/CertificateWithAliasFactory.java rename to certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/certificate/CertificateWithAliasFactory.java diff --git a/trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/certificate/PemAliasGenerator.java b/certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/certificate/PemAliasGenerator.java similarity index 100% rename from trustStoreMerger/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/certificate/PemAliasGenerator.java rename to certServicePostProcessor/src/main/java/org/onap/oom/certservice/postprocessor/merger/model/certificate/PemAliasGenerator.java diff --git a/trustStoreMerger/src/main/resources/log4j2.xml b/certServicePostProcessor/src/main/resources/log4j2.xml similarity index 100% rename from trustStoreMerger/src/main/resources/log4j2.xml rename to certServicePostProcessor/src/main/resources/log4j2.xml diff --git a/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/AppExecutorTest.java b/certServicePostProcessor/src/test/java/org/onap/oom/certservice/postprocessor/AppExecutorTest.java similarity index 100% rename from trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/AppExecutorTest.java rename to certServicePostProcessor/src/test/java/org/onap/oom/certservice/postprocessor/AppExecutorTest.java diff --git a/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/common/ExtensionResolverTest.java b/certServicePostProcessor/src/test/java/org/onap/oom/certservice/postprocessor/common/ExtensionResolverTest.java similarity index 100% rename from trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/common/ExtensionResolverTest.java rename to certServicePostProcessor/src/test/java/org/onap/oom/certservice/postprocessor/common/ExtensionResolverTest.java diff --git a/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/common/FileToolsTest.java b/certServicePostProcessor/src/test/java/org/onap/oom/certservice/postprocessor/common/FileToolsTest.java similarity index 100% rename from trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/common/FileToolsTest.java rename to certServicePostProcessor/src/test/java/org/onap/oom/certservice/postprocessor/common/FileToolsTest.java diff --git a/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/common/PasswordReaderTest.java b/certServicePostProcessor/src/test/java/org/onap/oom/certservice/postprocessor/common/PasswordReaderTest.java similarity index 100% rename from trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/common/PasswordReaderTest.java rename to certServicePostProcessor/src/test/java/org/onap/oom/certservice/postprocessor/common/PasswordReaderTest.java diff --git a/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/configuration/AppConfigurationProviderTest.java b/certServicePostProcessor/src/test/java/org/onap/oom/certservice/postprocessor/configuration/AppConfigurationProviderTest.java similarity index 100% rename from trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/configuration/AppConfigurationProviderTest.java rename to certServicePostProcessor/src/test/java/org/onap/oom/certservice/postprocessor/configuration/AppConfigurationProviderTest.java diff --git a/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/configuration/path/DelimitedPathsSplitterTest.java b/certServicePostProcessor/src/test/java/org/onap/oom/certservice/postprocessor/configuration/path/DelimitedPathsSplitterTest.java similarity index 100% rename from trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/configuration/path/DelimitedPathsSplitterTest.java rename to certServicePostProcessor/src/test/java/org/onap/oom/certservice/postprocessor/configuration/path/DelimitedPathsSplitterTest.java diff --git a/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/configuration/path/env/EnvReaderTest.java b/certServicePostProcessor/src/test/java/org/onap/oom/certservice/postprocessor/configuration/path/env/EnvReaderTest.java similarity index 100% rename from trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/configuration/path/env/EnvReaderTest.java rename to certServicePostProcessor/src/test/java/org/onap/oom/certservice/postprocessor/configuration/path/env/EnvReaderTest.java diff --git a/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/configuration/path/validation/ValidationFunctionsTest.java b/certServicePostProcessor/src/test/java/org/onap/oom/certservice/postprocessor/configuration/path/validation/ValidationFunctionsTest.java similarity index 100% rename from trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/configuration/path/validation/ValidationFunctionsTest.java rename to certServicePostProcessor/src/test/java/org/onap/oom/certservice/postprocessor/configuration/path/validation/ValidationFunctionsTest.java diff --git a/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/copier/KeystoreCopierTest.java b/certServicePostProcessor/src/test/java/org/onap/oom/certservice/postprocessor/copier/KeystoreCopierTest.java similarity index 100% rename from trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/copier/KeystoreCopierTest.java rename to certServicePostProcessor/src/test/java/org/onap/oom/certservice/postprocessor/copier/KeystoreCopierTest.java diff --git a/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/merger/TruststoreFilesProviderTest.java b/certServicePostProcessor/src/test/java/org/onap/oom/certservice/postprocessor/merger/TruststoreFilesProviderTest.java similarity index 100% rename from trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/merger/TruststoreFilesProviderTest.java rename to certServicePostProcessor/src/test/java/org/onap/oom/certservice/postprocessor/merger/TruststoreFilesProviderTest.java diff --git a/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/JavaTruststoreTest.java b/certServicePostProcessor/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/JavaTruststoreTest.java similarity index 100% rename from trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/JavaTruststoreTest.java rename to certServicePostProcessor/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/JavaTruststoreTest.java diff --git a/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/PemTruststoreTest.java b/certServicePostProcessor/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/PemTruststoreTest.java similarity index 100% rename from trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/PemTruststoreTest.java rename to certServicePostProcessor/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/PemTruststoreTest.java diff --git a/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/TestCertificateProvider.java b/certServicePostProcessor/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/TestCertificateProvider.java similarity index 100% rename from trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/TestCertificateProvider.java rename to certServicePostProcessor/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/TestCertificateProvider.java diff --git a/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/TruststoreFactoryTest.java b/certServicePostProcessor/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/TruststoreFactoryTest.java similarity index 100% rename from trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/TruststoreFactoryTest.java rename to certServicePostProcessor/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/TruststoreFactoryTest.java diff --git a/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/TruststoreTest.java b/certServicePostProcessor/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/TruststoreTest.java similarity index 100% rename from trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/TruststoreTest.java rename to certServicePostProcessor/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/TruststoreTest.java diff --git a/trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/certificate/PemAliasGeneratorTest.java b/certServicePostProcessor/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/certificate/PemAliasGeneratorTest.java similarity index 100% rename from trustStoreMerger/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/certificate/PemAliasGeneratorTest.java rename to certServicePostProcessor/src/test/java/org/onap/oom/certservice/postprocessor/merger/model/certificate/PemAliasGeneratorTest.java diff --git a/trustStoreMerger/src/test/resources/empty-truststore.pem b/certServicePostProcessor/src/test/resources/empty-truststore.pem similarity index 100% rename from trustStoreMerger/src/test/resources/empty-truststore.pem rename to certServicePostProcessor/src/test/resources/empty-truststore.pem diff --git a/trustStoreMerger/src/test/resources/keystore.p12 b/certServicePostProcessor/src/test/resources/keystore.p12 similarity index 100% rename from trustStoreMerger/src/test/resources/keystore.p12 rename to certServicePostProcessor/src/test/resources/keystore.p12 diff --git a/trustStoreMerger/src/test/resources/keystore.pass b/certServicePostProcessor/src/test/resources/keystore.pass similarity index 100% rename from trustStoreMerger/src/test/resources/keystore.pass rename to certServicePostProcessor/src/test/resources/keystore.pass diff --git a/trustStoreMerger/src/test/resources/truststore-jks-uniq.jks b/certServicePostProcessor/src/test/resources/truststore-jks-uniq.jks similarity index 100% rename from trustStoreMerger/src/test/resources/truststore-jks-uniq.jks rename to certServicePostProcessor/src/test/resources/truststore-jks-uniq.jks diff --git a/trustStoreMerger/src/test/resources/truststore-jks.jks b/certServicePostProcessor/src/test/resources/truststore-jks.jks similarity index 100% rename from trustStoreMerger/src/test/resources/truststore-jks.jks rename to certServicePostProcessor/src/test/resources/truststore-jks.jks diff --git a/trustStoreMerger/src/test/resources/truststore-jks.pass b/certServicePostProcessor/src/test/resources/truststore-jks.pass similarity index 100% rename from trustStoreMerger/src/test/resources/truststore-jks.pass rename to certServicePostProcessor/src/test/resources/truststore-jks.pass diff --git a/trustStoreMerger/src/test/resources/truststore-p12.p12 b/certServicePostProcessor/src/test/resources/truststore-p12.p12 similarity index 100% rename from trustStoreMerger/src/test/resources/truststore-p12.p12 rename to certServicePostProcessor/src/test/resources/truststore-p12.p12 diff --git a/trustStoreMerger/src/test/resources/truststore-p12.pass b/certServicePostProcessor/src/test/resources/truststore-p12.pass similarity index 100% rename from trustStoreMerger/src/test/resources/truststore-p12.pass rename to certServicePostProcessor/src/test/resources/truststore-p12.pass diff --git a/trustStoreMerger/src/test/resources/truststore-with-private-key.pem b/certServicePostProcessor/src/test/resources/truststore-with-private-key.pem similarity index 100% rename from trustStoreMerger/src/test/resources/truststore-with-private-key.pem rename to certServicePostProcessor/src/test/resources/truststore-with-private-key.pem diff --git a/trustStoreMerger/src/test/resources/truststore.pem b/certServicePostProcessor/src/test/resources/truststore.pem similarity index 100% rename from trustStoreMerger/src/test/resources/truststore.pem rename to certServicePostProcessor/src/test/resources/truststore.pem diff --git a/pom.xml b/pom.xml index 793439dd..674c0c65 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ certService certServiceClient - trustStoreMerger + certServicePostProcessor -- 2.16.6