Author: norman
Date: Wed Jan 6 11:47:24 2010
New Revision: 896407
URL: http://svn.apache.org/viewvc?rev=896407&view=rev
Log:
some dependency cleanup.
Copy over tests from old phoenix-deployment
Added:
james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/assemble/src.xml
james/server/trunk/phoenix-deployment/src/test/java/
james/server/trunk/phoenix-deployment/src/test/java/org/
- copied from r885351, james/server/trunk/phoenix-deployment/src/test/org/
Removed:
james/server/trunk/phoenix-deployment/src/test/java/org/apache/james/AvalonJamesTest.java
james/server/trunk/phoenix-deployment/src/test/java/org/apache/james/FakeLoader.java
Modified:
james/server/sandbox/active/pure_spring_deployment/build-tools/function-build.xml
james/server/sandbox/active/pure_spring_deployment/core-library/src/main/java/org/apache/james/Constants.java
james/server/sandbox/active/pure_spring_deployment/imapserver-function/pom.xml
james/server/sandbox/active/pure_spring_deployment/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServerProtocolHandlerFactory.java
james/server/sandbox/active/pure_spring_deployment/mailets-function/src/main/java/org/apache/james/transport/mailets/FromRepository.java
james/server/sandbox/active/pure_spring_deployment/management-library/pom.xml
james/server/sandbox/active/pure_spring_deployment/mina-socket-library/pom.xml
james/server/sandbox/active/pure_spring_deployment/nntpserver-function/pom.xml
james/server/sandbox/active/pure_spring_deployment/pop3server-function/pom.xml
james/server/sandbox/active/pure_spring_deployment/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/WelcomeHandler.java
james/server/sandbox/active/pure_spring_deployment/spring-deployment/pom.xml
james/server/trunk/phoenix-deployment/src/test/java/org/apache/james/JamesTest.java
james/server/trunk/phoenix-deployment/src/test/java/org/apache/james/smtpserver/SMTPServerRemoteDeliveryIntegrationTest.java
Modified:
james/server/sandbox/active/pure_spring_deployment/build-tools/function-build.xml
URL:
http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/build-tools/function-build.xml?rev=896407&r1=896406&r2=896407&view=diff
==============================================================================
---
james/server/sandbox/active/pure_spring_deployment/build-tools/function-build.xml
(original)
+++
james/server/sandbox/active/pure_spring_deployment/build-tools/function-build.xml
Wed Jan 6 11:47:24 2010
@@ -52,11 +52,7 @@
<classpathentry combineaccessrules="false"
kind='src' path='/imap-api'/>
<classpathentry combineaccessrules="false"
kind="src" path="/user-api"/>
<classpathentry combineaccessrules="false"
kind="src" path="/core-library"/>
- <classpathentry combineaccessrules="false"
kind="src" path="/imap-codec-library"/>
- <classpathentry combineaccessrules="false"
kind="src" path="/imap-command-library"/>
- <classpathentry combineaccessrules="false"
kind="src" path="/imapmailbox-library"/>
- <classpathentry combineaccessrules="false"
kind="src" path="/mordred-library"/>
- <classpathentry combineaccessrules="false"
kind="src" path="/user-library"/>
+ <classpathentry combineaccessrules="false"
kind="src" path="/user-library"/>
</dependencies>
</GenerateEclipseProject>
</target>
Modified:
james/server/sandbox/active/pure_spring_deployment/core-library/src/main/java/org/apache/james/Constants.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/core-library/src/main/java/org/apache/james/Constants.java?rev=896407&r1=896406&r2=896407&view=diff
==============================================================================
---
james/server/sandbox/active/pure_spring_deployment/core-library/src/main/java/org/apache/james/Constants.java
(original)
+++
james/server/sandbox/active/pure_spring_deployment/core-library/src/main/java/org/apache/james/Constants.java
Wed Jan 6 11:47:24 2010
@@ -53,13 +53,6 @@
public static final String HELLO_NAME = "HELLO_NAME";
/**
- * Key used to store the component manager for
- * this James instance in a way accessible by
- * Avalon aware Mailets.
- */
- public static final String AVALON_COMPONENT_MANAGER = "AVALON_COMP_MGR";
-
- /**
* Key used to store the hostaddress of the localhost
*/
public static final String HOSTADDRESS = "LOCAL_HOSTADDRESS";
Modified:
james/server/sandbox/active/pure_spring_deployment/imapserver-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/imapserver-function/pom.xml?rev=896407&r1=896406&r2=896407&view=diff
==============================================================================
---
james/server/sandbox/active/pure_spring_deployment/imapserver-function/pom.xml
(original)
+++
james/server/sandbox/active/pure_spring_deployment/imapserver-function/pom.xml
Wed Jan 6 11:47:24 2010
@@ -47,17 +47,14 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-core-library</artifactId>
+ <artifactId>james-server-socket-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mailet</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-jsieve</artifactId>
- </dependency>
+
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-jsieve-mailet</artifactId>
@@ -69,10 +66,6 @@
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-avalon-socket-library</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-socket-shared-library</artifactId>
</dependency>
<dependency>
@@ -103,11 +96,7 @@
<groupId>org.apache.james</groupId>
<artifactId>apache-james-imap-seda</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.avalon.framework</groupId>
- <artifactId>avalon-framework-api</artifactId>
- </dependency>
-
+
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
Modified:
james/server/sandbox/active/pure_spring_deployment/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServerProtocolHandlerFactory.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServerProtocolHandlerFactory.java?rev=896407&r1=896406&r2=896407&view=diff
==============================================================================
---
james/server/sandbox/active/pure_spring_deployment/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServerProtocolHandlerFactory.java
(original)
+++
james/server/sandbox/active/pure_spring_deployment/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServerProtocolHandlerFactory.java
Wed Jan 6 11:47:24 2010
@@ -30,7 +30,6 @@
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.james.Constants;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.mailbox.Mailbox;
@@ -53,7 +52,7 @@
*/
public class ImapServerProtocolHandlerFactory extends
AbstractProtocolHandlerFactory implements ImapConstants, Poster
{
- private static final String softwaretype = "JAMES "+VERSION+" Server " +
Constants.SOFTWARE_VERSION;
+ private static final String softwaretype = "JAMES "+VERSION+" Server ";
//+ Constants.SOFTWARE_VERSION;
private ImapFactory factory;
Modified:
james/server/sandbox/active/pure_spring_deployment/mailets-function/src/main/java/org/apache/james/transport/mailets/FromRepository.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/mailets-function/src/main/java/org/apache/james/transport/mailets/FromRepository.java?rev=896407&r1=896406&r2=896407&view=diff
==============================================================================
---
james/server/sandbox/active/pure_spring_deployment/mailets-function/src/main/java/org/apache/james/transport/mailets/FromRepository.java
(original)
+++
james/server/sandbox/active/pure_spring_deployment/mailets-function/src/main/java/org/apache/james/transport/mailets/FromRepository.java
Wed Jan 6 11:47:24 2010
@@ -22,15 +22,13 @@
package org.apache.james.transport.mailets;
import org.apache.avalon.cornerstone.services.store.Store;
-import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.container.ContainerUtil;
-import org.apache.avalon.framework.service.ServiceException;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.james.Constants;
+import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.james.services.MailRepository;
import org.apache.mailet.base.GenericMailet;
import org.apache.mailet.Mail;
+import javax.annotation.Resource;
import javax.mail.MessagingException;
import java.util.Iterator;
@@ -68,6 +66,13 @@
*/
private String processor;
+ private Store mailStore;
+
+ @Resource(name="mailstore")
+ public void setStore(Store mailStore) {
+ this.mailStore = mailStore;
+ }
+
/**
* Initialize the mailet, loading configuration information.
*/
@@ -81,16 +86,12 @@
// Ignore exception, default to false
}
- ServiceManager compMgr =
(ServiceManager)getMailetContext().getAttribute(Constants.AVALON_COMPONENT_MANAGER);
try {
- Store mailstore = (Store) compMgr.lookup(Store.ROLE);
- DefaultConfiguration mailConf
- = new DefaultConfiguration("repository",
"generated:ToRepository");
- mailConf.setAttribute("destinationURL", repositoryPath);
- mailConf.setAttribute("type", "MAIL");
- repository = (MailRepository) mailstore.select(mailConf);
- } catch (ServiceException cnfe) {
- log("Failed to retrieve Store component:" + cnfe.getMessage());
+ DefaultConfigurationBuilder mailConf
+ = new DefaultConfigurationBuilder();
+ mailConf.addProperty("[...@destinationurl]", repositoryPath);
+ mailConf.addProperty("[...@type]", "MAIL");
+ repository = (MailRepository) mailStore.select(mailConf);
} catch (Exception e) {
log("Failed to retrieve Store component:" + e.getMessage());
}
Modified:
james/server/sandbox/active/pure_spring_deployment/management-library/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/management-library/pom.xml?rev=896407&r1=896406&r2=896407&view=diff
==============================================================================
---
james/server/sandbox/active/pure_spring_deployment/management-library/pom.xml
(original)
+++
james/server/sandbox/active/pure_spring_deployment/management-library/pom.xml
Wed Jan 6 11:47:24 2010
@@ -33,14 +33,6 @@
<groupId>org.apache.james</groupId>
<artifactId>apache-mailet</artifactId>
</dependency>
- <!-- Probably used for RFC2822Headers -->
- <!-- Not needed at runtime because of compiler inlining constants -->
- <!--
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-mailet-base</artifactId>
- </dependency>
- -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -66,10 +58,6 @@
</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>
Modified:
james/server/sandbox/active/pure_spring_deployment/mina-socket-library/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/mina-socket-library/pom.xml?rev=896407&r1=896406&r2=896407&view=diff
==============================================================================
---
james/server/sandbox/active/pure_spring_deployment/mina-socket-library/pom.xml
(original)
+++
james/server/sandbox/active/pure_spring_deployment/mina-socket-library/pom.xml
Wed Jan 6 11:47:24 2010
@@ -34,14 +34,6 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-socket-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-common-util</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-domain-api</artifactId>
</dependency>
<dependency>
@@ -49,10 +41,6 @@
<artifactId>james-server-core-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.avalon.framework</groupId>
- <artifactId>avalon-framework-api</artifactId>
- </dependency>
- <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
@@ -60,9 +48,5 @@
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.avalon.framework</groupId>
- <artifactId>avalon-framework-impl</artifactId>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified:
james/server/sandbox/active/pure_spring_deployment/nntpserver-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/nntpserver-function/pom.xml?rev=896407&r1=896406&r2=896407&view=diff
==============================================================================
---
james/server/sandbox/active/pure_spring_deployment/nntpserver-function/pom.xml
(original)
+++
james/server/sandbox/active/pure_spring_deployment/nntpserver-function/pom.xml
Wed Jan 6 11:47:24 2010
@@ -106,12 +106,12 @@
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-user-library</artifactId>
+ <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-user-library</artifactId>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Modified:
james/server/sandbox/active/pure_spring_deployment/pop3server-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/pop3server-function/pom.xml?rev=896407&r1=896406&r2=896407&view=diff
==============================================================================
---
james/server/sandbox/active/pure_spring_deployment/pop3server-function/pom.xml
(original)
+++
james/server/sandbox/active/pure_spring_deployment/pop3server-function/pom.xml
Wed Jan 6 11:47:24 2010
@@ -50,16 +50,15 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-socket-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
<artifactId>james-server-core-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-jxpath</groupId>
- <artifactId>commons-jxpath</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
Modified:
james/server/sandbox/active/pure_spring_deployment/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/WelcomeHandler.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/WelcomeHandler.java?rev=896407&r1=896406&r2=896407&view=diff
==============================================================================
---
james/server/sandbox/active/pure_spring_deployment/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/WelcomeHandler.java
(original)
+++
james/server/sandbox/active/pure_spring_deployment/remotemanager-function/src/main/java/org/apache/james/remotemanager/core/WelcomeHandler.java
Wed Jan 6 11:47:24 2010
@@ -19,7 +19,6 @@
package org.apache.james.remotemanager.core;
-import org.apache.james.Constants;
import org.apache.james.remotemanager.ConnectHandler;
import org.apache.james.remotemanager.RemoteManagerResponse;
import org.apache.james.remotemanager.RemoteManagerSession;
@@ -27,7 +26,7 @@
public class WelcomeHandler implements ConnectHandler{
public void onConnect(RemoteManagerSession session) {
- session.writeRemoteManagerResponse(new RemoteManagerResponse("JAMES
Remote Administration Tool " + Constants.SOFTWARE_VERSION));
+ session.writeRemoteManagerResponse(new RemoteManagerResponse("JAMES
Remote Administration Tool "));// + Constants.SOFTWARE_VERSION));
}
}
Modified:
james/server/sandbox/active/pure_spring_deployment/spring-deployment/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/spring-deployment/pom.xml?rev=896407&r1=896406&r2=896407&view=diff
==============================================================================
---
james/server/sandbox/active/pure_spring_deployment/spring-deployment/pom.xml
(original)
+++
james/server/sandbox/active/pure_spring_deployment/spring-deployment/pom.xml
Wed Jan 6 11:47:24 2010
@@ -324,5 +324,52 @@
<artifactId>derby</artifactId>
<scope>runtime</scope>
</dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-core-library</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-user-library</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-user-library</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mailet-base</artifactId>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-core-api</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-smtpserver-function</artifactId>
+ <version>3.0-M1</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Added:
james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/assemble/src.xml
URL:
http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/assemble/src.xml?rev=896407&view=auto
==============================================================================
---
james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/assemble/src.xml
(added)
+++
james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/assemble/src.xml
Wed Jan 6 11:47:24 2010
@@ -0,0 +1,42 @@
+<assembly>
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied.
+
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+ <id>src</id>
+ <!--
+ Generates a file including all the source tree excluding files/folders
+ starting with "." , *.bak and the target
+ -->
+ <formats>
+ <format>zip</format>
+ <format>tar.gz</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>..</directory>
+ <outputDirectory></outputDirectory>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ <exclude>.*</exclude>
+ <exclude>.*/**</exclude>
+ <exclude>**.bak</exclude>
+ </excludes>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Modified:
james/server/trunk/phoenix-deployment/src/test/java/org/apache/james/JamesTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/java/org/apache/james/JamesTest.java?rev=896407&r1=885351&r2=896407&view=diff
==============================================================================
---
james/server/trunk/phoenix-deployment/src/test/java/org/apache/james/JamesTest.java
(original)
+++
james/server/trunk/phoenix-deployment/src/test/java/org/apache/james/JamesTest.java
Wed Jan 6 11:47:24 2010
@@ -66,12 +66,12 @@
james.setSpoolRepository(mockMailRepository);
james.setStore(mockStore);
james.setUsersRepository(mockUsersRepository);
- james.setLogger(new SimpleLog("JamesLog"));
- james.setMailetLogger(new SimpleLog("MailetLog"));
+ james.setLog(new SimpleLog("JamesLog"));
+ //james.setMailetLogger(new SimpleLog("MailetLog"));
try {
JamesTestConfiguration conf = new JamesTestConfiguration();
conf.init();
- james.setConfiguration(new ConfigurationAdapter(conf));
+ james.configure(new ConfigurationAdapter(conf));
james.init();
} catch (Exception e) {
e.printStackTrace();
@@ -83,9 +83,8 @@
protected void setUp() throws Exception{
super.setUp();
mockUsersRepository = new MockUsersRepository();
- mockUsersRepository.setLogger(new SimpleLog("MockLog"));
- mockUsersRepository.setConfiguration(new
DefaultConfigurationBuilder());
- mockUsersRepository.init();
+ mockUsersRepository.setLog(new SimpleLog("MockLog"));
+ mockUsersRepository.configure(new DefaultConfigurationBuilder());
usersStore = new MockUsersStore(mockUsersRepository);
Modified:
james/server/trunk/phoenix-deployment/src/test/java/org/apache/james/smtpserver/SMTPServerRemoteDeliveryIntegrationTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/java/org/apache/james/smtpserver/SMTPServerRemoteDeliveryIntegrationTest.java?rev=896407&r1=885351&r2=896407&view=diff
==============================================================================
---
james/server/trunk/phoenix-deployment/src/test/java/org/apache/james/smtpserver/SMTPServerRemoteDeliveryIntegrationTest.java
(original)
+++
james/server/trunk/phoenix-deployment/src/test/java/org/apache/james/smtpserver/SMTPServerRemoteDeliveryIntegrationTest.java
Wed Jan 6 11:47:24 2010
@@ -50,7 +50,6 @@
import org.apache.james.core.MailImpl;
import org.apache.james.services.MailServer;
import org.apache.james.socket.AvalonProtocolServer;
-import org.apache.james.socket.JamesConnectionManager;
import org.apache.james.socket.SimpleConnectionManager;
import org.apache.james.test.mock.avalon.MockLogger;
import org.apache.james.test.mock.avalon.MockSocketManager;
@@ -218,10 +217,10 @@
private void finishSetUp(SMTPTestConfiguration testConfiguration) throws
Exception {
testConfiguration.init();
ConfigurationAdapter conf = new
ConfigurationAdapter(testConfiguration);
- m_smtpServer.setConfiguration(conf);
+ m_smtpServer.configure(conf);
m_smtpServer.init();
- protoserver.setConfiguration(conf);
+ protoserver.configure(conf);
protoserver.init();
m_mailServer.setMaxMessageSizeBytes(m_testConfiguration.getMaxMessageSize()*1024);
}
@@ -246,8 +245,7 @@
connectionManager = new SimpleConnectionManager();
connectionManager.setThreadManager(threadManager);
connectionManager.setLog(new SimpleLog("CM"));
- connectionManager.setConfiguration(new DefaultConfigurationBuilder());
- connectionManager.init();
+ connectionManager.configure(new DefaultConfigurationBuilder());
m_serviceManager.put(SimpleConnectionManager.ROLE, connectionManager);
m_dnsServer = new AlterableDNSServer();
@@ -289,7 +287,6 @@
rd.setDNSService(m_dnsServer);
FakeMailContext mmc = new FakeMailContext();
- mmc.setAttribute(Constants.AVALON_COMPONENT_MANAGER,m_serviceManager);
mmc.setAttribute(Constants.HELLO_NAME,"localhost");
FakeMailetConfig mci = new
FakeMailetConfig("Test",mmc,getStandardParameters());
mci.setProperty("bind", "127.0.0.1");
@@ -331,7 +328,6 @@
rd.setStore(store);
rd.setDNSService(m_dnsServer);
FakeMailContext mmc = new FakeMailContext();
- mmc.setAttribute(Constants.AVALON_COMPONENT_MANAGER,m_serviceManager);
mmc.setAttribute(Constants.HELLO_NAME,"localhost");
FakeMailetConfig mci = new
FakeMailetConfig("Test",mmc,getStandardParameters());
mci.setProperty("gateway","127.0.0.1");
@@ -378,7 +374,6 @@
rd.setDNSService(m_dnsServer);
FakeMailContext mmc = new FakeMailContext();
- mmc.setAttribute(Constants.AVALON_COMPONENT_MANAGER,m_serviceManager);
mmc.setAttribute(Constants.HELLO_NAME,"localhost");
FakeMailetConfig mci = new
FakeMailetConfig("Test",mmc,getStandardParameters());
mci.setProperty("gateway","127.0.0.1");
@@ -425,7 +420,6 @@
rd.setDNSService(m_dnsServer);
FakeMailContext mmc = new FakeMailContext();
- mmc.setAttribute(Constants.AVALON_COMPONENT_MANAGER,m_serviceManager);
mmc.setAttribute(Constants.HELLO_NAME,"localhost");
FakeMailetConfig mci = new
FakeMailetConfig("Test",mmc,getStandardParameters());
mci.setProperty("gateway","127.0.0.1");
@@ -472,7 +466,6 @@
rd.setDNSService(m_dnsServer);
FakeMailContext mmc = new FakeMailContext();
- mmc.setAttribute(Constants.AVALON_COMPONENT_MANAGER,m_serviceManager);
mmc.setAttribute(Constants.HELLO_NAME,"localhost");
FakeMailetConfig mci = new
FakeMailetConfig("Test",mmc,getStandardParameters());
mci.setProperty("gateway","127.0.0.1");
@@ -519,7 +512,6 @@
rd.setDNSService(m_dnsServer);
FakeMailContext mmc = new FakeMailContext();
- mmc.setAttribute(Constants.AVALON_COMPONENT_MANAGER,m_serviceManager);
mmc.setAttribute(Constants.HELLO_NAME,"localhost");
FakeMailetConfig mci = new
FakeMailetConfig("Test",mmc,getStandardParameters());
mci.setProperty("gateway","127.0.0.1");
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
