-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/release/1.0.0' into main
- Loading branch information
Showing
400 changed files
with
7,713 additions
and
6,162 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| jetty.port=8002 | ||
| jetty.status.port=10002 | ||
| jetty.context.path=/bpe | ||
| dev.dsf.server.api.port=8002 | ||
| dev.dsf.server.status.port=10002 | ||
| dev.dsf.server.context.path=/bpe | ||
|
|
||
| jetty.server.server.certificate=target/localhost_certificate.pem | ||
| jetty.server.certificate.private.key=target/localhost_private-key.pem | ||
| jetty.server.certificate.private.key.password=password | ||
| dev.dsf.server.certificate=target/localhost_certificate.pem | ||
| dev.dsf.server.certificate.key=target/localhost_private-key.pem | ||
| dev.dsf.server.certificate.key.password=password | ||
|
|
||
| jetty.auth.client.trust.certificates=target/testca_certificate.pem | ||
| dev.dsf.server.trust.client.certificate.cas=target/testca_certificate.pem |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 23 additions & 2 deletions
25
dsf-bpe/dsf-bpe-server-jetty/src/main/java/dev/dsf/bpe/BpeJettyServer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,38 @@ | ||
| package dev.dsf.bpe; | ||
|
|
||
| import org.slf4j.bridge.SLF4JBridgeHandler; | ||
| import org.springframework.context.annotation.AnnotationConfigApplicationContext; | ||
|
|
||
| import dev.dsf.bpe.config.BpeDbMigratorConfig; | ||
| import dev.dsf.bpe.config.BpeHttpJettyConfig; | ||
| import dev.dsf.common.jetty.JettyServer; | ||
| import dev.dsf.common.jetty.Log4jInitializer; | ||
| import dev.dsf.common.jetty.PropertyJettyConfig; | ||
| import dev.dsf.tools.db.DbMigrator; | ||
|
|
||
| public class BpeJettyServer | ||
| { | ||
| static | ||
| { | ||
| SLF4JBridgeHandler.removeHandlersForRootLogger(); | ||
| SLF4JBridgeHandler.install(); | ||
|
|
||
| Log4jInitializer.initializeLog4j(); | ||
| } | ||
|
|
||
| public static void main(String[] args) | ||
| { | ||
| new BpeServer(PropertyJettyConfig.forHttp().read()).start(); | ||
| try (AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext( | ||
| BpeDbMigratorConfig.class)) | ||
| { | ||
| DbMigrator migrator = context.getBean(DbMigrator.class); | ||
| DbMigrator.retryOnConnectException(3, migrator::migrate); | ||
| } | ||
|
|
||
| try (AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext( | ||
| BpeHttpJettyConfig.class)) | ||
| { | ||
| JettyServer server = context.getBean(JettyServer.class); | ||
| server.start(); | ||
| } | ||
| } | ||
| } |
25 changes: 23 additions & 2 deletions
25
dsf-bpe/dsf-bpe-server-jetty/src/main/java/dev/dsf/bpe/BpeJettyServerHttps.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,38 @@ | ||
| package dev.dsf.bpe; | ||
|
|
||
| import org.slf4j.bridge.SLF4JBridgeHandler; | ||
| import org.springframework.context.annotation.AnnotationConfigApplicationContext; | ||
|
|
||
| import dev.dsf.bpe.config.BpeDbMigratorConfig; | ||
| import dev.dsf.bpe.config.BpeHttpsJettyConfig; | ||
| import dev.dsf.common.jetty.JettyServer; | ||
| import dev.dsf.common.jetty.Log4jInitializer; | ||
| import dev.dsf.common.jetty.PropertyJettyConfig; | ||
| import dev.dsf.tools.db.DbMigrator; | ||
|
|
||
| public class BpeJettyServerHttps | ||
| { | ||
| static | ||
| { | ||
| SLF4JBridgeHandler.removeHandlersForRootLogger(); | ||
| SLF4JBridgeHandler.install(); | ||
|
|
||
| Log4jInitializer.initializeLog4j(); | ||
| } | ||
|
|
||
| public static void main(String[] args) | ||
| { | ||
| new BpeServer(PropertyJettyConfig.forHttps().read()).start(); | ||
| try (AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext( | ||
| BpeDbMigratorConfig.class)) | ||
| { | ||
| DbMigrator migrator = context.getBean(DbMigrator.class); | ||
| DbMigrator.retryOnConnectException(3, migrator::migrate); | ||
| } | ||
|
|
||
| try (AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext( | ||
| BpeHttpsJettyConfig.class)) | ||
| { | ||
| JettyServer server = context.getBean(JettyServer.class); | ||
| server.start(); | ||
| } | ||
| } | ||
| } |
40 changes: 0 additions & 40 deletions
40
dsf-bpe/dsf-bpe-server-jetty/src/main/java/dev/dsf/bpe/BpeServer.java
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.