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 no...@apache.org on 2010/12/18 11:50:00 UTC
svn commit: r1050613 - in /james/server/trunk: ./ container-spring/
container-spring/src/main/config/examples/
container-spring/src/main/config/james/ domainlist-jdbc/
Author: norman
Date: Sat Dec 18 10:50:00 2010
New Revision: 1050613
URL: http://svn.apache.org/viewvc?rev=1050613&view=rev
Log:
Remove domainlist-jdbc
Removed:
james/server/trunk/domainlist-jdbc/
Modified:
james/server/trunk/container-spring/pom.xml
james/server/trunk/container-spring/src/main/config/examples/domainlist.xml
james/server/trunk/container-spring/src/main/config/examples/sqlResources.xml
james/server/trunk/container-spring/src/main/config/james/sqlResources.xml
james/server/trunk/pom.xml
Modified: james/server/trunk/container-spring/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/pom.xml?rev=1050613&r1=1050612&r2=1050613&view=diff
==============================================================================
--- james/server/trunk/container-spring/pom.xml (original)
+++ james/server/trunk/container-spring/pom.xml Sat Dec 18 10:50:00 2010
@@ -594,11 +594,6 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-domainlist-jdbc</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-domainlist-jpa</artifactId>
<scope>runtime</scope>
</dependency>
Modified: james/server/trunk/container-spring/src/main/config/examples/domainlist.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/examples/domainlist.xml?rev=1050613&r1=1050612&r2=1050613&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/config/examples/domainlist.xml (original)
+++ james/server/trunk/container-spring/src/main/config/examples/domainlist.xml Sat Dec 18 10:50:00 2010
@@ -56,14 +56,3 @@
</domainlist>
-->
-<!-- JDBC implementation for DomainList. This is deprecated and should not be used. -->
-<!-- Use JPADomainList if you need a db backend DomainList -->
-<!--
-<domainlist class="org.apache.james.domainlist.jdbc.JDBCDomainList">
- <repositoryPath>db://maildb/domain</repositoryPath>
- <sqlFile>file://conf/sqlResources.xml</sqlFile>
- <autodetect>true</autodetect>
- <autodetectIP>true</autodetectIP>
- <defaultDomain>localhost</defaultDomain>
-</domainlist>
--->
Modified: james/server/trunk/container-spring/src/main/config/examples/sqlResources.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/examples/sqlResources.xml?rev=1050613&r1=1050612&r2=1050613&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/config/examples/sqlResources.xml (original)
+++ james/server/trunk/container-spring/src/main/config/examples/sqlResources.xml Sat Dec 18 10:50:00 2010
@@ -997,68 +997,5 @@
)
</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>
Modified: james/server/trunk/container-spring/src/main/config/james/sqlResources.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/james/sqlResources.xml?rev=1050613&r1=1050612&r2=1050613&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/config/james/sqlResources.xml (original)
+++ james/server/trunk/container-spring/src/main/config/james/sqlResources.xml Sat Dec 18 10:50:00 2010
@@ -929,67 +929,5 @@
</sql>
</sqlDefs>
-<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>
Modified: james/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=1050613&r1=1050612&r2=1050613&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Sat Dec 18 10:50:00 2010
@@ -41,7 +41,6 @@
<module>imapserver</module>
<module>lmtpserver</module>
<module>domainlist-api</module>
- <module>domainlist-jdbc</module>
<module>domainlist-jpa</module>
<module>domainlist-library</module>
<module>domainlist-xml</module>
@@ -510,11 +509,6 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-domainlist-jdbc</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-domainlist-jpa</artifactId>
<version>${project.version}</version>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org