micord/ervu-secret
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

package executor service as war

Browse source
This commit is contained in:
kochetkov 2024-09-25 12:43:09 +03:00
parent 42561f210b
commit f17ab649cc
8 changed files with 118 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

73
config-data-executor/pom.xml
View file

@ -3,11 +3,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>ervu_secret</groupId>
<artifactId>ervu_secret</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<groupId>org.micord</groupId> <groupId>org.micord</groupId>
<artifactId>config-data-executor</artifactId> <artifactId>config-data-executor</artifactId>
<version>1.0-SNAPSHOT</version> <packaging>war</packaging>
<!-- <packaging>war</packaging>-->
<properties> <properties>
<maven.compiler.source>17</maven.compiler.source> <maven.compiler.source>17</maven.compiler.source>
@ -17,26 +20,6 @@
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-bom</artifactId>
<version>1.12.770</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>6.1.12</version>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>3.3.3</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
@ -44,12 +27,6 @@
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
<!-- <exclusions>-->
<!-- <exclusion>-->
<!-- <groupId>org.springframework.boot</groupId>-->
<!-- <artifactId>spring-boot-starter-tomcat</artifactId>-->
<!-- </exclusion>-->
<!-- </exclusions>-->
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
@ -58,18 +35,14 @@
<dependency> <dependency>
<groupId>com.atomikos</groupId> <groupId>com.atomikos</groupId>
<artifactId>transactions-jta</artifactId> <artifactId>transactions-jta</artifactId>
<version>6.0.0</version>
<classifier>jakarta</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.atomikos</groupId> <groupId>com.atomikos</groupId>
<artifactId>transactions-jdbc</artifactId> <artifactId>transactions-jdbc</artifactId>
<version>6.0.0</version>
<classifier>jakarta</classifier>
</dependency> </dependency>
<dependency> <dependency>
<groupId>jakarta.transaction</groupId> <groupId>javax.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId> <artifactId>javax.transaction-api</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.postgresql</groupId> <groupId>org.postgresql</groupId>
@ -80,32 +53,28 @@
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
<scope>provided</scope> <scope>provided</scope>
<version>1.18.34</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.xml.bind</groupId> <groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId> <artifactId>jaxb-api</artifactId>
<version>2.3.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.glassfish.jaxb</groupId> <groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId> <artifactId>jaxb-runtime</artifactId>
<version>2.3.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.arangodb</groupId> <groupId>com.arangodb</groupId>
<artifactId>arangodb-java-driver</artifactId> <artifactId>arangodb-java-driver</artifactId>
<version>7.7.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.amazonaws</groupId> <groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId> <artifactId>aws-java-sdk-s3</artifactId>
</dependency> </dependency>
<!-- <dependency>--> <dependency>
<!-- <groupId>jakarta.servlet</groupId>--> <groupId>javax.servlet</groupId>
<!-- <artifactId>jakarta.servlet-api</artifactId>--> <artifactId>javax.servlet-api</artifactId>
<!-- <scope>provided</scope>--> <scope>provided</scope>
<!-- </dependency>--> </dependency>
</dependencies> </dependencies>
<repositories> <repositories>
<repository> <repository>
@ -117,14 +86,14 @@
<build> <build>
<finalName>${artifactId}</finalName> <finalName>${artifactId}</finalName>
<plugins> <plugins>
<!-- <plugin>--> <plugin>
<!-- <groupId>org.apache.maven.plugins</groupId>--> <groupId>org.apache.maven.plugins</groupId>
<!-- <artifactId>maven-war-plugin</artifactId>--> <artifactId>maven-war-plugin</artifactId>
<!-- <version>3.1.0</version>--> <version>3.1.0</version>
<!-- <configuration>--> <configuration>
<!-- <failOnMissingWebXml>false</failOnMissingWebXml>--> <failOnMissingWebXml>false</failOnMissingWebXml>
<!-- </configuration>--> </configuration>
<!-- </plugin>--> </plugin>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>

30
config-data-executor/src/main/java/org/micord/Main.java
View file

@ -1,15 +1,15 @@
package org.micord; //package org.micord;
//
import org.springframework.boot.SpringApplication; //import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; //import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; //import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
//
/** ///**
* @author Maksim Tereshin // * @author Maksim Tereshin
*/ // */
@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) //@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
public class Main { //public class Main {
public static void main(String[] args) { // public static void main(String[] args) {
SpringApplication.run(Main.class, args); // SpringApplication.run(Main.class, args);
} // }
} //}

16
config-data-executor/src/main/java/org/micord/SpringBootTomcatApplication.java
View file

