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 1ad46c0f5d52041270e6abe22b74daa456c43266 Author: Benoit Tellier <[email protected]> AuthorDate: Fri Jun 25 14:17:35 2021 +0700 JAMES-3261 JPA-SMTP app: docker-compose to connect to MariaDB --- server/apps/jpa-app/README.adoc | 26 +++- server/apps/jpa-smtp-app/README.adoc | 26 +++- server/apps/jpa-smtp-app/docker-compose.yml | 28 ++++ .../james-database-mariadb.properties} | 12 +- server/apps/jpa-smtp-mariadb-app/pom.xml | 156 --------------------- .../sample-configuration/dnsservice.xml | 25 ---- .../sample-configuration/domainlist.xml | 25 ---- .../sample-configuration/mailetcontainer.xml | 105 -------------- .../sample-configuration/mailrepositorystore.xml | 34 ----- .../sample-configuration/recipientrewritetable.xml | 27 ---- .../sample-configuration/smtpserver.xml | 105 -------------- .../sample-configuration/usersrepository.xml | 27 ---- .../sample-configuration/webadmin.properties | 23 --- server/pom.xml | 1 - 14 files changed, 82 insertions(+), 538 deletions(-) diff --git a/server/apps/jpa-app/README.adoc b/server/apps/jpa-app/README.adoc index 97b16db..43e7c89 100644 --- a/server/apps/jpa-app/README.adoc +++ b/server/apps/jpa-app/README.adoc @@ -77,4 +77,28 @@ The [CLI](https://james.apache.org/server/manage-cli.html) can easily be used: [source] ---- docker exec CONTAINER-ID james-cli ListDomains ----- \ No newline at end of file +---- + +=== Using alternative JDBC drivers + +In `james-database.properties`, one can specify any JDBC driver on the class path. + +With docker, such drivers can be added to the classpath by placing the driver JAR in a volume +and mounting it within `/root/libs` directory. + +We do ship a [docker-compose](https://github.com/apache/james-project/blob/master/server/apps/jpa-smtp-app/docker-compose.yml) +file demonstrating James JPA app usage with MariaDB. In order to run it: + +.... +# 1. Download the driver: +wget https://repo1.maven.org/maven2/org/mariadb/jdbc/mariadb-java-client/2.7.2/mariadb-java-client-2.7.2.jar + +# 2. Generate the keystore with the default password `james72laBalle`: +keytool -genkey -alias james -keyalg RSA -keystore keystore + +# 3. Start MariaDB +docker-compose up -d mariadb + +# 4. Start James +docker-compose up james +.... \ No newline at end of file diff --git a/server/apps/jpa-smtp-app/README.adoc b/server/apps/jpa-smtp-app/README.adoc index 8254a6a..207baad 100644 --- a/server/apps/jpa-smtp-app/README.adoc +++ b/server/apps/jpa-smtp-app/README.adoc @@ -79,4 +79,28 @@ The [CLI](https://james.apache.org/server/manage-cli.html) can easily be used: [source] ---- docker exec CONTAINER-ID james-cli ListDomains ----- \ No newline at end of file +---- + +=== Using alternative JDBC drivers + +In `james-database.properties`, one can specify any JDBC driver on the class path. + +With docker, such drivers can be added to the classpath by placing the driver JAR in a volume +and mounting it within `/root/libs` directory. + +We do ship a [docker-compose](https://github.com/apache/james-project/blob/master/server/apps/jpa-smtp-app/docker-compose.yml) +file demonstrating James JPA app usage with MariaDB. In order to run it: + +.... +# 1. Download the driver: +wget https://repo1.maven.org/maven2/org/mariadb/jdbc/mariadb-java-client/2.7.2/mariadb-java-client-2.7.2.jar + +# 2. Generate the keystore with the default password `james72laBalle`: +keytool -genkey -alias james -keyalg RSA -keystore keystore + +# 3. Start MariaDB +docker-compose up -d mariadb + +# 4. Start James +docker-compose up james +.... \ No newline at end of file diff --git a/server/apps/jpa-smtp-app/docker-compose.yml b/server/apps/jpa-smtp-app/docker-compose.yml new file mode 100644 index 0000000..2d22da5 --- /dev/null +++ b/server/apps/jpa-smtp-app/docker-compose.yml @@ -0,0 +1,28 @@ +version: '3' + +# In order to start James JPA app on top of mariaDB: +# 1. Download the driver: `wget https://repo1.maven.org/maven2/org/mariadb/jdbc/mariadb-java-client/2.7.2/mariadb-java-client-2.7.2.jar` +# 2. Generate the keystore with the default password `james72laBalle`: `keytool -genkey -alias james -keyalg RSA -keystore keystore` +# 3. Start MariaDB: `docker-compose up -d mariadb` +# 4. Start James: `docker-compose up james` + +services: + + james: + depends_on: + - mariadb + image: apache/james:jpa-smtp-latest + container_name: james + hostname: james.local + volumes: + - $PWD/mariadb-java-client-2.7.2.jar:/root/libs/mariadb-java-client-2.7.2.jar + - $PWD/sample-configuration/james-database-mariadb.properties:/root/conf/james-database.properties + - $PWD/keystore:/root/conf/keystore + + mariadb: + image: mariadb:10.6 + environment: + - MARIADB_ROOT_PASSWORD=test + - MARIADB_DATABASE=test + - MARIADB_USER=test + - MARIADB_PASSWORD=test \ No newline at end of file diff --git a/server/apps/jpa-smtp-mariadb-app/sample-configuration/james-database.properties b/server/apps/jpa-smtp-app/sample-configuration/james-database-mariadb.properties similarity index 84% rename from server/apps/jpa-smtp-mariadb-app/sample-configuration/james-database.properties rename to server/apps/jpa-smtp-app/sample-configuration/james-database-mariadb.properties index 80fe839..8060df0 100644 --- a/server/apps/jpa-smtp-mariadb-app/sample-configuration/james-database.properties +++ b/server/apps/jpa-smtp-app/sample-configuration/james-database-mariadb.properties @@ -18,17 +18,13 @@ # 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 +# Read https://james.apache.org/server/config-system.html#james-database.properties for further details # Use derby as default database.driverClassName=org.mariadb.jdbc.Driver -database.url=jdbc:mariadb://localhost:3306/ -database.username=app -database.password=app - -# Supported adapters are: -# DB2, DERBY, H2, HSQL, INFORMIX, MYSQL, ORACLE, POSTGRESQL, SQL_SERVER, SYBASE -vendorAdapter.database=MYSQL +database.url=jdbc:mariadb://mariadb/test +database.username=test +database.password=test # Use streaming for Blobs # This is only supported on a limited set of databases atm. You should check if its supported by your DB before enable diff --git a/server/apps/jpa-smtp-mariadb-app/pom.xml b/server/apps/jpa-smtp-mariadb-app/pom.xml deleted file mode 100644 index 4a076f8..0000000 --- a/server/apps/jpa-smtp-mariadb-app/pom.xml +++ /dev/null @@ -1,156 +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</artifactId> - <version>3.7.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - - <artifactId>james-server-jpa-smtp-mariadb-guice</artifactId> - <packaging>jar</packaging> - - <name>Apache James :: Server :: JPA + mariaDB client :: SMTP only :: App</name> - <description>An advanced email server - JPA backend for SMTP with guice injection</description> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>james-server-guice</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> - - <dependencies> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>apache-james-backends-jpa</artifactId> - <version>${project.version}</version> - <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-jpa-smtp-common-guice</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>james-server-mailets</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>testing-base</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derby</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.mariadb.jdbc</groupId> - <artifactId>mariadb-java-client</artifactId> - <version>2.7.2</version> - </dependency> - <dependency> - <groupId>org.testcontainers</groupId> - <artifactId>mariadb</artifactId> - <version>${testcontainers.version}</version> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-dependencies</id> - <goals> - <goal>copy-dependencies</goal> - </goals> - <phase>package</phase> - <configuration> - <includeScope>compile</includeScope> - <includeScope>runtime</includeScope> - <outputDirectory>${project.build.directory}/${project.artifactId}.lib</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>default-jar</id> - <goals> - <goal>jar</goal> - </goals> - <configuration> - <finalName>${project.artifactId}</finalName> - <archive> - <manifest> - <addClasspath>true</addClasspath> - <classpathPrefix>${project.artifactId}.lib/</classpathPrefix> - <mainClass>org.apache.james.JPAJamesServerMain</mainClass> - <useUniqueVersions>false</useUniqueVersions> - </manifest> - <manifestEntries> - <Specification-Title>Apache James JPA-SMTP mariaDB server Application</Specification-Title> - <Specification-Version>${project.version}</Specification-Version> - <Specification-Vendor>The Apache Software Foundation</Specification-Vendor> - <Implementation-Title>Apache James JPA-SMTP mariaDB server Application</Implementation-Title> - <Implementation-Version>${project.version}</Implementation-Version> - <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor> - <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id> - <url>https://james.apache.org/server</url> - </manifestEntries> - </archive> - </configuration> - </execution> - <execution> - <id>test-jar</id> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - -</project> diff --git a/server/apps/jpa-smtp-mariadb-app/sample-configuration/dnsservice.xml b/server/apps/jpa-smtp-mariadb-app/sample-configuration/dnsservice.xml deleted file mode 100644 index 6e4fbd2..0000000 --- a/server/apps/jpa-smtp-mariadb-app/sample-configuration/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/server/apps/jpa-smtp-mariadb-app/sample-configuration/domainlist.xml b/server/apps/jpa-smtp-mariadb-app/sample-configuration/domainlist.xml deleted file mode 100644 index 89b01d1..0000000 --- a/server/apps/jpa-smtp-mariadb-app/sample-configuration/domainlist.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. - --> - -<domainlist class="org.apache.james.domainlist.jpa.JPADomainList"> - <autodetect>false</autodetect> - <autodetectIP>false</autodetectIP> - <defaultDomain>localhost</defaultDomain> -</domainlist> diff --git a/server/apps/jpa-smtp-mariadb-app/sample-configuration/mailetcontainer.xml b/server/apps/jpa-smtp-mariadb-app/sample-configuration/mailetcontainer.xml deleted file mode 100644 index 38d009d..0000000 --- a/server/apps/jpa-smtp-mariadb-app/sample-configuration/mailetcontainer.xml +++ /dev/null @@ -1,105 +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>[email protected]</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"/> - <mailet match="All" class="ToRepository"> - <repositoryPath>file://var/mail/error/</repositoryPath> - </mailet> - </processor> - - - <processor state="transport" enableJmx="true"> - <matcher name="relay-allowed" match="org.apache.james.mailetcontainer.impl.matchers.Or"> - <matcher match="SMTPAuthSuccessful"/> - <matcher match="SMTPIsAuthNetwork"/> - <matcher match="SentByMailet"/> - </matcher> - - <mailet match="All" class="RecipientRewriteTable" /> - <mailet match="RecipientIsLocal" class="LocalDelivery"/> - <mailet match="HostIsLocal" class="ToProcessor"> - <processor>local-address-error</processor> - <notice>550 - Requested action not taken: no such user here</notice> - </mailet> - - <mailet match="relay-allowed" class="RemoteDelivery"> - <outgoingQueue>outgoing</outgoingQueue> - <delayTime>5000, 100000, 500000</delayTime> - <maxRetries>3</maxRetries> - <maxDnsProblemRetries>0</maxDnsProblemRetries> - <deliveryThreads>10</deliveryThreads> - <sendpartial>true</sendpartial> - <bounceProcessor>bounces</bounceProcessor> - </mailet> - <mailet match="All" class="ToProcessor"> - <processor>relay-denied</processor> - </mailet> - </processor> - - <processor state="local-address-error" enableJmx="true"> - <mailet match="All" class="Bounce"> - <attachment>none</attachment> - </mailet> - <mailet match="All" class="ToRepository"> - <repositoryPath>file://var/mail/address-error/</repositoryPath> - </mailet> - </processor> - - <processor state="relay-denied" enableJmx="true"> - <mailet match="All" class="Bounce"> - <attachment>none</attachment> - </mailet> - <mailet match="All" class="ToRepository"> - <repositoryPath>file://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> - </processors> - -</mailetcontainer> - - diff --git a/server/apps/jpa-smtp-mariadb-app/sample-configuration/mailrepositorystore.xml b/server/apps/jpa-smtp-mariadb-app/sample-configuration/mailrepositorystore.xml deleted file mode 100644 index acca810..0000000 --- a/server/apps/jpa-smtp-mariadb-app/sample-configuration/mailrepositorystore.xml +++ /dev/null @@ -1,34 +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> - <!-- File based repositories. These repositories store all message data --> - <!-- in the file system. --> - <mailrepository class="org.apache.james.mailrepository.file.FileMailRepository"> - <protocols> - <protocol>file</protocol> - </protocols> - <!-- Set if the messages should be listed sorted. False by default --> - <config FIFO="false" CACHEKEYS="true"/> - </mailrepository> - </mailrepositories> -</mailrepositorystore> diff --git a/server/apps/jpa-smtp-mariadb-app/sample-configuration/recipientrewritetable.xml b/server/apps/jpa-smtp-mariadb-app/sample-configuration/recipientrewritetable.xml deleted file mode 100644 index 7e7f586..0000000 --- a/server/apps/jpa-smtp-mariadb-app/sample-configuration/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 class="org.apache.james.rrt.jpa.JPARecipientRewriteTable"> - <recursiveMapping>true</recursiveMapping> - <mappingLimit>10</mappingLimit> - <mapping>some@domain=some</mapping> -</recipientrewritetable> - diff --git a/server/apps/jpa-smtp-mariadb-app/sample-configuration/smtpserver.xml b/server/apps/jpa-smtp-mariadb-app/sample-configuration/smtpserver.xml deleted file mode 100644 index 7946218..0000000 --- a/server/apps/jpa-smtp-mariadb-app/sample-configuration/smtpserver.xml +++ /dev/null @@ -1,105 +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"> - <jmxName>smtpserver-global</jmxName> - <bind>0.0.0.0:1025</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> - <authRequired>false</authRequired> - <authorizedAddresses>0.0.0.0/0</authorizedAddresses> - <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> - </smtpserver> - <smtpserver enabled="true"> - <jmxName>smtpserver-TLS</jmxName> - <bind>0.0.0.0:1465</bind> - <connectionBacklog>200</connectionBacklog> - <tls socketTLS="true" 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> - <!-- - Authorize only local users - --> - <authRequired>true</authRequired> - <authorizedAddresses>0.0.0.0/0</authorizedAddresses> - <!-- 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> - </smtpserver> - <smtpserver enabled="true"> - <jmxName>smtpserver-authenticated</jmxName> - <bind>0.0.0.0:1587</bind> - <connectionBacklog>200</connectionBacklog> - <tls socketTLS="false" startTLS="true"> - <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> - <!-- - Authorize only local users - --> - <authRequired>true</authRequired> - <authorizedAddresses>0.0.0.0/0</authorizedAddresses> - <!-- 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> - </smtpserver> -</smtpservers> - - diff --git a/server/apps/jpa-smtp-mariadb-app/sample-configuration/usersrepository.xml b/server/apps/jpa-smtp-mariadb-app/sample-configuration/usersrepository.xml deleted file mode 100644 index fc76107..0000000 --- a/server/apps/jpa-smtp-mariadb-app/sample-configuration/usersrepository.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. - --> - -<usersrepository name="LocalUsers" class="org.apache.james.user.jpa.JPAUsersRepository"> - <destination URL="file://users/"/> - <algorithm>MD5</algorithm> - <enableVirtualHosting>true</enableVirtualHosting> - <enableForwarding>true</enableForwarding> -</usersrepository> - diff --git a/server/apps/jpa-smtp-mariadb-app/sample-configuration/webadmin.properties b/server/apps/jpa-smtp-mariadb-app/sample-configuration/webadmin.properties deleted file mode 100644 index a9b5cc2..0000000 --- a/server/apps/jpa-smtp-mariadb-app/sample-configuration/webadmin.properties +++ /dev/null @@ -1,23 +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. - -# This template file can be used as example for James Server configuration -# DO NOT USE IT AS SUCH AND ADAPT IT TO YOUR NEEDS - -enabled=true -port=8000 -host=localhost \ No newline at end of file diff --git a/server/pom.xml b/server/pom.xml index 644ddb5..5402cb0 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -44,7 +44,6 @@ <module>apps/distributed-app</module> <module>apps/jpa-app</module> <module>apps/jpa-smtp-app</module> - <module>apps/jpa-smtp-mariadb-app</module> <module>apps/memory-app</module> <module>apps/spring-app</module> <module>apps/webadmin-cli</module> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
