Modified: james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/SpoolManagement.java URL: http://svn.apache.org/viewvc/james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/SpoolManagement.java?rev=830276&r1=830275&r2=830276&view=diff ============================================================================== --- james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/SpoolManagement.java (original) +++ james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/SpoolManagement.java Tue Oct 27 18:13:19 2009 @@ -23,11 +23,11 @@ package org.apache.james.management.impl; 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.avalon.framework.service.Serviceable; +import org.apache.commons.configuration.DefaultConfigurationBuilder; import org.apache.james.management.SpoolFilter; import org.apache.james.management.SpoolManagementException; import org.apache.james.management.SpoolManagementMBean; @@ -476,10 +476,9 @@ private SpoolRepository getSpoolRepository(String url) throws SpoolManagementException { // Setup all needed data - DefaultConfiguration spoolConf = new DefaultConfiguration("spool", - "generated:RemoteManager.java"); - spoolConf.setAttribute("destinationURL", url); - spoolConf.setAttribute("type", "SPOOL"); + DefaultConfigurationBuilder spoolConf = new DefaultConfigurationBuilder(); + spoolConf.addProperty("/ @destinationURL", url); + spoolConf.addProperty("/ @type", "SPOOL"); try { return (SpoolRepository) mailStore.select(spoolConf);
Modified: james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml?rev=830276&r1=830275&r2=830276&view=diff ============================================================================== --- james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml (original) +++ james/server/trunk/phoenix-deployment/src/conf/james-assembly.xml Tue Oct 27 18:13:19 2009 @@ -75,7 +75,7 @@ <proxy disable='true'/> </block> - <block name="dnsserver" class="org.apache.james.dnsserver.DNSServer" /> + <block name="dnsserver" class="org.apache.james.dnsserver.AvalonDNSServer" /> <!-- The Spool Management block --> <block name="spoolmanagement" class="org.apache.james.management.impl.SpoolManagement" > @@ -234,7 +234,7 @@ </block> <!-- The main SpoolRepository --> - <block name="spoolrepository" class="org.apache.james.mailrepository.MailStoreSpoolRepository" > + <block name="spoolrepository" class="org.apache.james.mailrepository.AvalonMailStoreSpoolRepository" > <provide name="mailstore" role="org.apache.avalon.cornerstone.services.store.Store" /> <proxy disable='true'/> @@ -291,14 +291,14 @@ <!-- ######################################################################## --> <!-- The context domainlist implementation --> - <block name="domainlist" class="org.apache.james.domain.XMLDomainList"> + <block name="domainlist" class="org.apache.james.domain.AvalonXMLDomainList"> <provide name="dnsserver" role="org.apache.james.api.dnsservice.DNSService"/> <proxy disable='true'/> </block> <!-- JDBC implementation of the domainlist service--> <!-- - <block name="domainlist" class="org.apache.james.domain.JDBCDomainList"> + <block name="domainlist" class="org.apache.james.domain.AvalonJDBCDomainList"> <provide name="database-connections" role="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector"/> <provide name="filesystem" role="org.apache.james.services.FileSystem"/> Modified: james/server/trunk/phoenix-deployment/src/conf/james-config.xml URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/conf/james-config.xml?rev=830276&r1=830275&r2=830276&view=diff ============================================================================== --- james/server/trunk/phoenix-deployment/src/conf/james-config.xml (original) +++ james/server/trunk/phoenix-deployment/src/conf/james-config.xml Tue Oct 27 18:13:19 2009 @@ -1255,7 +1255,7 @@ </repository> <!-- File based repositories. These repositories store all message data --> <!-- in the file system. --> - <repository class="org.apache.james.mailrepository.AvalonMailRepository"> + <repository class="org.apache.james.mailrepository.FileMailRepository"> <protocols> <protocol>file</protocol> </protocols> @@ -1265,7 +1265,7 @@ <!-- Set if the messages should be listed sorted. False by default --> <config FIFO="false"/> </repository> - <repository class="org.apache.james.mailrepository.AvalonSpoolRepository"> + <repository class="org.apache.james.mailrepository.FileSpoolRepository"> <protocols> <protocol>file</protocol> </protocols> Modified: james/server/trunk/phoenix-deployment/src/test/org/apache/james/JamesTest.java URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/JamesTest.java?rev=830276&r1=830275&r2=830276&view=diff ============================================================================== --- james/server/trunk/phoenix-deployment/src/test/org/apache/james/JamesTest.java (original) +++ james/server/trunk/phoenix-deployment/src/test/org/apache/james/JamesTest.java Tue Oct 27 18:13:19 2009 @@ -24,6 +24,8 @@ import org.apache.avalon.cornerstone.services.store.Store; import org.apache.avalon.framework.container.ContainerUtil; import org.apache.avalon.framework.service.ServiceException; +import org.apache.commons.configuration.DefaultConfigurationBuilder; +import org.apache.commons.logging.impl.SimpleLog; import org.apache.james.api.dnsservice.AbstractDNSServer; import org.apache.james.api.dnsservice.DNSService; import org.apache.james.api.domainlist.DomainList; @@ -54,7 +56,7 @@ private File tempContextFile = null; private InMemorySpoolRepository mockMailRepository; - public MailServer createMailServer() throws ServiceException { + public MailServer createMailServer() throws Exception { James james = new James(); james.service(setUpServiceManager()); MockLogger mockLogger = new MockLogger(); @@ -86,9 +88,13 @@ - private MockServiceManager setUpServiceManager() { + private MockServiceManager setUpServiceManager() throws Exception { MockServiceManager serviceManager = new MockServiceManager(); MockUsersRepository mockUsersRepository = new MockUsersRepository(); + mockUsersRepository.setLogger(new SimpleLog("MockLog")); + mockUsersRepository.setConfiguration(new DefaultConfigurationBuilder()); + mockUsersRepository.init(); + serviceManager.put(UsersRepository.ROLE, mockUsersRepository); serviceManager.put(UsersStore.ROLE, new MockUsersStore(mockUsersRepository)); serviceManager.put(FileSystem.ROLE, new FileSystem() { @@ -123,6 +129,7 @@ public void setAutoDetectIP(boolean autodetectIP) {} }); MockStore mockStore = new MockStore(); + mockMailRepository = new InMemorySpoolRepository(); mockStore.add(EXISTING_USER_NAME, mockMailRepository); serviceManager.put(Store.ROLE, mockStore); Modified: james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/James.java URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/James.java?rev=830276&r1=830275&r2=830276&view=diff ============================================================================== --- james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/James.java (original) +++ james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/James.java Tue Oct 27 18:13:19 2009 @@ -51,6 +51,7 @@ import org.apache.james.services.SpoolRepository; import org.apache.james.transport.MailetConfigImpl; import org.apache.james.transport.mailets.LocalDelivery; +import org.apache.james.util.ConfigurationAdapter; import org.apache.mailet.Mail; import org.apache.mailet.MailAddress; import org.apache.mailet.Mailet; @@ -606,7 +607,7 @@ .getChild("inboxRepository").getChild("repository")); mboxConf.setAttribute("destinationURL", destination); - userInbox = (MailRepository) store.select(mboxConf); + userInbox = (MailRepository) store.select(new ConfigurationAdapter(mboxConf)); if (userInbox!=null) { mailboxes.put(userName, userInbox); } Modified: james/server/trunk/user-library/src/test/java/org/apache/james/userrepository/MockUsersRepositoryTest.java URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/test/java/org/apache/james/userrepository/MockUsersRepositoryTest.java?rev=830276&r1=830275&r2=830276&view=diff ============================================================================== --- james/server/trunk/user-library/src/test/java/org/apache/james/userrepository/MockUsersRepositoryTest.java (original) +++ james/server/trunk/user-library/src/test/java/org/apache/james/userrepository/MockUsersRepositoryTest.java Tue Oct 27 18:13:19 2009 @@ -20,6 +20,8 @@ package org.apache.james.userrepository; import org.apache.avalon.framework.container.ContainerUtil; +import org.apache.commons.configuration.DefaultConfigurationBuilder; +import org.apache.commons.logging.impl.SimpleLog; import org.apache.james.api.user.User; import org.apache.james.api.user.UsersRepository; import org.apache.james.impl.user.DefaultJamesUser; @@ -46,7 +48,11 @@ * @throws Exception */ protected UsersRepository getUsersRepository() throws Exception { - return new MockUsersRepository(); + MockUsersRepository repos = new MockUsersRepository(); + repos.setLogger(new SimpleLog("MockLog")); + repos.setConfiguration(new DefaultConfigurationBuilder()); + repos.init(); + return repos; } public void testUsersRepositoryEmpty() { @@ -219,7 +225,9 @@ * Dispose the repository */ protected void disposeUsersRepository() { - ContainerUtil.dispose(this.usersRepository); + if (usersRepository != null) { + ContainerUtil.dispose(this.usersRepository); + } } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