@ -1,8 +1,8 @@
//package org.micord; package org.micord;
//
//import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
//import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
//
//@SpringBootApplication @SpringBootApplication
//public class SpringBootTomcatApplication extends SpringBootServletInitializer { public class SpringBootTomcatApplication extends SpringBootServletInitializer {
//} }

4
config-data-executor/src/main/java/org/micord/config/AtomikosConfig.java
View file

@ -2,8 +2,8 @@ package org.micord.config;
import com.atomikos.icatch.jta.UserTransactionImp; import com.atomikos.icatch.jta.UserTransactionImp;
import com.atomikos.icatch.jta.UserTransactionManager; import com.atomikos.icatch.jta.UserTransactionManager;
import jakarta.transaction.TransactionManager; import javax.transaction.TransactionManager;
import jakarta.transaction.UserTransaction; import javax.transaction.UserTransaction;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.transaction.annotation.EnableTransactionManagement; import org.springframework.transaction.annotation.EnableTransactionManagement;

4
config-data-executor/src/main/resources/application.yml
View file

@ -1,3 +1 @@
configDirectory: C:\work\ervu-secret\сonfig-data-executor\config-examples configDirectory: C:\work\ervu-secret\config-data-executor\config-examples
server:
port: 8090

2
config/patches/default.cli
View file

@ -63,6 +63,6 @@ xa-data-source add \
/system-property=gar.enable:add(value=false) /system-property=gar.enable:add(value=false)
/system-property=fias.enable:add(value=false) /system-property=fias.enable:add(value=false)
/system-property=bpmn.enable:add(value=false) /system-property=bpmn.enable:add(value=false)
/system-property=config.data.executor.url:add(value="http://localhost:8090/api") /system-property=config.data.executor.url:add(value="http://localhost:8080/config-data-executor/api")
/system-property=config.data.executor.socket.timeout:add(value="10") /system-property=config.data.executor.socket.timeout:add(value="10")
/system-property=config.data.executor.connection.timeout:add(value="10") /system-property=config.data.executor.connection.timeout:add(value="10")

2
config/standalone.xml
View file

@ -55,7 +55,7 @@
<property name="fias.enable" value="false"/> <property name="fias.enable" value="false"/>
<property name="bpmn.enable" value="false"/> <property name="bpmn.enable" value="false"/>
<property name="com.arjuna.ats.arjuna.allowMultipleLastResources" value="true"/> <property name="com.arjuna.ats.arjuna.allowMultipleLastResources" value="true"/>
<property name="config.data.executor.url" value="http://localhost:8090/api"/> <property name="config.data.executor.url" value="http://localhost:8080/config-data-executor/api"/>
<property name="config.data.executor.socket.timeout" value="10"/> <property name="config.data.executor.socket.timeout" value="10"/>
<property name="config.data.executor.connection.timeout" value="10"/> <property name="config.data.executor.connection.timeout" value="10"/>
</system-properties> </system-properties>

69
pom.xml
View file

@ -8,6 +8,7 @@
<packaging>pom</packaging> <packaging>pom</packaging>
<modules> <modules>
<module>backend</module> <module>backend</module>
<module>config-data-executor</module>
<module>resources</module> <module>resources</module>
</modules> </modules>
<scm> <scm>
@ -22,6 +23,7 @@
<webbpm-platform.version>3.180.0</webbpm-platform.version> <webbpm-platform.version>3.180.0</webbpm-platform.version>
<wbp.overall-timeout>72000</wbp.overall-timeout> <wbp.overall-timeout>72000</wbp.overall-timeout>
<jasperreports.version>6.15.0</jasperreports.version> <jasperreports.version>6.15.0</jasperreports.version>
<spring-boot.version>2.7.18</spring-boot.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
@ -32,6 +34,27 @@
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-bom</artifactId>
<version>1.12.770</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring-boot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.33</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency> <dependency>
<groupId>ervu_secret.ervu_secret</groupId> <groupId>ervu_secret.ervu_secret</groupId>
<artifactId>backend</artifactId> <artifactId>backend</artifactId>
@ -343,6 +366,52 @@
<artifactId>slf4j-simple</artifactId> <artifactId>slf4j-simple</artifactId>
<version>1.7.28</version> <version>1.7.28</version>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>${spring-boot.version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
</exclusion>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.atomikos</groupId>
<artifactId>transactions-jta</artifactId>
<version>6.0.0</version>
</dependency>
<dependency>
<groupId>com.atomikos</groupId>
<artifactId>transactions-jdbc</artifactId>
<version>6.0.0</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
<version>1.18.34</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>com.arangodb</groupId>
<artifactId>arangodb-java-driver</artifactId>
<version>7.7.1</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
<repositories> <repositories>