diff --git a/clearing-parent/dbf-export/pom.xml b/clearing-parent/dbf-exporter/pom.xml similarity index 96% rename from clearing-parent/dbf-export/pom.xml rename to clearing-parent/dbf-exporter/pom.xml index 093bb2711..f8d2aa74e 100644 --- a/clearing-parent/dbf-export/pom.xml +++ b/clearing-parent/dbf-exporter/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - dbf-export - dbf-export + dbf-exporter + dbf-exporter DBF exporter for DBF files SPCEX-1.0.0.0 @@ -60,7 +60,7 @@ - ru.spcex.clearing.dbf.export.DBFLoaderApplication + ru.spcex.clearing.dbf.exporter.DBFLoaderApplication diff --git a/clearing-parent/dbf-export/src/main/java/ru/spcex/clearing/dbf/export/DBFExportApplication.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/DBFExportApplication.java similarity index 94% rename from clearing-parent/dbf-export/src/main/java/ru/spcex/clearing/dbf/export/DBFExportApplication.java rename to clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/DBFExportApplication.java index 4d2684252..a0df4b5fa 100644 --- a/clearing-parent/dbf-export/src/main/java/ru/spcex/clearing/dbf/export/DBFExportApplication.java +++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/DBFExportApplication.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.dbf.export; +package ru.spcex.clearing.dbf.exporter; import org.slf4j.LoggerFactory; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/clearing-parent/dbf-export/src/main/java/ru/spcex/clearing/dbf/export/config/DBFExportConfig.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/config/DBFExportConfig.java similarity index 82% rename from clearing-parent/dbf-export/src/main/java/ru/spcex/clearing/dbf/export/config/DBFExportConfig.java rename to clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/config/DBFExportConfig.java index d82e773fd..2877a307d 100644 --- a/clearing-parent/dbf-export/src/main/java/ru/spcex/clearing/dbf/export/config/DBFExportConfig.java +++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/config/DBFExportConfig.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.dbf.export.config; +package ru.spcex.clearing.dbf.exporter.config; import com.mchange.v2.c3p0.ComboPooledDataSource; import org.springframework.beans.factory.annotation.Qualifier; @@ -7,10 +7,10 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.jdbc.core.JdbcTemplate; -import ru.spcex.clearing.dbf.export.logic.stages.ExportFromDB; -import ru.spcex.clearing.dbf.export.logic.stages.PrepareDBFFiles; -import ru.spcex.clearing.dbf.export.logic.stages.Stage; -import ru.spcex.clearing.dbf.export.properties.AProperties; +import ru.spcex.clearing.dbf.exporter.logic.stages.ExportFromDB; +import ru.spcex.clearing.dbf.exporter.logic.stages.PrepareDBFFiles; +import ru.spcex.clearing.dbf.exporter.logic.stages.Stage; +import ru.spcex.clearing.dbf.exporter.properties.AProperties; import javax.sql.DataSource; import java.beans.PropertyVetoException; @@ -18,7 +18,7 @@ import java.util.LinkedList; import java.util.List; @Configuration -@ComponentScan(basePackages = {"ru.spcex.clearing.dbf.export"}) +@ComponentScan(basePackages = {"ru.spcex.clearing.dbf.exporter"}) public class DBFExportConfig { private final AProperties properties; private final ApplicationContext context; diff --git a/clearing-parent/dbf-export/src/main/java/ru/spcex/clearing/dbf/export/exceptions/ConfigException.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/exceptions/ConfigException.java similarity index 79% rename from clearing-parent/dbf-export/src/main/java/ru/spcex/clearing/dbf/export/exceptions/ConfigException.java rename to clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/exceptions/ConfigException.java index ce17d44a7..2649a219d 100644 --- a/clearing-parent/dbf-export/src/main/java/ru/spcex/clearing/dbf/export/exceptions/ConfigException.java +++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/exceptions/ConfigException.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.dbf.export.exceptions; +package ru.spcex.clearing.dbf.exporter.exceptions; public class ConfigException extends RuntimeException { public ConfigException(String msg) { super(msg); } diff --git a/clearing-parent/dbf-export/src/main/java/ru/spcex/clearing/dbf/export/logic/data/ISqlFilter.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/ISqlFilter.java similarity index 71% rename from clearing-parent/dbf-export/src/main/java/ru/spcex/clearing/dbf/export/logic/data/ISqlFilter.java rename to clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/ISqlFilter.java index ff4b61033..668a5e6f3 100644 --- a/clearing-parent/dbf-export/src/main/java/ru/spcex/clearing/dbf/export/logic/data/ISqlFilter.java +++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/ISqlFilter.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.dbf.export.logic.data; +package ru.spcex.clearing.dbf.exporter.logic.data; /** * Фильтр записей для экспорта diff --git a/clearing-parent/dbf-export/src/main/java/ru/spcex/clearing/dbf/export/logic/data/ResultContainer.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/ResultContainer.java similarity index 88% rename from clearing-parent/dbf-export/src/main/java/ru/spcex/clearing/dbf/export/logic/data/ResultContainer.java rename to clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/ResultContainer.java index bc8adc5da..99d8e8e30 100644 --- a/clearing-parent/dbf-export/src/main/java/ru/spcex/clearing/dbf/export/logic/data/ResultContainer.java +++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/ResultContainer.java @@ -1,6 +1,6 @@ -package ru.spcex.clearing.dbf.export.logic.data; +package ru.spcex.clearing.dbf.exporter.logic.data; -import ru.spcex.clearing.dbf.export.logic.data.enums.Table; +import ru.spcex.clearing.dbf.exporter.logic.data.enums.Table; import java.io.File; import java.util.Map; diff --git a/clearing-parent/dbf-export/src/main/java/ru/spcex/clearing/dbf/export/logic/data/enums/ColumnType.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/enums/ColumnType.java similarity index 95% rename from clearing-parent/dbf-export/src/main/java/ru/spcex/clearing/dbf/export/logic/data/enums/ColumnType.java rename to clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/enums/ColumnType.java index b6445dbe2..fbf77e773 100644 --- a/clearing-parent/dbf-export/src/main/java/ru/spcex/clearing/dbf/export/logic/data/enums/ColumnType.java +++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/enums/ColumnType.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.dbf.export.logic.data.enums; +package ru.spcex.clearing.dbf.exporter.logic.data.enums; import com.linuxense.javadbf.DBFDataType; diff --git a/clearing-parent/dbf-export/src/main/java/ru/spcex/clearing/dbf/export/logic/data/enums/StageResult.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/enums/StageResult.java similarity index 51% rename from clearing-parent/dbf-export/src/main/java/ru/spcex/clearing/dbf/export/logic/data/enums/StageResult.java rename to clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/enums/StageResult.java index 76e9be113..2be9b0f99 100644 --- a/clearing-parent/dbf-export/src/main/java/ru/spcex/clearing/dbf/export/logic/data/enums/StageResult.java +++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/enums/StageResult.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.dbf.export.logic.data.enums; +package ru.spcex.clearing.dbf.exporter.logic.data.enums; public enum StageResult { OK, diff --git a/clearing-parent/dbf-export/src/main/java/ru/spcex/clearing/dbf/export/logic/data/enums/Table.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/enums/Table.java similarity index 93% rename from clearing-parent/dbf-export/src/main/java/ru/spcex/clearing/dbf/export/logic/data/enums/Table.java rename to clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/enums/Table.java index 6ce65dcec..697490f7e 100644 --- a/clearing-parent/dbf-export/src/main/java/ru/spcex/clearing/dbf/export/logic/data/enums/Table.java +++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/enums/Table.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.dbf.export.logic.data.enums; +package ru.spcex.clearing.dbf.exporter.logic.data.enums; public enum Table { DF_01("DF-01"), diff --git a/clearing-parent/dbf-export/src/main/java/ru/spcex/clearing/dbf/export/logic/stages/ExportFromDB.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/stages/ExportFromDB.java similarity index 92% rename from clearing-parent/dbf-export/src/main/java/ru/spcex/clearing/dbf/export/logic/stages/ExportFromDB.java rename to clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/stages/ExportFromDB.java index 1922c49f2..6592a34f6 100644 --- a/clearing-parent/dbf-export/src/main/java/ru/spcex/clearing/dbf/export/logic/stages/ExportFromDB.java +++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/stages/ExportFromDB.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.dbf.export.logic.stages; +package ru.spcex.clearing.dbf.exporter.logic.stages; import com.linuxense.javadbf.DBFDataType; import com.linuxense.javadbf.DBFException; @@ -10,13 +10,13 @@ import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.support.JdbcUtils; import org.springframework.jdbc.support.MetaDataAccessException; import org.springframework.stereotype.Component; -import ru.spcex.clearing.dbf.export.exceptions.ConfigException; -import ru.spcex.clearing.dbf.export.logic.data.ISqlFilter; -import ru.spcex.clearing.dbf.export.logic.data.ResultContainer; -import ru.spcex.clearing.dbf.export.logic.data.enums.ColumnType; -import ru.spcex.clearing.dbf.export.logic.data.enums.StageResult; -import ru.spcex.clearing.dbf.export.logic.data.enums.Table; -import ru.spcex.clearing.dbf.export.properties.AProperties; +import ru.spcex.clearing.dbf.exporter.exceptions.ConfigException; +import ru.spcex.clearing.dbf.exporter.logic.data.ISqlFilter; +import ru.spcex.clearing.dbf.exporter.logic.data.ResultContainer; +import ru.spcex.clearing.dbf.exporter.logic.data.enums.ColumnType; +import ru.spcex.clearing.dbf.exporter.logic.data.enums.StageResult; +import ru.spcex.clearing.dbf.exporter.logic.data.enums.Table; +import ru.spcex.clearing.dbf.exporter.properties.AProperties; import java.io.File; import java.io.IOException; diff --git a/clearing-parent/dbf-export/src/main/java/ru/spcex/clearing/dbf/export/logic/stages/PrepareDBFFiles.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/stages/PrepareDBFFiles.java similarity index 88% rename from clearing-parent/dbf-export/src/main/java/ru/spcex/clearing/dbf/export/logic/stages/PrepareDBFFiles.java rename to clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/stages/PrepareDBFFiles.java index 3215f02d9..ab2ba336e 100644 --- a/clearing-parent/dbf-export/src/main/java/ru/spcex/clearing/dbf/export/logic/stages/PrepareDBFFiles.java +++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/stages/PrepareDBFFiles.java @@ -1,12 +1,12 @@ -package ru.spcex.clearing.dbf.export.logic.stages; +package ru.spcex.clearing.dbf.exporter.logic.stages; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Component; -import ru.spcex.clearing.dbf.export.logic.data.ResultContainer; -import ru.spcex.clearing.dbf.export.logic.data.enums.StageResult; -import ru.spcex.clearing.dbf.export.logic.data.enums.Table; -import ru.spcex.clearing.dbf.export.properties.AProperties; +import ru.spcex.clearing.dbf.exporter.logic.data.ResultContainer; +import ru.spcex.clearing.dbf.exporter.logic.data.enums.StageResult; +import ru.spcex.clearing.dbf.exporter.logic.data.enums.Table; +import ru.spcex.clearing.dbf.exporter.properties.AProperties; import java.io.File; import java.io.IOException; diff --git a/clearing-parent/dbf-export/src/main/java/ru/spcex/clearing/dbf/export/logic/stages/Stage.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/stages/Stage.java similarity index 55% rename from clearing-parent/dbf-export/src/main/java/ru/spcex/clearing/dbf/export/logic/stages/Stage.java rename to clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/stages/Stage.java index 2329dc21d..cb9870d0d 100644 --- a/clearing-parent/dbf-export/src/main/java/ru/spcex/clearing/dbf/export/logic/stages/Stage.java +++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/stages/Stage.java @@ -1,9 +1,9 @@ -package ru.spcex.clearing.dbf.export.logic.stages; +package ru.spcex.clearing.dbf.exporter.logic.stages; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import ru.spcex.clearing.dbf.export.logic.data.ResultContainer; -import ru.spcex.clearing.dbf.export.logic.data.enums.StageResult; +import ru.spcex.clearing.dbf.exporter.logic.data.ResultContainer; +import ru.spcex.clearing.dbf.exporter.logic.data.enums.StageResult; public abstract class Stage { protected Logger log = LoggerFactory.getLogger(getClass()); diff --git a/clearing-parent/dbf-export/src/main/java/ru/spcex/clearing/dbf/export/properties/AProperties.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/properties/AProperties.java similarity index 97% rename from clearing-parent/dbf-export/src/main/java/ru/spcex/clearing/dbf/export/properties/AProperties.java rename to clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/properties/AProperties.java index d5508668a..7bdf2a673 100644 --- a/clearing-parent/dbf-export/src/main/java/ru/spcex/clearing/dbf/export/properties/AProperties.java +++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/properties/AProperties.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.dbf.export.properties; +package ru.spcex.clearing.dbf.exporter.properties; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.PropertySource; diff --git a/clearing-parent/dbf-export/src/main/java/ru/spcex/clearing/dbf/export/services/DBFExportService.java b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/DBFExportService.java similarity index 74% rename from clearing-parent/dbf-export/src/main/java/ru/spcex/clearing/dbf/export/services/DBFExportService.java rename to clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/DBFExportService.java index c55d2936d..b6071d575 100644 --- a/clearing-parent/dbf-export/src/main/java/ru/spcex/clearing/dbf/export/services/DBFExportService.java +++ b/clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/DBFExportService.java @@ -1,15 +1,15 @@ -package ru.spcex.clearing.dbf.export.services; +package ru.spcex.clearing.dbf.exporter.services; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; -import ru.spcex.clearing.dbf.export.logic.data.ISqlFilter; -import ru.spcex.clearing.dbf.export.logic.data.ResultContainer; -import ru.spcex.clearing.dbf.export.logic.data.enums.StageResult; -import ru.spcex.clearing.dbf.export.logic.data.enums.Table; -import ru.spcex.clearing.dbf.export.logic.stages.Stage; -import ru.spcex.clearing.dbf.export.properties.AProperties; +import ru.spcex.clearing.dbf.exporter.logic.data.ISqlFilter; +import ru.spcex.clearing.dbf.exporter.logic.data.ResultContainer; +import ru.spcex.clearing.dbf.exporter.logic.data.enums.StageResult; +import ru.spcex.clearing.dbf.exporter.logic.data.enums.Table; +import ru.spcex.clearing.dbf.exporter.logic.stages.Stage; +import ru.spcex.clearing.dbf.exporter.properties.AProperties; import java.util.Arrays; import java.util.HashMap; diff --git a/clearing-parent/dbf-export/src/main/resources/dbf_export.properties b/clearing-parent/dbf-exporter/src/main/resources/dbf_export.properties similarity index 100% rename from clearing-parent/dbf-export/src/main/resources/dbf_export.properties rename to clearing-parent/dbf-exporter/src/main/resources/dbf_export.properties diff --git a/clearing-parent/dbf-export/src/main/resources/logback.xml b/clearing-parent/dbf-exporter/src/main/resources/logback.xml similarity index 100% rename from clearing-parent/dbf-export/src/main/resources/logback.xml rename to clearing-parent/dbf-exporter/src/main/resources/logback.xml diff --git a/clearing-parent/dbf-loader/pom.xml b/clearing-parent/dbf-importer/pom.xml similarity index 94% rename from clearing-parent/dbf-loader/pom.xml rename to clearing-parent/dbf-importer/pom.xml index 7f5b5e8f1..5baf79a9e 100644 --- a/clearing-parent/dbf-loader/pom.xml +++ b/clearing-parent/dbf-importer/pom.xml @@ -5,8 +5,8 @@ 4.0.0 - dbf-loader - dbf-loader + dbf-importer + dbf-importer DBF loader for DBF files SPCEX-1.0.0.0 @@ -61,7 +61,7 @@ - ru.spcex.clearing.dbf.loader.DBFLoaderApplication + ru.spcex.clearing.dbf.importer.DBFLoaderApplication diff --git a/clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/DBFLoaderApplication.java b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/DBFLoaderApplication.java similarity index 94% rename from clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/DBFLoaderApplication.java rename to clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/DBFLoaderApplication.java index 942869b03..88029b92d 100644 --- a/clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/DBFLoaderApplication.java +++ b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/DBFLoaderApplication.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.dbf.loader; +package ru.spcex.clearing.dbf.importer; import org.slf4j.LoggerFactory; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/config/DBFLoaderConfig.java b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/config/DBFLoaderConfig.java similarity index 82% rename from clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/config/DBFLoaderConfig.java rename to clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/config/DBFLoaderConfig.java index 3a385d450..628a9f367 100644 --- a/clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/config/DBFLoaderConfig.java +++ b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/config/DBFLoaderConfig.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.dbf.loader.config; +package ru.spcex.clearing.dbf.importer.config; import com.mchange.v2.c3p0.ComboPooledDataSource; import org.springframework.beans.factory.annotation.Qualifier; @@ -7,10 +7,10 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.jdbc.core.JdbcTemplate; -import ru.spcex.clearing.dbf.loader.logic.stages.ImportToDB; -import ru.spcex.clearing.dbf.loader.logic.stages.Stage; -import ru.spcex.clearing.dbf.loader.logic.stages.ValidateFields; -import ru.spcex.clearing.dbf.loader.properties.AProperties; +import ru.spcex.clearing.dbf.importer.logic.stages.ImportToDB; +import ru.spcex.clearing.dbf.importer.logic.stages.Stage; +import ru.spcex.clearing.dbf.importer.logic.stages.ValidateFields; +import ru.spcex.clearing.dbf.importer.properties.AProperties; import javax.sql.DataSource; import java.beans.PropertyVetoException; @@ -18,7 +18,7 @@ import java.util.LinkedList; import java.util.List; @Configuration -@ComponentScan(basePackages = {"ru.spcex.clearing.dbf.loader"}) +@ComponentScan(basePackages = {"ru.spcex.clearing.dbf.importer"}) public class DBFLoaderConfig { private final AProperties properties; private final ApplicationContext context; diff --git a/clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/exceptions/ConfigException.java b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/exceptions/ConfigException.java similarity index 79% rename from clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/exceptions/ConfigException.java rename to clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/exceptions/ConfigException.java index 95aa73185..674012ba2 100644 --- a/clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/exceptions/ConfigException.java +++ b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/exceptions/ConfigException.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.dbf.loader.exceptions; +package ru.spcex.clearing.dbf.importer.exceptions; public class ConfigException extends RuntimeException { public ConfigException(String msg) { super(msg); } diff --git a/clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/logic/data/ColumnStructureDBF.java b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/ColumnStructureDBF.java similarity index 88% rename from clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/logic/data/ColumnStructureDBF.java rename to clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/ColumnStructureDBF.java index 78e051c77..0ce747f4c 100644 --- a/clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/logic/data/ColumnStructureDBF.java +++ b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/ColumnStructureDBF.java @@ -1,6 +1,6 @@ -package ru.spcex.clearing.dbf.loader.logic.data; +package ru.spcex.clearing.dbf.importer.logic.data; -import ru.spcex.clearing.dbf.loader.logic.data.enums.ColumnType; +import ru.spcex.clearing.dbf.importer.logic.data.enums.ColumnType; public class ColumnStructureDBF { private String name; diff --git a/clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/logic/data/DBStructureDBF.java b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/DBStructureDBF.java similarity index 75% rename from clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/logic/data/DBStructureDBF.java rename to clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/DBStructureDBF.java index b384fb518..32a2bfbf3 100644 --- a/clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/logic/data/DBStructureDBF.java +++ b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/DBStructureDBF.java @@ -1,6 +1,6 @@ -package ru.spcex.clearing.dbf.loader.logic.data; +package ru.spcex.clearing.dbf.importer.logic.data; -import ru.spcex.clearing.dbf.loader.logic.data.enums.Table; +import ru.spcex.clearing.dbf.importer.logic.data.enums.Table; import java.util.HashMap; import java.util.Map; diff --git a/clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/logic/data/ResultContainer.java b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/ResultContainer.java similarity index 87% rename from clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/logic/data/ResultContainer.java rename to clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/ResultContainer.java index f6c1264a2..defaa8d8f 100644 --- a/clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/logic/data/ResultContainer.java +++ b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/ResultContainer.java @@ -1,6 +1,6 @@ -package ru.spcex.clearing.dbf.loader.logic.data; +package ru.spcex.clearing.dbf.importer.logic.data; -import ru.spcex.clearing.dbf.loader.logic.data.enums.Table; +import ru.spcex.clearing.dbf.importer.logic.data.enums.Table; /** * Контейнер для передачи результата между стадиями diff --git a/clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/logic/data/TableStructureDBF.java b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/TableStructureDBF.java similarity index 92% rename from clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/logic/data/TableStructureDBF.java rename to clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/TableStructureDBF.java index cb5c20728..3b4dee14d 100644 --- a/clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/logic/data/TableStructureDBF.java +++ b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/TableStructureDBF.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.dbf.loader.logic.data; +package ru.spcex.clearing.dbf.importer.logic.data; import java.util.HashMap; import java.util.Map; diff --git a/clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/logic/data/enums/ColumnType.java b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/enums/ColumnType.java similarity index 95% rename from clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/logic/data/enums/ColumnType.java rename to clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/enums/ColumnType.java index 2fab3a8cb..12a7e0fac 100644 --- a/clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/logic/data/enums/ColumnType.java +++ b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/enums/ColumnType.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.dbf.loader.logic.data.enums; +package ru.spcex.clearing.dbf.importer.logic.data.enums; import com.linuxense.javadbf.DBFDataType; diff --git a/clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/logic/data/enums/StageResult.java b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/enums/StageResult.java similarity index 51% rename from clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/logic/data/enums/StageResult.java rename to clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/enums/StageResult.java index 9558147d2..0b323969d 100644 --- a/clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/logic/data/enums/StageResult.java +++ b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/enums/StageResult.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.dbf.loader.logic.data.enums; +package ru.spcex.clearing.dbf.importer.logic.data.enums; public enum StageResult { OK, diff --git a/clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/logic/data/enums/Table.java b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/enums/Table.java similarity index 93% rename from clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/logic/data/enums/Table.java rename to clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/enums/Table.java index 536e48625..d237910c7 100644 --- a/clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/logic/data/enums/Table.java +++ b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/data/enums/Table.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.dbf.loader.logic.data.enums; +package ru.spcex.clearing.dbf.importer.logic.data.enums; public enum Table { DF_01("DF-01"), diff --git a/clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/logic/stages/ImportToDB.java b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/stages/ImportToDB.java similarity index 92% rename from clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/logic/stages/ImportToDB.java rename to clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/stages/ImportToDB.java index 82245314c..1f6fd8260 100644 --- a/clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/logic/stages/ImportToDB.java +++ b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/stages/ImportToDB.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.dbf.loader.logic.stages; +package ru.spcex.clearing.dbf.importer.logic.stages; import com.linuxense.javadbf.DBFField; import com.linuxense.javadbf.DBFReader; @@ -6,11 +6,11 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.jdbc.core.BatchPreparedStatementSetter; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Component; -import ru.spcex.clearing.dbf.loader.logic.data.ResultContainer; -import ru.spcex.clearing.dbf.loader.logic.data.enums.ColumnType; -import ru.spcex.clearing.dbf.loader.logic.data.enums.StageResult; -import ru.spcex.clearing.dbf.loader.logic.data.enums.Table; -import ru.spcex.clearing.dbf.loader.properties.AProperties; +import ru.spcex.clearing.dbf.importer.logic.data.ResultContainer; +import ru.spcex.clearing.dbf.importer.logic.data.enums.ColumnType; +import ru.spcex.clearing.dbf.importer.logic.data.enums.StageResult; +import ru.spcex.clearing.dbf.importer.logic.data.enums.Table; +import ru.spcex.clearing.dbf.importer.properties.AProperties; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/logic/stages/Stage.java b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/stages/Stage.java similarity index 55% rename from clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/logic/stages/Stage.java rename to clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/stages/Stage.java index 978cc1f84..ee41691dd 100644 --- a/clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/logic/stages/Stage.java +++ b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/stages/Stage.java @@ -1,9 +1,9 @@ -package ru.spcex.clearing.dbf.loader.logic.stages; +package ru.spcex.clearing.dbf.importer.logic.stages; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import ru.spcex.clearing.dbf.loader.logic.data.ResultContainer; -import ru.spcex.clearing.dbf.loader.logic.data.enums.StageResult; +import ru.spcex.clearing.dbf.importer.logic.data.ResultContainer; +import ru.spcex.clearing.dbf.importer.logic.data.enums.StageResult; public abstract class Stage { protected Logger log = LoggerFactory.getLogger(getClass()); diff --git a/clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/logic/stages/ValidateFields.java b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/stages/ValidateFields.java similarity index 92% rename from clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/logic/stages/ValidateFields.java rename to clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/stages/ValidateFields.java index d3b18cc34..0efb1aab8 100644 --- a/clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/logic/stages/ValidateFields.java +++ b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/logic/stages/ValidateFields.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.dbf.loader.logic.stages; +package ru.spcex.clearing.dbf.importer.logic.stages; import com.linuxense.javadbf.DBFDataType; import com.linuxense.javadbf.DBFField; @@ -9,15 +9,15 @@ import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.support.JdbcUtils; import org.springframework.jdbc.support.MetaDataAccessException; import org.springframework.stereotype.Component; -import ru.spcex.clearing.dbf.loader.exceptions.ConfigException; -import ru.spcex.clearing.dbf.loader.logic.data.ColumnStructureDBF; -import ru.spcex.clearing.dbf.loader.logic.data.DBStructureDBF; -import ru.spcex.clearing.dbf.loader.logic.data.ResultContainer; -import ru.spcex.clearing.dbf.loader.logic.data.TableStructureDBF; -import ru.spcex.clearing.dbf.loader.logic.data.enums.ColumnType; -import ru.spcex.clearing.dbf.loader.logic.data.enums.StageResult; -import ru.spcex.clearing.dbf.loader.logic.data.enums.Table; -import ru.spcex.clearing.dbf.loader.properties.AProperties; +import ru.spcex.clearing.dbf.importer.exceptions.ConfigException; +import ru.spcex.clearing.dbf.importer.logic.data.ColumnStructureDBF; +import ru.spcex.clearing.dbf.importer.logic.data.DBStructureDBF; +import ru.spcex.clearing.dbf.importer.logic.data.ResultContainer; +import ru.spcex.clearing.dbf.importer.logic.data.TableStructureDBF; +import ru.spcex.clearing.dbf.importer.logic.data.enums.ColumnType; +import ru.spcex.clearing.dbf.importer.logic.data.enums.StageResult; +import ru.spcex.clearing.dbf.importer.logic.data.enums.Table; +import ru.spcex.clearing.dbf.importer.properties.AProperties; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/properties/AProperties.java b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/properties/AProperties.java similarity index 98% rename from clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/properties/AProperties.java rename to clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/properties/AProperties.java index 687c9fef1..adb7670aa 100644 --- a/clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/properties/AProperties.java +++ b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/properties/AProperties.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.dbf.loader.properties; +package ru.spcex.clearing.dbf.importer.properties; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.PropertySource; diff --git a/clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/services/DBFLoaderService.java b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/services/DBFLoaderService.java similarity index 81% rename from clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/services/DBFLoaderService.java rename to clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/services/DBFLoaderService.java index 359a4b3dd..efa42461a 100644 --- a/clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/services/DBFLoaderService.java +++ b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/services/DBFLoaderService.java @@ -1,13 +1,13 @@ -package ru.spcex.clearing.dbf.loader.services; +package ru.spcex.clearing.dbf.importer.services; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; -import ru.spcex.clearing.dbf.loader.logic.data.ResultContainer; -import ru.spcex.clearing.dbf.loader.logic.data.enums.StageResult; -import ru.spcex.clearing.dbf.loader.logic.stages.Stage; -import ru.spcex.clearing.dbf.loader.properties.AProperties; +import ru.spcex.clearing.dbf.importer.logic.data.ResultContainer; +import ru.spcex.clearing.dbf.importer.logic.data.enums.StageResult; +import ru.spcex.clearing.dbf.importer.logic.stages.Stage; +import ru.spcex.clearing.dbf.importer.properties.AProperties; import java.util.Arrays; import java.util.List; diff --git a/clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/services/FileMessageListener.java b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/services/FileMessageListener.java similarity index 92% rename from clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/services/FileMessageListener.java rename to clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/services/FileMessageListener.java index 394e680c4..dff851486 100644 --- a/clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/services/FileMessageListener.java +++ b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/services/FileMessageListener.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.dbf.loader.services; +package ru.spcex.clearing.dbf.importer.services; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -6,9 +6,9 @@ import org.springframework.beans.factory.InitializingBean; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; -import ru.spcex.clearing.dbf.loader.exceptions.ConfigException; -import ru.spcex.clearing.dbf.loader.logic.data.enums.Table; -import ru.spcex.clearing.dbf.loader.properties.AProperties; +import ru.spcex.clearing.dbf.importer.exceptions.ConfigException; +import ru.spcex.clearing.dbf.importer.logic.data.enums.Table; +import ru.spcex.clearing.dbf.importer.properties.AProperties; import java.io.File; import java.io.IOException; diff --git a/clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/services/MessageListener.java b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/services/MessageListener.java similarity index 85% rename from clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/services/MessageListener.java rename to clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/services/MessageListener.java index fb93941de..3ce245ee2 100644 --- a/clearing-parent/dbf-loader/src/main/java/ru/spcex/clearing/dbf/loader/services/MessageListener.java +++ b/clearing-parent/dbf-importer/src/main/java/ru/spcex/clearing/dbf/importer/services/MessageListener.java @@ -1,8 +1,8 @@ -package ru.spcex.clearing.dbf.loader.services; +package ru.spcex.clearing.dbf.importer.services; import org.springframework.stereotype.Service; -import ru.spcex.clearing.dbf.loader.logic.data.ResultContainer; -import ru.spcex.clearing.dbf.loader.logic.data.enums.Table; +import ru.spcex.clearing.dbf.importer.logic.data.ResultContainer; +import ru.spcex.clearing.dbf.importer.logic.data.enums.Table; import java.util.LinkedList; import java.util.List; diff --git a/clearing-parent/dbf-loader/src/main/resources/dbf_loader.properties b/clearing-parent/dbf-importer/src/main/resources/dbf_loader.properties similarity index 100% rename from clearing-parent/dbf-loader/src/main/resources/dbf_loader.properties rename to clearing-parent/dbf-importer/src/main/resources/dbf_loader.properties diff --git a/clearing-parent/dbf-loader/src/main/resources/logback.xml b/clearing-parent/dbf-importer/src/main/resources/logback.xml similarity index 100% rename from clearing-parent/dbf-loader/src/main/resources/logback.xml rename to clearing-parent/dbf-importer/src/main/resources/logback.xml diff --git a/clearing-parent/pom.xml b/clearing-parent/pom.xml index 3c1783d7d..6f86a0c25 100644 --- a/clearing-parent/pom.xml +++ b/clearing-parent/pom.xml @@ -21,8 +21,8 @@ backend-api storage db-scripts - dbf-loader - dbf-export + dbf-importer + dbf-exporter diff --git a/z-distr/src/main/resources/distr/modules/backend-api/Dockerfile b/z-distr/src/main/resources/distr/modules/backend-api/Dockerfile index 1ce623b61..99782d29b 100644 --- a/z-distr/src/main/resources/distr/modules/backend-api/Dockerfile +++ b/z-distr/src/main/resources/distr/modules/backend-api/Dockerfile @@ -30,14 +30,10 @@ RUN set -eux; \ tar -xf /tmp/bellsoft-jdk.tar.gz --strip-components=1; \ rm -rf /tmp/bellsoft-jdk.tar.gz; -RUN /opt/java/bellsoft-jdk/bin/java --version - ENV JAVA_HOME=/opt/java/bellsoft-jdk/ \ PATH="/opt/java/bellsoft-jdk/bin:$PATH" - -RUN java --version # ADD backend-api.jar /deployments/backend-api.jar USER root RUN mkdir ./logs -ENV JAVA_APP_JAR=backend-api.jar +ENTRYPOINT java -jar /deployments/backend-api.jar diff --git a/z-distr/src/main/resources/distr/modules/bin/backend-api.sh b/z-distr/src/main/resources/distr/modules/bin/backend-api.sh new file mode 100644 index 000000000..7942fcc25 --- /dev/null +++ b/z-distr/src/main/resources/distr/modules/bin/backend-api.sh @@ -0,0 +1,2 @@ +docker build -t backend-api ../backend-api/ +docker run -p 8090:8080 backend-api:latest \ No newline at end of file diff --git a/z-distr/src/main/resources/distr/modules/bin/dbf-exporter.sh b/z-distr/src/main/resources/distr/modules/bin/dbf-exporter.sh new file mode 100644 index 000000000..14e7b2530 --- /dev/null +++ b/z-distr/src/main/resources/distr/modules/bin/dbf-exporter.sh @@ -0,0 +1,2 @@ +docker build -t dbf-exporter ../dbf-exporter/ +docker run -p 8090:8080 dbf-exporter:latest \ No newline at end of file diff --git a/z-distr/src/main/resources/distr/modules/bin/dbf-importer.sh b/z-distr/src/main/resources/distr/modules/bin/dbf-importer.sh new file mode 100644 index 000000000..5d7732e18 --- /dev/null +++ b/z-distr/src/main/resources/distr/modules/bin/dbf-importer.sh @@ -0,0 +1,2 @@ +docker build -t dbf-importer ../dbf-importer/ +docker run -p 8090:8080 dbf-importer:latest \ No newline at end of file diff --git a/z-distr/src/main/resources/distr/modules/dbf-exporter/Dockerfile b/z-distr/src/main/resources/distr/modules/dbf-exporter/Dockerfile new file mode 100644 index 000000000..fa8f8dab3 --- /dev/null +++ b/z-distr/src/main/resources/distr/modules/dbf-exporter/Dockerfile @@ -0,0 +1,39 @@ +FROM debian:stable-20220125 + + +############################################################################################################################################### +# Global system deps +############################################################################################################################################### + +RUN apt update \ + && apt install apt-file -y \ + && apt upgrade -y + +RUN apt install -y \ + wget \ + tzdata \ + curl \ + ca-certificates + +############################################################################################################################################### +# Java +############################################################################################################################################### + +ENV JAVA_VERSION jdk17.0.4+8 + +RUN set -eux; \ + ESUM='637a742591f75447eaab1f23942db038d411686f'; \ + BINARY_URL='https://download.bell-sw.com/java/17.0.4+8/bellsoft-jdk17.0.4+8-linux-amd64.tar.gz'; \ + curl -LfsSo /tmp/bellsoft-jdk.tar.gz ${BINARY_URL}; \ + mkdir -p /opt/java/bellsoft-jdk; \ + cd /opt/java/bellsoft-jdk; \ + tar -xf /tmp/bellsoft-jdk.tar.gz --strip-components=1; \ + rm -rf /tmp/bellsoft-jdk.tar.gz; + +ENV JAVA_HOME=/opt/java/bellsoft-jdk/ \ + PATH="/opt/java/bellsoft-jdk/bin:$PATH" +# +ADD dbf-exporter.jar /deployments/dbf-exporter.jar +USER root +RUN mkdir ./logs +ENTRYPOINT java -jar /deployments/dbf-exporter.jar diff --git a/z-distr/src/main/resources/distr/modules/dbf-importer/Dockerfile b/z-distr/src/main/resources/distr/modules/dbf-importer/Dockerfile new file mode 100644 index 000000000..2752db05d --- /dev/null +++ b/z-distr/src/main/resources/distr/modules/dbf-importer/Dockerfile @@ -0,0 +1,39 @@ +FROM debian:stable-20220125 + + +############################################################################################################################################### +# Global system deps +############################################################################################################################################### + +RUN apt update \ + && apt install apt-file -y \ + && apt upgrade -y + +RUN apt install -y \ + wget \ + tzdata \ + curl \ + ca-certificates + +############################################################################################################################################### +# Java +############################################################################################################################################### + +ENV JAVA_VERSION jdk17.0.4+8 + +RUN set -eux; \ + ESUM='637a742591f75447eaab1f23942db038d411686f'; \ + BINARY_URL='https://download.bell-sw.com/java/17.0.4+8/bellsoft-jdk17.0.4+8-linux-amd64.tar.gz'; \ + curl -LfsSo /tmp/bellsoft-jdk.tar.gz ${BINARY_URL}; \ + mkdir -p /opt/java/bellsoft-jdk; \ + cd /opt/java/bellsoft-jdk; \ + tar -xf /tmp/bellsoft-jdk.tar.gz --strip-components=1; \ + rm -rf /tmp/bellsoft-jdk.tar.gz; + +ENV JAVA_HOME=/opt/java/bellsoft-jdk/ \ + PATH="/opt/java/bellsoft-jdk/bin:$PATH" +# +ADD dbf-importer.jar /deployments/dbf-importer.jar +USER root +RUN mkdir ./logs +ENTRYPOINT java -jar /deployments/dbf-importer.jar diff --git a/z-distr/src/main/resources/distr/modules/sh/buid.sh b/z-distr/src/main/resources/distr/modules/sh/buid.sh deleted file mode 100644 index ce3510809..000000000 --- a/z-distr/src/main/resources/distr/modules/sh/buid.sh +++ /dev/null @@ -1 +0,0 @@ -docker build -t backend-api ../backend-api/ \ No newline at end of file