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 [1/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...
Author: norman
Date: Mon Jan 25 16:33:12 2010
New Revision: 902863
URL: http://svn.apache.org/viewvc?rev=902863&view=rev
Log:
* Remove dependencies on ContainerUtil and Disposible
* Remove Spring BeanPostProcessors which were used for Avalon lifecycle
Added:
james/server/trunk/core-api/src/main/java/org/apache/james/lifecycle/Disposable.java
james/server/trunk/core-api/src/main/java/org/apache/james/lifecycle/LifecycleUtil.java
Removed:
james/server/trunk/common-util/src/test/java/org/apache/james/util/ConfigurationAdapter.java
james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/avalon/MockLogger.java
james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/avalon/MockServiceManager.java
james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/util/
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/AvalonConfigurationProvider.java
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/AvalonConfigurableBeanPostProcessor.java
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/AvalonInitializableBeanPostProcessor.java
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/AvalonLogEnabledBeanPostProcessor.java
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/AvalonServiceableBeanPostProcessor.java
Modified:
james/server/trunk/avalon-user-function/pom.xml
james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/DefaultUsersJdbcRepositoryTest.java
james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/JamesUsersJdbcRepositoryTest.java
james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/ListUsersJdbcRepositoryTest.java
james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/UsersFileRepositoryTest.java
james/server/trunk/basic-user-function/pom.xml
james/server/trunk/basic-user-function/src/test/java/org/apache/james/vut/XMLVirtualUserTableTest.java
james/server/trunk/common-util/pom.xml
james/server/trunk/core-api/pom.xml
james/server/trunk/core-api/src/test/java/org/apache/james/api/kernel/mock/FakeLoader.java
james/server/trunk/core-function/pom.xml
james/server/trunk/core-function/src/test/java/org/apache/james/mailrepository/AbstractMailRepositoryTest.java
james/server/trunk/core-function/src/test/java/org/apache/james/management/impl/SpoolManagementTest.java
james/server/trunk/core-library/pom.xml
james/server/trunk/core-library/src/main/java/org/apache/james/core/MailImpl.java
james/server/trunk/core-library/src/main/java/org/apache/james/core/MimeMessageCopyOnWriteProxy.java
james/server/trunk/core-library/src/main/java/org/apache/james/core/MimeMessageInputStreamSource.java
james/server/trunk/core-library/src/main/java/org/apache/james/core/MimeMessageWrapper.java
james/server/trunk/core-library/src/test/java/org/apache/james/core/MimeMessageCopyOnWriteProxyTest.java
james/server/trunk/core-library/src/test/java/org/apache/james/core/MimeMessageTest.java
james/server/trunk/core-library/src/test/java/org/apache/james/core/MimeMessageWrapperTest.java
james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/james/InMemorySpoolRepository.java
james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/james/MockMailServer.java
james/server/trunk/mailets-function/pom.xml
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/FromRepository.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/Retry.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
james/server/trunk/management-library/src/main/java/org/apache/james/management/impl/SpoolManagement.java
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/core/DeleCmdHandler.java
james/server/trunk/pop3server-function/src/test/java/org/apache/james/pop3server/AsyncPOP3ServerTest.java
james/server/trunk/remotemanager-function/src/test/java/org/apache/james/remotemanager/AsyncRemoteManagerTest.java
james/server/trunk/smtpserver-function/pom.xml
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/DataLineJamesMessageHookHandler.java
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/AsyncSMTPServerTest.java
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/POP3BeforeSMTPHandlerTest.java
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/Util.java
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/JamesMailetContext.java
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/JamesSpoolManager.java
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/transport/LinearProcessor.java
james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/LinearProcessorTest.java
james/server/trunk/spoolmanager-function/src/test/java/org/apache/james/transport/mailets/LocalDeliveryTest.java
james/server/trunk/spring-deployment/pom.xml
james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/SpringConfigurationProvider.java
james/server/trunk/user-library/src/test/java/org/apache/james/userrepository/MockUsersRepositoryTest.java
james/server/trunk/user-library/src/test/java/org/apache/james/vut/AbstractVirtualUserTableTest.java
Modified: james/server/trunk/avalon-user-function/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/pom.xml?rev=902863&r1=902862&r2=902863&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/pom.xml (original)
+++ james/server/trunk/avalon-user-function/pom.xml Mon Jan 25 16:33:12 2010
@@ -63,14 +63,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>
<groupId>org.apache.avalon.cornerstone.store</groupId>
<artifactId>cornerstone-store-api</artifactId>
</dependency>
Modified: james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/DefaultUsersJdbcRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/DefaultUsersJdbcRepositoryTest.java?rev=902863&r1=902862&r2=902863&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/DefaultUsersJdbcRepositoryTest.java (original)
+++ james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/DefaultUsersJdbcRepositoryTest.java Mon Jan 25 16:33:12 2010
@@ -24,6 +24,7 @@
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.commons.logging.impl.SimpleLog;
import org.apache.james.api.user.UsersRepository;
+import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.james.services.DataSourceSelector;
import org.apache.james.test.mock.james.MockFileSystem;
import org.apache.james.test.util.Util;
@@ -80,7 +81,7 @@
while (i.hasNext()) {
this.usersRepository.removeUser((String) i.next());
}
- ContainerUtil.dispose(this.usersRepository);
+ LifecycleUtil.dispose(this.usersRepository);
}
}
Modified: james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/JamesUsersJdbcRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/JamesUsersJdbcRepositoryTest.java?rev=902863&r1=902862&r2=902863&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/JamesUsersJdbcRepositoryTest.java (original)
+++ james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/JamesUsersJdbcRepositoryTest.java Mon Jan 25 16:33:12 2010
@@ -20,13 +20,13 @@
package org.apache.james.userrepository;
-import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.commons.logging.impl.SimpleLog;
import org.apache.james.api.user.JamesUser;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.api.vut.VirtualUserTable;
+import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.james.test.mock.james.MockFileSystem;
import org.apache.james.test.util.Util;
import org.apache.mailet.MailAddress;
@@ -82,7 +82,7 @@
while (i.hasNext()) {
this.usersRepository.removeUser((String) i.next());
}
- ContainerUtil.dispose(this.usersRepository);
+ LifecycleUtil.dispose(this.usersRepository);
}
Modified: james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/ListUsersJdbcRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/ListUsersJdbcRepositoryTest.java?rev=902863&r1=902862&r2=902863&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/ListUsersJdbcRepositoryTest.java (original)
+++ james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/ListUsersJdbcRepositoryTest.java Mon Jan 25 16:33:12 2010
@@ -19,7 +19,6 @@
package org.apache.james.userrepository;
-import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.commons.logging.impl.SimpleLog;
@@ -80,7 +79,7 @@
while (i.hasNext()) {
this.usersRepository.removeUser((String) i.next());
}
- ContainerUtil.dispose(this.usersRepository);
+ LifecycleUtil.dispose(this.usersRepository);
}
}
Modified: james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/UsersFileRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/UsersFileRepositoryTest.java?rev=902863&r1=902862&r2=902863&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/UsersFileRepositoryTest.java (original)
+++ james/server/trunk/avalon-user-function/src/test/java/org/apache/james/userrepository/UsersFileRepositoryTest.java Mon Jan 25 16:33:12 2010
@@ -27,12 +27,12 @@
import java.util.Collection;
import java.util.Iterator;
-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.JamesUser;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.api.vut.VirtualUserTable;
+import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.james.mailrepository.filepair.File_Persistent_Object_Repository;
import org.apache.james.services.FileSystem;
import org.apache.james.test.mock.avalon.MockStore;
@@ -93,7 +93,7 @@
while (i.hasNext()) {
this.usersRepository.removeUser((String) i.next());
}
- ContainerUtil.dispose(this.usersRepository);
+ LifecycleUtil.dispose(this.usersRepository);
}
}
Modified: james/server/trunk/basic-user-function/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/basic-user-function/pom.xml?rev=902863&r1=902862&r2=902863&view=diff
==============================================================================
--- james/server/trunk/basic-user-function/pom.xml (original)
+++ james/server/trunk/basic-user-function/pom.xml Mon Jan 25 16:33:12 2010
@@ -43,12 +43,6 @@
</dependency>
- <!-- Needed by the UsersLDAPRepository -->
- <dependency>
- <groupId>org.apache.avalon.framework</groupId>
- <artifactId>avalon-framework-api</artifactId>
- </dependency>
-
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-common-util</artifactId>
@@ -68,11 +62,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.avalon.framework</groupId>
- <artifactId>avalon-framework-impl</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified: james/server/trunk/basic-user-function/src/test/java/org/apache/james/vut/XMLVirtualUserTableTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/basic-user-function/src/test/java/org/apache/james/vut/XMLVirtualUserTableTest.java?rev=902863&r1=902862&r2=902863&view=diff
==============================================================================
--- james/server/trunk/basic-user-function/src/test/java/org/apache/james/vut/XMLVirtualUserTableTest.java (original)
+++ james/server/trunk/basic-user-function/src/test/java/org/apache/james/vut/XMLVirtualUserTableTest.java Mon Jan 25 16:33:12 2010
@@ -22,21 +22,29 @@
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Iterator;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.DefaultConfiguration;
+import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.commons.logging.impl.SimpleLog;
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.impl.vut.VirtualUserTableUtil;
-import org.apache.james.test.mock.util.AttrValConfiguration;
-import org.apache.james.util.ConfigurationAdapter;
public class XMLVirtualUserTableTest extends AbstractVirtualUserTableTest {
- DefaultConfiguration defaultConfiguration = new DefaultConfiguration("conf");
+ private DefaultConfigurationBuilder defaultConfiguration = new DefaultConfigurationBuilder();
+
+ @Override
+ protected void setUp() throws Exception {
+ defaultConfiguration.setDelimiterParsingDisabled(true);
+
+ super.setUp();
+ }
+
+
+
protected AbstractVirtualUserTable getVirtalUserTable() throws Exception {
XMLVirtualUserTable mr = new XMLVirtualUserTable();
mr.setDNSService(setUpDNSServer());
@@ -73,11 +81,11 @@
}
if (mappings.size() > 0) {
- defaultConfiguration.addChild(new AttrValConfiguration("mapping",user + "@" + domain +"=" + VirtualUserTableUtil.CollectionToMapping(mappings)));
+ defaultConfiguration.addProperty("mapping",user + "@" + domain +"=" + VirtualUserTableUtil.CollectionToMapping(mappings));
}
try {
- virtualUserTable.configure(new ConfigurationAdapter(defaultConfiguration));
+ virtualUserTable.configure(defaultConfiguration);
} catch (Exception e) {
if (mappings.size() > 0) {
return false;
@@ -114,11 +122,11 @@
}
if (mappings.size() > 0) {
- defaultConfiguration.addChild(new AttrValConfiguration("mapping",user + "@" + domain +"=" + VirtualUserTableUtil.CollectionToMapping(mappings)));
+ defaultConfiguration.addProperty("mapping",user + "@" + domain +"=" + VirtualUserTableUtil.CollectionToMapping(mappings));
}
try {
- virtualUserTable.configure(new ConfigurationAdapter(defaultConfiguration));
+ virtualUserTable.configure(defaultConfiguration);
} catch (Exception e) {
if (mappings.size() > 0) {
return false;
@@ -130,17 +138,18 @@
}
+ @SuppressWarnings("unchecked")
private void removeMappings(String user, String domain, Collection<String> mappings) {
- Configuration [] conf = defaultConfiguration.getChildren("mapping");
+ Iterator<String> conf = defaultConfiguration.getKeys();
- for (int i = 0; i < conf.length; i++ ) {
- DefaultConfiguration c = (DefaultConfiguration) conf[i];
+ while(conf.hasNext()) {
+ String c = conf.next();
try {
String mapping = user + "@" + domain + "=" + VirtualUserTableUtil.CollectionToMapping(mappings);
- if (c.getValue().equalsIgnoreCase(mapping)){
- defaultConfiguration.removeChild(c);
+ if (defaultConfiguration.getProperty(c).toString().equalsIgnoreCase(mapping)){
+ defaultConfiguration.clearProperty(c);
}
} catch (Exception e) {
e.printStackTrace();
Modified: james/server/trunk/common-util/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/common-util/pom.xml?rev=902863&r1=902862&r2=902863&view=diff
==============================================================================
--- james/server/trunk/common-util/pom.xml (original)
+++ james/server/trunk/common-util/pom.xml Mon Jan 25 16:33:12 2010
@@ -34,14 +34,6 @@
<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>
Modified: james/server/trunk/core-api/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/core-api/pom.xml?rev=902863&r1=902862&r2=902863&view=diff
==============================================================================
--- james/server/trunk/core-api/pom.xml (original)
+++ james/server/trunk/core-api/pom.xml Mon Jan 25 16:33:12 2010
@@ -43,17 +43,6 @@
</dependency>
<dependency>
- <groupId>org.apache.avalon.framework</groupId>
- <artifactId>avalon-framework-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.avalon.framework</groupId>
- <artifactId>avalon-framework-impl</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
</dependency>
Added: james/server/trunk/core-api/src/main/java/org/apache/james/lifecycle/Disposable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-api/src/main/java/org/apache/james/lifecycle/Disposable.java?rev=902863&view=auto
==============================================================================
--- james/server/trunk/core-api/src/main/java/org/apache/james/lifecycle/Disposable.java (added)
+++ james/server/trunk/core-api/src/main/java/org/apache/james/lifecycle/Disposable.java Mon Jan 25 16:33:12 2010
@@ -0,0 +1,25 @@
+/****************************************************************
+ * 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. *
+ ****************************************************************/
+
+package org.apache.james.lifecycle;
+
+public interface Disposable {
+
+ public void dispose();
+}
Added: james/server/trunk/core-api/src/main/java/org/apache/james/lifecycle/LifecycleUtil.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-api/src/main/java/org/apache/james/lifecycle/LifecycleUtil.java?rev=902863&view=auto
==============================================================================
--- james/server/trunk/core-api/src/main/java/org/apache/james/lifecycle/LifecycleUtil.java (added)
+++ james/server/trunk/core-api/src/main/java/org/apache/james/lifecycle/LifecycleUtil.java Mon Jan 25 16:33:12 2010
@@ -0,0 +1,29 @@
+/****************************************************************
+ * 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. *
+ ****************************************************************/
+
+package org.apache.james.lifecycle;
+
+public class LifecycleUtil {
+
+ public static void dispose(Object obj) {
+ if (obj instanceof Disposable) {
+ ((Disposable) obj).dispose();
+ }
+ }
+}
Modified: james/server/trunk/core-api/src/test/java/org/apache/james/api/kernel/mock/FakeLoader.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-api/src/test/java/org/apache/james/api/kernel/mock/FakeLoader.java?rev=902863&r1=902862&r2=902863&view=diff
==============================================================================
--- james/server/trunk/core-api/src/test/java/org/apache/james/api/kernel/mock/FakeLoader.java (original)
+++ james/server/trunk/core-api/src/test/java/org/apache/james/api/kernel/mock/FakeLoader.java Mon Jan 25 16:33:12 2010
@@ -22,10 +22,9 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.avalon.framework.service.ServiceException;
import org.apache.james.api.kernel.AbstractJSR250LoaderService;
-public class FakeLoader extends AbstractJSR250LoaderService implements org.apache.avalon.framework.service.ServiceManager{
+public class FakeLoader extends AbstractJSR250LoaderService {
private final Map<String, Object> servicesByName;
private final Map<String, String> mappings = new HashMap<String, String>();
@@ -77,30 +76,6 @@
}
-
- /*
- * (non-Javadoc)
- * @see org.apache.avalon.framework.service.ServiceManager#hasService(java.lang.String)
- */
- public boolean hasService(String name) {
- return servicesByName.containsKey(name);
- }
-
- /*
- * (non-Javadoc)
- * @see org.apache.avalon.framework.service.ServiceManager#lookup(java.lang.String)
- */
- public Object lookup(String name) throws ServiceException {
- return servicesByName.get(name);
- }
-
- /*
- * (non-Javadoc)
- * @see org.apache.avalon.framework.service.ServiceManager#release(java.lang.Object)
- */
- public void release(Object service) {
- }
-
public void put(String role, Object service) {
servicesByName.put(role, service);
}
Modified: james/server/trunk/core-function/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/pom.xml?rev=902863&r1=902862&r2=902863&view=diff
==============================================================================
--- james/server/trunk/core-function/pom.xml (original)
+++ james/server/trunk/core-function/pom.xml Mon Jan 25 16:33:12 2010
@@ -55,17 +55,10 @@
<artifactId>${javax.mail.artifactId}</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.avalon.framework</groupId>
- <artifactId>avalon-framework-api</artifactId>
- </dependency>
- <dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.avalon.framework</groupId>
- <artifactId>avalon-framework-impl</artifactId>
- </dependency>
+
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
Modified: james/server/trunk/core-function/src/test/java/org/apache/james/mailrepository/AbstractMailRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/test/java/org/apache/james/mailrepository/AbstractMailRepositoryTest.java?rev=902863&r1=902862&r2=902863&view=diff
==============================================================================
--- james/server/trunk/core-function/src/test/java/org/apache/james/mailrepository/AbstractMailRepositoryTest.java (original)
+++ james/server/trunk/core-function/src/test/java/org/apache/james/mailrepository/AbstractMailRepositoryTest.java Mon Jan 25 16:33:12 2010
@@ -19,10 +19,10 @@
package org.apache.james.mailrepository;
-import org.apache.avalon.framework.container.ContainerUtil;
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.services.MailRepository;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
@@ -74,9 +74,9 @@
for (Iterator<String> i = mailRepository.list(); i.hasNext(); ) {
mailRepository.remove(i.next());
}
- ContainerUtil.dispose(mail);
- ContainerUtil.dispose(mimeMessage);
- ContainerUtil.dispose(mailRepository);
+ LifecycleUtil.dispose(mail);
+ LifecycleUtil.dispose(mimeMessage);
+ LifecycleUtil.dispose(mailRepository);
super.tearDown();
}
@@ -93,8 +93,7 @@
assertEquals("stored and retrieved keys do not match", mail.getName(), m2.getName());
assertEquals("stored and retrieved states do not match", mail.getState(), m2.getState());
assertEquals("stored and retrieved attributes do not match", mail.getAttribute("testAttribute"), m2.getAttribute("testAttribute"));
-
- ContainerUtil.dispose(m2);
+ LifecycleUtil.dispose(m2);
}
public void testEmptyRepository() throws MessagingException {
@@ -128,14 +127,14 @@
mailRepository.store(m2);
// ALWAYS remember to dispose mails!
- ContainerUtil.dispose(m2);
+ LifecycleUtil.dispose(m2);
m2 = mailRepository.retrieve("mail1");
assertEquals(mail.getMessage().getContent().toString(),m2.getMessage().getContent().toString());
- ContainerUtil.dispose(mail);
+ LifecycleUtil.dispose(mail);
mail = null;
- ContainerUtil.dispose(m2);
+ LifecycleUtil.dispose(m2);
mailRepository.remove("mail1");
}
@@ -152,15 +151,15 @@
mailRepository.store(m2);
// ALWAYS remember to dispose mails!
- ContainerUtil.dispose(m2);
+ LifecycleUtil.dispose(m2);
m2 = mailRepository.retrieve("mail1");
assertEquals(mail.getMessage().getContent().toString(),m2.getMessage().getContent().toString());
- ContainerUtil.dispose(mail);
+ LifecycleUtil.dispose(mail);
mail = null;
- ContainerUtil.dispose(m2);
+ LifecycleUtil.dispose(m2);
mailRepository.remove("mail1");
}
Modified: james/server/trunk/core-function/src/test/java/org/apache/james/management/impl/SpoolManagementTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-function/src/test/java/org/apache/james/management/impl/SpoolManagementTest.java?rev=902863&r1=902862&r2=902863&view=diff
==============================================================================
--- james/server/trunk/core-function/src/test/java/org/apache/james/management/impl/SpoolManagementTest.java (original)
+++ james/server/trunk/core-function/src/test/java/org/apache/james/management/impl/SpoolManagementTest.java Mon Jan 25 16:33:12 2010
@@ -27,7 +27,7 @@
import junit.framework.TestCase;
-import org.apache.avalon.framework.container.ContainerUtil;
+import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.james.management.SpoolFilter;
import org.apache.james.management.SpoolManagementException;
import org.apache.james.test.mock.avalon.MockStore;
@@ -59,7 +59,7 @@
protected void tearDown() throws Exception {
if (m_mockSpoolRepository != null) {
- ContainerUtil.dispose(m_mockSpoolRepository);
+ LifecycleUtil.dispose(m_mockSpoolRepository);
}
super.tearDown();
}
Modified: james/server/trunk/core-library/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/pom.xml?rev=902863&r1=902862&r2=902863&view=diff
==============================================================================
--- james/server/trunk/core-library/pom.xml (original)
+++ james/server/trunk/core-library/pom.xml Mon Jan 25 16:33:12 2010
@@ -63,14 +63,6 @@
<groupId>${javax.activation.groupId}</groupId>
<artifactId>${javax.activation.artifactId}</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.apache.avalon.cornerstone.store</groupId>
Modified: james/server/trunk/core-library/src/main/java/org/apache/james/core/MailImpl.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/core/MailImpl.java?rev=902863&r1=902862&r2=902863&view=diff
==============================================================================
--- james/server/trunk/core-library/src/main/java/org/apache/james/core/MailImpl.java (original)
+++ james/server/trunk/core-library/src/main/java/org/apache/james/core/MailImpl.java Mon Jan 25 16:33:12 2010
@@ -21,8 +21,8 @@
package org.apache.james.core;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.container.ContainerUtil;
+import org.apache.james.lifecycle.Disposable;
+import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
import org.apache.mailet.base.RFC2822Headers;
@@ -195,7 +195,7 @@
try {
this.setMessage(new MimeMessageCopyOnWriteProxy(source));
} catch (MessagingException e) {
- ContainerUtil.dispose(source);
+ LifecycleUtil.dispose(source);
throw e;
}
}
@@ -384,7 +384,7 @@
// (discouraged) we have to make sure that the message we remove is
// correctly unreferenced and disposed, otherwise it will keep locks
if (this.message != null) {
- ContainerUtil.dispose(this.message);
+ LifecycleUtil.dispose(this.message);
}
this.message = message;
}
@@ -526,7 +526,7 @@
* @see org.apache.avalon.framework.activity.Disposable#dispose()
*/
public void dispose() {
- ContainerUtil.dispose(message);
+ LifecycleUtil.dispose(message);
message = null;
}
Modified: james/server/trunk/core-library/src/main/java/org/apache/james/core/MimeMessageCopyOnWriteProxy.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/core/MimeMessageCopyOnWriteProxy.java?rev=902863&r1=902862&r2=902863&view=diff
==============================================================================
--- james/server/trunk/core-library/src/main/java/org/apache/james/core/MimeMessageCopyOnWriteProxy.java (original)
+++ james/server/trunk/core-library/src/main/java/org/apache/james/core/MimeMessageCopyOnWriteProxy.java Mon Jan 25 16:33:12 2010
@@ -21,9 +21,6 @@
package org.apache.james.core;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.container.ContainerUtil;
-
import javax.activation.DataHandler;
import javax.mail.Address;
import javax.mail.Flags;
@@ -36,6 +33,9 @@
import javax.mail.internet.MimeMessage;
import javax.mail.search.SearchTerm;
+import org.apache.james.lifecycle.Disposable;
+import org.apache.james.lifecycle.LifecycleUtil;
+
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -91,7 +91,7 @@
*/
referenceCount--;
if (referenceCount<=0) {
- ContainerUtil.dispose(wrapped);
+ LifecycleUtil.dispose(wrapped);
wrapped = null;
}
}
Modified: james/server/trunk/core-library/src/main/java/org/apache/james/core/MimeMessageInputStreamSource.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/core/MimeMessageInputStreamSource.java?rev=902863&r1=902862&r2=902863&view=diff
==============================================================================
--- james/server/trunk/core-library/src/main/java/org/apache/james/core/MimeMessageInputStreamSource.java (original)
+++ james/server/trunk/core-library/src/main/java/org/apache/james/core/MimeMessageInputStreamSource.java Mon Jan 25 16:33:12 2010
@@ -24,6 +24,8 @@
import javax.mail.MessagingException;
import javax.mail.util.SharedFileInputStream;
+import org.apache.james.lifecycle.Disposable;
+
import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileNotFoundException;
@@ -32,8 +34,6 @@
import java.io.InputStream;
import java.io.OutputStream;
-import org.apache.avalon.framework.activity.Disposable;
-
/**
* Takes an input stream and creates a repeatable input stream source
* for a MimeMessageWrapper. It does this by completely reading the
Modified: james/server/trunk/core-library/src/main/java/org/apache/james/core/MimeMessageWrapper.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/main/java/org/apache/james/core/MimeMessageWrapper.java?rev=902863&r1=902862&r2=902863&view=diff
==============================================================================
--- james/server/trunk/core-library/src/main/java/org/apache/james/core/MimeMessageWrapper.java (original)
+++ james/server/trunk/core-library/src/main/java/org/apache/james/core/MimeMessageWrapper.java Mon Jan 25 16:33:12 2010
@@ -21,8 +21,8 @@
package org.apache.james.core;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.container.ContainerUtil;
+import org.apache.james.lifecycle.Disposable;
+import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.james.util.InternetPrintWriter;
import org.apache.james.util.io.IOUtil;
@@ -466,7 +466,7 @@
IOUtil.shutdownStream(sourceIn);
}
if (source != null) {
- ContainerUtil.dispose(source);
+ LifecycleUtil.dispose(source);
}
}
Modified: james/server/trunk/core-library/src/test/java/org/apache/james/core/MimeMessageCopyOnWriteProxyTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/test/java/org/apache/james/core/MimeMessageCopyOnWriteProxyTest.java?rev=902863&r1=902862&r2=902863&view=diff
==============================================================================
--- james/server/trunk/core-library/src/test/java/org/apache/james/core/MimeMessageCopyOnWriteProxyTest.java (original)
+++ james/server/trunk/core-library/src/test/java/org/apache/james/core/MimeMessageCopyOnWriteProxyTest.java Mon Jan 25 16:33:12 2010
@@ -19,17 +19,17 @@
package org.apache.james.core;
-import org.apache.avalon.framework.container.ContainerUtil;
-import org.apache.mailet.Mail;
-import org.apache.mailet.MailAddress;
+import java.util.ArrayList;
+import java.util.Properties;
import javax.mail.MessagingException;
import javax.mail.Session;
import javax.mail.internet.MimeMessage;
import javax.mail.util.SharedByteArrayInputStream;
-import java.util.ArrayList;
-import java.util.Properties;
+import org.apache.james.lifecycle.LifecycleUtil;
+import org.apache.mailet.Mail;
+import org.apache.mailet.MailAddress;
public class MimeMessageCopyOnWriteProxyTest extends MimeMessageFromStreamTest {
@@ -66,9 +66,9 @@
// test it is different after a write operation!
mail.getMessage().setSubject("new Subject");
assertTrue(!isSameMimeMessage(m2.getMessage(),mail.getMessage()));
- ContainerUtil.dispose(mail);
- ContainerUtil.dispose(m2);
- ContainerUtil.dispose(messageFromSources);
+ LifecycleUtil.dispose(mail);
+ LifecycleUtil.dispose(m2);
+ LifecycleUtil.dispose(messageFromSources);
}
@@ -103,15 +103,15 @@
MimeMessage mm3 = getWrappedMessage(m2clone.getMessage());
assertNotNull(mm3);
// dispose m2 and check that the clone has still a valid message and it is the same!
- ContainerUtil.dispose(m2);
+ LifecycleUtil.dispose(m2);
assertEquals(mm3,getWrappedMessage(m2clone.getMessage()));
// change the message that should be not referenced by m2 that has
// been disposed, so it should not clone it!
m2clone.getMessage().setSubject("new Subject 2");
m2clone.getMessage().setText("new Body 3");
assertTrue(isSameMimeMessage(m2clone.getMessage(),mm));
- ContainerUtil.dispose(mail);
- ContainerUtil.dispose(messageFromSources);
+ LifecycleUtil.dispose(mail);
+ LifecycleUtil.dispose(messageFromSources);
}
/**
@@ -129,8 +129,8 @@
MimeMessage mm = getWrappedMessage(mail.getMessage());
assertNotSame(mail.getMessage(),mailClone.getMessage());
// dispose mail and check that the clone has still a valid message and it is the same!
- ContainerUtil.dispose(mail);
- ContainerUtil.dispose(messageFromSources);
+ LifecycleUtil.dispose(mail);
+ LifecycleUtil.dispose(messageFromSources);
// need to add a gc and a wait, because the original mimemessage should be finalized before the test.
System.gc();
Thread.sleep(1000);
@@ -141,8 +141,8 @@
mailClone.getMessage().setSubject("new Subject 2");
mailClone.getMessage().setText("new Body 3");
assertTrue(isSameMimeMessage(mailClone.getMessage(),mm));
- ContainerUtil.dispose(mailClone);
- ContainerUtil.dispose(mm);
+ LifecycleUtil.dispose(mailClone);
+ LifecycleUtil.dispose(mm);
}
@@ -166,8 +166,8 @@
System.gc();
Thread.sleep(100);
assertFalse(isSameMimeMessage(m,mail.getMessage()));
- ContainerUtil.dispose(mail);
- ContainerUtil.dispose(m);
+ LifecycleUtil.dispose(mail);
+ LifecycleUtil.dispose(m);
}
@@ -178,17 +178,17 @@
MailImpl mail = new MailImpl("test",new MailAddress("test@test.com"),r,messageFromSources);
// cloning the message
MailImpl mailClone = (MailImpl) mail.duplicate();
- ContainerUtil.dispose(mail);
+ LifecycleUtil.dispose(mail);
assertNotNull(getWrappedMessage(mailClone.getMessage()));
assertNull(mail.getMessage());
- ContainerUtil.dispose(mailClone);
+ LifecycleUtil.dispose(mailClone);
assertNull(mailClone.getMessage());
assertNull(mail.getMessage());
- ContainerUtil.dispose(mail);
- ContainerUtil.dispose(messageFromSources);
+ LifecycleUtil.dispose(mail);
+ LifecycleUtil.dispose(messageFromSources);
}
public void testNPE1() throws MessagingException, InterruptedException {
@@ -204,13 +204,13 @@
"Body Text testNPE1\r\n").getBytes())));
MimeMessageCopyOnWriteProxy mw2 = new MimeMessageCopyOnWriteProxy(mw);
- ContainerUtil.dispose(mw2);
+ LifecycleUtil.dispose(mw2);
mw2 = null;
System.gc();
Thread.sleep(1000);
// the NPE was inside this call
mw.getMessageSize();
- ContainerUtil.dispose(mw);
+ LifecycleUtil.dispose(mw);
}
@@ -223,7 +223,7 @@
MimeMessage mm = new MimeMessageCopyOnWriteProxy(mmorig);
- ContainerUtil.dispose(mmorig);
+ LifecycleUtil.dispose(mmorig);
mmorig = null;
System.gc();
Thread.sleep(200);
@@ -235,7 +235,7 @@
fail("Exception while writing the message to output");
}
- ContainerUtil.dispose(mm);
+ LifecycleUtil.dispose(mm);
}
private static String getReferences(MimeMessage m) {
Modified: james/server/trunk/core-library/src/test/java/org/apache/james/core/MimeMessageTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/test/java/org/apache/james/core/MimeMessageTest.java?rev=902863&r1=902862&r2=902863&view=diff
==============================================================================
--- james/server/trunk/core-library/src/test/java/org/apache/james/core/MimeMessageTest.java (original)
+++ james/server/trunk/core-library/src/test/java/org/apache/james/core/MimeMessageTest.java Mon Jan 25 16:33:12 2010
@@ -19,7 +19,7 @@
package org.apache.james.core;
-import org.apache.avalon.framework.container.ContainerUtil;
+import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.mailet.base.RFC2822Headers;
import javax.mail.BodyPart;
@@ -89,7 +89,7 @@
public void testSimpleMessage() throws Exception {
MimeMessage m = getSimpleMessage();
assertEquals(getSimpleMessageCleanedSource(), getCleanedMessageSource(m));
- ContainerUtil.dispose(m);
+ LifecycleUtil.dispose(m);
}
@@ -224,7 +224,7 @@
assertEquals(getMultipartMessageExpected3(),getCleanedMessageSource(mm));
- ContainerUtil.dispose(mm);
+ LifecycleUtil.dispose(mm);
}
@@ -336,7 +336,7 @@
} catch (Exception e) {
fail("Unexpected exception in getLineCount");
}
- ContainerUtil.dispose(mm);
+ LifecycleUtil.dispose(mm);
}
/**
@@ -352,15 +352,15 @@
mm2.setHeader("Subject", "Modified");
- ContainerUtil.dispose(mm2);
+ LifecycleUtil.dispose(mm2);
System.gc();
Thread.sleep(200);
//((Disposable)mail_dup.getMessage()).dispose();
mm.setHeader("Subject", "Modified");
- ContainerUtil.dispose(mm);
- ContainerUtil.dispose(mmorig);
+ LifecycleUtil.dispose(mm);
+ LifecycleUtil.dispose(mmorig);
}
/**
@@ -374,7 +374,7 @@
MimeMessage mm2 = new MimeMessageCopyOnWriteProxy(mm);
- ContainerUtil.dispose(mm);
+ LifecycleUtil.dispose(mm);
mm = null;
System.gc();
Thread.sleep(200);
@@ -386,8 +386,8 @@
fail("Exception while writing the message to output");
}
- ContainerUtil.dispose(mm2);
- ContainerUtil.dispose(mmorig);
+ LifecycleUtil.dispose(mm2);
+ LifecycleUtil.dispose(mmorig);
}
@@ -405,14 +405,14 @@
assertEquals(getSimpleMessageCleanedSourceHeaderExpected(),getCleanedMessageSource(mm));
- ContainerUtil.dispose(mm);
- ContainerUtil.dispose(mmorig);
+ LifecycleUtil.dispose(mm);
+ LifecycleUtil.dispose(mmorig);
}
public void testReturnPath() throws Exception {
MimeMessage message = getSimpleMessage();
assertNull(message.getHeader(RFC2822Headers.RETURN_PATH));
- ContainerUtil.dispose(message);
+ LifecycleUtil.dispose(message);
}
public void testHeaderOrder() throws Exception {
@@ -421,7 +421,7 @@
Enumeration h = message.getAllHeaderLines();
assertEquals(h.nextElement(),"Return-Path: <te...@test.de>");
- ContainerUtil.dispose(message);
+ LifecycleUtil.dispose(message);
}
Modified: james/server/trunk/core-library/src/test/java/org/apache/james/core/MimeMessageWrapperTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/test/java/org/apache/james/core/MimeMessageWrapperTest.java?rev=902863&r1=902862&r2=902863&view=diff
==============================================================================
--- james/server/trunk/core-library/src/test/java/org/apache/james/core/MimeMessageWrapperTest.java (original)
+++ james/server/trunk/core-library/src/test/java/org/apache/james/core/MimeMessageWrapperTest.java Mon Jan 25 16:33:12 2010
@@ -19,7 +19,7 @@
package org.apache.james.core;
-import org.apache.avalon.framework.container.ContainerUtil;
+import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.mailet.base.RFC2822Headers;
import javax.mail.MessagingException;
@@ -118,7 +118,7 @@
}
protected void tearDown() throws Exception {
- ContainerUtil.dispose(mw);
+ LifecycleUtil.dispose(mw);
}
@@ -160,7 +160,7 @@
*/
public void testMessageCloned() throws MessagingException, IOException, InterruptedException {
MimeMessageWrapper mmw = new MimeMessageWrapper(mw);
- ContainerUtil.dispose(mw);
+ LifecycleUtil.dispose(mw);
mw = null;
System.gc();
Thread.sleep(200);
@@ -230,7 +230,7 @@
Enumeration h = message.getAllHeaderLines();
assertEquals("Return-Path: <te...@test.de>",h.nextElement());
assertFalse(h.nextElement().toString().startsWith("Return-Path:"));
- ContainerUtil.dispose(message);
+ LifecycleUtil.dispose(message);
}
public void testAddReturnPathOnBadMessage() throws Exception {
@@ -243,7 +243,7 @@
// test that return-path is the first line
Enumeration h = message.getAllHeaderLines();
assertEquals("Return-Path: <te...@test.de>",h.nextElement());
- ContainerUtil.dispose(message);
+ LifecycleUtil.dispose(message);
}
}
Modified: james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/james/InMemorySpoolRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/james/InMemorySpoolRepository.java?rev=902863&r1=902862&r2=902863&view=diff
==============================================================================
--- james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/james/InMemorySpoolRepository.java (original)
+++ james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/james/InMemorySpoolRepository.java Mon Jan 25 16:33:12 2010
@@ -19,11 +19,12 @@
package org.apache.james.test.mock.james;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.container.ContainerUtil;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.impl.SimpleLog;
import org.apache.james.core.MailImpl;
+import org.apache.james.lifecycle.Disposable;
+import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.james.services.SpoolRepository;
-import org.apache.james.test.mock.avalon.MockLogger;
import org.apache.james.util.Lock;
import org.apache.mailet.Mail;
@@ -54,12 +55,12 @@
*/
protected final static boolean DEEP_DEBUG = true;
private Lock lock;
- private MockLogger logger;
+ private Log logger;
private Hashtable<String, Mail> spool;
- private MockLogger getLogger() {
+ private Log getLogger() {
if (logger == null) {
- logger = new MockLogger();
+ logger = new SimpleLog("Log");
}
return logger;
}
@@ -144,7 +145,7 @@
// do not use this.remove because this would
// also remove a current lock.
Object o = spool.remove(key);
- ContainerUtil.dispose(o);
+ LifecycleUtil.dispose(o);
}
// Clone the mail (so the caller could modify it).
MailImpl m = new MailImpl(mc,mc.getName());
@@ -250,7 +251,7 @@
try {
if (spool != null) {
Object o = spool.remove(key);
- ContainerUtil.dispose(o);
+ LifecycleUtil.dispose(o);
}
} finally {
unlock(key);
Modified: james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/james/MockMailServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/james/MockMailServer.java?rev=902863&r1=902862&r2=902863&view=diff
==============================================================================
--- james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/james/MockMailServer.java (original)
+++ james/server/trunk/core-library/src/test/java/org/apache/james/test/mock/james/MockMailServer.java Mon Jan 25 16:33:12 2010
@@ -19,10 +19,10 @@
package org.apache.james.test.mock.james;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.core.MailImpl;
+import org.apache.james.lifecycle.Disposable;
+import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.james.services.MailRepository;
import org.apache.james.services.MailServer;
import org.apache.mailet.base.test.MailUtil;
@@ -162,7 +162,7 @@
Iterator<MailRepository> i = inboxes.values().iterator();
while (i.hasNext()) {
MailRepository m = i.next();
- ContainerUtil.dispose(m);
+ LifecycleUtil.dispose(m);
}
}
}
Modified: james/server/trunk/mailets-function/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/pom.xml?rev=902863&r1=902862&r2=902863&view=diff
==============================================================================
--- james/server/trunk/mailets-function/pom.xml (original)
+++ james/server/trunk/mailets-function/pom.xml Mon Jan 25 16:33:12 2010
@@ -91,14 +91,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>
<groupId>oro</groupId>
<artifactId>oro</artifactId>
</dependency>
Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/FromRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/FromRepository.java?rev=902863&r1=902862&r2=902863&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/FromRepository.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/FromRepository.java Mon Jan 25 16:33:12 2010
@@ -22,8 +22,8 @@
package org.apache.james.transport.mailets;
import org.apache.avalon.cornerstone.services.store.Store;
-import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
+import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.james.services.MailRepository;
import org.apache.mailet.base.GenericMailet;
import org.apache.mailet.Mail;
@@ -128,7 +128,7 @@
mail.setState(processor);
getMailetContext().sendMail(mail);
if (delete) processed.add(key);
- ContainerUtil.dispose(mail);
+ LifecycleUtil.dispose(mail);
}
} catch (MessagingException e) {
log((new StringBuffer(160).append("Unable to re-spool mail ").append(key).append(" from ").append(repositoryPath)).toString(), e);
Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java?rev=902863&r1=902862&r2=902863&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java Mon Jan 25 16:33:12 2010
@@ -22,11 +22,11 @@
package org.apache.james.transport.mailets;
import org.apache.avalon.cornerstone.services.store.Store;
-import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.james.Constants;
import org.apache.james.api.dnsservice.DNSService;
import org.apache.james.api.dnsservice.TemporaryResolutionException;
+import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.james.services.SpoolRepository;
import org.apache.james.util.TimeConverter;
import org.apache.mailet.base.GenericMailet;
@@ -791,13 +791,13 @@
if (deliver(mail, session)) {
// Message was successfully delivered/fully failed...
// delete it
- ContainerUtil.dispose(mail);
+ LifecycleUtil.dispose(mail);
workRepository.remove(key);
} else {
// Something happened that will delay delivery.
// Store it back in the retry repository.
workRepository.store(mail);
- ContainerUtil.dispose(mail);
+ LifecycleUtil.dispose(mail);
// This is an update, so we have to unlock and
// notify or this mail is kept locked by this thread.
@@ -820,7 +820,7 @@
// there were an OutOfMemory condition caused because
// something else in the server was abusing memory, we would
// not want to start purging the retrying spool!
- ContainerUtil.dispose(mail);
+ LifecycleUtil.dispose(mail);
workRepository.remove(key);
throw e;
}
Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/Retry.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/Retry.java?rev=902863&r1=902862&r2=902863&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/Retry.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/Retry.java Mon Jan 25 16:33:12 2010
@@ -20,9 +20,9 @@
package org.apache.james.transport.mailets;
import org.apache.avalon.cornerstone.services.store.Store;
-import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.james.Constants;
+import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.james.services.SpoolRepository;
import org.apache.mailet.base.GenericMailet;
import org.apache.mailet.Mail;
@@ -645,7 +645,7 @@
// Something happened that will delay delivery.
// Store it back in the retry repository.
workRepository.store(mail);
- ContainerUtil.dispose(mail);
+ LifecycleUtil.dispose(mail);
// This is an update, so we have to unlock and
// notify or this mail is kept locked by this thread.
@@ -668,7 +668,7 @@
// there were an OutOfMemory condition caused because
// something else in the server was abusing memory, we would
// not want to start purging the retrying spool!
- ContainerUtil.dispose(mail);
+ LifecycleUtil.dispose(mail);
workRepository.remove(key);
throw e;
}
Modified: james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java?rev=902863&r1=902862&r2=902863&view=diff
==============================================================================
--- james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java (original)
+++ james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java Mon Jan 25 16:33:12 2010
@@ -21,9 +21,9 @@
package org.apache.james.transport.matchers;
-import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.james.api.user.JamesUser;
import org.apache.james.api.user.UsersRepository;
+import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.james.services.MailRepository;
import org.apache.james.services.MailServer;
import org.apache.mailet.Mail;
@@ -98,7 +98,7 @@
// It could be deleted while we're looping.
log("Exception in getting message size: " + e.getMessage());
}
- ContainerUtil.dispose(mc);
+ LifecycleUtil.dispose(mc);
}
return size;
}
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=902863&r1=902862&r2=902863&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 Mon Jan 25 16:33:12 2010
@@ -23,8 +23,8 @@
package org.apache.james.management.impl;
import org.apache.avalon.cornerstone.services.store.Store;
-import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.commons.configuration.DefaultConfigurationBuilder;
+import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.james.management.SpoolFilter;
import org.apache.james.management.SpoolManagementException;
import org.apache.james.management.SpoolManagementMBean;
@@ -136,7 +136,7 @@
} catch (MessagingException e) {
// unable to unlock
}
- ContainerUtil.dispose(m);
+ LifecycleUtil.dispose(m);
}
}
}
@@ -452,7 +452,7 @@
Mail m = spoolRepository.retrieve(key);
if (m == null) throw new SpoolManagementException("mail not available having key " + key);
if (!filterMatches(m, filter)) return false;
- ContainerUtil.dispose(m);
+ LifecycleUtil.dispose(m);
spoolRepository.remove(key);
return true;
}
Modified: james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/core/DeleCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/core/DeleCmdHandler.java?rev=902863&r1=902862&r2=902863&view=diff
==============================================================================
--- james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/core/DeleCmdHandler.java (original)
+++ james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/core/DeleCmdHandler.java Mon Jan 25 16:33:12 2010
@@ -25,10 +25,10 @@
import java.util.Collection;
import java.util.List;
-import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.james.api.protocol.CommandHandler;
import org.apache.james.api.protocol.Request;
import org.apache.james.api.protocol.Response;
+import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.james.pop3server.POP3Response;
import org.apache.james.pop3server.POP3Session;
import org.apache.mailet.Mail;
@@ -69,7 +69,7 @@
session.getUserMailbox().set(num, dm);
// we are replacing our reference with "DELETED", so we have
// to dispose the no-more-referenced mail object.
- ContainerUtil.dispose(mc);
+ LifecycleUtil.dispose(mc);
response = new POP3Response(POP3Response.OK_RESPONSE,"Message deleted");
}
} catch (IndexOutOfBoundsException iob) {
Modified: james/server/trunk/pop3server-function/src/test/java/org/apache/james/pop3server/AsyncPOP3ServerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/src/test/java/org/apache/james/pop3server/AsyncPOP3ServerTest.java?rev=902863&r1=902862&r2=902863&view=diff
==============================================================================
--- james/server/trunk/pop3server-function/src/test/java/org/apache/james/pop3server/AsyncPOP3ServerTest.java (original)
+++ james/server/trunk/pop3server-function/src/test/java/org/apache/james/pop3server/AsyncPOP3ServerTest.java Mon Jan 25 16:33:12 2010
@@ -32,7 +32,6 @@
import junit.framework.TestCase;
-import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.commons.logging.impl.SimpleLog;
import org.apache.commons.net.pop3.POP3Client;
import org.apache.commons.net.pop3.POP3MessageInfo;
@@ -42,6 +41,7 @@
import org.apache.james.api.kernel.mock.FakeLoader;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.core.MailImpl;
+import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.james.pop3server.mina.AsyncPOP3Server;
import org.apache.james.services.MailRepository;
import org.apache.james.services.MailServer;
@@ -126,7 +126,7 @@
m_pop3Protocol.sendCommand("quit");
m_pop3Protocol.disconnect();
}
- ContainerUtil.dispose(m_mailServer);
+ LifecycleUtil.dispose(m_mailServer);
if (testMail1 != null) testMail1.dispose();
if (testMail2 != null) testMail2.dispose();
super.tearDown();
@@ -184,7 +184,7 @@
assertEquals(1, m_pop3Protocol.getState());
assertNull(p3i);
- ContainerUtil.dispose(mockMailRepository);
+ LifecycleUtil.dispose(mockMailRepository);
}
// TODO: This currently fails with Async implementation because
@@ -389,7 +389,7 @@
Reader r3 = m_pop3Protocol.retrieveMessageTop(entries[0].number, 0);
assertNotNull(r3);
r3.close();
- ContainerUtil.dispose(mailRep);
+ LifecycleUtil.dispose(mailRep);
}
private void setupTestMails(MailRepository mailRep) throws MessagingException {
@@ -470,7 +470,7 @@
m_pop3Protocol.login("foo", pass);
assertEquals(1, m_pop3Protocol.getState());
assertTrue(POP3BeforeSMTPHelper.isAuthorized("127.0.0.1"));
- ContainerUtil.dispose(mockMailRepository);
+ LifecycleUtil.dispose(mockMailRepository);
}
public void testCapa() throws Exception {
@@ -502,7 +502,7 @@
assertTrue("contains UIDL", replies.contains("UIDL"));
assertTrue("contains TOP", replies.contains("TOP"));
- ContainerUtil.dispose(mockMailRepository);
+ LifecycleUtil.dispose(mockMailRepository);
}
Modified: james/server/trunk/remotemanager-function/src/test/java/org/apache/james/remotemanager/AsyncRemoteManagerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/src/test/java/org/apache/james/remotemanager/AsyncRemoteManagerTest.java?rev=902863&r1=902862&r2=902863&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/src/test/java/org/apache/james/remotemanager/AsyncRemoteManagerTest.java (original)
+++ james/server/trunk/remotemanager-function/src/test/java/org/apache/james/remotemanager/AsyncRemoteManagerTest.java Mon Jan 25 16:33:12 2010
@@ -34,7 +34,6 @@
import junit.framework.TestCase;
-import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.commons.logging.impl.SimpleLog;
import org.apache.commons.net.telnet.TelnetClient;
import org.apache.james.api.dnsservice.AbstractDNSServer;
@@ -46,6 +45,7 @@
import org.apache.james.api.user.UsersStore;
import org.apache.james.api.vut.management.MockVirtualUserTableManagementService;
import org.apache.james.api.vut.management.VirtualUserTableManagementService;
+import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.james.management.BayesianAnalyzerManagementException;
import org.apache.james.management.BayesianAnalyzerManagementService;
import org.apache.james.management.DomainListManagementException;
@@ -96,7 +96,7 @@
}
protected void tearDown() throws Exception {
- ContainerUtil.dispose(mailServer);
+ LifecycleUtil.dispose(mailServer);
super.tearDown();
}
Modified: james/server/trunk/smtpserver-function/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/pom.xml?rev=902863&r1=902862&r2=902863&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/pom.xml (original)
+++ james/server/trunk/smtpserver-function/pom.xml Mon Jan 25 16:33:12 2010
@@ -89,19 +89,11 @@
<groupId>org.apache.avalon.cornerstone.store</groupId>
<artifactId>cornerstone-store-api</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.apache.avalon.framework</groupId>
- <artifactId>avalon-framework-impl</artifactId>
- </dependency>
+
<dependency>
<groupId>oro</groupId>
<artifactId>oro</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.avalon.framework</groupId>
- <artifactId>avalon-framework-api</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/DataLineJamesMessageHookHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/DataLineJamesMessageHookHandler.java?rev=902863&r1=902862&r2=902863&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/DataLineJamesMessageHookHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/DataLineJamesMessageHookHandler.java Mon Jan 25 16:33:12 2010
@@ -31,7 +31,6 @@
import javax.annotation.Resource;
import javax.mail.MessagingException;
-import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.james.api.protocol.ExtensibleHandler;
@@ -41,6 +40,7 @@
import org.apache.james.core.MimeMessageCopyOnWriteProxy;
import org.apache.james.core.MimeMessageInputStreamSource;
import org.apache.james.dsn.DSNStatus;
+import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.james.lifecycle.LogEnabled;
import org.apache.james.services.MailServer;
import org.apache.james.smtpserver.protocol.MailEnvelope;
@@ -127,9 +127,9 @@
session.getLogger().info("Unexpected error handling DATA stream",e);
session.writeResponse(new SMTPResponse(SMTPRetCode.LOCAL_ERROR, "Unexpected error handling DATA stream."));
} finally {
- ContainerUtil.dispose(mimeMessageCopyOnWriteProxy);
- ContainerUtil.dispose(mmiss);
- ContainerUtil.dispose(mail);
+ LifecycleUtil.dispose(mimeMessageCopyOnWriteProxy);
+ LifecycleUtil.dispose(mmiss);
+ LifecycleUtil.dispose(mail);
}
@@ -221,7 +221,7 @@
} finally {
// Dispose the mail object and remove it
if (mail != null) {
- ContainerUtil.dispose(mail);
+ LifecycleUtil.dispose(mail);
mail = null;
}
// do the clean up
Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/AsyncSMTPServerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/AsyncSMTPServerTest.java?rev=902863&r1=902862&r2=902863&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/AsyncSMTPServerTest.java (original)
+++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/AsyncSMTPServerTest.java Mon Jan 25 16:33:12 2010
@@ -39,7 +39,6 @@
import junit.framework.TestCase;
import org.apache.avalon.cornerstone.services.store.Store;
-import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.commons.logging.impl.SimpleLog;
import org.apache.commons.net.smtp.SMTPClient;
import org.apache.commons.net.smtp.SMTPReply;
@@ -47,6 +46,7 @@
import org.apache.james.api.kernel.mock.FakeLoader;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.api.vut.VirtualUserTableStore;
+import org.apache.james.lifecycle.LifecycleUtil;
import org.apache.james.services.FileSystem;
import org.apache.james.services.MailServer;
import org.apache.james.smtpserver.integration.SMTPServerDNSServiceAdapter;
@@ -179,7 +179,7 @@
}
protected void tearDown() throws Exception {
- ContainerUtil.dispose(m_mailServer);
+ LifecycleUtil.dispose(m_mailServer);
super.tearDown();
}
Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/POP3BeforeSMTPHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/POP3BeforeSMTPHandlerTest.java?rev=902863&r1=902862&r2=902863&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/POP3BeforeSMTPHandlerTest.java (original)
+++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/POP3BeforeSMTPHandlerTest.java Mon Jan 25 16:33:12 2010
@@ -20,11 +20,9 @@
package org.apache.james.smtpserver;
-import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.james.smtpserver.integration.POP3BeforeSMTPHandler;
import org.apache.james.smtpserver.protocol.BaseFakeSMTPSession;
import org.apache.james.smtpserver.protocol.SMTPSession;
-import org.apache.james.test.mock.avalon.MockLogger;
import org.apache.james.util.POP3BeforeSMTPHelper;
import junit.framework.TestCase;
@@ -56,7 +54,6 @@
POP3BeforeSMTPHandler handler = new POP3BeforeSMTPHandler();
- ContainerUtil.enableLogging(handler, new MockLogger());
setupMockedSMTPSession();
POP3BeforeSMTPHelper.addIPAddress("192.168.200.1");
@@ -69,7 +66,6 @@
long sleepTime = 100;
POP3BeforeSMTPHandler handler = new POP3BeforeSMTPHandler();
- ContainerUtil.enableLogging(handler, new MockLogger());
setupMockedSMTPSession();
POP3BeforeSMTPHelper.addIPAddress("192.168.200.1");
assertFalse(mockedSession.isRelayingAllowed());
@@ -89,7 +85,6 @@
boolean exception = false;
POP3BeforeSMTPHandler handler = new POP3BeforeSMTPHandler();
- ContainerUtil.enableLogging(handler, new MockLogger());
setupMockedSMTPSession();
try {
@@ -104,7 +99,6 @@
boolean exception = false;
POP3BeforeSMTPHandler handler = new POP3BeforeSMTPHandler();
- ContainerUtil.enableLogging(handler, new MockLogger());
setupMockedSMTPSession();
try {
Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java?rev=902863&r1=902862&r2=902863&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java (original)
+++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java Mon Jan 25 16:33:12 2010
@@ -25,7 +25,6 @@
import java.util.List;
import java.util.Map;
-import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.james.jspf.core.DNSRequest;
import org.apache.james.jspf.core.DNSService;
import org.apache.james.jspf.core.exceptions.TimeoutException;
@@ -33,7 +32,6 @@
import org.apache.james.smtpserver.protocol.SMTPSession;
import org.apache.james.smtpserver.protocol.core.fastfail.SPFHandler;
import org.apache.james.smtpserver.protocol.hook.HookReturnCode;
-import org.apache.james.test.mock.avalon.MockLogger;
import org.apache.mailet.base.test.FakeMail;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
@@ -194,8 +192,6 @@
setupMockedSMTPSession("192.168.100.1", "spf1.james.apache.org");
SPFHandler spf = new SPFHandler();
-
- ContainerUtil.enableLogging(spf, new MockLogger());
spf.setDNSService(mockedDnsService);
@@ -208,8 +204,6 @@
MailAddress rcpt = new MailAddress("test@localhost");
setupMockedSMTPSession("192.168.100.1", "spf2.james.apache.org");
SPFHandler spf = new SPFHandler();
-
- ContainerUtil.enableLogging(spf, new MockLogger());
spf.setDNSService(mockedDnsService);
@@ -222,8 +216,6 @@
MailAddress rcpt = new MailAddress("test@localhost");
setupMockedSMTPSession("192.168.100.1", "spf3.james.apache.org");
SPFHandler spf = new SPFHandler();
-
- ContainerUtil.enableLogging(spf, new MockLogger());
spf.setDNSService(mockedDnsService);
@@ -237,8 +229,6 @@
setupMockedSMTPSession("192.168.100.1", "spf3.james.apache.org");
SPFHandler spf = new SPFHandler();
-
- ContainerUtil.enableLogging(spf, new MockLogger());
spf.setDNSService(mockedDnsService);
@@ -254,8 +244,6 @@
setupMockedSMTPSession("192.168.100.1", "spf4.james.apache.org");
SPFHandler spf = new SPFHandler();
-
- ContainerUtil.enableLogging(spf, new MockLogger());
spf.setDNSService(mockedDnsService);
@@ -272,8 +260,6 @@
setupMockedSMTPSession("192.168.100.1", "spf5.james.apache.org");
SPFHandler spf = new SPFHandler();
-
- ContainerUtil.enableLogging(spf, new MockLogger());
spf.setDNSService(mockedDnsService);
@@ -288,8 +274,6 @@
setupMockedSMTPSession("192.168.100.1", "spf6.james.apache.org");
SPFHandler spf = new SPFHandler();
- ContainerUtil.enableLogging(spf, new MockLogger());
-
spf.setDNSService(mockedDnsService);
assertEquals("declined",HookReturnCode.DECLINED, spf.doMail(mockedSMTPSession, sender).getResult());
@@ -302,8 +286,6 @@
MailAddress rcpt = new MailAddress("test@localhost");
setupMockedSMTPSession("192.168.100.1", "spf4.james.apache.org");
SPFHandler spf = new SPFHandler();
-
- ContainerUtil.enableLogging(spf, new MockLogger());
spf.setDNSService(mockedDnsService);
Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java?rev=902863&r1=902862&r2=902863&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java (original)
+++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java Mon Jan 25 16:33:12 2010
@@ -21,11 +21,9 @@
package org.apache.james.smtpserver;
import junit.framework.TestCase;
-import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.james.smtpserver.integration.SetMimeHeaderHandler;
import org.apache.james.smtpserver.protocol.BaseFakeSMTPSession;
import org.apache.james.smtpserver.protocol.SMTPSession;
-import org.apache.james.test.mock.avalon.MockLogger;
import org.apache.mailet.Mail;
import javax.mail.MessagingException;
@@ -84,8 +82,6 @@
SetMimeHeaderHandler header = new SetMimeHeaderHandler();
- ContainerUtil.enableLogging(header, new MockLogger());
-
header.setHeaderName(HEADER_NAME);
header.setHeaderValue(HEADER_VALUE);
header.onMessage(mockedSMTPSession, mockedMail);
@@ -104,8 +100,6 @@
SetMimeHeaderHandler header = new SetMimeHeaderHandler();
- ContainerUtil.enableLogging(header, new MockLogger());
-
header.setHeaderName(HEADER_NAME);
header.setHeaderValue(HEADER_VALUE);
header.onMessage(mockedSMTPSession, mockedMail);
Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java?rev=902863&r1=902862&r2=902863&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java (original)
+++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java Mon Jan 25 16:33:12 2010
@@ -29,14 +29,12 @@
import junit.framework.TestCase;
-import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.james.smtpserver.integration.SpamAssassinHandler;
import org.apache.james.smtpserver.protocol.BaseFakeSMTPSession;
import org.apache.james.smtpserver.protocol.SMTPSession;
import org.apache.james.smtpserver.protocol.hook.HookResult;
import org.apache.james.smtpserver.protocol.hook.HookReturnCode;
import org.apache.james.test.mock.MockMimeMessage;
-import org.apache.james.test.mock.avalon.MockLogger;
import org.apache.james.test.mock.mailet.MockMail;
import org.apache.james.test.mock.util.MockSpamd;
import org.apache.james.test.util.Util;
@@ -113,7 +111,6 @@
SpamAssassinHandler handler = new SpamAssassinHandler();
- ContainerUtil.enableLogging(handler, new MockLogger());
handler.setSpamdHost(SPAMD_HOST);
handler.setSpamdPort(port);
handler.setSpamdRejectionHits(200.0);
@@ -136,7 +133,6 @@
SpamAssassinHandler handler = new SpamAssassinHandler();
- ContainerUtil.enableLogging(handler, new MockLogger());
handler.setSpamdHost(SPAMD_HOST);
handler.setSpamdPort(port);
handler.setSpamdRejectionHits(2000.0);
@@ -158,7 +154,6 @@
SpamAssassinHandler handler = new SpamAssassinHandler();
- ContainerUtil.enableLogging(handler, new MockLogger());
handler.setSpamdHost(SPAMD_HOST);
handler.setSpamdPort(port);
handler.setSpamdRejectionHits(200.0);
Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java?rev=902863&r1=902862&r2=902863&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java (original)
+++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java Mon Jan 25 16:33:12 2010
@@ -38,7 +38,6 @@
import junit.framework.TestCase;
-import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.james.api.dnsservice.AbstractDNSServer;
import org.apache.james.api.dnsservice.DNSService;
import org.apache.james.smtpserver.integration.URIRBLHandler;
@@ -47,7 +46,6 @@
import org.apache.james.smtpserver.protocol.hook.HookResult;
import org.apache.james.smtpserver.protocol.hook.HookReturnCode;
import org.apache.james.test.mock.MockMimeMessage;
-import org.apache.james.test.mock.avalon.MockLogger;
import org.apache.james.test.mock.mailet.MockMail;
import org.apache.mailet.Mail;
@@ -174,7 +172,6 @@
URIRBLHandler handler = new URIRBLHandler();
- ContainerUtil.enableLogging(handler, new MockLogger());
handler.setDNSService(setupMockedDnsServer());
handler.setUriRblServer(servers);
HookResult response = handler.onMessage(session, mockedMail);
@@ -191,7 +188,6 @@
URIRBLHandler handler = new URIRBLHandler();
- ContainerUtil.enableLogging(handler, new MockLogger());
handler.setDNSService(setupMockedDnsServer());
handler.setUriRblServer(servers);
HookResult response = handler.onMessage(session, mockedMail);
@@ -208,7 +204,6 @@
URIRBLHandler handler = new URIRBLHandler();
- ContainerUtil.enableLogging(handler, new MockLogger());
handler.setDNSService(setupMockedDnsServer());
handler.setUriRblServer(servers);
HookResult response = handler.onMessage(session, mockedMail);
Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/Util.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/Util.java?rev=902863&r1=902862&r2=902863&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/Util.java (original)
+++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/Util.java Mon Jan 25 16:33:12 2010
@@ -29,8 +29,6 @@
import javax.mail.internet.MimeMessage;
import javax.mail.internet.ParseException;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.james.test.mock.MockMimeMessage;
import org.apache.james.test.mock.mailet.MockMail;
import org.apache.mailet.MailAddress;
@@ -88,17 +86,6 @@
return PORT_LAST_USED;
}
- public static Configuration getValuedConfiguration(String name, String value) {
- DefaultConfiguration defaultConfiguration = new DefaultConfiguration(name);
- defaultConfiguration.setValue(value);
- return defaultConfiguration;
- }
-
- public static DefaultConfiguration createRemoteManagerHandlerChainConfiguration() {
- DefaultConfiguration handlerChainConfig = new DefaultConfiguration("test");
- return handlerChainConfig;
- }
-
public static MockMail createMockMail2Recipients(MimeMessage m) throws ParseException {
MockMail mockedMail = new MockMail();
mockedMail.setName("ID="+RANDOM.nextLong());
Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java?rev=902863&r1=902862&r2=902863&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java (original)
+++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java Mon Jan 25 16:33:12 2010
@@ -28,14 +28,12 @@
import javax.mail.internet.ParseException;
-import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.james.api.dnsservice.AbstractDNSServer;
import org.apache.james.api.dnsservice.DNSService;
import org.apache.james.smtpserver.integration.ValidRcptMX;
import org.apache.james.smtpserver.protocol.BaseFakeSMTPSession;
import org.apache.james.smtpserver.protocol.SMTPSession;
import org.apache.james.smtpserver.protocol.hook.HookReturnCode;
-import org.apache.james.test.mock.avalon.MockLogger;
import org.apache.mailet.MailAddress;
import junit.framework.TestCase;
@@ -99,8 +97,6 @@
SMTPSession session = setupMockedSMTPSession(mailAddress);
ValidRcptMX handler = new ValidRcptMX();
- ContainerUtil.enableLogging(handler, new MockLogger());
-
handler.setDNSService(dns);
handler.setBannedNetworks(bNetworks, dns);
int rCode = handler.doRcpt(session, null, mailAddress).getResult();
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org