Merge remote-tracking branch

'origin/issue/315_Reorganize_dsf-tools_Modules' into develop_2

Author: hhund

.gitignore

@@ -9,9 +9,15 @@
 
 **/*.iml
 
+## dev setup cert folder and files, folder and files generated by dsf-maven-plugin 
+cert
+cert/**
+
 ###
 # dsf-bpe ignores
 ###
+dsf-bpe/dsf-bpe-server-jetty/cert/*.crt
+dsf-bpe/dsf-bpe-server-jetty/cert/*.key
 dsf-bpe/dsf-bpe-server-jetty/conf/config.properties
 dsf-bpe/dsf-bpe-server-jetty/docker/api/v1/*.jar
 dsf-bpe/dsf-bpe-server-jetty/docker/api/v2/*.jar
@@ -88,6 +94,8 @@ dsf-docker-test-setup-3dic-ttp/docker-compose.override.yml
 ###
 # dsf-fhir ignores
 ###
+dsf-fhir/dsf-fhir-server-jetty/cert/*.crt
+dsf-fhir/dsf-fhir-server-jetty/cert/*.key
 dsf-fhir/dsf-fhir-server-jetty/conf/bundle.xml
 dsf-fhir/dsf-fhir-server-jetty/conf/config.properties
 dsf-fhir/dsf-fhir-server-jetty/docker/ca/*.pem

dsf-bpe/dsf-bpe-server-jetty/conf/jetty.properties

@@ -2,9 +2,9 @@ dev.dsf.server.api.port=8002
 dev.dsf.server.status.port=10002
 dev.dsf.server.context.path=/bpe
 
-dev.dsf.server.certificate=target/bpe.crt
-dev.dsf.server.certificate.chain=target/issuing_ca.crt
-dev.dsf.server.certificate.key=target/bpe.key
+dev.dsf.server.certificate=cert/bpe.crt
+dev.dsf.server.certificate.chain=cert/issuing_ca.crt
+dev.dsf.server.certificate.key=cert/bpe.key
 dev.dsf.server.certificate.key.password=password
 
-dev.dsf.server.auth.trust.client.certificate.cas=target/ca_chain.crt
+dev.dsf.server.auth.trust.client.certificate.cas=cert/ca_chain.crt

dsf-bpe/dsf-bpe-server-jetty/pom.xml

@@ -16,7 +16,7 @@
 		</dependency>
 		<dependency>
 			<groupId>dev.dsf</groupId>
-			<artifactId>dsf-tools-db-migration</artifactId>
+			<artifactId>dsf-common-db</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>dev.dsf</groupId>
@@ -122,24 +122,51 @@
 							</includes>
 							<followSymlinks>false</followSymlinks>
 						</fileset>
+						<fileset>
+							<directory>docker/ca</directory>
+							<includes>
+								<include>*.pem</include>
+							</includes>
+							<followSymlinks>false</followSymlinks>
+						</fileset>
+						<fileset>
+							<directory>../../dsf-docker/bpe_proxy/ca</directory>
+							<includes>
+								<include>*.pem</include>
+							</includes>
+							<followSymlinks>false</followSymlinks>
+						</fileset>
 					</filesets>
 				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>dev.dsf</groupId>
-				<artifactId>dsf-tools-documentation-generator</artifactId>
+				<artifactId>dsf-maven-plugin</artifactId>
 				<executions>
 					<execution>
+						<id>config-doc</id>
+						<goals>
+							<goal>generate-config-doc</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>default-ca-files</id>
 						<goals>
-							<goal>generate</goal>
+							<goal>generate-default-ca-files</goal>
 						</goals>
 					</execution>
 				</executions>
 				<configuration>
-					<workingPackages>
-						<workingPackage>dev.dsf.common</workingPackage>
-						<workingPackage>dev.dsf.bpe</workingPackage>
-					</workingPackages>
+					<configDocPackages>dev.dsf.common,dev.dsf.bpe</configDocPackages>
+					<clientCertIssuingCaFiles>
+						../../dsf-docker/bpe_proxy/ca/client_cert_issuing_cas.pem
+					</clientCertIssuingCaFiles>
+					<clientCertCaChainFiles>
+						../../dsf-docker/bpe_proxy/ca/client_cert_ca_chains.pem,docker/ca/client_cert_ca_chains.pem
+					</clientCertCaChainFiles>
+					<serverCertRootCaFiles>
+						docker/ca/server_cert_root_cas.pem
+					</serverCertRootCaFiles>
 				</configuration>
 			</plugin>
 		</plugins>

dsf-bpe/dsf-bpe-server-jetty/src/main/java/dev/dsf/bpe/BpeJettyServer.java

@@ -5,9 +5,9 @@
 
 import dev.dsf.bpe.config.BpeDbMigratorConfig;
 import dev.dsf.bpe.config.BpeHttpJettyConfig;
+import dev.dsf.common.db.migration.DbMigrator;
 import dev.dsf.common.jetty.JettyServer;
 import dev.dsf.common.jetty.Log4jInitializer;
-import dev.dsf.tools.db.DbMigrator;
 
 public final class BpeJettyServer
 {

dsf-bpe/dsf-bpe-server-jetty/src/main/java/dev/dsf/bpe/BpeJettyServerHttps.java

@@ -5,9 +5,9 @@
 
 import dev.dsf.bpe.config.BpeDbMigratorConfig;
 import dev.dsf.bpe.config.BpeHttpsJettyConfig;
+import dev.dsf.common.db.migration.DbMigrator;
 import dev.dsf.common.jetty.JettyServer;
 import dev.dsf.common.jetty.Log4jInitializer;
-import dev.dsf.tools.db.DbMigrator;
 
 public final class BpeJettyServerHttps
 {

dsf-bpe/dsf-bpe-server-jetty/src/main/java/dev/dsf/bpe/config/BpeDbMigratorConfig.java

@@ -9,10 +9,10 @@
 import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
 import org.springframework.core.env.ConfigurableEnvironment;
 
+import dev.dsf.common.db.migration.DbMigrator;
+import dev.dsf.common.db.migration.DbMigratorConfig;
+import dev.dsf.common.docker.secrets.DockerSecretsPropertySourceFactory;
 import dev.dsf.common.documentation.Documentation;
-import dev.dsf.tools.db.DbMigrator;
-import dev.dsf.tools.db.DbMigratorConfig;
-import dev.dsf.tools.docker.secrets.DockerSecretsPropertySourceFactory;
 
 @Configuration
 @PropertySource(value = "file:conf/config.properties", encoding = "UTF-8", ignoreResourceNotFound = true)

dsf-bpe/dsf-bpe-server/pom.xml

@@ -14,6 +14,10 @@
 			<groupId>dev.dsf</groupId>
 			<artifactId>dsf-bpe-process-api</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>dev.dsf</groupId>
+			<artifactId>dsf-common-build-info-reader</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>dev.dsf</groupId>
 			<artifactId>dsf-common-auth</artifactId>
@@ -26,6 +30,10 @@
 			<groupId>dev.dsf</groupId>
 			<artifactId>dsf-common-db</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>dev.dsf</groupId>
+			<artifactId>dsf-common-docker-secrets-reader</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>dev.dsf</groupId>
 			<artifactId>dsf-common-documentation</artifactId>
@@ -42,14 +50,6 @@
 			<groupId>dev.dsf</groupId>
 			<artifactId>dsf-fhir-websocket-client</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>dev.dsf</groupId>
-			<artifactId>dsf-tools-build-info-reader</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>dev.dsf</groupId>
-			<artifactId>dsf-tools-docker-secrets-reader</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>de.hs-heilbronn.mi</groupId>
 			<artifactId>crypto-utils</artifactId>

dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/spring/config/BuildInfoReaderConfig.java

@@ -7,8 +7,8 @@
 import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.context.event.EventListener;
 
-import dev.dsf.tools.build.BuildInfoReader;
-import dev.dsf.tools.build.BuildInfoReaderImpl;
+import dev.dsf.common.build.BuildInfoReader;
+import dev.dsf.common.build.BuildInfoReaderImpl;
 
 @Configuration
 public class BuildInfoReaderConfig

dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/spring/config/DaoConfig.java

@@ -14,7 +14,7 @@
 import dev.dsf.bpe.dao.ProcessPluginResourcesDaoJdbc;
 import dev.dsf.bpe.dao.ProcessStateDao;
 import dev.dsf.bpe.dao.ProcessStateDaoJdbc;
-import dev.dsf.common.db.DataSourceWithLogger;
+import dev.dsf.common.db.logging.DataSourceWithLogger;
 
 @Configuration
 public class DaoConfig

dsf-bpe/dsf-bpe-server/src/main/java/dev/dsf/bpe/spring/config/MailConfig.java

@@ -26,7 +26,7 @@
 import dev.dsf.bpe.api.service.BpeMailService;
 import dev.dsf.bpe.mail.LoggingMailService;
 import dev.dsf.bpe.mail.SmtpMailService;
-import dev.dsf.tools.build.BuildInfoReader;
+import dev.dsf.common.build.BuildInfoReader;
 
 @Configuration
 public class MailConfig implements InitializingBean