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 2021/06/29 01:34:50 UTC
[james-project] 09/09: JAMES-3261 Get rid of no longer needed
jpa-smtp-common maven module in server/container/guice
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 277f514b4020e348189576120d9017c0444874a5
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Fri Jun 25 15:09:09 2021 +0700
JAMES-3261 Get rid of no longer needed jpa-smtp-common maven module in server/container/guice
---
server/apps/jpa-smtp-app/pom.xml | 45 ++++++++++-
.../java/org/apache/james/JPAJamesServerMain.java | 0
.../src/main/resources/META-INF/persistence.xml | 8 +-
.../src/main/resources/defaultMailetContainer.xml | 0
server/container/guice/jpa-smtp-common/pom.xml | 88 ----------------------
.../jpa-smtp-common/src/main/resources/logback.xml | 22 ------
server/container/guice/pom.xml | 6 --
7 files changed, 47 insertions(+), 122 deletions(-)
diff --git a/server/apps/jpa-smtp-app/pom.xml b/server/apps/jpa-smtp-app/pom.xml
index 4ea814d..ced7ff6 100644
--- a/server/apps/jpa-smtp-app/pom.xml
+++ b/server/apps/jpa-smtp-app/pom.xml
@@ -65,23 +65,60 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
+ <artifactId>james-server-data-jpa</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${james.groupId}</groupId>
+ <artifactId>james-server-guice-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-guice-common</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
+ <artifactId>james-server-guice-es-resporter</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${james.groupId}</groupId>
+ <artifactId>james-server-guice-smtp</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${james.groupId}</groupId>
+ <artifactId>james-server-guice-webadmin</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${james.groupId}</groupId>
+ <artifactId>james-server-guice-webadmin-data</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${james.groupId}</groupId>
+ <artifactId>james-server-guice-webadmin-mailqueue</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${james.groupId}</groupId>
+ <artifactId>james-server-guice-webadmin-mailrepository</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${james.groupId}</groupId>
+ <artifactId>james-server-jpa-common-guice</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${james.groupId}</groupId>
<artifactId>james-server-jpa-common-guice</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>james-server-jpa-smtp-common-guice</artifactId>
+ <artifactId>james-server-mailets</artifactId>
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>james-server-mailets</artifactId>
+ <artifactId>james-server-testing</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
@@ -105,6 +142,10 @@
<artifactId>logback-json-classic</artifactId>
</dependency>
<dependency>
+ <groupId>com.linagora</groupId>
+ <artifactId>logback-elasticsearch-appender</artifactId>
+ </dependency>
+ <dependency>
<groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
<scope>test</scope>
diff --git a/server/container/guice/jpa-smtp-common/src/main/java/org/apache/james/JPAJamesServerMain.java b/server/apps/jpa-smtp-app/src/main/java/org/apache/james/JPAJamesServerMain.java
similarity index 100%
rename from server/container/guice/jpa-smtp-common/src/main/java/org/apache/james/JPAJamesServerMain.java
rename to server/apps/jpa-smtp-app/src/main/java/org/apache/james/JPAJamesServerMain.java
diff --git a/server/container/guice/jpa-smtp-common/src/main/resources/META-INF/persistence.xml b/server/apps/jpa-smtp-app/src/main/resources/META-INF/persistence.xml
similarity index 87%
rename from server/container/guice/jpa-smtp-common/src/main/resources/META-INF/persistence.xml
rename to server/apps/jpa-smtp-app/src/main/resources/META-INF/persistence.xml
index 0656779..1dd8538 100644
--- a/server/container/guice/jpa-smtp-common/src/main/resources/META-INF/persistence.xml
+++ b/server/apps/jpa-smtp-app/src/main/resources/META-INF/persistence.xml
@@ -15,13 +15,13 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
- under the License.
+ under the License.
-->
<persistence xmlns="http://java.sun.com/xml/ns/persistence"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
- version="2.0">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
+ version="2.0">
<persistence-unit name="Global" transaction-type="RESOURCE_LOCAL">
<class>org.apache.james.domainlist.jpa.model.JPADomain</class>
diff --git a/server/container/guice/jpa-smtp-common/src/main/resources/defaultMailetContainer.xml b/server/apps/jpa-smtp-app/src/main/resources/defaultMailetContainer.xml
similarity index 100%
rename from server/container/guice/jpa-smtp-common/src/main/resources/defaultMailetContainer.xml
rename to server/apps/jpa-smtp-app/src/main/resources/defaultMailetContainer.xml
diff --git a/server/container/guice/jpa-smtp-common/pom.xml b/server/container/guice/jpa-smtp-common/pom.xml
deleted file mode 100644
index 9bd128b..0000000
--- a/server/container/guice/jpa-smtp-common/pom.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-guice</artifactId>
- <version>3.7.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>james-server-jpa-smtp-common-guice</artifactId>
-
- <name>Apache James :: Server :: JPA + SMTP - common guice injection</name>
-
- <dependencies>
- <dependency>
- <groupId>${james.groupId}</groupId>
- <artifactId>james-server-data-jpa</artifactId>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
- <artifactId>james-server-guice-common</artifactId>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
- <artifactId>james-server-guice-es-resporter</artifactId>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
- <artifactId>james-server-guice-smtp</artifactId>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
- <artifactId>james-server-guice-webadmin</artifactId>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
- <artifactId>james-server-guice-webadmin-data</artifactId>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
- <artifactId>james-server-guice-webadmin-mailqueue</artifactId>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
- <artifactId>james-server-guice-webadmin-mailrepository</artifactId>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
- <artifactId>james-server-jpa-common-guice</artifactId>
- </dependency>
- <dependency>
- <!-- Added because of https://issues.apache.org/jira/browse/SUREFIRE-1266 -->
- <groupId>${james.groupId}</groupId>
- <artifactId>james-server-testing</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
- <artifactId>queue-activemq-guice</artifactId>
- </dependency>
- <dependency>
- <groupId>com.linagora</groupId>
- <artifactId>logback-elasticsearch-appender</artifactId>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/server/container/guice/jpa-smtp-common/src/main/resources/logback.xml b/server/container/guice/jpa-smtp-common/src/main/resources/logback.xml
deleted file mode 100644
index 0e1ff22..0000000
--- a/server/container/guice/jpa-smtp-common/src/main/resources/logback.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-
- <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
- <resetJUL>true</resetJUL>
- </contextListener>
-
- <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%-5level] %logger{15} - %msg%n%rEx</pattern>
- <immediateFlush>false</immediateFlush>
- </encoder>
- </appender>
-
- <root level="WARN">
- <appender-ref ref="CONSOLE" />
- </root>
-
- <logger name="org.apache.james" level="INFO"/>
-
-
-</configuration>
diff --git a/server/container/guice/pom.xml b/server/container/guice/pom.xml
index 74dd1b2..ea45f6f 100644
--- a/server/container/guice/pom.xml
+++ b/server/container/guice/pom.xml
@@ -47,7 +47,6 @@
<module>es-metric-reporter</module>
<module>jmx</module>
<module>jpa-common</module>
- <module>jpa-smtp-common</module>
<module>mailbox</module>
<module>mailbox-jpa</module>
<module>mailbox-plugin-deleted-messages-vault</module>
@@ -252,11 +251,6 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>james-server-jpa-smtp-common-guice</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
<artifactId>mailrepository-cassandra</artifactId>
<version>${project.version}</version>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org