Author: rdonkin
Date: Mon Sep 7 06:20:12 2009
New Revision: 812004
URL: http://svn.apache.org/viewvc?rev=812004&view=rev
Log:
More concise naming
Added:
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPConfiguration.java
- copied, changed from r812001,
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandlerConfigurationData.java
Removed:
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandlerConfigurationData.java
Modified:
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/AbstractSMTPSession.java
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
Copied:
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPConfiguration.java
(from r812001,
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandlerConfigurationData.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPConfiguration.java?p2=james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPConfiguration.java&p1=james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandlerConfigurationData.java&r1=812001&r2=812004&rev=812004&view=diff
==============================================================================
---
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandlerConfigurationData.java
(original)
+++
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPConfiguration.java
Mon Sep 7 06:20:12 2009
@@ -27,7 +27,7 @@
* SMTPHandlers
*
*/
-public interface SMTPHandlerConfigurationData {
+public interface SMTPConfiguration {
/**
* Returns the service wide hello name
Modified:
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandler.java?rev=812004&r1=812003&r2=812004&view=diff
==============================================================================
---
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandler.java
(original)
+++
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPHandler.java
Mon Sep 7 06:20:12 2009
@@ -75,7 +75,7 @@
*/
private final LinkedList<ConnectHandler> connectHandlers;
- private SMTPHandlerConfigurationData theConfigData;
+ private SMTPConfiguration theConfigData;
private boolean relayingAllowed;
@@ -99,8 +99,8 @@
* @param theData the per-service configuration data for this handler
*/
public void setConfigurationData(Object theData) {
- if (theData instanceof SMTPHandlerConfigurationData) {
- theConfigData = (SMTPHandlerConfigurationData) theData;
+ if (theData instanceof SMTPConfiguration) {
+ theConfigData = (SMTPConfiguration) theData;
} else {
throw new IllegalArgumentException("Configuration object does not
implement SMTPHandlerConfigurationData");
}
@@ -282,7 +282,7 @@
/**
* @see org.apache.james.smtpserver.SMTPSession#getConfigurationData()
*/
- public SMTPHandlerConfigurationData getConfigurationData() {
+ public SMTPConfiguration getConfigurationData() {
return theConfigData;
}
/**
Modified:
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java?rev=812004&r1=812003&r2=812004&view=diff
==============================================================================
---
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java
(original)
+++
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java
Mon Sep 7 06:20:12 2009
@@ -119,7 +119,7 @@
/**
* The configuration data to be passed to the handler
*/
- private SMTPHandlerConfigurationData theConfigData
+ private SMTPConfiguration theConfigData
= new SMTPHandlerConfigurationDataImpl();
private ServiceManager serviceManager;
@@ -287,10 +287,10 @@
/**
* A class to provide SMTP handler configuration to the handlers
*/
- private class SMTPHandlerConfigurationDataImpl implements
SMTPHandlerConfigurationData {
+ private class SMTPHandlerConfigurationDataImpl implements
SMTPConfiguration {
/**
- * @see
org.apache.james.smtpserver.SMTPHandlerConfigurationData#getHelloName()
+ * @see org.apache.james.smtpserver.SMTPConfiguration#getHelloName()
*/
public String getHelloName() {
if (SMTPServer.this.helloName == null) {
@@ -301,21 +301,21 @@
}
/**
- * @see
org.apache.james.smtpserver.SMTPHandlerConfigurationData#getResetLength()
+ * @see org.apache.james.smtpserver.SMTPConfiguration#getResetLength()
*/
public int getResetLength() {
return SMTPServer.this.lengthReset;
}
/**
- * @see
org.apache.james.smtpserver.SMTPHandlerConfigurationData#getMaxMessageSize()
+ * @see
org.apache.james.smtpserver.SMTPConfiguration#getMaxMessageSize()
*/
public long getMaxMessageSize() {
return SMTPServer.this.maxMessageSize;
}
/**
- * @see
org.apache.james.smtpserver.SMTPHandlerConfigurationData#isAuthSupported(String)
+ * @see
org.apache.james.smtpserver.SMTPConfiguration#isAuthSupported(String)
*/
public boolean isRelayingAllowed(String remoteIP) {
boolean relayingAllowed = false;
@@ -326,7 +326,7 @@
}
/**
- * @see
org.apache.james.smtpserver.SMTPHandlerConfigurationData#useHeloEhloEnforcement()
+ * @see
org.apache.james.smtpserver.SMTPConfiguration#useHeloEhloEnforcement()
*/
public boolean useHeloEhloEnforcement() {
return SMTPServer.this.heloEhloEnforcement;
@@ -334,14 +334,14 @@
/**
- * @see
org.apache.james.smtpserver.SMTPHandlerConfigurationData#getSMTPGreeting()
+ * @see org.apache.james.smtpserver.SMTPConfiguration#getSMTPGreeting()
*/
public String getSMTPGreeting() {
return SMTPServer.this.smtpGreeting;
}
/**
- * @see
org.apache.james.smtpserver.SMTPHandlerConfigurationData#useAddressBracketsEnforcement()
+ * @see
org.apache.james.smtpserver.SMTPConfiguration#useAddressBracketsEnforcement()
*/
public boolean useAddressBracketsEnforcement() {
return SMTPServer.this.addressBracketsEnforcement;
Modified:
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/AbstractSMTPSession.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/AbstractSMTPSession.java?rev=812004&r1=812003&r2=812004&view=diff
==============================================================================
---
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/AbstractSMTPSession.java
(original)
+++
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/AbstractSMTPSession.java
Mon Sep 7 06:20:12 2009
@@ -31,7 +31,7 @@
/**
* @see org.apache.james.smtpserver.SMTPSession#getConfigurationData()
*/
- public SMTPHandlerConfigurationData getConfigurationData() {
+ public SMTPConfiguration getConfigurationData() {
throw new UnsupportedOperationException("Unimplemented Stub Method");
}
Modified:
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java?rev=812004&r1=812003&r2=812004&view=diff
==============================================================================
---
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
(original)
+++
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
Mon Sep 7 06:20:12 2009
@@ -61,7 +61,7 @@
handler.setUsers(users);
}
- private SMTPSession setupMockedSMTPSession(final
SMTPHandlerConfigurationData conf, final MailAddress rcpt, final boolean
relayingAllowed) {
+ private SMTPSession setupMockedSMTPSession(final SMTPConfiguration conf,
final MailAddress rcpt, final boolean relayingAllowed) {
SMTPSession session = new AbstractSMTPSession() {
HashMap state = new HashMap();
@@ -99,8 +99,8 @@
return table;
}
- private SMTPHandlerConfigurationData setupMockedSMTPConfiguration() {
- SMTPHandlerConfigurationData conf = new SMTPHandlerConfigurationData()
{
+ private SMTPConfiguration setupMockedSMTPConfiguration() {
+ SMTPConfiguration conf = new SMTPConfiguration() {
public String getHelloName() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
