Author: bago
Date: Wed Apr 25 04:51:33 2007
New Revision: 532327
URL: http://svn.apache.org/viewvc?view=rev&rev=532327
Log:
Changed default parameter for gateway username to gatewayUsername. Added
backward compatibility for lowercase parameter.
Added documentation to config.xml about the use of gatewayUsername and
gatewayPassword parameters.
Modified:
james/server/trunk/phoenix-deployment/src/conf/james-config.xml
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
Modified: james/server/trunk/phoenix-deployment/src/conf/james-config.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/conf/james-config.xml?view=diff&rev=532327&r1=532326&r2=532327
==============================================================================
--- james/server/trunk/phoenix-deployment/src/conf/james-config.xml (original)
+++ james/server/trunk/phoenix-deployment/src/conf/james-config.xml Wed Apr 25
04:51:33 2007
@@ -694,6 +694,12 @@
<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 -->
<!--
Modified:
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java?view=diff&rev=532327&r1=532326&r2=532327
==============================================================================
---
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
(original)
+++
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
Wed Apr 25 04:51:33 2007
@@ -314,7 +314,11 @@
if (isDebug) log("Adding SMTP gateway: " + server) ;
gatewayServer.add(server);
}
- authUser = getInitParameter("gatewayusername");
+ authUser = getInitParameter("gatewayUsername");
+ // backward compatibility with 2.3.x
+ if (authUser == null) {
+ authUser = getInitParameter("gatewayusername");
+ }
authPass = getInitParameter("gatewayPassword");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
