You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ad...@apache.org on 2017/07/05 06:53:11 UTC
[1/8] james-project git commit: JAMES-2089 Make server/app
configuration work out of the box
Repository: james-project
Updated Branches:
refs/heads/master 01c3bd1a3 -> 9d8d71cd0
http://git-wip-us.apache.org/repos/asf/james-project/blob/ee131ea6/server/app/src/main/resources/sqlResources-template.xml
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/sqlResources-template.xml b/server/app/src/main/resources/sqlResources-template.xml
deleted file mode 100644
index f3ed58d..0000000
--- a/server/app/src/main/resources/sqlResources-template.xml
+++ /dev/null
@@ -1,938 +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
--->
-
-<!-- See http://james.apache.org/server/3/config.html for usage -->
-
-<sqlResources>
-
-<dbMatchers>
- <dbMatcher db="mssql" databaseProductName="microsoft sql server"/>
- <dbMatcher db="oracle" databaseProductName="oracle.*"/>
- <dbMatcher db="mysql" databaseProductName="my.*"/>
- <dbMatcher db="derby" databaseProductName="derby.*"/>
- <dbMatcher db="postgresql" databaseProductName="postgres.*"/>
- <dbMatcher db="hsqldb" databaseProductName="hsql.*"/>
- <dbMatcher db="sapdb" databaseProductName="sap.*"/>
- <dbMatcher db="hypersonic" databaseProductName="HypersonicSQL"/>
- <dbMatcher db="db2" databaseProductName="db2.*"/>
- <dbMatcher db="ingres" databaseProductName="ingres.*"/>
-</dbMatchers>
-
-<dbOptions>
- <dbOption name="getBody" value="useBytes"/>
- <dbOption name="getAttributes" value="useBytes"/>
- <dbOption db="mssql" name="getBody" value="useBytes"/>
- <dbOption db="mssql" name="getAttributes" value="useBytes"/>
- <dbOption db="oracle" name="getBody" value="useBlob"/>
- <dbOption db="oracle" name="getAttributes" value="useBlob"/>
- <dbOption db="mysql" name="getBody" value="useBytes"/>
- <dbOption db="mysql" name="getAttributes" value="useBytes"/>
- <dbOption db="derby" name="getBody" value="useBytes"/>
- <dbOption db="derby" name="getAttributes" value="useBytes"/>
- <dbOption db="postgresql" name="getBody" value="useBytes"/>
- <dbOption db="postgresql" name="getAttributes" value="useBytes"/>
- <dbOption db="sapdb" name="getBody" value="useBytes"/>
- <dbOption db="sapdb" name="getAttributes" value="useBytes"/>
- <dbOption db="hypersonic" name="getBody" value="useBytes"/>
- <dbOption db="hypersonic" name="getAttributes" value="useBytes"/>
- <dbOption db="hsqldb" name="getBody" value="useBytes"/>
- <dbOption db="hsqldb" name="getAttributes" value="useBytes"/>
- <dbOption db="db2" name="getBody" value="useBlob"/>
- <dbOption db="db2" name="getAttributes" value="useBlob"/>
- <dbOption db="ingres" name="getBody" value="useBytes"/>
- <dbOption db="ingres" name="getAttributes" value="useBytes"/>
-</dbOptions>
-
-<sqlDefs name="org.apache.james.user.jdbc.JamesUsersJdbcRepository">
- <sql name="tableName">${table}</sql>
-
- <!-- Statements used to retrieve all user information for a user from this repository. -->
- <sql name="select">SELECT username, pwdHash, pwdAlgorithm, useForwarding,
- forwardDestination, useAlias, alias
- FROM ${table}
- ORDER BY username
- </sql>
-
- <!-- Statements used to get all user information for a user with a particular user name in a -->
- <!-- case-insensitive fashion from this repository. -->
- <sql name="selectByLowercaseName">
- SELECT username, pwdHash, pwdAlgorithm, useForwarding,
- forwardDestination, useAlias, alias
- FROM ${table}
- WHERE lower(username) = ?
- </sql>
-
- <sql name="selectByLowercaseName" db="mysql">
- SELECT username, pwdHash, pwdAlgorithm, useForwarding,
- forwardDestination, useAlias, alias
- FROM ${table}
- WHERE username = ?
- </sql>
-
- <!-- Statements used to insert a user into this repository. -->
- <sql name="insert">INSERT INTO ${table}
- (username, pwdHash, pwdAlgorithm, useForwarding, forwardDestination, useAlias, alias)
- VALUES (?,?,?,?,?,?,?)
- </sql>
-
- <!-- Statements used to update information for a user from this repository. -->
- <sql name="update">UPDATE ${table} SET
- pwdHash = ?, pwdAlgorithm = ?, useForwarding = ?, forwardDestination = ?, useAlias = ?, alias = ?
- WHERE username = ?
- </sql>
-
- <!-- Statements used to delete a user from this repository. -->
- <sql name="delete">DELETE FROM ${table} WHERE username = ?</sql>
-
- <!-- Statements used to create the table associated with this class. -->
- <sql name="createTable" db="hypersonic">CREATE CACHED TABLE ${table} (username VARCHAR(64) NOT NULL, pwdHash VARCHAR(50), pwdAlgorithm VARCHAR(20), useForwarding INTEGER, forwardDestination VARCHAR(255), useAlias INTEGER, alias VARCHAR(255), PRIMARY KEY(username))</sql>
- <sql name="createTable">CREATE TABLE ${table} (username VARCHAR(64) NOT NULL, pwdHash VARCHAR(50), pwdAlgorithm VARCHAR(20), useForwarding SMALLINT, forwardDestination VARCHAR(255), useAlias SMALLINT, alias VARCHAR(255), PRIMARY KEY(username))</sql>
- <!-- An example of a database-specific sql statement
- <sql name="createTable" db="mssql">CREATE TABLE ${table} (uniqueId UNIQUEIDENTIFIER, username VARCHAR(64) NOT NULL, pwdHash VARCHAR(50), pwdAlgorithm VARCHAR(20), useForwarding SMALLINT, forwardDestination VARCHAR(255), useAlias SMALLINT, alias VARCHAR(255), PRIMARY KEY(username))</sql>
- -->
-</sqlDefs>
-
-<sqlDefs name="org.apache.james.user.jdbc.DefaultUsersJdbcRepository">
- <sql name="tableName">${table}</sql>
-
- <!-- Statements used to retrieve all user information for a user from this repository. -->
- <sql name="select">SELECT username, pwdHash, pwdAlgorithm
- FROM ${table}
- </sql>
-
- <!-- Statements used to insert a user into this repository. -->
- <sql name="insert">INSERT INTO ${table}
- (username, pwdHash, pwdAlgorithm)
- VALUES (?,?,?)
- </sql>
-
- <!-- Statements used to update information for a user from this repository. -->
- <sql name="update">UPDATE ${table} SET
- pwdHash = ?, pwdAlgorithm = ?
- WHERE username = ?
- </sql>
-
- <!-- Statements used to delete a user from this repository. -->
- <sql name="delete">DELETE FROM ${table} WHERE username = ?</sql>
-
- <!-- Statements used to create the table associated with this class. -->
- <sql name="createTable" db="hypersonic">CREATE CACHED TABLE ${table} (username VARCHAR(64) NOT NULL, pwdHash VARCHAR(50), pwdAlgorithm VARCHAR(20), PRIMARY KEY(username))</sql>
- <sql name="createTable">CREATE TABLE ${table} (username VARCHAR(64) NOT NULL, pwdHash VARCHAR(50), pwdAlgorithm VARCHAR(20), PRIMARY KEY(username))</sql>
-</sqlDefs>
-
-<sqlDefs name="org.apache.james.user.jdbc.ListUsersJdbcRepository">
- <!-- An example of defining "default" parameters within the definition file.
- This is used if no key parameter is specified in config. -->
- <parameters key="unknownList"/>
-
- <sql name="tableName">${table}</sql>
-
- <!-- Statements used to retrieve all users on a particular list from this repository. -->
- <sql name="select">SELECT listSubscriber
- FROM ${table}
- WHERE listName = '${key}'
- </sql>
-
- <!-- Statements used to insert a user/list mapping into this repository. -->
- <sql name="insert">INSERT INTO ${table}
- (listSubscriber, listName)
- VALUES (?, '${key}')
- </sql>
-
- <!-- Statements used to update a user/list mapping in this repository. -->
- <sql name="update">UPDATE ${table} SET
- listSubscriber = ?
- WHERE listSubscriber = ? AND listName = '${key}'
- </sql>
-
- <!-- Statements used to delete a user/list mapping from this repository. -->
- <sql name="delete">DELETE FROM ${table}
- WHERE listSubscriber = ? AND listName = '${key}'
- </sql>
-
- <!-- Statements used to create the table associated with this class. -->
- <sql name="createTable" db="hypersonic">CREATE CACHED TABLE ${table} (listName VARCHAR(64) NOT NULL, listSubscriber VARCHAR(255) NOT NULL, PRIMARY KEY(listName, listSubscriber))</sql>
- <sql name="createTable">CREATE TABLE ${table} (listName VARCHAR(64) NOT NULL, listSubscriber VARCHAR(255) NOT NULL, PRIMARY KEY(listName, listSubscriber))</sql>
-</sqlDefs>
-
-<sqlDefs name="org.apache.james.mailrepository.jdbc.JDBCMailRepository">
-
- <!-- Statements used to check whether a particular message exists in this repository. -->
- <sql name="checkMessageExistsSQL">SELECT count(*) FROM ${table} WHERE message_name = ? AND repository_name = ?</sql>
-
- <!-- Statements used to update a message stored in this repository. -->
- <sql name="updateMessageSQL">UPDATE ${table} SET message_state = ?, error_message = ?, sender = ?, recipients = ?, remote_host = ?, remote_addr = ?, last_updated = ? WHERE message_name = ? AND repository_name = ?</sql>
-
- <!-- Statements used to update the body of a message stored in this repository. -->
- <sql name="updateMessageBodySQL">UPDATE ${table} SET message_body = ? WHERE message_name = ? AND repository_name = ?</sql>
-
- <!-- Statements used to update the attributes of a message stored in this repository. -->
- <sql name="updateMessageAttributesSQL">UPDATE ${table} SET message_attributes = ? WHERE message_name = ? AND repository_name = ?</sql>
-
- <!-- Statements used to insert a message into this repository. -->
- <sql name="insertMessageSQL">INSERT INTO ${table} (message_name,
- repository_name, message_state, error_message, sender, recipients,
- remote_host, remote_addr, last_updated, message_body,
- message_attributes) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)</sql>
-
- <!-- Statements used to retrieve a message stored in this repository. -->
- <sql name="retrieveMessageSQL">SELECT message_state, error_message, sender, recipients, remote_host, remote_addr, last_updated FROM ${table} WHERE message_name = ? AND repository_name = ?</sql>
-
- <!-- Statements used to retrieve the body of a message stored in this repository. -->
- <sql name="retrieveMessageBodySQL">SELECT message_body FROM ${table} WHERE message_name = ? AND repository_name = ?</sql>
-
- <!-- Statements used to retrieve the attributes of a message stored in this repository. -->
- <sql name="retrieveMessageAttributesSQL">SELECT message_attributes FROM ${table} WHERE message_name = ? AND repository_name = ?</sql>
-
- <!-- Statements used to retrieve the size of the body of a message stored in this repository. -->
- <!-- NOTE: This statement is optional and need not be implemented for a particular database to be supported. -->
- <sql name="retrieveMessageBodySizeSQL" db="mssql">SELECT datalength(message_body) FROM ${table} WHERE message_name = ? AND repository_name = ?</sql>
- <sql name="retrieveMessageBodySizeSQL" db="mysql">SELECT length(message_body) FROM ${table} WHERE message_name = ? AND repository_name = ?</sql>
- <sql name="retrieveMessageBodySizeSQL" db="hypersonic">SELECT length(message_body) FROM ${table} WHERE message_name = ? AND repository_name = ?</sql>
- <sql name="retrieveMessageBodySizeSQL" db="hsqldb">SELECT length(message_body) FROM ${table} WHERE message_name = ? AND repository_name = ?</sql>
- <sql name="retrieveMessageBodySizeSQL" db="postgresql">SELECT length(message_body) FROM ${table} WHERE message_name = ? AND repository_name = ?</sql>
- <sql name="retrieveMessageBodySizeSQL" db="oracle">SELECT dbms_lob.getlength(message_body) FROM ${table} WHERE message_name = ? AND repository_name = ?</sql>
- <sql name="retrieveMessageBodySizeSQL" db="db2">SELECT length(message_body) FROM ${table} WHERE message_name = ? AND repository_name = ?</sql>
- <sql name="retrieveMessageBodySizeSQL" db="ingres">SELECT length(message_body) FROM ${table} WHERE message_name = ? AND repository_name = ?</sql>
- <sql name="retrieveMessageBodySizeSQL" db="derby">SELECT length(message_body) FROM ${table} WHERE message_name = ? AND repository_name = ?</sql>
-
- <!-- Statements used to delete a message stored in this repository. -->
- <sql name="removeMessageSQL">DELETE FROM ${table} WHERE message_name = ? AND repository_name = ?</sql>
-
- <!-- Statements used to list all messages stored in this repository. -->
- <sql name="listMessagesSQL">SELECT message_name, message_state, last_updated FROM ${table} WHERE repository_name = ? ORDER BY last_updated ASC</sql>
-
- <!-- Statements used to create the table associated with this class. -->
- <sql name="createTable" db="mysql">
- CREATE TABLE ${table} (
- message_name varchar (200) NOT NULL,
- repository_name varchar (100) NOT NULL,
- message_state varchar (30) NOT NULL ,
- error_message varchar (200) NULL ,
- sender varchar (255) NULL ,
- recipients text NOT NULL ,
- remote_host varchar (255) NOT NULL ,
- remote_addr varchar (20) NOT NULL ,
- message_body longblob NOT NULL ,
- message_attributes longblob NULL ,
- last_updated datetime NOT NULL,
- PRIMARY KEY (repository_name, message_name)
- )
- </sql>
- <sql name="createTable" db="hypersonic">
- CREATE CACHED TABLE ${table} (
- message_name varchar (200) NOT NULL,
- repository_name varchar (255) NOT NULL,
- message_state varchar (30) NOT NULL ,
- error_message varchar (200) NULL ,
- sender varchar (255) NULL ,
- recipients varchar NOT NULL ,
- remote_host varchar (255) NOT NULL ,
- remote_addr varchar (20) NOT NULL ,
- message_body varchar NOT NULL ,
- message_attributes varchar NULL ,
- last_updated timestamp NOT NULL,
- PRIMARY KEY (repository_name, message_name)
- )
- </sql>
- <sql name="createTable" db="hsqldb">
- CREATE CACHED TABLE ${table} (
- message_name varchar (200) NOT NULL,
- repository_name varchar (255) NOT NULL,
- message_state varchar (30) NOT NULL ,
- error_message varchar (200) NULL ,
- sender varchar (255) NULL ,
- recipients varchar NOT NULL ,
- remote_host varchar (255) NOT NULL ,
- remote_addr varchar (20) NOT NULL ,
- message_body varchar NOT NULL ,
- message_attributes varchar NULL ,
- last_updated timestamp NOT NULL,
- PRIMARY KEY (repository_name, message_name)
- )
- </sql>
- <sql name="createTable" db="mssql">
- CREATE TABLE [${table}] (
- [message_name] [varchar] (200) NOT NULL,
- [repository_name] [varchar] (255) NOT NULL,
- [message_state] [varchar] (30) NOT NULL ,
- [error_message] [varchar] (1000) NULL ,
- [sender] [varchar] (255) NULL ,
- [recipients] [text] NOT NULL ,
- [remote_host] [varchar] (255) NOT NULL ,
- [remote_addr] [varchar] (20) NOT NULL ,
- [message_body] [image] NOT NULL ,
- [message_attributes] [image] NULL ,
- [last_updated] [datetime] NOT NULL,
- PRIMARY KEY (repository_name, message_name)
- )
- </sql>
- <sql name="createTable" db="oracle">
- CREATE TABLE ${table} (
- message_name varchar2(200) NOT NULL ,
- repository_name varchar2(255) NOT NULL ,
- message_state varchar2(30) NOT NULL ,
- error_message varchar2(200) NULL ,
- sender varchar2(255) ,
- recipients varchar2(1000) NOT NULL ,
- remote_host varchar2(100) NOT NULL ,
- remote_addr varchar2(20) NOT NULL ,
- message_body blob NOT NULL ,
- message_attributes blob NULL ,
- last_updated date NOT NULL ,
- PRIMARY KEY (repository_name, message_name)
- )
- </sql>
- <sql name="createTable" db="postgresql">
- CREATE TABLE ${table} (
- message_name varchar (200) NOT NULL,
- repository_name varchar (255) NOT NULL,
- message_state varchar (30) NOT NULL ,
- error_message varchar (200) NULL ,
- sender varchar (255) NULL ,
- recipients text NOT NULL ,
- remote_host varchar (255) NOT NULL ,
- remote_addr varchar (20) NOT NULL ,
- message_body bytea NOT NULL ,
- message_attributes bytea NULL ,
- last_updated timestamp NOT NULL,
- PRIMARY KEY (repository_name, message_name)
- )
- </sql>
- <sql name="createTable" db="sapdb">
- CREATE TABLE ${table} (
- message_name varchar (200) NOT NULL,
- repository_name varchar (200) NOT NULL,
- message_state varchar (30) NOT NULL ,
- error_message varchar (200) NULL ,
- sender varchar (200) NULL ,
- recipients long NOT NULL ,
- remote_host varchar (100) NOT NULL ,
- remote_addr varchar (20) NOT NULL ,
- message_body long byte NOT NULL ,
- message_attributes long byte NULL ,
- last_updated date NOT NULL,
- PRIMARY KEY (repository_name, message_name)
- )
- </sql>
- <sql name="createTable" db="db2">
- CREATE TABLE ${table} (
- message_name varchar(200) NOT NULL ,
- repository_name varchar(255) NOT NULL ,
- message_state varchar(30) NOT NULL ,
- error_message varchar(200) ,
- sender varchar(255) ,
- recipients varchar(1000) NOT NULL ,
- remote_host varchar(100) NOT NULL ,
- remote_addr varchar(20) NOT NULL ,
- message_body blob NOT NULL ,
- message_attributes blob ,
- last_updated timestamp NOT NULL ,
- PRIMARY KEY (repository_name, message_name)
- )
- </sql>
- <sql name="createTable" db="ingres">
- CREATE TABLE ${table} (
- message_name varchar (200) NOT NULL,
- repository_name varchar (255) NOT NULL,
- message_state varchar (30) NOT NULL ,
- error_message varchar (200) ,
- sender varchar (255) ,
- recipients LONG VARCHAR NOT NULL ,
- remote_host varchar (255) NOT NULL ,
- remote_addr varchar (20) NOT NULL ,
- message_body LONG BYTE NOT NULL ,
- message_attributes LONG BYTE ,
- last_updated DATE NOT NULL
- )
- </sql>
- <sql name="createTable" db="derby">
- CREATE TABLE ${table} (
- message_name varchar (200) NOT NULL,
- repository_name varchar (255) NOT NULL,
- message_state varchar (30) NOT NULL ,
- error_message varchar (200) ,
- sender varchar (255) ,
- recipients long varchar NOT NULL ,
- remote_host varchar (255) NOT NULL ,
- remote_addr varchar (20) NOT NULL ,
- message_body blob NOT NULL ,
- message_attributes blob ,
- last_updated timestamp NOT NULL,
- PRIMARY KEY (repository_name, message_name)
- )
- </sql>
-</sqlDefs>
-
-<sqlDefs name="org.apache.james.util.bayesian.JDBCBayesianAnalyzer">
-
- <sql name="hamTableName">bayesiananalysis_ham</sql>
- <sql name="spamTableName">bayesiananalysis_spam</sql>
- <sql name="messageCountsTableName">bayesiananalysis_messagecounts</sql>
-
- <!-- Statements used to retrieve the message counts. -->
- <sql name="selectMessageCounts">SELECT HAMCOUNT, SPAMCOUNT FROM bayesiananalysis_messagecounts</sql>
-
- <!-- Statements used to initialize the message counts. -->
- <sql name="initializeMessageCounts">INSERT INTO bayesiananalysis_messagecounts (HAMCOUNT, SPAMCOUNT) VALUES (0,0)</sql>
-
- <!-- Statements used to update the ham message counts. -->
- <sql name="updateHamMessageCounts">UPDATE bayesiananalysis_messagecounts SET HAMCOUNT=(HAMCOUNT + ?)</sql>
-
- <!-- Statements used to update the spam message counts. -->
- <sql name="updateSpamMessageCounts">UPDATE bayesiananalysis_messagecounts SET SPAMCOUNT=(SPAMCOUNT + ?)</sql>
-
- <!-- Statements used to retrieve the ham token counts. -->
- <sql name="selectHamTokens">SELECT TOKEN, OCCURRENCES FROM bayesiananalysis_ham</sql>
-
- <!-- Statements used to retrieve the spam token counts. -->
- <sql name="selectSpamTokens">SELECT TOKEN, OCCURRENCES FROM bayesiananalysis_spam</sql>
-
- <!-- Statements used to insert the ham token counts. -->
- <sql name="insertHamToken">INSERT INTO bayesiananalysis_ham (TOKEN, OCCURRENCES) VALUES (?,?)</sql>
-
- <!-- Statements used to insert the spam token counts. -->
- <sql name="insertSpamToken">INSERT INTO bayesiananalysis_spam (TOKEN, OCCURRENCES) VALUES (?,?)</sql>
-
- <!-- Statements used to update the ham token counts. -->
- <sql name="updateHamToken">UPDATE bayesiananalysis_ham SET OCCURRENCES=(OCCURRENCES + ?) WHERE (TOKEN=?)</sql>
-
- <!-- Statements used to update the spam token counts. -->
- <sql name="updateSpamToken">UPDATE bayesiananalysis_spam SET OCCURRENCES=(OCCURRENCES + ?) WHERE (TOKEN=?)</sql>
-
- <!-- Statements used to delete ham tokens. -->
- <sql name="deleteHamTokens">DELETE FROM bayesiananalysis_ham</sql>
-
- <!-- Statements used to delete spam tokens. -->
- <sql name="deleteSpamTokens">DELETE FROM bayesiananalysis_spam</sql>
-
- <!-- Statements used to delete message counts. -->
- <sql name="deleteMessageCounts">DELETE FROM bayesiananalysis_messagecounts</sql>
-
-
- <!-- Statements used to create the "ham" table (the 'token' field must be case sensitive). -->
- <sql name="createHamTable" db="mysql">
- CREATE TABLE bayesiananalysis_ham (
- token varchar(128) binary NOT NULL default '',
- occurrences int(11) NOT NULL default '0',
- PRIMARY KEY (token)
- ) TYPE=InnoDB
- </sql>
- <sql name="createHamTable" db="mssql">
- CREATE TABLE [bayesiananalysis_ham] (
- [token] [varchar] (128) COLLATE Latin1_General_CS_AS NOT NULL,
- [occurrences] [int] NOT NULL default (0),
- PRIMARY KEY (token)
- )
- </sql>
- <sql name="createHamTable" db="derby">
- CREATE TABLE bayesiananalysis_ham (
- token varchar(128) NOT NULL,
- occurrences INTEGER NOT NULL default 0,
- PRIMARY KEY (token)
- )
- </sql>
- <sql name="createHamTable" db="postgresql">
- CREATE TABLE bayesiananalysis_ham (
- token varchar(128) NOT NULL,
- occurrences int NOT NULL default 0,
- PRIMARY KEY (token)
- )
- </sql>
-
- <!-- Statements used to create the "spam" table (the 'token' field must be case sensitive). -->
- <sql name="createSpamTable" db="mysql">
- CREATE TABLE bayesiananalysis_spam (
- token varchar(128) binary NOT NULL default '',
- occurrences int(11) NOT NULL default '0',
- PRIMARY KEY (token)
- ) TYPE=InnoDB
- </sql>
- <sql name="createSpamTable" db="mssql">
- CREATE TABLE [bayesiananalysis_spam] (
- [token] [varchar] (128) COLLATE Latin1_General_CS_AS NOT NULL,
- [occurrences] [int] NOT NULL default (0),
- PRIMARY KEY (token)
- )
- </sql>
- <sql name="createSpamTable" db="derby">
- CREATE TABLE bayesiananalysis_spam (
- token varchar (128) NOT NULL,
- occurrences INTEGER NOT NULL default 0,
- PRIMARY KEY (token)
- )
- </sql>
- <sql name="createSpamTable" db="postgresql">
- CREATE TABLE bayesiananalysis_spam (
- token varchar (128) NOT NULL,
- occurrences int NOT NULL default 0,
- PRIMARY KEY (token)
- )
- </sql>
-
- <!-- Statements used to create the "message counts" table. -->
- <sql name="createMessageCountsTable" db="mysql">
- CREATE TABLE bayesiananalysis_messagecounts (
- hamcount int(11) NOT NULL default '0',
- spamcount int(11) NOT NULL default '0'
- ) TYPE=InnoDB
- </sql>
- <sql name="createMessageCountsTable" db="mssql">
- CREATE TABLE [bayesiananalysis_messagecounts] (
- [hamcount] [int] NOT NULL default (0),
- [spamcount] [int] NOT NULL default (0)
- )
- </sql>
- <sql name="createMessageCountsTable" db="derby">
- CREATE TABLE bayesiananalysis_messagecounts (
- hamcount INTEGER NOT NULL default 0,
- spamcount INTEGER NOT NULL default 0
- )
- </sql>
- <sql name="createMessageCountsTable" db="postgresql">
- CREATE TABLE bayesiananalysis_messagecounts (
- hamcount int NOT NULL default 0,
- spamcount int NOT NULL default 0
- )
- </sql>
-</sqlDefs>
-
-<sqlDefs name="WhiteList">
-
- <sql name="whiteListTableName">whitelist</sql>
-
- <!-- Statements used to retrieve a single entry. -->
- <sql name="selectByPK">SELECT localUser, localHost FROM whitelist where (localUser=? AND localHost=? AND remoteUser=? AND remoteHost=?)</sql>
-
- <!-- Statements used to all entries by sender address. -->
- <sql name="selectBySender">SELECT remoteUser, remoteHost FROM whitelist where (localUser=? AND localHost=?) ORDER BY remoteUser, remoteHost</sql>
-
- <!-- Statements used to insert an entry. -->
- <sql name="insert">INSERT INTO whitelist (localUser, localHost, remoteUser, remoteHost) VALUES (?,?,?,?)</sql>
-
- <!-- Statements used to delete an entry. -->
- <sql name="deleteByPK">DELETE FROM whitelist where (localUser=? AND localHost=? AND remoteUser=? AND remoteHost=?)</sql>
-
- <!-- Statements used to create the "whitelist" table. -->
- <sql name="createWhiteListTable" db="hypersonic">
- CREATE TABLE whitelist (
- localUser varchar (64) NOT NULL,
- localHost varchar (255) NOT NULL,
- remoteUser varchar (64) NOT NULL,
- remoteHost varchar (255) NOT NULL,
- PRIMARY KEY (localUser, localHost, remoteUser, remoteHost)
- ) </sql>
- <sql name="createWhiteListTable" db="hsqldb">
- CREATE CACHED TABLE ${table} (
- CREATE TABLE whitelist (
- localUser varchar (64) NOT NULL,
- localHost varchar (255) NOT NULL,
- remoteUser varchar (64) NOT NULL,
- remoteHost varchar (255) NOT NULL,
- PRIMARY KEY (localUser, localHost, remoteUser, remoteHost)
- ) </sql>
- <sql name="createWhiteListTable" db="mysql">
- CREATE TABLE whitelist (
- localUser varchar (64) NOT NULL,
- localHost varchar (255) character set latin1 NOT NULL,
- remoteUser varchar (64) NOT NULL,
- remoteHost varchar (255) character set latin1 NOT NULL,
- PRIMARY KEY (localUser, localHost, remoteUser, remoteHost)
- ) TYPE=InnoDB
- </sql>
- <sql name="createWhiteListTable" db="mssql">
- CREATE TABLE [whitelist] (
- [localUser] [varchar] (64) NOT NULL,
- [localHost] [varchar] (255) NOT NULL,
- [remoteUser] [varchar] (64) NOT NULL,
- [remoteHost] [varchar] (255) NOT NULL,
- PRIMARY KEY (localUser, localHost, remoteUser, remoteHost)
- )
- </sql>
- <sql name="createWhiteListTable" db="oracle">
- CREATE TABLE whitelist (
- localUser varchar (64) NOT NULL,
- localHost varchar (255) NOT NULL,
- remoteUser varchar (64) NOT NULL,
- remoteHost varchar (255) NOT NULL,
- PRIMARY KEY (localUser, localHost, remoteUser, remoteHost)
- )
- </sql>
- <sql name="createWhiteListTable" db="postgresql">
- CREATE TABLE whitelist (
- localUser varchar (64) NOT NULL,
- localHost varchar (255) NOT NULL,
- remoteUser varchar (64) NOT NULL,
- remoteHost varchar (255) NOT NULL,
- PRIMARY KEY (localUser, localHost, remoteUser, remoteHost)
- )
- </sql>
- <sql name="createWhiteListTable" db="sapdb">
- CREATE TABLE whitelist (
- localUser varchar (64) NOT NULL,
- localHost varchar (255) NOT NULL,
- remoteUser varchar (64) NOT NULL,
- remoteHost varchar (255) NOT NULL,
- PRIMARY KEY (localUser, localHost, remoteUser, remoteHost)
- )
- </sql>
- <sql name="createWhiteListTable" db="db2">
- CREATE TABLE whitelist (
- localUser varchar (64) NOT NULL,
- localHost varchar (255) NOT NULL,
- remoteUser varchar (64) NOT NULL,
- remoteHost varchar (255) NOT NULL,
- PRIMARY KEY (localUser, localHost, remoteUser, remoteHost)
- )
- </sql>
- <sql name="createWhiteListTable" db="ingres">
- CREATE TABLE whitelist (
- localUser varchar (64) NOT NULL,
- localHost varchar (255) NOT NULL,
- remoteUser varchar (64) NOT NULL,
- remoteHost varchar (255) NOT NULL,
- PRIMARY KEY (localUser, localHost, remoteUser, remoteHost)
- )
- </sql>
- <sql name="createWhiteListTable" db="derby">
- CREATE TABLE whitelist (
- localUser varchar (64) NOT NULL,
- localHost varchar (255) NOT NULL,
- remoteUser varchar (64) NOT NULL,
- remoteHost varchar (255) NOT NULL,
- PRIMARY KEY (localUser, localHost, remoteUser, remoteHost)
- )
- </sql>
-
-</sqlDefs>
-
-<sqlDefs name="NetworkWhiteList">
-
- <sql name="networkWhiteListTableName">networkWhitelist</sql>
-
- <!-- Statements used to retrieve a single entry. -->
- <sql name="selectNetwork">SELECT network FROM networkWhitelist where (localUser=? AND localHost=?)</sql>
-
- <!-- Statements used to create the "whitelist" table. -->
- <sql name="createNetworkWhiteListTable" db="hypersonic">
- CREATE TABLE networkWhitelist (
- localUser varchar (64) NOT NULL,
- localHost varchar (255) NOT NULL,
- network varchar (255) NOT NULL,
- PRIMARY KEY (localUser, localHost)
- ) </sql>
- <sql name="createNetworkWhiteListTable" db="hsqldb">
- CREATE CACHED TABLE ${table} (
- CREATE TABLE networkWhitelist (
- localUser varchar (64) NOT NULL,
- localHost varchar (255) NOT NULL,
- network varchar (255) NOT NULL
- ) </sql>
- <sql name="createNetworkWhiteListTable" db="mysql">
- CREATE TABLE networkWhitelist (
- localUser varchar (64) NOT NULL,
- localHost varchar (255) character set latin1 NOT NULL,
- network varchar (255) NOT NULL
- ) TYPE=InnoDB
- </sql>
- <sql name="createNetworkWhiteListTable" db="mssql">
- CREATE TABLE [networkWhitelist] (
- [localUser] [varchar] (64) NOT NULL,
- [localHost] [varchar] (255) NOT NULL,
- [network] [varchar] (255) NOT NULL
- )
- </sql>
- <sql name="createNetworkWhiteListTable" db="oracle">
- CREATE TABLE networkWhitelist (
- localUser varchar (64) NOT NULL,
- localHost varchar (255) NOT NULL,
- network varchar (255) NOT NULL
- )
- </sql>
- <sql name="createNetworkWhiteListTable" db="postgresql">
- CREATE TABLE networkWhitelist (
- localUser varchar (64) NOT NULL,
- localHost varchar (255) NOT NULL,
- network varchar (255) NOT NULL
- )
- </sql>
- <sql name="createNetworkWhiteListTable" db="sapdb">
- CREATE TABLE networkWhitelist (
- localUser varchar (64) NOT NULL,
- localHost varchar (255) NOT NULL,
- network varchar (255) NOT NULL
- )
- </sql>
- <sql name="createNetworkWhiteListTable" db="db2">
- CREATE TABLE networkWhitelist (
- localUser varchar (64) NOT NULL,
- localHost varchar (255) NOT NULL,
- network varchar (255) NOT NULL
- )
- </sql>
- <sql name="createNetworkWhiteListTable" db="ingres">
- CREATE TABLE networkWhitelist (
- localUser varchar (64) NOT NULL,
- localHost varchar (255) NOT NULL,
- network varchar (255) NOT NULL
- )
- </sql>
- <sql name="createNetworkWhiteListTable" db="derby">
- CREATE TABLE networkWhitelist (
- localUser varchar (64) NOT NULL,
- localHost varchar (255) NOT NULL,
- network varchar (255) NOT NULL
- )
- </sql>
-
-</sqlDefs>
-
-<sqlDefs name="GreyList">
-
- <sql name="greyListTableName">greylist</sql>
-
- <!-- Statements used to retrieve a single entry. -->
- <sql name="selectQuery">SELECT create_time,count FROM greylist WHERE ipaddress = ? AND sender = ? AND recip = ?</sql>
-
- <!-- Statements used to insert an entry. -->
- <sql name="insertQuery">INSERT INTO greylist (ipaddress,sender,recip,count,create_time) values (?,?,?,?,?)</sql>
-
- <!-- Statements used to delete an entry. -->
- <sql name="deleteQuery">DELETE FROM greylist WHERE create_time < ? AND count = 0</sql>
-
- <!-- Statements used to delete an entry. -->
- <sql name="deleteAutoWhitelistQuery">DELETE FROM greylist WHERE create_time < ?</sql>
-
- <!-- Statements used to delete an entry. -->
- <sql name="updateQuery">UPDATE greylist SET create_time = ? , count = ? WHERE ipaddress = ? AND sender = ? AND recip = ?</sql>
-
- <!-- Statements used to create the "whitelist" table. -->
- <sql name="createGreyListTable" db="hypersonic">
- CREATE TABLE greylist (
- ipaddress varchar (20) NOT NULL,
- sender varchar (255) NOT NULL,
- recip varchar (255) NOT NULL,
- count int NOT NULL,
- create_time datetime NOT NULL,
- PRIMARY KEY (ipaddress,sender,recip)
- ) </sql>
-
- <sql name="createGreyListTable" db="hsqldb">
- CREATE CACHED TABLE ${table} (
- CREATE TABLE greylist (
- ipaddress varchar (20) NOT NULL,
- sender varchar (255) NOT NULL,
- recip varchar (255) NOT NULL,
- count int NOT NULL,
- create_time timestamo NOT NULL,
- PRIMARY KEY (ipaddress,sender,recip)
- ) </sql>
- <sql name="createGreyListTable" db="mysql">
- CREATE TABLE greylist (
- ipaddress varchar (20) NOT NULL,
- sender varchar (255) NOT NULL,
- recip varchar (255) NOT NULL,
- count int NOT NULL,
- create_time datetime NOT NULL,
- PRIMARY KEY (ipaddress,sender,recip)
- ) TYPE=InnoDB
- </sql>
- <sql name="createGreyListTable" db="mssql">
- CREATE TABLE [greylist] (
- [ipaddress] [varchar] (20) NOT NULL,
- [sender] [varchar] (255) NOT NULL,
- [recip] [varchar] (255) NOT NULL,
- [count] [int] NOT NULL,
- [create_time] [datetime] NOT NULL,
- PRIMARY KEY (ipaddress,sender,recip)
- )
- </sql>
- <sql name="createGreyListTable" db="oracle">
- CREATE TABLE greylist (
- ipaddress varchar2(20) NOT NULL,
- sender varchar2(255) NOT NULL,
- recip varchar2(255) NOT NULL,
- count int NOT NULL,
- create_time datetime NOT NULL,
- PRIMARY KEY (ipaddress,sender,recip)
- )
- </sql>
- <sql name="createGreyListTable" db="postgresql">
- CREATE TABLE greylist (
- ipaddress varchar (20) NOT NULL,
- sender varchar (255) NOT NULL,
- recip varchar (255) NOT NULL,
- count int NOT NULL,
- create_time timestamp NOT NULL,
- PRIMARY KEY (ipaddress,sender,recip)
- )
- </sql>
- <sql name="createGreyListTable" db="sapdb">
- CREATE TABLE greylist (
- ipaddress varchar (20) NOT NULL,
- sender varchar (255) NOT NULL,
- recip varchar (255) NOT NULL,
- count int NOT NULL,
- create_time date NOT NULL,
- PRIMARY KEY (ipaddress,sender,recip)
- )
- </sql>
- <sql name="createGreyListTable" db="db2">
- CREATE TABLE greylist (
- ipaddress varchar (20) NOT NULL,
- sender varchar (255) NOT NULL,
- recip varchar (255) NOT NULL,
- count int NOT NULL,
- create_time timestamp NOT NULL,
- PRIMARY KEY (ipaddress,sender,recip)
- )
- </sql>
- <sql name="createGreyListTable" db="ingres">
- CREATE TABLE greylist (
- ipaddress varchar (20) NOT NULL,
- sender varchar (255) NOT NULL,
- recip varchar (255) NOT NULL,
- count int NOT NULL,
- create_time date NOT NULL,
- PRIMARY KEY (ipaddress,sender,recip)
- )
- </sql>
- <sql name="createGreyListTable" db="derby">
- CREATE TABLE greylist (
- ipaddress varchar (20) NOT NULL,
- sender varchar (255) NOT NULL,
- recip varchar (255) NOT NULL,
- count int NOT NULL,
- create_time timestamp NOT NULL,
- PRIMARY KEY (ipaddress,sender,recip)
- )
- </sql>
-</sqlDefs>
-
-<sqlDefs name="org.apache.james.rrt.jdbc.JDBCRecipientRewriteTable">
-
- <!-- Statements used to check whether a particular message exists in this repository. -->
- <sql name="selectMappings" db="derby">select RecipientRewriteTable.target_address,(RecipientRewriteTable."user" || '@' ||RecipientRewriteTable.domain) from RecipientRewriteTable, RecipientRewriteTable as VUTDomains where ((RecipientRewriteTable."user") like ? or (RecipientRewriteTable."user") = '*') and (RecipientRewriteTable.domain like ? or (RecipientRewriteTable.domain = '*')) order by 2 desc</sql>
- <sql name="selectMappings">select RecipientRewriteTable.target_address from RecipientRewriteTable, RecipientRewriteTable as VUTDomains where (RecipientRewriteTable.user like ? or RecipientRewriteTable.user = '*') and (RecipientRewriteTable.domain like ? or (RecipientRewriteTable.domain = '*')) order by concat(RecipientRewriteTable.user,'@',RecipientRewriteTable.domain) desc limit 1</sql>
- <sql name="selectMappings" db="postgresql">select RecipientRewriteTable.target_address from RecipientRewriteTable, RecipientRewriteTable as VUTDomains where (RecipientRewriteTable.user like ? or RecipientRewriteTable.user = '*') and (RecipientRewriteTable.domain like ? or (RecipientRewriteTable.domain = '*')) order by (RecipientRewriteTable.user || '@' || RecipientRewriteTable.domain) desc limit 1</sql>
-
- <sql name="selectUserDomainMapping" db="derby">select RecipientRewriteTable.target_address from RecipientRewriteTable where RecipientRewriteTable."user" = ? and RecipientRewriteTable.domain = ? </sql>
- <sql name="selectUserDomainMapping">select RecipientRewriteTable.target_address from RecipientRewriteTable where RecipientRewriteTable.user = ? and RecipientRewriteTable.domain = ? </sql>
-
- <sql name="deleteMapping">delete from RecipientRewriteTable where RecipientRewriteTable."user" = ? and RecipientRewriteTable.domain = ? and RecipientRewriteTable.target_address = ?</sql>
-
- <sql name="updateMapping">update RecipientRewriteTable set RecipientRewriteTable.target_address = ? where RecipientRewriteTable."user" = ? and RecipientRewriteTable.domain = ? </sql>
-
- <sql name="addMapping">insert into RecipientRewriteTable values(?,?,?) </sql>
-
- <sql name="selectAllMappings">select * from RecipientRewriteTable </sql>
-
- <!-- Statements used to create the table associated with this class. -->
- <sql name="createTable" db="mysql">
- CREATE TABLE RecipientRewriteTable (
- user varchar(64) NOT NULL default '',
- domain varchar(255) NOT NULL default '',
- target_address varchar(255) NOT NULL default '',
- PRIMARY KEY (user,domain)
- )
- </sql>
- <!-- TEMPORARY DISABLED -->
- <!--
- <sql name="createTable" db="hypersonic">
- CREATE CACHED TABLE RecipientRewriteTable (
- user varchar(64) NOT NULL default '',
- domain varchar(255) NOT NULL default '',
- target_address varchar(255) NOT NULL default '',
- PRIMARY KEY (user,domain)
- )
- </sql>
- <sql name="createTable" db="hsqldb">
- CREATE CACHED TABLE RecipientRewriteTable (
- user varchar(64) NOT NULL default '',
- domain varchar(255) NOT NULL default '',
- target_address varchar(255) NOT NULL default '',
- PRIMARY KEY (user,domain)
- )
- </sql>
- <sql name="createTable" db="mssql">
- CREATE TABLE [RecipientRewriteTable] (
- [user] [varchar] (64) NOT NULL default '',
- [domain] [varchar] (255) NOT NULL default '',
- [target_address] [varchar] (255) NOT NULL default '',
- PRIMARY KEY (user,domain)
- )
- </sql>
- <sql name="createTable" db="oracle">
- CREATE TABLE RecipientRewriteTable (
- user varchar2(64) NOT NULL default '',
- domain varchar2(255) NOT NULL default '',
- target_address varchar2(255) NOT NULL default '',
- PRIMARY KEY (user,domain)
- )
- </sql>
- <sql name="createTable" db="sapdb">
- CREATE TABLE RecipientRewriteTable (
- user varchar(64) NOT NULL default '',
- domain varchar(255) NOT NULL default '',
- target_address varchar(255) NOT NULL default '',
- PRIMARY KEY (user,domain)
- )
- </sql>
- <sql name="createTable" db="db2">
- CREATE TABLE RecipientRewriteTable (
- user varchar(64) NOT NULL default '',
- domain varchar(255) NOT NULL default '',
- target_address varchar(255) NOT NULL default '',
- PRIMARY KEY (user,domain)
- )
- </sql>
- <sql name="createTable" db="ingres">
- CREATE TABLE RecipientRewriteTable (
- user varchar(64) NOT NULL default '',
- domain varchar(255) NOT NULL default '',
- target_address varchar(255) NOT NULL default '',
- PRIMARY KEY (user,domain)
- )
- </sql>
- -->
- <sql name="createTable" db="postgresql">
- CREATE TABLE RecipientRewriteTable (
- "user" varchar(64) NOT NULL default '',
- domain varchar(255) NOT NULL default '',
- target_address varchar(255) NOT NULL default '',
- PRIMARY KEY ("user",domain)
- )
- </sql>
- <sql name="createTable" db="derby">
- CREATE TABLE RecipientRewriteTable (
- "user" varchar (64) NOT NULL default '',
- domain varchar (255) NOT NULL default '',
- target_address varchar (255) NOT NULL default '',
- PRIMARY KEY ("user",domain)
- )
- </sql>
-</sqlDefs>
-
-</sqlResources>
-
http://git-wip-us.apache.org/repos/asf/james-project/blob/ee131ea6/server/app/src/main/resources/usersrepository-template.xml
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/usersrepository-template.xml b/server/app/src/main/resources/usersrepository-template.xml
deleted file mode 100644
index 112e935..0000000
--- a/server/app/src/main/resources/usersrepository-template.xml
+++ /dev/null
@@ -1,81 +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 -->
-
-<!-- Configure User Repositories here. -->
-
-<!-- -->
-<!-- User repositories are required for the following purposes: -->
-<!-- - storing James user information and authentication data. -->
-<!-- -->
-
-<!-- JPA based backend. Support password algorithm are:
- MD5, SHA-256, SHA-512, NONE
--->
-<usersrepository name="LocalUsers" class="org.apache.james.user.jpa.JPAUsersRepository">
- <algorithm>MD5</algorithm>
- <enableVirtualHosting>true</enableVirtualHosting>
-</usersrepository>
-
-<!-- Read-Only LDAP based UsersRepository -->
-<!--
-<repository name="LocalUsers" class="org.apache.james.user.ldap.ReadOnlyUsersLDAPRepository" ldapHost="ldap://myldapserver:389"
- principal="uid=ldapUser,ou=system" credentials="password" userBase="ou=People,o=myorg.com,ou=system" userIdAttribute="uid"/>;
--->
-
-<!-- The UsersRepository implementations below are DEPRECATED and will get removed in the next release -->
-<!-- They are just listed here for backward-compatibility-->
-
-<!-- File-based user repositories Use these configurations to store user info in the filesystem -->
-<!-- The LocalUsers repository, for storing James' User info. -->
-<!-- DEPRECATED: This implementation will get removed in the next release -->
-<!--
-<usersrepository name="LocalUsers" class="org.apache.james.user.file.UsersFileRepository">
- <destination URL="file://var/users/"/>
- <ignoreCase>true</ignoreCase>
- <enableAliases>true</enableAliases>
- <enableForwarding>true</enableForwarding>
- <enableVirtualHosting>false</enableVirtualHosting>
-</usersrepository>
--->
-
-<!-- Database backed user repositories -->
-<!-- -->
-<!-- Use these configurations to store user info in a database. -->
-<!-- Note: The<data-source>element must refer to a connection configured -->
-<!-- in the<database-connections>configuration section. -->
-<!-- The LocalUsers repository, for storing James' User info. -->
-<!-- DEPRECATED: This implementation will get removed in the next release -->
-<!-- Use JPAUsersRepository if you want to store the Users in a database -->
-<!--
-<usersrepository name="LocalUsers" class="org.apache.james.user.jdbc.JamesUsersJdbcRepository" destinationURL="db://maildb/users">
- <sqlFile>file://conf/sqlResources.xml</sqlFile>
- <ignoreCase>true</ignoreCase>
- <enableAliases>true</enableAliases>
- <enableForwarding>true</enableForwarding>
- <enableVirtualHosting>false</enableVirtualHosting>
-</usersrepository>
--->
http://git-wip-us.apache.org/repos/asf/james-project/blob/ee131ea6/server/app/src/main/resources/usersrepository.xml
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/usersrepository.xml b/server/app/src/main/resources/usersrepository.xml
new file mode 100644
index 0000000..112e935
--- /dev/null
+++ b/server/app/src/main/resources/usersrepository.xml
@@ -0,0 +1,81 @@
+<?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 -->
+
+<!-- Configure User Repositories here. -->
+
+<!-- -->
+<!-- User repositories are required for the following purposes: -->
+<!-- - storing James user information and authentication data. -->
+<!-- -->
+
+<!-- JPA based backend. Support password algorithm are:
+ MD5, SHA-256, SHA-512, NONE
+-->
+<usersrepository name="LocalUsers" class="org.apache.james.user.jpa.JPAUsersRepository">
+ <algorithm>MD5</algorithm>
+ <enableVirtualHosting>true</enableVirtualHosting>
+</usersrepository>
+
+<!-- Read-Only LDAP based UsersRepository -->
+<!--
+<repository name="LocalUsers" class="org.apache.james.user.ldap.ReadOnlyUsersLDAPRepository" ldapHost="ldap://myldapserver:389"
+ principal="uid=ldapUser,ou=system" credentials="password" userBase="ou=People,o=myorg.com,ou=system" userIdAttribute="uid"/>;
+-->
+
+<!-- The UsersRepository implementations below are DEPRECATED and will get removed in the next release -->
+<!-- They are just listed here for backward-compatibility-->
+
+<!-- File-based user repositories Use these configurations to store user info in the filesystem -->
+<!-- The LocalUsers repository, for storing James' User info. -->
+<!-- DEPRECATED: This implementation will get removed in the next release -->
+<!--
+<usersrepository name="LocalUsers" class="org.apache.james.user.file.UsersFileRepository">
+ <destination URL="file://var/users/"/>
+ <ignoreCase>true</ignoreCase>
+ <enableAliases>true</enableAliases>
+ <enableForwarding>true</enableForwarding>
+ <enableVirtualHosting>false</enableVirtualHosting>
+</usersrepository>
+-->
+
+<!-- Database backed user repositories -->
+<!-- -->
+<!-- Use these configurations to store user info in a database. -->
+<!-- Note: The<data-source>element must refer to a connection configured -->
+<!-- in the<database-connections>configuration section. -->
+<!-- The LocalUsers repository, for storing James' User info. -->
+<!-- DEPRECATED: This implementation will get removed in the next release -->
+<!-- Use JPAUsersRepository if you want to store the Users in a database -->
+<!--
+<usersrepository name="LocalUsers" class="org.apache.james.user.jdbc.JamesUsersJdbcRepository" destinationURL="db://maildb/users">
+ <sqlFile>file://conf/sqlResources.xml</sqlFile>
+ <ignoreCase>true</ignoreCase>
+ <enableAliases>true</enableAliases>
+ <enableForwarding>true</enableForwarding>
+ <enableVirtualHosting>false</enableVirtualHosting>
+</usersrepository>
+-->
http://git-wip-us.apache.org/repos/asf/james-project/blob/ee131ea6/server/app/src/main/resources/usersrepository23-template.xml
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/usersrepository23-template.xml b/server/app/src/main/resources/usersrepository23-template.xml
deleted file mode 100644
index 5709494..0000000
--- a/server/app/src/main/resources/usersrepository23-template.xml
+++ /dev/null
@@ -1,36 +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 -->
-
-<importjames23-usersrepository class="org.apache.james.user.file.UsersFileRepository">
-
- <destination URL="file://var/users/" />
- <ignoreCase>true</ignoreCase>
- <enableAliases>true</enableAliases>
- <enableForwarding>true</enableForwarding>
- <enableVirtualHosting>false</enableVirtualHosting>
-
-</importjames23-usersrepository>
http://git-wip-us.apache.org/repos/asf/james-project/blob/ee131ea6/server/app/src/main/resources/usersrepository23.xml
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/usersrepository23.xml b/server/app/src/main/resources/usersrepository23.xml
new file mode 100644
index 0000000..5709494
--- /dev/null
+++ b/server/app/src/main/resources/usersrepository23.xml
@@ -0,0 +1,36 @@
+<?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 -->
+
+<importjames23-usersrepository class="org.apache.james.user.file.UsersFileRepository">
+
+ <destination URL="file://var/users/" />
+ <ignoreCase>true</ignoreCase>
+ <enableAliases>true</enableAliases>
+ <enableForwarding>true</enableForwarding>
+ <enableVirtualHosting>false</enableVirtualHosting>
+
+</importjames23-usersrepository>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[6/8] james-project git commit: JAMES-2088 Remove duplicated license
Posted by ad...@apache.org.
JAMES-2088 Remove duplicated license
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/a276ab8f
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/a276ab8f
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/a276ab8f
Branch: refs/heads/master
Commit: a276ab8f194364ebb76f09234f02299e8a574887
Parents: 05fb144
Author: benwa <bt...@linagora.com>
Authored: Wed Jul 5 09:58:32 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 5 09:58:32 2017 +0700
----------------------------------------------------------------------
mpt/LICENSE.apache | 176 ------------------------------------------------
1 file changed, 176 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/a276ab8f/mpt/LICENSE.apache
----------------------------------------------------------------------
diff --git a/mpt/LICENSE.apache b/mpt/LICENSE.apache
deleted file mode 100644
index 2bb9ad2..0000000
--- a/mpt/LICENSE.apache
+++ /dev/null
@@ -1,176 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[3/8] james-project git commit: JAMES-2089 Make server/app
configuration work out of the box
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/james-project/blob/ee131ea6/server/app/src/main/resources/jmx-template.properties
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/jmx-template.properties b/server/app/src/main/resources/jmx-template.properties
deleted file mode 100644
index a1dbdf8..0000000
--- a/server/app/src/main/resources/jmx-template.properties
+++ /dev/null
@@ -1,28 +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
-
-# 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
-
-jmx.address=127.0.0.1
-jmx.port=9999
http://git-wip-us.apache.org/repos/asf/james-project/blob/ee131ea6/server/app/src/main/resources/jmx.properties
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/jmx.properties b/server/app/src/main/resources/jmx.properties
new file mode 100644
index 0000000..a1dbdf8
--- /dev/null
+++ b/server/app/src/main/resources/jmx.properties
@@ -0,0 +1,28 @@
+# 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
+
+# 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
+
+jmx.address=127.0.0.1
+jmx.port=9999
http://git-wip-us.apache.org/repos/asf/james-project/blob/ee131ea6/server/app/src/main/resources/lmtpserver-template.xml
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/lmtpserver-template.xml b/server/app/src/main/resources/lmtpserver-template.xml
deleted file mode 100644
index 15bb62f..0000000
--- a/server/app/src/main/resources/lmtpserver-template.xml
+++ /dev/null
@@ -1,77 +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 -->
-
-<lmtpservers>
-
- <!-- The LMTP server is disabled by default -->
- <!-- Disabling blocks will stop them from listening, -->
- <!-- but does not free as many resources as removing them would -->
- <lmtpserver enabled="false">
-
- <jmxName>lmtpserver</jmxName>
-
- <!-- LMTP should not be reachable from outside your network so bind it to loopback-->
- <bind>127.0.0.1:24</bind>
-
- <connectionBacklog>200</connectionBacklog>
-
- <!-- This is the name used by the server to identify itself in the LMTP -->
- <!-- protocol. If autodetect is TRUE, the server will discover its -->
- <!-- own host name and use that in the protocol. If discovery fails, -->
- <!-- the value of 'localhost' is used. If autodetect is FALSE, James -->
- <!-- will use the specified value. -->
- <!--
- <helloName autodetect="true">myMailServer</helloName>
- -->
- <!-- connection timeout in secconds -->
- <connectiontimeout>1200</connectiontimeout>
-
- <!-- Set the maximum simultaneous incoming connections for this service -->
- <connectionLimit>0</connectionLimit>
-
- <!-- Set the maximum simultaneous incoming connections per IP for this service -->
- <connectionLimitPerIP>0</connectionLimitPerIP>
-
- <!-- This sets the maximum allowed message size (in kilobytes) for this -->
- <!-- LMTP service. If unspecified, the value defaults to 0, which means no limit. -->
- <maxmessagesize>0</maxmessagesize>
-
- <!-- This sets the LMTPGreeting which will be used when connect to the lmtpserver -->
- <!-- If none is specified a default is generated -->
- <!--
- <smtpGreeting>JAMES LMTP Server</smtpGreeting>
- -->
-
- <handlerchain>
- <!-- This loads the core CommandHandlers. Only remove this if you really -->
- <!-- know what you are doing -->
- <handler class="org.apache.james.lmtpserver.CoreCmdHandlerLoader"/>
- </handlerchain>
-
- </lmtpserver>
-
-</lmtpservers>
http://git-wip-us.apache.org/repos/asf/james-project/blob/ee131ea6/server/app/src/main/resources/lmtpserver.xml
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/lmtpserver.xml b/server/app/src/main/resources/lmtpserver.xml
new file mode 100644
index 0000000..15bb62f
--- /dev/null
+++ b/server/app/src/main/resources/lmtpserver.xml
@@ -0,0 +1,77 @@
+<?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 -->
+
+<lmtpservers>
+
+ <!-- The LMTP server is disabled by default -->
+ <!-- Disabling blocks will stop them from listening, -->
+ <!-- but does not free as many resources as removing them would -->
+ <lmtpserver enabled="false">
+
+ <jmxName>lmtpserver</jmxName>
+
+ <!-- LMTP should not be reachable from outside your network so bind it to loopback-->
+ <bind>127.0.0.1:24</bind>
+
+ <connectionBacklog>200</connectionBacklog>
+
+ <!-- This is the name used by the server to identify itself in the LMTP -->
+ <!-- protocol. If autodetect is TRUE, the server will discover its -->
+ <!-- own host name and use that in the protocol. If discovery fails, -->
+ <!-- the value of 'localhost' is used. If autodetect is FALSE, James -->
+ <!-- will use the specified value. -->
+ <!--
+ <helloName autodetect="true">myMailServer</helloName>
+ -->
+ <!-- connection timeout in secconds -->
+ <connectiontimeout>1200</connectiontimeout>
+
+ <!-- Set the maximum simultaneous incoming connections for this service -->
+ <connectionLimit>0</connectionLimit>
+
+ <!-- Set the maximum simultaneous incoming connections per IP for this service -->
+ <connectionLimitPerIP>0</connectionLimitPerIP>
+
+ <!-- This sets the maximum allowed message size (in kilobytes) for this -->
+ <!-- LMTP service. If unspecified, the value defaults to 0, which means no limit. -->
+ <maxmessagesize>0</maxmessagesize>
+
+ <!-- This sets the LMTPGreeting which will be used when connect to the lmtpserver -->
+ <!-- If none is specified a default is generated -->
+ <!--
+ <smtpGreeting>JAMES LMTP Server</smtpGreeting>
+ -->
+
+ <handlerchain>
+ <!-- This loads the core CommandHandlers. Only remove this if you really -->
+ <!-- know what you are doing -->
+ <handler class="org.apache.james.lmtpserver.CoreCmdHandlerLoader"/>
+ </handlerchain>
+
+ </lmtpserver>
+
+</lmtpservers>
http://git-wip-us.apache.org/repos/asf/james-project/blob/ee131ea6/server/app/src/main/resources/log4j-template.properties
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/log4j-template.properties b/server/app/src/main/resources/log4j-template.properties
deleted file mode 100644
index fe9a8cc..0000000
--- a/server/app/src/main/resources/log4j-template.properties
+++ /dev/null
@@ -1,140 +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
-
-# See http://james.apache.org/server/3/config.html for usage
-
-log4j.rootLogger=DEBUG
-
-log4j.appender.CONS=org.apache.log4j.ConsoleAppender
-log4j.appender.CONS.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONS.layout.ConversionPattern=%-5p %d{HH:mm:ss,SSS} | %c | %m%n
-
-log4j.appender.FILE=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.FILE.File=../log/james-server.log
-log4j.appender.FILE.layout=org.apache.log4j.PatternLayout
-log4j.appender.FILE.layout.ConversionPattern=%-5p %d{HH:mm:ss,SSS} | %c | %m%n
-
-log4j.appender.MAILBOXMANAGER=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.MAILBOXMANAGER.File=../log/mailboxmanager.log
-log4j.appender.MAILBOXMANAGER.DatePattern='.'yyyy-MM-dd
-log4j.appender.MAILBOXMANAGER.layout=org.apache.log4j.PatternLayout
-log4j.appender.MAILBOXMANAGER.layout.ConversionPattern=%-5p %d{HH:mm:ss,SSS} | %c | %m%n
-
-log4j.appender.IMAPSERVER=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.IMAPSERVER.File=../log/imapserver.log
-log4j.appender.IMAPSERVER.DatePattern='.'yyyy-MM-dd
-log4j.appender.IMAPSERVER.layout=org.apache.log4j.PatternLayout
-log4j.appender.IMAPSERVER.layout.ConversionPattern=%-5p %d{HH:mm:ss,SSS} | %c | %m%n
-
-log4j.appender.MAILETCONTAINER=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.MAILETCONTAINER.File=../log/mailetcontainer.log
-log4j.appender.MAILETCONTAINER.DatePattern='.'yyyy-MM-dd
-log4j.appender.MAILETCONTAINER.layout=org.apache.log4j.PatternLayout
-log4j.appender.MAILETCONTAINER.layout.ConversionPattern=%-5p %d{HH:mm:ss,SSS} | %c | %m%n
-
-log4j.appender.DNSSERVICE=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.DNSSERVICE.File=../log/dnsservice.log
-log4j.appender.DNSSERVICE.DatePattern='.'yyyy-MM-dd
-log4j.appender.DNSSERVICE.layout=org.apache.log4j.PatternLayout
-log4j.appender.DNSSERVICE.layout.ConversionPattern=%-5p %d{HH:mm:ss,SSS} | %c | %m%n
-
-log4j.appender.POP3SERVER=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.POP3SERVER.File=../log/pop3server.log
-log4j.appender.POP3SERVER.DatePattern='.'yyyy-MM-dd
-log4j.appender.POP3SERVER.layout=org.apache.log4j.PatternLayout
-log4j.appender.POP3SERVER.layout.ConversionPattern=%-5p %d{HH:mm:ss,SSS} | %c | %m%n
-
-log4j.appender.SMTPSERVER=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.SMTPSERVER.File=../log/smtpserver.log
-log4j.appender.SMTPSERVER.DatePattern='.'yyyy-MM-dd
-log4j.appender.SMTPSERVER.layout=org.apache.log4j.PatternLayout
-log4j.appender.SMTPSERVER.layout.ConversionPattern=%-5p %d{HH:mm:ss,SSS} | %c | %m%n
-
-log4j.appender.LMTPSERVER=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.LMTPSERVER.File=../log/lmtpserver.log
-log4j.appender.LMTPSERVER.DatePattern='.'yyyy-MM-dd
-log4j.appender.LMTPSERVER.layout=org.apache.log4j.PatternLayout
-log4j.appender.LMTPSERVER.layout.ConversionPattern=%-5p %d{HH:mm:ss,SSS} | %c | %m%n
-
-log4j.appender.MAILREPOSITORYSTORE=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.MAILREPOSITORYSTORE.File=../log/mailrepositorystore.log
-log4j.appender.MAILREPOSITORYSTORE.DatePattern='.'yyyy-MM-dd
-log4j.appender.MAILREPOSITORYSTORE.layout=org.apache.log4j.PatternLayout
-log4j.appender.MAILREPOSITORYSTORE.layout.ConversionPattern=%-5p %d{HH:mm:ss,SSS} | %c | %m%n
-
-log4j.appender.USERSREPOSITORY=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.USERSREPOSITORY.File=../log/usersrepository.log
-log4j.appender.USERSREPOSITORY.DatePattern='.'yyyy-MM-dd
-log4j.appender.USERSREPOSITORY.layout=org.apache.log4j.PatternLayout
-log4j.appender.USERSREPOSITORY.layout.ConversionPattern=%-5p %d{HH:mm:ss,SSS} | %c | %m%n
-
-log4j.appender.FETCHMAIL=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.FETCHMAIL.File=../log/fetchmail.log
-log4j.appender.FETCHMAIL.DatePattern='.'yyyy-MM-dd
-log4j.appender.FETCHMAIL.layout=org.apache.log4j.PatternLayout
-log4j.appender.FETCHMAIL.layout.ConversionPattern=%-5p %d{HH:mm:ss,SSS} | %c | %m%n
-
-log4j.appender.DOMAINLIST=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.DOMAINLIST.File=../log/domainlist.log
-log4j.appender.DOMAINLIST.DatePattern='.'yyyy-MM-dd
-log4j.appender.DOMAINLIST.layout=org.apache.log4j.PatternLayout
-log4j.appender.DOMAINLIST.layout.ConversionPattern=%-5p %d{HH:mm:ss,SSS} | %c | %m%n
-
-log4j.appender.VIRTUALUSERTABLE=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.VIRTUALUSERTABLE.File=../log/virtualusertable.log
-log4j.appender.VIRTUALUSERTABLE.DatePattern='.'yyyy-MM-dd
-log4j.appender.VIRTUALUSERTABLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.VIRTUALUSERTABLE.layout.ConversionPattern=%-5p %d{HH:mm:ss,SSS} | %c | %m%n
-
-log4j.appender.MAILQUEUEFACTORY=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.MAILQUEUEFACTORY.File=../log/mailqueuefactory.log
-log4j.appender.MAILQUEUEFACTORY.DatePattern='.'yyyy-MM-dd
-log4j.appender.MAILQUEUEFACTORY.layout=org.apache.log4j.PatternLayout
-log4j.appender.MAILQUEUEFACTORY.layout.ConversionPattern=%-5p %d{HH:mm:ss,SSS} | %c | %m%n
-
-log4j.logger.org.apache.jackrabbit=ERROR, CONS, FILE
-
-log4j.logger.org.apache.xbean.spring=WARN, CONS, FILE
-log4j.logger.org.apache.activemq=WARN, CONS, FILE
-
-log4j.logger.org.apache.camel=WARN, CONS, FILE
-log4j.logger.org.springframework=WARN, CONS, FILE
-log4j.logger.org.apache.james=INFO, CONS, FILE
-
-log4j.logger.james=WARN, CONS, FILE
-log4j.logger=DEBUG, CONS, FILE
-
-log4j.logger.james.mailboxmanager=INFO, MAILBOXMANAGER
-log4j.logger.james.imapserver=INFO, IMAPSERVER
-log4j.logger.james.mailetcontainer=INFO, MAILETCONTAINER
-log4j.logger.james.mailetcontext=INFO, MAILETCONTAINER
-log4j.logger.james.mailspooler=INFO, MAILETCONTAINER
-log4j.logger.james.mailprocessor=INFO, MAILETCONTAINER
-log4j.logger.james.dnsservice=INFO, DNSSERVICE
-log4j.logger.james.pop3server=INFO, POP3SERVER
-log4j.logger.james.smtpserver=INFO, SMTPSERVER
-log4j.logger.james.lmtpserver=INFO, LMTPSERVER
-log4j.logger.james.mailrepositorystore=INFO, MAILREPOSITORYSTORE
-log4j.logger.james.usersrepository=INFO, USERSREPOSITORY
-log4j.logger.james.fetchmail=INFO, FETCHMAIL
-log4j.logger.james.domainlist=INFO, DOMAINLIST
-log4j.logger.james.virtualusertable=INFO, VIRTUALUSERTABLE
-log4j.logger.james.mailqueuefactory=INFO, MAILQUEUEFACTORY
-log4j.logger.etm.core.monitor.EtmMonitor= INFO, CONS, FILE
http://git-wip-us.apache.org/repos/asf/james-project/blob/ee131ea6/server/app/src/main/resources/mailbox-jcr-template.cnd
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/mailbox-jcr-template.cnd b/server/app/src/main/resources/mailbox-jcr-template.cnd
deleted file mode 100644
index fd625fd..0000000
--- a/server/app/src/main/resources/mailbox-jcr-template.cnd
+++ /dev/null
@@ -1,74 +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
--->
-
-<!-- See http://james.apache.org/server/3/config.html for usage -->
-
-<jamesMailbox = 'http://james.apache.org/imap/jcr/'>
-
-[jamesMailbox:user] > mix:created
- mixin
- - jamesMailbox:user (String)
- - jamesMailbox:subscriptionMailboxes (STRING) multiple
- + * (nt:unstructured) multiple
-
-
-[jamesMailbox:messageHeader] > mix:created, mix:lockable
- mixin
- - jamesMailbox:headerFieldName (STRING) mandatory
- - jamesMailbox:headerValue(STRING) mandatory
- - jamesMailbox:headerLineNumber (LONG) mandatory
-
-[jamesMailbox:messageProperty] > mix:created
- mixin
- - jamesMailbox:propertyNamespace (STRING) mandatory
- - jamesMailbox:propertyLocalName (STRING) mandatory
- - jamesMailbox:propertyValue(STRING) mandatory
- - jamesMailbox:propertyOrder (Long) mandatory
-
-[jamesMailbox:message] > mix:referenceable, mix:created, mix:created
- mixin
- - jamesMailbox:mailboxUUID (String) mandatory
- - jamesMailbox:uid (LONG) mandatory
- - jamesMailbox:modSeq (LONG)
- - jamesMailbox:size (LONG) mandatory
- - jamesMailbox:answered (BOOLEAN)
- - jamesMailbox:deleted (BOOLEAN)
- - jamesMailbox:draft (BOOLEAN)
- - jamesMailbox:flagged (BOOLEAN)
- - jamesMailbox:recent (BOOLEAN)
- - jamesMailbox:seen (BOOLEAN)
- - jamesMailbox:internalDate (DATE)
- - jamesMailbox:userFlags (STRING) multiple
- - jamesMailbox:messageBodyStartOctet (LONG) mandatory
- - jamesMailbox:messageTextualLineCount (LONG)
- - jamesMailbox:messageSubType (String) mandatory
- + messageHeader (nt:unstructured) multiple
- + messageProperty (nt:unstructured) multiple
-
-[jamesMailbox:mailbox] > mix:referenceable, mix:lockable, mix:created
- mixin
- - jamesMailbox:mailboxUidValidity (LONG)
- - jamesMailbox:mailboxName (STRING)
- - jamesMailbox:mailboxLastUid (LONG)
- - jamesMailbox:mailboxNamespace (STRING)
- - jamesMailbox:mailboxUser (STRING)
- + * (nt:unstructured) multiple
http://git-wip-us.apache.org/repos/asf/james-project/blob/ee131ea6/server/app/src/main/resources/mailbox-jcr.cnd
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/mailbox-jcr.cnd b/server/app/src/main/resources/mailbox-jcr.cnd
new file mode 100644
index 0000000..fd625fd
--- /dev/null
+++ b/server/app/src/main/resources/mailbox-jcr.cnd
@@ -0,0 +1,74 @@
+/*
+ * 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 -->
+
+<jamesMailbox = 'http://james.apache.org/imap/jcr/'>
+
+[jamesMailbox:user] > mix:created
+ mixin
+ - jamesMailbox:user (String)
+ - jamesMailbox:subscriptionMailboxes (STRING) multiple
+ + * (nt:unstructured) multiple
+
+
+[jamesMailbox:messageHeader] > mix:created, mix:lockable
+ mixin
+ - jamesMailbox:headerFieldName (STRING) mandatory
+ - jamesMailbox:headerValue(STRING) mandatory
+ - jamesMailbox:headerLineNumber (LONG) mandatory
+
+[jamesMailbox:messageProperty] > mix:created
+ mixin
+ - jamesMailbox:propertyNamespace (STRING) mandatory
+ - jamesMailbox:propertyLocalName (STRING) mandatory
+ - jamesMailbox:propertyValue(STRING) mandatory
+ - jamesMailbox:propertyOrder (Long) mandatory
+
+[jamesMailbox:message] > mix:referenceable, mix:created, mix:created
+ mixin
+ - jamesMailbox:mailboxUUID (String) mandatory
+ - jamesMailbox:uid (LONG) mandatory
+ - jamesMailbox:modSeq (LONG)
+ - jamesMailbox:size (LONG) mandatory
+ - jamesMailbox:answered (BOOLEAN)
+ - jamesMailbox:deleted (BOOLEAN)
+ - jamesMailbox:draft (BOOLEAN)
+ - jamesMailbox:flagged (BOOLEAN)
+ - jamesMailbox:recent (BOOLEAN)
+ - jamesMailbox:seen (BOOLEAN)
+ - jamesMailbox:internalDate (DATE)
+ - jamesMailbox:userFlags (STRING) multiple
+ - jamesMailbox:messageBodyStartOctet (LONG) mandatory
+ - jamesMailbox:messageTextualLineCount (LONG)
+ - jamesMailbox:messageSubType (String) mandatory
+ + messageHeader (nt:unstructured) multiple
+ + messageProperty (nt:unstructured) multiple
+
+[jamesMailbox:mailbox] > mix:referenceable, mix:lockable, mix:created
+ mixin
+ - jamesMailbox:mailboxUidValidity (LONG)
+ - jamesMailbox:mailboxName (STRING)
+ - jamesMailbox:mailboxLastUid (LONG)
+ - jamesMailbox:mailboxNamespace (STRING)
+ - jamesMailbox:mailboxUser (STRING)
+ + * (nt:unstructured) multiple
http://git-wip-us.apache.org/repos/asf/james-project/blob/ee131ea6/server/app/src/main/resources/mailbox-maildir-template.properties
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/mailbox-maildir-template.properties b/server/app/src/main/resources/mailbox-maildir-template.properties
deleted file mode 100644
index 3164d0a..0000000
--- a/server/app/src/main/resources/mailbox-maildir-template.properties
+++ /dev/null
@@ -1,25 +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
-
-# See http://james.apache.org/server/3/config.html for usage
-
-maildir.folder=../var/store/maildir/%domain/%user
-maildir.messageNameParser.strictMode=false
http://git-wip-us.apache.org/repos/asf/james-project/blob/ee131ea6/server/app/src/main/resources/mailbox-maildir.properties
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/mailbox-maildir.properties b/server/app/src/main/resources/mailbox-maildir.properties
new file mode 100644
index 0000000..3164d0a
--- /dev/null
+++ b/server/app/src/main/resources/mailbox-maildir.properties
@@ -0,0 +1,25 @@
+# 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
+
+maildir.folder=../var/store/maildir/%domain/%user
+maildir.messageNameParser.strictMode=false
http://git-wip-us.apache.org/repos/asf/james-project/blob/ee131ea6/server/app/src/main/resources/mailbox-template.xml
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/mailbox-template.xml b/server/app/src/main/resources/mailbox-template.xml
deleted file mode 100644
index 4c0cf91..0000000
--- a/server/app/src/main/resources/mailbox-template.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.
- -->
-
-<!--
- 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 -->
-
-<mailbox>
- <!-- supported providers are: -->
- <!-- jpa, jcr, maildir, hbase, memory -->
- <!-- -->
- <!-- Be aware that maildir will only work on unix like operation systems! -->
- <provider>jpa</provider>
-</mailbox>
http://git-wip-us.apache.org/repos/asf/james-project/blob/ee131ea6/server/app/src/main/resources/mailbox.xml
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/mailbox.xml b/server/app/src/main/resources/mailbox.xml
new file mode 100644
index 0000000..4c0cf91
--- /dev/null
+++ b/server/app/src/main/resources/mailbox.xml
@@ -0,0 +1,34 @@
+<?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 -->
+
+<mailbox>
+ <!-- supported providers are: -->
+ <!-- jpa, jcr, maildir, hbase, memory -->
+ <!-- -->
+ <!-- Be aware that maildir will only work on unix like operation systems! -->
+ <provider>jpa</provider>
+</mailbox>
http://git-wip-us.apache.org/repos/asf/james-project/blob/ee131ea6/server/app/src/main/resources/mailetcontainer-template.xml
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/mailetcontainer-template.xml b/server/app/src/main/resources/mailetcontainer-template.xml
deleted file mode 100644
index abb8282..0000000
--- a/server/app/src/main/resources/mailetcontainer-template.xml
+++ /dev/null
@@ -1,518 +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 -->
-
-<!-- This block is responsible for processing messages on the spool. -->
-
-<mailetcontainer enableJmx="true">
-
- <!-- MailAddress used for PostMaster -->
- <context>
- <postmaster>postmaster@localhost</postmaster>
- </context>
-
- <!-- Number of spool threads -->
- <spooler>
- <threads>20</threads>
- </spooler>
-
- <processors>
-
- <!-- The root processor is a required processor - James routes all mail on the spool -->
- <!-- through this processor first. -->
- <!-- -->
- <!-- This configuration is a sample configuration for the root processor. -->
- <processor state="root" enableJmx="true">
-
- <!-- This mailet redirects mail for the user 'postmaster' at any local domain to -->
- <!-- the postmaster address specified for the server. The postmaster address -->
- <!-- is required by rfc822. Do not remove this mailet unless you are meeting -->
- <!-- this requirement through other means (e.g. a XML/JDBCRecipientRewriteTable defined in recipientrewritetable-store.xml) -->
- <mailet match="All" class="PostmasterAlias"/>
-
- <!-- Important check to avoid looping -->
- <mailet match="RelayLimit=30" class="Null"/>
-
- <!-- Check attachment extensions for possible viruses -->
- <!-- The "-z" option requests the check to be non-recursively applied -->
- <!-- to the contents of any attached '*.zip' file. -->
- <!--
- <mailet match="AttachmentFileNameIs=-d -z *.exe *.com *.bat *.cmd *.pif *.scr *.vbs *.avi *.mp3 *.mpeg *.shs" class="Bounce" onMatchException="error">
- <inline>heads</inline>
- <attachment>none</attachment>
- <passThrough>false</passThrough>
- <prefix>[REJECTED]</prefix>
- <notice>
-The Security Policy of XXX does not allow to forward messages containing attachments having any of the extensions .exe, .com, .bat, .cmd, .pif, .scr, .vbs, .avi, .mp3, .mpeg, .shs, therefore your message has been rejected.
-
-Please don't reply to this e-mail as it has been automatically sent by the antivirus system.
-
-Regards, Postmaster XXX.YYY
-.....................................
- </notice>
- </mailet>
- -->
-
- <!-- sample SMIME mailets configuration -->
- <!--
- <mailet match="IsSMIMEEncrypted" class="SMIMEDecrypt">
- <keyStoreType>pkcs12</keyStoreType>
- <keyStoreFileName>c:/path.pfx</keyStoreFileName>
- <keyStorePassword>myKeyStorePass</keyStorePassword>
- <keyAlias>myKeyAlias</keyAlias>
- <keyAliasPassword>myKeyPass</keyAliasPassword>
- </mailet>
-
- <mailet match="IsSMIMESigned" class="SMIMECheckSignature">
- <keyStoreType>pkcs12</keyStoreType>
- <keyStoreFileName>c:/path.pfx</keyStoreFileName>
- <keyStorePassword>myKeyStorePass</keyStorePassword>
- <strip>false</strip>
- <onlyTrusted>true</onlyTrusted>
- </mailet>
- -->
-
-
- <!-- Anti-spam processing -->
- <!-- The following two entries avoid double anti-spam analysis -->
- <!-- for forwarded messages. -->
- <!-- Has spam checking already been done? -->
- <mailet match="HasMailAttribute=spamChecked" class="ToProcessor">
- <processor>transport</processor>
- </mailet>
- <!-- Spam checking will not be done twice -->
- <mailet match="All" class="SetMailAttribute">
- <spamChecked>true</spamChecked>
- </mailet>
-
- <!-- White List:
- If you use block lists, you will probably want to check
- for known permitted senders. This is particularly true
- if you use more aggressive block lists, such as SPEWS,
- that are prone to block entire subnets without regard
- for non-spamming senders.
- -->
-
- <!-- Messages from authenticated senders never are spam -->
- <mailet match="SMTPAuthSuccessful" class="ToProcessor">
- <processor>transport</processor>
- </mailet>
-
- <!-- Messages signed by trusted users never are spam -->
- <!-- Uncommenting the following entry, messages with valid signatures will never be considered spam. -->
- <!-- This can be a valid policy *if* SMIMECheckSignature was invoked -->
- <!-- with<onlyTrusted>true</onlyTrusted>set -->
- <!--
- <mailet match="HasMailAttribute=org.apache.james.SMIMECheckSignature" class="ToProcessor">
- <processor>transport</processor>
- </mailet>
- -->
-
- <!-- specific known senders -->
- <!--
- <mailet match="SenderIs=goodboy@goodhost"
- class="ToProcessor">
- <processor>transport</processor>
- </mailet>
- -->
-
- <!-- End of White List -->
-
- <!-- Sample matching to kill a message (send to Null) -->
- <!--
- <mailet match="RecipientIs=badboy@badhost" class="Null"/>
- -->
- <!--
- <mailet match="CompareNumericHeaderValue=X-MessageIsSpamProbability >0.90" class="SetMailAttribute" onMatchException="noMatch">
- <isSpam>true</isSpam>
- </mailet>
-
- <mailet match="CompareNumericHeaderValue=X-MessageIsSpamProbability >0.90" class="SetMimeHeader" onMatchException="noMatch">
- <name>X-MessageIsSpam</name>
- <value>true</value>
- </mailet>
-
- <mailet match="CompareNumericHeaderValue=X-MessageIsSpamProbability >0.99" class="ToProcessor" onMatchException="noMatch">
- <processor>spam</processor>
- <notice>Spam not accepted</notice>
- </mailet>
- -->
-
- <!-- Send remaining mails to the transport processor for either local or remote delivery -->
- <mailet match="All" class="ToProcessor">
- <processor>transport</processor>
- </mailet>
-
- </processor>
-
- <!-- The error processor is required. James may internally set emails to the -->
- <!-- error state. The error processor is generally invoked when there is an -->
- <!-- unexpected error either in the mailet chain or internal to James. -->
- <!-- -->
- <!-- By default configuration all email that generates an error in placed in -->
- <!-- an error repository. -->
- <processor state="error" enableJmx="true">
- <!-- If you want to notify the sender their message generated an error, uncomment this -->
- <!--
- <mailet match="All" class="Bounce"/>
- -->
- <!-- If you want to notify the postmaster that a message generated an error, uncomment this -->
- <!--
- <mailet match="All" class="NotifyPostmaster"/>
- -->
-
- <!-- Logs any messages to the repository specified -->
- <mailet match="All" class="ToRepository">
- <repositoryPath>file://var/mail/error/</repositoryPath>
- <!-- An alternative database repository example follows. -->
- <!--
- <repositoryPath>db://maildb/deadletter/error</repositoryPath>
- -->
- </mailet>
- </processor>
-
- <!-- Processor CONFIGURATION SAMPLE: transport is a sample custom processor for local or -->
- <!-- remote delivery -->
- <processor state="transport" enableJmx="true">
-
- <!-- This is an example configuration including configuration for a list server. -->
- <!-- CHECKME: before uncommenting this, edit the configuration file's contents -->
- <!--
- &listserverConfig;
- -->
-
- <mailet match="SMTPAuthSuccessful" class="SetMimeHeader">
- <name>X-UserIsAuth</name>
- <value>true</value>
- </mailet>
-
- <mailet match="HasMailAttribute=org.apache.james.SMIMECheckSignature" class="SetMimeHeader">
- <name>X-WasSigned</name>
- <value>true</value>
- </mailet>
-
- <!-- Add a server-side signature -->
- <!--
- <mailet match="All" class="SMIMESign" onMailetException="ignore">
- <keyStoreType>jks</keyStoreType>
- <keyStoreFileName>path.keystore</keyStoreFileName>
- <keyStorePassword>myKeyStorePass</keyStorePassword>
- <keyAlias>myKeyAlias</keyAlias>
- <keyAliasPassword>myKeyPass</keyAliasPassword>
- <signerName>XXX Trusted Server</signerName>
- <rebuildFrom>true</rebuildFrom>
- <postmasterSigns>true</postmasterSigns>
- <debug>true</debug>
- </mailet>
- -->
-
- <!-- Experimental quota Matcher -->
- <!-- Check if over quota -->
- <!--
-
- <mailet match="IsOverQuota" class="ToProcessor">
- <processor>over-quota</processor>
- </mailet>
- -->
-
- <!-- The RecipientRewriteTable will use the definitions found in recipientrewritetablexml -->
- <mailet match="All" class="RecipientRewriteTable" />
-
- <!-- Place a copy in the user Sent folder -->
- <mailet match="SenderIsLocal" class="ToSenderFolder">
- <folder>Sent</folder>
- <consume>false</consume>
- </mailet>
-
- <!-- Is the recipient is for a local account, deliver it locally -->
- <mailet match="RecipientIsLocal" class="Sieve"/>
- <mailet match="RecipientIsLocal" class="AddDeliveredToHeader"/>
- <mailet match="RecipientIsLocal" class="LocalDelivery"/>
-
- <!-- If the host is handled by this server and it did not get -->
- <!-- locally delivered, this is an invalid recipient -->
- <mailet match="HostIsLocal" class="ToProcessor">
- <processor>local-address-error</processor>
- <notice>550 - Requested action not taken: no such user here</notice>
- </mailet>
-
-<!-- CHECKME! -->
- <!-- This is an anti-relay matcher/mailet combination -->
- <!-- -->
- <!-- Emails sent from servers not in the network list are -->
- <!-- rejected as spam. This is one method of preventing your -->
- <!-- server from being used as an open relay. Make sure you understand -->
- <!-- how to prevent your server from becoming an open relay before -->
- <!-- changing this configuration. See also<authorizedAddresses>in SMTP Server -->
- <!-- -->
- <!-- This matcher/mailet combination must come after local delivery has -->
- <!-- been performed. Otherwise local users will not be able to receive -->
- <!-- email from senders not in this remote address list. -->
- <!-- -->
- <!-- If you are using this matcher/mailet you will probably want to -->
- <!-- update the configuration to include your own network/addresses. The -->
- <!-- matcher can be configured with a comma separated list of IP addresses -->
- <!-- wildcarded IP subnets, and wildcarded hostname subnets. -->
- <!-- e.g. "RemoteAddrNotInNetwork=127.0.0.1, abc.de.*, 192.168.0.*" -->
- <!-- -->
- <!-- If you are using SMTP authentication then you can (and generally -->
- <!-- should) disable this matcher/mailet pair. -->
- <mailet match="RemoteAddrNotInNetwork=127.0.0.1" class="ToProcessor">
- <processor>relay-denied</processor>
- <notice>550 - Requested action not taken: relaying denied</notice>
- </mailet>
-
- <!-- Attempt remote delivery using the specified repository for the spool, -->
- <!-- using delay time to retry delivery and the maximum number of retries -->
- <mailet match="All" class="RemoteDelivery">
- <outgoingQueue>outgoing</outgoingQueue>
-
- <!-- Delivery Schedule based upon RFC 2821, 4.5.4.1 -->
- <!-- 5 day retry period, with 4 attempts in the first
- hour, two more within the first 6 hours, and then
- every 6 hours for the rest of the period.
- This format is not yet supported, instead, use a unique
- tag with the list of delays in milliseconds separated by commas.
- <delayTime>5 minutes</delayTime>
- <delayTime>10 minutes</delayTime>
- <delayTime>45 minutes</delayTime>
- <delayTime>2 hours</delayTime>
- <delayTime>3 hours</delayTime>
- <delayTime>6 hours</delayTime>
- -->
- <delayTime>5000, 100000, 500000</delayTime>
- <maxRetries>25</maxRetries>
-
- <!-- The max reties which will used if no A or MX record for the domain was found. -->
- <!-- If 0 it will fail on first time -->
- <maxDnsProblemRetries>0</maxDnsProblemRetries>
-
- <!-- The number of threads that should be trying to deliver outgoing messages -->
- <deliveryThreads>10</deliveryThreads>
-
- <!-- If false the message will not be sent to given server if any recipients fail -->
- <sendpartial>true</sendpartial>
-
- <!-- By default we send bounces to the "bounce" processor -->
- <!-- By removing this configuration James will fallback to hardcoded bounce -->
- <!-- notifications -->
- <bounceProcessor>bounces</bounceProcessor>
-
- <!-- A single mail server to deliver all outgoing messages. -->
- <!-- This is useful if this server is a backup or failover machine, -->
- <!-- or if you want all messages to be routed through a particular mail server, -->
- <!-- regardless of the email addresses specified in the message -->
- <!-- -->
- <!-- The gateway element specifies the gateway SMTP server name. -->
- <!-- If your gateway mail server is listening on a port other than 25, -->
- <!-- you can set James to connect to it on that port using the gatewayPort -->
- <!-- element. -->
- <!-- Although normally multiple addresses are implemented through proper -->
- <!-- DNS configuration, the RemoteDelivery mail does allow specifying -->
- <!-- multiple gateway elements, each of which may also have a port -->
- <!-- e.g., mygateway:2525 -->
- <!-- the gatewayPort element is used as a default -->
- <!--
- <gateway>otherserver.mydomain.com</gateway>
- <gatewayPort>25</gatewayPort>
- -->
- <!-- If the gateway requires smtp authentication the following directives -->
- <!-- (gatewayUsername/gatewayPassword) can be used. -->
- <!--
- <gatewayUsername>login</gatewayUsername>
- <gatewayPassword>pass</gatewayPassword>
- -->
-
- <!-- Set the HELO/EHLO name to use when connectiong to remote SMTP-Server -->
- <!--
- <mail.smtp.localhost>myMailServer</mail.smtp.localhost>
- -->
- </mailet>
-
- </processor>
-
- <processor state="over-quota" enableJmx="true">
- <mailet match="All" class="MetricsMailet">
- <metricName>mailet-over-quota-error</metricName>
- </mailet>
- <mailet match="All" class="Bounce">
- <message>The following recipients do not have enough space for storing the email you sent them.</message>
- <attachment>none</attachment>
- </mailet>
- <mailet match="All" class="ToRepository">
- <repositoryPath>file://var/mail/over-quota-error/</repositoryPath>
- </mailet>
- </processor>
-
-
- <!-- Processor CONFIGURATION SAMPLE: spam is a sample custom processor for handling -->
- <!-- spam. -->
- <!-- You can either log these, bounce these, or just ignore them. -->
- <processor state="spam" enableJmx="true">
-
- <!-- To place the spam messages in the user junk folder, uncomment this matcher/mailet configuration -->
- <!--
- <mailet match="RecipientIsLocal" class="ToRecipientFolder">
- <folder>Junk</folder>
- <consume>false</consume>
- </mailet>
- -->
-
- <!-- To destroy all messages, uncomment this matcher/mailet configuration -->
- <!--
- <mailet match="All" class="Null"/>
- -->
-
- <!-- To notify the sender their message was marked as spam, uncomment this matcher/mailet configuration -->
- <!--
- <mailet match="All" class="Bounce"/>
- -->
-
- <!-- To notify the postmaster that a message was marked as spam, uncomment this matcher/mailet configuration -->
- <!--
- <mailet match="All" class="NotifyPostmaster"/>
- -->
-
- <!-- To log the message to a repository, this matcher/mailet configuration should be uncommented. -->
- <!-- This is the default configuration. -->
- <mailet match="All" class="ToRepository">
- <repositoryPath>file://var/mail/spam/</repositoryPath>
-
- <!-- Changing the repositoryPath, as in this commented out example, will -->
- <!-- cause the mails to be stored in a database repository. -->
- <!-- Please note that only one repositoryPath element can be present for the mailet -->
- <!-- configuration. -->
- <!--
- <repositoryPath>db://maildb/deadletter/spam</repositoryPath>
- -->
- </mailet>
- </processor>
-
- <!-- messages containing viruses. -->
- <processor state="virus" enableJmx="true">
-
- <!-- To avoid a loop while bouncing -->
- <mailet match="All" class="SetMailAttribute">
- <org.apache.james.infected>true, bouncing</org.apache.james.infected>
- </mailet>
-
- <!-- If the sender is authenticated, notify the infection -->
- <mailet match="SMTPAuthSuccessful" class="Bounce">
- <inline>heads</inline>
- <attachment>none</attachment>
- <notice>Warning: We were unable to deliver the message below because it was found infected by virus(es).</notice>
- </mailet>
-
- <!-- In any other situation ghost it, -->
- <!-- as viruses almost always spoof the sender's address -->
- <mailet match="All" class="Null" />
- </processor>
-
- <!-- This processor handles messages that are for local domains, where the user is unknown -->
- <processor state="local-address-error" enableJmx="true">
- <!-- To avoid bouncing/archiving spam, uncomment this matcher/mailet configuration -->
- <!--
- <mailet match="HasMailAttribute=isSpam" class="Null" onMatchException="noMatch"/>
- -->
-
- <!-- To notify the sender the address was invalid, uncomment this matcher/mailet configuration -->
- <!-- The original message is not attached to keep the bounce processor from deliverying spam -->
- <!--
- <mailet match="All" class="Bounce">
- <attachment>none</attachment>
- </mailet>
- -->
-
- <!-- To notify the postmaster that a message had an invalid address, uncomment this matcher/mailet configuration -->
- <!--
- <mailet match="All" class="NotifyPostmaster"/>
- -->
-
- <mailet match="All" class="ToRepository">
- <repositoryPath>file://var/mail/address-error/</repositoryPath>
- <!-- An alternative database repository example follows. -->
- <!--
- <repositoryPath>db://maildb/deadletter/address-error</repositoryPath>
- -->
- </mailet>
- </processor>
-
- <!-- This processor handles messages that are for foreign domains, where relaying is denied -->
- <!-- As of James v2.2, this processor can be deprecated by using the<authorizedAddresses>tag
- in the SMTP Server, and rejecting the message in the protocol transaction. -->
- <processor state="relay-denied" enableJmx="true">
- <!-- To notify the sender the address was invalid, uncomment this matcher/mailet configuration -->
- <!-- The original message is not attached to keep the bounce processor from deliverying spam -->
- <!--
- <mailet match="All" class="Bounce">
- <attachment>none</attachment>
- </mailet>
- -->
-
- <!-- To notify the postmaster that a relay request was denied, uncomment this matcher/mailet configuration -->
- <!--
- <mailet match="All" class="NotifyPostmaster"/>
- -->
-
- <mailet match="All" class="ToRepository">
- <repositoryPath>file://var/mail/relay-denied/</repositoryPath>
- <!-- An alternative database repository example follows. -->
- <!--
- <repositoryPath>db://maildb/deadletter/relay-denied</repositoryPath>
- -->
- </mailet>
- </processor>
-
- <!-- This processor handle the bounces from RemoteDelivery: As of James v2.3, this is the new -->
- <!-- Default. -->
- <!-- -->
- <!-- DSNBounce properly create a DSN compliant bounce -->
- <processor state="bounces" enableJmx="true">
- <mailet match="All" class="DSNBounce">
- <passThrough>false</passThrough>
-
- <!-- optional subject prefix prepended to the original message -->
- <!--
- <prefix>[bounce]</prefix>
- -->
-
- <!-- message, heads or none, default=message -->
- <!--
- <attachment>heads</attachment>
- -->
-
- <!-- the message sent in the bounce, the first occurrence of the pattern [machine] is -->
- <!-- replaced with the name of the executing machine -->
- <!-- Default: Hi. This is the James mail server at [machine] ... -->
- <!--
- <messageString>Here is [machine]. I'm not able to deliver this message.</messageString>
- -->
- </mailet>
- </processor>
-
- </processors>
-
-</mailetcontainer>
http://git-wip-us.apache.org/repos/asf/james-project/blob/ee131ea6/server/app/src/main/resources/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/mailetcontainer.xml b/server/app/src/main/resources/mailetcontainer.xml
new file mode 100644
index 0000000..abb8282
--- /dev/null
+++ b/server/app/src/main/resources/mailetcontainer.xml
@@ -0,0 +1,518 @@
+<?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 -->
+
+<!-- This block is responsible for processing messages on the spool. -->
+
+<mailetcontainer enableJmx="true">
+
+ <!-- MailAddress used for PostMaster -->
+ <context>
+ <postmaster>postmaster@localhost</postmaster>
+ </context>
+
+ <!-- Number of spool threads -->
+ <spooler>
+ <threads>20</threads>
+ </spooler>
+
+ <processors>
+
+ <!-- The root processor is a required processor - James routes all mail on the spool -->
+ <!-- through this processor first. -->
+ <!-- -->
+ <!-- This configuration is a sample configuration for the root processor. -->
+ <processor state="root" enableJmx="true">
+
+ <!-- This mailet redirects mail for the user 'postmaster' at any local domain to -->
+ <!-- the postmaster address specified for the server. The postmaster address -->
+ <!-- is required by rfc822. Do not remove this mailet unless you are meeting -->
+ <!-- this requirement through other means (e.g. a XML/JDBCRecipientRewriteTable defined in recipientrewritetable-store.xml) -->
+ <mailet match="All" class="PostmasterAlias"/>
+
+ <!-- Important check to avoid looping -->
+ <mailet match="RelayLimit=30" class="Null"/>
+
+ <!-- Check attachment extensions for possible viruses -->
+ <!-- The "-z" option requests the check to be non-recursively applied -->
+ <!-- to the contents of any attached '*.zip' file. -->
+ <!--
+ <mailet match="AttachmentFileNameIs=-d -z *.exe *.com *.bat *.cmd *.pif *.scr *.vbs *.avi *.mp3 *.mpeg *.shs" class="Bounce" onMatchException="error">
+ <inline>heads</inline>
+ <attachment>none</attachment>
+ <passThrough>false</passThrough>
+ <prefix>[REJECTED]</prefix>
+ <notice>
+The Security Policy of XXX does not allow to forward messages containing attachments having any of the extensions .exe, .com, .bat, .cmd, .pif, .scr, .vbs, .avi, .mp3, .mpeg, .shs, therefore your message has been rejected.
+
+Please don't reply to this e-mail as it has been automatically sent by the antivirus system.
+
+Regards, Postmaster XXX.YYY
+.....................................
+ </notice>
+ </mailet>
+ -->
+
+ <!-- sample SMIME mailets configuration -->
+ <!--
+ <mailet match="IsSMIMEEncrypted" class="SMIMEDecrypt">
+ <keyStoreType>pkcs12</keyStoreType>
+ <keyStoreFileName>c:/path.pfx</keyStoreFileName>
+ <keyStorePassword>myKeyStorePass</keyStorePassword>
+ <keyAlias>myKeyAlias</keyAlias>
+ <keyAliasPassword>myKeyPass</keyAliasPassword>
+ </mailet>
+
+ <mailet match="IsSMIMESigned" class="SMIMECheckSignature">
+ <keyStoreType>pkcs12</keyStoreType>
+ <keyStoreFileName>c:/path.pfx</keyStoreFileName>
+ <keyStorePassword>myKeyStorePass</keyStorePassword>
+ <strip>false</strip>
+ <onlyTrusted>true</onlyTrusted>
+ </mailet>
+ -->
+
+
+ <!-- Anti-spam processing -->
+ <!-- The following two entries avoid double anti-spam analysis -->
+ <!-- for forwarded messages. -->
+ <!-- Has spam checking already been done? -->
+ <mailet match="HasMailAttribute=spamChecked" class="ToProcessor">
+ <processor>transport</processor>
+ </mailet>
+ <!-- Spam checking will not be done twice -->
+ <mailet match="All" class="SetMailAttribute">
+ <spamChecked>true</spamChecked>
+ </mailet>
+
+ <!-- White List:
+ If you use block lists, you will probably want to check
+ for known permitted senders. This is particularly true
+ if you use more aggressive block lists, such as SPEWS,
+ that are prone to block entire subnets without regard
+ for non-spamming senders.
+ -->
+
+ <!-- Messages from authenticated senders never are spam -->
+ <mailet match="SMTPAuthSuccessful" class="ToProcessor">
+ <processor>transport</processor>
+ </mailet>
+
+ <!-- Messages signed by trusted users never are spam -->
+ <!-- Uncommenting the following entry, messages with valid signatures will never be considered spam. -->
+ <!-- This can be a valid policy *if* SMIMECheckSignature was invoked -->
+ <!-- with<onlyTrusted>true</onlyTrusted>set -->
+ <!--
+ <mailet match="HasMailAttribute=org.apache.james.SMIMECheckSignature" class="ToProcessor">
+ <processor>transport</processor>
+ </mailet>
+ -->
+
+ <!-- specific known senders -->
+ <!--
+ <mailet match="SenderIs=goodboy@goodhost"
+ class="ToProcessor">
+ <processor>transport</processor>
+ </mailet>
+ -->
+
+ <!-- End of White List -->
+
+ <!-- Sample matching to kill a message (send to Null) -->
+ <!--
+ <mailet match="RecipientIs=badboy@badhost" class="Null"/>
+ -->
+ <!--
+ <mailet match="CompareNumericHeaderValue=X-MessageIsSpamProbability >0.90" class="SetMailAttribute" onMatchException="noMatch">
+ <isSpam>true</isSpam>
+ </mailet>
+
+ <mailet match="CompareNumericHeaderValue=X-MessageIsSpamProbability >0.90" class="SetMimeHeader" onMatchException="noMatch">
+ <name>X-MessageIsSpam</name>
+ <value>true</value>
+ </mailet>
+
+ <mailet match="CompareNumericHeaderValue=X-MessageIsSpamProbability >0.99" class="ToProcessor" onMatchException="noMatch">
+ <processor>spam</processor>
+ <notice>Spam not accepted</notice>
+ </mailet>
+ -->
+
+ <!-- Send remaining mails to the transport processor for either local or remote delivery -->
+ <mailet match="All" class="ToProcessor">
+ <processor>transport</processor>
+ </mailet>
+
+ </processor>
+
+ <!-- The error processor is required. James may internally set emails to the -->
+ <!-- error state. The error processor is generally invoked when there is an -->
+ <!-- unexpected error either in the mailet chain or internal to James. -->
+ <!-- -->
+ <!-- By default configuration all email that generates an error in placed in -->
+ <!-- an error repository. -->
+ <processor state="error" enableJmx="true">
+ <!-- If you want to notify the sender their message generated an error, uncomment this -->
+ <!--
+ <mailet match="All" class="Bounce"/>
+ -->
+ <!-- If you want to notify the postmaster that a message generated an error, uncomment this -->
+ <!--
+ <mailet match="All" class="NotifyPostmaster"/>
+ -->
+
+ <!-- Logs any messages to the repository specified -->
+ <mailet match="All" class="ToRepository">
+ <repositoryPath>file://var/mail/error/</repositoryPath>
+ <!-- An alternative database repository example follows. -->
+ <!--
+ <repositoryPath>db://maildb/deadletter/error</repositoryPath>
+ -->
+ </mailet>
+ </processor>
+
+ <!-- Processor CONFIGURATION SAMPLE: transport is a sample custom processor for local or -->
+ <!-- remote delivery -->
+ <processor state="transport" enableJmx="true">
+
+ <!-- This is an example configuration including configuration for a list server. -->
+ <!-- CHECKME: before uncommenting this, edit the configuration file's contents -->
+ <!--
+ &listserverConfig;
+ -->
+
+ <mailet match="SMTPAuthSuccessful" class="SetMimeHeader">
+ <name>X-UserIsAuth</name>
+ <value>true</value>
+ </mailet>
+
+ <mailet match="HasMailAttribute=org.apache.james.SMIMECheckSignature" class="SetMimeHeader">
+ <name>X-WasSigned</name>
+ <value>true</value>
+ </mailet>
+
+ <!-- Add a server-side signature -->
+ <!--
+ <mailet match="All" class="SMIMESign" onMailetException="ignore">
+ <keyStoreType>jks</keyStoreType>
+ <keyStoreFileName>path.keystore</keyStoreFileName>
+ <keyStorePassword>myKeyStorePass</keyStorePassword>
+ <keyAlias>myKeyAlias</keyAlias>
+ <keyAliasPassword>myKeyPass</keyAliasPassword>
+ <signerName>XXX Trusted Server</signerName>
+ <rebuildFrom>true</rebuildFrom>
+ <postmasterSigns>true</postmasterSigns>
+ <debug>true</debug>
+ </mailet>
+ -->
+
+ <!-- Experimental quota Matcher -->
+ <!-- Check if over quota -->
+ <!--
+
+ <mailet match="IsOverQuota" class="ToProcessor">
+ <processor>over-quota</processor>
+ </mailet>
+ -->
+
+ <!-- The RecipientRewriteTable will use the definitions found in recipientrewritetablexml -->
+ <mailet match="All" class="RecipientRewriteTable" />
+
+ <!-- Place a copy in the user Sent folder -->
+ <mailet match="SenderIsLocal" class="ToSenderFolder">
+ <folder>Sent</folder>
+ <consume>false</consume>
+ </mailet>
+
+ <!-- Is the recipient is for a local account, deliver it locally -->
+ <mailet match="RecipientIsLocal" class="Sieve"/>
+ <mailet match="RecipientIsLocal" class="AddDeliveredToHeader"/>
+ <mailet match="RecipientIsLocal" class="LocalDelivery"/>
+
+ <!-- If the host is handled by this server and it did not get -->
+ <!-- locally delivered, this is an invalid recipient -->
+ <mailet match="HostIsLocal" class="ToProcessor">
+ <processor>local-address-error</processor>
+ <notice>550 - Requested action not taken: no such user here</notice>
+ </mailet>
+
+<!-- CHECKME! -->
+ <!-- This is an anti-relay matcher/mailet combination -->
+ <!-- -->
+ <!-- Emails sent from servers not in the network list are -->
+ <!-- rejected as spam. This is one method of preventing your -->
+ <!-- server from being used as an open relay. Make sure you understand -->
+ <!-- how to prevent your server from becoming an open relay before -->
+ <!-- changing this configuration. See also<authorizedAddresses>in SMTP Server -->
+ <!-- -->
+ <!-- This matcher/mailet combination must come after local delivery has -->
+ <!-- been performed. Otherwise local users will not be able to receive -->
+ <!-- email from senders not in this remote address list. -->
+ <!-- -->
+ <!-- If you are using this matcher/mailet you will probably want to -->
+ <!-- update the configuration to include your own network/addresses. The -->
+ <!-- matcher can be configured with a comma separated list of IP addresses -->
+ <!-- wildcarded IP subnets, and wildcarded hostname subnets. -->
+ <!-- e.g. "RemoteAddrNotInNetwork=127.0.0.1, abc.de.*, 192.168.0.*" -->
+ <!-- -->
+ <!-- If you are using SMTP authentication then you can (and generally -->
+ <!-- should) disable this matcher/mailet pair. -->
+ <mailet match="RemoteAddrNotInNetwork=127.0.0.1" class="ToProcessor">
+ <processor>relay-denied</processor>
+ <notice>550 - Requested action not taken: relaying denied</notice>
+ </mailet>
+
+ <!-- Attempt remote delivery using the specified repository for the spool, -->
+ <!-- using delay time to retry delivery and the maximum number of retries -->
+ <mailet match="All" class="RemoteDelivery">
+ <outgoingQueue>outgoing</outgoingQueue>
+
+ <!-- Delivery Schedule based upon RFC 2821, 4.5.4.1 -->
+ <!-- 5 day retry period, with 4 attempts in the first
+ hour, two more within the first 6 hours, and then
+ every 6 hours for the rest of the period.
+ This format is not yet supported, instead, use a unique
+ tag with the list of delays in milliseconds separated by commas.
+ <delayTime>5 minutes</delayTime>
+ <delayTime>10 minutes</delayTime>
+ <delayTime>45 minutes</delayTime>
+ <delayTime>2 hours</delayTime>
+ <delayTime>3 hours</delayTime>
+ <delayTime>6 hours</delayTime>
+ -->
+ <delayTime>5000, 100000, 500000</delayTime>
+ <maxRetries>25</maxRetries>
+
+ <!-- The max reties which will used if no A or MX record for the domain was found. -->
+ <!-- If 0 it will fail on first time -->
+ <maxDnsProblemRetries>0</maxDnsProblemRetries>
+
+ <!-- The number of threads that should be trying to deliver outgoing messages -->
+ <deliveryThreads>10</deliveryThreads>
+
+ <!-- If false the message will not be sent to given server if any recipients fail -->
+ <sendpartial>true</sendpartial>
+
+ <!-- By default we send bounces to the "bounce" processor -->
+ <!-- By removing this configuration James will fallback to hardcoded bounce -->
+ <!-- notifications -->
+ <bounceProcessor>bounces</bounceProcessor>
+
+ <!-- A single mail server to deliver all outgoing messages. -->
+ <!-- This is useful if this server is a backup or failover machine, -->
+ <!-- or if you want all messages to be routed through a particular mail server, -->
+ <!-- regardless of the email addresses specified in the message -->
+ <!-- -->
+ <!-- The gateway element specifies the gateway SMTP server name. -->
+ <!-- If your gateway mail server is listening on a port other than 25, -->
+ <!-- you can set James to connect to it on that port using the gatewayPort -->
+ <!-- element. -->
+ <!-- Although normally multiple addresses are implemented through proper -->
+ <!-- DNS configuration, the RemoteDelivery mail does allow specifying -->
+ <!-- multiple gateway elements, each of which may also have a port -->
+ <!-- e.g., mygateway:2525 -->
+ <!-- the gatewayPort element is used as a default -->
+ <!--
+ <gateway>otherserver.mydomain.com</gateway>
+ <gatewayPort>25</gatewayPort>
+ -->
+ <!-- If the gateway requires smtp authentication the following directives -->
+ <!-- (gatewayUsername/gatewayPassword) can be used. -->
+ <!--
+ <gatewayUsername>login</gatewayUsername>
+ <gatewayPassword>pass</gatewayPassword>
+ -->
+
+ <!-- Set the HELO/EHLO name to use when connectiong to remote SMTP-Server -->
+ <!--
+ <mail.smtp.localhost>myMailServer</mail.smtp.localhost>
+ -->
+ </mailet>
+
+ </processor>
+
+ <processor state="over-quota" enableJmx="true">
+ <mailet match="All" class="MetricsMailet">
+ <metricName>mailet-over-quota-error</metricName>
+ </mailet>
+ <mailet match="All" class="Bounce">
+ <message>The following recipients do not have enough space for storing the email you sent them.</message>
+ <attachment>none</attachment>
+ </mailet>
+ <mailet match="All" class="ToRepository">
+ <repositoryPath>file://var/mail/over-quota-error/</repositoryPath>
+ </mailet>
+ </processor>
+
+
+ <!-- Processor CONFIGURATION SAMPLE: spam is a sample custom processor for handling -->
+ <!-- spam. -->
+ <!-- You can either log these, bounce these, or just ignore them. -->
+ <processor state="spam" enableJmx="true">
+
+ <!-- To place the spam messages in the user junk folder, uncomment this matcher/mailet configuration -->
+ <!--
+ <mailet match="RecipientIsLocal" class="ToRecipientFolder">
+ <folder>Junk</folder>
+ <consume>false</consume>
+ </mailet>
+ -->
+
+ <!-- To destroy all messages, uncomment this matcher/mailet configuration -->
+ <!--
+ <mailet match="All" class="Null"/>
+ -->
+
+ <!-- To notify the sender their message was marked as spam, uncomment this matcher/mailet configuration -->
+ <!--
+ <mailet match="All" class="Bounce"/>
+ -->
+
+ <!-- To notify the postmaster that a message was marked as spam, uncomment this matcher/mailet configuration -->
+ <!--
+ <mailet match="All" class="NotifyPostmaster"/>
+ -->
+
+ <!-- To log the message to a repository, this matcher/mailet configuration should be uncommented. -->
+ <!-- This is the default configuration. -->
+ <mailet match="All" class="ToRepository">
+ <repositoryPath>file://var/mail/spam/</repositoryPath>
+
+ <!-- Changing the repositoryPath, as in this commented out example, will -->
+ <!-- cause the mails to be stored in a database repository. -->
+ <!-- Please note that only one repositoryPath element can be present for the mailet -->
+ <!-- configuration. -->
+ <!--
+ <repositoryPath>db://maildb/deadletter/spam</repositoryPath>
+ -->
+ </mailet>
+ </processor>
+
+ <!-- messages containing viruses. -->
+ <processor state="virus" enableJmx="true">
+
+ <!-- To avoid a loop while bouncing -->
+ <mailet match="All" class="SetMailAttribute">
+ <org.apache.james.infected>true, bouncing</org.apache.james.infected>
+ </mailet>
+
+ <!-- If the sender is authenticated, notify the infection -->
+ <mailet match="SMTPAuthSuccessful" class="Bounce">
+ <inline>heads</inline>
+ <attachment>none</attachment>
+ <notice>Warning: We were unable to deliver the message below because it was found infected by virus(es).</notice>
+ </mailet>
+
+ <!-- In any other situation ghost it, -->
+ <!-- as viruses almost always spoof the sender's address -->
+ <mailet match="All" class="Null" />
+ </processor>
+
+ <!-- This processor handles messages that are for local domains, where the user is unknown -->
+ <processor state="local-address-error" enableJmx="true">
+ <!-- To avoid bouncing/archiving spam, uncomment this matcher/mailet configuration -->
+ <!--
+ <mailet match="HasMailAttribute=isSpam" class="Null" onMatchException="noMatch"/>
+ -->
+
+ <!-- To notify the sender the address was invalid, uncomment this matcher/mailet configuration -->
+ <!-- The original message is not attached to keep the bounce processor from deliverying spam -->
+ <!--
+ <mailet match="All" class="Bounce">
+ <attachment>none</attachment>
+ </mailet>
+ -->
+
+ <!-- To notify the postmaster that a message had an invalid address, uncomment this matcher/mailet configuration -->
+ <!--
+ <mailet match="All" class="NotifyPostmaster"/>
+ -->
+
+ <mailet match="All" class="ToRepository">
+ <repositoryPath>file://var/mail/address-error/</repositoryPath>
+ <!-- An alternative database repository example follows. -->
+ <!--
+ <repositoryPath>db://maildb/deadletter/address-error</repositoryPath>
+ -->
+ </mailet>
+ </processor>
+
+ <!-- This processor handles messages that are for foreign domains, where relaying is denied -->
+ <!-- As of James v2.2, this processor can be deprecated by using the<authorizedAddresses>tag
+ in the SMTP Server, and rejecting the message in the protocol transaction. -->
+ <processor state="relay-denied" enableJmx="true">
+ <!-- To notify the sender the address was invalid, uncomment this matcher/mailet configuration -->
+ <!-- The original message is not attached to keep the bounce processor from deliverying spam -->
+ <!--
+ <mailet match="All" class="Bounce">
+ <attachment>none</attachment>
+ </mailet>
+ -->
+
+ <!-- To notify the postmaster that a relay request was denied, uncomment this matcher/mailet configuration -->
+ <!--
+ <mailet match="All" class="NotifyPostmaster"/>
+ -->
+
+ <mailet match="All" class="ToRepository">
+ <repositoryPath>file://var/mail/relay-denied/</repositoryPath>
+ <!-- An alternative database repository example follows. -->
+ <!--
+ <repositoryPath>db://maildb/deadletter/relay-denied</repositoryPath>
+ -->
+ </mailet>
+ </processor>
+
+ <!-- This processor handle the bounces from RemoteDelivery: As of James v2.3, this is the new -->
+ <!-- Default. -->
+ <!-- -->
+ <!-- DSNBounce properly create a DSN compliant bounce -->
+ <processor state="bounces" enableJmx="true">
+ <mailet match="All" class="DSNBounce">
+ <passThrough>false</passThrough>
+
+ <!-- optional subject prefix prepended to the original message -->
+ <!--
+ <prefix>[bounce]</prefix>
+ -->
+
+ <!-- message, heads or none, default=message -->
+ <!--
+ <attachment>heads</attachment>
+ -->
+
+ <!-- the message sent in the bounce, the first occurrence of the pattern [machine] is -->
+ <!-- replaced with the name of the executing machine -->
+ <!-- Default: Hi. This is the James mail server at [machine] ... -->
+ <!--
+ <messageString>Here is [machine]. I'm not able to deliver this message.</messageString>
+ -->
+ </mailet>
+ </processor>
+
+ </processors>
+
+</mailetcontainer>
http://git-wip-us.apache.org/repos/asf/james-project/blob/ee131ea6/server/app/src/main/resources/mailrepositorystore-template.xml
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/mailrepositorystore-template.xml b/server/app/src/main/resources/mailrepositorystore-template.xml
deleted file mode 100644
index 291fa24..0000000
--- a/server/app/src/main/resources/mailrepositorystore-template.xml
+++ /dev/null
@@ -1,96 +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 -->
-
-<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>
-
- <!-- JDBC based repositories. These repositories store all message data -->
- <!-- in the database. -->
- <mailrepository class="org.apache.james.mailrepository.jdbc.JDBCMailRepository">
- <protocols>
- <protocol>db</protocol>
- </protocols>
- <config>
- <sqlFile>file://conf/sqlResources.xml</sqlFile>
- <!-- Set the size threshold for in memory handling of storing operations -->
- <!-- Default is currently 409600000 due to a bug with mysql and binary stream -->
- <!-- currently under investigation. Please change this only if you know what -->
- <!-- you do. -->
- <!--
- <inMemorySizeLimit>4096</inMemorySizeLimit>
- -->
- </config>
- </mailrepository>
-
- <!-- These repositories store message delivery and headers in the DB, and the body to the filesystem -->
- <mailrepository class="org.apache.james.mailrepository.jdbc.JDBCMailRepository">
- <protocols>
- <protocol>dbfile</protocol>
- </protocols>
- <config>
- <sqlFile>file://conf/sqlResources.xml</sqlFile>
- <filestore>file://var/dbmail</filestore>
- </config>
- </mailrepository>
-
- <!-- The mbox repository is designed for MAIL only; SPOOL performance would be less than ideal-->
- <mailrepository class="org.apache.james.mailrepository.file.MBoxMailRepository">
- <protocols>
- <protocol>mbox</protocol>
- </protocols>
- <!-- Set if the messages should be listed sorted. False by default -->
- <config FIFO="false"/>
- </mailrepository>
-
- <!-- If you enable this you need to make sure that embedded Jackrabbit instance is started as well. Check the container configuration -->
- <!--
- <mailrepository class="org.apache.james.mailrepository.jcr.JCRMailRepository">
- <protocols>
- <protocol>jcr</protocol>
- </protocols>
- <config>
- <repository>//localhost/jackrabbit.repository</repository>
- <username>admin</username>
- <password>admin</password>
- <workspace>default</workspace>
- </config>
- </mailrepository>
- -->
- </mailrepositories>
-
-</mailrepositorystore>
http://git-wip-us.apache.org/repos/asf/james-project/blob/ee131ea6/server/app/src/main/resources/mailrepositorystore.xml
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/mailrepositorystore.xml b/server/app/src/main/resources/mailrepositorystore.xml
new file mode 100644
index 0000000..291fa24
--- /dev/null
+++ b/server/app/src/main/resources/mailrepositorystore.xml
@@ -0,0 +1,96 @@
+<?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 -->
+
+<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>
+
+ <!-- JDBC based repositories. These repositories store all message data -->
+ <!-- in the database. -->
+ <mailrepository class="org.apache.james.mailrepository.jdbc.JDBCMailRepository">
+ <protocols>
+ <protocol>db</protocol>
+ </protocols>
+ <config>
+ <sqlFile>file://conf/sqlResources.xml</sqlFile>
+ <!-- Set the size threshold for in memory handling of storing operations -->
+ <!-- Default is currently 409600000 due to a bug with mysql and binary stream -->
+ <!-- currently under investigation. Please change this only if you know what -->
+ <!-- you do. -->
+ <!--
+ <inMemorySizeLimit>4096</inMemorySizeLimit>
+ -->
+ </config>
+ </mailrepository>
+
+ <!-- These repositories store message delivery and headers in the DB, and the body to the filesystem -->
+ <mailrepository class="org.apache.james.mailrepository.jdbc.JDBCMailRepository">
+ <protocols>
+ <protocol>dbfile</protocol>
+ </protocols>
+ <config>
+ <sqlFile>file://conf/sqlResources.xml</sqlFile>
+ <filestore>file://var/dbmail</filestore>
+ </config>
+ </mailrepository>
+
+ <!-- The mbox repository is designed for MAIL only; SPOOL performance would be less than ideal-->
+ <mailrepository class="org.apache.james.mailrepository.file.MBoxMailRepository">
+ <protocols>
+ <protocol>mbox</protocol>
+ </protocols>
+ <!-- Set if the messages should be listed sorted. False by default -->
+ <config FIFO="false"/>
+ </mailrepository>
+
+ <!-- If you enable this you need to make sure that embedded Jackrabbit instance is started as well. Check the container configuration -->
+ <!--
+ <mailrepository class="org.apache.james.mailrepository.jcr.JCRMailRepository">
+ <protocols>
+ <protocol>jcr</protocol>
+ </protocols>
+ <config>
+ <repository>//localhost/jackrabbit.repository</repository>
+ <username>admin</username>
+ <password>admin</password>
+ <workspace>default</workspace>
+ </config>
+ </mailrepository>
+ -->
+ </mailrepositories>
+
+</mailrepositorystore>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[8/8] james-project git commit: Merge remote-tracking branch
'btellier/JAMES-2089'
Posted by ad...@apache.org.
Merge remote-tracking branch 'btellier/JAMES-2089'
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/9d8d71cd
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/9d8d71cd
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/9d8d71cd
Branch: refs/heads/master
Commit: 9d8d71cd0a35ba0fb4edba8d943030b4ac970560
Parents: 01c3bd1 8b9824c
Author: Antoine Duprat <ad...@linagora.com>
Authored: Wed Jul 5 08:52:44 2017 +0200
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Wed Jul 5 08:52:44 2017 +0200
----------------------------------------------------------------------
mpt/LICENSE.apache | 176 ----
mpt/RELEASE_NOTES.txt | 19 -
server/README.txt | 62 --
server/app/README | 8 -
server/app/README.txt | 31 -
.../src/main/resources/dnsservice-template.xml | 65 --
server/app/src/main/resources/dnsservice.xml | 65 ++
.../src/main/resources/domainlist-template.xml | 63 --
server/app/src/main/resources/domainlist.xml | 63 ++
.../app/src/main/resources/events-template.xml | 90 --
server/app/src/main/resources/events.xml | 90 ++
.../src/main/resources/fetchmail-template.xml | 288 ------
server/app/src/main/resources/fetchmail.xml | 288 ++++++
.../src/main/resources/hbase-site-template.xml | 33 -
.../src/main/resources/imapserver-template.xml | 77 --
server/app/src/main/resources/imapserver.xml | 77 ++
.../app/src/main/resources/indexer-template.xml | 33 -
server/app/src/main/resources/indexer.xml | 33 +
.../james-database-template.properties | 40 -
.../main/resources/james-database.properties | 40 +
.../main/resources/jcr-repository-template.xml | 72 --
.../app/src/main/resources/jcr-repository.xml | 72 ++
.../src/main/resources/jmx-template.properties | 28 -
server/app/src/main/resources/jmx.properties | 28 +
.../src/main/resources/lmtpserver-template.xml | 77 --
server/app/src/main/resources/lmtpserver.xml | 77 ++
.../main/resources/log4j-template.properties | 140 ---
.../src/main/resources/mailbox-jcr-template.cnd | 74 --
server/app/src/main/resources/mailbox-jcr.cnd | 74 ++
.../mailbox-maildir-template.properties | 25 -
.../main/resources/mailbox-maildir.properties | 25 +
.../app/src/main/resources/mailbox-template.xml | 34 -
server/app/src/main/resources/mailbox.xml | 34 +
.../main/resources/mailetcontainer-template.xml | 518 ----------
.../app/src/main/resources/mailetcontainer.xml | 518 ++++++++++
.../resources/mailrepositorystore-template.xml | 96 --
.../src/main/resources/mailrepositorystore.xml | 96 ++
.../resources/managesieveserver-template.xml | 95 --
.../src/main/resources/managesieveserver.xml | 95 ++
.../src/main/resources/pop3server-template.xml | 81 --
server/app/src/main/resources/pop3server.xml | 81 ++
.../app/src/main/resources/quota-template.xml | 132 ---
server/app/src/main/resources/quota.xml | 132 +++
.../recipientrewritetable-template.xml | 57 --
.../main/resources/recipientrewritetable.xml | 57 ++
.../main/resources/sieverepository-template.xml | 23 -
.../app/src/main/resources/sieverepository.xml | 23 +
.../src/main/resources/smtpserver-template.xml | 324 -------
server/app/src/main/resources/smtpserver.xml | 324 +++++++
.../main/resources/sqlResources-template.xml | 938 -------------------
.../main/resources/usersrepository-template.xml | 81 --
.../app/src/main/resources/usersrepository.xml | 81 ++
.../resources/usersrepository23-template.xml | 36 -
.../src/main/resources/usersrepository23.xml | 36 +
54 files changed, 2409 insertions(+), 3816 deletions(-)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[7/8] james-project git commit: JAMES-2088 Remove outdated release
notes
Posted by ad...@apache.org.
JAMES-2088 Remove outdated release notes
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/8b9824c9
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/8b9824c9
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/8b9824c9
Branch: refs/heads/master
Commit: 8b9824c97ab6445f8f51eb90ff5f3e0f927d7b15
Parents: a276ab8
Author: benwa <bt...@linagora.com>
Authored: Wed Jul 5 09:59:36 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 5 09:59:36 2017 +0700
----------------------------------------------------------------------
mpt/RELEASE_NOTES.txt | 19 --------------
server/README.txt | 62 ----------------------------------------------
2 files changed, 81 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/8b9824c9/mpt/RELEASE_NOTES.txt
----------------------------------------------------------------------
diff --git a/mpt/RELEASE_NOTES.txt b/mpt/RELEASE_NOTES.txt
deleted file mode 100644
index 00f4b95..0000000
--- a/mpt/RELEASE_NOTES.txt
+++ /dev/null
@@ -1,19 +0,0 @@
- Release Notes - Apache James MPT
-
- MPT is a scriptable functional test tool particularly suitable for the ASCII
- protocols beloved by mail standards.
-
-Comments, Questions and Issues
-------------------------------
- MPT is created by the Apache James Project. Please direct your comments and
- questions to the relevant James list http://james.apache.org/mail.html.
- To report issues, such as bugs, go to http://issues.apache.org/jira/browse/MPT.
-
-Licensing and legal issues
---------------------------
- See the LICENSE and NOTICE files.
-
-Version 0.1
------------
- This is the first independent release of MPT. The code base was previously used
- within Apache James IMAP.
http://git-wip-us.apache.org/repos/asf/james-project/blob/8b9824c9/server/README.txt
----------------------------------------------------------------------
diff --git a/server/README.txt b/server/README.txt
deleted file mode 100644
index c80a8a4..0000000
--- a/server/README.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-### http://james.apache.org/server/3/ ###
-
-Thank you for testing Apache James Server 3.0-beta4!
-
- * What's new in 3.0-beta3 for end users
- - Numerous IMAP bug fixes (better client support, memory improvement, NIO and IO support...)
- - Support for IMAP IDLE (RFC 2177, server transmit updates to the client in real time)
- - Support for IMAP User Flags
- - Support for IMAP WITHIN Extensions (RFC 5032)
- - Support for IMAP SEARCHRES
- - Support for IMAP AUTH=PLAIN
- - Support for IMAP ENABLE
- - Support for IMAP ESEARCH
- - Support for IMAP I18NLEVEL=1
- - Telnet Management has been removed in favor of JMX with client shell
- - More metrics counters available via JMX
- - JPA validated against more databases (among others Oracle)
- - Better debug logging on protocols
- - Multiple address and port configurations per protocol
- - POP3 is now operational (was buggy in 3.0-M2)
- - Mailbox Tooling to copy from a persistence to another persistence
- - Upgrade tool from James 2.3 is available
- - Better logging on protocols with adjustable level
- - Full mailet package must be specified
- - Composite Matchers
- - Mailing list functionality has been removed
- - More documentation on web site for configuration,...
- - Java 1.6 mandatory
- - ... and much more, see details on https://issues.apache.org/jira/secure/ReleaseNote.jspa?in&version=12316850&styleName=Html&projectId=10411
- * What's new in 3.0-beta3 for developers
- - Less maven modules
- - Maven 3.0.2 required to build
- - Upgrade to latest frameworks versions (netty, activemq, jackrabbit...)
- - Code reports generation via 'mvn site -P site-reports' maven profile
- - Corrections further to findbugs,... reports
- - Code formatting
- - ... and much more, see details on https://issues.apache.org/jira/secure/ReleaseNote.jspa?in&version=12316850&styleName=Html&projectId=10411
-
- * Quick Start http://james.apache.org/server/3/quick-start.html
-
- * Install http://james.apache.org/server/3/install.html
- * Configure http://james.apache.org/server/3/config.html
- * Manage http://james.apache.org/server/3/manage.html
- * Monitor http://james.apache.org/server/3/monitor.html
-
- * Upgrade from James 3.0-M2
- For JPA Mailbox, database table names have changes.
- You have to manually migrate the database...
- or use the mailbox-copier to backup to maildir, recreate database from scratch, and recopy from maildir
-
- * Develop http://james.apache.org/server/3/dev.html
-
- * Feedbacks and Questions
- Mailing lists http://james.apache.org/mail.html
- Twitter http://twitter.com/ApacheJames
-
- * Upgrade from James 2.3 http://james.apache.org/server/3/upgrade-2.3.html
-
- * Limitations
- Some issues are identified in some use cases with clients such as Outlook Express,...
- You are kindly invited to report any issue on https://issues.apache.org/jira/browse/JAMES
- or on our mailing list (http://james.apache.org/mail.html)
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[5/8] james-project git commit: JAMES-2088 Simplify app bundled
READMEs
Posted by ad...@apache.org.
JAMES-2088 Simplify app bundled READMEs
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/05fb1443
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/05fb1443
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/05fb1443
Branch: refs/heads/master
Commit: 05fb144391bc4b5bb197a3d34746cf1147efe79b
Parents: ee131ea
Author: benwa <bt...@linagora.com>
Authored: Wed Jul 5 09:58:07 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 5 09:58:07 2017 +0700
----------------------------------------------------------------------
server/app/README | 8 --------
server/app/README.txt | 31 -------------------------------
2 files changed, 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/05fb1443/server/app/README
----------------------------------------------------------------------
diff --git a/server/app/README b/server/app/README
deleted file mode 100644
index 35dec47..0000000
--- a/server/app/README
+++ /dev/null
@@ -1,8 +0,0 @@
-RUN FROM IDE
-============
-
-If you want to run James App (the main class, or a test) from your favorite IDE,
-the JPA classes will need to be enhanced by openjpa, so add the following option
-to the VM argument of your run configuration (replace MY_HOME_FOLDER with your real home folder):
-
-'-javaagent:MY_HOME_FOLDER/.m2/repository/org/apache/openjpa/openjpa/2.2.1/openjpa-2.2.1.jar'
http://git-wip-us.apache.org/repos/asf/james-project/blob/05fb1443/server/app/README.txt
----------------------------------------------------------------------
diff --git a/server/app/README.txt b/server/app/README.txt
deleted file mode 100644
index 50785fd..0000000
--- a/server/app/README.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-### http://james.apache.org/server/3/ ###
-
-Thank you for testing Apache James Server 3.0-beta4!
-
- * What's new in 3.0-beta4
- - see details on https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=10411&version=12316850
-
- * Quick Start http://james.apache.org/server/3/quick-start.html
-
- * Install http://james.apache.org/server/3/install.html
- * Configure http://james.apache.org/server/3/config.html
- * Manage http://james.apache.org/server/3/manage.html
- * Monitor http://james.apache.org/server/3/monitor.html
-
- * Upgrade from James 3.0-M2
- For JPA Mailbox, database table names have changes.
- You have to manually migrate the database...
- or use the mailbox-copier to backup to maildir, recreate database from scratch, and re-copy from maildir
-
- * Develop http://james.apache.org/server/3/dev.html
-
- * Feedbacks and Questions
- Mailing lists http://james.apache.org/mail.html
- Twitter http://twitter.com/ApacheJames
-
- * Upgrade from James 2.3 http://james.apache.org/server/3/upgrade-2.3.html
-
- * Limitations
- Some issues are identified in some use cases with clients such as Outlook Express,...
- You are kindly invited to report any issue on https://issues.apache.org/jira/browse/JAMES
- or on our mailing list (http://james.apache.org/mail.html)
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[2/8] james-project git commit: JAMES-2089 Make server/app
configuration work out of the box
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/james-project/blob/ee131ea6/server/app/src/main/resources/managesieveserver-template.xml
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/managesieveserver-template.xml b/server/app/src/main/resources/managesieveserver-template.xml
deleted file mode 100644
index ff2eee7..0000000
--- a/server/app/src/main/resources/managesieveserver-template.xml
+++ /dev/null
@@ -1,95 +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">
-
- <jmxName>managesieveserver</jmxName>
-
- <!-- Configure this to bind to a specific inetaddress -->
- <!-- Please NOTE: you should add this IP also to your RemoteAddrNotInNetwork -->
- <!-- in order to avoid relay check for locallly generated bounces -->
- <!--
- Port 4190 is the well-known/IANA registered port for ManageSieve.
- -->
- <bind>0.0.0.0:4190</bind>
-
- <connectionBacklog>200</connectionBacklog>
-
- <!-- Set to true to support STARTTLS or TLS for the Socket.
- To use this you need to copy sunjce_provider.jar to /path/james/lib directory.
- -->
- <tls socketTLS="false" startTLS="false">
- <!-- To create a new keystore execute:
- keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
- -->
- <keystore>file://conf/keystore</keystore>
- <secret>yoursecret</secret>
- <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
- <!-- The algorithm is optional and only needs to be specified when using something other
- than the Sun JCE provider - You could use IbmX509 with IBM Java runtime. -->
- <algorithm>SunX509</algorithm>
- </tls>
-
- <!-- connection timeout in secconds -->
- <connectiontimeout>360</connectiontimeout>
-
- <!-- Set the maximum simultaneous incoming connections for this service -->
- <connectionLimit>0</connectionLimit>
-
- <!-- Set the maximum simultaneous incoming connections per IP for this service -->
- <connectionLimitPerIP>0</connectionLimitPerIP>
-
- <!-- Uncomment this if you want to verify sender addresses, ensuring that -->
- <!-- the sender address matches the user who has authenticated. -->
- <!-- This prevents a user of your mail server from acting as someone else -->
- <!-- If unspecified, default value is true -->
- <!--
- <verifyIdentity>true</verifyIdentity>
- -->
-
- <!-- This sets the maximum allowed message size (in kilobytes) for this -->
- <!-- ManageSieve service. If unspecified, the value defaults to 0, which means no limit. -->
- <maxmessagesize>0</maxmessagesize>
-
- <!-- This sets wether to enforce the use of HELO/EHLO salutation before a -->
- <!-- MAIL command is accepted. If unspecified, the value defaults to true -->
- <!--
- <heloEhloEnforcement>true</heloEhloEnforcement>
- -->
-
- <!-- WARNING: This is Non-RFC compliant (default value: true) -->
- <!-- See: http://wiki.apache.org/james/StandardsComplianceStatement -->
- <!-- TODO: CHANGE TO OFFICIAL URL LATER -->
- <addressBracketsEnforcement>true</addressBracketsEnforcement>
-
- </managesieveserver>
-
-</managesieveservers>
-
-
http://git-wip-us.apache.org/repos/asf/james-project/blob/ee131ea6/server/app/src/main/resources/managesieveserver.xml
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/managesieveserver.xml b/server/app/src/main/resources/managesieveserver.xml
new file mode 100644
index 0000000..ff2eee7
--- /dev/null
+++ b/server/app/src/main/resources/managesieveserver.xml
@@ -0,0 +1,95 @@
+<?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">
+
+ <jmxName>managesieveserver</jmxName>
+
+ <!-- Configure this to bind to a specific inetaddress -->
+ <!-- Please NOTE: you should add this IP also to your RemoteAddrNotInNetwork -->
+ <!-- in order to avoid relay check for locallly generated bounces -->
+ <!--
+ Port 4190 is the well-known/IANA registered port for ManageSieve.
+ -->
+ <bind>0.0.0.0:4190</bind>
+
+ <connectionBacklog>200</connectionBacklog>
+
+ <!-- Set to true to support STARTTLS or TLS for the Socket.
+ To use this you need to copy sunjce_provider.jar to /path/james/lib directory.
+ -->
+ <tls socketTLS="false" startTLS="false">
+ <!-- To create a new keystore execute:
+ keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
+ -->
+ <keystore>file://conf/keystore</keystore>
+ <secret>yoursecret</secret>
+ <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
+ <!-- The algorithm is optional and only needs to be specified when using something other
+ than the Sun JCE provider - You could use IbmX509 with IBM Java runtime. -->
+ <algorithm>SunX509</algorithm>
+ </tls>
+
+ <!-- connection timeout in secconds -->
+ <connectiontimeout>360</connectiontimeout>
+
+ <!-- Set the maximum simultaneous incoming connections for this service -->
+ <connectionLimit>0</connectionLimit>
+
+ <!-- Set the maximum simultaneous incoming connections per IP for this service -->
+ <connectionLimitPerIP>0</connectionLimitPerIP>
+
+ <!-- Uncomment this if you want to verify sender addresses, ensuring that -->
+ <!-- the sender address matches the user who has authenticated. -->
+ <!-- This prevents a user of your mail server from acting as someone else -->
+ <!-- If unspecified, default value is true -->
+ <!--
+ <verifyIdentity>true</verifyIdentity>
+ -->
+
+ <!-- This sets the maximum allowed message size (in kilobytes) for this -->
+ <!-- ManageSieve service. If unspecified, the value defaults to 0, which means no limit. -->
+ <maxmessagesize>0</maxmessagesize>
+
+ <!-- This sets wether to enforce the use of HELO/EHLO salutation before a -->
+ <!-- MAIL command is accepted. If unspecified, the value defaults to true -->
+ <!--
+ <heloEhloEnforcement>true</heloEhloEnforcement>
+ -->
+
+ <!-- WARNING: This is Non-RFC compliant (default value: true) -->
+ <!-- See: http://wiki.apache.org/james/StandardsComplianceStatement -->
+ <!-- TODO: CHANGE TO OFFICIAL URL LATER -->
+ <addressBracketsEnforcement>true</addressBracketsEnforcement>
+
+ </managesieveserver>
+
+</managesieveservers>
+
+
http://git-wip-us.apache.org/repos/asf/james-project/blob/ee131ea6/server/app/src/main/resources/pop3server-template.xml
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/pop3server-template.xml b/server/app/src/main/resources/pop3server-template.xml
deleted file mode 100644
index 83d1558..0000000
--- a/server/app/src/main/resources/pop3server-template.xml
+++ /dev/null
@@ -1,81 +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 -->
-
-<pop3servers>
-
- <!-- The POP3 server is enabled by default -->
- <!-- Disabling blocks will stop them from listening, -->
- <!-- but does not free as many resources as removing them would -->
- <pop3server enabled="true">
-
- <jmxName>pop3server</jmxName>
-
- <!-- Configure this to bind to a specific inetaddress -->
- <!-- port 995 is the well-known/IANA registered port for POP3S ie over SSL/TLS -->
- <!-- port 110 is the well-known/IANA registered port for Standard POP3 -->
- <bind>0.0.0.0:110</bind>
-
- <connectionBacklog>200</connectionBacklog>
-
- <!-- Set to true to support STARTTLS or SSL for the Socket.
- To use this you need to copy sunjce_provider.jar to /path/james/lib directory.
- -->
- <tls socketTLS="false" startTLS="false">
- <!-- To create a new keystore execute:
- keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
- -->
- <keystore>file://conf/keystore</keystore>
- <secret>yoursecret</secret>
- <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
- </tls>
-
- <!-- This is the name used by the server to identify itself in the POP3 -->
- <!-- protocol. If autodetect is TRUE, the server will discover its -->
- <!-- own host name and use that in the protocol. If discovery fails, -->
- <!-- the value of 'localhost' is used. If autodetect is FALSE, James -->
- <!-- will use the specified value. -->
- <!--
- <helloName autodetect="true">myMailServer</helloName>
- -->
- <!-- connection timeout in secconds -->
- <connectiontimeout>1200</connectiontimeout>
-
- <!-- Set the maximum simultaneous incoming connections for this service -->
- <connectionLimit>0</connectionLimit>
-
- <!-- Set the maximum simultaneous incoming connections per IP for this service -->
- <connectionLimitPerIP>0</connectionLimitPerIP>
-
- <handlerchain>
- <!-- This loads the core CommandHandlers. Only remove this if you really -->
- <!-- know what you are doing -->
- <handler class="org.apache.james.pop3server.core.CoreCmdHandlerLoader"/>
- </handlerchain>
-
- </pop3server>
-
-</pop3servers>
http://git-wip-us.apache.org/repos/asf/james-project/blob/ee131ea6/server/app/src/main/resources/pop3server.xml
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/pop3server.xml b/server/app/src/main/resources/pop3server.xml
new file mode 100644
index 0000000..83d1558
--- /dev/null
+++ b/server/app/src/main/resources/pop3server.xml
@@ -0,0 +1,81 @@
+<?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 -->
+
+<pop3servers>
+
+ <!-- The POP3 server is enabled by default -->
+ <!-- Disabling blocks will stop them from listening, -->
+ <!-- but does not free as many resources as removing them would -->
+ <pop3server enabled="true">
+
+ <jmxName>pop3server</jmxName>
+
+ <!-- Configure this to bind to a specific inetaddress -->
+ <!-- port 995 is the well-known/IANA registered port for POP3S ie over SSL/TLS -->
+ <!-- port 110 is the well-known/IANA registered port for Standard POP3 -->
+ <bind>0.0.0.0:110</bind>
+
+ <connectionBacklog>200</connectionBacklog>
+
+ <!-- Set to true to support STARTTLS or SSL for the Socket.
+ To use this you need to copy sunjce_provider.jar to /path/james/lib directory.
+ -->
+ <tls socketTLS="false" startTLS="false">
+ <!-- To create a new keystore execute:
+ keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
+ -->
+ <keystore>file://conf/keystore</keystore>
+ <secret>yoursecret</secret>
+ <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
+ </tls>
+
+ <!-- This is the name used by the server to identify itself in the POP3 -->
+ <!-- protocol. If autodetect is TRUE, the server will discover its -->
+ <!-- own host name and use that in the protocol. If discovery fails, -->
+ <!-- the value of 'localhost' is used. If autodetect is FALSE, James -->
+ <!-- will use the specified value. -->
+ <!--
+ <helloName autodetect="true">myMailServer</helloName>
+ -->
+ <!-- connection timeout in secconds -->
+ <connectiontimeout>1200</connectiontimeout>
+
+ <!-- Set the maximum simultaneous incoming connections for this service -->
+ <connectionLimit>0</connectionLimit>
+
+ <!-- Set the maximum simultaneous incoming connections per IP for this service -->
+ <connectionLimitPerIP>0</connectionLimitPerIP>
+
+ <handlerchain>
+ <!-- This loads the core CommandHandlers. Only remove this if you really -->
+ <!-- know what you are doing -->
+ <handler class="org.apache.james.pop3server.core.CoreCmdHandlerLoader"/>
+ </handlerchain>
+
+ </pop3server>
+
+</pop3servers>
http://git-wip-us.apache.org/repos/asf/james-project/blob/ee131ea6/server/app/src/main/resources/quota-template.xml
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/quota-template.xml b/server/app/src/main/resources/quota-template.xml
deleted file mode 100644
index 9c8c63e..0000000
--- a/server/app/src/main/resources/quota-template.xml
+++ /dev/null
@@ -1,132 +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 -->
-
-<!--
- This configuration file allows you to customize the way quota are handled on this server.
- You need to rename it in quota.xml so that it gets interpreted by James on startup.
-
- The different configuration options are detailed here.
-
- Read RFC-2087 for full details.
--->
-
-<quota>
- <!--
- Quota implementation is based on several components:
- - QuotaRootResolver: In regard of quota management, mailboxes forms abstract groups called QUOTA ROOT. This
- component finds to which QUOTA ROOT a mailbox belongs
- - Current quota manager: Counters for current values: how many messages belongs to this quota root ? Which
- size ?
- - Max Quota manager: Sets a maximum value QUOTA ROOT resources can not exceed.
- - QuotaManager: assemble Current quota manager and Max quota manager.
- - Listening quota updater: Event system based quota update. On each APPED / COPY /EXPUNGE command, current
- quotas gets updated.
- -->
-
- <quotaRootResolver>
- <!--
- Possible value:
- - default
- -->
- <provider>default</provider>
- </quotaRootResolver>
- <currentQuotaManager>
- <!--
- Possible value for provider:
- - none: when you use fake as a value for quotaManager's provider
- - inmemory
- - cassandra
- - jpa
-
- The inmemory implementation:
- - Does not work in a distributed context
- Note that quota need to be (lazy) re-calculated after each starts
-
- Cassandra implementation.
- Non existing quota are considered as null. No cache. It needs to be always enabled, or you might get some
- quota synchronisation issues.
- -->
- <provider>none</provider>
- </currentQuotaManager>
- <maxQuotaManager>
- <!--
- This component is exposed to the CLI for quota administration tasks.
-
- Possible value are:
- - fake: will always return UNLIMITED. Throws on modifications.
- - fixed: all QUOTA ROOT get the same upper bound for their quotas.
- - inmemory: allows you to define QUOTA ROOT specific limits, backed with a fixed policy. It does not
- work in a distributed context.
- - cassandra: Same thing than inmemory but backed on cassandra. Works on a distributed context. Note that using
- the default* configuration options and the CLI to set default options is dangerous as server startup might override
- CLI values.
- - jpa: Same thing than inmemory but backed on jpa. Works on a distributed context. Note that using
- the default* configuration options and the CLI to set default options is dangerous as server startup might override
- CLI values.
- -->
- <provider>fake</provider>
- <!--
- Configuration option for setting max policies for MaxQuotaManager ( message count and byte )
- -->
- <!--
- <defaultMaxMessage>100000</defaultMaxMessage>
- <defaultMaxStorage>5368709120</defaultMaxStorage>
- -->
- <!--
- Configuration option for setting max values per quota root ( message count and byte )
- -->
- <!--
- <maxMessage>
- <quotaRoot>#private&btellier@apache.org</quotaRoot>
- <value>200000</value>
- </maxMessage>
- <maxStorage>
- <quotaRoot>#private&btellier@apache.org</quotaRoot>
- <value>10737418240</value>
- </maxStorage>
- -->
- </maxQuotaManager>
- <quotaManager>
- <!--
- The QuotaManager you use.
-
- Possible values are:
- - fake: returns only UNKNOWN/UNLIMITED quotas
- - store: returns quotas using a CurrentQuotaManager and a MaxQuotaManager
- -->
- <provider>fake</provider>
- </quotaManager>
- <updates>
- <!--
- This defines the way your quotas gets updated.
- Possible values are:
- - fake
- - event
- -->
- <provider>fake</provider>
- </updates>
-</quota>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/james-project/blob/ee131ea6/server/app/src/main/resources/quota.xml
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/quota.xml b/server/app/src/main/resources/quota.xml
new file mode 100644
index 0000000..9c8c63e
--- /dev/null
+++ b/server/app/src/main/resources/quota.xml
@@ -0,0 +1,132 @@
+<?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 -->
+
+<!--
+ This configuration file allows you to customize the way quota are handled on this server.
+ You need to rename it in quota.xml so that it gets interpreted by James on startup.
+
+ The different configuration options are detailed here.
+
+ Read RFC-2087 for full details.
+-->
+
+<quota>
+ <!--
+ Quota implementation is based on several components:
+ - QuotaRootResolver: In regard of quota management, mailboxes forms abstract groups called QUOTA ROOT. This
+ component finds to which QUOTA ROOT a mailbox belongs
+ - Current quota manager: Counters for current values: how many messages belongs to this quota root ? Which
+ size ?
+ - Max Quota manager: Sets a maximum value QUOTA ROOT resources can not exceed.
+ - QuotaManager: assemble Current quota manager and Max quota manager.
+ - Listening quota updater: Event system based quota update. On each APPED / COPY /EXPUNGE command, current
+ quotas gets updated.
+ -->
+
+ <quotaRootResolver>
+ <!--
+ Possible value:
+ - default
+ -->
+ <provider>default</provider>
+ </quotaRootResolver>
+ <currentQuotaManager>
+ <!--
+ Possible value for provider:
+ - none: when you use fake as a value for quotaManager's provider
+ - inmemory
+ - cassandra
+ - jpa
+
+ The inmemory implementation:
+ - Does not work in a distributed context
+ Note that quota need to be (lazy) re-calculated after each starts
+
+ Cassandra implementation.
+ Non existing quota are considered as null. No cache. It needs to be always enabled, or you might get some
+ quota synchronisation issues.
+ -->
+ <provider>none</provider>
+ </currentQuotaManager>
+ <maxQuotaManager>
+ <!--
+ This component is exposed to the CLI for quota administration tasks.
+
+ Possible value are:
+ - fake: will always return UNLIMITED. Throws on modifications.
+ - fixed: all QUOTA ROOT get the same upper bound for their quotas.
+ - inmemory: allows you to define QUOTA ROOT specific limits, backed with a fixed policy. It does not
+ work in a distributed context.
+ - cassandra: Same thing than inmemory but backed on cassandra. Works on a distributed context. Note that using
+ the default* configuration options and the CLI to set default options is dangerous as server startup might override
+ CLI values.
+ - jpa: Same thing than inmemory but backed on jpa. Works on a distributed context. Note that using
+ the default* configuration options and the CLI to set default options is dangerous as server startup might override
+ CLI values.
+ -->
+ <provider>fake</provider>
+ <!--
+ Configuration option for setting max policies for MaxQuotaManager ( message count and byte )
+ -->
+ <!--
+ <defaultMaxMessage>100000</defaultMaxMessage>
+ <defaultMaxStorage>5368709120</defaultMaxStorage>
+ -->
+ <!--
+ Configuration option for setting max values per quota root ( message count and byte )
+ -->
+ <!--
+ <maxMessage>
+ <quotaRoot>#private&btellier@apache.org</quotaRoot>
+ <value>200000</value>
+ </maxMessage>
+ <maxStorage>
+ <quotaRoot>#private&btellier@apache.org</quotaRoot>
+ <value>10737418240</value>
+ </maxStorage>
+ -->
+ </maxQuotaManager>
+ <quotaManager>
+ <!--
+ The QuotaManager you use.
+
+ Possible values are:
+ - fake: returns only UNKNOWN/UNLIMITED quotas
+ - store: returns quotas using a CurrentQuotaManager and a MaxQuotaManager
+ -->
+ <provider>fake</provider>
+ </quotaManager>
+ <updates>
+ <!--
+ This defines the way your quotas gets updated.
+ Possible values are:
+ - fake
+ - event
+ -->
+ <provider>fake</provider>
+ </updates>
+</quota>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/james-project/blob/ee131ea6/server/app/src/main/resources/recipientrewritetable-template.xml
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/recipientrewritetable-template.xml b/server/app/src/main/resources/recipientrewritetable-template.xml
deleted file mode 100644
index b5399be..0000000
--- a/server/app/src/main/resources/recipientrewritetable-template.xml
+++ /dev/null
@@ -1,57 +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 -->
-
-<!-- If set recursiveMapping false only the first mapping will get processed. -->
-<!-- Default true. -->
-<!-- By setting the mappingLimit you can specify how much mapping will get processed -->
-<!-- before a bounce will send. This avoid infinity loops. Default 10. -->
-<!--
-<recipientrewritetable class="org.apache.james.rrt.xml.XMLRecipientRewriteTable">
- <recursiveMapping>true</recursiveMapping>
- <mappingLimit>10</mappingLimit>
-
- <mapping>some@domain=someuser</mapping>
-</recipientrewritetable>
--->
-
-<!-- Database backed RecipientRewritetable -->
-<!-- -->
-<!-- Use these configurations to store the RecipientRewriteTable in a database. -->
-<!--
-<recipientrewritetable class="org.apache.james.rrt.jdbc.JDBCRecipientRewriteTable" destinationURL="db://maildb/RecipientRewriteTable">
- <recursiveMapping>true</recursiveMapping>
- <mappingLimit>10</mappingLimit>
- <sqlFile>file://conf/sqlResources.xml</sqlFile>
-</recipientrewritetable>
--->
-
-<!-- The default table for storing James' RecipientRewriteTable mappings. -->
-<recipientrewritetable class="org.apache.james.rrt.jpa.JPARecipientRewriteTable">
- <recursiveMapping>true</recursiveMapping>
- <mappingLimit>10</mappingLimit>
-</recipientrewritetable>
-
http://git-wip-us.apache.org/repos/asf/james-project/blob/ee131ea6/server/app/src/main/resources/recipientrewritetable.xml
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/recipientrewritetable.xml b/server/app/src/main/resources/recipientrewritetable.xml
new file mode 100644
index 0000000..b5399be
--- /dev/null
+++ b/server/app/src/main/resources/recipientrewritetable.xml
@@ -0,0 +1,57 @@
+<?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 -->
+
+<!-- If set recursiveMapping false only the first mapping will get processed. -->
+<!-- Default true. -->
+<!-- By setting the mappingLimit you can specify how much mapping will get processed -->
+<!-- before a bounce will send. This avoid infinity loops. Default 10. -->
+<!--
+<recipientrewritetable class="org.apache.james.rrt.xml.XMLRecipientRewriteTable">
+ <recursiveMapping>true</recursiveMapping>
+ <mappingLimit>10</mappingLimit>
+
+ <mapping>some@domain=someuser</mapping>
+</recipientrewritetable>
+-->
+
+<!-- Database backed RecipientRewritetable -->
+<!-- -->
+<!-- Use these configurations to store the RecipientRewriteTable in a database. -->
+<!--
+<recipientrewritetable class="org.apache.james.rrt.jdbc.JDBCRecipientRewriteTable" destinationURL="db://maildb/RecipientRewriteTable">
+ <recursiveMapping>true</recursiveMapping>
+ <mappingLimit>10</mappingLimit>
+ <sqlFile>file://conf/sqlResources.xml</sqlFile>
+</recipientrewritetable>
+-->
+
+<!-- The default table for storing James' RecipientRewriteTable mappings. -->
+<recipientrewritetable class="org.apache.james.rrt.jpa.JPARecipientRewriteTable">
+ <recursiveMapping>true</recursiveMapping>
+ <mappingLimit>10</mappingLimit>
+</recipientrewritetable>
+
http://git-wip-us.apache.org/repos/asf/james-project/blob/ee131ea6/server/app/src/main/resources/sieverepository-template.xml
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/sieverepository-template.xml b/server/app/src/main/resources/sieverepository-template.xml
deleted file mode 100644
index 58b0537..0000000
--- a/server/app/src/main/resources/sieverepository-template.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.
- -->
-
-<!-- See http://james.apache.org/server/3/config.html for usage -->
-<sieverepository class="org.apache.james.sieverepository.file.SieveFileRepository">
-</sieverepository>
http://git-wip-us.apache.org/repos/asf/james-project/blob/ee131ea6/server/app/src/main/resources/sieverepository.xml
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/sieverepository.xml b/server/app/src/main/resources/sieverepository.xml
new file mode 100644
index 0000000..58b0537
--- /dev/null
+++ b/server/app/src/main/resources/sieverepository.xml
@@ -0,0 +1,23 @@
+<?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.
+ -->
+
+<!-- See http://james.apache.org/server/3/config.html for usage -->
+<sieverepository class="org.apache.james.sieverepository.file.SieveFileRepository">
+</sieverepository>
http://git-wip-us.apache.org/repos/asf/james-project/blob/ee131ea6/server/app/src/main/resources/smtpserver-template.xml
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/smtpserver-template.xml b/server/app/src/main/resources/smtpserver-template.xml
deleted file mode 100644
index e01ec51..0000000
--- a/server/app/src/main/resources/smtpserver-template.xml
+++ /dev/null
@@ -1,324 +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 -->
-
-<smtpservers>
-
- <!-- The SMTP server is enabled by default -->
- <!-- Disabling blocks will stop them from listening, -->
- <!-- but does not free as many resources as removing them would -->
- <smtpserver enabled="true">
-
- <jmxName>smtpserver</jmxName>
-
- <!-- Configure this to bind to a specific inetaddress -->
- <!-- Please NOTE: you should add this IP also to your RemoteAddrNotInNetwork -->
- <!-- in order to avoid relay check for locallly generated bounces -->
- <!--
- Port 25 is the well-known/IANA registered port for SMTP.
- Port 465 is the well-known/IANA registered port for SMTP over TLS.
- -->
- <bind>0.0.0.0:25</bind>
-
- <connectionBacklog>200</connectionBacklog>
-
- <!-- Set to true to support STARTTLS or TLS for the Socket.
- To use this you need to copy sunjce_provider.jar to /path/james/lib directory.
- -->
- <tls socketTLS="false" startTLS="false">
- <!-- To create a new keystore execute:
- keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
- -->
- <keystore>file://conf/keystore</keystore>
- <secret>yoursecret</secret>
- <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
- <!-- The algorithm is optional and only needs to be specified when using something other
- than the Sun JCE provider - You could use IbmX509 with IBM Java runtime. -->
- <algorithm>SunX509</algorithm>
- </tls>
-
- <!-- This is the name used by the server to identify itself in the SMTP -->
- <!-- protocol. If autodetect is TRUE, the server will discover its -->
- <!-- own host name and use that in the protocol. If discovery fails, -->
- <!-- the value of 'localhost' is used. If autodetect is FALSE, James -->
- <!-- will use the specified value. -->
- <!--
- <helloName autodetect="true">myMailServer</helloName>
- -->
-
- <!-- connection timeout in secconds -->
- <connectiontimeout>360</connectiontimeout>
-
- <!-- Set the maximum simultaneous incoming connections for this service -->
- <connectionLimit>0</connectionLimit>
-
- <!-- Set the maximum simultaneous incoming connections per IP for this service -->
- <connectionLimitPerIP>0</connectionLimitPerIP>
-
- <!-- Uncomment this if you want to require SMTP authentication.
-
- supported values:
- true: required but announced only to not authorizedAddresses
- false: don't use AUTH
- announce: like true, but always announce AUTH capability to clients
-
- The correct behaviour per RFC value would be false or announce
- but we still support true for backward compatibility and because
- some webmail client fails when AUTH is announced but no authentication
- information has been provided
- -->
- <!--
- <authRequired>true</authRequired>
- -->
-
-<!-- CHECKME! -->
- <!-- Uncomment this if you want to authorize specific addresses/networks.
- If you use SMTP AUTH, addresses that match those specified here will
- be permitted to relay without SMTP AUTH. If you do not use SMTP
- AUTH, and you specify addreses here, then only addresses that match
- those specified will be permitted to relay.
-
- Addresses may be specified as a an IP address or domain name, with an
- optional netmask, e.g.,
-
- 127.*, 127.0.0.0/8, 127.0.0.0/255.0.0.0, and localhost/8 are all the same
-
- See also the RemoteAddrNotInNetwork matcher in the transport processor.
- You would generally use one OR the other approach.
- -->
- <authorizedAddresses>127.0.0.0/8</authorizedAddresses>
-
- <!-- Uncomment this if you want to verify sender addresses, ensuring that -->
- <!-- the sender address matches the user who has authenticated. -->
- <!-- This prevents a user of your mail server from acting as someone else -->
- <!-- If unspecified, default value is true -->
- <!--
- <verifyIdentity>true</verifyIdentity>
- -->
-
- <!-- This sets the maximum allowed message size (in kilobytes) for this -->
- <!-- SMTP service. If unspecified, the value defaults to 0, which means no limit. -->
- <maxmessagesize>0</maxmessagesize>
-
- <!-- This sets wether to enforce the use of HELO/EHLO salutation before a -->
- <!-- MAIL command is accepted. If unspecified, the value defaults to true -->
- <!--
- <heloEhloEnforcement>true</heloEhloEnforcement>
- -->
-
- <!-- WARNING: This is Non-RFC compliant (default value: true) -->
- <!-- See: http://wiki.apache.org/james/StandardsComplianceStatement -->
- <!-- TODO: CHANGE TO OFFICIAL URL LATER -->
- <addressBracketsEnforcement>true</addressBracketsEnforcement>
-
- <!-- This sets the SMTPGreeting which will be used when connect to the smtpserver -->
- <!-- If none is specified a default is generated -->
- <!--
- <smtpGreeting>JAMES SMTP Server</smtpGreeting>
- -->
-
- <!-- The configuration handler chain -->
- <handlerchain>
-
- <!-- This connect handler can be used to enable POP3 before SMTP support -->
- <!-- Plz note that only the ip get stored to indentify an authenticated client -->
- <!-- The expireTime is the time after which an ipAddress is handled as expired -->
- <!--
- <handler class="org.apache.james.smtpserver.POP3BeforeSMTPHandler">
- <expireTime>1 hour</expireTime>
- </handler>
- -->
-
- <!-- This command handler check against RBL-Lists -->
- <!-- If getDetail is set to true it try to retrieve information from TXT Record -->
- <!-- why the ip was blocked. Default to false -->
- <!-- STOP - before you uncomment out the DNS RBL handler,
- please take a moment to review each block list. We
- have included some that various JAMES committers use,
- but you must decide which, if any, are appropriate
- for your environment. The mail servers hosting
- @apache.org mailing lists, for example, use a
- slightly different list than we have included below.
- And it is likely that most JAMES committes also have
- slightly different sets of lists. The SpamAssassin
- user's list would be one good place to discuss the
- measured quality of various block lists.
-
- NOTA BENE: the domain names, below, are terminated
- with '.' to ensure that they are absolute names in
- DNS lookups. Under some circumstances, names that
- are not explicitly absolute could be treated as
- relative names, leading to incorrect results. This
- has been observed on *nix and MS-Windows platforms
- by users of multiple mail servers, and is not JAMES
- specific. If you are unsure what this means for you,
- please speak with your local system/network admins.
- -->
- <!--
- <handler class="org.apache.james.smtpserver.fastfail.DNSRBLHandler">
- <getDetail>false</getDetail>
- <rblservers>
- <whitelist>query.bondedsender.org.</whitelist>
- <blacklist>sbl-xbl.spamhaus.org.</blacklist>
- <blacklist>dul.dnsbl.sorbs.net.</blacklist>
- <blacklist>list.dsbl.org.</blacklist>
- </rblservers>
- </handler>
- -->
-
- <!-- This command handler can be used to reject emails with not match the SPF record of the sender domain -->
- <!-- If checkAuthNetworks is set to true sender domain will be checked also for clients that -->
- <!-- are allowed to relay. Default is false. -->
- <!--
- <handler class="org.apache.james.smtpserver.fastfail.SPFHandler">
- <blockSoftFail>false</blockSoftFail>
- <blockPermError>true</blockPermError>
- </handler>
- -->
-
- <!-- checks for resolvable HELO/EHLO before accept the HELO/EHLO -->
- <!-- If checkAuthNetworks is set to true sender domain will be checked also for clients that -->
- <!-- are allowed to relay. Default is false. -->
- <!--
- <handler class="org.apache.james.smtpserver.fastfail.ResolvableEhloHeloHandler"/>
- -->
-
- <!-- Checks HELO/EHLO is equal the reverse of the connecting client before accept it -->
- <!-- If checkAuthNetworks is set to true sender domain will be checked also for clients that -->
- <!-- are allowed to relay. Default is false. -->
- <!--
- <handler class="org.apache.james.smtpserver.fastfail.ReverseEqualsEhloHeloHandler"/>
- -->
-
- <!-- If activated mail is only accepted if the sender contains -->
- <!-- a resolvable domain having a valid MX Record or A Record associated! -->
- <!-- If checkAuthNetworks is set to true sender domain will be checked also for clients that -->
- <!-- are allowed to relay. Default is false. -->
- <!--
- <handler class="org.apache.james.smtpserver.fastfail.ValidSenderDomainHandler"/>
- -->
-
- <!-- With ValidRcptHandler, all email will get rejected which has no valid user -->
- <!-- You need to add the recipient to the validRecipient list if you want -->
- <!-- to accept email for a recipient which not exist on the server -->
- <!-- If you want James to act as a spamtrap or honeypot, you may comment ValidRcptHandler -->
- <!-- and implement the needed processors in spoolmanager.xml -->
- <handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
-
- <!-- If activated you can limit the maximal recipients -->
- <!--
- <handler class="org.apache.james.smtpserver.fastfail.MaxRcptHandler">
- <maxRcpt>10</maxRcpt>
- </handler>
- -->
-
- <!-- If uncomment this block you can enable greylisting. For more infos-->
- <!-- how greylisting work see: http://projects.puremagic.com/greylisting/whitepaper.html -->
- <!--
- <handler class="org.apache.james.smtpserver.fastfail.JDBCGreylistHandler">
- <repositoryPath>db://maildb</repositoryPath>
- <sqlFile>file://conf/sqlResources.xml</sqlFile>
- <tempBlockTime>1 hour</tempBlockTime>
- <unseenLifeTime>4 hours</unseenLifeTime>
- <autoWhiteListLifeTime>36 days</autoWhiteListLifeTime>
- <whitelistedNetworks>127.0.0.0/8</whitelistedNetworks>
- </handler>
- -->
-
- <!-- Tarpitting is a method to insert a small sleep after each rcpt. For more -->
- <!-- infos read this: http://www.palomine.net/qmail/tarpit.html . -->
- <!-- Default is set to 0 (disabled). -->
- <!-- You can also configure the time to sleep in milliseconds -->
- <!--
- <handler class="org.apache.james.smtpserver.fastfail.TarpitHandler">
- <tarpitRcptCount>5</tarpitRcptCount>
- <tarpitSleepTime>5000</tarpitSleepTime>
- </handler>
- -->
-
- <!-- This handler ignore duplicated recipients per session. So the email will get only send on time even -->
- <!-- if the recipient is specified more then once -->
- <!--
- <handler class="org.apache.james.smtpserver.protocol.core.fastfail.SuppressDuplicateRcptHandler"/>
- -->
-
- <!-- Load the core command handlers -->
- <handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
-
- <!-- This handler can add a hint to the mail which tells the MailQueue which email should get processed first -->
- <!-- Normally the MailQueue will just handles Mails in FIFO manner -->
- <!-- Valid priority values are 1,5,9 where 9 is the highest-->
- <!--
- <handler class="org.apache.james.smtpserver.MailPriortyHandler">
- <priorityEntries>
- <priorityEntry>
- <domain>yourdomain1</domain>
- <priority>1</priority>
- </priorityEntry>
- <priorityEntry>
- <domain>yourdomain2</domain>
- <priority>9</priority>
- </priorityEntry>
- <priorityEntries>
- </handler>
- -->
-
- <!-- This MessageHandler could be used to check message against spamd before -->
- <!-- accept the email. So its possible to reject a message on smtplevel if a -->
- <!-- configured hits amount is reached. -->
- <!--
- <handler class="org.apache.james.smtpserver.fastfail.SpamAssassinHandler">
- <spamdHost>127.0.0.1</spamdHost>
- <spamdPort>783</spamdPort>
- <spamdRejectionHits>10</spamdRejectionHits>
- </handler>
- -->
-
- <!-- This MessageHandler could be used to extract domain out of the message and check -->
- <!-- this domains against uriRbllists. See http://www.surbl.org for more informations. -->
- <!-- The message get rejected if a domain matched . -->
- <!--
- <handler class="org.apache.james.smtpserver.fastfail.URIRBLHandler">
- <action>reject</action>
- <getDetail>true</getDetail>
- <uriRblServers>
- <server>multi.surbl.org</server>
- </uriRblServers>
- </handler>
- -->
- <!--
- <handler class="org.apache.james.smtpserver.SetMimeHeaderHandler">
- <headername>SPF-test</headername>
- <headervalue>passed</headervalue>
- </handler>
- -->
- </handlerchain>
-
- </smtpserver>
-
-</smtpservers>
-
-
http://git-wip-us.apache.org/repos/asf/james-project/blob/ee131ea6/server/app/src/main/resources/smtpserver.xml
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/smtpserver.xml b/server/app/src/main/resources/smtpserver.xml
new file mode 100644
index 0000000..e01ec51
--- /dev/null
+++ b/server/app/src/main/resources/smtpserver.xml
@@ -0,0 +1,324 @@
+<?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 -->
+
+<smtpservers>
+
+ <!-- The SMTP server is enabled by default -->
+ <!-- Disabling blocks will stop them from listening, -->
+ <!-- but does not free as many resources as removing them would -->
+ <smtpserver enabled="true">
+
+ <jmxName>smtpserver</jmxName>
+
+ <!-- Configure this to bind to a specific inetaddress -->
+ <!-- Please NOTE: you should add this IP also to your RemoteAddrNotInNetwork -->
+ <!-- in order to avoid relay check for locallly generated bounces -->
+ <!--
+ Port 25 is the well-known/IANA registered port for SMTP.
+ Port 465 is the well-known/IANA registered port for SMTP over TLS.
+ -->
+ <bind>0.0.0.0:25</bind>
+
+ <connectionBacklog>200</connectionBacklog>
+
+ <!-- Set to true to support STARTTLS or TLS for the Socket.
+ To use this you need to copy sunjce_provider.jar to /path/james/lib directory.
+ -->
+ <tls socketTLS="false" startTLS="false">
+ <!-- To create a new keystore execute:
+ keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
+ -->
+ <keystore>file://conf/keystore</keystore>
+ <secret>yoursecret</secret>
+ <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
+ <!-- The algorithm is optional and only needs to be specified when using something other
+ than the Sun JCE provider - You could use IbmX509 with IBM Java runtime. -->
+ <algorithm>SunX509</algorithm>
+ </tls>
+
+ <!-- This is the name used by the server to identify itself in the SMTP -->
+ <!-- protocol. If autodetect is TRUE, the server will discover its -->
+ <!-- own host name and use that in the protocol. If discovery fails, -->
+ <!-- the value of 'localhost' is used. If autodetect is FALSE, James -->
+ <!-- will use the specified value. -->
+ <!--
+ <helloName autodetect="true">myMailServer</helloName>
+ -->
+
+ <!-- connection timeout in secconds -->
+ <connectiontimeout>360</connectiontimeout>
+
+ <!-- Set the maximum simultaneous incoming connections for this service -->
+ <connectionLimit>0</connectionLimit>
+
+ <!-- Set the maximum simultaneous incoming connections per IP for this service -->
+ <connectionLimitPerIP>0</connectionLimitPerIP>
+
+ <!-- Uncomment this if you want to require SMTP authentication.
+
+ supported values:
+ true: required but announced only to not authorizedAddresses
+ false: don't use AUTH
+ announce: like true, but always announce AUTH capability to clients
+
+ The correct behaviour per RFC value would be false or announce
+ but we still support true for backward compatibility and because
+ some webmail client fails when AUTH is announced but no authentication
+ information has been provided
+ -->
+ <!--
+ <authRequired>true</authRequired>
+ -->
+
+<!-- CHECKME! -->
+ <!-- Uncomment this if you want to authorize specific addresses/networks.
+ If you use SMTP AUTH, addresses that match those specified here will
+ be permitted to relay without SMTP AUTH. If you do not use SMTP
+ AUTH, and you specify addreses here, then only addresses that match
+ those specified will be permitted to relay.
+
+ Addresses may be specified as a an IP address or domain name, with an
+ optional netmask, e.g.,
+
+ 127.*, 127.0.0.0/8, 127.0.0.0/255.0.0.0, and localhost/8 are all the same
+
+ See also the RemoteAddrNotInNetwork matcher in the transport processor.
+ You would generally use one OR the other approach.
+ -->
+ <authorizedAddresses>127.0.0.0/8</authorizedAddresses>
+
+ <!-- Uncomment this if you want to verify sender addresses, ensuring that -->
+ <!-- the sender address matches the user who has authenticated. -->
+ <!-- This prevents a user of your mail server from acting as someone else -->
+ <!-- If unspecified, default value is true -->
+ <!--
+ <verifyIdentity>true</verifyIdentity>
+ -->
+
+ <!-- This sets the maximum allowed message size (in kilobytes) for this -->
+ <!-- SMTP service. If unspecified, the value defaults to 0, which means no limit. -->
+ <maxmessagesize>0</maxmessagesize>
+
+ <!-- This sets wether to enforce the use of HELO/EHLO salutation before a -->
+ <!-- MAIL command is accepted. If unspecified, the value defaults to true -->
+ <!--
+ <heloEhloEnforcement>true</heloEhloEnforcement>
+ -->
+
+ <!-- WARNING: This is Non-RFC compliant (default value: true) -->
+ <!-- See: http://wiki.apache.org/james/StandardsComplianceStatement -->
+ <!-- TODO: CHANGE TO OFFICIAL URL LATER -->
+ <addressBracketsEnforcement>true</addressBracketsEnforcement>
+
+ <!-- This sets the SMTPGreeting which will be used when connect to the smtpserver -->
+ <!-- If none is specified a default is generated -->
+ <!--
+ <smtpGreeting>JAMES SMTP Server</smtpGreeting>
+ -->
+
+ <!-- The configuration handler chain -->
+ <handlerchain>
+
+ <!-- This connect handler can be used to enable POP3 before SMTP support -->
+ <!-- Plz note that only the ip get stored to indentify an authenticated client -->
+ <!-- The expireTime is the time after which an ipAddress is handled as expired -->
+ <!--
+ <handler class="org.apache.james.smtpserver.POP3BeforeSMTPHandler">
+ <expireTime>1 hour</expireTime>
+ </handler>
+ -->
+
+ <!-- This command handler check against RBL-Lists -->
+ <!-- If getDetail is set to true it try to retrieve information from TXT Record -->
+ <!-- why the ip was blocked. Default to false -->
+ <!-- STOP - before you uncomment out the DNS RBL handler,
+ please take a moment to review each block list. We
+ have included some that various JAMES committers use,
+ but you must decide which, if any, are appropriate
+ for your environment. The mail servers hosting
+ @apache.org mailing lists, for example, use a
+ slightly different list than we have included below.
+ And it is likely that most JAMES committes also have
+ slightly different sets of lists. The SpamAssassin
+ user's list would be one good place to discuss the
+ measured quality of various block lists.
+
+ NOTA BENE: the domain names, below, are terminated
+ with '.' to ensure that they are absolute names in
+ DNS lookups. Under some circumstances, names that
+ are not explicitly absolute could be treated as
+ relative names, leading to incorrect results. This
+ has been observed on *nix and MS-Windows platforms
+ by users of multiple mail servers, and is not JAMES
+ specific. If you are unsure what this means for you,
+ please speak with your local system/network admins.
+ -->
+ <!--
+ <handler class="org.apache.james.smtpserver.fastfail.DNSRBLHandler">
+ <getDetail>false</getDetail>
+ <rblservers>
+ <whitelist>query.bondedsender.org.</whitelist>
+ <blacklist>sbl-xbl.spamhaus.org.</blacklist>
+ <blacklist>dul.dnsbl.sorbs.net.</blacklist>
+ <blacklist>list.dsbl.org.</blacklist>
+ </rblservers>
+ </handler>
+ -->
+
+ <!-- This command handler can be used to reject emails with not match the SPF record of the sender domain -->
+ <!-- If checkAuthNetworks is set to true sender domain will be checked also for clients that -->
+ <!-- are allowed to relay. Default is false. -->
+ <!--
+ <handler class="org.apache.james.smtpserver.fastfail.SPFHandler">
+ <blockSoftFail>false</blockSoftFail>
+ <blockPermError>true</blockPermError>
+ </handler>
+ -->
+
+ <!-- checks for resolvable HELO/EHLO before accept the HELO/EHLO -->
+ <!-- If checkAuthNetworks is set to true sender domain will be checked also for clients that -->
+ <!-- are allowed to relay. Default is false. -->
+ <!--
+ <handler class="org.apache.james.smtpserver.fastfail.ResolvableEhloHeloHandler"/>
+ -->
+
+ <!-- Checks HELO/EHLO is equal the reverse of the connecting client before accept it -->
+ <!-- If checkAuthNetworks is set to true sender domain will be checked also for clients that -->
+ <!-- are allowed to relay. Default is false. -->
+ <!--
+ <handler class="org.apache.james.smtpserver.fastfail.ReverseEqualsEhloHeloHandler"/>
+ -->
+
+ <!-- If activated mail is only accepted if the sender contains -->
+ <!-- a resolvable domain having a valid MX Record or A Record associated! -->
+ <!-- If checkAuthNetworks is set to true sender domain will be checked also for clients that -->
+ <!-- are allowed to relay. Default is false. -->
+ <!--
+ <handler class="org.apache.james.smtpserver.fastfail.ValidSenderDomainHandler"/>
+ -->
+
+ <!-- With ValidRcptHandler, all email will get rejected which has no valid user -->
+ <!-- You need to add the recipient to the validRecipient list if you want -->
+ <!-- to accept email for a recipient which not exist on the server -->
+ <!-- If you want James to act as a spamtrap or honeypot, you may comment ValidRcptHandler -->
+ <!-- and implement the needed processors in spoolmanager.xml -->
+ <handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
+
+ <!-- If activated you can limit the maximal recipients -->
+ <!--
+ <handler class="org.apache.james.smtpserver.fastfail.MaxRcptHandler">
+ <maxRcpt>10</maxRcpt>
+ </handler>
+ -->
+
+ <!-- If uncomment this block you can enable greylisting. For more infos-->
+ <!-- how greylisting work see: http://projects.puremagic.com/greylisting/whitepaper.html -->
+ <!--
+ <handler class="org.apache.james.smtpserver.fastfail.JDBCGreylistHandler">
+ <repositoryPath>db://maildb</repositoryPath>
+ <sqlFile>file://conf/sqlResources.xml</sqlFile>
+ <tempBlockTime>1 hour</tempBlockTime>
+ <unseenLifeTime>4 hours</unseenLifeTime>
+ <autoWhiteListLifeTime>36 days</autoWhiteListLifeTime>
+ <whitelistedNetworks>127.0.0.0/8</whitelistedNetworks>
+ </handler>
+ -->
+
+ <!-- Tarpitting is a method to insert a small sleep after each rcpt. For more -->
+ <!-- infos read this: http://www.palomine.net/qmail/tarpit.html . -->
+ <!-- Default is set to 0 (disabled). -->
+ <!-- You can also configure the time to sleep in milliseconds -->
+ <!--
+ <handler class="org.apache.james.smtpserver.fastfail.TarpitHandler">
+ <tarpitRcptCount>5</tarpitRcptCount>
+ <tarpitSleepTime>5000</tarpitSleepTime>
+ </handler>
+ -->
+
+ <!-- This handler ignore duplicated recipients per session. So the email will get only send on time even -->
+ <!-- if the recipient is specified more then once -->
+ <!--
+ <handler class="org.apache.james.smtpserver.protocol.core.fastfail.SuppressDuplicateRcptHandler"/>
+ -->
+
+ <!-- Load the core command handlers -->
+ <handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
+
+ <!-- This handler can add a hint to the mail which tells the MailQueue which email should get processed first -->
+ <!-- Normally the MailQueue will just handles Mails in FIFO manner -->
+ <!-- Valid priority values are 1,5,9 where 9 is the highest-->
+ <!--
+ <handler class="org.apache.james.smtpserver.MailPriortyHandler">
+ <priorityEntries>
+ <priorityEntry>
+ <domain>yourdomain1</domain>
+ <priority>1</priority>
+ </priorityEntry>
+ <priorityEntry>
+ <domain>yourdomain2</domain>
+ <priority>9</priority>
+ </priorityEntry>
+ <priorityEntries>
+ </handler>
+ -->
+
+ <!-- This MessageHandler could be used to check message against spamd before -->
+ <!-- accept the email. So its possible to reject a message on smtplevel if a -->
+ <!-- configured hits amount is reached. -->
+ <!--
+ <handler class="org.apache.james.smtpserver.fastfail.SpamAssassinHandler">
+ <spamdHost>127.0.0.1</spamdHost>
+ <spamdPort>783</spamdPort>
+ <spamdRejectionHits>10</spamdRejectionHits>
+ </handler>
+ -->
+
+ <!-- This MessageHandler could be used to extract domain out of the message and check -->
+ <!-- this domains against uriRbllists. See http://www.surbl.org for more informations. -->
+ <!-- The message get rejected if a domain matched . -->
+ <!--
+ <handler class="org.apache.james.smtpserver.fastfail.URIRBLHandler">
+ <action>reject</action>
+ <getDetail>true</getDetail>
+ <uriRblServers>
+ <server>multi.surbl.org</server>
+ </uriRblServers>
+ </handler>
+ -->
+ <!--
+ <handler class="org.apache.james.smtpserver.SetMimeHeaderHandler">
+ <headername>SPF-test</headername>
+ <headervalue>passed</headervalue>
+ </handler>
+ -->
+ </handlerchain>
+
+ </smtpserver>
+
+</smtpservers>
+
+
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[4/8] james-project git commit: JAMES-2089 Make server/app
configuration work out of the box
Posted by ad...@apache.org.
JAMES-2089 Make server/app configuration work out of the box
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/ee131ea6
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/ee131ea6
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/ee131ea6
Branch: refs/heads/master
Commit: ee131ea6a31a71aec31931c9272cdf21358e9944
Parents: 02d86a4
Author: benwa <bt...@linagora.com>
Authored: Wed Jul 5 09:56:39 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Jul 5 09:56:39 2017 +0700
----------------------------------------------------------------------
.../src/main/resources/dnsservice-template.xml | 65 --
server/app/src/main/resources/dnsservice.xml | 65 ++
.../src/main/resources/domainlist-template.xml | 63 --
server/app/src/main/resources/domainlist.xml | 63 ++
.../app/src/main/resources/events-template.xml | 90 --
server/app/src/main/resources/events.xml | 90 ++
.../src/main/resources/fetchmail-template.xml | 288 ------
server/app/src/main/resources/fetchmail.xml | 288 ++++++
.../src/main/resources/hbase-site-template.xml | 33 -
.../src/main/resources/imapserver-template.xml | 77 --
server/app/src/main/resources/imapserver.xml | 77 ++
.../app/src/main/resources/indexer-template.xml | 33 -
server/app/src/main/resources/indexer.xml | 33 +
.../james-database-template.properties | 40 -
.../main/resources/james-database.properties | 40 +
.../main/resources/jcr-repository-template.xml | 72 --
.../app/src/main/resources/jcr-repository.xml | 72 ++
.../src/main/resources/jmx-template.properties | 28 -
server/app/src/main/resources/jmx.properties | 28 +
.../src/main/resources/lmtpserver-template.xml | 77 --
server/app/src/main/resources/lmtpserver.xml | 77 ++
.../main/resources/log4j-template.properties | 140 ---
.../src/main/resources/mailbox-jcr-template.cnd | 74 --
server/app/src/main/resources/mailbox-jcr.cnd | 74 ++
.../mailbox-maildir-template.properties | 25 -
.../main/resources/mailbox-maildir.properties | 25 +
.../app/src/main/resources/mailbox-template.xml | 34 -
server/app/src/main/resources/mailbox.xml | 34 +
.../main/resources/mailetcontainer-template.xml | 518 ----------
.../app/src/main/resources/mailetcontainer.xml | 518 ++++++++++
.../resources/mailrepositorystore-template.xml | 96 --
.../src/main/resources/mailrepositorystore.xml | 96 ++
.../resources/managesieveserver-template.xml | 95 --
.../src/main/resources/managesieveserver.xml | 95 ++
.../src/main/resources/pop3server-template.xml | 81 --
server/app/src/main/resources/pop3server.xml | 81 ++
.../app/src/main/resources/quota-template.xml | 132 ---
server/app/src/main/resources/quota.xml | 132 +++
.../recipientrewritetable-template.xml | 57 --
.../main/resources/recipientrewritetable.xml | 57 ++
.../main/resources/sieverepository-template.xml | 23 -
.../app/src/main/resources/sieverepository.xml | 23 +
.../src/main/resources/smtpserver-template.xml | 324 -------
server/app/src/main/resources/smtpserver.xml | 324 +++++++
.../main/resources/sqlResources-template.xml | 938 -------------------
.../main/resources/usersrepository-template.xml | 81 --
.../app/src/main/resources/usersrepository.xml | 81 ++
.../resources/usersrepository23-template.xml | 36 -
.../src/main/resources/usersrepository23.xml | 36 +
49 files changed, 2409 insertions(+), 3520 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/ee131ea6/server/app/src/main/resources/dnsservice-template.xml
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/dnsservice-template.xml b/server/app/src/main/resources/dnsservice-template.xml
deleted file mode 100644
index cf38e9f..0000000
--- a/server/app/src/main/resources/dnsservice-template.xml
+++ /dev/null
@@ -1,65 +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 -->
-
-<!-- DNS Service Block -->
-<!-- -->
-<!-- Specifies DNS Server information for use by various components inside -->
-<!-- James. -->
-<!-- -->
-<!-- If autodiscover is true, James will attempt to autodiscover the DNS servers configured on your underlying system.-->
-<!-- Currently, this works if the OS has a unix-like /etc/resolv.conf,-->
-<!-- or the system is Windows based with ipconfig or winipcfg.-->
-<!-- -->
-<!-- If no DNS servers are found and you have not specified any below, 127.0.0.1 will be used-->
-<!-- If you use autodiscover and add DNS servers manually a combination of all the dns servers will be used -->
-<!-- -->
-<!-- Information includes a list of DNS Servers to be used by James. These are -->
-<!-- specified by the server elements, each of which is a child element of the -->
-<!-- servers element. Each server element is the IP address of a single DNS server. -->
-<!-- The servers element can have multiple server children. -->
-<dnsservice>
- <servers>
- <!--Enter ip address of your DNS server, one IP address per server -->
- <!-- element. -->
- <!--
- <server>127.0.0.1</server>
- -->
- </servers>
- <!-- Change autodiscover to false if you would like to turn off autodiscovery -->
- <!-- and set the DNS servers manually in the<servers>section -->
- <autodiscover>true</autodiscover>
- <authoritative>false</authoritative>
-
- <!-- Maximum number of entries to maintain in the DNS cache -->
- <maxcachesize>50000</maxcachesize>
-
- <!-- Uncomment this if you want James to try a single server for each -->
- <!-- multihomed mx host. -->
- <!--
- <singleIPperMX>true</singleIPperMX>
- -->
-</dnsservice>
http://git-wip-us.apache.org/repos/asf/james-project/blob/ee131ea6/server/app/src/main/resources/dnsservice.xml
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/dnsservice.xml b/server/app/src/main/resources/dnsservice.xml
new file mode 100644
index 0000000..cf38e9f
--- /dev/null
+++ b/server/app/src/main/resources/dnsservice.xml
@@ -0,0 +1,65 @@
+<?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 -->
+
+<!-- DNS Service Block -->
+<!-- -->
+<!-- Specifies DNS Server information for use by various components inside -->
+<!-- James. -->
+<!-- -->
+<!-- If autodiscover is true, James will attempt to autodiscover the DNS servers configured on your underlying system.-->
+<!-- Currently, this works if the OS has a unix-like /etc/resolv.conf,-->
+<!-- or the system is Windows based with ipconfig or winipcfg.-->
+<!-- -->
+<!-- If no DNS servers are found and you have not specified any below, 127.0.0.1 will be used-->
+<!-- If you use autodiscover and add DNS servers manually a combination of all the dns servers will be used -->
+<!-- -->
+<!-- Information includes a list of DNS Servers to be used by James. These are -->
+<!-- specified by the server elements, each of which is a child element of the -->
+<!-- servers element. Each server element is the IP address of a single DNS server. -->
+<!-- The servers element can have multiple server children. -->
+<dnsservice>
+ <servers>
+ <!--Enter ip address of your DNS server, one IP address per server -->
+ <!-- element. -->
+ <!--
+ <server>127.0.0.1</server>
+ -->
+ </servers>
+ <!-- Change autodiscover to false if you would like to turn off autodiscovery -->
+ <!-- and set the DNS servers manually in the<servers>section -->
+ <autodiscover>true</autodiscover>
+ <authoritative>false</authoritative>
+
+ <!-- Maximum number of entries to maintain in the DNS cache -->
+ <maxcachesize>50000</maxcachesize>
+
+ <!-- Uncomment this if you want James to try a single server for each -->
+ <!-- multihomed mx host. -->
+ <!--
+ <singleIPperMX>true</singleIPperMX>
+ -->
+</dnsservice>
http://git-wip-us.apache.org/repos/asf/james-project/blob/ee131ea6/server/app/src/main/resources/domainlist-template.xml
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/domainlist-template.xml b/server/app/src/main/resources/domainlist-template.xml
deleted file mode 100644
index 4147550..0000000
--- a/server/app/src/main/resources/domainlist-template.xml
+++ /dev/null
@@ -1,63 +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 -->
-
-<!-- Domainnames identifies the DNS namespace served by this instance of James. -->
-<!-- These domainnames are used for both matcher/mailet processing and SMTP auth -->
-<!-- to determine when a mail is intended for local delivery. -->
-<!-- -->
-<!-- If autodetect is TRUE, James wil attempt to discover its own host name AND -->
-<!-- use any explicitly specified servernames. -->
-<!-- If autodetect is FALSE, James will use only the specified domainnames. -->
-<!-- -->
-<!-- If autodetectIP is not FALSE, James will also allow add the IP address for each servername. -->
-<!-- The automatic IP detection is to support RFC 2821, Sec 4.1.3, address literals. -->
-<!-- -->
-<!-- To override autodetected domainames names simply add explicit domainname elements. -->
-<!-- In most cases this will be necessary. -->
-<!-- By default, the domainname 'localhost' is specified. This can be removed, if required. -->
-<!-- -->
-<!-- Warning: If you are using fetchmail it is important to include the -->
-<!-- fetched domains in the server name list to prevent looping. -->
-
-<!-- JPA implementation for DomainList -->
-<domainlist class="org.apache.james.domainlist.jpa.JPADomainList">
- <autodetect>true</autodetect>
- <autodetectIP>true</autodetectIP>
- <defaultDomain>localhost</defaultDomain>
-</domainlist>
-
-<!-- XML based implementation for DomainList -->
-<!--
-<domainlist class="org.apache.james.domainlist.xml.XMLDomainList">
- <domainnames>
- <domainname>localhost</domainname>
- </domainnames>
- <autodetect>true</autodetect>
- <autodetectIP>true</autodetectIP>
- <defaultDomain>localhost</defaultDomain>
-</domainlist>
--->
http://git-wip-us.apache.org/repos/asf/james-project/blob/ee131ea6/server/app/src/main/resources/domainlist.xml
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/domainlist.xml b/server/app/src/main/resources/domainlist.xml
new file mode 100644
index 0000000..4147550
--- /dev/null
+++ b/server/app/src/main/resources/domainlist.xml
@@ -0,0 +1,63 @@
+<?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 -->
+
+<!-- Domainnames identifies the DNS namespace served by this instance of James. -->
+<!-- These domainnames are used for both matcher/mailet processing and SMTP auth -->
+<!-- to determine when a mail is intended for local delivery. -->
+<!-- -->
+<!-- If autodetect is TRUE, James wil attempt to discover its own host name AND -->
+<!-- use any explicitly specified servernames. -->
+<!-- If autodetect is FALSE, James will use only the specified domainnames. -->
+<!-- -->
+<!-- If autodetectIP is not FALSE, James will also allow add the IP address for each servername. -->
+<!-- The automatic IP detection is to support RFC 2821, Sec 4.1.3, address literals. -->
+<!-- -->
+<!-- To override autodetected domainames names simply add explicit domainname elements. -->
+<!-- In most cases this will be necessary. -->
+<!-- By default, the domainname 'localhost' is specified. This can be removed, if required. -->
+<!-- -->
+<!-- Warning: If you are using fetchmail it is important to include the -->
+<!-- fetched domains in the server name list to prevent looping. -->
+
+<!-- JPA implementation for DomainList -->
+<domainlist class="org.apache.james.domainlist.jpa.JPADomainList">
+ <autodetect>true</autodetect>
+ <autodetectIP>true</autodetectIP>
+ <defaultDomain>localhost</defaultDomain>
+</domainlist>
+
+<!-- XML based implementation for DomainList -->
+<!--
+<domainlist class="org.apache.james.domainlist.xml.XMLDomainList">
+ <domainnames>
+ <domainname>localhost</domainname>
+ </domainnames>
+ <autodetect>true</autodetect>
+ <autodetectIP>true</autodetectIP>
+ <defaultDomain>localhost</defaultDomain>
+</domainlist>
+-->
http://git-wip-us.apache.org/repos/asf/james-project/blob/ee131ea6/server/app/src/main/resources/events-template.xml
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/events-template.xml b/server/app/src/main/resources/events-template.xml
deleted file mode 100644
index 536278a..0000000
--- a/server/app/src/main/resources/events-template.xml
+++ /dev/null
@@ -1,90 +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
--->
-
-<events>
- <!-- By default the event system is in memory based, providing better performances but is not
- distributed and won't do the work with multiples servers -->
- <type>default</type>
-
- <!-- Do you want to wait for MailboxListeners to be executed before returning result to the user ?
-
- If yes set this to synchronous
- If no set this to asynchronous
- If you want to use default supported behaviour exposed by listeners set this to mixed
- -->
- <delivery>synchronous</delivery>
-
- <!-- Broadcast event system will send messages to all your James servers.
-
- It is the only viable options if you rely on Mailbox Listeners that do not perform well in a distributed system.
-
- Here follows a non exhaustive list of such Mailbox Listeners :
- - Memory quota based system
- - Lucene based search system
-
- Workload is higher because event needs to be serialized and de serialized.
-
- Also note that depending on the publisher you use, messages might be either lost or duplicated, implying wrong
- indexing or wrong quota count on network partitions.
-
- Here follows a sample configuration :
- -->
- <!--
- <type>broadcast</type>
- <serialization>json</serialization>
- <publisher>kafka</publisher>
- -->
-
- <!--
- Further notes on the choice you had here :
-
- serialization : you have to choices : either json or message-pack
-
- message-pack is a binary representation for json, and is 2 times lighter by average, but is 2 time slower to serialize and de serialize.
- This choice allows you to trade compute against network.
-
- publisher : Publish - subscribe used. The only current implementation is Kafka.
- -->
-
- <!-- Registered event system
-
- Scalable event system based on registration : each James server listen on his own topic and manage registrations on
- mailbox paths in order to receive events interesting him.
-
- This configuration does not support distributed unfriendly Mailbox Listeners (see the non exhaustive list above) for obvious reasons.
- -->
- <!--
- <type>registered</type>
- <serialization>json</serialization>
- <registration>cassandra</registration>
- <publisher>kafka</publisher>
- -->
-
- <!--
- The only registration system available is Cassandra, used in an available fashion. This means there is no warranties,
- either at least one delivery nor at most one delivery. But you get the certitude that the system will always be available.
- -->
-
-</events>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/james-project/blob/ee131ea6/server/app/src/main/resources/events.xml
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/events.xml b/server/app/src/main/resources/events.xml
new file mode 100644
index 0000000..536278a
--- /dev/null
+++ b/server/app/src/main/resources/events.xml
@@ -0,0 +1,90 @@
+<?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
+-->
+
+<events>
+ <!-- By default the event system is in memory based, providing better performances but is not
+ distributed and won't do the work with multiples servers -->
+ <type>default</type>
+
+ <!-- Do you want to wait for MailboxListeners to be executed before returning result to the user ?
+
+ If yes set this to synchronous
+ If no set this to asynchronous
+ If you want to use default supported behaviour exposed by listeners set this to mixed
+ -->
+ <delivery>synchronous</delivery>
+
+ <!-- Broadcast event system will send messages to all your James servers.
+
+ It is the only viable options if you rely on Mailbox Listeners that do not perform well in a distributed system.
+
+ Here follows a non exhaustive list of such Mailbox Listeners :
+ - Memory quota based system
+ - Lucene based search system
+
+ Workload is higher because event needs to be serialized and de serialized.
+
+ Also note that depending on the publisher you use, messages might be either lost or duplicated, implying wrong
+ indexing or wrong quota count on network partitions.
+
+ Here follows a sample configuration :
+ -->
+ <!--
+ <type>broadcast</type>
+ <serialization>json</serialization>
+ <publisher>kafka</publisher>
+ -->
+
+ <!--
+ Further notes on the choice you had here :
+
+ serialization : you have to choices : either json or message-pack
+
+ message-pack is a binary representation for json, and is 2 times lighter by average, but is 2 time slower to serialize and de serialize.
+ This choice allows you to trade compute against network.
+
+ publisher : Publish - subscribe used. The only current implementation is Kafka.
+ -->
+
+ <!-- Registered event system
+
+ Scalable event system based on registration : each James server listen on his own topic and manage registrations on
+ mailbox paths in order to receive events interesting him.
+
+ This configuration does not support distributed unfriendly Mailbox Listeners (see the non exhaustive list above) for obvious reasons.
+ -->
+ <!--
+ <type>registered</type>
+ <serialization>json</serialization>
+ <registration>cassandra</registration>
+ <publisher>kafka</publisher>
+ -->
+
+ <!--
+ The only registration system available is Cassandra, used in an available fashion. This means there is no warranties,
+ either at least one delivery nor at most one delivery. But you get the certitude that the system will always be available.
+ -->
+
+</events>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/james-project/blob/ee131ea6/server/app/src/main/resources/fetchmail-template.xml
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/fetchmail-template.xml b/server/app/src/main/resources/fetchmail-template.xml
deleted file mode 100644
index 3c6a890..0000000
--- a/server/app/src/main/resources/fetchmail-template.xml
+++ /dev/null
@@ -1,288 +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 -->
-
-<!-- Fetch mail block, fetches mail from message servers and inserts it into the incoming spool -->
-<!-- Warning: It is important to prevent mail from looping by setting the -->
-<!-- fetched domains in the<servernames>section of the<James>block -->
-<!-- above. This block is disabled by default. -->
-
-<!-- See http://james.apache.org/server/2.3.0/fetchmail_configuration.html for detailed -->
-<!-- configuration instructions and examples. -->
-
-<!-- I M P O R T A N T -->
-<!-- Setting markseen="true" will have no effect on many POP3 servers as the POP3 -->
-<!-- protocol does not require the markSeen flag to be supported. When this is the -->
-<!-- case, the only way to ensure that messages are fetched just once is to delete -->
-<!-- fetched messages from the server with leaveonserver="false". -->
-
-<!-- If you want to perform mailet processing on messages fetched by fetchmail, -->
-<!-- use the HasMailAttribute matcher to detect messages with the MailAttribute -->
-<!-- org.apache.james.fetchmail.taskName. The attribute's value is that of the -->
-<!-- fetch task's name parameter described below. -->
-
-<fetchmail enabled="false">
-
- <!-- The number of threads to use for the scheduled execution -->
- <threads>5</threads>
-
- <!-- The JMX Name to use -->
- <jmxName>fetchmail</jmxName>
-
- <!-- You can have as many fetch tasks as you want, but each must have a -->
- <!-- unique name by which it is identified. -->
- <!-- Each task runs at the specified<interval>, tasks may run concurrently. -->
-
- <fetch name="mydomain.com">
- <!-- There must be one<accounts>entry per fetch task. An accounts entry can have 0 to many -->
- <!--<account>entries and 0 or 1<alllocal>entries.<alllocal>generates -->
- <!--<accounts>for every user defined to James.<accounts>run consecutively within the -->
- <!-- scope of their fetch task and inherit all the properties of the fetch task. -->
-
- <!-- The advantage of running consecutively is that we can avoid conflicting fetch tasks -->
- <!-- operating concurrently on the same mailboxes. -->
-
- <!-- Fetchmail attempts to deduce the correct recipient of each message, but sometimes there is -->
- <!-- insufficient information in the headers to do so. When the correct recipient cannot be deduced, -->
- <!-- fetchmail can be configured to leave the mail on the server or deliver it to a default recipient. -->
-
- <!-- When a message server delivers mail for a single user to a specific INBOX you can define -->
- <!-- each user to James (via the console) and use<alllocal>with ignorercpt-header="true" to deliver mail -->
- <!-- directly from each users INBOX onto James' spool. There is no need to update 'config.xml' -->
- <!-- each time you add or remove users, fetchmail checks the list of users at the start of each fetch. -->
-
- <!-- When a message server provides an account that gives access to all mail for a domain through a single -->
- <!-- INBOX, you can use an<account>to fetch all the mail for that domain, using the filter facilities -->
- <!-- described below to reject unwanted messages. -->
-
- <!-- When a message server supports BOTH delivery for a single user to a specific INBOX and access to all mail -->
- <!-- for a domain through a single INBOX, you can use<alllocal>and<account>together to guarantee that all -->
- <!-- local mail gets delivered to the correct user and all unwanted mail is deleted from the message -->
- <!-- server. See http://james.apache.org/server/2.3.0/fetchmail_configuration.html for details. -->
-
- <!-- Limitations and Future Directions -->
- <!-- 1)<alllocal>requires the password for all accounts for a domain on the message server be the same. True -->
- <!-- in many cases, but not all. A future version might work out a way of associating James users with a set -->
- <!-- of account properties. -->
- <!-- 2)<alllocal>will try to access an INBOX on the message server for all local users. The instance of James used -->
- <!-- for this purpose should not have extraneous users defined. This is inefficient, but not fatal. -->
- <!-- Again, a future version might work out a way of associating James users with message account properties. -->
- <!-- This would allow all local users with an account on a particular message server to be fetched. -->
-
- <accounts>
- <alllocal userprefix="" usersuffix="@myaccount" password="password" recipientprefix="" recipientsuffix="@mydomain.com" ignorercpt-header="true"/>
- <account user="myglobalaccount" password="password" recipient="postmaster@localhost" ignorercpt-header="false"/>
- <!-- Custom recipient header handling -->
- <!-- this example search an header named X-Envelope-To and use the recipient found in that header -->
- <!--
- <account customrcpt-header="X-Envelope-To" user="myglobalaccount" password="password" recipient="postmaster@localhost" ignorercpt-header="false"/>
- -->
- </accounts>
-
- <!-- The address of the server from which to fetch the mail -->
- <host>pop.server.com</host>
-
- <!-- How frequently this host is checked - in milliseconds. 600000 is every ten minutes -->
- <interval>600000</interval>
-
- <!-- name of the javamail provider you wish to use -->
- <!-- (pop3, imap, etc. -->
- <javaMailProviderName>pop3</javaMailProviderName>
-
- <!-- name of the folder to open -->
- <javaMailFolderName>INBOX</javaMailFolderName>
-
- <!-- Properties to be applied to the JavaMail Session. -->
- <!-- Properties are specific to the selected JavaMail provider. -->
- <!-- Any number may be specified. -->
- <javaMailProperties>
- <!-- Set the connection timeout to 3 minutes -->
- <property name="mail.pop3.connectiontimeout" value="180000"/>
- <!-- Set the I/O timeout to 3 minutes -->
- <property name="mail.pop3.timeout" value="180000"/>
- </javaMailProperties>
-
- <!-- Retrieve both old (seen) and new messages from mailserver. The default -->
- <!-- is to fetch only messages the server has not marked as seen -->
- <fetchall>false</fetchall>
-
- <!-- If the folder javaMailFolderName contains subfolders do you -->
- <!-- want to recurse into the subfolders as well? true = yes, false = no -->
- <recursesubfolders>false</recursesubfolders>
-
- <!-- If the From: header of a fetched message has a valid user part -->
- <!-- but no domain part the fetch task will correct this by appending -->
- <!-- a default domain. eg: 'james' becomes 'james@defaultdomain' -->
- <!-- The default behaviour is to append the canonical host name of the James server. -->
- <!-- You can override this behaviour here by specifying the name of the domain -->
- <!-- you wish to append. The name you choose must be a local server or you can -->
- <!-- use the name localhost -->
- <!-- Example using a locally served domain -->
- <!--
- <defaultdomain>mydomain.com</defaultdomain>
- -->
- <!-- Example using localhost -->
- <!--
- <defaultdomain>localhost</defaultdomain>
- -->
-
- <!-- Specify what happens to messages succesfully fetched from the mailserver -->
- <!-- leaveonserver -->
- <!-- if true, messages will be left on the server -->
- <!-- if false, messages will be deleted from the server -->
- <!-- markseen -->
- <!-- if true, messages left on the server will be marked as seen -->
- <!-- if false, messages left on the server will not be marked as seen -->
- <fetched leaveonserver="false" markseen="true"/>
-
- <!-- Specify the index of the RECEIVED Header used to compute the remote address and remote host name -->
- <!-- and what happens to messages that contain an invalid header at that index. -->
- <!-- Matchers such as InSpammerBlacklist use the remote address and/or remote host name to identify illegitimate -->
- <!-- remote MTAs. -->
- <!-- This tag is optional. If omitted, the remote address will be set to 127.0.0.1 and the remote domain -->
- <!-- will be set to 'localhost'. Both are almost always considered legitimate. -->
- <!-- index -->
- <!-- The zero based index of the RECEIVED Header used to compute the remote address and remote host name -->
- <!-- of the MTA that delivered a fetched message. -->
- <!-- Typically, the first (index = 0) RECEIVED Header is for the local MTA that delivers mail to the message store -->
- <!-- and the second RECEIVED Header (index = 1) is the remote domain delivering mail to the MTA, so the second -->
- <!-- RECEIVED Header is the one to use. -->
- <!-- Some configurations will differ. Look at the RECEIVED Headers and set the index to point to the first remote MTA. -->
- <!-- An index of -1 is is interpreted as use 127.0.0.1 for the remote address and use 'localhost' for the remote host name. -->
- <!-- reject -->
- <!-- if true, messages whose received header at the specified index is invalid will be rejected -->
- <!-- if false, messages whose received header at the specified index is invalid will be accepted -->
- <!-- and the Mail Attribute "org.apache.james.fetchmail.isInvalidReceivedHeader" -->
- <!-- will be added to the message. Use the HasMailAttribute matcher to detect them. -->
- <!-- The following apply if reject="true" and a message is rejected... -->
- <!-- leaveonserver -->
- <!-- if true, messages will be left on the server -->
- <!-- if false, messages will be deleted from the server -->
- <!-- markseen -->
- <!-- if true, messages left on the server will be marked as seen -->
- <!-- if false, messages left on the server will not be marked as seen -->
- <remotereceivedheader index="1" reject="true" leaveonserver="true" markseen="false"/>
-
- <!-- Specify what happens to messages whose size exceeds the specified limit. -->
- <!-- This tag is optional. If omitted, there is no limit. -->
- <!-- limit -->
- <!-- The maximum message size in Kilobytes of messages injected into James. -->
- <!-- A value of 0 means no limit. -->
- <!-- reject -->
- <!-- if true, messages whose size exceeds the limit will be rejected -->
- <!-- if false, messages whose size exceeds the limit will be stripped of their message bodies -->
- <!-- prior to injection into James and the MailAttribute "org.apache.james.fetchmail.isMaxMessageSizeExceeded" -->
- <!-- will be added to the message with the value set to the original message size in bytes. -->
- <!-- Use the HasMailAttribute matcher to detect them. -->
- <!-- The following apply if reject="true" and a message is rejected... -->
- <!-- leaveonserver -->
- <!-- if true, messages will be left on the server -->
- <!-- if false, messages will be deleted from the server -->
- <!-- markseen -->
- <!-- if true, messages left on the server will be marked as seen -->
- <!-- if false, messages left on the server will not be marked as seen -->
- <maxmessagesize limit="0" reject="false" leaveonserver="true" markseen="false"/>
-
- <!-- Specify what happens to undeliverable messages -->
- <!-- leaveonserver -->
- <!-- if true, messages will be left on the server -->
- <!-- if false, messages will be deleted from the server -->
- <!-- markseen -->
- <!-- if true, messages left on the server will be marked as seen -->
- <!-- if false, messages left on the server will not be marked as seen -->
- <undeliverable leaveonserver="true" markseen="false"/>
-
- <!-- Specify what happens to messages for which a recipient cannot be determined. -->
- <!-- defer -->
- <!-- if true, processing of messages for which a recipient cannot be determined will deferred -->
- <!-- until the next fetch of the Account. This gives an opportunity for other Accounts in the -->
- <!-- fetch task to determine the recipient and process the mail. -->
- <!-- if false, messages for which a recipient cannot be determined are processed immediately. -->
- <!-- reject -->
- <!-- if true, messages for which a recipient cannot be determined will be rejected -->
- <!-- if false, messages for which a recipient cannot be determined will be accepted, -->
- <!-- the account recipient will be used and the MailAttribute "org.apache.james.fetchmail.isRecipientNotFound" -->
- <!-- will be added to the message. Use the HasMailAttribute matcher to detect them. -->
- <!-- The following apply if reject="true" and a message is rejected... -->
- <!-- leaveonserver -->
- <!-- if true, messages will be left on the server -->
- <!-- if false, messages will be deleted from the server -->
- <!-- markseen -->
- <!-- if true, messages left on the server will be marked as seen -->
- <!-- if false, messages left on the server will not be marked as seen -->
- <recipientnotfound defer="true" reject="true" leaveonserver="true" markseen="false"/>
-
- <!-- Specify a list of recipients for whom messages will be rejected -->
- <!-- and what happens to rejected messages. -->
- <!-- The list can be comma, tab or space delimited. -->
- <!-- reject -->
- <!-- if true, messages for users on the blacklist will be rejected -->
- <!-- if false, messages for users on the blacklist will be accepted -->
- <!-- and the Mail Attribute "org.apache.james.fetchmail.isBlacklistedRecipient" -->
- <!-- will be added to the message. Use the HasMailAttribute matcher to detect them. -->
- <!-- The following apply if reject="true" and a message is rejected... -->
- <!-- leaveonserver -->
- <!-- if true, messages will be left on the server -->
- <!-- if false, messages will be deleted from the server -->
- <!-- markseen -->
- <!-- if true, messages left on the server will be marked as seen -->
- <!-- if false, messages left on the server will not be marked as seen -->
- <blacklist reject="true" leaveonserver="true" markseen="false">wibble@localhost, flobble@localhost</blacklist>
-
- <!-- Specify if messages for users who are not defined to James should -->
- <!-- be rejected and what happens to rejected messages. -->
- <!-- reject -->
- <!-- if true, messages for users who are not defined to James will be rejected -->
- <!-- if false, messages for users who are not defined to James will be accepted -->
- <!-- and the Mail Attribute "org.apache.james.fetchmail.isUserUndefined" -->
- <!-- will be added to the message. Use the HasMailAttribute matcher to detect them. -->
- <!-- The following apply if reject="true" and a message is rejected... -->
- <!-- leaveonserver -->
- <!-- if true, messages will be left on the server -->
- <!-- if false, messages will be deleted from the server -->
- <!-- markseen -->
- <!-- if true, messages left on the server will be marked as seen -->
- <!-- if false, messages left on the server will not be marked as seen -->
- <userundefined reject="true" leaveonserver="true" markseen="false" />
-
- <!-- Specify if messages for recipients on remote hosts should -->
- <!-- be rejected and what happens to rejected messages. -->
- <!-- reject -->
- <!-- if true, messages for remote recipients will be rejected -->
- <!-- if false, messages for remote recipients will be accepted -->
- <!-- and the Mail Attribute "org.apache.james.fetchmail.isRemoteRecipient" -->
- <!-- will be added to the message. Use the HasMailAttribute matcher to detect them. -->
- <!-- The following apply if reject="true" and a message is rejected... -->
- <!-- leaveonserver -->
- <!-- if true, messages will be left on the server -->
- <!-- if false, messages will be deleted from the server -->
- <!-- markseen -->
- <!-- if true, messages left on the server will be marked as seen -->
- <!-- if false, messages left on the server will not be marked as seen -->
- <remoterecipient reject="true" leaveonserver="true" markseen="false" />
- </fetch>
-
-</fetchmail>
http://git-wip-us.apache.org/repos/asf/james-project/blob/ee131ea6/server/app/src/main/resources/fetchmail.xml
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/fetchmail.xml b/server/app/src/main/resources/fetchmail.xml
new file mode 100644
index 0000000..3c6a890
--- /dev/null
+++ b/server/app/src/main/resources/fetchmail.xml
@@ -0,0 +1,288 @@
+<?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 -->
+
+<!-- Fetch mail block, fetches mail from message servers and inserts it into the incoming spool -->
+<!-- Warning: It is important to prevent mail from looping by setting the -->
+<!-- fetched domains in the<servernames>section of the<James>block -->
+<!-- above. This block is disabled by default. -->
+
+<!-- See http://james.apache.org/server/2.3.0/fetchmail_configuration.html for detailed -->
+<!-- configuration instructions and examples. -->
+
+<!-- I M P O R T A N T -->
+<!-- Setting markseen="true" will have no effect on many POP3 servers as the POP3 -->
+<!-- protocol does not require the markSeen flag to be supported. When this is the -->
+<!-- case, the only way to ensure that messages are fetched just once is to delete -->
+<!-- fetched messages from the server with leaveonserver="false". -->
+
+<!-- If you want to perform mailet processing on messages fetched by fetchmail, -->
+<!-- use the HasMailAttribute matcher to detect messages with the MailAttribute -->
+<!-- org.apache.james.fetchmail.taskName. The attribute's value is that of the -->
+<!-- fetch task's name parameter described below. -->
+
+<fetchmail enabled="false">
+
+ <!-- The number of threads to use for the scheduled execution -->
+ <threads>5</threads>
+
+ <!-- The JMX Name to use -->
+ <jmxName>fetchmail</jmxName>
+
+ <!-- You can have as many fetch tasks as you want, but each must have a -->
+ <!-- unique name by which it is identified. -->
+ <!-- Each task runs at the specified<interval>, tasks may run concurrently. -->
+
+ <fetch name="mydomain.com">
+ <!-- There must be one<accounts>entry per fetch task. An accounts entry can have 0 to many -->
+ <!--<account>entries and 0 or 1<alllocal>entries.<alllocal>generates -->
+ <!--<accounts>for every user defined to James.<accounts>run consecutively within the -->
+ <!-- scope of their fetch task and inherit all the properties of the fetch task. -->
+
+ <!-- The advantage of running consecutively is that we can avoid conflicting fetch tasks -->
+ <!-- operating concurrently on the same mailboxes. -->
+
+ <!-- Fetchmail attempts to deduce the correct recipient of each message, but sometimes there is -->
+ <!-- insufficient information in the headers to do so. When the correct recipient cannot be deduced, -->
+ <!-- fetchmail can be configured to leave the mail on the server or deliver it to a default recipient. -->
+
+ <!-- When a message server delivers mail for a single user to a specific INBOX you can define -->
+ <!-- each user to James (via the console) and use<alllocal>with ignorercpt-header="true" to deliver mail -->
+ <!-- directly from each users INBOX onto James' spool. There is no need to update 'config.xml' -->
+ <!-- each time you add or remove users, fetchmail checks the list of users at the start of each fetch. -->
+
+ <!-- When a message server provides an account that gives access to all mail for a domain through a single -->
+ <!-- INBOX, you can use an<account>to fetch all the mail for that domain, using the filter facilities -->
+ <!-- described below to reject unwanted messages. -->
+
+ <!-- When a message server supports BOTH delivery for a single user to a specific INBOX and access to all mail -->
+ <!-- for a domain through a single INBOX, you can use<alllocal>and<account>together to guarantee that all -->
+ <!-- local mail gets delivered to the correct user and all unwanted mail is deleted from the message -->
+ <!-- server. See http://james.apache.org/server/2.3.0/fetchmail_configuration.html for details. -->
+
+ <!-- Limitations and Future Directions -->
+ <!-- 1)<alllocal>requires the password for all accounts for a domain on the message server be the same. True -->
+ <!-- in many cases, but not all. A future version might work out a way of associating James users with a set -->
+ <!-- of account properties. -->
+ <!-- 2)<alllocal>will try to access an INBOX on the message server for all local users. The instance of James used -->
+ <!-- for this purpose should not have extraneous users defined. This is inefficient, but not fatal. -->
+ <!-- Again, a future version might work out a way of associating James users with message account properties. -->
+ <!-- This would allow all local users with an account on a particular message server to be fetched. -->
+
+ <accounts>
+ <alllocal userprefix="" usersuffix="@myaccount" password="password" recipientprefix="" recipientsuffix="@mydomain.com" ignorercpt-header="true"/>
+ <account user="myglobalaccount" password="password" recipient="postmaster@localhost" ignorercpt-header="false"/>
+ <!-- Custom recipient header handling -->
+ <!-- this example search an header named X-Envelope-To and use the recipient found in that header -->
+ <!--
+ <account customrcpt-header="X-Envelope-To" user="myglobalaccount" password="password" recipient="postmaster@localhost" ignorercpt-header="false"/>
+ -->
+ </accounts>
+
+ <!-- The address of the server from which to fetch the mail -->
+ <host>pop.server.com</host>
+
+ <!-- How frequently this host is checked - in milliseconds. 600000 is every ten minutes -->
+ <interval>600000</interval>
+
+ <!-- name of the javamail provider you wish to use -->
+ <!-- (pop3, imap, etc. -->
+ <javaMailProviderName>pop3</javaMailProviderName>
+
+ <!-- name of the folder to open -->
+ <javaMailFolderName>INBOX</javaMailFolderName>
+
+ <!-- Properties to be applied to the JavaMail Session. -->
+ <!-- Properties are specific to the selected JavaMail provider. -->
+ <!-- Any number may be specified. -->
+ <javaMailProperties>
+ <!-- Set the connection timeout to 3 minutes -->
+ <property name="mail.pop3.connectiontimeout" value="180000"/>
+ <!-- Set the I/O timeout to 3 minutes -->
+ <property name="mail.pop3.timeout" value="180000"/>
+ </javaMailProperties>
+
+ <!-- Retrieve both old (seen) and new messages from mailserver. The default -->
+ <!-- is to fetch only messages the server has not marked as seen -->
+ <fetchall>false</fetchall>
+
+ <!-- If the folder javaMailFolderName contains subfolders do you -->
+ <!-- want to recurse into the subfolders as well? true = yes, false = no -->
+ <recursesubfolders>false</recursesubfolders>
+
+ <!-- If the From: header of a fetched message has a valid user part -->
+ <!-- but no domain part the fetch task will correct this by appending -->
+ <!-- a default domain. eg: 'james' becomes 'james@defaultdomain' -->
+ <!-- The default behaviour is to append the canonical host name of the James server. -->
+ <!-- You can override this behaviour here by specifying the name of the domain -->
+ <!-- you wish to append. The name you choose must be a local server or you can -->
+ <!-- use the name localhost -->
+ <!-- Example using a locally served domain -->
+ <!--
+ <defaultdomain>mydomain.com</defaultdomain>
+ -->
+ <!-- Example using localhost -->
+ <!--
+ <defaultdomain>localhost</defaultdomain>
+ -->
+
+ <!-- Specify what happens to messages succesfully fetched from the mailserver -->
+ <!-- leaveonserver -->
+ <!-- if true, messages will be left on the server -->
+ <!-- if false, messages will be deleted from the server -->
+ <!-- markseen -->
+ <!-- if true, messages left on the server will be marked as seen -->
+ <!-- if false, messages left on the server will not be marked as seen -->
+ <fetched leaveonserver="false" markseen="true"/>
+
+ <!-- Specify the index of the RECEIVED Header used to compute the remote address and remote host name -->
+ <!-- and what happens to messages that contain an invalid header at that index. -->
+ <!-- Matchers such as InSpammerBlacklist use the remote address and/or remote host name to identify illegitimate -->
+ <!-- remote MTAs. -->
+ <!-- This tag is optional. If omitted, the remote address will be set to 127.0.0.1 and the remote domain -->
+ <!-- will be set to 'localhost'. Both are almost always considered legitimate. -->
+ <!-- index -->
+ <!-- The zero based index of the RECEIVED Header used to compute the remote address and remote host name -->
+ <!-- of the MTA that delivered a fetched message. -->
+ <!-- Typically, the first (index = 0) RECEIVED Header is for the local MTA that delivers mail to the message store -->
+ <!-- and the second RECEIVED Header (index = 1) is the remote domain delivering mail to the MTA, so the second -->
+ <!-- RECEIVED Header is the one to use. -->
+ <!-- Some configurations will differ. Look at the RECEIVED Headers and set the index to point to the first remote MTA. -->
+ <!-- An index of -1 is is interpreted as use 127.0.0.1 for the remote address and use 'localhost' for the remote host name. -->
+ <!-- reject -->
+ <!-- if true, messages whose received header at the specified index is invalid will be rejected -->
+ <!-- if false, messages whose received header at the specified index is invalid will be accepted -->
+ <!-- and the Mail Attribute "org.apache.james.fetchmail.isInvalidReceivedHeader" -->
+ <!-- will be added to the message. Use the HasMailAttribute matcher to detect them. -->
+ <!-- The following apply if reject="true" and a message is rejected... -->
+ <!-- leaveonserver -->
+ <!-- if true, messages will be left on the server -->
+ <!-- if false, messages will be deleted from the server -->
+ <!-- markseen -->
+ <!-- if true, messages left on the server will be marked as seen -->
+ <!-- if false, messages left on the server will not be marked as seen -->
+ <remotereceivedheader index="1" reject="true" leaveonserver="true" markseen="false"/>
+
+ <!-- Specify what happens to messages whose size exceeds the specified limit. -->
+ <!-- This tag is optional. If omitted, there is no limit. -->
+ <!-- limit -->
+ <!-- The maximum message size in Kilobytes of messages injected into James. -->
+ <!-- A value of 0 means no limit. -->
+ <!-- reject -->
+ <!-- if true, messages whose size exceeds the limit will be rejected -->
+ <!-- if false, messages whose size exceeds the limit will be stripped of their message bodies -->
+ <!-- prior to injection into James and the MailAttribute "org.apache.james.fetchmail.isMaxMessageSizeExceeded" -->
+ <!-- will be added to the message with the value set to the original message size in bytes. -->
+ <!-- Use the HasMailAttribute matcher to detect them. -->
+ <!-- The following apply if reject="true" and a message is rejected... -->
+ <!-- leaveonserver -->
+ <!-- if true, messages will be left on the server -->
+ <!-- if false, messages will be deleted from the server -->
+ <!-- markseen -->
+ <!-- if true, messages left on the server will be marked as seen -->
+ <!-- if false, messages left on the server will not be marked as seen -->
+ <maxmessagesize limit="0" reject="false" leaveonserver="true" markseen="false"/>
+
+ <!-- Specify what happens to undeliverable messages -->
+ <!-- leaveonserver -->
+ <!-- if true, messages will be left on the server -->
+ <!-- if false, messages will be deleted from the server -->
+ <!-- markseen -->
+ <!-- if true, messages left on the server will be marked as seen -->
+ <!-- if false, messages left on the server will not be marked as seen -->
+ <undeliverable leaveonserver="true" markseen="false"/>
+
+ <!-- Specify what happens to messages for which a recipient cannot be determined. -->
+ <!-- defer -->
+ <!-- if true, processing of messages for which a recipient cannot be determined will deferred -->
+ <!-- until the next fetch of the Account. This gives an opportunity for other Accounts in the -->
+ <!-- fetch task to determine the recipient and process the mail. -->
+ <!-- if false, messages for which a recipient cannot be determined are processed immediately. -->
+ <!-- reject -->
+ <!-- if true, messages for which a recipient cannot be determined will be rejected -->
+ <!-- if false, messages for which a recipient cannot be determined will be accepted, -->
+ <!-- the account recipient will be used and the MailAttribute "org.apache.james.fetchmail.isRecipientNotFound" -->
+ <!-- will be added to the message. Use the HasMailAttribute matcher to detect them. -->
+ <!-- The following apply if reject="true" and a message is rejected... -->
+ <!-- leaveonserver -->
+ <!-- if true, messages will be left on the server -->
+ <!-- if false, messages will be deleted from the server -->
+ <!-- markseen -->
+ <!-- if true, messages left on the server will be marked as seen -->
+ <!-- if false, messages left on the server will not be marked as seen -->
+ <recipientnotfound defer="true" reject="true" leaveonserver="true" markseen="false"/>
+
+ <!-- Specify a list of recipients for whom messages will be rejected -->
+ <!-- and what happens to rejected messages. -->
+ <!-- The list can be comma, tab or space delimited. -->
+ <!-- reject -->
+ <!-- if true, messages for users on the blacklist will be rejected -->
+ <!-- if false, messages for users on the blacklist will be accepted -->
+ <!-- and the Mail Attribute "org.apache.james.fetchmail.isBlacklistedRecipient" -->
+ <!-- will be added to the message. Use the HasMailAttribute matcher to detect them. -->
+ <!-- The following apply if reject="true" and a message is rejected... -->
+ <!-- leaveonserver -->
+ <!-- if true, messages will be left on the server -->
+ <!-- if false, messages will be deleted from the server -->
+ <!-- markseen -->
+ <!-- if true, messages left on the server will be marked as seen -->
+ <!-- if false, messages left on the server will not be marked as seen -->
+ <blacklist reject="true" leaveonserver="true" markseen="false">wibble@localhost, flobble@localhost</blacklist>
+
+ <!-- Specify if messages for users who are not defined to James should -->
+ <!-- be rejected and what happens to rejected messages. -->
+ <!-- reject -->
+ <!-- if true, messages for users who are not defined to James will be rejected -->
+ <!-- if false, messages for users who are not defined to James will be accepted -->
+ <!-- and the Mail Attribute "org.apache.james.fetchmail.isUserUndefined" -->
+ <!-- will be added to the message. Use the HasMailAttribute matcher to detect them. -->
+ <!-- The following apply if reject="true" and a message is rejected... -->
+ <!-- leaveonserver -->
+ <!-- if true, messages will be left on the server -->
+ <!-- if false, messages will be deleted from the server -->
+ <!-- markseen -->
+ <!-- if true, messages left on the server will be marked as seen -->
+ <!-- if false, messages left on the server will not be marked as seen -->
+ <userundefined reject="true" leaveonserver="true" markseen="false" />
+
+ <!-- Specify if messages for recipients on remote hosts should -->
+ <!-- be rejected and what happens to rejected messages. -->
+ <!-- reject -->
+ <!-- if true, messages for remote recipients will be rejected -->
+ <!-- if false, messages for remote recipients will be accepted -->
+ <!-- and the Mail Attribute "org.apache.james.fetchmail.isRemoteRecipient" -->
+ <!-- will be added to the message. Use the HasMailAttribute matcher to detect them. -->
+ <!-- The following apply if reject="true" and a message is rejected... -->
+ <!-- leaveonserver -->
+ <!-- if true, messages will be left on the server -->
+ <!-- if false, messages will be deleted from the server -->
+ <!-- markseen -->
+ <!-- if true, messages left on the server will be marked as seen -->
+ <!-- if false, messages left on the server will not be marked as seen -->
+ <remoterecipient reject="true" leaveonserver="true" markseen="false" />
+ </fetch>
+
+</fetchmail>
http://git-wip-us.apache.org/repos/asf/james-project/blob/ee131ea6/server/app/src/main/resources/hbase-site-template.xml
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/hbase-site-template.xml b/server/app/src/main/resources/hbase-site-template.xml
deleted file mode 100644
index 5363b42..0000000
--- a/server/app/src/main/resources/hbase-site-template.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-/**
- * Copyright 2010 The Apache Software Foundation
- *
- * 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 -->
-
-<configuration>
-</configuration>
http://git-wip-us.apache.org/repos/asf/james-project/blob/ee131ea6/server/app/src/main/resources/imapserver-template.xml
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/imapserver-template.xml b/server/app/src/main/resources/imapserver-template.xml
deleted file mode 100644
index cc2ab1b..0000000
--- a/server/app/src/main/resources/imapserver-template.xml
+++ /dev/null
@@ -1,77 +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 -->
-
-<imapservers>
-
- <!-- IMAP server is enabled by default -->
- <!-- Disabling blocks will stop them from listening, -->
- <!-- but does not free as many resources as removing them would -->
- <imapserver enabled="true">
-
- <jmxName>imapserver</jmxName>
-
- <!-- Configure this if you want to bind to a specific inetaddress -->
- <!-- port 143 is the well-known/IANA registered port for IMAP -->
- <!-- port 993 is the well-known/IANA registered port for IMAPS ie over SSL/TLS -->
- <!-- Please NOTE: you should add this IP also to your RemoteAddrNotInNetwork -->
- <!-- in order to avoid relay check for locally generated bounces -->
- <bind>0.0.0.0:143</bind>
-
- <connectionBacklog>200</connectionBacklog>
-
- <!-- Set to true to use TLS for the Socket.
- To use this you need to copy sunjce_provider.jar to /path/james/lib directory.
- -->
- <tls socketTLS="false" startTLS="false">
- <!-- To create a new keystore execute:
- keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
- -->
- <keystore>file://conf/keystore</keystore>
- <secret>yoursecret</secret>
- <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
- </tls>
-
- <!-- This is the name used by the server to identify itself in the IMAP -->
- <!-- protocol. If autodetect is TRUE, the server will discover its -->
- <!-- own host name and use that in the protocol. If discovery fails, -->
- <!-- the value of 'localhost' is used. If autodetect is FALSE, James -->
- <!-- will use the specified value. -->
- <!--
- <helloName autodetect="true">myMailServer</helloName>
- -->
-
- <!-- Connection timeout is 30 minutes and can not be changed - See rfc2060 5.4 for details -->
-
- <!-- Set the maximum simultaneous incoming connections for this service -->
- <connectionLimit>0</connectionLimit>
-
- <!-- Set the maximum simultaneous incoming connections per IP for this service -->
- <connectionLimitPerIP>0</connectionLimitPerIP>
-
- </imapserver>
-
-</imapservers>
http://git-wip-us.apache.org/repos/asf/james-project/blob/ee131ea6/server/app/src/main/resources/imapserver.xml
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/imapserver.xml b/server/app/src/main/resources/imapserver.xml
new file mode 100644
index 0000000..cc2ab1b
--- /dev/null
+++ b/server/app/src/main/resources/imapserver.xml
@@ -0,0 +1,77 @@
+<?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 -->
+
+<imapservers>
+
+ <!-- IMAP server is enabled by default -->
+ <!-- Disabling blocks will stop them from listening, -->
+ <!-- but does not free as many resources as removing them would -->
+ <imapserver enabled="true">
+
+ <jmxName>imapserver</jmxName>
+
+ <!-- Configure this if you want to bind to a specific inetaddress -->
+ <!-- port 143 is the well-known/IANA registered port for IMAP -->
+ <!-- port 993 is the well-known/IANA registered port for IMAPS ie over SSL/TLS -->
+ <!-- Please NOTE: you should add this IP also to your RemoteAddrNotInNetwork -->
+ <!-- in order to avoid relay check for locally generated bounces -->
+ <bind>0.0.0.0:143</bind>
+
+ <connectionBacklog>200</connectionBacklog>
+
+ <!-- Set to true to use TLS for the Socket.
+ To use this you need to copy sunjce_provider.jar to /path/james/lib directory.
+ -->
+ <tls socketTLS="false" startTLS="false">
+ <!-- To create a new keystore execute:
+ keytool -genkey -alias james -keyalg RSA -keystore /path/to/james/conf/keystore
+ -->
+ <keystore>file://conf/keystore</keystore>
+ <secret>yoursecret</secret>
+ <provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
+ </tls>
+
+ <!-- This is the name used by the server to identify itself in the IMAP -->
+ <!-- protocol. If autodetect is TRUE, the server will discover its -->
+ <!-- own host name and use that in the protocol. If discovery fails, -->
+ <!-- the value of 'localhost' is used. If autodetect is FALSE, James -->
+ <!-- will use the specified value. -->
+ <!--
+ <helloName autodetect="true">myMailServer</helloName>
+ -->
+
+ <!-- Connection timeout is 30 minutes and can not be changed - See rfc2060 5.4 for details -->
+
+ <!-- Set the maximum simultaneous incoming connections for this service -->
+ <connectionLimit>0</connectionLimit>
+
+ <!-- Set the maximum simultaneous incoming connections per IP for this service -->
+ <connectionLimitPerIP>0</connectionLimitPerIP>
+
+ </imapserver>
+
+</imapservers>
http://git-wip-us.apache.org/repos/asf/james-project/blob/ee131ea6/server/app/src/main/resources/indexer-template.xml
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/indexer-template.xml b/server/app/src/main/resources/indexer-template.xml
deleted file mode 100644
index 24c52e7..0000000
--- a/server/app/src/main/resources/indexer-template.xml
+++ /dev/null
@@ -1,33 +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 -->
-
-<indexer>
- <!-- supported providers are: -->
- <!-- lazyIndex, luceneIndex -->
- <!-- -->
- <provider>luceneIndex</provider>
-</indexer>
http://git-wip-us.apache.org/repos/asf/james-project/blob/ee131ea6/server/app/src/main/resources/indexer.xml
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/indexer.xml b/server/app/src/main/resources/indexer.xml
new file mode 100644
index 0000000..24c52e7
--- /dev/null
+++ b/server/app/src/main/resources/indexer.xml
@@ -0,0 +1,33 @@
+<?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 -->
+
+<indexer>
+ <!-- supported providers are: -->
+ <!-- lazyIndex, luceneIndex -->
+ <!-- -->
+ <provider>luceneIndex</provider>
+</indexer>
http://git-wip-us.apache.org/repos/asf/james-project/blob/ee131ea6/server/app/src/main/resources/james-database-template.properties
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/james-database-template.properties b/server/app/src/main/resources/james-database-template.properties
deleted file mode 100644
index 10d0a2a..0000000
--- a/server/app/src/main/resources/james-database-template.properties
+++ /dev/null
@@ -1,40 +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
-
-# See http://james.apache.org/server/3/config.html for usage
-
-# Use derby as default
-database.driverClassName=org.apache.derby.jdbc.EmbeddedDriver
-database.url=jdbc:derby:../var/store/derby;create=true
-database.username=app
-database.password=app
-
-# Supported adapters are:
-# DB2, DERBY, H2, HSQL, INFORMIX, MYSQL, ORACLE, POSTGRESQL, SQL_SERVER, SYBASE
-vendorAdapter.database=DERBY
-
-# 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
-# it.
-#
-# See:
-# http://openjpa.apache.org/builds/latest/docs/manual/ref_guide_mapping_jpa.html #7.11. LOB Streaming
-#
-openjpa.streaming=false
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/james-project/blob/ee131ea6/server/app/src/main/resources/james-database.properties
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/james-database.properties b/server/app/src/main/resources/james-database.properties
new file mode 100644
index 0000000..b3ac7eb
--- /dev/null
+++ b/server/app/src/main/resources/james-database.properties
@@ -0,0 +1,40 @@
+# 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
+
+# Use derby as default
+database.driverClassName=org.apache.derby.jdbc.EmbeddedDriver
+database.url=jdbc:derby:../var/store/derby;create=true
+database.username=app
+database.password=app
+
+# Supported adapters are:
+# DB2, DERBY, H2, HSQL, INFORMIX, MYSQL, ORACLE, POSTGRESQL, SQL_SERVER, SYBASE
+vendorAdapter.database=DERBY
+
+# 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
+# it.
+#
+# See:
+# http://openjpa.apache.org/builds/latest/docs/manual/ref_guide_mapping_jpa.html #7.11. LOB Streaming
+#
+openjpa.streaming=false
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/james-project/blob/ee131ea6/server/app/src/main/resources/jcr-repository-template.xml
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/jcr-repository-template.xml b/server/app/src/main/resources/jcr-repository-template.xml
deleted file mode 100644
index 96f99f7..0000000
--- a/server/app/src/main/resources/jcr-repository-template.xml
+++ /dev/null
@@ -1,72 +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 -->
-
-<!DOCTYPE Repository
- PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 2.0//EN"
- "http://jackrabbit.apache.org/dtd/repository-2.0.dtd">
-
-<Repository>
- <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
- <param name="path" value="${rep.home}/repository"/>
- </FileSystem>
- <DataStore class="org.apache.jackrabbit.core.data.FileDataStore"/>
- <Security appName="Jackrabbit">
- <SecurityManager class="org.apache.jackrabbit.core.security.simple.SimpleSecurityManager" workspaceName="security">
- </SecurityManager>
- <AccessManager class="org.apache.jackrabbit.core.security.simple.SimpleAccessManager">
- </AccessManager>
- <LoginModule class="org.apache.jackrabbit.core.security.simple.SimpleLoginModule">
- <param name="anonymousId" value="anonymous"/>
- <param name="adminId" value="admin"/>
- </LoginModule>
- </Security>
- <Workspaces rootPath="${rep.home}/workspaces" defaultWorkspace="james"/>
- <Workspace name="${wsp.name}">
- <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
- <param name="path" value="${wsp.home}"/>
- </FileSystem>
- <PersistenceManager class="org.apache.jackrabbit.core.persistence.pool.DerbyPersistenceManager">
- <param name="url" value="jdbc:derby:${wsp.home}/db;create=true"/>
- <param name="schemaObjectPrefix" value="${wsp.name}_"/>
- </PersistenceManager>
- <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
- <param name="path" value="${wsp.home}/index"/>
- <param name="supportHighlighting" value="true"/>
- </SearchIndex>
- </Workspace>
- <Versioning rootPath="${rep.home}/version">
- <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
- <param name="path" value="${rep.home}/version" />
- </FileSystem>
- <PersistenceManager class="org.apache.jackrabbit.core.persistence.pool.DerbyPersistenceManager">
- <param name="url" value="jdbc:derby:${rep.home}/version/db;create=true"/>
- <param name="schemaObjectPrefix" value="version_"/>
- </PersistenceManager>
- </Versioning>
- <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
- <param name="path" value="${rep.home}/repository/index"/>
- <param name="supportHighlighting" value="true"/>
- </SearchIndex>
-</Repository>
http://git-wip-us.apache.org/repos/asf/james-project/blob/ee131ea6/server/app/src/main/resources/jcr-repository.xml
----------------------------------------------------------------------
diff --git a/server/app/src/main/resources/jcr-repository.xml b/server/app/src/main/resources/jcr-repository.xml
new file mode 100644
index 0000000..96f99f7
--- /dev/null
+++ b/server/app/src/main/resources/jcr-repository.xml
@@ -0,0 +1,72 @@
+<?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 -->
+
+<!DOCTYPE Repository
+ PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 2.0//EN"
+ "http://jackrabbit.apache.org/dtd/repository-2.0.dtd">
+
+<Repository>
+ <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
+ <param name="path" value="${rep.home}/repository"/>
+ </FileSystem>
+ <DataStore class="org.apache.jackrabbit.core.data.FileDataStore"/>
+ <Security appName="Jackrabbit">
+ <SecurityManager class="org.apache.jackrabbit.core.security.simple.SimpleSecurityManager" workspaceName="security">
+ </SecurityManager>
+ <AccessManager class="org.apache.jackrabbit.core.security.simple.SimpleAccessManager">
+ </AccessManager>
+ <LoginModule class="org.apache.jackrabbit.core.security.simple.SimpleLoginModule">
+ <param name="anonymousId" value="anonymous"/>
+ <param name="adminId" value="admin"/>
+ </LoginModule>
+ </Security>
+ <Workspaces rootPath="${rep.home}/workspaces" defaultWorkspace="james"/>
+ <Workspace name="${wsp.name}">
+ <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
+ <param name="path" value="${wsp.home}"/>
+ </FileSystem>
+ <PersistenceManager class="org.apache.jackrabbit.core.persistence.pool.DerbyPersistenceManager">
+ <param name="url" value="jdbc:derby:${wsp.home}/db;create=true"/>
+ <param name="schemaObjectPrefix" value="${wsp.name}_"/>
+ </PersistenceManager>
+ <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+ <param name="path" value="${wsp.home}/index"/>
+ <param name="supportHighlighting" value="true"/>
+ </SearchIndex>
+ </Workspace>
+ <Versioning rootPath="${rep.home}/version">
+ <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
+ <param name="path" value="${rep.home}/version" />
+ </FileSystem>
+ <PersistenceManager class="org.apache.jackrabbit.core.persistence.pool.DerbyPersistenceManager">
+ <param name="url" value="jdbc:derby:${rep.home}/version/db;create=true"/>
+ <param name="schemaObjectPrefix" value="version_"/>
+ </PersistenceManager>
+ </Versioning>
+ <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+ <param name="path" value="${rep.home}/repository/index"/>
+ <param name="supportHighlighting" value="true"/>
+ </SearchIndex>
+</Repository>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org