Author: bago
Date: Sun Oct 18 12:34:15 2009
New Revision: 826423
URL: http://svn.apache.org/viewvc?rev=826423&view=rev
Log:
addProperty works differently than I thought. Fixing the broken code (from the
previous commit).
Added:
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ProtocolHandlerChain.java
- copied, changed from r826417,
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/AbstractHandlerChain.java
Removed:
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/AbstractHandlerChain.java
Modified:
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3HandlerChain.java
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Server.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManager.java
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandlerChain.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServerComposed.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AsyncSMTPServer.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/SMTPHandlerChain.java
Modified:
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3HandlerChain.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3HandlerChain.java?rev=826423&r1=826422&r2=826423&view=diff
==============================================================================
---
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3HandlerChain.java
(original)
+++
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3HandlerChain.java
Sun Oct 18 12:34:15 2009
@@ -22,17 +22,17 @@
package org.apache.james.pop3server;
import org.apache.james.pop3server.core.CoreCmdHandlerLoader;
-import org.apache.james.socket.shared.AbstractHandlerChain;
+import org.apache.james.socket.shared.ProtocolHandlerChain;
import org.apache.james.socket.shared.LogEnabled;
/**
* The POP3HandlerChain is per service object providing access
* ConnectHandlers and Commandhandlers
*/
-public class POP3HandlerChain extends AbstractHandlerChain implements
LogEnabled{
+public class POP3HandlerChain extends ProtocolHandlerChain implements
LogEnabled{
/**
- * @see
org.apache.james.socket.shared.AbstractHandlerChain#getCoreCmdHandlerLoader()
+ * @see
org.apache.james.socket.shared.ProtocolHandlerChain#getCoreCmdHandlerLoader()
*/
protected Class<?> getCoreCmdHandlerLoader() {
return CoreCmdHandlerLoader.class;
Modified:
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Server.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Server.java?rev=826423&r1=826422&r2=826423&view=diff
==============================================================================
---
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Server.java
(original)
+++
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Server.java
Sun Oct 18 12:34:15 2009
@@ -131,8 +131,8 @@
//read from the XML configuration and create and configure each of the
handlers
JamesConfiguration jamesConfiguration = new
JamesConfiguration(handlerConfiguration.getChild("handlerchain"));
- if (jamesConfiguration.getProperty("coreHandlersPackage") == null)
- jamesConfiguration.addProperty("coreHandlersPackage",
CoreCmdHandlerLoader.class.getName());
+ if (jamesConfiguration.getString("@coreHandlersPackage") == null)
+ jamesConfiguration.addProperty("/ @coreHandlersPackage",
CoreCmdHandlerLoader.class.getName());
handlerChain.configure(jamesConfiguration);
}
Modified:
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManager.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManager.java?rev=826423&r1=826422&r2=826423&view=diff
==============================================================================
---
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManager.java
(original)
+++
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManager.java
Sun Oct 18 12:34:15 2009
@@ -154,8 +154,8 @@
//read from the XML configuration and create and configure each of the
handlers
JamesConfiguration jamesConfiguration = new
JamesConfiguration(handlerConfiguration.getChild("handlerchain"));
- if (jamesConfiguration.getProperty("coreHandlersPackage") == null)
- jamesConfiguration.addProperty("coreHandlersPackage",
CoreCmdHandlerLoader.class.getName());
+ if (jamesConfiguration.getString("@coreHandlersPackage") == null)
+ jamesConfiguration.addProperty("/ @coreHandlersPackage",
CoreCmdHandlerLoader.class.getName());
handlerChain.configure(jamesConfiguration);
}
Modified:
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandlerChain.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandlerChain.java?rev=826423&r1=826422&r2=826423&view=diff
==============================================================================
---
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandlerChain.java
(original)
+++
james/server/trunk/remotemanager-function/src/main/java/org/apache/james/remotemanager/RemoteManagerHandlerChain.java
Sun Oct 18 12:34:15 2009
@@ -20,14 +20,14 @@
package org.apache.james.remotemanager;
import org.apache.james.remotemanager.core.CoreCmdHandlerLoader;
-import org.apache.james.socket.shared.AbstractHandlerChain;
+import org.apache.james.socket.shared.ProtocolHandlerChain;
import org.apache.james.socket.shared.LogEnabled;
-public class RemoteManagerHandlerChain extends AbstractHandlerChain implements
LogEnabled{
+public class RemoteManagerHandlerChain extends ProtocolHandlerChain implements
LogEnabled{
/**
* (non-Javadoc)
- * @see
org.apache.james.socket.shared.AbstractHandlerChain#getCoreCmdHandlerLoader()
+ * @see
org.apache.james.socket.shared.ProtocolHandlerChain#getCoreCmdHandlerLoader()
*/
protected Class<?> getCoreCmdHandlerLoader() {
return CoreCmdHandlerLoader.class;
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=826423&r1=826422&r2=826423&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
Sun Oct 18 12:34:15 2009
@@ -244,8 +244,8 @@
//read from the XML configuration and create and configure each of the
handlers
JamesConfiguration jamesConfiguration = new
JamesConfiguration(handlerConfiguration.getChild("handlerchain"));
- if (jamesConfiguration.getProperty("coreHandlersPackage") == null)
- jamesConfiguration.addProperty("coreHandlersPackage",
CoreCmdHandlerLoader.class.getName());
+ if (jamesConfiguration.getString("@coreHandlersPackage") == null)
+ jamesConfiguration.addProperty("/ @coreHandlersPackage",
CoreCmdHandlerLoader.class.getName());
handlerChain.configure(jamesConfiguration);
}
Modified:
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServerComposed.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServerComposed.java?rev=826423&r1=826422&r2=826423&view=diff
==============================================================================
---
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServerComposed.java
(original)
+++
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServerComposed.java
Sun Oct 18 12:34:15 2009
@@ -270,8 +270,8 @@
//read from the XML configuration and create and configure each of the
handlers
JamesConfiguration jamesConfiguration = new
JamesConfiguration(handlerConfiguration.getChild("handlerchain"));
- if (jamesConfiguration.getProperty("coreHandlersPackage") == null)
- jamesConfiguration.addProperty("coreHandlersPackage",
CoreCmdHandlerLoader.class.getName());
+ if (jamesConfiguration.getString("@coreHandlersPackage") == null)
+ jamesConfiguration.addProperty("/ @coreHandlersPackage",
CoreCmdHandlerLoader.class.getName());
handlerChain.configure(jamesConfiguration);
}
Modified:
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AsyncSMTPServer.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AsyncSMTPServer.java?rev=826423&r1=826422&r2=826423&view=diff
==============================================================================
---
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AsyncSMTPServer.java
(original)
+++
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AsyncSMTPServer.java
Sun Oct 18 12:34:15 2009
@@ -200,8 +200,8 @@
//read from the XML configuration and create and configure each of the
handlers
JamesConfiguration jamesConfiguration = new
JamesConfiguration(handlerConfiguration.getChild("handlerchain"));
- if (jamesConfiguration.getProperty("coreHandlersPackage") == null)
- jamesConfiguration.addProperty("coreHandlersPackage",
CoreCmdHandlerLoader.class.getName());
+ if (jamesConfiguration.getString("@coreHandlersPackage") == null)
+ jamesConfiguration.addProperty("/ @coreHandlersPackage",
CoreCmdHandlerLoader.class.getName());
handlerChain.configure(jamesConfiguration);
}
Modified:
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/SMTPHandlerChain.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/SMTPHandlerChain.java?rev=826423&r1=826422&r2=826423&view=diff
==============================================================================
---
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/SMTPHandlerChain.java
(original)
+++
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/SMTPHandlerChain.java
Sun Oct 18 12:34:15 2009
@@ -20,17 +20,17 @@
package org.apache.james.smtpserver.protocol;
import org.apache.james.smtpserver.protocol.core.CoreCmdHandlerLoader;
-import org.apache.james.socket.shared.AbstractHandlerChain;
+import org.apache.james.socket.shared.ProtocolHandlerChain;
import org.apache.james.socket.shared.LogEnabled;
/**
* The SMTPHandlerChain is per service object providing access
* ConnectHandlers, Command handlers and message handlers
*/
-public class SMTPHandlerChain extends AbstractHandlerChain implements
LogEnabled{
+public class SMTPHandlerChain extends ProtocolHandlerChain implements
LogEnabled{
/**
- * @see
org.apache.james.socket.shared.AbstractHandlerChain#getCoreCmdHandlerLoader()
+ * @see
org.apache.james.socket.shared.ProtocolHandlerChain#getCoreCmdHandlerLoader()
*/
protected Class<?> getCoreCmdHandlerLoader() {
return CoreCmdHandlerLoader.class;
Copied:
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ProtocolHandlerChain.java
(from r826417,
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/AbstractHandlerChain.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ProtocolHandlerChain.java?p2=james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ProtocolHandlerChain.java&p1=james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/AbstractHandlerChain.java&r1=826417&r2=826423&rev=826423&view=diff
==============================================================================
---
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/AbstractHandlerChain.java
(original)
+++
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/shared/ProtocolHandlerChain.java
Sun Oct 18 12:34:15 2009
@@ -40,10 +40,10 @@
*
*
*/
-public class AbstractHandlerChain implements LogEnabled, Configurable {
+public class ProtocolHandlerChain implements LogEnabled, Configurable {
/** This log is the fall back shared by all instances */
- private static final Log FALLBACK_LOG =
LogFactory.getLog(AbstractHandlerChain.class);
+ private static final Log FALLBACK_LOG =
LogFactory.getLog(ProtocolHandlerChain.class);
/** Non context specific log should only be used when no context specific
log is available */
private Log log = FALLBACK_LOG;
@@ -58,7 +58,7 @@
}
/**
- * @see org.apache.james.socket.shared.AbstractHandlerChain#getLog()
+ * @see org.apache.james.socket.shared.ProtocolHandlerChain#getLog()
*/
protected Log getLog() {
return log;
@@ -205,7 +205,7 @@
List<org.apache.commons.configuration.Configuration> children =
((HierarchicalConfiguration) commonsConf).configurationsAt("handler");
ClassLoader classLoader =
Thread.currentThread().getContextClassLoader();
- String coreCmdName = (String)
commonsConf.getProperty("coreHandlersPackage");
+ String coreCmdName = commonsConf.getString("@coreHandlersPackage");
// load the core handlers
loadClass(classLoader, coreCmdName,
addHandler(coreCmdName));
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
