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 be...@apache.org on 2007/09/03 20:27:25 UTC
svn commit: r572400 - in
/james/server/sandbox/spring-integration/spring-deployment: ./
src/main/config/
Author: berndf
Date: Mon Sep 3 11:27:24 2007
New Revision: 572400
URL: http://svn.apache.org/viewvc?rev=572400&view=rev
Log:
update configuration files to latest from TRUNK and document how to do this
Modified:
james/server/sandbox/spring-integration/spring-deployment/HOW-TO.txt
james/server/sandbox/spring-integration/spring-deployment/src/main/config/james-assembly.xml
james/server/sandbox/spring-integration/spring-deployment/src/main/config/james-config.xml
james/server/sandbox/spring-integration/spring-deployment/src/main/config/james-fetchmail.xml
james/server/sandbox/spring-integration/spring-deployment/src/main/config/james-listmanager.xml
james/server/sandbox/spring-integration/spring-deployment/src/main/config/james-liststores.xml
james/server/sandbox/spring-integration/spring-deployment/src/main/config/james-smtphandlerchain.xml
james/server/sandbox/spring-integration/spring-deployment/src/main/config/mailboxManagerSqlResources.xml
james/server/sandbox/spring-integration/spring-deployment/src/main/config/miResources.xml
james/server/sandbox/spring-integration/spring-deployment/src/main/config/sqlResources.xml
Modified: james/server/sandbox/spring-integration/spring-deployment/HOW-TO.txt
URL: http://svn.apache.org/viewvc/james/server/sandbox/spring-integration/spring-deployment/HOW-TO.txt?rev=572400&r1=572399&r2=572400&view=diff
==============================================================================
--- james/server/sandbox/spring-integration/spring-deployment/HOW-TO.txt (original)
+++ james/server/sandbox/spring-integration/spring-deployment/HOW-TO.txt Mon Sep 3 11:27:24 2007
@@ -32,3 +32,25 @@
cd spring-integration/spring-deployment
ant run
+
+A. Updating configuration files
+
+The configuration files are taken nearly unchanged from James module 'phoenix-depoyment'.
+To update spring-deployment to latest from phoenix-deployment, copy files
+ james-assembly.xml
+ james-config.xml
+ james-fetchmail.xml
+ james-listmanager.xml
+ james-liststores.xml
+ james-xmtphandlerchain.xml
+ mailboxManagerSqlResources.xml
+ miResources.xml
+ sqlResources.xml
+from
+ trunk/phoenix-deployment/src/conf
+to
+ spring-deployment/src/main/config/
+and change all four entity definitions at the top of file
+ james-config.xml
+from "../conf/" to "./"
+
\ No newline at end of file
Modified: james/server/sandbox/spring-integration/spring-deployment/src/main/config/james-assembly.xml
URL: http://svn.apache.org/viewvc/james/server/sandbox/spring-integration/spring-deployment/src/main/config/james-assembly.xml?rev=572400&r1=572399&r2=572400&view=diff
==============================================================================
--- james/server/sandbox/spring-integration/spring-deployment/src/main/config/james-assembly.xml (original)
+++ james/server/sandbox/spring-integration/spring-deployment/src/main/config/james-assembly.xml Mon Sep 3 11:27:24 2007
@@ -1,24 +1,22 @@
<?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.
--->
-
+ 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.
+ -->
<assembly>
<!-- The list of blocks being run in this Phoenix server. -->
@@ -60,6 +58,7 @@
role="org.apache.james.mailboxmanager.manager.MailboxManagerProvider" />
</block>
+
<block name="mailboxmanager" class="org.apache.james.mailboxmanager.impl.DefaultMailboxManagerProvider">
<provide name="filesystem" role="org.apache.james.services.FileSystem" />
<provide name="mailboxmanager-mailstore" role="org.apache.avalon.cornerstone.services.store.Store" />
@@ -70,6 +69,7 @@
role="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector" />
<provide name="filesystem" role="org.apache.james.services.FileSystem" />
</block>
+
<!-- The James Spool Manager block -->
<block name="spoolmanager" class="org.apache.james.transport.JamesSpoolManager" >
Modified: james/server/sandbox/spring-integration/spring-deployment/src/main/config/james-config.xml
URL: http://svn.apache.org/viewvc/james/server/sandbox/spring-integration/spring-deployment/src/main/config/james-config.xml?rev=572400&r1=572399&r2=572400&view=diff
==============================================================================
--- james/server/sandbox/spring-integration/spring-deployment/src/main/config/james-config.xml (original)
+++ james/server/sandbox/spring-integration/spring-deployment/src/main/config/james-config.xml Mon Sep 3 11:27:24 2007
@@ -1,4 +1,22 @@
<?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.
+ -->
<!DOCTYPE config [
<!ENTITY listserverConfig SYSTEM "./james-listmanager.xml">
<!ENTITY listserverStores SYSTEM "./james-liststores.xml">
@@ -22,7 +40,7 @@
<!-- For production use you will probably need to make more extensive changes, see -->
<!-- http://james.apache.org/server/2.3.0/ -->
-<!-- $Revision: 481870 $ Committed on $Date: 2006-12-03 19:59:18 +0000 (So, 03 Dez 2006) $ by: $Author: joachim $ -->
+<!-- $Revision: 559572 $ Committed on $Date: 2007-07-25 21:40:47 +0200 (Wed, 25 Jul 2007) $ by: $Author: rdonkin $ -->
<config>
<James>
@@ -102,6 +120,13 @@
<!-- If not defaultdomain is set the first domain of the DomainList get used -->
<defaultDomain> localhost </defaultDomain>
+ <!-- This is the name used by the server to identify itself in the RemoteManager -->
+ <!-- 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. -->
+ <!-- Set the default helloName which is used in all services if not overridden in the specific service-->
+ <helloName autodetect="true">myMailServer</helloName>
</James>
<!--
@@ -187,7 +212,7 @@
<imapserver enabled="true">
<!-- port 993 is the well-known/IANA registered port for IMAPs ie over SSL/TLS -->
<!-- port 143 is the well-known/IANA registered port for Standard IMAP4 -->
- <port>143</port>
+ <port>10143</port>
<handler>
<!-- RFC 3501 requires a minimum timeout of 30 minutes -->
<connectiontimeout>1800000</connectiontimeout>
@@ -474,13 +499,7 @@
<processor> spam </processor>
<notice>550 Requested action not taken: rejected - see http://njabl.org/ </notice>
</mailet>
-
- <mailet match="InSpammerBlacklist=relays.ordb.org."
- class="ToProcessor">
- <processor> spam </processor>
- <notice>550 Requested action not taken: rejected - see http://www.ordb.org/ </notice>
- </mailet>
-
+
<!-- Sample matching to kill a message (send to Null) -->
<!--
<mailet match="RecipientIs=badboy@badhost" class="Null"/>
@@ -580,8 +599,11 @@
</mailet>
-->
+ <!-- Experimental quota Matcher -->
+ <!-- This matcher need to calculate the mailbox size everytime it is called. This can slow down things if there are many mails in -->
+ <!-- the mailbox. Some users also report big problems with the matcher if a JDBC based mailrepository is used. -->
<!-- Check if over quota -->
- <!--
+ <!--
<mailet match="RecipientIsOverFixedQuota=20M" class="Resend">
<sender>postmaster</sender>
<replyTo>postmaster</replyTo>
@@ -690,6 +712,17 @@
<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>
@@ -851,15 +884,17 @@
<servers>
<!--Enter ip address of your DNS server, one IP address per server -->
<!-- element. -->
- <server>169.254.11.1</server>
+ <!--
+ <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>false</autodiscover>
+ <autodiscover>true</autodiscover>
<authoritative>false</authoritative>
<!-- Maximum number of entries to maintain in the DNS cache -->
- <maxcachesize>0</maxcachesize>
+ <maxcachesize>50000</maxcachesize>
<!-- Uncomment this if you want James to try a single server for each -->
<!-- multihomed mx host. -->
@@ -887,7 +922,7 @@
<!-- Warning: If you are using fetchmail it is important to include the -->
<!-- fetched domains in the server name list to prevent looping. -->
<domainnames>
- <domainname>127.0.0.1</domainname>
+ <domainname>localhost</domainname>
</domainnames>
<autodetect>true</autodetect>
<autodetectIP>true</autodetectIP>
@@ -920,7 +955,9 @@
<!-- 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="false">myMailServer</helloName>
+ <!--
+ <helloName autodetect="true">myMailServer</helloName>
+ -->
<administrator_accounts>
<!-- CHECKME! -->
<!-- Change the default login/password. -->
@@ -957,7 +994,9 @@
<!-- 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="false">myMailServer</helloName>
+ <!--
+ <helloName autodetect="true">myMailServer</helloName>
+ -->
<connectiontimeout>120000</connectiontimeout>
</handler>
</pop3server>
@@ -986,7 +1025,9 @@
<!-- 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="false">myMailServer</helloName>
+ <!--
+ <helloName autodetect="true">myMailServer</helloName>
+ -->
<connectiontimeout>360000</connectiontimeout>
<!-- Uncomment this if you want to require SMTP authentication.
@@ -1084,7 +1125,9 @@
<!-- 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="false">myMailServer</helloName>
+ <!--
+ <helloName autodetect="true">myMailServer</helloName>
+ -->
<connectiontimeout>120000</connectiontimeout>
<!-- Set the authRequired value to true to enable authenticated NNTP -->
<authRequired>false</authRequired>
@@ -1482,10 +1525,19 @@
<!-- The VirtualUserTable Store block -->
<virtualusertable-store>
-
+ <!-- Configure VirtualUserTable stores here. -->
+ <!-- -->
+ <!-- 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. -->
+
<!-- The DefaultVirtualUserTable for storing James' VirtualUserTable mappings. -->
<!--
<table name="DefaultVirtualUserTable" class="org.apache.james.vut.XMLVirtualUserTable">
+ <recursiveMapping> true </recursiveMapping>
+ <mappingLimit> 10 </mappingLimit>
+
<mapping> some@domain=someuser </mapping>
</table>
-->
@@ -1499,6 +1551,8 @@
<!-- The DefaultVirtualUserTable for storing James' VirtualUserTable mappings. -->
<!-- TEMPORARY DEFAULT: db using Derby -->
<table name="DefaultVirtualUserTable" class="org.apache.james.vut.JDBCVirtualUserTable" destinationURL="db://maildb/VirtualUserTable">
+ <recursiveMapping> true </recursiveMapping>
+ <mappingLimit> 10 </mappingLimit>
<sqlFile>file://conf/sqlResources.xml</sqlFile>
</table>
</virtualusertable-store>
@@ -1528,7 +1582,7 @@
<!-- -->
<data-source name="maildb" class="org.apache.james.util.dbcp.JdbcDataSource">
<driver>org.apache.derby.jdbc.EmbeddedDriver</driver>
- <dburl>jdbc:derby:derbydb;create=true</dburl>
+ <dburl>jdbc:derby:../apps/james/var/derbydb;create=true</dburl>
<user></user>
<password></password>
<poolPreparedStatements>true</poolPreparedStatements>
Modified: james/server/sandbox/spring-integration/spring-deployment/src/main/config/james-fetchmail.xml
URL: http://svn.apache.org/viewvc/james/server/sandbox/spring-integration/spring-deployment/src/main/config/james-fetchmail.xml?rev=572400&r1=572399&r2=572400&view=diff
==============================================================================
--- james/server/sandbox/spring-integration/spring-deployment/src/main/config/james-fetchmail.xml (original)
+++ james/server/sandbox/spring-integration/spring-deployment/src/main/config/james-fetchmail.xml Mon Sep 3 11:27:24 2007
@@ -1,3 +1,22 @@
+<!--
+ 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.
+ -->
+
<!-- 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 -->
Modified: james/server/sandbox/spring-integration/spring-deployment/src/main/config/james-listmanager.xml
URL: http://svn.apache.org/viewvc/james/server/sandbox/spring-integration/spring-deployment/src/main/config/james-listmanager.xml?rev=572400&r1=572399&r2=572400&view=diff
==============================================================================
--- james/server/sandbox/spring-integration/spring-deployment/src/main/config/james-listmanager.xml (original)
+++ james/server/sandbox/spring-integration/spring-deployment/src/main/config/james-listmanager.xml Mon Sep 3 11:27:24 2007
@@ -1,3 +1,21 @@
+<!--
+ 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.
+ -->
<!-- Add a Manager and Processor for each list -->
<!-- TODO: add more examples -->
<!-- CHECKME: check the <resource> path -->
Modified: james/server/sandbox/spring-integration/spring-deployment/src/main/config/james-liststores.xml
URL: http://svn.apache.org/viewvc/james/server/sandbox/spring-integration/spring-deployment/src/main/config/james-liststores.xml?rev=572400&r1=572399&r2=572400&view=diff
==============================================================================
--- james/server/sandbox/spring-integration/spring-deployment/src/main/config/james-liststores.xml (original)
+++ james/server/sandbox/spring-integration/spring-deployment/src/main/config/james-liststores.xml Mon Sep 3 11:27:24 2007
@@ -1,3 +1,21 @@
+<!--
+ 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.
+ -->
<!-- Mailing list repositories -->
<!-- Add a user repository for each list -->
<!-- TODO: add more examples -->
Modified: james/server/sandbox/spring-integration/spring-deployment/src/main/config/james-smtphandlerchain.xml
URL: http://svn.apache.org/viewvc/james/server/sandbox/spring-integration/spring-deployment/src/main/config/james-smtphandlerchain.xml?rev=572400&r1=572399&r2=572400&view=diff
==============================================================================
--- james/server/sandbox/spring-integration/spring-deployment/src/main/config/james-smtphandlerchain.xml (original)
+++ james/server/sandbox/spring-integration/spring-deployment/src/main/config/james-smtphandlerchain.xml Mon Sep 3 11:27:24 2007
@@ -1,3 +1,21 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ -->
<!-- The configuration handler chain -->
<!-- Please note that this is EXPERIMENTAL and will be changed in future -->
<!-- releases -->
@@ -49,7 +67,6 @@
<blacklist> sbl-xbl.spamhaus.org. </blacklist>
<blacklist> dul.dnsbl.sorbs.net. </blacklist>
<blacklist> list.dsbl.org. </blacklist>
- <blacklist> relays.ordb.org. </blacklist>
</rblservers>
</handler>
-->
Modified: james/server/sandbox/spring-integration/spring-deployment/src/main/config/mailboxManagerSqlResources.xml
URL: http://svn.apache.org/viewvc/james/server/sandbox/spring-integration/spring-deployment/src/main/config/mailboxManagerSqlResources.xml?rev=572400&r1=572399&r2=572400&view=diff
==============================================================================
--- james/server/sandbox/spring-integration/spring-deployment/src/main/config/mailboxManagerSqlResources.xml (original)
+++ james/server/sandbox/spring-integration/spring-deployment/src/main/config/mailboxManagerSqlResources.xml Mon Sep 3 11:27:24 2007
@@ -1,4 +1,22 @@
-<!-- SQL Statements used by MailboxManager for database access. -->
+<!--
+ 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.
+ -->
+ <!-- SQL Statements used by MailboxManager for database access. -->
<sqlResources>
<!--
Modified: james/server/sandbox/spring-integration/spring-deployment/src/main/config/miResources.xml
URL: http://svn.apache.org/viewvc/james/server/sandbox/spring-integration/spring-deployment/src/main/config/miResources.xml?rev=572400&r1=572399&r2=572400&view=diff
==============================================================================
--- james/server/sandbox/spring-integration/spring-deployment/src/main/config/miResources.xml (original)
+++ james/server/sandbox/spring-integration/spring-deployment/src/main/config/miResources.xml Mon Sep 3 11:27:24 2007
@@ -1,4 +1,22 @@
-<!-- XML resources for mailing lists -->
+<!--
+ 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.
+ -->
+ <!-- XML resources for mailing lists -->
<resources>
<matchers>
<matcher for="custom" match="My Custom List"/>
Modified: james/server/sandbox/spring-integration/spring-deployment/src/main/config/sqlResources.xml
URL: http://svn.apache.org/viewvc/james/server/sandbox/spring-integration/spring-deployment/src/main/config/sqlResources.xml?rev=572400&r1=572399&r2=572400&view=diff
==============================================================================
--- james/server/sandbox/spring-integration/spring-deployment/src/main/config/sqlResources.xml (original)
+++ james/server/sandbox/spring-integration/spring-deployment/src/main/config/sqlResources.xml Mon Sep 3 11:27:24 2007
@@ -1,3 +1,21 @@
+<!--
+ 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.
+ -->
<!-- SQL Statements used by James for database access. -->
<sqlResources>
@@ -706,6 +724,13 @@
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">
@@ -729,6 +754,13 @@
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">
@@ -749,6 +781,12 @@
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>
<!-- SQL statements to support the WhiteListManager mailet and the IsInWhiteList matcher -->
@@ -990,8 +1028,8 @@
<sqlDefs name="org.apache.james.vut.JDBCVirtualUserTable">
<!-- Statements used to check whether a particular message exists in this repository. -->
- <sql name="selectMappings" db="derby">select VirtualUserTable.target_address,(VirtualUserTable."user" || '@' ||VirtualUserTable.domain) from VirtualUserTable, VirtualUserTable as VUTDomains where ((VirtualUserTable."user") like ? or (VirtualUserTable."user") like '%') and (VirtualUserTable.domain like ? or (VirtualUserTable.domain like '%' and VUTDomains.domain like ?)) order by 2 desc</sql>
- <sql name="selectMappings">select VirtualUserTable.target_address from VirtualUserTable, VirtualUserTable as VUTDomains where (VirtualUserTable.user like ? or VirtualUserTable.user like '%') and (VirtualUserTable.domain like ? or (VirtualUserTable.domain like '%' and VUTDomains.domain like ?)) order by concat(VirtualUserTable.user,'@',VirtualUserTable.domain) desc limit 1" </sql>
+ <sql name="selectMappings" db="derby">select VirtualUserTable.target_address,(VirtualUserTable."user" || '@' ||VirtualUserTable.domain) from VirtualUserTable, VirtualUserTable as VUTDomains where ((VirtualUserTable."user") like ? or (VirtualUserTable."user") like '\%' escape '\') and (VirtualUserTable.domain like ? or (VirtualUserTable.domain like '\%' escape '\' and VUTDomains.domain like ?)) order by 2 desc</sql>
+ <sql name="selectMappings">select VirtualUserTable.target_address from VirtualUserTable, VirtualUserTable as VUTDomains where (VirtualUserTable.user like ? or VirtualUserTable.user like '\%') and (VirtualUserTable.domain like ? or (VirtualUserTable.domain like '\%' and VUTDomains.domain like ?)) order by concat(VirtualUserTable.user,'@',VirtualUserTable.domain) desc limit 1</sql>
<sql name="selectUserDomainMapping" db="derby">select VirtualUserTable.target_address from VirtualUserTable where VirtualUserTable."user" = ? and VirtualUserTable.domain = ? </sql>
<sql name="selectUserDomainMapping">select VirtualUserTable.target_address from VirtualUserTable where VirtualUserTable.user = ? and VirtualUserTable.domain = ? </sql>
@@ -1051,7 +1089,7 @@
PRIMARY KEY (user,domain)
)
</sql>
- <sql name="createTable" db="postgresql">
+ <sql name="createTable" db="sapdb">
CREATE TABLE VirtualUserTable (
user varchar(64) NOT NULL default '',
domain varchar(255) NOT NULL default '',
@@ -1059,7 +1097,7 @@
PRIMARY KEY (user,domain)
)
</sql>
- <sql name="createTable" db="sapdb">
+ <sql name="createTable" db="db2">
CREATE TABLE VirtualUserTable (
user varchar(64) NOT NULL default '',
domain varchar(255) NOT NULL default '',
@@ -1067,7 +1105,7 @@
PRIMARY KEY (user,domain)
)
</sql>
- <sql name="createTable" db="db2">
+ <sql name="createTable" db="ingres">
CREATE TABLE VirtualUserTable (
user varchar(64) NOT NULL default '',
domain varchar(255) NOT NULL default '',
@@ -1075,15 +1113,15 @@
PRIMARY KEY (user,domain)
)
</sql>
- <sql name="createTable" db="ingres">
+ -->
+ <sql name="createTable" db="postgresql">
CREATE TABLE VirtualUserTable (
- user varchar(64) NOT NULL default '',
+ "user" varchar(64) NOT NULL default '',
domain varchar(255) NOT NULL default '',
target_address varchar(255) NOT NULL default '',
- PRIMARY KEY (user,domain)
+ PRIMARY KEY ("user",domain)
)
</sql>
- -->
<sql name="createTable" db="derby">
CREATE TABLE VirtualUserTable (
"user" varchar (64) NOT NULL default '',
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org