Author: norman
Date: Mon Nov 23 20:22:51 2009
New Revision: 883484
URL: http://svn.apache.org/viewvc?rev=883484&view=rev
Log:
More work on removing Avalon dependencies (JAMES-893)
Modified:
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/CommandListservFooter.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/CommandListservManager.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/CommandListservProcessor.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/GenericListservManager.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/ICommandListservManager.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/BaseCommand.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/ErrorCommand.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/IListServCommand.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/Info.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/Owner.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/Subscribe.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/SubscribeConfirm.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/UnSubscribe.java
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/UnSubscribeConfirm.java
Modified:
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/CommandListservFooter.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/CommandListservFooter.java?rev=883484&r1=883483&r2=883484&view=diff
==============================================================================
---
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/CommandListservFooter.java
(original)
+++
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/CommandListservFooter.java
Mon Nov 23 20:22:51 2009
@@ -21,7 +21,7 @@
package org.apache.james.transport.mailets;
-import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.commons.configuration.ConfigurationException;
import org.apache.james.util.XMLResources;
import org.apache.oro.text.regex.MalformedPatternException;
import org.apache.oro.text.regex.Pattern;
Modified:
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/CommandListservManager.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/CommandListservManager.java?rev=883484&r1=883483&r2=883484&view=diff
==============================================================================
---
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/CommandListservManager.java
(original)
+++
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/CommandListservManager.java
Mon Nov 23 20:22:51 2009
@@ -21,10 +21,9 @@
package org.apache.james.transport.mailets;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.james.Constants;
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.api.user.UsersStore;
import org.apache.james.transport.mailets.listservcommands.ErrorCommand;
@@ -34,6 +33,7 @@
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
+import javax.annotation.Resource;
import javax.mail.MessagingException;
import java.io.File;
import java.lang.reflect.Field;
@@ -100,14 +100,15 @@
*/
public class CommandListservManager extends GenericMailet implements
ICommandListservManager {
- protected Map commandMap = new HashMap();
- protected List commandPackages = new ArrayList();
+ protected Map<String,IListServCommand> commandMap = new
HashMap<String,IListServCommand>();
+ protected List<String> commandPackages = new ArrayList<String>();
protected UsersRepository usersRepository;
protected String listName;
protected String displayName;
protected String listOwner;
protected String listDomain;
protected XMLResources xmlResources;
+ private UsersStore usersStore;
/**
* Get the name of this list specified by the config param: 'listName'.
@@ -169,7 +170,7 @@
* @return a map of {...@link IListServCommand}
* @see #getCommand
*/
- public Map getCommands() {
+ public Map<String,IListServCommand> getCommands() {
return commandMap;
}
@@ -244,10 +245,10 @@
Configuration configuration = (Configuration)
getField(getMailetConfig(), "configuration");
//get name
- listName = configuration.getChild("listName").getValue();
- displayName = configuration.getChild("displayName").getValue();
- listOwner = configuration.getChild("listOwner").getValue();
- listDomain = configuration.getChild("listDomain").getValue();
+ listName = configuration.getString("listName");
+ displayName = configuration.getString("displayName");
+ listOwner = configuration.getString("listOwner");
+ listDomain = configuration.getString("listDomain");
//initialize resources
initializeResources();
@@ -259,7 +260,7 @@
loadCommandPackages(configuration);
//load commands
- loadCommands(configuration);
+ loadCommands((HierarchicalConfiguration)configuration);
//register w/context
getMailetContext().setAttribute(ICommandListservManager.ID +
listName, this);
@@ -319,7 +320,7 @@
* @return the name of the command
*/
protected String getCommandName(MailAddress mailAddress) {
- String user = mailAddress.getUser();
+ String user = mailAddress.getLocalPart();
int index = user.indexOf('-', listName.length());
String commandName = user.substring(++index);
return commandName;
@@ -332,14 +333,17 @@
protected void initializeResources() throws Exception {
xmlResources = initXMLResources(new String[]{"List Manager"})[0];
}
+
+ @Resource(name="org.apache.james.api.user.UsersStore")
+ public void setUsersStore(UsersStore usersStore) {
+ this.usersStore = usersStore;
+ }
/**
* Fetch the repository of users
*/
protected void initUsersRepository() {
- ServiceManager compMgr = (ServiceManager)
getMailetContext().getAttribute(Constants.AVALON_COMPONENT_MANAGER);
try {
- UsersStore usersStore = (UsersStore)
compMgr.lookup(UsersStore.ROLE);
String repName = getInitParameter("repositoryName");
usersRepository = usersStore.getRepository(repName);
@@ -353,13 +357,14 @@
* @param configuration
* @throws ConfigurationException
*/
- protected void loadCommands(Configuration configuration) throws Exception {
- final Configuration commandConfigurations =
configuration.getChild("commands");
- final Configuration[] commandConfs =
commandConfigurations.getChildren("command");
- for (int index = 0; index < commandConfs.length; index++) {
- Configuration commandConf = commandConfs[index];
- String commandName =
commandConf.getAttribute("name").toLowerCase();
- String className = commandConf.getAttribute("class");
+ @SuppressWarnings("unchecked")
+ protected void loadCommands(HierarchicalConfiguration configuration)
throws Exception {
+
+ final List<HierarchicalConfiguration> commandConfs =
configuration.configurationsAt("commands.command");
+ for (int index = 0; index < commandConfs.size(); index++) {
+ HierarchicalConfiguration commandConf = commandConfs.get(index);
+ String commandName =
commandConf.getString("[...@name]").toLowerCase();
+ String className = commandConf.getString("[...@class]");
loadCommand(commandName, className, commandConf);
}
}
@@ -377,8 +382,8 @@
Configuration configuration)
throws ConfigurationException, ClassNotFoundException,
IllegalAccessException, InstantiationException {
ClassLoader theClassLoader =
Thread.currentThread().getContextClassLoader();
- for (Iterator it = commandPackages.iterator(); it.hasNext();) {
- String packageName = (String) it.next();
+ for (Iterator<String> it = commandPackages.iterator(); it.hasNext();) {
+ String packageName = it.next();
IListServCommand listServCommand = null;
try {
@@ -401,13 +406,12 @@
* @param configuration
* @throws ConfigurationException
*/
+ @SuppressWarnings("unchecked")
protected void loadCommandPackages(Configuration configuration) throws
ConfigurationException {
commandPackages.add("");
- final Configuration packageConfiguration =
configuration.getChild("commandpackages");
- final Configuration[] pkgConfs =
packageConfiguration.getChildren("commandpackage");
- for (int index = 0; index < pkgConfs.length; index++) {
- Configuration conf = pkgConfs[index];
- String packageName = conf.getValue().trim();
+ final List<String>pkgConfs =
configuration.getList("commandpackages.commandpackage");
+ for (int index = 0; index < pkgConfs.size(); index++) {
+ String packageName = pkgConfs.get(index).trim();
if (!packageName.endsWith(".")) {
packageName += ".";
}
@@ -420,7 +424,7 @@
* @return null if not found, the object otherwise
*/
protected static Object getField(Object instance, String name) throws
IllegalAccessException {
- Class clazz = instance.getClass();
+ Class<?> clazz = instance.getClass();
Field[] fields;
while (clazz != null) {
fields = clazz.getDeclaredFields();
Modified:
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/CommandListservProcessor.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/CommandListservProcessor.java?rev=883484&r1=883483&r2=883484&view=diff
==============================================================================
---
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/CommandListservProcessor.java
(original)
+++
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/CommandListservProcessor.java
Mon Nov 23 20:22:51 2009
@@ -21,9 +21,7 @@
package org.apache.james.transport.mailets;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.james.Constants;
+import org.apache.commons.configuration.Configuration;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.api.user.UsersStore;
import org.apache.mailet.base.RFC2822Headers;
@@ -34,6 +32,7 @@
import org.apache.mailet.MailAddress;
import org.apache.mailet.MailetException;
+import javax.annotation.Resource;
import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
import javax.mail.internet.MimeMultipart;
@@ -43,6 +42,7 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
+import java.util.List;
import java.util.Properties;
@@ -164,10 +164,12 @@
protected XMLResources xmlResources;
protected boolean specificPostersOnly;
- protected Collection allowedPosters;
+ protected Collection<MailAddress> allowedPosters;
protected boolean addFooter;
+ private UsersStore usersStore;
+
/**
* Initialize the mailet
*/
@@ -201,7 +203,7 @@
*/
public void service(Mail mail) throws MessagingException {
try {
- Collection members = getMembers();
+ Collection<MailAddress> members = getMembers();
MailAddress listservAddr = (MailAddress)
mail.getRecipients().iterator().next();
// Check if allowed to post
@@ -339,7 +341,7 @@
* @return true if this message is ok, false otherwise
* @throws MessagingException
*/
- protected boolean checkMembers(Collection members, Mail mail) throws
MessagingException {
+ protected boolean checkMembers(Collection<MailAddress> members, Mail mail)
throws MessagingException {
if (membersOnly && !members.contains(mail.getSender())) {
Properties standardProperties =
getCommandListservManager().getStandardProperties();
getCommandListservManager().onError(mail,
@@ -351,10 +353,10 @@
return true;
}
- public Collection getMembers() throws ParseException {
- Collection reply = new ArrayList();
- for (Iterator it = usersRepository.list(); it.hasNext();) {
- String member = it.next().toString();
+ public Collection<MailAddress> getMembers() throws ParseException {
+ Collection<MailAddress> reply = new ArrayList<MailAddress>();
+ for (Iterator<String> it = usersRepository.list(); it.hasNext();) {
+ String member = it.next();
try {
reply.add(new MailAddress(member));
} catch (Exception e) {
@@ -412,12 +414,15 @@
xmlResources = getCommandListservManager().initXMLResources(new
String[]{"List Manager"})[0];
}
+ @Resource(name="org.apache.james.api.user.UsersStore")
+ public void setUsersStore(UsersStore usersStore) {
+ this.usersStore = usersStore;
+ }
+
/**
* Fetch the repository of users
*/
protected void initUsersRepository() throws Exception {
- ServiceManager compMgr = (ServiceManager)
getMailetContext().getAttribute(Constants.AVALON_COMPONENT_MANAGER);
- UsersStore usersStore = (UsersStore) compMgr.lookup(UsersStore.ROLE);
String repName = getInitParameter("repositoryName");
usersRepository = usersStore.getRepository(repName);
@@ -456,7 +461,7 @@
* @return null if not found, the object otherwise
*/
protected static Object getField(Object instance, String name) throws
IllegalAccessException {
- Class clazz = instance.getClass();
+ Class<?> clazz = instance.getClass();
Field[] fields;
while (clazz != null) {
fields = clazz.getDeclaredFields();
@@ -473,14 +478,13 @@
return null;
}
+ @SuppressWarnings("unchecked")
protected void initAllowedPosters(Configuration configuration) throws
Exception {
- final Configuration allowedPostersElement =
configuration.getChild("allowedposters");
- allowedPosters = new ArrayList();
- if (allowedPostersElement != null) {
- final Configuration[] addresses =
allowedPostersElement.getChildren("address");
- for (int index = 0; index < addresses.length; index++) {
- Configuration address = addresses[index];
- String emailAddress = address.getValue();
+ allowedPosters = new ArrayList<MailAddress>();
+ if (configuration.getKeys("allowedposters").hasNext()) {
+ List<String> addresses =
configuration.getList("allowedposters.address");
+ for (int index = 0; index < addresses.size(); index++) {
+ String emailAddress = addresses.get(index);
allowedPosters.add(new MailAddress(emailAddress));
}
}
@@ -493,7 +497,7 @@
* @return true if this message is ok, false otherwise
* @throws MessagingException
*/
- protected boolean checkAllowedPoster(Mail mail, Collection members) throws
MessagingException {
+ protected boolean checkAllowedPoster(Mail mail, Collection<MailAddress>
members) throws MessagingException {
/*
if we don't require someone to be an allowed poster, then allow post
if we don't require require them to be a subscriber, or they are one.
if the sender is in the allowed list, post
Modified:
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/GenericListservManager.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/GenericListservManager.java?rev=883484&r1=883483&r2=883484&view=diff
==============================================================================
---
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/GenericListservManager.java
(original)
+++
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/GenericListservManager.java
Mon Nov 23 20:22:51 2009
@@ -62,7 +62,7 @@
return;
}
MailAddress address =
(MailAddress)mail.getRecipients().iterator().next();
- if (address.getUser().endsWith("-off")) {
+ if (address.getLocalPart().endsWith("-off")) {
if (existsAddress(mail.getSender())) {
if (removeAddress(mail.getSender())) {
getMailetContext().bounce(mail, "Successfully removed from
listserv.");
@@ -72,7 +72,7 @@
} else {
getMailetContext().bounce(mail, "You are not subscribed to
this listserv.");
}
- } else if (address.getUser().endsWith("-on")) {
+ } else if (address.getLocalPart().endsWith("-on")) {
if (existsAddress(mail.getSender())) {
getMailetContext().bounce(mail, "You are already subscribed to
this listserv.");
} else {
Modified:
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/ICommandListservManager.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/ICommandListservManager.java?rev=883484&r1=883483&r2=883484&view=diff
==============================================================================
---
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/ICommandListservManager.java
(original)
+++
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/ICommandListservManager.java
Mon Nov 23 20:22:51 2009
@@ -21,13 +21,13 @@
package org.apache.james.transport.mailets;
+import org.apache.commons.configuration.ConfigurationException;
import org.apache.james.transport.mailets.listservcommands.IListServCommand;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.util.XMLResources;
import org.apache.mailet.Mailet;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
-import org.apache.avalon.framework.configuration.ConfigurationException;
import javax.mail.MessagingException;
import java.util.Map;
Modified:
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/BaseCommand.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/BaseCommand.java?rev=883484&r1=883483&r2=883484&view=diff
==============================================================================
---
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/BaseCommand.java
(original)
+++
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/BaseCommand.java
Mon Nov 23 20:22:51 2009
@@ -21,8 +21,8 @@
package org.apache.james.transport.mailets.listservcommands;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.ConfigurationException;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.transport.mailets.ICommandListservManager;
import org.apache.mailet.base.RFC2822Headers;
@@ -72,7 +72,7 @@
public void init(ICommandListservManager commandListservManager,
Configuration configuration) throws ConfigurationException {
this.commandListservManager = commandListservManager;
this.configuration = configuration;
- commandName = configuration.getAttribute("name");
+ commandName = configuration.getString("[...@name]");
mailetContext =
this.commandListservManager.getMailetConfig().getMailetContext();
log("Initialized listserv command: [" + commandName + ", " +
getClass().getName() + "]");
}
@@ -161,7 +161,7 @@
MailAddress senderAddress = origMail.getSender();
try {
MimeMessage mimeMessage = generateMail(senderAddress.toString(),
- senderAddress.getUser(),
+ senderAddress.getLocalPart(),
getCommandListservManager().getListOwner(),
getCommandListservManager().getListName(true),
subject,
Modified:
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/ErrorCommand.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/ErrorCommand.java?rev=883484&r1=883483&r2=883484&view=diff
==============================================================================
---
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/ErrorCommand.java
(original)
+++
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/ErrorCommand.java
Mon Nov 23 20:22:51 2009
@@ -21,11 +21,11 @@
package org.apache.james.transport.mailets.listservcommands;
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.ConfigurationException;
import org.apache.james.transport.mailets.ICommandListservManager;
import org.apache.james.util.XMLResources;
import org.apache.mailet.Mail;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
import javax.mail.MessagingException;
import java.util.Properties;
Modified:
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/IListServCommand.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/IListServCommand.java?rev=883484&r1=883483&r2=883484&view=diff
==============================================================================
---
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/IListServCommand.java
(original)
+++
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/IListServCommand.java
Mon Nov 23 20:22:51 2009
@@ -21,8 +21,8 @@
package org.apache.james.transport.mailets.listservcommands;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.ConfigurationException;
import org.apache.james.transport.mailets.ICommandListservManager;
import org.apache.mailet.Mail;
Modified:
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/Info.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/Info.java?rev=883484&r1=883483&r2=883484&view=diff
==============================================================================
---
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/Info.java
(original)
+++
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/Info.java
Mon Nov 23 20:22:51 2009
@@ -21,8 +21,8 @@
package org.apache.james.transport.mailets.listservcommands;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.ConfigurationException;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.transport.mailets.ICommandListservManager;
import org.apache.james.util.XMLResources;
@@ -111,8 +111,8 @@
StringBuffer buffer = new StringBuffer(0x1000);
buffer.append("\r\n");
UsersRepository usersRepository = getUsersRepository();
- for (Iterator it = usersRepository.list(); it.hasNext();) {
- String userName = (String) it.next();
+ for (Iterator<String> it = usersRepository.list(); it.hasNext();) {
+ String userName = it.next();
buffer.append(" ").append(userName);
buffer.append("\r\n");
}
Modified:
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/Owner.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/Owner.java?rev=883484&r1=883483&r2=883484&view=diff
==============================================================================
---
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/Owner.java
(original)
+++
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/Owner.java
Mon Nov 23 20:22:51 2009
@@ -23,8 +23,8 @@
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.ConfigurationException;
import org.apache.james.transport.mailets.ICommandListservManager;
import javax.mail.MessagingException;
@@ -40,7 +40,7 @@
*/
public class Owner extends BaseCommand {
- protected List m_listOwner = new ArrayList();
+ protected List<MailAddress> m_listOwner = new ArrayList<MailAddress>();
/**
* Perform any required initialization
Modified:
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/Subscribe.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/Subscribe.java?rev=883484&r1=883483&r2=883484&view=diff
==============================================================================
---
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/Subscribe.java
(original)
+++
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/Subscribe.java
Mon Nov 23 20:22:51 2009
@@ -21,8 +21,8 @@
package org.apache.james.transport.mailets.listservcommands;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.ConfigurationException;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.transport.mailets.ICommandListservManager;
import org.apache.james.util.XMLResources;
Modified:
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/SubscribeConfirm.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/SubscribeConfirm.java?rev=883484&r1=883483&r2=883484&view=diff
==============================================================================
---
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/SubscribeConfirm.java
(original)
+++
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/SubscribeConfirm.java
Mon Nov 23 20:22:51 2009
@@ -21,8 +21,8 @@
package org.apache.james.transport.mailets.listservcommands;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.ConfigurationException;
import org.apache.james.transport.mailets.ICommandListservManager;
import org.apache.james.util.XMLResources;
import org.apache.james.api.user.UsersRepository;
Modified:
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/UnSubscribe.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/UnSubscribe.java?rev=883484&r1=883483&r2=883484&view=diff
==============================================================================
---
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/UnSubscribe.java
(original)
+++
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/UnSubscribe.java
Mon Nov 23 20:22:51 2009
@@ -21,8 +21,8 @@
package org.apache.james.transport.mailets.listservcommands;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.ConfigurationException;
import org.apache.james.api.user.UsersRepository;
import org.apache.james.transport.mailets.ICommandListservManager;
import org.apache.james.util.XMLResources;
Modified:
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/UnSubscribeConfirm.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/UnSubscribeConfirm.java?rev=883484&r1=883483&r2=883484&view=diff
==============================================================================
---
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/UnSubscribeConfirm.java
(original)
+++
james/server/trunk/mailets-function/src/main/java/org/apache/james/transport/mailets/listservcommands/UnSubscribeConfirm.java
Mon Nov 23 20:22:51 2009
@@ -21,8 +21,8 @@
package org.apache.james.transport.mailets.listservcommands;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.ConfigurationException;
import org.apache.james.transport.mailets.ICommandListservManager;
import org.apache.james.util.XMLResources;
import org.apache.james.api.user.UsersRepository;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
