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 1804abd0270ed1e5b377b938ad04f1cc11e2850f Author: Benoit TELLIER <[email protected]> AuthorDate: Tue Sep 30 07:18:47 2025 +0200 [REMOVAL] Drop SMTP MPT tests for cassandra-app Those tests are identical to the ones of distributed app thus brings no value. --- mpt/impl/smtp/cassandra/pom.xml | 95 ----------------- .../james/mpt/smtp/CassandraForwardSmtpTest.java | 66 ------------ .../mpt/smtp/CassandraSmtpStarttlsCommandTest.java | 58 ----------- .../cassandra/src/test/resources/dnsservice.xml | 25 ----- .../cassandra/src/test/resources/domainlist.xml | 28 ----- .../cassandra/src/test/resources/imapserver.xml | 25 ----- .../smtp/cassandra/src/test/resources/keystore | Bin 2245 -> 0 bytes .../cassandra/src/test/resources/lmtpserver.xml | 23 ----- .../src/test/resources/mailetcontainer.xml | 115 --------------------- .../src/test/resources/mailrepositorystore.xml | 30 ------ .../src/test/resources/managesieveserver.xml | 32 ------ .../cassandra/src/test/resources/pop3server.xml | 24 ----- .../src/test/resources/recipientrewritetable.xml | 27 ----- .../cassandra/src/test/resources/smtpserver.xml | 110 -------------------- mpt/impl/smtp/pom.xml | 7 -- 15 files changed, 665 deletions(-) diff --git a/mpt/impl/smtp/cassandra/pom.xml b/mpt/impl/smtp/cassandra/pom.xml deleted file mode 100644 index 3c56366dbf..0000000000 --- a/mpt/impl/smtp/cassandra/pom.xml +++ /dev/null @@ -1,95 +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/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.james</groupId> - <artifactId>apache-james-mpt-smtp</artifactId> - <version>3.10.0-SNAPSHOT</version> - </parent> - - <artifactId>apache-james-mpt-smtp-cassandra</artifactId> - <packaging>jar</packaging> - - <name>Apache James :: MPT :: SMTP :: Cassandra</name> - - <dependencies> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>apache-james-backends-cassandra</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>apache-james-backends-opensearch</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>apache-james-mpt-smtp-core</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>james-server-cassandra-app</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>james-server-cassandra-app</artifactId> - <type>test-jar</type> - <scope>test</scope> - </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-jmap</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice-opensearch</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>james-server-util</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>testing-base</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> - </dependencies> -</project> diff --git a/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/CassandraForwardSmtpTest.java b/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/CassandraForwardSmtpTest.java deleted file mode 100644 index 4901dbf862..0000000000 --- a/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/CassandraForwardSmtpTest.java +++ /dev/null @@ -1,66 +0,0 @@ -/**************************************************************** - * 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. * - ****************************************************************/ - -package org.apache.james.mpt.smtp; - -import static org.apache.james.modules.protocols.SmtpGuiceProbe.SmtpServerConnectedType.SMTP_GLOBAL_SERVER; - -import org.apache.james.CassandraExtension; -import org.apache.james.CassandraJamesServerMain; -import org.apache.james.DockerOpenSearchExtension; -import org.apache.james.JamesServerExtension; -import org.apache.james.SearchConfiguration; -import org.apache.james.TestingDistributedJamesServerBuilder; -import org.apache.james.backends.cassandra.DockerCassandra; -import org.apache.james.backends.cassandra.init.configuration.ClusterConfiguration; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Order; -import org.junit.jupiter.api.extension.RegisterExtension; - -public class CassandraForwardSmtpTest implements ForwardSmtpTest { - - - private static final CassandraExtension cassandraExtension = new CassandraExtension(); - - @BeforeAll - static void setUp() { - Thread.currentThread().setContextClassLoader(CassandraForwardSmtpTest.class.getClassLoader()); - } - - @Order(1) - @RegisterExtension - static JamesServerExtension testExtension = TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.openSearch()) - .extension(new DockerOpenSearchExtension()) - .extension(cassandraExtension) - .extension(new InMemoryDnsExtension()) - .server(CassandraJamesServerMain::createServer) - .overrideServerModule(binder -> binder.bind(ClusterConfiguration.class) - .toInstance(DockerCassandra.configurationBuilder(cassandraExtension.getCassandra().getHost()) - .username(DockerCassandra.CASSANDRA_TESTING_USER) - .password(DockerCassandra.CASSANDRA_TESTING_PASSWORD) - .build())) - .build(); - - - @Order(2) - @RegisterExtension - static SmtpTestExtension smtpTestExtension = new SmtpTestExtension(SMTP_GLOBAL_SERVER, testExtension); - - -} diff --git a/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/CassandraSmtpStarttlsCommandTest.java b/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/CassandraSmtpStarttlsCommandTest.java deleted file mode 100644 index 3dfe6e7e1d..0000000000 --- a/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/CassandraSmtpStarttlsCommandTest.java +++ /dev/null @@ -1,58 +0,0 @@ -/**************************************************************** - * 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. * - ****************************************************************/ - -package org.apache.james.mpt.smtp; - -import static org.apache.james.modules.protocols.SmtpGuiceProbe.SmtpServerConnectedType.SMTP_START_TLS_SERVER; - -import org.apache.james.CassandraExtension; -import org.apache.james.CassandraJamesServerMain; -import org.apache.james.DockerOpenSearchExtension; -import org.apache.james.JamesServerExtension; -import org.apache.james.SearchConfiguration; -import org.apache.james.TestingDistributedJamesServerBuilder; -import org.apache.james.backends.cassandra.DockerCassandra; -import org.apache.james.backends.cassandra.init.configuration.ClusterConfiguration; -import org.junit.jupiter.api.Order; -import org.junit.jupiter.api.extension.RegisterExtension; - -public class CassandraSmtpStarttlsCommandTest extends SmtpStarttlsCommandTest { - - - private static final CassandraExtension cassandraExtension = new CassandraExtension(); - - @Order(1) - @RegisterExtension - static JamesServerExtension testExtension = TestingDistributedJamesServerBuilder.withSearchConfiguration(SearchConfiguration.openSearch()) - .extension(new DockerOpenSearchExtension()) - .extension(cassandraExtension) - .extension(new InMemoryDnsExtension()) - .server(CassandraJamesServerMain::createServer) - .overrideServerModule(binder -> binder.bind(ClusterConfiguration.class) - .toInstance(DockerCassandra.configurationBuilder(cassandraExtension.getCassandra().getHost()) - .username(DockerCassandra.CASSANDRA_TESTING_USER) - .password(DockerCassandra.CASSANDRA_TESTING_PASSWORD) - .build())) - .build(); - - - @Order(2) - @RegisterExtension - static SmtpTestExtension smtpTestExtension = new SmtpTestExtension(SMTP_START_TLS_SERVER, testExtension); -} diff --git a/mpt/impl/smtp/cassandra/src/test/resources/dnsservice.xml b/mpt/impl/smtp/cassandra/src/test/resources/dnsservice.xml deleted file mode 100644 index 6e4fbd2efb..0000000000 --- a/mpt/impl/smtp/cassandra/src/test/resources/dnsservice.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0"?> -<!-- - 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. - --> - -<dnsservice> - <autodiscover>true</autodiscover> - <authoritative>false</authoritative> - <maxcachesize>50000</maxcachesize> -</dnsservice> diff --git a/mpt/impl/smtp/cassandra/src/test/resources/domainlist.xml b/mpt/impl/smtp/cassandra/src/test/resources/domainlist.xml deleted file mode 100644 index cb6a2e8b0e..0000000000 --- a/mpt/impl/smtp/cassandra/src/test/resources/domainlist.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0"?> -<!-- - 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. - --> - -<domainlist> - <domainnames> - <domainname>mydomain.tld</domainname> - </domainnames> - <autodetect>false</autodetect> - <autodetectIP>false</autodetectIP> - <defaultDomain>localhost</defaultDomain> -</domainlist> diff --git a/mpt/impl/smtp/cassandra/src/test/resources/imapserver.xml b/mpt/impl/smtp/cassandra/src/test/resources/imapserver.xml deleted file mode 100644 index 7d64639297..0000000000 --- a/mpt/impl/smtp/cassandra/src/test/resources/imapserver.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0"?> - -<!-- -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. ---> - - -<imapservers> - <imapserver enabled="false"/> -</imapservers> diff --git a/mpt/impl/smtp/cassandra/src/test/resources/keystore b/mpt/impl/smtp/cassandra/src/test/resources/keystore deleted file mode 100644 index 536a6c792b..0000000000 Binary files a/mpt/impl/smtp/cassandra/src/test/resources/keystore and /dev/null differ diff --git a/mpt/impl/smtp/cassandra/src/test/resources/lmtpserver.xml b/mpt/impl/smtp/cassandra/src/test/resources/lmtpserver.xml deleted file mode 100644 index 5f5447360f..0000000000 --- a/mpt/impl/smtp/cassandra/src/test/resources/lmtpserver.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0"?> -<!-- - 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. - --> - -<lmtpservers> - <lmtpserver enabled="false"/> -</lmtpservers> diff --git a/mpt/impl/smtp/cassandra/src/test/resources/mailetcontainer.xml b/mpt/impl/smtp/cassandra/src/test/resources/mailetcontainer.xml deleted file mode 100644 index a9bea5550a..0000000000 --- a/mpt/impl/smtp/cassandra/src/test/resources/mailetcontainer.xml +++ /dev/null @@ -1,115 +0,0 @@ -<?xml version="1.0"?> - -<!-- - 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. - --> - -<mailetcontainer enableJmx="true"> - - <context> - <postmaster>postmaster</postmaster> - </context> - - <spooler> - <threads>20</threads> - </spooler> - - <processors> - <processor state="root" enableJmx="true"> - <mailet match="All" class="PostmasterAlias"/> - <mailet match="RelayLimit=30" class="Null"/> - - <mailet match="All" class="ToProcessor"> - <processor>transport</processor> - </mailet> - </processor> - - <processor state="error" enableJmx="true"> - <mailet match="All" class="Bounce"> - <onMailetException>ignore</onMailetException> - </mailet> - <mailet match="All" class="ToRepository"> - <repositoryPath>cassandra://var/mail/error/</repositoryPath> - <onMailetException>ignore</onMailetException> - </mailet> - </processor> - - <processor state="transport" enableJmx="true"> - <mailet match="All" class="RemoveMimeHeader"> - <name>bcc</name> - </mailet> - <mailet match="HasMailAttribute=org.apache.james.SMIMECheckSignature" class="SetMimeHeader"> - <name>X-WasSigned</name> - <value>true</value> - </mailet> - <mailet match="All" class="RemoveMimeHeader"> - <name>bcc</name> - </mailet> - <mailet match="All" class="RecipientRewriteTable"> - <errorProcessor>rrt-error</errorProcessor> - </mailet> - <mailet match="RecipientIsLocal" class="VacationMailet"> - <onMailetException>ignore</onMailetException> - </mailet> - <mailet match="RecipientIsLocal" class="org.apache.james.jmap.mailet.filter.JMAPFiltering"> - <onMailetException>ignore</onMailetException> - </mailet> - <mailet match="All" class="RemoteDelivery"> - <outgoingQueue>outgoing</outgoingQueue> - <delayTime>5 minutes</delayTime> - <delayTime>10 minutes</delayTime> - <delayTime>45 minutes</delayTime> - <delayTime>2 hours</delayTime> - <delayTime>3 hours</delayTime> - <delayTime>6 hours</delayTime> - <maxRetries>0</maxRetries> - <maxDnsProblemRetries>0</maxDnsProblemRetries> - <deliveryThreads>1</deliveryThreads> - <sendpartial>false</sendpartial> - <bounceProcessor>bounces</bounceProcessor> - </mailet> - </processor> - - <processor state="relay-denied" enableJmx="true"> - <mailet match="All" class="Bounce"> - <attachment>none</attachment> - </mailet> - <mailet match="All" class="ToRepository"> - <repositoryPath>cassandra://var/mail/relay-denied/</repositoryPath> - <notice>Warning: You are sending an e-mail to a remote server. You must be authentified to perform such an operation</notice> - </mailet> - </processor> - - <processor state="bounces" enableJmx="true"> - <mailet match="All" class="DSNBounce"> - <passThrough>false</passThrough> - </mailet> - </processor> - - <processor state="rrt-error" enableJmx="false"> - <mailet match="All" class="ToRepository"> - <repositoryPath>cassandra://var/mail/rrt-error/</repositoryPath> - <passThrough>true</passThrough> - </mailet> - <mailet match="IsSenderInRRTLoop" class="Null"/> - <mailet match="All" class="Bounce"/> - </processor> - </processors> - -</mailetcontainer> - diff --git a/mpt/impl/smtp/cassandra/src/test/resources/mailrepositorystore.xml b/mpt/impl/smtp/cassandra/src/test/resources/mailrepositorystore.xml deleted file mode 100644 index 626e0a2bad..0000000000 --- a/mpt/impl/smtp/cassandra/src/test/resources/mailrepositorystore.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0"?> - -<!-- - 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. - --> - -<mailrepositorystore> - <mailrepositories> - <mailrepository class="org.apache.james.mailrepository.cassandra.CassandraMailRepository"> - <protocols> - <protocol>cassandra</protocol> - </protocols> - </mailrepository> - </mailrepositories> -</mailrepositorystore> diff --git a/mpt/impl/smtp/cassandra/src/test/resources/managesieveserver.xml b/mpt/impl/smtp/cassandra/src/test/resources/managesieveserver.xml deleted file mode 100644 index 4047f9f8af..0000000000 --- a/mpt/impl/smtp/cassandra/src/test/resources/managesieveserver.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0"?> -<!-- - 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. - --> - -<!-- - This template file can be used as example for James Server configuration - DO NOT USE IT AS SUCH AND ADAPT IT TO YOUR NEEDS ---> - -<!-- See http://james.apache.org/server/3/config.html for usage --> - -<managesieveservers> - <managesieveserver enabled="false"/> -</managesieveservers> - - diff --git a/mpt/impl/smtp/cassandra/src/test/resources/pop3server.xml b/mpt/impl/smtp/cassandra/src/test/resources/pop3server.xml deleted file mode 100644 index e277325b2d..0000000000 --- a/mpt/impl/smtp/cassandra/src/test/resources/pop3server.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0"?> -<!-- - 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. - --> - - -<pop3servers> - <pop3server enabled="false"/> -</pop3servers> diff --git a/mpt/impl/smtp/cassandra/src/test/resources/recipientrewritetable.xml b/mpt/impl/smtp/cassandra/src/test/resources/recipientrewritetable.xml deleted file mode 100644 index 5553a40643..0000000000 --- a/mpt/impl/smtp/cassandra/src/test/resources/recipientrewritetable.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0"?> -<!-- - 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. - --> - -<!-- The default table for storing James' RecipientRewriteTable mappings. --> -<recipientrewritetable> - <recursiveMapping>true</recursiveMapping> - <mappingLimit>10</mappingLimit> - <mapping>some@domain=some</mapping> -</recipientrewritetable> - diff --git a/mpt/impl/smtp/cassandra/src/test/resources/smtpserver.xml b/mpt/impl/smtp/cassandra/src/test/resources/smtpserver.xml deleted file mode 100644 index b85ebee8ba..0000000000 --- a/mpt/impl/smtp/cassandra/src/test/resources/smtpserver.xml +++ /dev/null @@ -1,110 +0,0 @@ -<?xml version="1.0"?> - -<!-- - 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. - --> - -<smtpservers> - <smtpserver enabled="true"> - <heloName autodetect="false">mydomain.tld</heloName> - <jmxName>smtpserver-global</jmxName> - <bind>0.0.0.0:0</bind> - <connectionBacklog>200</connectionBacklog> - <tls socketTLS="false" startTLS="false"> - <keystore>file://conf/keystore</keystore> - <secret>james72laBalle</secret> - <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider> - <algorithm>SunX509</algorithm> - </tls> - <connectiontimeout>360</connectiontimeout> - <connectionLimit>0</connectionLimit> - <connectionLimitPerIP>0</connectionLimitPerIP> - <auth> - <announce>never</announce> - <requireSSL>false</requireSSL> - <plainAuthEnabled>true</plainAuthEnabled> - </auth> - <verifyIdentity>false</verifyIdentity> - <maxmessagesize>0</maxmessagesize> - <addressBracketsEnforcement>true</addressBracketsEnforcement> - <smtpGreeting>mydomain.tld smtp</smtpGreeting> - <handlerchain> - <handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/> - <handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/> - </handlerchain> - <gracefulShutdown>false</gracefulShutdown> - </smtpserver> - <smtpserver enabled="true"> - <jmxName>smtpserver-TLS</jmxName> - <bind>0.0.0.0:0</bind> - <connectionBacklog>200</connectionBacklog> - <tls socketTLS="false" startTLS="false"> - <keystore>file://conf/keystore</keystore> - <secret>james72laBalle</secret> - <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider> - <algorithm>SunX509</algorithm> - </tls> - <connectiontimeout>360</connectiontimeout> - <connectionLimit>0</connectionLimit> - <connectionLimitPerIP>0</connectionLimitPerIP> - <auth> - <announce>forUnauthorizedAddresses</announce> - <requireSSL>false</requireSSL> - </auth> - <!-- Trust authenticated users --> - <verifyIdentity>false</verifyIdentity> - <maxmessagesize>0</maxmessagesize> - <addressBracketsEnforcement>true</addressBracketsEnforcement> - <smtpGreeting>Apache JAMES awesome SMTP Server</smtpGreeting> - <handlerchain> - <handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/> - <handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/> - </handlerchain> - <gracefulShutdown>false</gracefulShutdown> - </smtpserver> - <smtpserver enabled="true"> - <jmxName>smtpserver-authenticated</jmxName> - <bind>0.0.0.0:0</bind> - <connectionBacklog>200</connectionBacklog> - <tls socketTLS="false" startTLS="true"> - <keystore>keystore</keystore> - <secret>james72laBalle</secret> - <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider> - <algorithm>SunX509</algorithm> - </tls> - <connectiontimeout>360</connectiontimeout> - <connectionLimit>0</connectionLimit> - <connectionLimitPerIP>0</connectionLimitPerIP> - <auth> - <announce>forUnauthorizedAddresses</announce> - <requireSSL>false</requireSSL> - </auth> - <!-- Trust authenticated users --> - <verifyIdentity>false</verifyIdentity> - <maxmessagesize>0</maxmessagesize> - <addressBracketsEnforcement>true</addressBracketsEnforcement> - <smtpGreeting>Apache JAMES awesome SMTP Server</smtpGreeting> - <handlerchain> - <handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/> - <handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/> - </handlerchain> - <gracefulShutdown>false</gracefulShutdown> - </smtpserver> -</smtpservers> - - diff --git a/mpt/impl/smtp/pom.xml b/mpt/impl/smtp/pom.xml index 1bb32e70c9..f099c93d8d 100644 --- a/mpt/impl/smtp/pom.xml +++ b/mpt/impl/smtp/pom.xml @@ -31,7 +31,6 @@ <name>Apache James :: MPT :: SMTP</name> <modules> - <module>cassandra</module> <module>cassandra-rabbitmq-object-storage</module> <module>core</module> <module>jpa-pulsar</module> @@ -39,12 +38,6 @@ <dependencyManagement> <dependencies> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>apache-james-mpt-smtp-cassandra</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> <dependency> <groupId>${james.groupId}</groupId> <artifactId>apache-james-mpt-smtp-core</artifactId> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
