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 fe...@apache.org on 2011/04/04 16:59:14 UTC
svn commit: r1088657 [1/9] - in /james/server/trunk:
container-spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/
core/src/main/java/org/apache/james/core/
data-api/src/main/java/org/apache/james/domainlist/api/ da...
Author: felixk
Date: Mon Apr 4 14:59:11 2011
New Revision: 1088657
URL: http://svn.apache.org/viewvc?rev=1088657&view=rev
Log:
Formatting (see JAMES-711)
Modified:
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java
james/server/trunk/core/src/main/java/org/apache/james/core/MailImpl.java
james/server/trunk/core/src/main/java/org/apache/james/core/MimeMessageInputStreamSource.java
james/server/trunk/data-api/src/main/java/org/apache/james/domainlist/api/DomainList.java
james/server/trunk/data-api/src/main/java/org/apache/james/mailrepository/api/MailRepository.java
james/server/trunk/data-api/src/main/java/org/apache/james/user/api/UsersRepository.java
james/server/trunk/data-api/src/main/java/org/apache/james/user/api/model/JamesUser.java
james/server/trunk/data-api/src/main/java/org/apache/james/user/api/model/User.java
james/server/trunk/data-library/src/main/java/org/apache/james/repository/file/ClassLoaderObjectInputStream.java
james/server/trunk/data-library/src/main/java/org/apache/james/repository/file/ExtensionFileFilter.java
james/server/trunk/data-library/src/main/java/org/apache/james/repository/file/FilePersistentStreamRepository.java
james/server/trunk/data-library/src/main/java/org/apache/james/user/lib/AbstractJamesUsersRepository.java
james/server/trunk/data-library/src/main/java/org/apache/james/user/lib/AbstractUsersRepository.java
james/server/trunk/data-library/src/main/java/org/apache/james/user/lib/UsersRepositoryManagement.java
james/server/trunk/data-library/src/main/java/org/apache/james/user/lib/model/DefaultJamesUser.java
james/server/trunk/data-library/src/main/java/org/apache/james/user/lib/model/DefaultUser.java
james/server/trunk/data-library/src/main/java/org/apache/james/user/lib/util/DigestUtil.java
james/server/trunk/data-library/src/main/java/org/apache/james/vut/lib/AbstractVirtualUserTable.java
james/server/trunk/data-library/src/main/java/org/apache/james/vut/lib/VirtualUserTableManagement.java
james/server/trunk/data-library/src/main/java/org/apache/james/vut/lib/VirtualUserTableUtil.java
james/server/trunk/dnsservice-api/src/main/java/org/apache/james/dnsservice/api/DNSService.java
james/server/trunk/dnsservice-api/src/main/java/org/apache/james/dnsservice/api/DNSServiceMBean.java
james/server/trunk/dnsservice-dnsjava/src/main/java/org/apache/james/dnsservice/dnsjava/DNSJavaService.java
james/server/trunk/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/MXHostAddressIterator.java
james/server/trunk/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/inetnetwork/InetNetworkBuilder.java
james/server/trunk/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/inetnetwork/model/Inet4Network.java
james/server/trunk/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/inetnetwork/model/Inet6Network.java
james/server/trunk/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/inetnetwork/model/InetNetwork.java
james/server/trunk/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/netmatcher/NetMatcher.java
james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/Account.java
james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/DynamicAccount.java
james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java
james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java
james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FetchSchedulerMBean.java
james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/FolderProcessor.java
james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/MessageProcessor.java
james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java
james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/ProcessorAbstract.java
james/server/trunk/fetchmail/src/main/java/org/apache/james/fetchmail/StoreProcessor.java
james/server/trunk/file/src/main/java/org/apache/james/domainlist/xml/XMLDomainList.java
james/server/trunk/file/src/main/java/org/apache/james/mailrepository/file/FileMailRepository.java
james/server/trunk/file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java
james/server/trunk/file/src/main/java/org/apache/james/mailrepository/file/MimeMessageStreamRepositorySource.java
james/server/trunk/file/src/main/java/org/apache/james/user/file/UsersFileRepository.java
james/server/trunk/file/src/main/java/org/apache/james/vut/file/XMLVirtualUserTable.java
james/server/trunk/filesystem-api/src/main/java/org/apache/james/filesystem/api/FileSystem.java
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/AbstractNettyImapRequestLineReader.java
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ChannelImapResponseWriter.java
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ChannelWritableByteChannel.java
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ChunkFetchProcessor.java
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/FetchChunkedInput.java
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/IMAPServerMBean.java
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ImapIdleStateHandler.java
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ImapLineHandlerAdapter.java
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ImapRequestFrameDecoder.java
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/NettyConstants.java
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/NettyImapProcessorFactory.java
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/NettyImapRequestLineReader.java
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/NettyImapSession.java
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/NettyStreamImapRequestLineReader.java
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/OioIMAPServer.java
james/server/trunk/jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java
james/server/trunk/jcr/src/main/java/org/apache/james/user/jcr/JCRUsersRepository.java
james/server/trunk/jcr/src/main/java/org/apache/james/user/jcr/model/JCRUser.java
james/server/trunk/jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java
james/server/trunk/jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MessageInputStream.java
james/server/trunk/jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MimeMessageJDBCSource.java
james/server/trunk/jdbc/src/main/java/org/apache/james/user/jdbc/AbstractJdbcUsersRepository.java
james/server/trunk/jdbc/src/main/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepository.java
james/server/trunk/jdbc/src/main/java/org/apache/james/user/jdbc/JamesUsersJdbcRepository.java
james/server/trunk/jdbc/src/main/java/org/apache/james/vut/jdbc/JDBCVirtualUserTable.java
Modified: james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java?rev=1088657&r1=1088656&r2=1088657&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java (original)
+++ james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java Mon Apr 4 14:59:11 2011
@@ -158,11 +158,11 @@ public class MailRepositoryStoreBeanFact
* corresponding MailRepository. The Configuration must be in the form of:
*
* <pre>
- * <repository destinationURL="[URL of this mail repository]"
+ * <repository destinationURL="[URL of this mail repository]"
* type="[repository type ex. OBJECT or STREAM or MAIL etc.]"
- * model="[repository model ex. PERSISTENT or CACHE etc.]">
+ * model="[repository model ex. PERSISTENT or CACHE etc.]">
* [addition configuration]
- * </repository>
+ * </repository>
* </pre>
*
* @param hint
Modified: james/server/trunk/core/src/main/java/org/apache/james/core/MailImpl.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core/src/main/java/org/apache/james/core/MailImpl.java?rev=1088657&r1=1088656&r2=1088657&view=diff
==============================================================================
--- james/server/trunk/core/src/main/java/org/apache/james/core/MailImpl.java (original)
+++ james/server/trunk/core/src/main/java/org/apache/james/core/MailImpl.java Mon Apr 4 14:59:11 2011
@@ -61,9 +61,6 @@ import java.util.UUID;
* attributes.</li>
* </ul>
* </p>
- *
- * @version CVS $Revision$ $Date: 2010-12-16 15:18:27 +0100 (Thu, 16
- * Dec 2010) $
*/
public class MailImpl implements Disposable, Mail {
Modified: james/server/trunk/core/src/main/java/org/apache/james/core/MimeMessageInputStreamSource.java
URL: http://svn.apache.org/viewvc/james/server/trunk/core/src/main/java/org/apache/james/core/MimeMessageInputStreamSource.java?rev=1088657&r1=1088656&r2=1088657&view=diff
==============================================================================
--- james/server/trunk/core/src/main/java/org/apache/james/core/MimeMessageInputStreamSource.java (original)
+++ james/server/trunk/core/src/main/java/org/apache/james/core/MimeMessageInputStreamSource.java Mon Apr 4 14:59:11 2011
@@ -43,8 +43,6 @@ import java.util.List;
* object is GC'd.
*
* @see MimeMessageWrapper
- *
- *
*/
public class MimeMessageInputStreamSource extends MimeMessageSource implements Disposable {
Modified: james/server/trunk/data-api/src/main/java/org/apache/james/domainlist/api/DomainList.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data-api/src/main/java/org/apache/james/domainlist/api/DomainList.java?rev=1088657&r1=1088656&r2=1088657&view=diff
==============================================================================
--- james/server/trunk/data-api/src/main/java/org/apache/james/domainlist/api/DomainList.java (original)
+++ james/server/trunk/data-api/src/main/java/org/apache/james/domainlist/api/DomainList.java Mon Apr 4 14:59:11 2011
@@ -21,7 +21,6 @@ package org.apache.james.domainlist.api;
/**
* This interface should be implemented by services which offer domains for
* which email will accepted.
- *
*/
public interface DomainList {
Modified: james/server/trunk/data-api/src/main/java/org/apache/james/mailrepository/api/MailRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data-api/src/main/java/org/apache/james/mailrepository/api/MailRepository.java?rev=1088657&r1=1088656&r2=1088657&view=diff
==============================================================================
--- james/server/trunk/data-api/src/main/java/org/apache/james/mailrepository/api/MailRepository.java (original)
+++ james/server/trunk/data-api/src/main/java/org/apache/james/mailrepository/api/MailRepository.java Mon Apr 4 14:59:11 2011
@@ -28,8 +28,6 @@ import java.util.Iterator;
/**
* Interface for a Repository to store Mails.
- *
- * @version 1.0.0, 24/04/1999
*/
public interface MailRepository {
Modified: james/server/trunk/data-api/src/main/java/org/apache/james/user/api/UsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data-api/src/main/java/org/apache/james/user/api/UsersRepository.java?rev=1088657&r1=1088656&r2=1088657&view=diff
==============================================================================
--- james/server/trunk/data-api/src/main/java/org/apache/james/user/api/UsersRepository.java (original)
+++ james/server/trunk/data-api/src/main/java/org/apache/james/user/api/UsersRepository.java Mon Apr 4 14:59:11 2011
@@ -27,9 +27,6 @@ import org.apache.james.user.api.model.U
* Interface for a repository of users. A repository represents a logical
* grouping of users, typically by common purpose. E.g. the users served by an
* email server or the members of a mailing list.
- *
- *
- * @version $Revision$
*/
public interface UsersRepository {
Modified: james/server/trunk/data-api/src/main/java/org/apache/james/user/api/model/JamesUser.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data-api/src/main/java/org/apache/james/user/api/model/JamesUser.java?rev=1088657&r1=1088656&r2=1088657&view=diff
==============================================================================
--- james/server/trunk/data-api/src/main/java/org/apache/james/user/api/model/JamesUser.java (original)
+++ james/server/trunk/data-api/src/main/java/org/apache/james/user/api/model/JamesUser.java Mon Apr 4 14:59:11 2011
@@ -24,8 +24,6 @@ import org.apache.mailet.MailAddress;
/**
* Interface for objects representing users of an email/ messaging system.
*
- *
- * @version $Revision$
* @deprecated Just use the User interface for Users. Forwarding and Aliasing
* should get done via VirtualUserTable
*/
Modified: james/server/trunk/data-api/src/main/java/org/apache/james/user/api/model/User.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data-api/src/main/java/org/apache/james/user/api/model/User.java?rev=1088657&r1=1088656&r2=1088657&view=diff
==============================================================================
--- james/server/trunk/data-api/src/main/java/org/apache/james/user/api/model/User.java (original)
+++ james/server/trunk/data-api/src/main/java/org/apache/james/user/api/model/User.java Mon Apr 4 14:59:11 2011
@@ -21,11 +21,7 @@ package org.apache.james.user.api.model;
/**
* Interface for objects representing users.
- *
- *
- * @version $Revision$
*/
-
public interface User {
/**
Modified: james/server/trunk/data-library/src/main/java/org/apache/james/repository/file/ClassLoaderObjectInputStream.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data-library/src/main/java/org/apache/james/repository/file/ClassLoaderObjectInputStream.java?rev=1088657&r1=1088656&r2=1088657&view=diff
==============================================================================
--- james/server/trunk/data-library/src/main/java/org/apache/james/repository/file/ClassLoaderObjectInputStream.java (original)
+++ james/server/trunk/data-library/src/main/java/org/apache/james/repository/file/ClassLoaderObjectInputStream.java Mon Apr 4 14:59:11 2011
@@ -28,9 +28,6 @@ import java.io.StreamCorruptedException;
/**
* A special ObjectInputStream to handle highly transient classes hosted by
* Avalon components that are juggling many classloaders.
- *
- * @version $Revision$ $Date: 2010-12-16 09:20:25 +0100 (Thu, 16 Dec
- * 2010) $
*/
public class ClassLoaderObjectInputStream extends ObjectInputStream {
private ClassLoader m_classLoader;
Modified: james/server/trunk/data-library/src/main/java/org/apache/james/repository/file/ExtensionFileFilter.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data-library/src/main/java/org/apache/james/repository/file/ExtensionFileFilter.java?rev=1088657&r1=1088656&r2=1088657&view=diff
==============================================================================
--- james/server/trunk/data-library/src/main/java/org/apache/james/repository/file/ExtensionFileFilter.java (original)
+++ james/server/trunk/data-library/src/main/java/org/apache/james/repository/file/ExtensionFileFilter.java Mon Apr 4 14:59:11 2011
@@ -38,9 +38,6 @@ import java.io.FilenameFilter;
* System.out.println(files[i]);
* }
* </pre>
- *
- * @version CVS $Revision$ $Date: 2010-12-16 10:36:43 +0100 (Thu, 16
- * Dec 2010) $
*/
public class ExtensionFileFilter implements FilenameFilter {
private String[] m_extensions;
Modified: james/server/trunk/data-library/src/main/java/org/apache/james/repository/file/FilePersistentStreamRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data-library/src/main/java/org/apache/james/repository/file/FilePersistentStreamRepository.java?rev=1088657&r1=1088656&r2=1088657&view=diff
==============================================================================
--- james/server/trunk/data-library/src/main/java/org/apache/james/repository/file/FilePersistentStreamRepository.java (original)
+++ james/server/trunk/data-library/src/main/java/org/apache/james/repository/file/FilePersistentStreamRepository.java Mon Apr 4 14:59:11 2011
@@ -32,7 +32,6 @@ import org.apache.james.repository.api.S
* Implementation of a StreamRepository to a File.<br>
* TODO: -retieve(String key) should return a FilterInputStream to allow
* mark and reset methods. (working not like BufferedInputStream!!!)
- *
*/
public class FilePersistentStreamRepository
extends AbstractFileRepository
Modified: james/server/trunk/data-library/src/main/java/org/apache/james/user/lib/AbstractJamesUsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data-library/src/main/java/org/apache/james/user/lib/AbstractJamesUsersRepository.java?rev=1088657&r1=1088656&r2=1088657&view=diff
==============================================================================
--- james/server/trunk/data-library/src/main/java/org/apache/james/user/lib/AbstractJamesUsersRepository.java (original)
+++ james/server/trunk/data-library/src/main/java/org/apache/james/user/lib/AbstractJamesUsersRepository.java Mon Apr 4 14:59:11 2011
@@ -17,8 +17,6 @@
* under the License. *
****************************************************************/
-
-
package org.apache.james.user.lib;
import org.apache.commons.configuration.ConfigurationException;
@@ -38,13 +36,14 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-
/**
* A partial implementation of a Repository to store users.
- * <p>This implements common functionality found in different UsersRespository
- * implementations, and makes it easier to create new User repositories.</p>
- *
- *@deprecated Please implement {@link UsersRepository}
+ * <p>
+ * This implements common functionality found in different UsersRespository
+ * implementations, and makes it easier to create new User repositories.
+ * </p>
+ *
+ * @deprecated Please implement {@link UsersRepository}
*/
@Deprecated
public abstract class AbstractJamesUsersRepository extends AbstractUsersRepository implements JamesUsersRepository, VirtualUserTable {
@@ -53,20 +52,17 @@ public abstract class AbstractJamesUsers
* Ignore case in usernames
*/
protected boolean ignoreCase;
-
+
/**
* Enable Aliases frmo JamesUser
*/
protected boolean enableAliases;
-
+
/**
* Wether to enable forwarding for JamesUser or not
*/
protected boolean enableForwarding;
-
-
-
@Override
public void configure(HierarchicalConfiguration configuration) throws ConfigurationException {
setIgnoreCase(configuration.getBoolean("ignoreCase", false));
@@ -92,14 +88,14 @@ public abstract class AbstractJamesUsers
*/
protected abstract void doUpdateUser(User user) throws UsersRepositoryException;
-
-
-
/*
* (non-Javadoc)
- * @see org.apache.james.user.lib.AbstractUsersRepository#doAddUser(java.lang.String, java.lang.String)
+ *
+ * @see
+ * org.apache.james.user.lib.AbstractUsersRepository#doAddUser(java.lang
+ * .String, java.lang.String)
*/
- protected void doAddUser(String username, String password) throws UsersRepositoryException{
+ protected void doAddUser(String username, String password) throws UsersRepositoryException {
User newbie = new DefaultJamesUser(username, "SHA");
newbie.setPassword(password);
doAddUser(newbie);
@@ -113,7 +109,7 @@ public abstract class AbstractJamesUsers
* the user to be updated
*
* @return true if successful.
- * @throws UsersRepositoryException
+ * @throws UsersRepositoryException
*/
public void updateUser(User user) throws UsersRepositoryException {
// Return false if it's not found.
@@ -125,12 +121,11 @@ public abstract class AbstractJamesUsers
}
/**
- * @throws VirtualUserTableException
+ * @throws VirtualUserTableException
* @see org.apache.james.vut.api.VirtualUserTable#getMappings(java.lang.String,
* java.lang.String)
*/
- public Collection<String> getMappings(String username, String domain)
- throws ErrorMappingException, VirtualUserTableException {
+ public Collection<String> getMappings(String username, String domain) throws ErrorMappingException, VirtualUserTableException {
Collection<String> mappings = new ArrayList<String>();
try {
User user = getUserByName(username);
@@ -165,7 +160,6 @@ public abstract class AbstractJamesUsers
}
}
-
/**
* @see org.apache.james.user.api.JamesUsersRepository#setEnableAliases(boolean)
*/
@@ -189,9 +183,10 @@ public abstract class AbstractJamesUsers
/*
* (non-Javadoc)
+ *
* @see org.apache.james.vut.api.VirtualUserTable#getAllMappings()
*/
- public Map<String, Collection<String>> getAllMappings() throws VirtualUserTableException{
+ public Map<String, Collection<String>> getAllMappings() throws VirtualUserTableException {
Map<String, Collection<String>> mappings = new HashMap<String, Collection<String>>();
if (enableAliases == true || enableForwarding == true) {
try {
@@ -218,65 +213,68 @@ public abstract class AbstractJamesUsers
throw new VirtualUserTableException("Unable to access forwards/aliases", e);
}
}
-
+
return mappings;
}
/*
* (non-Javadoc)
- * @see org.apache.james.vut.api.VirtualUserTable#getUserDomainMappings(java.lang.String, java.lang.String)
+ *
+ * @see
+ * org.apache.james.vut.api.VirtualUserTable#getUserDomainMappings(java.
+ * lang.String, java.lang.String)
*/
public Collection<String> getUserDomainMappings(String user, String domain) throws VirtualUserTableException {
return new ArrayList<String>();
}
public void addRegexMapping(String user, String domain, String regex) throws VirtualUserTableException {
- throw new VirtualUserTableException("Read-Only VirtualUserTable");
+ throw new VirtualUserTableException("Read-Only VirtualUserTable");
}
public void removeRegexMapping(String user, String domain, String regex) throws VirtualUserTableException {
- throw new VirtualUserTableException("Read-Only VirtualUserTable");
-
+ throw new VirtualUserTableException("Read-Only VirtualUserTable");
+
}
public void addAddressMapping(String user, String domain, String address) throws VirtualUserTableException {
- throw new VirtualUserTableException("Read-Only VirtualUserTable");
-
+ throw new VirtualUserTableException("Read-Only VirtualUserTable");
+
}
public void removeAddressMapping(String user, String domain, String address) throws VirtualUserTableException {
- throw new VirtualUserTableException("Read-Only VirtualUserTable");
-
+ throw new VirtualUserTableException("Read-Only VirtualUserTable");
+
}
public void addErrorMapping(String user, String domain, String error) throws VirtualUserTableException {
- throw new VirtualUserTableException("Read-Only VirtualUserTable");
-
+ throw new VirtualUserTableException("Read-Only VirtualUserTable");
+
}
public void removeErrorMapping(String user, String domain, String error) throws VirtualUserTableException {
- throw new VirtualUserTableException("Read-Only VirtualUserTable");
-
+ throw new VirtualUserTableException("Read-Only VirtualUserTable");
+
}
public void addMapping(String user, String domain, String mapping) throws VirtualUserTableException {
- throw new VirtualUserTableException("Read-Only VirtualUserTable");
-
+ throw new VirtualUserTableException("Read-Only VirtualUserTable");
+
}
public void removeMapping(String user, String domain, String mapping) throws VirtualUserTableException {
- throw new VirtualUserTableException("Read-Only VirtualUserTable");
-
+ throw new VirtualUserTableException("Read-Only VirtualUserTable");
+
}
public void addAliasDomainMapping(String aliasDomain, String realDomain) throws VirtualUserTableException {
- throw new VirtualUserTableException("Read-Only VirtualUserTable");
-
+ throw new VirtualUserTableException("Read-Only VirtualUserTable");
+
}
public void removeAliasDomainMapping(String aliasDomain, String realDomain) throws VirtualUserTableException {
- throw new VirtualUserTableException("Read-Only VirtualUserTable");
-
+ throw new VirtualUserTableException("Read-Only VirtualUserTable");
+
}
}
Modified: james/server/trunk/data-library/src/main/java/org/apache/james/user/lib/AbstractUsersRepository.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data-library/src/main/java/org/apache/james/user/lib/AbstractUsersRepository.java?rev=1088657&r1=1088656&r2=1088657&view=diff
==============================================================================
--- james/server/trunk/data-library/src/main/java/org/apache/james/user/lib/AbstractUsersRepository.java (original)
+++ james/server/trunk/data-library/src/main/java/org/apache/james/user/lib/AbstractUsersRepository.java Mon Apr 4 14:59:11 2011
@@ -17,7 +17,6 @@
* under the License. *
****************************************************************/
-
package org.apache.james.user.lib;
import javax.annotation.Resource;
@@ -32,52 +31,53 @@ import org.apache.james.user.api.UsersRe
import org.apache.james.user.api.UsersRepositoryException;
import org.slf4j.Logger;
-public abstract class AbstractUsersRepository implements UsersRepository, LogEnabled, Configurable{
+public abstract class AbstractUsersRepository implements UsersRepository, LogEnabled, Configurable {
private DomainList domainList;
private boolean virtualHosting;
private Logger logger;
-
protected Logger getLogger() {
return logger;
}
-
-
+
/*
* (non-Javadoc)
+ *
* @see org.apache.james.lifecycle.api.LogEnabled#setLog(org.slf4j.Logger)
*/
public void setLog(Logger logger) {
this.logger = logger;
}
-
+
/*
* (non-Javadoc)
- * @see org.apache.james.lifecycle.api.Configurable#configure(org.apache.commons.configuration.HierarchicalConfiguration)
+ *
+ * @see
+ * org.apache.james.lifecycle.api.Configurable#configure(org.apache.commons
+ * .configuration.HierarchicalConfiguration)
*/
- public void configure(HierarchicalConfiguration configuration) throws ConfigurationException{
-
+ public void configure(HierarchicalConfiguration configuration) throws ConfigurationException {
+
virtualHosting = configuration.getBoolean("enableVirtualHosting", false);
doConfigure(configuration);
}
-
-
- protected void doConfigure(HierarchicalConfiguration config) throws ConfigurationException{
-
+
+ protected void doConfigure(HierarchicalConfiguration config) throws ConfigurationException {
+
}
public void setEnableVirtualHosting(boolean virtualHosting) {
this.virtualHosting = virtualHosting;
}
-
- @Resource(name="domainlist")
+
+ @Resource(name = "domainlist")
public void setDomainList(DomainList domainList) {
this.domainList = domainList;
}
-
- protected void isValidUsername(String username) throws UsersRepositoryException {
+
+ protected void isValidUsername(String username) throws UsersRepositoryException {
int i = username.indexOf("@");
if (supportVirtualHosting()) {
// need a @ in the username
@@ -103,10 +103,11 @@ public abstract class AbstractUsersRepos
}
}
-
/*
* (non-Javadoc)
- * @see org.apache.james.user.api.UsersRepository#addUser(java.lang.String, java.lang.String)
+ *
+ * @see org.apache.james.user.api.UsersRepository#addUser(java.lang.String,
+ * java.lang.String)
*/
public void addUser(String username, String password) throws UsersRepositoryException {
@@ -121,12 +122,13 @@ public abstract class AbstractUsersRepos
/*
* (non-Javadoc)
+ *
* @see org.apache.james.user.api.UsersRepository#supportVirtualHosting()
*/
- public boolean supportVirtualHosting() throws UsersRepositoryException{
+ public boolean supportVirtualHosting() throws UsersRepositoryException {
return virtualHosting;
}
-
+
/**
* Add the user with the given username and password
*
Modified: james/server/trunk/data-library/src/main/java/org/apache/james/user/lib/UsersRepositoryManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data-library/src/main/java/org/apache/james/user/lib/UsersRepositoryManagement.java?rev=1088657&r1=1088656&r2=1088657&view=diff
==============================================================================
--- james/server/trunk/data-library/src/main/java/org/apache/james/user/lib/UsersRepositoryManagement.java (original)
+++ james/server/trunk/data-library/src/main/java/org/apache/james/user/lib/UsersRepositoryManagement.java Mon Apr 4 14:59:11 2011
@@ -17,9 +17,6 @@
* under the License. *
****************************************************************/
-
-
-
package org.apache.james.user.lib;
import java.util.ArrayList;
@@ -37,35 +34,37 @@ import org.apache.james.user.api.model.J
import org.apache.james.user.api.model.User;
public class UsersRepositoryManagement extends StandardMBean implements UsersRepositoryManagementMBean {
-
+
/**
* The administered UsersRepository
*/
private UsersRepository localUsers;
- @Resource(name="usersrepository")
+ @Resource(name = "usersrepository")
public void setUsersRepository(UsersRepository localUsers) {
this.localUsers = localUsers;
}
-
-
+
public UsersRepositoryManagement() throws NotCompliantMBeanException {
super(UsersRepositoryManagementMBean.class);
}
-
private JamesUser getJamesUser(String userName) throws UsersRepositoryException {
User baseuser = localUsers.getUserByName(userName);
- if (baseuser == null) throw new IllegalArgumentException("user not found: " + userName);
- if (! (baseuser instanceof JamesUser ) ) throw new IllegalArgumentException("user is not of type JamesUser: " + userName);
+ if (baseuser == null)
+ throw new IllegalArgumentException("user not found: " + userName);
+ if (!(baseuser instanceof JamesUser))
+ throw new IllegalArgumentException("user is not of type JamesUser: " + userName);
return (JamesUser) baseuser;
}
-
/*
* (non-Javadoc)
- * @see org.apache.james.user.api.UsersRepositoryManagementMBean#addUser(java.lang.String, java.lang.String)
+ *
+ * @see
+ * org.apache.james.user.api.UsersRepositoryManagementMBean#addUser(java
+ * .lang.String, java.lang.String)
*/
public void addUser(String userName, String password) throws Exception {
try {
@@ -77,7 +76,10 @@ public class UsersRepositoryManagement e
/*
* (non-Javadoc)
- * @see org.apache.james.user.api.UsersRepositoryManagementMBean#deleteUser(java.lang.String)
+ *
+ * @see
+ * org.apache.james.user.api.UsersRepositoryManagementMBean#deleteUser(java
+ * .lang.String)
*/
public void deleteUser(String userName) throws Exception {
try {
@@ -87,10 +89,12 @@ public class UsersRepositoryManagement e
}
}
-
/*
* (non-Javadoc)
- * @see org.apache.james.user.api.UsersRepositoryManagementMBean#verifyExists(java.lang.String)
+ *
+ * @see
+ * org.apache.james.user.api.UsersRepositoryManagementMBean#verifyExists
+ * (java.lang.String)
*/
public boolean verifyExists(String userName) throws Exception {
try {
@@ -100,10 +104,11 @@ public class UsersRepositoryManagement e
}
}
-
/*
* (non-Javadoc)
- * @see org.apache.james.user.api.UsersRepositoryManagementMBean#countUsers()
+ *
+ * @see
+ * org.apache.james.user.api.UsersRepositoryManagementMBean#countUsers()
*/
public long countUsers() throws Exception {
try {
@@ -113,11 +118,11 @@ public class UsersRepositoryManagement e
}
}
-
-
/*
* (non-Javadoc)
- * @see org.apache.james.user.api.UsersRepositoryManagementMBean#listAllUsers()
+ *
+ * @see
+ * org.apache.james.user.api.UsersRepositoryManagementMBean#listAllUsers()
*/
public String[] listAllUsers() throws Exception {
List<String> userNames = new ArrayList<String>();
@@ -129,19 +134,21 @@ public class UsersRepositoryManagement e
throw new Exception(e.getMessage());
}
- return (String[])userNames.toArray(new String[]{});
+ return (String[]) userNames.toArray(new String[] {});
}
-
-
/*
* (non-Javadoc)
- * @see org.apache.james.user.api.UsersRepositoryManagementMBean#setPassword(java.lang.String, java.lang.String)
+ *
+ * @see
+ * org.apache.james.user.api.UsersRepositoryManagementMBean#setPassword(
+ * java.lang.String, java.lang.String)
*/
public void setPassword(String userName, String password) throws Exception {
try {
User user = localUsers.getUserByName(userName);
- if (user == null) throw new UsersRepositoryException("user not found: " + userName);
+ if (user == null)
+ throw new UsersRepositoryException("user not found: " + userName);
if (user.setPassword(password) == false) {
throw new UsersRepositoryException("Unable to update password for user " + user);
}
@@ -150,19 +157,22 @@ public class UsersRepositoryManagement e
throw new Exception(e.getMessage());
}
-
- }
+ }
/*
* (non-Javadoc)
- * @see org.apache.james.user.api.UsersRepositoryManagementMBean#unsetAlias(java.lang.String)
+ *
+ * @see
+ * org.apache.james.user.api.UsersRepositoryManagementMBean#unsetAlias(java
+ * .lang.String)
*/
public void unsetAlias(String userName) throws Exception {
try {
JamesUser user = getJamesUser(userName);
- if (!user.getAliasing()) throw new UsersRepositoryException("User " + user + " is no alias");
-
+ if (!user.getAliasing())
+ throw new UsersRepositoryException("User " + user + " is no alias");
+
user.setAliasing(false);
localUsers.updateUser(user);
} catch (UsersRepositoryException e) {
@@ -172,15 +182,18 @@ public class UsersRepositoryManagement e
}
-
/*
* (non-Javadoc)
- * @see org.apache.james.user.api.UsersRepositoryManagementMBean#getAlias(java.lang.String)
+ *
+ * @see
+ * org.apache.james.user.api.UsersRepositoryManagementMBean#getAlias(java
+ * .lang.String)
*/
public String getAlias(String userName) throws Exception {
try {
JamesUser user = getJamesUser(userName);
- if (!user.getAliasing()) return null;
+ if (!user.getAliasing())
+ return null;
return user.getAlias();
} catch (UsersRepositoryException e) {
throw new Exception(e.getMessage());
@@ -189,16 +202,19 @@ public class UsersRepositoryManagement e
}
-
/*
* (non-Javadoc)
- * @see org.apache.james.user.api.UsersRepositoryManagementMBean#unsetForwardAddress(java.lang.String)
+ *
+ * @see
+ * org.apache.james.user.api.UsersRepositoryManagementMBean#unsetForwardAddress
+ * (java.lang.String)
*/
public void unsetForwardAddress(String userName) throws Exception {
try {
JamesUser user = getJamesUser(userName);
- if (!user.getForwarding()) throw new UsersRepositoryException("User " + user + " is no forward");
-
+ if (!user.getForwarding())
+ throw new UsersRepositoryException("User " + user + " is no forward");
+
user.setForwarding(false);
localUsers.updateUser(user);
} catch (UsersRepositoryException e) {
@@ -206,18 +222,20 @@ public class UsersRepositoryManagement e
}
-
}
-
/*
* (non-Javadoc)
- * @see org.apache.james.user.api.UsersRepositoryManagementMBean#getForwardAddress(java.lang.String)
+ *
+ * @see
+ * org.apache.james.user.api.UsersRepositoryManagementMBean#getForwardAddress
+ * (java.lang.String)
*/
public String getForwardAddress(String userName) throws Exception {
try {
- JamesUser user = getJamesUser(userName);
- if (!user.getForwarding()) return null;
+ JamesUser user = getJamesUser(userName);
+ if (!user.getForwarding())
+ return null;
return user.getForwardingDestination().toString();
} catch (UsersRepositoryException e) {
throw new Exception(e.getMessage());
@@ -228,7 +246,9 @@ public class UsersRepositoryManagement e
/*
* (non-Javadoc)
- * @see org.apache.james.user.api.UsersRepositoryManagementMBean#getVirtualHostingEnabled()
+ *
+ * @see org.apache.james.user.api.UsersRepositoryManagementMBean#
+ * getVirtualHostingEnabled()
*/
public boolean getVirtualHostingEnabled() throws Exception {
try {
Modified: james/server/trunk/data-library/src/main/java/org/apache/james/user/lib/model/DefaultJamesUser.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data-library/src/main/java/org/apache/james/user/lib/model/DefaultJamesUser.java?rev=1088657&r1=1088656&r2=1088657&view=diff
==============================================================================
--- james/server/trunk/data-library/src/main/java/org/apache/james/user/lib/model/DefaultJamesUser.java (original)
+++ james/server/trunk/data-library/src/main/java/org/apache/james/user/lib/model/DefaultJamesUser.java Mon Apr 4 14:59:11 2011
@@ -17,8 +17,6 @@
* under the License. *
****************************************************************/
-
-
package org.apache.james.user.lib.model;
import org.apache.james.user.api.model.JamesUser;
@@ -26,14 +24,11 @@ import org.apache.mailet.MailAddress;
/**
* Implementation of User Interface.
- *
- *
+ *
* @deprecated Use {@link DefaultUser}
*/
-@Deprecated
-public class DefaultJamesUser
- extends DefaultUser
- implements JamesUser {
+@Deprecated
+public class DefaultJamesUser extends DefaultUser implements JamesUser {
private static final long serialVersionUID = 6323959976390389529L;
@@ -52,7 +47,6 @@ public class DefaultJamesUser
*/
private boolean aliasing;
-
/**
* The user name that this user name is aliasing.
*/
@@ -68,7 +62,6 @@ public class DefaultJamesUser
initialize();
}
-
/**
* Initializes default values for local fields.
*/
Modified: james/server/trunk/data-library/src/main/java/org/apache/james/user/lib/model/DefaultUser.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data-library/src/main/java/org/apache/james/user/lib/model/DefaultUser.java?rev=1088657&r1=1088656&r2=1088657&view=diff
==============================================================================
--- james/server/trunk/data-library/src/main/java/org/apache/james/user/lib/model/DefaultUser.java (original)
+++ james/server/trunk/data-library/src/main/java/org/apache/james/user/lib/model/DefaultUser.java Mon Apr 4 14:59:11 2011
@@ -17,8 +17,6 @@
* under the License. *
****************************************************************/
-
-
package org.apache.james.user.lib.model;
import org.apache.james.user.api.model.User;
@@ -28,26 +26,24 @@ import java.io.Serializable;
import java.security.NoSuchAlgorithmException;
/**
- * Implementation of User Interface. Instances of this class do not allow
- * the the user name to be reset.
- *
- *
- * @version CVS $Revision: 521427 $
+ * Implementation of User Interface. Instances of this class do not allow the
+ * the user name to be reset.
*/
-
public class DefaultUser implements User, Serializable {
-
+
private static final long serialVersionUID = 5178048915868531270L;
-
+
private String userName;
private String hashedPassword;
- private String algorithm ;
+ private String algorithm;
/**
* Standard constructor.
- *
- * @param name the String name of this user
- * @param hashAlg the algorithm used to generate the hash of the password
+ *
+ * @param name
+ * the String name of this user
+ * @param hashAlg
+ * the algorithm used to generate the hash of the password
*/
public DefaultUser(String name, String hashAlg) {
userName = name;
@@ -57,11 +53,13 @@ public class DefaultUser implements User
/**
* Constructor for repositories that are construcing user objects from
* separate fields, e.g. databases.
- *
- * @param name the String name of this user
- * @param passwordHash the String hash of this users current password
- * @param hashAlg the String algorithm used to generate the hash of the
- * password
+ *
+ * @param name
+ * the String name of this user
+ * @param passwordHash
+ * the String hash of this users current password
+ * @param hashAlg
+ * the String algorithm used to generate the hash of the password
*/
public DefaultUser(String name, String passwordHash, String hashAlg) {
userName = name;
@@ -102,7 +100,7 @@ public class DefaultUser implements User
/**
* Method to access hash of password
- *
+ *
* @return the String of the hashed Password
*/
public String getHashedPassword() {
@@ -111,7 +109,7 @@ public class DefaultUser implements User
/**
* Method to access the hashing algorithm of the password.
- *
+ *
* @return the name of the hashing algorithm used for this user's password
*/
public String getHashAlgorithm() {
Modified: james/server/trunk/data-library/src/main/java/org/apache/james/user/lib/util/DigestUtil.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data-library/src/main/java/org/apache/james/user/lib/util/DigestUtil.java?rev=1088657&r1=1088656&r2=1088657&view=diff
==============================================================================
--- james/server/trunk/data-library/src/main/java/org/apache/james/user/lib/util/DigestUtil.java (original)
+++ james/server/trunk/data-library/src/main/java/org/apache/james/user/lib/util/DigestUtil.java Mon Apr 4 14:59:11 2011
@@ -17,8 +17,6 @@
* under the License. *
****************************************************************/
-
-
package org.apache.james.user.lib.util;
import javax.mail.MessagingException;
@@ -33,48 +31,44 @@ import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Locale;
-
/**
* Computes and verifies digests of files and strings
- *
- *
- * @version $Revision$
*/
public class DigestUtil {
/**
* Command line interface. Use -help for arguments.
- *
- * @param args the arguments passed in on the command line
+ *
+ * @param args
+ * the arguments passed in on the command line
*/
public static void main(String[] args) {
String alg = "SHA";
boolean file = false;
-
+
if (args.length == 0 || args.length > 4) {
printUsage();
return;
}
-
+
for (int i = 0; i < args.length; i++) {
String currArg = args[i].toLowerCase(Locale.US);
- if (currArg.equals("-help")
- || currArg.equals("-usage")) {
+ if (currArg.equals("-help") || currArg.equals("-usage")) {
printUsage();
return;
}
if (currArg.equals("-alg")) {
- alg = args[i+1];
+ alg = args[i + 1];
}
if (currArg.equals("-file")) {
file = true;
}
}
-
+
if (file) {
digestFile(args[args.length - 1], alg);
- return ;
+ return;
} else {
try {
String hash = digestString(args[args.length - 1], alg);
@@ -90,18 +84,17 @@ public class DigestUtil {
* Print the command line usage string.
*/
public static void printUsage() {
- System.out.println("Usage: "
- + "java org.apache.james.security.DigestUtil"
- + " [-alg algorithm]"
- + " [-file] filename|string");
+ System.out.println("Usage: " + "java org.apache.james.security.DigestUtil" + " [-alg algorithm]" + " [-file] filename|string");
}
/**
- * Calculate digest of given file with given algorithm.
- * Writes digest to file named filename.algorithm .
- *
- * @param filename the String name of the file to be hashed
- * @param algorithm the algorithm to be used to compute the digest
+ * Calculate digest of given file with given algorithm. Writes digest to
+ * file named filename.algorithm .
+ *
+ * @param filename
+ * the String name of the file to be hashed
+ * @param algorithm
+ * the algorithm to be used to compute the digest
*/
public static void digestFile(String filename, String algorithm) {
byte[] b = new byte[65536];
@@ -113,16 +106,12 @@ public class DigestUtil {
MessageDigest md = MessageDigest.getInstance(algorithm);
fis = new FileInputStream(filename);
while (fis.available() > 0) {
- read = fis.read(b);
+ read = fis.read(b);
md.update(b, 0, read);
count += read;
}
byte[] digest = md.digest();
- StringBuffer fileNameBuffer =
- new StringBuffer(128)
- .append(filename)
- .append(".")
- .append(algorithm);
+ StringBuffer fileNameBuffer = new StringBuffer(128).append(filename).append(".").append(algorithm);
fos = new FileOutputStream(fileNameBuffer.toString());
OutputStream encodedStream = MimeUtility.encode(fos, "base64");
encodedStream.write(digest);
@@ -133,22 +122,25 @@ public class DigestUtil {
try {
fis.close();
fos.close();
- } catch (Exception ignored) {}
+ } catch (Exception ignored) {
+ }
}
}
/**
- * Calculate digest of given String using given algorithm.
- * Encode digest in MIME-like base64.
- *
- * @param pass the String to be hashed
- * @param algorithm the algorithm to be used
+ * Calculate digest of given String using given algorithm. Encode digest in
+ * MIME-like base64.
+ *
+ * @param pass
+ * the String to be hashed
+ * @param algorithm
+ * the algorithm to be used
* @return String Base-64 encoding of digest
- *
- * @throws NoSuchAlgorithmException if the algorithm passed in cannot be found
+ *
+ * @throws NoSuchAlgorithmException
+ * if the algorithm passed in cannot be found
*/
- public static String digestString(String pass, String algorithm )
- throws NoSuchAlgorithmException {
+ public static String digestString(String pass, String algorithm) throws NoSuchAlgorithmException {
MessageDigest md;
ByteArrayOutputStream bos;
@@ -170,5 +162,6 @@ public class DigestUtil {
/**
* Private constructor to prevent instantiation of the class
*/
- private DigestUtil() {}
+ private DigestUtil() {
+ }
}
Modified: james/server/trunk/data-library/src/main/java/org/apache/james/vut/lib/AbstractVirtualUserTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data-library/src/main/java/org/apache/james/vut/lib/AbstractVirtualUserTable.java?rev=1088657&r1=1088656&r2=1088657&view=diff
==============================================================================
--- james/server/trunk/data-library/src/main/java/org/apache/james/vut/lib/AbstractVirtualUserTable.java (original)
+++ james/server/trunk/data-library/src/main/java/org/apache/james/vut/lib/AbstractVirtualUserTable.java Mon Apr 4 14:59:11 2011
@@ -46,24 +46,27 @@ import org.slf4j.Logger;
public abstract class AbstractVirtualUserTable implements VirtualUserTable, LogEnabled, Configurable {
// The maximum mappings which will process before throwing exception
private int mappingLimit = 10;
-
+
private boolean recursive = true;
-
+
private Logger logger;
private DomainList domainList;
- @Resource(name="domainlist")
+ @Resource(name = "domainlist")
public void setDomainList(DomainList domainList) {
this.domainList = domainList;
}
-
+
/*
* (non-Javadoc)
- * @see org.apache.james.lifecycle.Configurable#configure(org.apache.commons.configuration.HierarchicalConfiguration)
+ *
+ * @see
+ * org.apache.james.lifecycle.Configurable#configure(org.apache.commons.
+ * configuration.HierarchicalConfiguration)
*/
public void configure(HierarchicalConfiguration config) throws ConfigurationException {
- setRecursiveMapping(config.getBoolean("recursiveMapping", true));
+ setRecursiveMapping(config.getBoolean("recursiveMapping", true));
try {
setMappingLimit(config.getInt("mappingLimit", 10));
} catch (IllegalArgumentException e) {
@@ -75,7 +78,7 @@ public abstract class AbstractVirtualUse
public void setLog(Logger logger) {
this.logger = logger;
}
-
+
/**
* Override to handle config
*
@@ -83,38 +86,44 @@ public abstract class AbstractVirtualUse
* @throws ConfigurationException
*/
protected void doConfigure(HierarchicalConfiguration conf) throws ConfigurationException {
-
+
}
-
+
public void setRecursiveMapping(boolean recursive) {
this.recursive = recursive;
}
-
+
/**
* Set the mappingLimit
*
- * @param mappingLimit the mappingLimit
- * @throws IllegalArgumentException get thrown if mappingLimit smaller then 1 is used
+ * @param mappingLimit
+ * the mappingLimit
+ * @throws IllegalArgumentException
+ * get thrown if mappingLimit smaller then 1 is used
*/
public void setMappingLimit(int mappingLimit) throws IllegalArgumentException {
- if (mappingLimit < 1) throw new IllegalArgumentException("The minimum mappingLimit is 1");
+ if (mappingLimit < 1)
+ throw new IllegalArgumentException("The minimum mappingLimit is 1");
this.mappingLimit = mappingLimit;
}
-
+
/**
- * @see org.apache.james.vut.api.VirtualUserTable#getMappings(String, String)
+ * @see org.apache.james.vut.api.VirtualUserTable#getMappings(String,
+ * String)
*/
- public Collection<String> getMappings(String user,String domain) throws ErrorMappingException, VirtualUserTableException{
- return getMappings(user,domain,mappingLimit);
+ public Collection<String> getMappings(String user, String domain) throws ErrorMappingException, VirtualUserTableException {
+ return getMappings(user, domain, mappingLimit);
}
-
+
public Collection<String> getMappings(String user, String domain, int mappingLimit) throws ErrorMappingException, VirtualUserTableException {
- // We have to much mappings throw ErrorMappingException to avoid infinity loop
- if (mappingLimit == 0) throw new ErrorMappingException("554 Too many mappings to process");
+ // We have to much mappings throw ErrorMappingException to avoid
+ // infinity loop
+ if (mappingLimit == 0)
+ throw new ErrorMappingException("554 Too many mappings to process");
String targetString = mapAddress(user, domain);
-
+
// Only non-null mappings are translated
if (targetString != null) {
Collection<String> mappings = new ArrayList<String>();
@@ -129,33 +138,31 @@ public abstract class AbstractVirtualUse
if (target.startsWith(VirtualUserTable.REGEX_PREFIX)) {
try {
- target = VirtualUserTableUtil.regexMap(new MailAddress(user,domain), target);
+ target = VirtualUserTableUtil.regexMap(new MailAddress(user, domain), target);
} catch (PatternSyntaxException e) {
getLogger().error("Exception during regexMap processing: ", e);
} catch (ParseException e) {
// should never happen
getLogger().error("Exception during regexMap processing: ", e);
- }
+ }
} else if (target.startsWith(VirtualUserTable.ALIASDOMAIN_PREFIX)) {
target = user + "@" + target.substring(VirtualUserTable.ALIASDOMAIN_PREFIX.length());
}
- if (target == null) continue;
-
- StringBuffer buf = new StringBuffer().append("Valid virtual user mapping ")
- .append(user).append("@").append(domain)
- .append(" to ").append(target);
+ if (target == null)
+ continue;
+
+ StringBuffer buf = new StringBuffer().append("Valid virtual user mapping ").append(user).append("@").append(domain).append(" to ").append(target);
getLogger().debug(buf.toString());
-
-
+
if (recursive) {
-
+
String userName = null;
String domainName = null;
String args[] = target.split("@");
-
+
if (args != null && args.length > 1) {
-
+
userName = args[0];
domainName = args[1];
} else {
@@ -163,224 +170,244 @@ public abstract class AbstractVirtualUse
userName = target;
domainName = domain;
}
-
- // Check if the returned mapping is the same as the input. If so return null to avoid loops
+
+ // Check if the returned mapping is the same as the
+ // input. If so return null to avoid loops
if (userName.equalsIgnoreCase(user) && domainName.equalsIgnoreCase(domain)) {
return null;
}
-
- Collection<String> childMappings = getMappings(userName, domainName, mappingLimit -1);
-
+
+ Collection<String> childMappings = getMappings(userName, domainName, mappingLimit - 1);
+
if (childMappings == null) {
- // add mapping
+ // add mapping
mappings.add(target);
} else {
- mappings.addAll(childMappings);
+ mappings.addAll(childMappings);
}
-
+
} else {
mappings.add(target);
}
- }
+ }
}
-
+
return mappings;
-
+
}
-
+
return null;
}
-
+
/**
- * @see org.apache.james.vut.api.ManageableVirtualUserTable#addRegexMapping(java.lang.String, java.lang.String, java.lang.String)
+ * @see org.apache.james.vut.api.ManageableVirtualUserTable#addRegexMapping(java.lang.String,
+ * java.lang.String, java.lang.String)
*/
- public void addRegexMapping(String user, String domain, String regex) throws VirtualUserTableException {
+ public void addRegexMapping(String user, String domain, String regex) throws VirtualUserTableException {
try {
Pattern.compile(regex);
} catch (PatternSyntaxException e) {
throw new VirtualUserTableException("Invalid regex: " + regex, e);
}
-
- checkMapping(user,domain,regex);
+
+ checkMapping(user, domain, regex);
getLogger().info("Add regex mapping => " + regex + " for user: " + user + " domain: " + domain);
addMappingInternal(user, domain, VirtualUserTable.REGEX_PREFIX + regex);
-
+
}
-
/**
- * @see org.apache.james.vut.api.ManageableVirtualUserTable#removeRegexMapping(java.lang.String, java.lang.String, java.lang.String)
+ * @see org.apache.james.vut.api.ManageableVirtualUserTable#removeRegexMapping(java.lang.String,
+ * java.lang.String, java.lang.String)
*/
- public void removeRegexMapping(String user, String domain, String regex) throws VirtualUserTableException{
+ public void removeRegexMapping(String user, String domain, String regex) throws VirtualUserTableException {
getLogger().info("Remove regex mapping => " + regex + " for user: " + user + " domain: " + domain);
- removeMappingInternal(user,domain,VirtualUserTable.REGEX_PREFIX + regex);
+ removeMappingInternal(user, domain, VirtualUserTable.REGEX_PREFIX + regex);
}
-
+
/**
- * @see org.apache.james.vut.api.ManageableVirtualUserTable#addAddressMapping(java.lang.String, java.lang.String, java.lang.String)
+ * @see org.apache.james.vut.api.ManageableVirtualUserTable#addAddressMapping(java.lang.String,
+ * java.lang.String, java.lang.String)
*/
- public void addAddressMapping(String user, String domain, String address) throws VirtualUserTableException{
+ public void addAddressMapping(String user, String domain, String address) throws VirtualUserTableException {
if (address.indexOf('@') < 0) {
try {
- address = address + "@" + domainList.getDefaultDomain();
+ address = address + "@" + domainList.getDefaultDomain();
} catch (DomainListException e) {
throw new VirtualUserTableException("Unable to retrieve default domain", e);
}
- }
+ }
try {
new MailAddress(address);
} catch (ParseException e) {
throw new VirtualUserTableException("Invalid emailAddress: " + address, e);
}
- checkMapping(user,domain,address);
+ checkMapping(user, domain, address);
getLogger().info("Add address mapping => " + address + " for user: " + user + " domain: " + domain);
addMappingInternal(user, domain, address);
-
+
}
-
+
/**
- * @see org.apache.james.vut.api.ManageableVirtualUserTable#removeAddressMapping(java.lang.String, java.lang.String, java.lang.String)
+ * @see org.apache.james.vut.api.ManageableVirtualUserTable#removeAddressMapping(java.lang.String,
+ * java.lang.String, java.lang.String)
*/
public void removeAddressMapping(String user, String domain, String address) throws VirtualUserTableException {
if (address.indexOf('@') < 0) {
try {
- address = address + "@" + domainList.getDefaultDomain();
+ address = address + "@" + domainList.getDefaultDomain();
} catch (DomainListException e) {
throw new VirtualUserTableException("Unable to retrieve default domain", e);
}
- }
+ }
getLogger().info("Remove address mapping => " + address + " for user: " + user + " domain: " + domain);
- removeMappingInternal(user,domain,address);
+ removeMappingInternal(user, domain, address);
}
-
+
/**
- * @see org.apache.james.vut.api.ManageableVirtualUserTable#addErrorMapping(java.lang.String, java.lang.String, java.lang.String)
+ * @see org.apache.james.vut.api.ManageableVirtualUserTable#addErrorMapping(java.lang.String,
+ * java.lang.String, java.lang.String)
*/
- public void addErrorMapping(String user, String domain, String error) throws VirtualUserTableException{
- checkMapping(user,domain,error);
+ public void addErrorMapping(String user, String domain, String error) throws VirtualUserTableException {
+ checkMapping(user, domain, error);
getLogger().info("Add error mapping => " + error + " for user: " + user + " domain: " + domain);
- addMappingInternal(user,domain, VirtualUserTable.ERROR_PREFIX + error);
-
+ addMappingInternal(user, domain, VirtualUserTable.ERROR_PREFIX + error);
+
}
-
+
/**
- * @see org.apache.james.vut.api.ManageableVirtualUserTable#removeErrorMapping(java.lang.String, java.lang.String, java.lang.String)
+ * @see org.apache.james.vut.api.ManageableVirtualUserTable#removeErrorMapping(java.lang.String,
+ * java.lang.String, java.lang.String)
*/
- public void removeErrorMapping(String user, String domain, String error) throws VirtualUserTableException{
- getLogger().info("Remove error mapping => " + error + " for user: " + user + " domain: " + domain);
- removeMappingInternal(user,domain,VirtualUserTable.ERROR_PREFIX + error);
+ public void removeErrorMapping(String user, String domain, String error) throws VirtualUserTableException {
+ getLogger().info("Remove error mapping => " + error + " for user: " + user + " domain: " + domain);
+ removeMappingInternal(user, domain, VirtualUserTable.ERROR_PREFIX + error);
}
-
/**
- * @see org.apache.james.vut.api.ManageableVirtualUserTable#addMapping(java.lang.String, java.lang.String, java.lang.String)
+ * @see org.apache.james.vut.api.ManageableVirtualUserTable#addMapping(java.lang.String,
+ * java.lang.String, java.lang.String)
*/
- public void addMapping(String user, String domain, String mapping) throws VirtualUserTableException{
+ public void addMapping(String user, String domain, String mapping) throws VirtualUserTableException {
String map = mapping.toLowerCase();
-
+
if (map.startsWith(VirtualUserTable.ERROR_PREFIX)) {
- addErrorMapping(user,domain,map.substring(VirtualUserTable.ERROR_PREFIX.length()));
+ addErrorMapping(user, domain, map.substring(VirtualUserTable.ERROR_PREFIX.length()));
} else if (map.startsWith(VirtualUserTable.REGEX_PREFIX)) {
- addRegexMapping(user,domain,map.substring(VirtualUserTable.REGEX_PREFIX.length()));
+ addRegexMapping(user, domain, map.substring(VirtualUserTable.REGEX_PREFIX.length()));
} else if (map.startsWith(VirtualUserTable.ALIASDOMAIN_PREFIX)) {
- if (user != null) throw new VirtualUserTableException("User must be null for aliasDomain mappings");
- addAliasDomainMapping(domain,map.substring(VirtualUserTable.ALIASDOMAIN_PREFIX.length()));
+ if (user != null)
+ throw new VirtualUserTableException("User must be null for aliasDomain mappings");
+ addAliasDomainMapping(domain, map.substring(VirtualUserTable.ALIASDOMAIN_PREFIX.length()));
} else {
- addAddressMapping(user,domain,map);
+ addAddressMapping(user, domain, map);
}
-
+
}
-
+
/**
- * @see org.apache.james.vut.api.ManageableVirtualUserTable#removeMapping(java.lang.String, java.lang.String, java.lang.String)
+ * @see org.apache.james.vut.api.ManageableVirtualUserTable#removeMapping(java.lang.String,
+ * java.lang.String, java.lang.String)
*/
- public void removeMapping(String user, String domain, String mapping) throws VirtualUserTableException{
+ public void removeMapping(String user, String domain, String mapping) throws VirtualUserTableException {
String map = mapping.toLowerCase();
-
+
if (map.startsWith(VirtualUserTable.ERROR_PREFIX)) {
- removeErrorMapping(user,domain,map.substring(VirtualUserTable.ERROR_PREFIX.length()));
+ removeErrorMapping(user, domain, map.substring(VirtualUserTable.ERROR_PREFIX.length()));
} else if (map.startsWith(VirtualUserTable.REGEX_PREFIX)) {
- removeRegexMapping(user,domain,map.substring(VirtualUserTable.REGEX_PREFIX.length()));
+ removeRegexMapping(user, domain, map.substring(VirtualUserTable.REGEX_PREFIX.length()));
} else if (map.startsWith(VirtualUserTable.ALIASDOMAIN_PREFIX)) {
- if (user != null) throw new VirtualUserTableException("User must be null for aliasDomain mappings");
- removeAliasDomainMapping(domain,map.substring(VirtualUserTable.ALIASDOMAIN_PREFIX.length()));
+ if (user != null)
+ throw new VirtualUserTableException("User must be null for aliasDomain mappings");
+ removeAliasDomainMapping(domain, map.substring(VirtualUserTable.ALIASDOMAIN_PREFIX.length()));
} else {
- removeAddressMapping(user,domain,map);
+ removeAddressMapping(user, domain, map);
}
-
+
}
-
+
/**
* @see org.apache.james.vut.api.ManageableVirtualUserTable#getAllMappings()
*/
- public Map<String,Collection<String>> getAllMappings() throws VirtualUserTableException{
+ public Map<String, Collection<String>> getAllMappings() throws VirtualUserTableException {
int count = 0;
- Map<String,Collection<String>> mappings = getAllMappingsInternal();
-
+ Map<String, Collection<String>> mappings = getAllMappingsInternal();
+
if (mappings != null) {
count = mappings.size();
}
getLogger().debug("Retrieve all mappings. Mapping count: " + count);
return mappings;
}
-
+
/**
- * @see org.apache.james.vut.api.ManageableVirtualUserTable#getUserDomainMappings(java.lang.String, java.lang.String)
+ * @see org.apache.james.vut.api.ManageableVirtualUserTable#getUserDomainMappings(java.lang.String,
+ * java.lang.String)
*/
- public Collection<String> getUserDomainMappings(String user, String domain) throws VirtualUserTableException{
+ public Collection<String> getUserDomainMappings(String user, String domain) throws VirtualUserTableException {
return getUserDomainMappingsInternal(user, domain);
}
/**
- * @see org.apache.james.vut.api.ManageableVirtualUserTable#addAliasDomainMapping(java.lang.String, java.lang.String)
+ * @see org.apache.james.vut.api.ManageableVirtualUserTable#addAliasDomainMapping(java.lang.String,
+ * java.lang.String)
*/
- public void addAliasDomainMapping(String aliasDomain, String realDomain) throws VirtualUserTableException{
- getLogger().info("Add domain mapping: " + aliasDomain + " => " + realDomain);
+ public void addAliasDomainMapping(String aliasDomain, String realDomain) throws VirtualUserTableException {
+ getLogger().info("Add domain mapping: " + aliasDomain + " => " + realDomain);
addMappingInternal(null, aliasDomain, VirtualUserTable.ALIASDOMAIN_PREFIX + realDomain);
}
-
+
/**
- * @return
- * @see org.apache.james.vut.api.ManageableVirtualUserTable#removeAliasDomainMapping(java.lang.String, java.lang.String)
+ * @return
+ * @see org.apache.james.vut.api.ManageableVirtualUserTable#removeAliasDomainMapping(java.lang.String,
+ * java.lang.String)
*/
- public void removeAliasDomainMapping(String aliasDomain, String realDomain) throws VirtualUserTableException{
- getLogger().info("Remove domain mapping: " + aliasDomain + " => " + realDomain);
+ public void removeAliasDomainMapping(String aliasDomain, String realDomain) throws VirtualUserTableException {
+ getLogger().info("Remove domain mapping: " + aliasDomain + " => " + realDomain);
removeMappingInternal(null, aliasDomain, VirtualUserTable.ALIASDOMAIN_PREFIX + realDomain);
}
-
+
protected Logger getLogger() {
return logger;
}
-
+
/**
* Add new mapping
*
- * @param user the user
- * @param domain the domain
- * @param mapping the mapping
+ * @param user
+ * the user
+ * @param domain
+ * the domain
+ * @param mapping
+ * the mapping
* @return true if successfully
- * @throws InvalidMappingException
+ * @throws InvalidMappingException
*/
- protected abstract void addMappingInternal(String user, String domain, String mapping) throws VirtualUserTableException;
-
+ protected abstract void addMappingInternal(String user, String domain, String mapping) throws VirtualUserTableException;
+
/**
- * Remove mapping
+ * Remove mapping
*
- * @param user the user
- * @param domain the domain
- * @param mapping the mapping
+ * @param user
+ * the user
+ * @param domain
+ * the domain
+ * @param mapping
+ * the mapping
* @return true if successfully
- * @throws InvalidMappingException
+ * @throws InvalidMappingException
*/
- protected abstract void removeMappingInternal(String user, String domain, String mapping) throws VirtualUserTableException;
+ protected abstract void removeMappingInternal(String user, String domain, String mapping) throws VirtualUserTableException;
/**
* Return Collection of all mappings for the given username and domain
*
- * @param user the user
- * @param domain the domain
+ * @param user
+ * the user
+ * @param domain
+ * the domain
* @return Collection which hold the mappings
*/
protected abstract Collection<String> getUserDomainMappingsInternal(String user, String domain) throws VirtualUserTableException;
@@ -390,31 +417,36 @@ public abstract class AbstractVirtualUse
*
* @return Map
*/
- protected abstract Map<String,Collection<String>> getAllMappingsInternal() throws VirtualUserTableException;
-
+ protected abstract Map<String, Collection<String>> getAllMappingsInternal() throws VirtualUserTableException;
+
/**
- * Override to map virtual recipients to real recipients, both local and non-local.
- * Each key in the provided map corresponds to a potential virtual recipient, stored as
- * a <code>MailAddress</code> object.
+ * Override to map virtual recipients to real recipients, both local and
+ * non-local. Each key in the provided map corresponds to a potential
+ * virtual recipient, stored as a <code>MailAddress</code> object.
*
- * Translate virtual recipients to real recipients by mapping a string containing the
- * address of the real recipient as a value to a key. Leave the value <code>null<code>
+ * Translate virtual recipients to real recipients by mapping a string
+ * containing the address of the real recipient as a value to a key. Leave
+ * the value <code>null<code>
* if no mapping should be performed. Multiple recipients may be specified by delineating
* the mapped string with commas, semi-colons or colons.
*
- * @param user the mapping of virtual to real recipients, as
- * <code>MailAddress</code>es to <code>String</code>s.
+ * @param user
+ * the mapping of virtual to real recipients, as
+ * <code>MailAddress</code>es to <code>String</code>s.
*/
protected abstract String mapAddressInternal(String user, String domain) throws VirtualUserTableException;
-
+
/**
- * Get all mappings for the given user and domain. If a aliasdomain mapping was found get sure it is in the map as first mapping.
+ * Get all mappings for the given user and domain. If a aliasdomain mapping
+ * was found get sure it is in the map as first mapping.
*
- * @param user the username
- * @param domain the domain
+ * @param user
+ * the username
+ * @param domain
+ * the domain
* @return the mappings
*/
- private String mapAddress(String user, String domain) throws VirtualUserTableException{
+ private String mapAddress(String user, String domain) throws VirtualUserTableException {
String mappings = mapAddressInternal(user, domain);
@@ -423,31 +455,31 @@ public abstract class AbstractVirtualUse
if (mappings != null && mappings.indexOf(VirtualUserTable.ALIASDOMAIN_PREFIX) > -1) {
Collection<String> mapCol = VirtualUserTableUtil.mappingToCollection(mappings);
Iterator<String> mapIt = mapCol.iterator();
-
+
List<String> col = new ArrayList<String>(mapCol.size());
-
+
while (mapIt.hasNext()) {
int i = 0;
String mapping = mapIt.next().toString();
-
+
if (mapping.startsWith(VirtualUserTable.ALIASDOMAIN_PREFIX)) {
- col.add(i,mapping);
+ col.add(i, mapping);
i++;
} else {
col.add(mapping);
}
}
return VirtualUserTableUtil.CollectionToMapping(col);
- } else {
+ } else {
return mappings;
}
}
-
- private void checkMapping(String user,String domain, String mapping) throws VirtualUserTableException{
- Collection<String> mappings = getUserDomainMappings(user,domain);
+
+ private void checkMapping(String user, String domain, String mapping) throws VirtualUserTableException {
+ Collection<String> mappings = getUserDomainMappings(user, domain);
if (mappings != null && mappings.contains(mapping)) {
throw new VirtualUserTableException("Mapping " + mapping + " for user " + user + " domain " + domain + " already exist!");
- }
- }
+ }
+ }
}
Modified: james/server/trunk/data-library/src/main/java/org/apache/james/vut/lib/VirtualUserTableManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/data-library/src/main/java/org/apache/james/vut/lib/VirtualUserTableManagement.java?rev=1088657&r1=1088656&r2=1088657&view=diff
==============================================================================
--- james/server/trunk/data-library/src/main/java/org/apache/james/vut/lib/VirtualUserTableManagement.java (original)
+++ james/server/trunk/data-library/src/main/java/org/apache/james/vut/lib/VirtualUserTableManagement.java Mon Apr 4 14:59:11 2011
@@ -32,7 +32,6 @@ import org.apache.james.vut.api.VirtualU
/**
* Management for VirtualUserTables
- *
*/
public class VirtualUserTableManagement extends StandardMBean implements VirtualUserTableManagementMBean {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org