Author: norman
Date: Sat Oct 24 16:07:20 2009
New Revision: 829396
URL: http://svn.apache.org/viewvc?rev=829396&view=rev
Log:
Rename JamesConfiguration to ConfigurationConverter
Move the class to common-util
Added:
james/server/trunk/common-util/src/main/java/org/apache/james/util/ConfigurationConverter.java
- copied, changed from r829385,
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/configuration/JamesConfiguration.java
Removed:
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/configuration/JamesConfiguration.java
Modified:
james/server/trunk/common-util/pom.xml
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/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/AvalonAsyncSMTPServer.java
Modified: james/server/trunk/common-util/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/common-util/pom.xml?rev=829396&r1=829395&r2=829396&view=diff
==============================================================================
--- james/server/trunk/common-util/pom.xml (original)
+++ james/server/trunk/common-util/pom.xml Sat Oct 24 16:07:20 2009
@@ -33,7 +33,18 @@
<groupId>oro</groupId>
<artifactId>oro</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.avalon.framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.avalon.framework</groupId>
+ <artifactId>avalon-framework-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Copied:
james/server/trunk/common-util/src/main/java/org/apache/james/util/ConfigurationConverter.java
(from r829385,
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/configuration/JamesConfiguration.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/common-util/src/main/java/org/apache/james/util/ConfigurationConverter.java?p2=james/server/trunk/common-util/src/main/java/org/apache/james/util/ConfigurationConverter.java&p1=james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/configuration/JamesConfiguration.java&r1=829385&r2=829396&rev=829396&view=diff
==============================================================================
---
james/server/trunk/socket-shared-library/src/main/java/org/apache/james/socket/configuration/JamesConfiguration.java
(original)
+++
james/server/trunk/common-util/src/main/java/org/apache/james/util/ConfigurationConverter.java
Sat Oct 24 16:07:20 2009
@@ -18,7 +18,7 @@
****************************************************************/
-package org.apache.james.socket.configuration;
+package org.apache.james.util;
import java.io.ByteArrayInputStream;
import org.apache.avalon.framework.configuration.ConfigurationUtil;
@@ -29,11 +29,11 @@
/**
* Bridges commons configuration to Avalon.
*/
-public class JamesConfiguration extends XMLConfiguration {
+public class ConfigurationConverter extends XMLConfiguration {
private static final long serialVersionUID = 6920719067623856243L;
- public
JamesConfiguration(org.apache.avalon.framework.configuration.Configuration
avalonConfig) throws ConfigurationException {
+ public
ConfigurationConverter(org.apache.avalon.framework.configuration.Configuration
avalonConfig) throws ConfigurationException {
String config = ConfigurationUtil.toString(avalonConfig);
load(new ByteArrayInputStream(config.getBytes()));
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=829396&r1=829395&r2=829396&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
Sat Oct 24 16:07:20 2009
@@ -33,8 +33,8 @@
import org.apache.james.services.MailServer;
import org.apache.james.socket.AbstractProtocolServer;
import org.apache.james.socket.api.ProtocolHandler;
-import org.apache.james.socket.configuration.JamesConfiguration;
import org.apache.james.socket.shared.ProtocolHandlerChainImpl;
+import org.apache.james.util.ConfigurationConverter;
/**
* <p>Accepts POP3 connections on a server socket and dispatches them to
POP3Handlers.</p>
@@ -131,7 +131,7 @@
handlerChain.setLog(new AvalonLogger(getLogger()));
//read from the XML configuration and create and configure each of the
handlers
- JamesConfiguration jamesConfiguration = new
JamesConfiguration(handlerConfiguration.getChild("handlerchain"));
+ ConfigurationConverter jamesConfiguration = new
ConfigurationConverter(handlerConfiguration.getChild("handlerchain"));
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=829396&r1=829395&r2=829396&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
Sat Oct 24 16:07:20 2009
@@ -36,8 +36,8 @@
import org.apache.james.services.MailServer;
import org.apache.james.socket.AbstractProtocolServer;
import org.apache.james.socket.api.ProtocolHandler;
-import org.apache.james.socket.configuration.JamesConfiguration;
import org.apache.james.socket.shared.ProtocolHandlerChainImpl;
+import org.apache.james.util.ConfigurationConverter;
/**
* Provides a really rude network interface to administer James.
@@ -154,7 +154,7 @@
handlerChain.setLog(new AvalonLogger(getLogger()));
//read from the XML configuration and create and configure each of the
handlers
- JamesConfiguration jamesConfiguration = new
JamesConfiguration(handlerConfiguration.getChild("handlerchain"));
+ ConfigurationConverter jamesConfiguration = new
ConfigurationConverter(handlerConfiguration.getChild("handlerchain"));
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/SMTPServer.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java?rev=829396&r1=829395&r2=829396&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
Sat Oct 24 16:07:20 2009
@@ -37,8 +37,8 @@
import org.apache.james.smtpserver.protocol.SMTPServerMBean;
import org.apache.james.socket.AbstractProtocolServer;
import org.apache.james.socket.api.ProtocolHandler;
-import org.apache.james.socket.configuration.JamesConfiguration;
import org.apache.james.socket.shared.ProtocolHandlerChainImpl;
+import org.apache.james.util.ConfigurationConverter;
import org.apache.mailet.MailetContext;
/**
@@ -243,7 +243,7 @@
handlerChain.setLog(new AvalonLogger(getLogger()));
//read from the XML configuration and create and configure each of the
handlers
- JamesConfiguration jamesConfiguration = new
JamesConfiguration(handlerConfiguration.getChild("handlerchain"));
+ ConfigurationConverter jamesConfiguration = new
ConfigurationConverter(handlerConfiguration.getChild("handlerchain"));
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=829396&r1=829395&r2=829396&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
Sat Oct 24 16:07:20 2009
@@ -44,8 +44,8 @@
import org.apache.james.socket.api.ProtocolHandler;
import org.apache.james.socket.api.ProtocolHandlerFactory;
import org.apache.james.socket.api.ProtocolServer;
-import org.apache.james.socket.configuration.JamesConfiguration;
import org.apache.james.socket.shared.ProtocolHandlerChainImpl;
+import org.apache.james.util.ConfigurationConverter;
import org.apache.mailet.MailetContext;
/**
@@ -269,7 +269,7 @@
handlerChain.setLog(new AvalonLogger(getLogger()));
//read from the XML configuration and create and configure each of the
handlers
- JamesConfiguration jamesConfiguration = new
JamesConfiguration(handlerConfiguration.getChild("handlerchain"));
+ ConfigurationConverter jamesConfiguration = new
ConfigurationConverter(handlerConfiguration.getChild("handlerchain"));
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/AvalonAsyncSMTPServer.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AvalonAsyncSMTPServer.java?rev=829396&r1=829395&r2=829396&view=diff
==============================================================================
---
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AvalonAsyncSMTPServer.java
(original)
+++
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AvalonAsyncSMTPServer.java
Sat Oct 24 16:07:20 2009
@@ -37,7 +37,7 @@
import org.apache.james.services.FileSystem;
import org.apache.james.services.MailServer;
import org.apache.james.smtpserver.protocol.SMTPServerMBean;
-import org.apache.james.socket.configuration.JamesConfiguration;
+import org.apache.james.util.ConfigurationConverter;
import org.apache.mailet.MailetContext;
import org.guiceyfruit.jsr250.Jsr250Module;
@@ -73,7 +73,7 @@
*/
public void configure(Configuration config) throws ConfigurationException {
try {
- this.config = new JamesConfiguration(config);
+ this.config = new ConfigurationConverter(config);
} catch (org.apache.commons.configuration.ConfigurationException e) {
throw new ConfigurationException("Unable to convert
configuration", e);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
