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 2011/10/27 18:29:11 UTC
svn commit: r1189846 - in /james/protocols/trunk:
lmtp/src/main/java/org/apache/james/protocols/lmtp/
smtp/src/main/java/org/apache/james/protocols/smtp/
Author: norman
Date: Thu Oct 27 16:29:10 2011
New Revision: 1189846
URL: http://svn.apache.org/viewvc?rev=1189846&view=rev
Log:
Simplify starttls configuration
Modified:
james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfiguration.java
james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfigurationImpl.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPConfiguration.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPConfigurationImpl.java
Modified: james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfiguration.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfiguration.java?rev=1189846&r1=1189845&r2=1189846&view=diff
==============================================================================
--- james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfiguration.java (original)
+++ james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfiguration.java Thu Oct 27 16:29:10 2011
@@ -22,14 +22,6 @@ import org.apache.james.protocols.smtp.S
public abstract class LMTPConfiguration implements SMTPConfiguration{
-
-
- @Override
- public int getResetLength() {
- return -1;
- }
-
-
@Override
public boolean isRelayingAllowed(String remoteIP) {
return false;
@@ -49,13 +41,4 @@ public abstract class LMTPConfiguration
public boolean useAddressBracketsEnforcement() {
return false;
}
-
-
- @Override
- public boolean isStartTLSSupported() {
- return false;
- }
-
-
-
}
Modified: james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfigurationImpl.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfigurationImpl.java?rev=1189846&r1=1189845&r2=1189846&view=diff
==============================================================================
--- james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfigurationImpl.java (original)
+++ james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPConfigurationImpl.java Thu Oct 27 16:29:10 2011
@@ -23,6 +23,7 @@ public class LMTPConfigurationImpl exten
private String helloName = "localhost";
private long maxMessageSize = 0;
private String greeting = "JAMES Protocols LMTP Server";
+ private boolean startTLSsupported = false;
@Override
public String getHelloName() {
@@ -52,4 +53,13 @@ public class LMTPConfigurationImpl exten
public void setGreeting(String greeting) {
this.greeting = greeting;
}
+
+ @Override
+ public boolean isStartTLSSupported() {
+ return startTLSsupported;
+ }
+
+ public void setStartTLSSupported(boolean startTLSsupported) {
+ this.startTLSsupported = startTLSsupported;
+ }
}
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPConfiguration.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPConfiguration.java?rev=1189846&r1=1189845&r2=1189846&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPConfiguration.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPConfiguration.java Thu Oct 27 16:29:10 2011
@@ -37,14 +37,6 @@ public interface SMTPConfiguration {
String getHelloName();
/**
- * Returns the service wide reset length in bytes.
- *
- * @return the reset length
- */
- @Deprecated
- int getResetLength();
-
- /**
* Returns the service wide maximum message size in bytes.
*
* @return the maximum message size
@@ -92,7 +84,9 @@ public interface SMTPConfiguration {
boolean useAddressBracketsEnforcement();
/**
+ * Return <code>true</code> if STARTTLS is supported.
*
+ * @return starttls
*/
boolean isStartTLSSupported();
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPConfigurationImpl.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPConfigurationImpl.java?rev=1189846&r1=1189845&r2=1189846&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPConfigurationImpl.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPConfigurationImpl.java Thu Oct 27 16:29:10 2011
@@ -28,15 +28,12 @@ public class SMTPConfigurationImpl imple
private boolean bracketsEnforcement = true;
private String greeting = "JAMES SMTP Protocols";
private boolean enforceHeloEhlo = true;
+ private boolean startTLSsupported = false;
public String getHelloName() {
return helloName;
}
- public int getResetLength() {
- return -1;
- }
-
public long getMaxMessageSize() {
return maxMessageSize;
}
@@ -76,8 +73,12 @@ public class SMTPConfigurationImpl imple
}
+ @Override
public boolean isStartTLSSupported() {
- return false;
+ return startTLSsupported;
}
+ public void setStartTLSSupported(boolean startTLSsupported) {
+ this.startTLSsupported = startTLSsupported;
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org