This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 33ae78b83c185c0a6b26ca2ff35044e2d8f5e423
Author: Benoit Tellier <btell...@linagora.com>
AuthorDate: Tue Sep 10 10:18:18 2019 +0700
JAMES-2703 Clean server/app sqlResources declarations
Remove SQL statement declaration for classes deleted in 3.4.0 release
---
server/app/src/main/resources/sqlResources.xml | 298 -------------------------
1 file changed, 298 deletions(-)
diff --git a/server/app/src/main/resources/sqlResources.xml
b/server/app/src/main/resources/sqlResources.xml
index 4fe890c..1e67b51 100644
--- a/server/app/src/main/resources/sqlResources.xml
+++ b/server/app/src/main/resources/sqlResources.xml
@@ -112,133 +112,6 @@
<!-- If a named statement has a definition defined for the current database
product, -->
<!-- then that statement is used. Otherwise the default statement is used. -->
-<!-- SQL statements for the JamesUsersJdbcRepository -->
-<!-- -->
-<!-- The JamesUsersJdbcRepository allows James to use a JDBC compliant
database -->
-<!-- to hold user related data. This includes aliases, forward addresses, -->
-<!-- and password data. The last is stored as an irreversible hash. -->
-<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>
-
-<!-- SQL statements for the DefaultUsersJdbcRepository -->
-<!-- -->
-<!-- The DefaultUsersJdbcRepository allows James to use a JDBC compliant
database -->
-<!-- to hold user ids and password data. The password is stored as an
irreversible hash. -->
-<!-- Unlike the JamesUsersJdbcRepository, this repository implementation
doesn't support -->
-<!-- aliases or forwards. -->
-<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>
-
-<!-- SQL statements for the ListUsersJdbcRepository -->
-<!-- -->
-<!-- This class is used for basic list management. The database table can -->
-<!-- be used to store subscriber data for mulitple lists. -->
-<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>
-
<!-- SQL statements for the JdbcMailRepository -->
<sqlDefs name="org.apache.james.mailrepository.jdbc.JDBCMailRepository">
@@ -901,176 +774,5 @@
</sql>
</sqlDefs>
-<!-- SQL statements for the JdbcRecipientRewriteTable -->
-<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>
-
- <sql name="selectDomains">select distinct domain from
RecipientRewriteTable</sql>
-
- <sql name="selectDomain">select distinct domain from RecipientRewriteTable
where domain = ? </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>
-
-<!-- SQL statements for the JDBCDomainList -->
-<sqlDefs name="org.apache.james.domainlist.jdbc.JDBCDomainList">
- <sql name="selectDomains">select distinct domain from ${table} </sql>
-
- <sql name="selectDomain">select distinct domain from ${table} where domain
= ? </sql>
-
- <sql name="addDomain">insert into ${table} values (?) </sql>
-
- <sql name="removeDomain">delete from ${table} where domain = ? </sql>
-
- <!-- Statements used to create the table associated with this class.
-->
- <sql name="createTable" db="mysql">
- CREATE TABLE ${table} (
- domain varchar(100) NOT NULL default ''
- )
- </sql>
- <sql name="createTable" db="hypersonic">
- CREATE CACHED TABLE ${table} (
- user varchar(100) NOT NULL default ''
- )
- </sql>
- <sql name="createTable" db="hsqldb">
- CREATE CACHED TABLE ${table} (
- domain varchar(100) NOT NULL default ''
- )
- </sql>
- <sql name="createTable" db="mssql">
- CREATE TABLE [${table}] (
- [user] [domain] (100) NOT NULL default ''
- )
- </sql>
- <sql name="createTable" db="oracle">
- CREATE TABLE ${table} (
- domain varchar2(100) NOT NULL default ''
- )
- </sql>
- <sql name="createTable" db="postgresql">
- CREATE TABLE ${table} (
- domain varchar(64) NOT NULL default ''
- )
- </sql>
- <sql name="createTable" db="sapdb">
- CREATE TABLE ${table} (
- domain varchar(100) NOT NULL default '',
- )
- </sql>
- <sql name="createTable" db="db2">
- CREATE TABLE ${table} (
- domain varchar(100) NOT NULL default ''
- )
- </sql>
- <sql name="createTable" db="ingres">
- CREATE TABLE ${table} (
- domain varchar(100) NOT NULL default ''
- )
- </sql>
- <sql name="createTable" db="derby">
- CREATE TABLE ${table} (
- domain varchar (100) NOT NULL default ''
- )
- </sql>
-</sqlDefs>
</sqlResources>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
