You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2022/08/23 10:27:02 UTC
[james-project] branch master updated (328aca0708 -> 72bbfec41e)
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
from 328aca0708 JAMES-3771 Delete ESReporterTest.java
add 72bbfec41e JAMES-3711 Move ElasticSearch as a separate extension (#1110)
No new revisions were added by this update.
Summary of changes:
server/apps/cassandra-app/pom.xml | 5 --
.../org/apache/james/CassandraJamesServerMain.java | 2 -
server/apps/distributed-app/pom.xml | 5 --
.../james/CassandraRabbitMQJamesServerMain.java | 2 -
.../james/DistributedPOP3JamesServerMain.java | 2 -
server/apps/scaling-pulsar-smtp/pom.xml | 5 --
.../src/main/java/org/apache/james/Main.java | 2 -
server/container/guice/es-metric-reporter/pom.xml | 73 ---------------------
server/container/guice/pom.xml | 1 -
server/pom.xml | 1 -
third-party/elasticsearch/README.md | 38 +++++++++++
.../elasticsearch/conf/elasticsearch.properties | 9 +++
.../elasticsearch/conf/extensions.properties | 2 +
.../elasticsearch/conf}/keystore | Bin
third-party/elasticsearch/docker-compose.yml | 20 ++++++
.../elasticsearch}/pom.xml | 49 ++++++++++++--
.../james/metrics/es/v7/ESMetricReporter.java | 6 +-
.../metrics/es/v7/ESMetricReporterModule.java | 18 +----
.../metrics/es/v7/ESReporterConfiguration.java | 0
.../metric/es/v7/DockerElasticSearchExtension.java | 12 ++--
.../apache/james/metric/es/v7/ES2ReporterTest.java | 0
.../apache/james/metric/es/v7/ES6ReporterTest.java | 0
.../apache/james/metric/es/v7/ES7ReporterTest.java | 0
.../metric/es/v7/ESReportedConfigurationTest.java | 2 +-
.../james/metric/es/v7/ESReporterContract.java | 0
third-party/pom.xml | 1 +
26 files changed, 125 insertions(+), 130 deletions(-)
delete mode 100644 server/container/guice/es-metric-reporter/pom.xml
create mode 100644 third-party/elasticsearch/README.md
create mode 100644 third-party/elasticsearch/conf/elasticsearch.properties
create mode 100644 third-party/elasticsearch/conf/extensions.properties
copy {examples/imap-autoconf => third-party/elasticsearch/conf}/keystore (100%)
create mode 100644 third-party/elasticsearch/docker-compose.yml
rename {server/container/metrics/metrics-es-reporter-v7 => third-party/elasticsearch}/pom.xml (66%)
rename {server/container/metrics/metrics-es-reporter-v7 => third-party/elasticsearch}/src/main/java/org/apache/james/metrics/es/v7/ESMetricReporter.java (95%)
rename server/container/guice/es-metric-reporter/src/main/java/org/apache/james/modules/server/ElasticSearchMetricReporterModule.java => third-party/elasticsearch/src/main/java/org/apache/james/metrics/es/v7/ESMetricReporterModule.java (83%)
rename {server/container/metrics/metrics-es-reporter-v7 => third-party/elasticsearch}/src/main/java/org/apache/james/metrics/es/v7/ESReporterConfiguration.java (100%)
rename {server/container/metrics/metrics-es-reporter-v7 => third-party/elasticsearch}/src/test/java/org/apache/james/metric/es/v7/DockerElasticSearchExtension.java (90%)
rename {server/container/metrics/metrics-es-reporter-v7 => third-party/elasticsearch}/src/test/java/org/apache/james/metric/es/v7/ES2ReporterTest.java (100%)
rename {server/container/metrics/metrics-es-reporter-v7 => third-party/elasticsearch}/src/test/java/org/apache/james/metric/es/v7/ES6ReporterTest.java (100%)
rename {server/container/metrics/metrics-es-reporter-v7 => third-party/elasticsearch}/src/test/java/org/apache/james/metric/es/v7/ES7ReporterTest.java (100%)
rename {server/container/metrics/metrics-es-reporter-v7 => third-party/elasticsearch}/src/test/java/org/apache/james/metric/es/v7/ESReportedConfigurationTest.java (98%)
rename {server/container/metrics/metrics-es-reporter-v7 => third-party/elasticsearch}/src/test/java/org/apache/james/metric/es/v7/ESReporterContract.java (100%)
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org