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 bt...@apache.org on 2019/09/26 02:10:09 UTC

[james-project] 15/38: JAMES-2703 Clean server dockerfile sqlResources declarations

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 bcab768141dc9a2b60efcccf81277645092c07e6
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Tue Sep 10 10:19:09 2019 +0700

    JAMES-2703 Clean server dockerfile sqlResources declarations
    
    Remove SQL statement declaration for classes deleted in 3.4.0 release
---
 .../run/spring/destination/conf/sqlResources.xml   | 216 ---------------------
 1 file changed, 216 deletions(-)

diff --git a/dockerfiles/run/spring/destination/conf/sqlResources.xml b/dockerfiles/run/spring/destination/conf/sqlResources.xml
index 82cfa26..a5284d8 100644
--- a/dockerfiles/run/spring/destination/conf/sqlResources.xml
+++ b/dockerfiles/run/spring/destination/conf/sqlResources.xml
@@ -57,118 +57,6 @@
         <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. -->
@@ -823,109 +711,5 @@
         </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>
 


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org