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/10/25 09:45:51 UTC
svn commit: r1026962 - in /james/server/trunk:
container-spring/src/main/config/james/
mailets/src/main/java/org/apache/james/transport/mailets/
remotemanager/src/main/java/org/apache/james/remotemanager/core/
remotemanager/src/test/java/org/apache/jam...
Author: norman
Date: Mon Oct 25 07:45:50 2010
New Revision: 1026962
URL: http://svn.apache.org/viewvc?rev=1026962&view=rev
Log:
Rename users-store.xml to usersrepository.xml, also rename user-store to usersstore in @Resource annotations
Added:
james/server/trunk/container-spring/src/main/config/james/usersrepository.xml
- copied unchanged from r1026947, james/server/trunk/container-spring/src/main/config/james/users-store.xml
Removed:
james/server/trunk/container-spring/src/main/config/james/users-store.xml
Modified:
james/server/trunk/container-spring/src/main/config/james/log4j.properties
james/server/trunk/container-spring/src/main/config/james/spring-beans.xml
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AvalonListserv.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AvalonListservManager.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/CommandListservManager.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/CommandListservProcessor.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java
james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddUserCmdHandler.java
james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/DelUserCmdHandler.java
james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListUsersCmdHandler.java
james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/SetPasswordCmdHandler.java
james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ShowAliasCmdHandler.java
james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ShowForwardingCmdHandler.java
james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/UnsetAliasCmdHandler.java
james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/UnsetForwardingCmdHandler.java
james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/UserCmdHandler.java
james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/VerifyCmdHandler.java
james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java
james/server/trunk/user-api/src/main/java/org/apache/james/user/api/JamesUsersRepository.java
james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/UserManagement.java
Modified: james/server/trunk/container-spring/src/main/config/james/log4j.properties
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/james/log4j.properties?rev=1026962&r1=1026961&r2=1026962&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/config/james/log4j.properties (original)
+++ james/server/trunk/container-spring/src/main/config/james/log4j.properties Mon Oct 25 07:45:50 2010
@@ -88,30 +88,17 @@ log4j.appender.LMTPSERVER.DatePattern='.
log4j.appender.LMTPSERVER.layout=org.apache.log4j.PatternLayout
log4j.appender.LMTPSERVER.layout.ConversionPattern=%-5p %d{HH:mm:ss,SSS} | %c | %m%n
-log4j.appender.NNTPSERVER=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.NNTPSERVER.File=../log/nntpserver.log
-log4j.appender.NNTPSERVER.DatePattern='.'yyyy-MM-dd
-log4j.appender.NNTPSERVER.layout=org.apache.log4j.PatternLayout
-log4j.appender.NNTPSERVER.layout.ConversionPattern=%-5p %d{HH:mm:ss,SSS} | %c | %m%n
-
-log4j.appender.NNTP-REPOSITORY=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.NNTP-REPOSITORY.File=../log/nntp-store.log
-log4j.appender.NNTP-REPOSITORY.DatePattern='.'yyyy-MM-dd
-log4j.appender.NNTP-REPOSITORY.layout=org.apache.log4j.PatternLayout
-log4j.appender.NNTP-REPOSITORY.layout.ConversionPattern=%-5p %d{HH:mm:ss,SSS} | %c | %m%n
-
log4j.appender.MAILSTORE=org.apache.log4j.DailyRollingFileAppender
log4j.appender.MAILSTORE.File=../log/mailstore.log
log4j.appender.MAILSTORE.DatePattern='.'yyyy-MM-dd
log4j.appender.MAILSTORE.layout=org.apache.log4j.PatternLayout
log4j.appender.MAILSTORE.layout.ConversionPattern=%-5p %d{HH:mm:ss,SSS} | %c | %m%n
-
-log4j.appender.USERS-STORE=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.USERS-STORE.File=../log/usersstore.log
-log4j.appender.USERS-STORE.DatePattern='.'yyyy-MM-dd
-log4j.appender.USERS-STORE.layout=org.apache.log4j.PatternLayout
-log4j.appender.USERS-STORE.layout.ConversionPattern=%-5p %d{HH:mm:ss,SSS} | %c | %m%n
+log4j.appender.USERSREPOSITORY=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.USERSREPOSITORY.File=../log/usersrepository.log
+log4j.appender.USERSREPOSITORY.DatePattern='.'yyyy-MM-dd
+log4j.appender.USERSREPOSITORY.layout=org.apache.log4j.PatternLayout
+log4j.appender.USERSREPOSITORY.layout.ConversionPattern=%-5p %d{HH:mm:ss,SSS} | %c | %m%n
log4j.appender.OBJECTSTORAGE=org.apache.log4j.DailyRollingFileAppender
log4j.appender.OBJECTSTORAGE.File=../log/objectstore.log
@@ -159,7 +146,7 @@ log4j.logger.james.pop3server=INFO, POP3
log4j.logger.james.smtpserver=INFO, SMTPSERVER
log4j.logger.james.lmtpserver=INFO, LMTPSERVER
log4j.logger.james.mailstore=INFO, MAILSTORE
-log4j.logger.james.users-store=INFO, USERS-STORE
+log4j.logger.james.usersrepository=INFO, USERSREPOSITORY
log4j.logger.james.objectstorage=INFO, OBJECTSTORAGE
log4j.logger.james.fetchmail=INFO, FETCHMAIL
log4j.logger.james.domainlist=INFO, DOMAINLIST
Modified: james/server/trunk/container-spring/src/main/config/james/spring-beans.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/james/spring-beans.xml?rev=1026962&r1=1026961&r2=1026962&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/config/james/spring-beans.xml (original)
+++ james/server/trunk/container-spring/src/main/config/james/spring-beans.xml Mon Oct 25 07:45:50 2010
@@ -78,6 +78,7 @@
<entry key="spoolmanager" value="mailetcontainer"/>
<entry key="mailetloader" value="mailetcontainer"/>
<entry key="matcherloader" value="mailetcontainer"/>
+ <entry key="usersstore" value="usersrepository"/>
</map>
</property>
</bean>
@@ -107,6 +108,7 @@
<entry key="spoolmanager" value="mailetcontainer"/>
<entry key="mailetloader" value="mailetcontainer"/>
<entry key="matcherloader" value="mailetcontainer"/>
+ <entry key="usersstore" value="usersrepository"/>
</map>
</property>
</bean>
@@ -218,7 +220,7 @@
<bean id="mailstore" class="org.apache.james.mailstore.lib.JamesMailStore" />
<!-- The User Storage block -->
- <bean id="users-store" class="org.apache.james.user.lib.JamesUsersStore" >
+ <bean id="usersstore" class="org.apache.james.user.lib.JamesUsersStore" >
<property name="defaultRepository" value="LocalUsers"/>
</bean>
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AvalonListserv.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AvalonListserv.java?rev=1026962&r1=1026961&r2=1026962&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AvalonListserv.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AvalonListserv.java Mon Oct 25 07:45:50 2010
@@ -100,7 +100,7 @@ public class AvalonListserv extends Gene
private UsersStore usersStore;
- @Resource(name="users-store")
+ @Resource(name="usersstore")
public void setUsersStore(UsersStore usersStore) {
this.usersStore = usersStore;
}
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AvalonListservManager.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AvalonListservManager.java?rev=1026962&r1=1026961&r2=1026962&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AvalonListservManager.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AvalonListservManager.java Mon Oct 25 07:45:50 2010
@@ -43,7 +43,7 @@ public class AvalonListservManager exten
private UsersStore usersStore;
- @Resource(name="users-store")
+ @Resource(name="usersstore")
public void setUsersStore(UsersStore usersStore) {
this.usersStore = usersStore;
}
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/CommandListservManager.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/CommandListservManager.java?rev=1026962&r1=1026961&r2=1026962&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/CommandListservManager.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/CommandListservManager.java Mon Oct 25 07:45:50 2010
@@ -17,8 +17,6 @@
* under the License. *
****************************************************************/
-
-
package org.apache.james.transport.mailets;
import org.apache.commons.configuration.Configuration;
@@ -46,24 +44,25 @@ import java.util.Map;
import java.util.Properties;
/**
- * CommandListservManager is the default implementation of {@link ICommandListservManager}.
- * It loads all the configured {@link IListServCommand}s and delegates to them at runtime.
- * <br />
- *
- * It isn't responsible for procesing messages sent to the main mailing list, but is responsible for
- * individual commands sent by users, such as: info, subscribe, etc...
- * <br />
- *
+ * CommandListservManager is the default implementation of
+ * {@link ICommandListservManager}. It loads all the configured
+ * {@link IListServCommand}s and delegates to them at runtime. <br />
+ *
+ * It isn't responsible for procesing messages sent to the main mailing list,
+ * but is responsible for individual commands sent by users, such as: info,
+ * subscribe, etc... <br />
+ *
* Requests sent to the CommandListservManager take the form of:
+ *
* <pre>
* <listName>-<commandName>@domain
* </pre>
- *
- * If the command isn't recognized an error will be sent using {@link #onError}.
+ *
+ * If the command isn't recognized an error will be sent using {@link #onError}. <br />
* <br />
- * <br />
- *
+ *
* The configuration for this mailet sould be in the 'root' processor block.
+ *
* <pre>
* <mailet match="CommandListservMatcher=announce@localhost" class="CommandListservManager">
* <listName>announce</listName>
@@ -71,11 +70,11 @@ import java.util.Properties;
* <listOwner>owner@localhost</listOwner>
* <repositoryName>list-announce</repositoryName>
* <listDomain>localhost</listDomain>
- *
+ *
* <commandpackages>
* <commandpackage>org.apache.james.transport.mailets.listservcommands</commandpackage>
* </commandpackages>
- *
+ *
* <commands>
* <command name="subscribe" class="Subscribe"/>
* <command name="subscribe-confirm" class="SubscribeConfirm"/>
@@ -87,20 +86,23 @@ import java.util.Properties;
* </commands>
* </mailet>
* </pre>
- *
+ *
* <br />
* <br />
- * Todo: refine the command matching so we can have more sophistciated commands such as:
+ * Todo: refine the command matching so we can have more sophistciated commands
+ * such as:
+ *
* <pre>
* <listName>-<commandName>-<optCommandParam>@domain
* </pre>
- *
- * @version CVS $Revision$ $Date$
+ *
+ * @version CVS $Revision$ $Date: 2010-10-21 10:54:06 +0200 (Thu, 21
+ * Oct 2010) $
* @since 2.2.0
*/
public class CommandListservManager extends GenericMailet implements ICommandListservManager {
- protected Map<String,IListServCommand> commandMap = new HashMap<String,IListServCommand>();
+ protected Map<String, IListServCommand> commandMap = new HashMap<String, IListServCommand>();
protected List<String> commandPackages = new ArrayList<String>();
protected UsersRepository usersRepository;
protected String listName;
@@ -111,11 +113,15 @@ public class CommandListservManager exte
private UsersStore usersStore;
/**
- * Get the name of this list specified by the config param: 'listName'.
- * <br />
- * eg: <pre><listName>announce</listName></pre>
- *
- * @param displayFormat is whether you want a display version of this or not
+ * Get the name of this list specified by the config param: 'listName'. <br />
+ * eg:
+ *
+ * <pre>
+ * <listName>announce</listName>
+ * </pre>
+ *
+ * @param displayFormat
+ * is whether you want a display version of this or not
* @return the official display name of this list
*/
public String getListName(boolean displayFormat) {
@@ -123,10 +129,13 @@ public class CommandListservManager exte
}
/**
- * Gets the owner of this list specified by the config param: 'listOwner'.
- * <br />
- * eg: <pre><listOwner>owner@localhost</listOwner></pre>
- *
+ * Gets the owner of this list specified by the config param: 'listOwner'. <br />
+ * eg:
+ *
+ * <pre>
+ * <listOwner>owner@localhost</listOwner>
+ * </pre>
+ *
* @return this is an address like listOwner@localhost
*/
public String getListOwner() {
@@ -134,10 +143,13 @@ public class CommandListservManager exte
}
/**
- * Get the domain of the list specified by the config param: 'listDomain'.
- * <br />
- * eg: <pre><listDomain>localhost</listDomain></pre>
- *
+ * Get the domain of the list specified by the config param: 'listDomain'. <br />
+ * eg:
+ *
+ * <pre>
+ * <listDomain>localhost</listDomain>
+ * </pre>
+ *
* @return a string like localhost
*/
public String getListDomain() {
@@ -147,6 +159,7 @@ public class CommandListservManager exte
/**
* Get a specific command specified by the 'commands' configuration block.
* For instance:
+ *
* <pre>
* <commands>
* <command name="subscribe" class="Subscribe"/>
@@ -158,7 +171,9 @@ public class CommandListservManager exte
* <command name="info" class="Info"/>
* </commands>
* </pre>
- * @param name case in-sensitive
+ *
+ * @param name
+ * case in-sensitive
* @return a {@link IListServCommand} if found, null otherwise
*/
public IListServCommand getCommand(String name) {
@@ -167,16 +182,19 @@ public class CommandListservManager exte
/**
* Get all the available commands
+ *
* @return a map of {@link IListServCommand}
* @see #getCommand
*/
- public Map<String,IListServCommand> getCommands() {
+ public Map<String, IListServCommand> getCommands() {
return commandMap;
}
/**
* Get the current user repository for this list serv
- * @return an instance of {@link UsersRepository} that is used for the member list of the list serv
+ *
+ * @return an instance of {@link UsersRepository} that is used for the
+ * member list of the list serv
*/
public UsersRepository getUsersRepository() {
return usersRepository;
@@ -184,7 +202,9 @@ public class CommandListservManager exte
/**
* An error occurred, send some sort of message
- * @param subject the subject of the message to send
+ *
+ * @param subject
+ * the subject of the message to send
* @param mail
* @param errorMessage
*/
@@ -201,7 +221,9 @@ public class CommandListservManager exte
}
/**
- * Use this to get standard properties for future calls to {@link org.apache.james.util.XMLResources}
+ * Use this to get standard properties for future calls to
+ * {@link org.apache.james.util.XMLResources}
+ *
* @return properties with the "LIST_NAME" and the "DOMAIN_NAME" properties
*/
public Properties getStandardProperties() {
@@ -214,7 +236,9 @@ public class CommandListservManager exte
/**
* Initializes an array of resources
- * @param names such as 'header, footer' etc...
+ *
+ * @param names
+ * such as 'header, footer' etc...
* @return an initialized array of XMLResources
* @throws ConfigurationException
*/
@@ -240,29 +264,29 @@ public class CommandListservManager exte
public void init() throws MessagingException {
try {
- //Well, i want a more complex configuration structure
- //of my mailet, so i have to cheat... and cheat i will...
+ // Well, i want a more complex configuration structure
+ // of my mailet, so i have to cheat... and cheat i will...
Configuration configuration = (Configuration) getField(getMailetConfig(), "configuration");
- //get name
+ // get name
listName = configuration.getString("listName");
displayName = configuration.getString("displayName");
listOwner = configuration.getString("listOwner");
listDomain = configuration.getString("listDomain");
- //initialize resources
+ // initialize resources
initializeResources();
- //get users store
+ // get users store
initUsersRepository();
- //get command packages
+ // get command packages
loadCommandPackages(configuration);
- //load commands
- loadCommands((HierarchicalConfiguration)configuration);
+ // load commands
+ loadCommands((HierarchicalConfiguration) configuration);
- //register w/context
+ // register w/context
getMailetContext().setAttribute(ICommandListservManager.ID + listName, this);
} catch (Exception e) {
throw new MessagingException(e.getMessage(), e);
@@ -271,6 +295,7 @@ public class CommandListservManager exte
/**
* Based on the to address get a valid or command or null
+ *
* @param mailAddress
* @return IListServCommand or null
*/
@@ -280,15 +305,20 @@ public class CommandListservManager exte
}
/**
- * <p>Called by the mailet container to allow the mailet to process a
- * message.</p>
- *
- * <p>This method is declared abstract so subclasses must override it.</p>
- *
- * @param mail - the Mail object that contains the MimeMessage and
- * routing information
- * @throws MessagingException - if an exception occurs that interferes with the mailet's normal operation
- * occurred
+ * <p>
+ * Called by the mailet container to allow the mailet to process a message.
+ * </p>
+ *
+ * <p>
+ * This method is declared abstract so subclasses must override it.
+ * </p>
+ *
+ * @param mail
+ * - the Mail object that contains the MimeMessage and routing
+ * information
+ * @throws MessagingException
+ * - if an exception occurs that interferes with the mailet's
+ * normal operation occurred
*/
public void service(Mail mail) throws MessagingException {
if (mail.getRecipients().size() != 1) {
@@ -299,7 +329,7 @@ public class CommandListservManager exte
IListServCommand command = getCommandTarget(mailAddress);
if (command == null) {
- //don't recognize the command
+ // don't recognize the command
Properties props = getStandardProperties();
props.setProperty("COMMAND", getCommandName(mailAddress));
onError(mail, "unknown command", xmlResources.getString("command.not.understood", props));
@@ -308,7 +338,7 @@ public class CommandListservManager exte
}
// onError or onCommand would have done the job, so regardless
- // of which get rid of this e-mail. This is something that we
+ // of which get rid of this e-mail. This is something that we
// should review, and decide if there is any reason to allow a
// passthrough.
mail.setState(Mail.GHOST);
@@ -316,6 +346,7 @@ public class CommandListservManager exte
/**
* Get the name of the command
+ *
* @param mailAddress
* @return the name of the command
*/
@@ -328,13 +359,14 @@ public class CommandListservManager exte
/**
* initialize the resources
+ *
* @throws Exception
*/
protected void initializeResources() throws Exception {
- xmlResources = initXMLResources(new String[]{"List Manager"})[0];
+ xmlResources = initXMLResources(new String[] { "List Manager" })[0];
}
-
- @Resource(name="users-store")
+
+ @Resource(name = "usersstore")
public void setUsersStore(UsersStore usersStore) {
this.usersStore = usersStore;
}
@@ -354,12 +386,13 @@ public class CommandListservManager exte
/**
* Load an initialize all of the available commands
+ *
* @param configuration
* @throws ConfigurationException
*/
@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);
@@ -371,16 +404,13 @@ public class CommandListservManager exte
/**
* Loads and initializes a single command
- *
+ *
* @param commandName
* @param className
* @param configuration
* @throws ConfigurationException
*/
- protected void loadCommand(String commandName,
- String className,
- Configuration configuration)
- throws ConfigurationException, ClassNotFoundException, IllegalAccessException, InstantiationException {
+ protected void loadCommand(String commandName, String className, Configuration configuration) throws ConfigurationException, ClassNotFoundException, IllegalAccessException, InstantiationException {
ClassLoader theClassLoader = Thread.currentThread().getContextClassLoader();
for (Iterator<String> it = commandPackages.iterator(); it.hasNext();) {
String packageName = it.next();
@@ -389,7 +419,7 @@ public class CommandListservManager exte
try {
listServCommand = (IListServCommand) theClassLoader.loadClass(packageName + className).newInstance();
} catch (Exception e) {
- //ignore
+ // ignore
continue;
}
listServCommand.init(this, configuration);
@@ -402,14 +432,14 @@ public class CommandListservManager exte
/**
* loads all of the packages for the commands
- *
+ *
* @param configuration
* @throws ConfigurationException
*/
@SuppressWarnings("unchecked")
protected void loadCommandPackages(Configuration configuration) throws ConfigurationException {
commandPackages.add("");
- final List<String>pkgConfs = configuration.getList("commandpackages.commandpackage");
+ 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(".")) {
@@ -421,6 +451,7 @@ public class CommandListservManager exte
/**
* Retrieves a data field, potentially defined by a super class.
+ *
* @return null if not found, the object otherwise
*/
protected static Object getField(Object instance, String name) throws IllegalAccessException {
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/CommandListservProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/CommandListservProcessor.java?rev=1026962&r1=1026961&r2=1026962&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/CommandListservProcessor.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/CommandListservProcessor.java Mon Oct 25 07:45:50 2010
@@ -414,7 +414,7 @@ public class CommandListservProcessor ex
xmlResources = getCommandListservManager().initXMLResources(new String[]{"List Manager"})[0];
}
- @Resource(name="users-store")
+ @Resource(name="usersstore")
public void setUsersStore(UsersStore usersStore) {
this.usersStore = usersStore;
}
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java?rev=1026962&r1=1026961&r2=1026962&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java Mon Oct 25 07:45:50 2010
@@ -72,7 +72,7 @@ public class LocalDelivery extends Gener
}
- @Resource(name="users-store")
+ @Resource(name="usersstore")
public void setUsersStore(UsersStore usersStore) {
this.usersStore = usersStore;
}
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java?rev=1026962&r1=1026961&r2=1026962&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java Mon Oct 25 07:45:50 2010
@@ -76,7 +76,7 @@ public class UsersRepositoryAliasingForw
this.usersRepository = usersRepository;
}
- @Resource(name="users-store")
+ @Resource(name="usersstore")
public void setUsersStore(UsersStore usersStore) {
this.usersStore = usersStore;
}
Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddUserCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddUserCmdHandler.java?rev=1026962&r1=1026961&r2=1026962&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddUserCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddUserCmdHandler.java Mon Oct 25 07:45:50 2010
@@ -59,7 +59,7 @@ public class AddUserCmdHandler implement
* Sets the users store.
* @param users the users to set
*/
- @Resource(name="users-store")
+ @Resource(name="usersstore")
public final void setUsers(UsersStore uStore) {
this.uStore = uStore;
}
Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/DelUserCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/DelUserCmdHandler.java?rev=1026962&r1=1026961&r2=1026962&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/DelUserCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/DelUserCmdHandler.java Mon Oct 25 07:45:50 2010
@@ -51,7 +51,7 @@ public class DelUserCmdHandler implement
* @param users
* the users to set
*/
- @Resource(name = "users-store")
+ @Resource(name = "usersstore")
public final void setUsers(UsersStore uStore) {
this.uStore = uStore;
}
Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListUsersCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListUsersCmdHandler.java?rev=1026962&r1=1026961&r2=1026962&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListUsersCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListUsersCmdHandler.java Mon Oct 25 07:45:50 2010
@@ -50,7 +50,7 @@ public class ListUsersCmdHandler impleme
* @param users
* the users to set
*/
- @Resource(name = "users-store")
+ @Resource(name = "usersstore")
public final void setUsers(UsersStore uStore) {
this.uStore = uStore;
}
Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/SetPasswordCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/SetPasswordCmdHandler.java?rev=1026962&r1=1026961&r2=1026962&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/SetPasswordCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/SetPasswordCmdHandler.java Mon Oct 25 07:45:50 2010
@@ -52,7 +52,7 @@ public class SetPasswordCmdHandler imple
* Sets the users store.
* @param users the users to set
*/
- @Resource(name="users-store")
+ @Resource(name="usersstore")
public final void setUsers(UsersStore uStore) {
this.uStore = uStore;
}
Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ShowAliasCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ShowAliasCmdHandler.java?rev=1026962&r1=1026961&r2=1026962&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ShowAliasCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ShowAliasCmdHandler.java Mon Oct 25 07:45:50 2010
@@ -53,7 +53,7 @@ public class ShowAliasCmdHandler impleme
* @param users
* the users to set
*/
- @Resource(name = "users-store")
+ @Resource(name = "usersstore")
public final void setUsers(UsersStore uStore) {
this.uStore = uStore;
}
Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ShowForwardingCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ShowForwardingCmdHandler.java?rev=1026962&r1=1026961&r2=1026962&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ShowForwardingCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ShowForwardingCmdHandler.java Mon Oct 25 07:45:50 2010
@@ -54,7 +54,7 @@ public class ShowForwardingCmdHandler im
* @param users
* the users to set
*/
- @Resource(name = "users-store")
+ @Resource(name = "usersstore")
public final void setUsers(UsersStore uStore) {
this.uStore = uStore;
}
Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/UnsetAliasCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/UnsetAliasCmdHandler.java?rev=1026962&r1=1026961&r2=1026962&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/UnsetAliasCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/UnsetAliasCmdHandler.java Mon Oct 25 07:45:50 2010
@@ -50,7 +50,7 @@ public class UnsetAliasCmdHandler implem
* @param users
* the users to set
*/
- @Resource(name = "users-store")
+ @Resource(name = "usersstore")
public final void setUsers(UsersStore uStore) {
this.uStore = uStore;
}
Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/UnsetForwardingCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/UnsetForwardingCmdHandler.java?rev=1026962&r1=1026961&r2=1026962&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/UnsetForwardingCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/UnsetForwardingCmdHandler.java Mon Oct 25 07:45:50 2010
@@ -51,7 +51,7 @@ public class UnsetForwardingCmdHandler i
* @param users
* the users to set
*/
- @Resource(name = "users-store")
+ @Resource(name = "usersstore")
public final void setUsers(UsersStore uStore) {
this.uStore = uStore;
}
Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/UserCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/UserCmdHandler.java?rev=1026962&r1=1026961&r2=1026962&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/UserCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/UserCmdHandler.java Mon Oct 25 07:45:50 2010
@@ -29,7 +29,7 @@ public class UserCmdHandler implements C
* Sets the users store.
* @param users the users to set
*/
- @Resource(name="users-store")
+ @Resource(name="usersstore")
public final void setUsers(UsersStore uStore) {
this.uStore = uStore;
}
Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/VerifyCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/VerifyCmdHandler.java?rev=1026962&r1=1026961&r2=1026962&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/VerifyCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/VerifyCmdHandler.java Mon Oct 25 07:45:50 2010
@@ -49,7 +49,7 @@ public class VerifyCmdHandler implements
* @param users
* the users to set
*/
- @Resource(name = "users-store")
+ @Resource(name = "usersstore")
public final void setUsers(UsersStore uStore) {
this.uStore = uStore;
}
Modified: james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java?rev=1026962&r1=1026961&r2=1026962&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java (original)
+++ james/server/trunk/remotemanager/src/test/java/org/apache/james/remotemanager/AbstractRemoteManagerTest.java Mon Oct 25 07:45:50 2010
@@ -173,7 +173,7 @@ public abstract class AbstractRemoteMana
usersStore = new MockUsersStore(m_mockUsersRepository);
- serviceManager.put("users-store", usersStore);
+ serviceManager.put("usersstore", usersStore);
mailServer = new MockMailServer();
serviceManager.put("mailserver", mailServer);
Modified: james/server/trunk/user-api/src/main/java/org/apache/james/user/api/JamesUsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-api/src/main/java/org/apache/james/user/api/JamesUsersRepository.java?rev=1026962&r1=1026961&r2=1026962&view=diff
==============================================================================
--- james/server/trunk/user-api/src/main/java/org/apache/james/user/api/JamesUsersRepository.java (original)
+++ james/server/trunk/user-api/src/main/java/org/apache/james/user/api/JamesUsersRepository.java Mon Oct 25 07:45:50 2010
@@ -22,6 +22,12 @@ package org.apache.james.user.api;
import org.apache.james.vut.api.VirtualUserTable;
+/**
+ *
+ * @deprecated Use {@link UsersRepository}
+ *
+ */
+@Deprecated
public interface JamesUsersRepository extends UsersRepository, VirtualUserTable {
/**
Modified: james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/UserManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/UserManagement.java?rev=1026962&r1=1026961&r2=1026962&view=diff
==============================================================================
--- james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/UserManagement.java (original)
+++ james/server/trunk/user-library/src/main/java/org/apache/james/user/lib/UserManagement.java Mon Oct 25 07:45:50 2010
@@ -49,7 +49,7 @@ public class UserManagement extends Stan
this.localUsers = localUsers;
}
- @Resource(name="users-store")
+ @Resource(name="usersstore")
public void setUsersStore(UsersStore usersStore) {
this.usersStore = usersStore;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org