You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by no...@apache.org on 2010/01/25 17:33:15 UTC
svn commit: r902863 [2/2] - in /james/server/trunk: avalon-user-function/
avalon-user-function/src/test/java/org/apache/james/userrepository/
basic-user-function/
basic-user-function/src/test/java/org/apache/james/vut/ common-util/
common-util/src/test...
Modified: james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/JamesMailetContext.java
URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/JamesMailetContext.java?rev=902863&r1=902862&r2=902863&view=diff
==============================================================================
--- james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/JamesMailetContext.java (original)
+++ james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/JamesMailetContext.java Mon Jan 25 16:33:12 2010
@@ -38,7 +38,6 @@
import javax.mail.internet.MimeMessage;
import javax.mail.internet.ParseException;
-import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.commons.configuration.HierarchicalConfiguration;
@@ -49,6 +48,7 @@
import org.apache.james.api.user.UsersRepository;
import org.apache.james.core.MailImpl;
import org.apache.james.lifecycle.Configurable;
+import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.james.lifecycle.LogEnabled;
import org.apache.james.services.MailServer;
import org.apache.james.transport.MailetConfigImpl;
@@ -216,7 +216,7 @@
// Send it off ... with null reverse-path
reply.setSender(null);
sendMail(reply);
- ContainerUtil.dispose(reply);
+ LifecycleUtil.dispose(reply);
}
/**
@@ -396,7 +396,7 @@
mail.setState(state);
sendMail(mail);
} finally {
- ContainerUtil.dispose(mail);
+ LifecycleUtil.dispose(mail);
}
}
@@ -436,7 +436,7 @@
recipients.add(recipient);
MailImpl m = new MailImpl(mailServer.getId(), sender, recipients, msg);
localDeliveryMailet.service(m);
- ContainerUtil.dispose(m);
+ LifecycleUtil.dispose(m);
}
public void setLog(Log log) {
Modified: james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/JamesSpoolManager.java
URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/JamesSpoolManager.java?rev=902863&r1=902862&r2=902863&view=diff
==============================================================================
--- james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/JamesSpoolManager.java (original)
+++ james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/JamesSpoolManager.java Mon Jan 25 16:33:12 2010
@@ -29,13 +29,12 @@
import javax.annotation.PreDestroy;
import javax.annotation.Resource;
-import org.apache.avalon.framework.container.ContainerUtil;
-
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.Log;
import org.apache.james.api.kernel.LoaderService;
import org.apache.james.lifecycle.Configurable;
+import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.james.lifecycle.LogEnabled;
import org.apache.james.services.SpoolManager;
import org.apache.james.services.SpoolRepository;
@@ -202,7 +201,7 @@
if ((Mail.GHOST.equals(mail.getState())) ||
(mail.getRecipients() == null) ||
(mail.getRecipients().size() == 0)) {
- ContainerUtil.dispose(mail);
+ LifecycleUtil.dispose(mail);
spool.remove(key);
if (logger.isDebugEnabled()) {
StringBuffer debugBuffer =
@@ -218,7 +217,7 @@
// message so that other threads can work on it! If
// we don't remove it, we must unlock it!
spool.store(mail);
- ContainerUtil.dispose(mail);
+ LifecycleUtil.dispose(mail);
spool.unlock(key);
// Do not notify: we simply updated the current mail
// and we are able to reprocess it now.
@@ -280,7 +279,7 @@
}
logger.info("JamesSpoolManager thread shutdown completed.");
- ContainerUtil.dispose(processorList);
+ LifecycleUtil.dispose(processorList);
}
/**
Modified: james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/LinearProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/LinearProcessor.java?rev=902863&r1=902862&r2=902863&view=diff
==============================================================================
--- james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/LinearProcessor.java (original)
+++ james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/LinearProcessor.java Mon Jan 25 16:33:12 2010
@@ -35,12 +35,12 @@
import javax.annotation.Resource;
import javax.mail.MessagingException;
-import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.Log;
import org.apache.james.core.MailImpl;
import org.apache.james.lifecycle.Configurable;
+import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.james.lifecycle.LogEnabled;
import org.apache.james.services.SpoolRepository;
import org.apache.mailet.Mail;
@@ -478,7 +478,7 @@
//If this message was ghosted, we just want to let it die
if (mail.getState().equals(Mail.GHOST)) {
// let this instance die...
- ContainerUtil.dispose(mail);
+ LifecycleUtil.dispose(mail);
mail = null;
continue;
}
@@ -489,7 +489,7 @@
// The original mail will be "stored" by the caller.
if (originalMail != mail) {
spool.store(mail);
- ContainerUtil.dispose(mail);
+ LifecycleUtil.dispose(mail);
}
mail = null;
continue;
Modified: james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/LinearProcessorTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/LinearProcessorTest.java?rev=902863&r1=902862&r2=902863&view=diff
==============================================================================
--- james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/LinearProcessorTest.java (original)
+++ james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/LinearProcessorTest.java Mon Jan 25 16:33:12 2010
@@ -19,11 +19,11 @@
package org.apache.james.transport;
-import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.commons.logging.impl.SimpleLog;
import org.apache.james.core.MailImpl;
import org.apache.james.core.MimeMessageCopyOnWriteProxy;
import org.apache.james.core.MimeMessageInputStreamSource;
+import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.james.test.mock.james.InMemorySpoolRepository;
import org.apache.mailet.base.test.FakeMailContext;
import org.apache.mailet.base.test.FakeMailetConfig;
@@ -166,8 +166,8 @@
assertEquals(m1.getSubject(), "new text 1");
assertEquals(m2.getSubject(), "new text 2");
m.dispose();
- ContainerUtil.dispose(mail1);
- ContainerUtil.dispose(mail2);
+ LifecycleUtil.dispose(mail1);
+ LifecycleUtil.dispose(mail2);
} catch (MessagingException e) {
// TODO Auto-generated catch block
e.printStackTrace();
@@ -217,8 +217,8 @@
assertEquals("MYSTATE", ((Mail) a.get(0)).getState());
assertEquals("MYSTATE", ((Mail) a.get(1)).getState());
m.dispose();
- ContainerUtil.dispose(mail1);
- ContainerUtil.dispose(mail2);
+ LifecycleUtil.dispose(mail1);
+ LifecycleUtil.dispose(mail2);
} catch (MessagingException e) {
// TODO Auto-generated catch block
e.printStackTrace();
@@ -241,9 +241,9 @@
public void tearDown() throws Exception {
if (mimeMessage != null) {
- ContainerUtil.dispose(mimeMessage);
+ LifecycleUtil.dispose(mimeMessage);
}
- ContainerUtil.dispose(linearProcessor);
+ LifecycleUtil.dispose(linearProcessor);
super.tearDown();
}
Modified: james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/mailets/LocalDeliveryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/mailets/LocalDeliveryTest.java?rev=902863&r1=902862&r2=902863&view=diff
==============================================================================
--- james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/mailets/LocalDeliveryTest.java (original)
+++ james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/mailets/LocalDeliveryTest.java Mon Jan 25 16:33:12 2010
@@ -34,9 +34,9 @@
import junit.framework.TestCase;
-import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.james.core.MailImpl;
import org.apache.james.impl.user.DefaultJamesUser;
+import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.james.services.MailRepository;
import org.apache.james.test.mock.james.InMemorySpoolRepository;
import org.apache.james.test.mock.james.MockMailServer;
@@ -337,13 +337,13 @@
assertEquals("Found a mail in outgoing having a state different from ERROR or ROOT", Mail.DEFAULT, m.getState());
}
- ContainerUtil.dispose(m);
+ LifecycleUtil.dispose(m);
}
assertExpectedMailsInRepository(mail, (String[]) expectedMails.get("resent"), sentMailsRepository);
assertExpectedMailsInRepository(mail, (String[]) expectedMails.get("errors"), errorsMailRepository);
- ContainerUtil.dispose(errorsMailRepository);
+ LifecycleUtil.dispose(errorsMailRepository);
}
Modified: james/server/trunk/spring-deployment/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/pom.xml?rev=902863&r1=902862&r2=902863&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/pom.xml (original)
+++ james/server/trunk/spring-deployment/pom.xml Mon Jan 25 16:33:12 2010
@@ -188,14 +188,6 @@
<artifactId>james-server-core-api</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>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</dependency>
Modified: james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml?rev=902863&r1=902862&r2=902863&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml (original)
+++ james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml Mon Jan 25 16:33:12 2010
@@ -63,26 +63,6 @@
</bean>
-->
- <bean class="org.apache.james.container.spring.lifecycle.AvalonServiceableBeanPostProcessor">
- <property name="order" value="2" />
- <property name="beanRoleMap">
- <map>
- <entry
- key="org.apache.avalon.cornerstone.services.threads.ThreadManager"
- value="thread-manager" />
- </map>
- </property>
- </bean>
-
- <bean class="org.apache.james.container.spring.lifecycle.AvalonInitializableBeanPostProcessor">
- <property name="order" value="4" />
- </bean>
-
- <bean class="org.apache.james.container.spring.lifecycle.AvalonConfigurableBeanPostProcessor">
- <property name="configurationProvider" ref="configurationProvider" />
- <property name="order" value="1" />
- </bean>
-
<bean class="org.apache.james.container.spring.lifecycle.CommonsConfigurableBeanPostProcessor">
<property name="configurationProvider" ref="configurationProvider" />
<property name="order" value="1" />
@@ -109,12 +89,6 @@
</property>
</bean>
- <bean
- class="org.apache.james.container.spring.lifecycle.AvalonLogEnabledBeanPostProcessor">
- <property name="logProvider" ref="logProvider" />
- <property name="order" value="0" />
- </bean>
-
<bean id="logProvider"
class="org.apache.james.container.spring.lifecycle.SpringLogProvider" />
Modified: james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/SpringConfigurationProvider.java
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/SpringConfigurationProvider.java?rev=902863&r1=902862&r2=902863&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/SpringConfigurationProvider.java (original)
+++ james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/SpringConfigurationProvider.java Mon Jan 25 16:33:12 2010
@@ -18,12 +18,9 @@
****************************************************************/
package org.apache.james.container.spring.lifecycle;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.configuration.XMLConfiguration;
-import org.apache.james.container.spring.AvalonConfigurationProvider;
import org.apache.james.container.spring.ConfigurationProvider;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.context.ResourceLoaderAware;
@@ -35,12 +32,11 @@
*
*
*/
-public class SpringConfigurationProvider implements ConfigurationProvider, AvalonConfigurationProvider, ResourceLoaderAware, InitializingBean{
+public class SpringConfigurationProvider implements ConfigurationProvider, ResourceLoaderAware, InitializingBean{
private ResourceLoader loader;
private String configFile;
private XMLConfiguration config;
- private Configuration avalonConfig;
public void setConfigurationResource(String configFile) {
this.configFile = configFile;
@@ -64,14 +60,6 @@
this.loader = loader;
}
- /*
- * (non-Javadoc)
- * @see org.apache.james.container.spring.AvalonConfigurationProvider#getAvalonConfigurationForComponent(java.lang.String)
- */
- public Configuration getAvalonConfigurationForComponent(String name)
- throws org.apache.avalon.framework.configuration.ConfigurationException {
- return avalonConfig.getChild(name);
- }
public void afterPropertiesSet() throws Exception {
Resource resource = loader.getResource(configFile);
@@ -84,7 +72,6 @@
config.setDelimiterParsingDisabled(true);
config.load(resource.getFile());
- avalonConfig = new DefaultConfigurationBuilder().buildFromFile(resource.getFile());
} catch (Exception e1) {
throw new RuntimeException("could not open configuration file "
+ configFile, e1);
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=902863&r1=902862&r2=902863&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 Mon Jan 25 16:33:12 2010
@@ -19,12 +19,12 @@
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;
+import org.apache.james.lifecycle.LifecycleUtil;
import java.util.ArrayList;
import java.util.Iterator;
@@ -228,7 +228,7 @@
*/
protected void disposeUsersRepository() {
if (usersRepository != null) {
- ContainerUtil.dispose(this.usersRepository);
+ LifecycleUtil.dispose(this.usersRepository);
}
}
Modified: james/server/trunk/user-library/src/test/java/org/apache/james/vut/AbstractVirtualUserTableTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/test/java/org/apache/james/vut/AbstractVirtualUserTableTest.java?rev=902863&r1=902862&r2=902863&view=diff
==============================================================================
--- james/server/trunk/user-library/src/test/java/org/apache/james/vut/AbstractVirtualUserTableTest.java (original)
+++ james/server/trunk/user-library/src/test/java/org/apache/james/vut/AbstractVirtualUserTableTest.java Mon Jan 25 16:33:12 2010
@@ -25,15 +25,13 @@
import java.util.Iterator;
import java.util.Map;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.container.ContainerUtil;
-import org.apache.avalon.framework.service.ServiceException;
import org.apache.james.api.dnsservice.DNSService;
import org.apache.james.api.dnsservice.TemporaryResolutionException;
import org.apache.james.api.vut.ErrorMappingException;
import org.apache.james.api.vut.VirtualUserTable;
import org.apache.james.api.vut.management.InvalidMappingException;
import org.apache.james.impl.vut.AbstractVirtualUserTable;
+import org.apache.james.lifecycle.LifecycleUtil;
import junit.framework.TestCase;
@@ -73,7 +71,7 @@
}
}
}
- ContainerUtil.dispose(virtualUserTable);
+ LifecycleUtil.dispose(virtualUserTable);
}
private void removeMapping(String user, String domain, String rawMapping) throws InvalidMappingException {
@@ -88,7 +86,7 @@
}
}
- protected abstract AbstractVirtualUserTable getVirtalUserTable() throws ServiceException, ConfigurationException, Exception;
+ protected abstract AbstractVirtualUserTable getVirtalUserTable() throws Exception;
protected abstract boolean addMapping(String user , String domain, String mapping,int type)throws InvalidMappingException;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org