Author: felixk
Date: Thu Oct 6 16:04:35 2011
New Revision: 1179679
URL: http://svn.apache.org/viewvc?rev=1179679&view=rev
Log:
Some more javadocs updates/fixes
Modified:
james/server/trunk/cli/src/main/java/org/apache/james/cli/probe/ServerProbe.java
james/server/trunk/cli/src/main/java/org/apache/james/cli/probe/impl/JmxServerProbe.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/Main.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/factory/mailetcontainer/MailetLoaderBeanFactory.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/factory/mailetcontainer/MatcherLoaderBeanFactory.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/FileSystemBeanFactoryPostProcessor.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/MailboxConfigurationBeanFactoryPostProcessor.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/context/JamesServerApplicationContext.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/context/web/JamesServerWebApplicationContext.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/filesystem/FileSystemImpl.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/mailbox/MailboxCopierManagement.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/mailbox/MailboxCopierManagementMBean.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/tool/James23Importer.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/tool/James23ImporterManagement.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/MimeMessageCopyOnWriteProxy.java
james/server/trunk/core/src/main/java/org/apache/james/core/MimeMessageInputStreamSource.java
james/server/trunk/core/src/main/java/org/apache/james/core/MimeMessageWrapper.java
Modified:
james/server/trunk/cli/src/main/java/org/apache/james/cli/probe/ServerProbe.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/cli/src/main/java/org/apache/james/cli/probe/ServerProbe.java?rev=1179679&r1=1179678&r2=1179679&view=diff
==============================================================================
---
james/server/trunk/cli/src/main/java/org/apache/james/cli/probe/ServerProbe.java
(original)
+++
james/server/trunk/cli/src/main/java/org/apache/james/cli/probe/ServerProbe.java
Thu Oct 6 16:04:35 2011
@@ -103,7 +103,7 @@ public interface ServerProbe {
* The username, or null if no username should be used.
* @param domain
* The domain, or null if no domain should be used.
- * @param toAaddress
+ * @param toAddress
* The address.
* @throws Exception
*/
Modified:
james/server/trunk/cli/src/main/java/org/apache/james/cli/probe/impl/JmxServerProbe.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/cli/src/main/java/org/apache/james/cli/probe/impl/JmxServerProbe.java?rev=1179679&r1=1179678&r2=1179679&view=diff
==============================================================================
---
james/server/trunk/cli/src/main/java/org/apache/james/cli/probe/impl/JmxServerProbe.java
(original)
+++
james/server/trunk/cli/src/main/java/org/apache/james/cli/probe/impl/JmxServerProbe.java
Thu Oct 6 16:04:35 2011
@@ -105,117 +105,91 @@ public class JmxServerProbe implements S
}
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see org.apache.james.cli.probe.ServerProbe#addUser(java.lang.String,
java.lang.String)
*/
public void addUser(String userName, String password) throws Exception {
usersRepositoryProxy.addUser(userName, password);
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see org.apache.james.cli.probe.ServerProbe#removeUser(java.lang.String)
*/
public void removeUser(String username) throws Exception {
usersRepositoryProxy.deleteUser(username);
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see org.apache.james.cli.probe.ServerProbe#listUsers()
*/
public String[] listUsers() throws Exception {
return usersRepositoryProxy.listAllUsers();
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
org.apache.james.cli.probe.ServerProbe#setPassword(java.lang.String,
java.lang.String)
*/
public void setPassword(String userName, String password) throws Exception
{
usersRepositoryProxy.setPassword(userName, password);
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see org.apache.james.cli.probe.ServerProbe#addDomain(java.lang.String)
*/
public void addDomain(String domain) throws Exception {
domainListProcxy.addDomain(domain);
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
org.apache.james.cli.probe.ServerProbe#removeDomain(java.lang.String)
*/
public void removeDomain(String domain) throws Exception {
domainListProcxy.removeDomain(domain);
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see org.apache.james.cli.probe.ServerProbe#listDomains()
*/
public String[] listDomains() throws Exception {
return domainListProcxy.getDomains();
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see org.apache.james.cli.probe.ServerProbe#listMappings()
*/
public Map<String, Collection<String>> listMappings() throws Exception {
return virtualUserTableProxy.getAllMappings();
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
org.apache.james.cli.probe.ServerProbe#addAddressMapping(java.lang.String,
java.lang.String, java.lang.String)
*/
public void addAddressMapping(String user, String domain, String
toAddress) throws Exception {
virtualUserTableProxy.addAddressMapping(user, domain, toAddress);
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
org.apache.james.cli.probe.ServerProbe#removeAddressMapping(java.lang.String,
java.lang.String, java.lang.String)
*/
public void removeAddressMapping(String user, String domain, String
fromAddress) throws Exception {
virtualUserTableProxy.removeAddressMapping(user, domain, fromAddress);
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
org.apache.james.cli.probe.ServerProbe#listUserDomainMappings(java.lang.String,
java.lang.String)
*/
public Collection<String> listUserDomainMappings(String user, String
domain) throws Exception {
return virtualUserTableProxy.getUserDomainMappings(user, domain);
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
org.apache.james.cli.probe.ServerProbe#addRegexMapping(java.lang.String,
java.lang.String, java.lang.String)
*/
public void addRegexMapping(String user, String domain, String regex)
throws Exception {
virtualUserTableProxy.addRegexMapping(user, domain, regex);
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
org.apache.james.cli.probe.ServerProbe#removeRegexMapping(java.lang.String,
java.lang.String, java.lang.String)
*/
public void removeRegexMapping(String user, String domain, String regex)
throws Exception {
Modified:
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/Main.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/Main.java?rev=1179679&r1=1179678&r2=1179679&view=diff
==============================================================================
---
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/Main.java
(original)
+++
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/Main.java
Thu Oct 6 16:04:35 2011
@@ -47,20 +47,15 @@ public class Main implements Daemon {
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see org.apache.commons.daemon.Daemon#destroy()
*/
public void destroy() {
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
- *
org.apache.commons.daemon.Daemon#init(org.apache.commons.daemon.DaemonContext
- * )
+ *
org.apache.commons.daemon.Daemon#init(org.apache.commons.daemon.DaemonContext)
*/
public void init(DaemonContext arg0) throws Exception {
context = new JamesServerApplicationContext(new String[] {
"META-INF/org/apache/james/spring-server.xml" });
@@ -68,18 +63,14 @@ public class Main implements Daemon {
context.start();
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see org.apache.commons.daemon.Daemon#start()
*/
public void start() throws Exception {
context.start();
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see org.apache.commons.daemon.Daemon#stop()
*/
public void stop() throws Exception {
Modified:
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/factory/mailetcontainer/MailetLoaderBeanFactory.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/factory/mailetcontainer/MailetLoaderBeanFactory.java?rev=1179679&r1=1179678&r2=1179679&view=diff
==============================================================================
---
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/factory/mailetcontainer/MailetLoaderBeanFactory.java
(original)
+++
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/factory/mailetcontainer/MailetLoaderBeanFactory.java
Thu Oct 6 16:04:35 2011
@@ -33,12 +33,9 @@ import org.springframework.beans.factory
*/
public class MailetLoaderBeanFactory extends AbstractLoaderBeanFactory<Mailet>
implements MailetLoader {
- /*
- * (non-Javadoc)
- *
+ /**
* @see
- * org.apache.james.mailetcontainer.api.MailetLoader#getMailet(org.apache
- * .mailet.MailetConfig)
+ *
org.apache.james.mailetcontainer.api.MailetLoader#getMailet(org.apache.mailet.MailetConfig)
*/
public Mailet getMailet(final MailetConfig config) throws
MessagingException {
String mailetName = config.getMailetName();
Modified:
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/factory/mailetcontainer/MatcherLoaderBeanFactory.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/factory/mailetcontainer/MatcherLoaderBeanFactory.java?rev=1179679&r1=1179678&r2=1179679&view=diff
==============================================================================
---
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/factory/mailetcontainer/MatcherLoaderBeanFactory.java
(original)
+++
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/factory/mailetcontainer/MatcherLoaderBeanFactory.java
Thu Oct 6 16:04:35 2011
@@ -33,12 +33,9 @@ import org.springframework.beans.factory
*/
public class MatcherLoaderBeanFactory extends
AbstractLoaderBeanFactory<Matcher> implements MatcherLoader {
- /*
- * (non-Javadoc)
- *
+ /**
* @see
- * org.apache.james.mailetcontainer.api.MatcherLoader#getMatcher(org.apache
- * .mailet.MatcherConfig)
+ *
org.apache.james.mailetcontainer.api.MatcherLoader#getMatcher(org.apache.mailet.MatcherConfig)
*/
public Matcher getMatcher(MatcherConfig config) throws MessagingException {
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=1179679&r1=1179678&r2=1179679&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
Thu Oct 6 16:04:35 2011
@@ -69,12 +69,9 @@ public class MailRepositoryStoreBeanFact
*/
private Logger logger;
- /*
- * (non-Javadoc)
- *
+ /**
* @see
- * org.apache.james.lifecycle.api.Configurable#configure(org.apache.commons
- * .configuration.HierarchicalConfiguration)
+ *
org.apache.james.lifecycle.api.Configurable#configure(org.apache.commons.configuration.HierarchicalConfiguration)
*/
public void configure(HierarchicalConfiguration configuration) throws
ConfigurationException {
this.configuration = configuration;
@@ -165,8 +162,8 @@ public class MailRepositoryStoreBeanFact
* </repository>
* </pre>
*
- * @param hint
- * the Configuration object used to look up the repository
+ * @param destination
+ * the destinationURL used to look up the repository
* @return the selected repository
* @throws MailRepositoryStoreException
* if any error occurs while parsing the Configuration or
@@ -242,10 +239,8 @@ public class MailRepositoryStoreBeanFact
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.james.mailstore.api.MailStore#getUrls()
+ /**
+ * @see org.apache.james.mailrepository.api.MailRepositoryStore#getUrls()
*/
public synchronized List<String> getUrls() {
return new ArrayList<String>(repositories.keySet());
Modified:
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/FileSystemBeanFactoryPostProcessor.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/FileSystemBeanFactoryPostProcessor.java?rev=1179679&r1=1179678&r2=1179679&view=diff
==============================================================================
---
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/FileSystemBeanFactoryPostProcessor.java
(original)
+++
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/FileSystemBeanFactoryPostProcessor.java
Thu Oct 6 16:04:35 2011
@@ -48,13 +48,9 @@ public class FileSystemBeanFactoryPostPr
this.fs = fs;
}
- /*
- * (non-Javadoc)
- *
- * @see org.springframework.beans.factory.config.BeanFactoryPostProcessor#
- * postProcessBeanFactory
- *
(org.springframework.beans.factory.config.ConfigurableListableBeanFactory
- * )
+ /**
+ * @see
org.springframework.beans.factory.config.BeanFactoryPostProcessor#postProcessBeanFactory
+ *
(org.springframework.beans.factory.config.ConfigurableListableBeanFactory)
*/
public void postProcessBeanFactory(ConfigurableListableBeanFactory
factory) throws BeansException {
String names[] = factory.getBeanDefinitionNames();
Modified:
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/MailboxConfigurationBeanFactoryPostProcessor.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/MailboxConfigurationBeanFactoryPostProcessor.java?rev=1179679&r1=1179678&r2=1179679&view=diff
==============================================================================
---
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/MailboxConfigurationBeanFactoryPostProcessor.java
(original)
+++
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/MailboxConfigurationBeanFactoryPostProcessor.java
Thu Oct 6 16:04:35 2011
@@ -37,13 +37,9 @@ import org.springframework.beans.factory
*/
public class MailboxConfigurationBeanFactoryPostProcessor implements
BeanFactoryPostProcessor {
- /*
- * (non-Javadoc)
- *
- * @see org.springframework.beans.factory.config.BeanFactoryPostProcessor#
- * postProcessBeanFactory
- *
(org.springframework.beans.factory.config.ConfigurableListableBeanFactory
- * )
+ /**
+ * @see
org.springframework.beans.factory.config.BeanFactoryPostProcessor#postProcessBeanFactory
+ *
(org.springframework.beans.factory.config.ConfigurableListableBeanFactory)
*/
public void postProcessBeanFactory(ConfigurableListableBeanFactory
beanFactory) throws BeansException {
ConfigurationProvider confProvider =
beanFactory.getBean(ConfigurationProvider.class);
Modified:
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/context/JamesServerApplicationContext.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/context/JamesServerApplicationContext.java?rev=1179679&r1=1179678&r2=1179679&view=diff
==============================================================================
---
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/context/JamesServerApplicationContext.java
(original)
+++
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/context/JamesServerApplicationContext.java
Thu Oct 6 16:04:35 2011
@@ -39,12 +39,9 @@ public class JamesServerApplicationConte
super(configs);
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
- * org.springframework.core.io.DefaultResourceLoader#getResource(java.lang
- * .String)
+ *
org.springframework.core.io.DefaultResourceLoader#getResource(java.lang.String)
*/
public Resource getResource(String fileURL) {
// delegate the loading to the resourceloader
@@ -55,42 +52,33 @@ public class JamesServerApplicationConte
return r;
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
- *
org.apache.james.container.spring.JamesResourceLoader#getAbsoluteDirectory
- * ()
+ *
org.apache.james.container.spring.resource.JamesResourceLoader#getAbsoluteDirectory()
*/
public String getAbsoluteDirectory() {
return resourceLoader.getAbsoluteDirectory();
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
- * org.apache.james.container.spring.JamesResourceLoader#getConfDirectory()
+ *
org.apache.james.container.spring.resource.JamesResourceLoader#getConfDirectory()
*/
public String getConfDirectory() {
return resourceLoader.getConfDirectory();
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
- * org.apache.james.container.spring.JamesResourceLoader#getVarDirectory()
+ *
org.apache.james.container.spring.resource.JamesResourceLoader#getVarDirectory()
*/
public String getVarDirectory() {
return resourceLoader.getVarDirectory();
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
- * org.apache.james.container.spring.JamesResourceLoader#getRootDirectory()
+ *
org.apache.james.container.spring.resource.JamesResourceLoader#getRootDirectory()
*/
public String getRootDirectory() {
return resourceLoader.getRootDirectory();
@@ -105,33 +93,24 @@ public class JamesServerApplicationConte
protected static final class JamesServerResourceLoader extends
AbstractJamesResourceLoader {
- /*
- * (non-Javadoc)
- *
- * @see org.apache.james.container.spring.JamesResourceLoader#
- * getAbsoluteDirectory()
+ /**
+ * @see
org.apache.james.container.spring.resource.JamesResourceLoader#getAbsoluteDirectory()
*/
public String getAbsoluteDirectory() {
return "/";
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
- *
org.apache.james.container.spring.JamesResourceLoader#getConfDirectory
- * ()
+ *
org.apache.james.container.spring.resource.JamesResourceLoader#getConfDirectory()
*/
public String getConfDirectory() {
return getRootDirectory() + "/conf/";
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
- *
org.apache.james.container.spring.JamesResourceLoader#getVarDirectory
- * ()
+ *
org.apache.james.container.spring.resource.JamesResourceLoader#getVarDirectory()
*/
public String getVarDirectory() {
return getRootDirectory() + "/var/";
@@ -147,12 +126,9 @@ public class JamesServerApplicationConte
return getRootDirectory() + "/conf/lib/";
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
- *
org.apache.james.container.spring.JamesResourceLoader#getRootDirectory
- * ()
+ *
org.apache.james.container.spring.resource.JamesResourceLoader#getRootDirectory()
*/
public String getRootDirectory() {
return "../";
Modified:
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/context/web/JamesServerWebApplicationContext.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/context/web/JamesServerWebApplicationContext.java?rev=1179679&r1=1179678&r2=1179679&view=diff
==============================================================================
---
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/context/web/JamesServerWebApplicationContext.java
(original)
+++
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/context/web/JamesServerWebApplicationContext.java
Thu Oct 6 16:04:35 2011
@@ -34,11 +34,8 @@ public class JamesServerWebApplicationCo
*/
private final JamesResourceLoader resourceLoader = new
AbstractJamesResourceLoader() {
- /*
- * (non-Javadoc)
- *
- * @see org.apache.james.container.spring.JamesResourceLoader#
- * getAbsoluteDirectory()
+ /**
+ * @see
org.apache.james.container.spring.JamesResourceLoader#getAbsoluteDirectory()
*/
public String getAbsoluteDirectory() {
if (absoluteDirectory == null) {
@@ -48,12 +45,8 @@ public class JamesServerWebApplicationCo
}
}
- /*
- * (non-Javadoc)
- *
- * @see
- *
org.apache.james.container.spring.JamesResourceLoader#getConfDirectory
- * ()
+ /**
+ * @see
org.apache.james.container.spring.JamesResourceLoader#getConfDirectory()
*/
public String getConfDirectory() {
if (confDirectory == null) {
@@ -63,12 +56,8 @@ public class JamesServerWebApplicationCo
}
}
- /*
- * (non-Javadoc)
- *
- * @see
- *
org.apache.james.container.spring.JamesResourceLoader#getRootDirectory
- * ()
+ /**
+ * @see
org.apache.james.container.spring.JamesResourceLoader#getRootDirectory()
*/
public String getRootDirectory() {
if (rootDirectory == null) {
@@ -79,12 +68,8 @@ public class JamesServerWebApplicationCo
}
}
- /*
- * (non-Javadoc)
- *
- * @see
- *
org.apache.james.container.spring.JamesResourceLoader#getVarDirectory
- * ()
+ /**
+ * @see
org.apache.james.container.spring.JamesResourceLoader#getVarDirectory()
*/
public String getVarDirectory() {
if (varDirectory == null) {
@@ -99,12 +84,9 @@ public class JamesServerWebApplicationCo
private String varDirectory;
private String confDirectory;
- /*
- * (non-Javadoc)
- *
+ /**
* @see
- * org.springframework.core.io.DefaultResourceLoader#getResource(java.lang
- * .String)
+ *
org.springframework.core.io.DefaultResourceLoader#getResource(java.lang.String)
*/
public Resource getResource(String fileURL) {
// delegate the loading to the resourceloader
@@ -131,42 +113,33 @@ public class JamesServerWebApplicationCo
this.confDirectory = confDirectory;
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
- *
org.apache.james.container.spring.JamesResourceLoader#getAbsoluteDirectory
- * ()
+ *
org.apache.james.container.spring.resource.JamesResourceLoader#getAbsoluteDirectory()
*/
public String getAbsoluteDirectory() {
return resourceLoader.getAbsoluteDirectory();
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
- * org.apache.james.container.spring.JamesResourceLoader#getConfDirectory()
+ *
org.apache.james.container.spring.resource.JamesResourceLoader#getConfDirectory()
*/
public String getConfDirectory() {
return resourceLoader.getConfDirectory();
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
- * org.apache.james.container.spring.JamesResourceLoader#getVarDirectory()
+ *
org.apache.james.container.spring.resource.JamesResourceLoader#getVarDirectory()
*/
public String getVarDirectory() {
return resourceLoader.getVarDirectory();
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
- * org.apache.james.container.spring.JamesResourceLoader#getRootDirectory()
+ *
org.apache.james.container.spring.resource.JamesResourceLoader#getRootDirectory()
*/
public String getRootDirectory() {
return resourceLoader.getRootDirectory();
Modified:
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/filesystem/FileSystemImpl.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/filesystem/FileSystemImpl.java?rev=1179679&r1=1179678&r2=1179679&view=diff
==============================================================================
---
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/filesystem/FileSystemImpl.java
(original)
+++
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/filesystem/FileSystemImpl.java
Thu Oct 6 16:04:35 2011
@@ -37,28 +37,22 @@ public class FileSystemImpl implements F
private JamesResourceLoader resourceLoader = null;
- /*
- * (non-Javadoc)
- *
- * @see org.apache.james.services.FileSystem#getBasedir()
+ /**
+ * @see org.apache.james.filesystem.api.FileSystem#getBasedir()
*/
public File getBasedir() throws FileNotFoundException {
return new File(resourceLoader.getRootDirectory());
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.james.services.FileSystem#getResource(java.lang.String)
+ /**
+ * @see org.apache.james.filesystem.api.FileSystem#getResource(String)
*/
public InputStream getResource(String url) throws IOException {
return resourceLoader.getResource(url).getInputStream();
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.james.services.FileSystem#getFile(java.lang.String)
+ /**
+ * @see org.apache.james.filesystem.api.FileSystem#getFile(String)
*/
public File getFile(String fileURL) throws FileNotFoundException {
try {
@@ -68,9 +62,7 @@ public class FileSystemImpl implements F
}
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
*
org.springframework.context.ApplicationContextAware#setApplicationContext
* (org.springframework.context.ApplicationContext)
Modified:
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/mailbox/MailboxCopierManagement.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/mailbox/MailboxCopierManagement.java?rev=1179679&r1=1179678&r2=1179679&view=diff
==============================================================================
---
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/mailbox/MailboxCopierManagement.java
(original)
+++
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/mailbox/MailboxCopierManagement.java
Thu Oct 6 16:04:35 2011
@@ -51,9 +51,7 @@ public class MailboxCopierManagement imp
this.copier = copier;
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
* org.apache.james.container.spring.mailbox.MailboxCopierManagementMBean
* #getMailboxManagerBeans()
@@ -72,9 +70,7 @@ public class MailboxCopierManagement imp
return bMap;
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
* org.apache.james.container.spring.mailbox.MailboxCopierManagementMBean
* #copy(java.lang.String, java.lang.String)
@@ -96,9 +92,7 @@ public class MailboxCopierManagement imp
}
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
*
org.springframework.context.ApplicationContextAware#setApplicationContext
* (org.springframework.context.ApplicationContext)
Modified:
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/mailbox/MailboxCopierManagementMBean.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/mailbox/MailboxCopierManagementMBean.java?rev=1179679&r1=1179678&r2=1179679&view=diff
==============================================================================
---
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/mailbox/MailboxCopierManagementMBean.java
(original)
+++
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/mailbox/MailboxCopierManagementMBean.java
Thu Oct 6 16:04:35 2011
@@ -18,6 +18,7 @@
****************************************************************/
package org.apache.james.container.spring.mailbox;
+import java.io.IOException;
import java.util.Map;
import org.apache.james.mailbox.MailboxManager;
@@ -41,7 +42,8 @@ public interface MailboxCopierManagement
*
* @param srcBean
* @param dstBean
- * @return true if successful, false otherwise
+ * @throws Exception
+ * if copying failed
*/
void copy(String srcBean, String dstBean) throws Exception;
Modified:
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/tool/James23Importer.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/tool/James23Importer.java?rev=1179679&r1=1179678&r2=1179679&view=diff
==============================================================================
---
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/tool/James23Importer.java
(original)
+++
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/tool/James23Importer.java
Thu Oct 6 16:04:35 2011
@@ -171,9 +171,7 @@ public class James23Importer implements
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see org.apache.james.lifecycle.api.LogEnabled#setLog(org.slf4j.Logger)
*/
public void setLog(Logger log) {
Modified:
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/tool/James23ImporterManagement.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/tool/James23ImporterManagement.java?rev=1179679&r1=1179678&r2=1179679&view=diff
==============================================================================
---
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/tool/James23ImporterManagement.java
(original)
+++
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/tool/James23ImporterManagement.java
Thu Oct 6 16:04:35 2011
@@ -39,9 +39,7 @@ public class James23ImporterManagement i
@Resource(name = "james23importer")
private James23Importer james23Importer;
- /*
- * (non-Javadoc)
- *
+ /**
* @see
* org.apache.james.container.spring.tool.James23ImporterManagementMBean
* #importUsersAndMailsFromJames23(java.lang.String, java.lang.String)
@@ -62,9 +60,7 @@ public class James23ImporterManagement i
}
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
* org.apache.james.container.spring.tool.James23ImporterManagementMBean
* #importUsersFromJames23(java.lang.String)
@@ -81,9 +77,7 @@ public class James23ImporterManagement i
}
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
* org.apache.james.container.spring.tool.James23ImporterManagementMBean
* #importMailsFromJames23(java.lang.String)
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=1179679&r1=1179678&r2=1179679&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
Thu Oct 6 16:04:35 2011
@@ -557,7 +557,7 @@ public class MailImpl implements Disposa
}
/**
- * @see
org.apache.james.lifecycle.api.avalon.framework.activity.Disposable#dispose()
+ * @see org.apache.james.lifecycle.api.Disposable#dispose()
*/
public void dispose() {
LifecycleUtil.dispose(message);
Modified:
james/server/trunk/core/src/main/java/org/apache/james/core/MimeMessageCopyOnWriteProxy.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/core/src/main/java/org/apache/james/core/MimeMessageCopyOnWriteProxy.java?rev=1179679&r1=1179678&r2=1179679&view=diff
==============================================================================
---
james/server/trunk/core/src/main/java/org/apache/james/core/MimeMessageCopyOnWriteProxy.java
(original)
+++
james/server/trunk/core/src/main/java/org/apache/james/core/MimeMessageCopyOnWriteProxy.java
Thu Oct 6 16:04:35 2011
@@ -168,7 +168,7 @@ public class MimeMessageCopyOnWriteProxy
}
/**
- * @see
org.apache.james.lifecycle.api.avalon.framework.activity.Disposable#dispose()
+ * @see org.apache.james.lifecycle.api.Disposable#dispose()
*/
public synchronized void dispose() {
if (refCount != null) {
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=1179679&r1=1179678&r2=1179679&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
Thu Oct 6 16:04:35 2011
@@ -161,7 +161,7 @@ public class MimeMessageInputStreamSourc
}
/**
- * @return
+ * @return the output stream to write to
* @throws FileNotFoundException
*/
public synchronized OutputStream getWritableOutputStream() throws
FileNotFoundException {
@@ -171,10 +171,8 @@ public class MimeMessageInputStreamSourc
return out;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.james.core.MimeMessageSource#disposeSource()
+ /**
+ * @see org.apache.james.lifecycle.api.Disposable#dispose()
*/
public void dispose() {
// explicit close all streams
Modified:
james/server/trunk/core/src/main/java/org/apache/james/core/MimeMessageWrapper.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/core/src/main/java/org/apache/james/core/MimeMessageWrapper.java?rev=1179679&r1=1179678&r2=1179679&view=diff
==============================================================================
---
james/server/trunk/core/src/main/java/org/apache/james/core/MimeMessageWrapper.java
(original)
+++
james/server/trunk/core/src/main/java/org/apache/james/core/MimeMessageWrapper.java
Thu Oct 6 16:04:35 2011
@@ -161,9 +161,9 @@ public class MimeMessageWrapper extends
/**
* Overrides default javamail behaviour by not altering the Message-ID by
- * default
- *
- * @see JAMES-875 / JAMES-1010
+ * default, see <a
href="https://issues.apache.org/jira/browse/JAMES-875";>JAMES-875</a> and
+ * <a
href="https://issues.apache.org/jira/browse/JAMES-1010";>JAMES-1010</a>
+ *
* @see javax.mail.internet.MimeMessage#updateMessageID()
*/
protected void updateMessageID() throws MessagingException {
@@ -531,10 +531,8 @@ public class MimeMessageWrapper extends
super.setDataHandler(arg0);
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.james.lifecycle.Disposable#dispose()
+ /**
+ * @see org.apache.james.lifecycle.api.Disposable#dispose()
*/
public void dispose() {
if (sourceIn != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
