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 se...@apache.org on 2003/01/12 23:38:37 UTC
cvs commit: jakarta-james/src/java/org/apache/mailet/dates RFC2980DateFormat.java RFC822DateFormat.java RFC977DateFormat.java SimplifiedDateFormat.java SynchronizedDateFormat.java
serge 2003/01/12 14:38:36
Modified: src/java/org/apache/james James.java
src/java/org/apache/james/context
AvalonContextConstants.java
AvalonContextUtilities.java
src/java/org/apache/james/core AbstractJamesService.java
AvalonMailStore.java AvalonUsersStore.java
MailImpl.java MailetConfigImpl.java
MimeMessageSource.java MimeMessageWrapper.java
src/java/org/apache/james/dnsserver DNSServer.java
src/java/org/apache/james/fetchpop FetchPOP.java
FetchScheduler.java ReaderInputStream.java
src/java/org/apache/james/mailrepository
AvalonMailRepository.java
AvalonSpoolRepository.java JDBCMailRepository.java
MimeMessageAvalonSource.java
MimeMessageJDBCSource.java
src/java/org/apache/james/nntpserver
DateSinceFileFilter.java NNTPException.java
NNTPHandler.java
src/java/org/apache/james/nntpserver/repository
ArticleIDRepository.java NNTPArticle.java
NNTPArticleImpl.java NNTPGroup.java
NNTPLineReader.java NNTPLineReaderImpl.java
NNTPRepositoryImpl.java NNTPSpooler.java
src/java/org/apache/james/pop3server POP3Handler.java
src/java/org/apache/james/remotemanager
RemoteManagerHandler.java
src/java/org/apache/james/security DigestUtil.java
src/java/org/apache/james/services DNSServer.java
JamesUser.java MailServer.java MailStore.java
UsersStore.java
src/java/org/apache/james/smtpserver
SizeLimitedInputStream.java
src/java/org/apache/james/transport LinearProcessor.java
Loader.java MatchLoader.java Resources.java
src/java/org/apache/james/transport/mailets AddFooter.java
AddHabeasWarrantMark.java AvalonListserv.java
Null.java Redirect.java RemoteDelivery.java
ToRepository.java
src/java/org/apache/james/transport/matchers
FetchedFrom.java HasHabeasWarrantMark.java
RemoteAddrInNetwork.java SenderInFakeDomain.java
src/java/org/apache/james/userrepository
AbstractJdbcUsersRepository.java
AbstractUsersRepository.java DefaultJamesUser.java
DefaultUser.java DefaultUsersJdbcRepository.java
JamesUsersJdbcRepository.java
ListUsersJdbcRepository.java
UsersFileRepository.java UsersLDAPRepository.java
src/java/org/apache/james/util JDBCUtil.java RFC822Date.java
SqlResources.java
src/java/org/apache/james/util/connection
ServerConnection.java SimpleConnectionManager.java
src/java/org/apache/james/util/watchdog
BytesReadResetInputStream.java
SchedulerWatchdogFactory.java
src/java/org/apache/mailet GenericMatcher.java Mail.java
MailAddress.java MailetContextConstants.java
RFC2822Headers.java SpoolRepository.java
src/java/org/apache/mailet/dates RFC2980DateFormat.java
RFC822DateFormat.java RFC977DateFormat.java
SimplifiedDateFormat.java
SynchronizedDateFormat.java
Log:
Converted tabs to 4 spaces.
Revision Changes Path
1.41 +11 -11 jakarta-james/src/java/org/apache/james/James.java
Index: James.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/James.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- James.java 7 Jan 2003 11:57:25 -0000 1.40
+++ James.java 12 Jan 2003 22:38:30 -0000 1.41
@@ -371,7 +371,7 @@
//compMgr.put("org.apache.mailet.MailetContext", this);
// For AVALON aware mailets and matchers, we put the Component object as
// an attribute
-
+
//TODO NOT unless specifically required by conf
attributes.put(Constants.AVALON_COMPONENT_MANAGER, compMgr);
@@ -571,7 +571,7 @@
*
* <p>TODO: This needs to be made a more specific ordered subtype of Collection.</p>
*
- * @param host
+ * @param host
*/
public Collection getMailServers(String host) {
DNSServer dnsServer = null;
@@ -719,7 +719,7 @@
if (enableForwarding && user.getForwarding()) {
MailAddress forwardTo = user.getForwardingDestination();
if (forwardTo == null) {
- StringBuffer errorBuffer =
+ StringBuffer errorBuffer =
new StringBuffer(128)
.append("Forwarding was enabled for ")
.append(username)
@@ -788,7 +788,7 @@
}
/**
- * Check whether the mail domain in question is to be
+ * Check whether the mail domain in question is to be
* handled by this server.
*
* @param serverName the name of the server to check
@@ -855,14 +855,14 @@
success = localusers.addUser(user);
return success;
}
-
+
/**
* @see org.apache.mailet.MailetContext#getMailSpool(String)
*/
public SpoolRepository getMailSpool(String specificationURL) throws MessagingException {
return (SpoolRepository) getRepository(specificationURL,SpoolRepository.SPOOL);
- }
+ }
private MailRepository getRepository(String specificationURL,String storeType)throws MessagingException {
if (specificationURL == null) {
@@ -870,7 +870,7 @@
}
try {
-
+
DefaultConfiguration spoolConf
= new DefaultConfiguration("repository", "generated by Context");
spoolConf.setAttribute("destinationURL", specificationURL);
@@ -882,8 +882,8 @@
} catch (Exception e) {
log("Failed to retrieve Store component:" + e.getMessage());
throw new MessagingException("Failed to retrieve Store component:"+specificationURL+" because "+e.getMessage(),e );
- }
-
+ }
+
}
/**
@@ -900,6 +900,6 @@
return usersStore.getRepository(respositoryName);
}
-
+
}
1.3 +2 -2 jakarta-james/src/java/org/apache/james/context/AvalonContextConstants.java
Index: AvalonContextConstants.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/context/AvalonContextConstants.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AvalonContextConstants.java 4 Oct 2002 03:38:52 -0000 1.2
+++ AvalonContextConstants.java 12 Jan 2003 22:38:30 -0000 1.3
@@ -17,7 +17,7 @@
* look up context values directly, using String keys. This
* class stores the String keys that are used by James to
* look up context values.
- *
+ *
* The lifetime of this class is expected to be limited. At some
* point in the near future the Avalon folks will make a decision
* about how exactly to define, describe, and publish context
@@ -35,7 +35,7 @@
/**
* The context key associated with the home directory of the application
- * being run. The object returned on a
+ * being run. The object returned on a
* context.get(AvalonContextConstants.APPLICATION_HOME) should be of
* type <code>java.io.File</code> and should be the home directory
* for the application (in our case, James)
1.2 +1 -1 jakarta-james/src/java/org/apache/james/context/AvalonContextUtilities.java
Index: AvalonContextUtilities.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/context/AvalonContextUtilities.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AvalonContextUtilities.java 4 Oct 2002 03:38:52 -0000 1.1
+++ AvalonContextUtilities.java 12 Jan 2003 22:38:30 -0000 1.2
@@ -36,7 +36,7 @@
*
* @param context the Avalon context
* @param fileURL an appropriately formatted URL describing a file on
- * the filesystem on which the server is running. The
+ * the filesystem on which the server is running. The
* URL is evaluated as a location relative to the
* application home, unless it begins with a slash. In
* the latter case the file location is evaluated relative
1.6 +2 -2 jakarta-james/src/java/org/apache/james/core/AbstractJamesService.java
Index: AbstractJamesService.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/core/AbstractJamesService.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractJamesService.java 6 Jan 2003 17:08:43 -0000 1.5
+++ AbstractJamesService.java 12 Jan 2003 22:38:30 -0000 1.6
@@ -168,11 +168,11 @@
Configuration handlerConfiguration = conf.getChild("handler");
- // Send the handler subconfiguration to the super class. This
+ // Send the handler subconfiguration to the super class. This
// ensures that the handler config is passed to the handlers.
//
// TODO: This should be rationalized. The handler element of the
- // server configuration doesn't really make a whole lot of
+ // server configuration doesn't really make a whole lot of
// sense. We should modify the config to get rid of it.
// Keeping it for now to maintain backwards compatibility.
super.configure(handlerConfiguration);
1.19 +2 -2 jakarta-james/src/java/org/apache/james/core/AvalonMailStore.java
Index: AvalonMailStore.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/core/AvalonMailStore.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- AvalonMailStore.java 6 Jan 2003 12:38:05 -0000 1.18
+++ AvalonMailStore.java 12 Jan 2003 22:38:30 -0000 1.19
@@ -198,8 +198,8 @@
*
* @return the selected repository
*
- * @throws ComponentException if any error occurs while parsing the
- * Configuration or retrieving the
+ * @throws ComponentException if any error occurs while parsing the
+ * Configuration or retrieving the
* MailRepository
*/
public synchronized Component select(Object hint) throws ComponentException {
1.15 +3 -3 jakarta-james/src/java/org/apache/james/core/AvalonUsersStore.java
Index: AvalonUsersStore.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/core/AvalonUsersStore.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- AvalonUsersStore.java 6 Jan 2003 15:52:59 -0000 1.14
+++ AvalonUsersStore.java 12 Jan 2003 22:38:30 -0000 1.15
@@ -122,7 +122,7 @@
}
repositories.put(repName, rep);
if (getLogger().isInfoEnabled()) {
- StringBuffer logBuffer =
+ StringBuffer logBuffer =
new StringBuffer(64)
.append("UsersRepository ")
.append(repName)
@@ -134,7 +134,7 @@
}
- /**
+ /**
* Get the repository, if any, whose name corresponds to
* the argument parameter
*
@@ -150,7 +150,7 @@
return response;
}
- /**
+ /**
* Yield an <code>Iterator</code> over the set of repository
* names managed internally by this store.
*
1.20 +1 -1 jakarta-james/src/java/org/apache/james/core/MailImpl.java
Index: MailImpl.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/core/MailImpl.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- MailImpl.java 7 Jan 2003 11:06:35 -0000 1.19
+++ MailImpl.java 12 Jan 2003 22:38:30 -0000 1.20
@@ -410,7 +410,7 @@
reply);
}
/**
- * Writes the content of the message, up to a total number of lines, out to
+ * Writes the content of the message, up to a total number of lines, out to
* an OutputStream.
*
* @param out the OutputStream to which to write the content
1.4 +1 -1 jakarta-james/src/java/org/apache/james/core/MailetConfigImpl.java
Index: MailetConfigImpl.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/core/MailetConfigImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MailetConfigImpl.java 17 Aug 2002 18:16:24 -0000 1.3
+++ MailetConfigImpl.java 12 Jan 2003 22:38:30 -0000 1.4
@@ -79,7 +79,7 @@
* Returns an iterator over the set of configuration parameter names.
*
* @throws UnsupportedOperationException in all cases, as this is not implemented
- */
+ */
public Iterator getInitParameterNames() {
throw new UnsupportedOperationException("Not yet implemented");
//return params.keySet().iterator();
1.9 +2 -2 jakarta-james/src/java/org/apache/james/core/MimeMessageSource.java
Index: MimeMessageSource.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/core/MimeMessageSource.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MimeMessageSource.java 26 Oct 2002 04:15:30 -0000 1.8
+++ MimeMessageSource.java 12 Jan 2003 22:38:30 -0000 1.9
@@ -19,8 +19,8 @@
*/
public abstract class MimeMessageSource {
/**
- * Returns a unique String ID that represents the location from where
- * this file is loaded. This will be used to identify where the data
+ * Returns a unique String ID that represents the location from where
+ * this file is loaded. This will be used to identify where the data
* is, primarily to avoid situations where this data would get overwritten.
*
* @return the String ID
1.20 +6 -6 jakarta-james/src/java/org/apache/james/core/MimeMessageWrapper.java
Index: MimeMessageWrapper.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/core/MimeMessageWrapper.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- MimeMessageWrapper.java 7 Jan 2003 11:06:35 -0000 1.19
+++ MimeMessageWrapper.java 12 Jan 2003 22:38:30 -0000 1.20
@@ -73,7 +73,7 @@
RFC822DateFormat mailDateFormat = new RFC822DateFormat();
/**
- * A constructor that instantiates a MimeMessageWrapper based on
+ * A constructor that instantiates a MimeMessageWrapper based on
* a MimeMessageSource
*
* @param source the MimeMessageSource
@@ -95,7 +95,7 @@
/**
* Load the message headers from the internal source.
*
- * @throws MessagingException if an error is encountered while
+ * @throws MessagingException if an error is encountered while
* loading the headers
*/
private synchronized void loadHeaders() throws MessagingException {
@@ -116,7 +116,7 @@
/**
* Load the complete MimeMessage from the internal source.
*
- * @throws MessagingException if an error is encountered while
+ * @throws MessagingException if an error is encountered while
* loading the message
*/
private synchronized void loadMessage() throws MessagingException {
@@ -190,7 +190,7 @@
//We do not want to instantiate the message... just read from source
// and write to this outputstream
- // TODO: This is really a bad way to do this sort of thing. A shared buffer to
+ // TODO: This is really a bad way to do this sort of thing. A shared buffer to
// allow simultaneous read/writes would be a substantial improvement
byte[] block = new byte[1024];
int read = 0;
@@ -233,7 +233,7 @@
pos.println(header);
}
pos.println();
- // TODO: This is really a bad way to do this sort of thing. A shared buffer to
+ // TODO: This is really a bad way to do this sort of thing. A shared buffer to
// allow simultaneous read/writes would be a substantial improvement
byte[] block = new byte[1024];
int read = 0;
@@ -649,7 +649,7 @@
loadMessage();
}
InputStream in = getContentStream();
- // TODO: This is really a bad way to do this sort of thing. A shared buffer to
+ // TODO: This is really a bad way to do this sort of thing. A shared buffer to
// allow simultaneous read/writes would be a substantial improvement
byte block[] = new byte[1024];
int len = 0;
1.11 +1 -1 jakarta-james/src/java/org/apache/james/dnsserver/DNSServer.java
Index: DNSServer.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/dnsserver/DNSServer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DNSServer.java 6 Jan 2003 17:08:43 -0000 1.10
+++ DNSServer.java 12 Jan 2003 22:38:30 -0000 1.11
@@ -188,7 +188,7 @@
/**
* Looks up DNS records of the specified type for the specified name.
*
- * This method is a public wrapper for the private implementation
+ * This method is a public wrapper for the private implementation
* method
*
* @param name the name of the host to be looked up
1.6 +3 -3 jakarta-james/src/java/org/apache/james/fetchpop/FetchPOP.java
Index: FetchPOP.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/fetchpop/FetchPOP.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FetchPOP.java 30 Oct 2002 12:45:11 -0000 1.5
+++ FetchPOP.java 12 Jan 2003 22:38:30 -0000 1.6
@@ -27,12 +27,12 @@
import org.apache.james.services.MailServer;
/**
*
- * A class which fetches mail from a single POP account and inserts it
+ * A class which fetches mail from a single POP account and inserts it
* into the incoming spool<br>
*
* <br>$Id$
* @author <A href="mailto:danny@apache.org">Danny Angus</a>
- *
+ *
*/
public class FetchPOP extends AbstractLogEnabled implements Configurable, Target {
/**
1.5 +2 -2 jakarta-james/src/java/org/apache/james/fetchpop/FetchScheduler.java
Index: FetchScheduler.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/fetchpop/FetchScheduler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FetchScheduler.java 30 Oct 2002 12:45:11 -0000 1.4
+++ FetchScheduler.java 12 Jan 2003 22:38:30 -0000 1.5
@@ -29,7 +29,7 @@
* <br>$Id$
* @author <A href="mailto:danny@apache.org">Danny Angus</a>
* @see org.apache.james.fetchpop.FetchPOP#configure(Configuration) FetchPOP
- *
+ *
*/
public class FetchScheduler
extends AbstractLogEnabled
1.2 +6 -6 jakarta-james/src/java/org/apache/james/fetchpop/ReaderInputStream.java
Index: ReaderInputStream.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/fetchpop/ReaderInputStream.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ReaderInputStream.java 24 Sep 2002 15:36:30 -0000 1.1
+++ ReaderInputStream.java 12 Jan 2003 22:38:30 -0000 1.2
@@ -1,11 +1,11 @@
/**
* ReaderInputStream.java
- *
+ *
* Copyright (C) 24-Sep-2002 The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
- * the LICENSE file.
+ * the LICENSE file.
*
* Danny Angus
*/
@@ -14,12 +14,12 @@
import java.io.InputStream;
import java.io.Reader;
/**
- *
- *
+ *
+ *
* Simple class to allow a cast from a java.io.Reader to a java.io.InputStream<br>
* <br>$Id$
* @author <A href="mailto:danny@apache.org">Danny Angus</a>
- *
+ *
*/
public class ReaderInputStream extends InputStream {
private Reader reader = null;
1.25 +1 -1 jakarta-james/src/java/org/apache/james/mailrepository/AvalonMailRepository.java
Index: AvalonMailRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/mailrepository/AvalonMailRepository.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- AvalonMailRepository.java 7 Jan 2003 11:57:25 -0000 1.24
+++ AvalonMailRepository.java 12 Jan 2003 22:38:31 -0000 1.25
@@ -386,7 +386,7 @@
*
*/
public Iterator list() {
- // Fix ConcurrentModificationException by cloning
+ // Fix ConcurrentModificationException by cloning
// the keyset before getting an iterator
final HashSet clone = new HashSet();
clone.addAll( keys );
1.10 +2 -2 jakarta-james/src/java/org/apache/james/mailrepository/AvalonSpoolRepository.java
Index: AvalonSpoolRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/mailrepository/AvalonSpoolRepository.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- AvalonSpoolRepository.java 7 Jan 2003 11:57:25 -0000 1.9
+++ AvalonSpoolRepository.java 12 Jan 2003 22:38:31 -0000 1.10
@@ -33,7 +33,7 @@
/**
* <p>Returns the key for an arbitrarily selected mail deposited in this Repository.
- * Usage: SpoolManager calls accept() to see if there are any unprocessed
+ * Usage: SpoolManager calls accept() to see if there are any unprocessed
* mails in the spool repository.</p>
*
* <p>Synchronized to ensure thread safe access to the underlying spool.</p>
@@ -48,7 +48,7 @@
try {
for(Iterator it = list(); it.hasNext(); ) {
- String s = it.next().toString();
+ String s = it.next().toString();
if ((DEEP_DEBUG) && (getLogger().isDebugEnabled())) {
StringBuffer logBuffer =
new StringBuffer(64)
1.35 +8 -8 jakarta-james/src/java/org/apache/james/mailrepository/JDBCMailRepository.java
Index: JDBCMailRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/mailrepository/JDBCMailRepository.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- JDBCMailRepository.java 7 Jan 2003 11:57:25 -0000 1.34
+++ JDBCMailRepository.java 12 Jan 2003 22:38:31 -0000 1.35
@@ -95,7 +95,7 @@
/**
* A lock used to control access to repository elements, locking access
- * based on the key
+ * based on the key
*/
private Lock lock;
@@ -455,7 +455,7 @@
ResultSet rsExists = null;
boolean exists = false;
try {
- checkMessageExists =
+ checkMessageExists =
conn.prepareStatement(sqlQueries.getSqlString("checkMessageExistsSQL", true));
checkMessageExists.setString(1, mc.getName());
checkMessageExists.setString(2, repositoryName);
@@ -527,10 +527,10 @@
//Store the body in the stream repository
bodyOut = sr.put(mc.getName());
}
-
+
//Write the message to the headerOut and bodyOut. bodyOut goes straight to the file
MimeMessageWrapper.writeTo(messageBody, headerOut, bodyOut);
-
+
//Store the headers in the database
ByteArrayInputStream headerInputStream =
new ByteArrayInputStream(headerOut.toByteArray());
@@ -572,7 +572,7 @@
insertMessage.setString(8, mc.getRemoteAddr());
insertMessage.setTimestamp(9, new java.sql.Timestamp(mc.getLastUpdated().getTime()));
MimeMessage messageBody = mc.getMessage();
-
+
ByteArrayOutputStream headerOut = new ByteArrayOutputStream();
OutputStream bodyOut = null;
try {
@@ -584,7 +584,7 @@
//Store the body in the file system.
bodyOut = sr.put(mc.getName());
}
-
+
//Write the message to the headerOut and bodyOut. bodyOut goes straight to the file
MimeMessageWrapper.writeTo(messageBody, headerOut, bodyOut);
@@ -791,7 +791,7 @@
// TODO: Figure out whether other instance variables should be part of
// the equals equation
JDBCMailRepository repository = (JDBCMailRepository)obj;
- return ((repository.tableName == tableName) || ((repository.tableName != null) && repository.tableName.equals(tableName))) &&
+ return ((repository.tableName == tableName) || ((repository.tableName != null) && repository.tableName.equals(tableName))) &&
((repository.repositoryName == repositoryName) || ((repository.repositoryName != null) && repository.repositoryName.equals(repositoryName)));
}
@@ -813,7 +813,7 @@
/**
* Closes output streams used to update message
- *
+ *
* @headerStream the stream containing header information - potentially the same
* as the body stream
* @bodyStream the stream containing body information
1.6 +3 -3 jakarta-james/src/java/org/apache/james/mailrepository/MimeMessageAvalonSource.java
Index: MimeMessageAvalonSource.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/mailrepository/MimeMessageAvalonSource.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MimeMessageAvalonSource.java 18 Aug 2002 07:23:55 -0000 1.5
+++ MimeMessageAvalonSource.java 12 Jan 2003 22:38:31 -0000 1.6
@@ -16,7 +16,7 @@
public class MimeMessageAvalonSource extends MimeMessageSource {
//Define how to get to the data
-
+
/**
* The stream repository used by this data source.
*/
@@ -40,8 +40,8 @@
}
/**
- * Returns a unique String ID that represents the location from where
- * this source is loaded. This will be used to identify where the data
+ * Returns a unique String ID that represents the location from where
+ * this source is loaded. This will be used to identify where the data
* is, primarily to avoid situations where this data would get overwritten.
*
* @return the String ID
1.11 +3 -3 jakarta-james/src/java/org/apache/james/mailrepository/MimeMessageJDBCSource.java
Index: MimeMessageJDBCSource.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/mailrepository/MimeMessageJDBCSource.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- MimeMessageJDBCSource.java 23 Aug 2002 08:00:28 -0000 1.10
+++ MimeMessageJDBCSource.java 12 Jan 2003 22:38:31 -0000 1.11
@@ -82,8 +82,8 @@
}
/**
- * Returns a unique String ID that represents the location from where
- * this source is loaded. This will be used to identify where the data
+ * Returns a unique String ID that represents the location from where
+ * this source is loaded. This will be used to identify where the data
* is, primarily to avoid situations where this data would get overwritten.
*
* @return the String ID
@@ -198,7 +198,7 @@
// Ignored - no access to logger at this point in the code
}
}
-
+
return size;
} catch (SQLException sqle) {
throw new IOException(sqle.toString());
1.4 +2 -2 jakarta-james/src/java/org/apache/james/nntpserver/DateSinceFileFilter.java
Index: DateSinceFileFilter.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/nntpserver/DateSinceFileFilter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DateSinceFileFilter.java 2 Oct 2002 09:53:38 -0000 1.3
+++ DateSinceFileFilter.java 12 Jan 2003 22:38:31 -0000 1.4
@@ -18,7 +18,7 @@
public class DateSinceFileFilter implements FilenameFilter {
/**
- * The date that serves as the lower bound of the region of
+ * The date that serves as the lower bound of the region of
* interest
*/
private final long m_date;
@@ -27,7 +27,7 @@
* Creates a new FileFilter that returns all Files that
* have been modified since the date specified.
*
- * @param date the date that serves as the lower bound of the region of
+ * @param date the date that serves as the lower bound of the region of
* interest
*/
public DateSinceFileFilter( long date ) {
1.4 +1 -1 jakarta-james/src/java/org/apache/james/nntpserver/NNTPException.java
Index: NNTPException.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/nntpserver/NNTPException.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NNTPException.java 19 Aug 2002 18:57:07 -0000 1.3
+++ NNTPException.java 12 Jan 2003 22:38:31 -0000 1.4
@@ -9,7 +9,7 @@
/**
* Exception Wrapper, like javax.servlet.ServletException.
- * Purpose is to catch and wrap exceptions into unchecked NNTP specific.
+ * Purpose is to catch and wrap exceptions into unchecked NNTP specific.
* Protocol handler catches the exception and returns error info to client.
* Error Information is obtained by calling 'getMessage'
*
1.29 +10 -10 jakarta-james/src/java/org/apache/james/nntpserver/NNTPHandler.java
Index: NNTPHandler.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/nntpserver/NNTPHandler.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- NNTPHandler.java 7 Jan 2003 11:06:36 -0000 1.28
+++ NNTPHandler.java 12 Jan 2003 22:38:31 -0000 1.29
@@ -198,7 +198,7 @@
private final static String AUTHINFO_PARAM_PASS = "PASS";
/**
- * The thread executing this handler
+ * The thread executing this handler
*/
private Thread handlerThread;
@@ -630,13 +630,13 @@
*/
private void doNEWGROUPS(String argument) {
// see section 11.3
- // both draft-ietf-nntpext-base-15.txt and rfc977 have only group names
- // in response lines, but INN sends
+ // both draft-ietf-nntpext-base-15.txt and rfc977 have only group names
+ // in response lines, but INN sends
// '<group name> <last article> <first article> <posting allowed>'
// NOTE: following INN over either document.
//
// TODO: Check this. Audit at http://www.academ.com/pipermail/ietf-nntp/2001-July/002185.html
- // doesn't mention the supposed discrepancy. Consider changing code to
+ // doesn't mention the supposed discrepancy. Consider changing code to
// be in line with spec.
Date theDate = null;
try {
@@ -1132,9 +1132,9 @@
} else {
group = newGroup;
// if the number of articles in group == 0
- // then the server may return this information in 3 ways,
+ // then the server may return this information in 3 ways,
// The clients must honor all those 3 ways.
- // our response is:
+ // our response is:
// highWaterMark == lowWaterMark and number of articles == 0
int articleCount = group.getNumberOfArticles();
int lowWaterMark = group.getFirstArticleNumber();
@@ -1257,7 +1257,7 @@
}
/**
- * Get the values of the headers for the selected newsgroup,
+ * Get the values of the headers for the selected newsgroup,
* with an optional range modifier.
*
* @param argument the argument passed in with the XHDR command.
@@ -1267,7 +1267,7 @@
}
/**
- * Get the values of the headers for the selected newsgroup,
+ * Get the values of the headers for the selected newsgroup,
* with an optional range modifier.
*
* @param argument the argument passed in with the HDR command.
@@ -1512,7 +1512,7 @@
}
/**
- * This method logs at a "DEBUG" level the response string that
+ * This method logs at a "DEBUG" level the response string that
* was sent to the SMTP client. The method is provided largely
* as syntactic sugar to neaten up the code base. It is declared
* private and final to encourage compiler inlining.
@@ -1539,7 +1539,7 @@
}
/**
- * Write a response string. The response is also logged.
+ * Write a response string. The response is also logged.
* Used for multi-line responses.
*
* @param responseString the response string sent to the client
1.11 +2 -2 jakarta-james/src/java/org/apache/james/nntpserver/repository/ArticleIDRepository.java
Index: ArticleIDRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/nntpserver/repository/ArticleIDRepository.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ArticleIDRepository.java 9 Oct 2002 00:21:06 -0000 1.10
+++ ArticleIDRepository.java 12 Jan 2003 22:38:31 -0000 1.11
@@ -17,7 +17,7 @@
import java.util.Enumeration;
import java.util.Properties;
-/**
+/**
* ArticleIDRepository: contains one file for each article.
* the file name is Base64 encoded article ID
* The first line of the file is '# <create date of file>
@@ -25,7 +25,7 @@
* Allows fast lookup of a message by message id.
*
* This class allows a process to iterate and synchronize messages with other NNTP Servers.
- * This may be inefficient. It may be better to use an alternate, more
+ * This may be inefficient. It may be better to use an alternate, more
* efficient process for synchronization and this class for sanity check.
*
* @author Harmeet Bedi <ha...@kodemuse.com>
1.4 +1 -1 jakarta-james/src/java/org/apache/james/nntpserver/repository/NNTPArticle.java
Index: NNTPArticle.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/nntpserver/repository/NNTPArticle.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NNTPArticle.java 2 Oct 2002 09:53:38 -0000 1.3
+++ NNTPArticle.java 12 Jan 2003 22:38:31 -0000 1.4
@@ -9,7 +9,7 @@
import java.io.PrintWriter;
-/**
+/**
* Contract exposed by a NewsGroup Article
*
* @author Harmeet Bedi <ha...@kodemuse.com>
1.12 +1 -1 jakarta-james/src/java/org/apache/james/nntpserver/repository/NNTPArticleImpl.java
Index: NNTPArticleImpl.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/nntpserver/repository/NNTPArticleImpl.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- NNTPArticleImpl.java 6 Jan 2003 17:08:45 -0000 1.11
+++ NNTPArticleImpl.java 12 Jan 2003 22:38:31 -0000 1.12
@@ -18,7 +18,7 @@
import org.apache.james.nntpserver.NNTPException;
-/**
+/**
* Please see NNTPArticle for comments
*
* @author Harmeet Bedi <ha...@kodemuse.com>
1.6 +1 -1 jakarta-james/src/java/org/apache/james/nntpserver/repository/NNTPGroup.java
Index: NNTPGroup.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/nntpserver/repository/NNTPGroup.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NNTPGroup.java 26 Oct 2002 04:15:29 -0000 1.5
+++ NNTPGroup.java 12 Jan 2003 22:38:31 -0000 1.6
@@ -12,7 +12,7 @@
import java.util.Date;
import java.util.Iterator;
-/**
+/**
* Contract exposed by a NewsGroup
*
* @author Harmeet Bedi <ha...@kodemuse.com>
1.5 +1 -1 jakarta-james/src/java/org/apache/james/nntpserver/repository/NNTPLineReader.java
Index: NNTPLineReader.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/nntpserver/repository/NNTPLineReader.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NNTPLineReader.java 2 Oct 2002 09:53:38 -0000 1.4
+++ NNTPLineReader.java 12 Jan 2003 22:38:31 -0000 1.5
@@ -16,7 +16,7 @@
*/
public interface NNTPLineReader {
- /**
+ /**
* Reads a line of data.
*
* @return null indicates end of data
1.6 +1 -1 jakarta-james/src/java/org/apache/james/nntpserver/repository/NNTPLineReaderImpl.java
Index: NNTPLineReaderImpl.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/nntpserver/repository/NNTPLineReaderImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NNTPLineReaderImpl.java 2 Oct 2002 09:53:38 -0000 1.5
+++ NNTPLineReaderImpl.java 12 Jan 2003 22:38:31 -0000 1.6
@@ -13,7 +13,7 @@
import java.io.IOException;
/**
- * Reads and translates client data. After this translation,
+ * Reads and translates client data. After this translation,
* the data can be streamed into server repository.
* Handles Dot Stuffing.
*
1.12 +2 -2 jakarta-james/src/java/org/apache/james/nntpserver/repository/NNTPRepositoryImpl.java
Index: NNTPRepositoryImpl.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/nntpserver/repository/NNTPRepositoryImpl.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- NNTPRepositoryImpl.java 26 Oct 2002 04:15:29 -0000 1.11
+++ NNTPRepositoryImpl.java 12 Jan 2003 22:38:31 -0000 1.12
@@ -38,7 +38,7 @@
*
* @author Harmeet Bedi <ha...@kodemuse.com>
*/
-public class NNTPRepositoryImpl extends AbstractLogEnabled
+public class NNTPRepositoryImpl extends AbstractLogEnabled
implements NNTPRepository, Contextualizable, Configurable, Initializable
{
/**
@@ -378,7 +378,7 @@
*
* TODO: This method doesn't properly implement the Avalon lifecycle.
*/
- private NNTPSpooler createSpooler()
+ private NNTPSpooler createSpooler()
throws ConfigurationException {
String className = "org.apache.james.nntpserver.repository.NNTPSpooler";
Configuration spoolerConfiguration = configuration.getChild("spool");
1.12 +2 -2 jakarta-james/src/java/org/apache/james/nntpserver/repository/NNTPSpooler.java
Index: NNTPSpooler.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/nntpserver/repository/NNTPSpooler.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- NNTPSpooler.java 26 Oct 2002 04:15:29 -0000 1.11
+++ NNTPSpooler.java 12 Jan 2003 22:38:31 -0000 1.12
@@ -31,7 +31,7 @@
*
* @author Harmeet Bedi <ha...@kodemuse.com>
*/
-class NNTPSpooler extends AbstractLogEnabled
+class NNTPSpooler extends AbstractLogEnabled
implements Contextualizable, Configurable, Initializable {
/**
@@ -62,7 +62,7 @@
/**
* @see org.apache.avalon.framework.context.Contextualizable#contextualize(Context)
*/
- public void contextualize(final Context context)
+ public void contextualize(final Context context)
throws ContextException {
this.context = context;
}
1.23 +5 -5 jakarta-james/src/java/org/apache/james/pop3server/POP3Handler.java
Index: POP3Handler.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/pop3server/POP3Handler.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- POP3Handler.java 7 Jan 2003 22:42:50 -0000 1.22
+++ POP3Handler.java 12 Jan 2003 22:38:32 -0000 1.23
@@ -91,7 +91,7 @@
private MailRepository userInbox;
/**
- * The thread executing this handler
+ * The thread executing this handler
*/
private Thread handlerThread;
@@ -133,7 +133,7 @@
*/
private Vector userMailbox = new Vector();
- private Vector backupUserMailbox; // A snapshot list representing the set of
+ private Vector backupUserMailbox; // A snapshot list representing the set of
// emails in the user's inbox at the beginning
// of the transaction
@@ -373,7 +373,7 @@
* Implements a "stat". If the handler is currently in
* a transaction state, this amounts to a rollback of the
* mailbox contents to the beginning of the transaction.
- * This method is also called when first entering the
+ * This method is also called when first entering the
* transaction state to initialize the handler copies of the
* user inbox.
*
@@ -1017,7 +1017,7 @@
}
/**
- * This method logs at a "DEBUG" level the response string that
+ * This method logs at a "DEBUG" level the response string that
* was sent to the POP3 client. The method is provided largely
* as syntactic sugar to neaten up the code base. It is declared
* private and final to encourage compiler inlining.
@@ -1044,7 +1044,7 @@
}
/**
- * Write a response string. The response is also logged.
+ * Write a response string. The response is also logged.
* Used for multi-line responses.
*
* @param responseString the response string sent to the client
1.24 +6 -6 jakarta-james/src/java/org/apache/james/remotemanager/RemoteManagerHandler.java
Index: RemoteManagerHandler.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/remotemanager/RemoteManagerHandler.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- RemoteManagerHandler.java 6 Jan 2003 17:08:46 -0000 1.23
+++ RemoteManagerHandler.java 12 Jan 2003 22:38:32 -0000 1.24
@@ -148,7 +148,7 @@
private PrintWriter out;
/**
- * The thread executing this handler
+ * The thread executing this handler
*/
private Thread handlerThread;
@@ -363,8 +363,8 @@
}
/**
- * <p>This method parses and processes RemoteManager commands read off the
- * wire in handleConnection. It returns true if expecting additional
+ * <p>This method parses and processes RemoteManager commands read off the
+ * wire in handleConnection. It returns true if expecting additional
* commands, false otherwise.</p>
*
* @param command the raw command string passed in over the socket
@@ -895,7 +895,7 @@
}
/**
- * This method logs at a "DEBUG" level the response string that
+ * This method logs at a "DEBUG" level the response string that
* was sent to the RemoteManager client. The method is provided largely
* as syntactic sugar to neaten up the code base. It is declared
* private and final to encourage compiler inlining.
@@ -922,7 +922,7 @@
}
/**
- * Write a response string. The response is also logged.
+ * Write a response string. The response is also logged.
* Used for multi-line responses.
*
* @param responseString the response string sent to the client
1.8 +5 -5 jakarta-james/src/java/org/apache/james/security/DigestUtil.java
Index: DigestUtil.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/security/DigestUtil.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DigestUtil.java 6 Jan 2003 17:08:46 -0000 1.7
+++ DigestUtil.java 12 Jan 2003 22:38:32 -0000 1.8
@@ -38,12 +38,12 @@
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")
@@ -58,7 +58,7 @@
file = true;
}
}
-
+
if (file) {
digestFile(args[args.length - 1], alg);
return ;
@@ -77,7 +77,7 @@
* Print the command line usage string.
*/
public static void printUsage() {
- System.out.println("Usage: "
+ System.out.println("Usage: "
+ "java org.apache.james.security.DigestUtil"
+ " [-alg algorithm]"
+ " [-file] filename|string");
1.5 +2 -2 jakarta-james/src/java/org/apache/james/services/DNSServer.java
Index: DNSServer.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/services/DNSServer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DNSServer.java 16 Aug 2002 22:00:06 -0000 1.4
+++ DNSServer.java 12 Jan 2003 22:38:32 -0000 1.5
@@ -11,7 +11,7 @@
/**
* Provides abstraction for DNS resolutions. The interface is Mail specific.
- * It may be a good idea to make the interface more generic or expose
+ * It may be a good idea to make the interface more generic or expose
* commonly needed DNS methods.
*
* @author Harmeet <ha...@kodemuse.com>
@@ -29,7 +29,7 @@
* <p>TODO: Change this to a list, as not all collections are sortable</p>
*
* @param hostname the hostname to check
- * @return collection of strings representing MX record values.
+ * @return collection of strings representing MX record values.
*/
Collection findMXRecords(String hostname);
}
1.7 +2 -2 jakarta-james/src/java/org/apache/james/services/JamesUser.java
Index: JamesUser.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/services/JamesUser.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JamesUser.java 6 Jan 2003 17:08:46 -0000 1.6
+++ JamesUser.java 12 Jan 2003 22:38:32 -0000 1.7
@@ -36,7 +36,7 @@
*/
void setForwarding(boolean forward);
- /**
+ /**
* Return true if mail for this user should be forwarded
*/
boolean getForwarding();
1.14 +3 -3 jakarta-james/src/java/org/apache/james/services/MailServer.java
Index: MailServer.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/services/MailServer.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- MailServer.java 6 Jan 2003 17:08:46 -0000 1.13
+++ MailServer.java 12 Jan 2003 22:38:32 -0000 1.14
@@ -73,14 +73,14 @@
*/
void sendMail(Mail mail)
throws MessagingException;
-
+
/**
* Pass a MimeMessage to this MailServer for processing
* @param message the message
* @throws MessagingException
*/
void sendMail(MimeMessage message)
- throws MessagingException;
+ throws MessagingException;
/**
* Retrieve the primary mailbox for userName. For POP3 style stores this
1.8 +4 -4 jakarta-james/src/java/org/apache/james/services/MailStore.java
Index: MailStore.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/services/MailStore.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MailStore.java 6 Jan 2003 15:53:01 -0000 1.7
+++ MailStore.java 12 Jan 2003 22:38:32 -0000 1.8
@@ -17,7 +17,7 @@
* <br><repository destinationURL="file://path-to-root-dir-for-repository"
* <br> type="MAIL">
* <br></repository>
- * <p>This configuration, including any included child elements, is used to
+ * <p>This configuration, including any included child elements, is used to
* configure the returned component.
*
* @author Federico Barbieri <sc...@pop.systemy.it>
@@ -25,7 +25,7 @@
*
* @version This is $Revision$
*/
-public interface MailStore
+public interface MailStore
extends Store {
/**
@@ -41,4 +41,4 @@
SpoolRepository getInboundSpool();
}
-
+
1.8 +4 -4 jakarta-james/src/java/org/apache/james/services/UsersStore.java
Index: UsersStore.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/services/UsersStore.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- UsersStore.java 6 Jan 2003 15:53:01 -0000 1.7
+++ UsersStore.java 12 Jan 2003 22:38:32 -0000 1.8
@@ -14,20 +14,20 @@
/**
* Interface for Phoenix blocks to access a store of Users. A UserStore
* contains one or more UserRepositories. Multiple UserRepositories may or may
- * not have overlapping membership.
+ * not have overlapping membership.
*
* @version 1.0.0, 24/04/1999
* @author Federico Barbieri <sc...@pop.systemy.it>
* @author <a href="mailto:charles@benett1.demon.co.uk">Charles Benett</a>
*/
-public interface UsersStore
+public interface UsersStore
{
/**
* The component role used by components implementing this service
*/
String ROLE = "org.apache.james.services.UsersStore";
- /**
+ /**
* Get the repository, if any, whose name corresponds to
* the argument parameter
*
@@ -37,7 +37,7 @@
*/
UsersRepository getRepository( String name );
- /**
+ /**
* Yield an <code>Iterator</code> over the set of repository
* names managed internally by this store.
*
1.5 +1 -1 jakarta-james/src/java/org/apache/james/smtpserver/SizeLimitedInputStream.java
Index: SizeLimitedInputStream.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/smtpserver/SizeLimitedInputStream.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SizeLimitedInputStream.java 15 Aug 2002 21:37:34 -0000 1.4
+++ SizeLimitedInputStream.java 12 Jan 2003 22:38:32 -0000 1.5
@@ -10,7 +10,7 @@
import java.io.IOException;
import java.io.InputStream;
-/**
+/**
* Wraps an underlying input stream, limiting the allowable size
* of incoming data. The size limit is configured in the conf file,
* and when the limit is reached, a MessageSizeException is thrown.
1.14 +15 -15 jakarta-james/src/java/org/apache/james/transport/LinearProcessor.java
Index: LinearProcessor.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/LinearProcessor.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- LinearProcessor.java 7 Jan 2003 11:57:25 -0000 1.13
+++ LinearProcessor.java 12 Jan 2003 22:38:32 -0000 1.14
@@ -52,7 +52,7 @@
*
* Note that the 'onerror' attribute is not yet supported.
*/
-public class LinearProcessor
+public class LinearProcessor
extends AbstractLogEnabled
implements Initializable, Disposable {
@@ -133,7 +133,7 @@
*
* <p>It is an essential part of the contract of the LinearProcessor
* that a particular matcher/mailet combination be used to
- * terminate the processor chain. This is done by calling the
+ * terminate the processor chain. This is done by calling the
* closeProcessorList method.</p>
*
* <p>Once the closeProcessorList has been called any subsequent
@@ -179,12 +179,12 @@
public Collection match(Mail mail) {
return mail.getRecipients();
}
-
+
public String getMatcherInfo() {
return TERMINATING_MATCHER_NAME;
}
};
- Mailet terminatingMailet =
+ Mailet terminatingMailet =
new GenericMailet() {
public void service(Mail mail) {
if (!(Mail.ERROR.equals(mail.getState()))) {
@@ -200,11 +200,11 @@
}
mail.setState(Mail.GHOST);
}
-
+
public String getMailetInfo() {
return getMailetName();
}
-
+
public String getMailetName() {
return TERMINATING_MAILET_NAME;
}
@@ -221,11 +221,11 @@
*
* <p>If the matcher/mailet lists have not been closed by a call to the closeProcessorLists
* method then a call to this method will result in an <code>IllegalStateException</code>.
- * The end of the matcher/mailet chain must be a matcher that matches all mails and
- * a mailet that sets every mail to GHOST status. This is necessary to ensure that
+ * The end of the matcher/mailet chain must be a matcher that matches all mails and
+ * a mailet that sets every mail to GHOST status. This is necessary to ensure that
* mails are removed from the spool in an orderly fashion. The closeProcessorLists method
* ensures this.</p>
- *
+ *
* @param mail the new mail to be processed
*
* @throws IllegalStateException when this method is called before the processor lists have been closed
@@ -252,7 +252,7 @@
// It is a List of Mail objects at each array spot as multiple Mail
// objects could be at the same stage.
//
- // Note that every Mail object in this array will either be the
+ // Note that every Mail object in this array will either be the
// original Mail object passed in, or a result of this method's
// (and hence this thread's) processing.
@@ -282,8 +282,8 @@
// Please note that the presence of the terminating mailet at the end
// of the chain is critical to the proper operation
// of the LinearProcessor code. If this mailet is not placed
- // at the end of the chain with a terminating matcher, there is a
- // potential for configuration or implementation errors to
+ // at the end of the chain with a terminating matcher, there is a
+ // potential for configuration or implementation errors to
// lead to mails trapped in the spool. This matcher/mailet
// combination is added when the closeProcessorList method
// is called.
@@ -380,8 +380,8 @@
mail = null;
continue;
}
- // This was just set to another state requiring further processing...
- // Store this back in the spool and it will get picked up and
+ // This was just set to another state requiring further processing...
+ // Store this back in the spool and it will get picked up and
// run in that processor
spool.store(mail);
mail = null;
@@ -399,7 +399,7 @@
* Create a unique new primary key name.
*
* @param mail the mail to use as the basis for the new mail name
- *
+ *
* @return a new name
*/
private String newName(Mail mail) {
1.2 +3 -3 jakarta-james/src/java/org/apache/james/transport/Loader.java
Index: Loader.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/Loader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Loader.java 8 Jan 2003 16:53:58 -0000 1.1
+++ Loader.java 12 Jan 2003 22:38:32 -0000 1.2
@@ -21,7 +21,7 @@
import org.apache.avalon.phoenix.BlockContext;
/**
* @author <A href="mailto:danny@apache.org">Danny Angus</a>
- *
+ *
* $Id$
*/
public class Loader implements Contextualizable {
@@ -52,7 +52,7 @@
public void setLogger(Logger logger) {
this.logger = logger;
}
-
+
protected void getPackages(Configuration conf, String packageType)
throws ConfigurationException {
packages = new Vector();
1.11 +3 -3 jakarta-james/src/java/org/apache/james/transport/MatchLoader.java
Index: MatchLoader.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/MatchLoader.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- MatchLoader.java 8 Jan 2003 16:53:58 -0000 1.10
+++ MatchLoader.java 12 Jan 2003 22:38:32 -0000 1.11
@@ -32,8 +32,8 @@
getPackages(conf,MATCHER_PACKAGE);
configureMailetClassLoader();
}
-
-
+
+
/**
* Get a new Matcher with the specified name acting
* in the specified context.
@@ -81,5 +81,5 @@
throw new MailetException(exceptionBuffer.toString(), e);
}
}
-
+
}
1.3 +4 -4 jakarta-james/src/java/org/apache/james/transport/Resources.java
Index: Resources.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/Resources.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Resources.java 17 Aug 2002 18:43:55 -0000 1.2
+++ Resources.java 12 Jan 2003 22:38:32 -0000 1.3
@@ -19,7 +19,7 @@
//public static final String SERVER_NAMES = "SERVER_NAMES";
/**
- * Don't know what this is supposed to be.
+ * Don't know what this is supposed to be.
*
* @deprecated this is unused
*/
@@ -29,21 +29,21 @@
//public static final String POSTMASTER = "POSTMASTER";
/**
- * Don't know what this is supposed to be.
+ * Don't know what this is supposed to be.
*
* @deprecated this is unused
*/
public static final String MAIL_SERVER = "MAIL_SERVER";
/**
- * Don't know what this is supposed to be.
+ * Don't know what this is supposed to be.
*
* @deprecated this is unused
*/
public static final String TRANSPORT = "TRANSPORT";
/**
- * Don't know what this is supposed to be.
+ * Don't know what this is supposed to be.
*
* @deprecated this is unused
*/
1.5 +3 -3 jakarta-james/src/java/org/apache/james/transport/mailets/AddFooter.java
Index: AddFooter.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/AddFooter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AddFooter.java 19 Aug 2002 18:57:07 -0000 1.4
+++ AddFooter.java 12 Jan 2003 22:38:32 -0000 1.5
@@ -126,7 +126,7 @@
*
* @param part the MimePart to attach
*
- * @throws MessagingException
+ * @throws MessagingException
* @throws IOException
*/
protected void addToText(MimePart part) throws MessagingException, IOException {
@@ -143,7 +143,7 @@
*
* @param part the MimePart to attach
*
- * @throws MessagingException
+ * @throws MessagingException
* @throws IOException
*/
protected void addToHTML(MimePart part) throws MessagingException, IOException {
@@ -157,7 +157,7 @@
*
* @param part the MimePart to attach
*
- * @throws MessagingException
+ * @throws MessagingException
* @throws IOException
*/
protected void attachFooter(MimePart part) throws MessagingException, IOException {
1.2 +8 -8 jakarta-james/src/java/org/apache/james/transport/mailets/AddHabeasWarrantMark.java
Index: AddHabeasWarrantMark.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/AddHabeasWarrantMark.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AddHabeasWarrantMark.java 2 Oct 2002 05:57:16 -0000 1.1
+++ AddHabeasWarrantMark.java 12 Jan 2003 22:38:32 -0000 1.2
@@ -23,7 +23,7 @@
* e-mail messages. Each James Administrator is responsible for
* ensuring that James is configured to attach the Habeas Warrant Mark
* only to e-mail covered by a suitable license received from Habeas.
- *
+ *
* Because the Habeas Warrant Mark is copyright material, I have asked
* for and received the following explicit statement from Habeas:
*
@@ -34,7 +34,7 @@
* Subject: RE: Habeas and Apache James
*
* Dear Noel,
- *
+ *
* > FURTHERMORE, if James is to be capable of sending Habeas SWE, I need
* > to write a Mailet that attaches the headers. As with any MTA, it
* > would be up to the administrator to properly configure James and make
@@ -43,18 +43,18 @@
* > Mailet, especially since it attaches the Habeas Warrant Mark. For my
* > own protection, please show me why such authorization is unnecessary,
* > send me a digitally signed e-mail, or FAX a signed authorization
- *
- * You do not yourself need the authorization to build the functionality
- * into the [mailet]; what one needs authorization, in the form of a
+ *
+ * You do not yourself need the authorization to build the functionality
+ * into the [mailet]; what one needs authorization, in the form of a
* license, for, is to use the mark *in headers*, in outgoing email.
- * However, please let me know if you would like something more
+ * However, please let me know if you would like something more
* formal, and I can try to have something faxed to you.
- *
+ *
* > The Mailet docs would reference the Habeas website, and inform
* > administrators that in order to USE the mailet, they need to ensure
* > that they have whatever licenses are required from you as appropriate
* > to your licensing terms.
- *
+ *
* That's absolutely perfect!
* -----------------------------------
*
1.10 +2 -2 jakarta-james/src/java/org/apache/james/transport/mailets/AvalonListserv.java
Index: AvalonListserv.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/AvalonListserv.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- AvalonListserv.java 7 Jan 2003 11:06:34 -0000 1.9
+++ AvalonListserv.java 12 Jan 2003 22:38:32 -0000 1.10
@@ -19,7 +19,7 @@
/**
* MailingListServer capability.
- *
+ *
* <p>Requires a configuration element in the config.xml file of the form:
* <br> <mailet match="RecipientIs=LIST-ADDRESS" class="AvalonListserv">
* <br> <repositoryName>LIST-NAME</repositoryName>
1.6 +1 -1 jakarta-james/src/java/org/apache/james/transport/mailets/Null.java
Index: Null.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/Null.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Null.java 19 Aug 2002 18:57:07 -0000 1.5
+++ Null.java 12 Jan 2003 22:38:32 -0000 1.6
@@ -18,7 +18,7 @@
public class Null extends GenericMailet {
/**
- * Set this mail to GHOST state, indicating that no further processing
+ * Set this mail to GHOST state, indicating that no further processing
* should take place.
*
* @param mail the mail to process
1.20 +2 -2 jakarta-james/src/java/org/apache/james/transport/mailets/Redirect.java
Index: Redirect.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/Redirect.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Redirect.java 7 Jan 2003 11:06:34 -0000 1.19
+++ Redirect.java 12 Jan 2003 22:38:32 -0000 1.20
@@ -551,9 +551,9 @@
if(reply.getHeader(RFC2822Headers.DATE) == null) {
reply.setHeader(RFC2822Headers.DATE, rfc822DateFormat.format(new Date()));
}
-
+
//
-
+
if(replyTo != null) {
InternetAddress[] iart = new InternetAddress[1];
iart[0] = replyTo.toInternetAddress();
1.39 +5 -5 jakarta-james/src/java/org/apache/james/transport/mailets/RemoteDelivery.java
Index: RemoteDelivery.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/RemoteDelivery.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- RemoteDelivery.java 12 Jan 2003 20:44:09 -0000 1.38
+++ RemoteDelivery.java 12 Jan 2003 22:38:32 -0000 1.39
@@ -80,7 +80,7 @@
private String gatewayServer = null; // the server to send all email to
private String gatewayPort = null; //the port of the gateway server to send all email to
private Collection deliveryThreads = new Vector();
-
+
private volatile boolean destroyed = false; //Flag that the run method will check and end itself if set to true
/**
@@ -111,8 +111,8 @@
}
gatewayServer = getInitParameter("gateway");
gatewayPort = getInitParameter("gatewayPort");
-
-
+
+
outgoing = getMailetContext().getMailSpool(getInitParameter("outgoing"));
//Start up a number of threads
@@ -449,7 +449,7 @@
* @return org.apache.mailet.MessageContainer
*/
public void service(Mail mail) throws AddressException {
-
+
// Do I want to give the internal key, or the message's Message ID
if (isDebug) {
log("Remotely delivering mail " + mail.getName());
1.12 +4 -4 jakarta-james/src/java/org/apache/james/transport/mailets/ToRepository.java
Index: ToRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/mailets/ToRepository.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ToRepository.java 7 Jan 2003 12:03:05 -0000 1.11
+++ ToRepository.java 12 Jan 2003 22:38:33 -0000 1.12
@@ -51,13 +51,13 @@
// Ignore exception, default to false
}
-
+
try {
repository = getMailetContext().getMailRepository(repositoryPath);
} catch (MessagingException e) {
log("Initialisation failed can't get repository "+repositoryPath);
}
-
+
}
@@ -67,7 +67,7 @@
* @param mail the mail to process
*/
public void service(Mail mail) {
-
+
StringBuffer logBuffer =
new StringBuffer(160)
.append("Storing mail ")
1.3 +2 -2 jakarta-james/src/java/org/apache/james/transport/matchers/FetchedFrom.java
Index: FetchedFrom.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/matchers/FetchedFrom.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FetchedFrom.java 27 Sep 2002 14:08:00 -0000 1.2
+++ FetchedFrom.java 12 Jan 2003 22:38:33 -0000 1.3
@@ -19,7 +19,7 @@
* This is used to match all mail fetched from a specific pop account.
* Once the condition is met the header is stripped from the message to prevent looping if the mail is re-inserted into the spool.
* @author <A href="mailto:danny@apache.org">Danny Angus</a>
- *
+ *
* $Id$
*/
1.2 +13 -13 jakarta-james/src/java/org/apache/james/transport/matchers/HasHabeasWarrantMark.java
Index: HasHabeasWarrantMark.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/matchers/HasHabeasWarrantMark.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HasHabeasWarrantMark.java 2 Oct 2002 05:57:16 -0000 1.1
+++ HasHabeasWarrantMark.java 12 Jan 2003 22:38:33 -0000 1.2
@@ -36,7 +36,7 @@
* Subject: RE: Habeas and Apache James
*
* Dear Noel,
- *
+ *
* > I guess that since your Warrant Mark is copyright, I should ask for
* > something from you to explicitly authorize that Hebeas will permit
* > this code to be included and distributed as part of Apache James
@@ -44,9 +44,9 @@
* > of the Habeas Warrant Mark for filtering is not restricted, but I
* > would like something to confirm that, so that Apache will be happy.
*
- * I can hereby confirm to you that there is no license necessary in
- * order to use the Habeas mark for filtering. That said, however, we
- * do insist that it not ever be used as a basis for rejecting email which
+ * I can hereby confirm to you that there is no license necessary in
+ * order to use the Habeas mark for filtering. That said, however, we
+ * do insist that it not ever be used as a basis for rejecting email which
* bears the Habeas mark.
* -----------------------------------
*
@@ -57,15 +57,15 @@
{
public static final String[][] warrantMark =
{
- { "X-Habeas-SWE-1", "winter into spring" },
- { "X-Habeas-SWE-2", "brightly anticipated" },
- { "X-Habeas-SWE-3", "like Habeas SWE (tm)" },
- { "X-Habeas-SWE-4", "Copyright 2002 Habeas (tm)" },
- { "X-Habeas-SWE-5", "Sender Warranted Email (SWE) (tm). The sender of this" },
- { "X-Habeas-SWE-6", "email in exchange for a license for this Habeas" },
- { "X-Habeas-SWE-7", "warrant mark warrants that this is a Habeas Compliant" },
- { "X-Habeas-SWE-8", "Message (HCM) and not spam. Please report use of this" },
- { "X-Habeas-SWE-9", "mark in spam to <http://www.habeas.com/report/>." },
+ { "X-Habeas-SWE-1", "winter into spring" },
+ { "X-Habeas-SWE-2", "brightly anticipated" },
+ { "X-Habeas-SWE-3", "like Habeas SWE (tm)" },
+ { "X-Habeas-SWE-4", "Copyright 2002 Habeas (tm)" },
+ { "X-Habeas-SWE-5", "Sender Warranted Email (SWE) (tm). The sender of this" },
+ { "X-Habeas-SWE-6", "email in exchange for a license for this Habeas" },
+ { "X-Habeas-SWE-7", "warrant mark warrants that this is a Habeas Compliant" },
+ { "X-Habeas-SWE-8", "Message (HCM) and not spam. Please report use of this" },
+ { "X-Habeas-SWE-9", "mark in spam to <http://www.habeas.com/report/>." },
};
public Collection match(Mail mail) throws MessagingException
1.4 +1 -1 jakarta-james/src/java/org/apache/james/transport/matchers/RemoteAddrInNetwork.java
Index: RemoteAddrInNetwork.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/matchers/RemoteAddrInNetwork.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RemoteAddrInNetwork.java 6 Aug 2002 03:01:57 -0000 1.3
+++ RemoteAddrInNetwork.java 12 Jan 2003 22:38:33 -0000 1.4
@@ -21,7 +21,7 @@
/**
* Checks the IP address of the sending server against a comma-
* delimited list of IP addresses or domain names.
- * <P>Networks should be indicated with a wildcard *, e.g. 192.168.*
+ * <P>Networks should be indicated with a wildcard *, e.g. 192.168.*
* <br>Note: The wildcard can go at any level, the matcher will match if the
* sending host's IP address (as a String based on the octet representation)
* starts with the String indicated in the configuration file, excluding the
1.6 +1 -1 jakarta-james/src/java/org/apache/james/transport/matchers/SenderInFakeDomain.java
Index: SenderInFakeDomain.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/transport/matchers/SenderInFakeDomain.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SenderInFakeDomain.java 23 Sep 2002 17:58:51 -0000 1.5
+++ SenderInFakeDomain.java 12 Jan 2003 22:38:33 -0000 1.6
@@ -14,7 +14,7 @@
/**
* Does a DNS lookup (MX and A/CNAME records) on the sender's domain. If
- * there are no entries, the domain is considered fake and the match is
+ * there are no entries, the domain is considered fake and the match is
* successful.
*
* @author Serge Knystautas <se...@lokitech.com>
1.17 +28 -28 jakarta-james/src/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java
Index: AbstractJdbcUsersRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/userrepository/AbstractJdbcUsersRepository.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- AbstractJdbcUsersRepository.java 6 Jan 2003 17:08:48 -0000 1.16
+++ AbstractJdbcUsersRepository.java 12 Jan 2003 22:38:33 -0000 1.17
@@ -41,12 +41,12 @@
/**
* An abstract base class for creating UserRepository implementations
* which use a database for persistence.
- *
+ *
* To implement a new UserRepository using by extending this class,
* you need to implement the 3 abstract methods defined below,
* and define the required SQL statements in an SQLResources
* file.
- *
+ *
* The SQL statements used by this implementation are:
* <TABLE>
* <TH><TD><B>Required</B></TD></TH>
@@ -58,7 +58,7 @@
* <TH><TD><B>Optional</B></TD></TH>
* <TR><TD>selectByLowercaseName</TD><TD>Select a user by name (case-insensitive lowercase).</TD></TR>
* </TABLE>
- *
+ *
* @author Darrell DeBoer <dd...@bigdaz.com>
*/
public abstract class AbstractJdbcUsersRepository extends AbstractUsersRepository
@@ -81,11 +81,11 @@
// Fetches all Users from the db.
private String m_getUsersSql;
-
+
// This fetch a user by name, ensuring case-insensitive matching.
private String m_userByNameCaseInsensitiveSql;
- // Insert, update and delete sql statements are not guaranteed
+ // Insert, update and delete sql statements are not guaranteed
// to be case-insensitive; this is handled in code.
private String m_insertUserSql;
private String m_updateUserSql;
@@ -121,7 +121,7 @@
getLogger().debug( logBuffer.toString() );
}
- m_datasources =
+ m_datasources =
(DataSourceSelector)componentManager.lookup( DataSourceSelector.ROLE );
}
@@ -142,7 +142,7 @@
* </repository>
* </pre>
*/
- public void configure(Configuration configuration) throws ConfigurationException
+ public void configure(Configuration configuration) throws ConfigurationException
{
StringBuffer logBuffer = null;
if (getLogger().isDebugEnabled()) {
@@ -153,7 +153,7 @@
getLogger().debug( logBuffer.toString() );
}
- // Parse the DestinationURL for the name of the datasource,
+ // Parse the DestinationURL for the name of the datasource,
// the table to use, and the (optional) repository Key.
String destUrl = configuration.getAttribute("destinationURL");
// normalise the destination, to simplify processing.
@@ -196,7 +196,7 @@
.append("'");
getLogger().debug(logBuffer.toString());
}
-
+
// Get the SQL file location
m_sqlFileName = configuration.getChild("sqlFile", true).getValue();
if (!m_sqlFileName.startsWith("file://")) {
@@ -219,13 +219,13 @@
* <p>Initialises the JDBC repository.</p>
* <p>1) Tests the connection to the database.</p>
* <p>2) Loads SQL strings from the SQL definition file,
- * choosing the appropriate SQL for this connection,
+ * choosing the appropriate SQL for this connection,
* and performing parameter substitution,</p>
* <p>3) Initialises the database with the required tables, if necessary.</p>
- *
+ *
* @throws Exception if an error occurs
*/
- public void initialize() throws Exception
+ public void initialize() throws Exception
{
StringBuffer logBuffer = null;
if (getLogger().isDebugEnabled()) {
@@ -272,7 +272,7 @@
}
SqlResources sqlStatements = new SqlResources();
- sqlStatements.init(sqlFile, this.getClass().getName(),
+ sqlStatements.init(sqlFile, this.getClass().getName(),
conn, m_sqlParameters);
// Create the SQL Strings to use for this table.
@@ -281,7 +281,7 @@
// Get a user by lowercase name. (optional)
// If not provided, the entire list is iterated to find a user.
- m_userByNameCaseInsensitiveSql =
+ m_userByNameCaseInsensitiveSql =
sqlStatements.getSqlString("selectByLowercaseName");
// Insert, update and delete are not guaranteed to be case-insensitive
@@ -296,9 +296,9 @@
// Check if the required table exists. If not, create it.
// The table name is defined in the SqlResources.
String tableName = sqlStatements.getSqlString("tableName", true);
-
+
// Need to ask in the case that identifiers are stored, ask the DatabaseMetaInfo.
- // NB this should work, but some drivers (eg mm MySQL)
+ // NB this should work, but some drivers (eg mm MySQL)
// don't return the right details, hence the hackery below.
/*
String tableName = m_tableName;
@@ -311,7 +311,7 @@
*/
// Try UPPER, lower, and MixedCase, to see if the table is there.
- if (! theJDBCUtil.tableExists(dbMetaData, tableName))
+ if (! theJDBCUtil.tableExists(dbMetaData, tableName))
{
// Users table doesn't exist - create it.
PreparedStatement createStatement = null;
@@ -335,7 +335,7 @@
getLogger().debug("Using table: " + tableName);
}
}
-
+
}
finally {
theJDBCUtil.closeJDBCConnection( conn );
@@ -357,7 +357,7 @@
ResultSet rsUsers = null;
try {
// Get a ResultSet containing all users.
- getUsersStatement =
+ getUsersStatement =
conn.prepareStatement(m_getUsersSql);
rsUsers = getUsersStatement.executeQuery();
@@ -393,7 +393,7 @@
// Insert into the database.
try {
// Get a PreparedStatement for the insert.
- addUserStatement =
+ addUserStatement =
conn.prepareStatement(m_insertUserSql);
setUserForInsertStatement(user, addUserStatement);
@@ -500,7 +500,7 @@
while ( rsUsers.next() ) {
User rowUser = readUserFromResultSet(rsUsers);
String actualName = rowUser.getUserName();
-
+
// Check case before we assume it's the right one.
if ( ignoreCase || actualName.equals(name) ) {
user = rowUser;
@@ -526,7 +526,7 @@
* Subclass implementations of this method must have knowledge of the fields
* presented by the "select" and "selectByLowercaseName" SQL statements.
* These implemenations may generate a subclass-specific User instance.
- *
+ *
* @param rsUsers A ResultSet with a User record in the current row.
* @return A User instance
* @throws SQLException
@@ -536,18 +536,18 @@
throws SQLException;
/**
- * Set parameters of a PreparedStatement object with
+ * Set parameters of a PreparedStatement object with
* property values from a User instance.
* Implementations of this method have knowledge of the parameter
* ordering of the "insert" SQL statement definition.
- *
+ *
* @param user a User instance, which should be an implementation class which
* is handled by this Repostory implementation.
* @param userInsert a PreparedStatement initialised with SQL taken from the "insert" SQL definition.
* @throws SQLException
* if an exception occurs while setting parameter values.
*/
- protected abstract void setUserForInsertStatement(User user,
+ protected abstract void setUserForInsertStatement(User user,
PreparedStatement userInsert)
throws SQLException;
@@ -556,14 +556,14 @@
* property values from a User instance.
* Implementations of this method have knowledge of the parameter
* ordering of the "update" SQL statement definition.
- *
+ *
* @param user a User instance, which should be an implementation class which
* is handled by this Repostory implementation.
* @param userUpdate a PreparedStatement initialised with SQL taken from the "update" SQL definition.
* @throws SQLException
* if an exception occurs while setting parameter values.
*/
- protected abstract void setUserForUpdateStatement(User user,
+ protected abstract void setUserForUpdateStatement(User user,
PreparedStatement userUpdate)
throws SQLException;
@@ -583,6 +583,6 @@
"An exception occurred getting a database connection.", sqle);
}
}
-}
+}
1.11 +3 -3 jakarta-james/src/java/org/apache/james/userrepository/AbstractUsersRepository.java
Index: AbstractUsersRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/userrepository/AbstractUsersRepository.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- AbstractUsersRepository.java 6 Jan 2003 15:53:01 -0000 1.10
+++ AbstractUsersRepository.java 12 Jan 2003 22:38:34 -0000 1.11
@@ -18,7 +18,7 @@
/**
* A partial implementation of a Repository to store users.
- * <p>This implements common functionality found in different UsersRespository
+ * <p>This implements common functionality found in different UsersRespository
* implementations, and makes it easier to create new User repositories.</p>
*
* @author Darrell DeBoer <dd...@bigdaz.com>
@@ -119,7 +119,7 @@
if ( containsCaseInsensitive(username) ) {
return false;
}
-
+
doAddUser(user);
return true;
}
@@ -137,7 +137,7 @@
newbie.setPassword( (String) attributes );
addUser(newbie);
} else {
- throw new RuntimeException("Improper use of deprecated method"
+ throw new RuntimeException("Improper use of deprecated method"
+ " - use addUser(User user)");
}
}
1.7 +3 -3 jakarta-james/src/java/org/apache/james/userrepository/DefaultJamesUser.java
Index: DefaultJamesUser.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/userrepository/DefaultJamesUser.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultJamesUser.java 2 Oct 2002 06:12:03 -0000 1.6
+++ DefaultJamesUser.java 12 Jan 2003 22:38:34 -0000 1.7
@@ -19,7 +19,7 @@
* @version $Revision$
*/
-public class DefaultJamesUser
+public class DefaultJamesUser
extends DefaultUser
implements JamesUser, Initializable {
@@ -83,7 +83,7 @@
return forwarding;
}
-
+
/**
* Set the destination address to which mail to this user
* will be forwarded.
1.8 +2 -2 jakarta-james/src/java/org/apache/james/userrepository/DefaultUser.java
Index: DefaultUser.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/userrepository/DefaultUser.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultUser.java 6 Jan 2003 15:53:01 -0000 1.7
+++ DefaultUser.java 12 Jan 2003 22:38:34 -0000 1.8
@@ -64,7 +64,7 @@
}
/**
- * Method to verify passwords.
+ * Method to verify passwords.
*
* @param pass the String that is claimed to be the password for this user
* @return true if the hash of pass with the current algorithm matches
1.5 +12 -12 jakarta-james/src/java/org/apache/james/userrepository/DefaultUsersJdbcRepository.java
Index: DefaultUsersJdbcRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/userrepository/DefaultUsersJdbcRepository.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultUsersJdbcRepository.java 6 Jan 2003 15:53:01 -0000 1.4
+++ DefaultUsersJdbcRepository.java 12 Jan 2003 22:38:34 -0000 1.5
@@ -20,20 +20,20 @@
* Although this repository can handle subclasses of DefaultUser,
* like <CODE>DefaultJamesUser</CODE>, only properties from
* the DefaultUser class are persisted.
- *
+ *
* @author Darrell DeBoer <dd...@bigdaz.com>
*/
public class DefaultUsersJdbcRepository extends AbstractJdbcUsersRepository
{
/**
* Reads properties for a User from an open ResultSet.
- *
+ *
* @param rsUsers A ResultSet with a User record in the current row.
* @return A User instance
* @throws SQLException
* if an exception occurs reading from the ResultSet
*/
- protected User readUserFromResultSet(ResultSet rsUsers) throws SQLException
+ protected User readUserFromResultSet(ResultSet rsUsers) throws SQLException
{
// Get the username, and build a DefaultUser with it.
String username = rsUsers.getString(1);
@@ -44,18 +44,18 @@
}
/**
- * Set parameters of a PreparedStatement object with
+ * Set parameters of a PreparedStatement object with
* property values from a User instance.
- *
+ *
* @param user a User instance, which should be an implementation class which
* is handled by this Repostory implementation.
* @param userInsert a PreparedStatement initialised with SQL taken from the "insert" SQL definition.
* @throws SQLException
* if an exception occurs while setting parameter values.
*/
- protected void setUserForInsertStatement(User user,
- PreparedStatement userInsert)
- throws SQLException
+ protected void setUserForInsertStatement(User user,
+ PreparedStatement userInsert)
+ throws SQLException
{
DefaultUser defUser = (DefaultUser)user;
userInsert.setString(1, defUser.getUserName());
@@ -66,16 +66,16 @@
/**
* Set parameters of a PreparedStatement object with
* property values from a User instance.
- *
+ *
* @param user a User instance, which should be an implementation class which
* is handled by this Repostory implementation.
* @param userUpdate a PreparedStatement initialised with SQL taken from the "update" SQL definition.
* @throws SQLException
* if an exception occurs while setting parameter values.
*/
- protected void setUserForUpdateStatement(User user,
- PreparedStatement userUpdate)
- throws SQLException
+ protected void setUserForUpdateStatement(User user,
+ PreparedStatement userUpdate)
+ throws SQLException
{
DefaultUser defUser = (DefaultUser)user;
userUpdate.setString(3, defUser.getUserName());
1.8 +13 -13 jakarta-james/src/java/org/apache/james/userrepository/JamesUsersJdbcRepository.java
Index: JamesUsersJdbcRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/userrepository/JamesUsersJdbcRepository.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JamesUsersJdbcRepository.java 6 Jan 2003 15:53:02 -0000 1.7
+++ JamesUsersJdbcRepository.java 12 Jan 2003 22:38:34 -0000 1.8
@@ -17,20 +17,20 @@
/**
* A Jdbc-backed UserRepository which handles User instances
* of the <CODE>DefaultJamesUser</CODE> class, or any superclass.
- *
+ *
* @author Darrell DeBoer <dd...@bigdaz.com>
*/
public class JamesUsersJdbcRepository extends AbstractJdbcUsersRepository
{
/**
* Reads properties for a User from an open ResultSet.
- *
+ *
* @param rsUsers A ResultSet with a User record in the current row.
* @return A User instance
* @throws SQLException
* if an exception occurs reading from the ResultSet
*/
- protected User readUserFromResultSet(ResultSet rsUsers) throws SQLException
+ protected User readUserFromResultSet(ResultSet rsUsers) throws SQLException
{
// Get the column values
String username = rsUsers.getString(1);
@@ -69,17 +69,17 @@
}
/**
- * Set parameters of a PreparedStatement object with
+ * Set parameters of a PreparedStatement object with
* property values from a User instance.
- *
+ *
* @param user a User instance, which should be an implementation class which
* is handled by this Repostory implementation.
* @param userInsert a PreparedStatement initialised with SQL taken from the "insert" SQL definition.
* @throws SQLException
* if an exception occurs while setting parameter values.
*/
- protected void setUserForInsertStatement(User user,
- PreparedStatement userInsert)
+ protected void setUserForInsertStatement(User user,
+ PreparedStatement userInsert)
throws SQLException {
setUserForStatement(user, userInsert, false);
}
@@ -87,15 +87,15 @@
/**
* Set parameters of a PreparedStatement object with
* property values from a User instance.
- *
+ *
* @param user a User instance, which should be an implementation class which
* is handled by this Repostory implementation.
* @param userUpdate a PreparedStatement initialised with SQL taken from the "update" SQL definition.
* @throws SQLException
* if an exception occurs while setting parameter values.
*/
- protected void setUserForUpdateStatement(User user,
- PreparedStatement userUpdate)
+ protected void setUserForUpdateStatement(User user,
+ PreparedStatement userUpdate)
throws SQLException {
setUserForStatement(user, userUpdate, true);
}
@@ -128,11 +128,11 @@
jamesUser = new DefaultJamesUser(aUser.getUserName(),
aUser.getHashedPassword(),
aUser.getHashAlgorithm());
- }
+ }
// Can't handle any other implementations.
else {
- throw new RuntimeException("An unknown implementation of User was " +
- "found. This implementation cannot be " +
+ throw new RuntimeException("An unknown implementation of User was " +
+ "found. This implementation cannot be " +
"persisted to a UsersJDBCRepsitory.");
}
1.6 +9 -9 jakarta-james/src/java/org/apache/james/userrepository/ListUsersJdbcRepository.java
Index: ListUsersJdbcRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/userrepository/ListUsersJdbcRepository.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ListUsersJdbcRepository.java 6 Jan 2003 15:53:02 -0000 1.5
+++ ListUsersJdbcRepository.java 12 Jan 2003 22:38:34 -0000 1.6
@@ -15,16 +15,16 @@
/**
* A very lightweight UserRepository, which persists a list
- * of user names in a database. Password information is not
+ * of user names in a database. Password information is not
* persisted.
- *
+ *
* @author Darrell DeBoer <dd...@bigdaz.com>
*/
public class ListUsersJdbcRepository extends AbstractJdbcUsersRepository
{
/**
* Reads properties for a User from an open ResultSet.
- *
+ *
* @param rsUsers A ResultSet with a User record in the current row.
* @return A User instance
* @throws SQLException
@@ -38,7 +38,7 @@
}
/**
- * Set parameters of a PreparedStatement object with
+ * Set parameters of a PreparedStatement object with
* property values from a User instance.
* @param user a User instance, which should be an implementation class which
* is handled by this Repostory implementation.
@@ -46,8 +46,8 @@
* @throws SQLException
* if an exception occurs while setting parameter values.
*/
- protected void setUserForInsertStatement(User user,
- PreparedStatement userInsert)
+ protected void setUserForInsertStatement(User user,
+ PreparedStatement userInsert)
throws SQLException {
userInsert.setString(1, user.getUserName());
}
@@ -55,15 +55,15 @@
/**
* Set parameters of a PreparedStatement object with
* property values from a User instance.
- *
+ *
* @param user a User instance, which should be an implementation class which
* is handled by this Repostory implementation.
* @param userUpdate a PreparedStatement initialised with SQL taken from the "update" SQL definition.
* @throws SQLException
* if an exception occurs while setting parameter values.
*/
- protected void setUserForUpdateStatement(User user,
- PreparedStatement userUpdate)
+ protected void setUserForUpdateStatement(User user,
+ PreparedStatement userUpdate)
throws SQLException {
throw new UnsupportedOperationException("Can't update a List User - " +
"only has a single attribute.");
1.12 +3 -3 jakarta-james/src/java/org/apache/james/userrepository/UsersFileRepository.java
Index: UsersFileRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/userrepository/UsersFileRepository.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- UsersFileRepository.java 6 Jan 2003 15:53:02 -0000 1.11
+++ UsersFileRepository.java 12 Jan 2003 22:38:34 -0000 1.12
@@ -43,7 +43,7 @@
public class UsersFileRepository
extends AbstractLogEnabled
implements UsersRepository, Component, Configurable, Composable, Initializable {
-
+
/**
* Whether 'deep debugging' is turned on.
*/
@@ -159,7 +159,7 @@
addUser(newbie);
}
else {
- throw new RuntimeException("Improper use of deprecated method"
+ throw new RuntimeException("Improper use of deprecated method"
+ " - use addUser(User user)");
}
}
1.12 +5 -5 jakarta-james/src/java/org/apache/james/userrepository/UsersLDAPRepository.java
Index: UsersLDAPRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/userrepository/UsersLDAPRepository.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- UsersLDAPRepository.java 6 Jan 2003 17:08:49 -0000 1.11
+++ UsersLDAPRepository.java 12 Jan 2003 22:38:34 -0000 1.12
@@ -609,7 +609,7 @@
SearchControls ctls = new SearchControls();
ctls.setReturningAttributes(returnAttrs);
ctls.setSearchScope(SearchControls.SUBTREE_SCOPE);
- StringBuffer filterBuffer =
+ StringBuffer filterBuffer =
new StringBuffer(128)
.append(mailAddressAttr)
.append("=")
@@ -625,7 +625,7 @@
try {
rootCtx = new InitialDirContext(env);
-
+
NamingEnumeration enum = rootCtx.search("", filter, ctls);
if (enum.hasMore()) { // ie User is in Directory
SearchResult sr = (SearchResult)enum.next();
@@ -648,7 +648,7 @@
.append("Problem finding user ")
.append(name)
.append(" for password test.")
- .append(e);
+ .append(e);
getLogger().error(exceptionBuffer.toString());
//e.getMessage();
//e.printStackTrace();
@@ -675,7 +675,7 @@
.append("Attempt to authenticate with incorrect password for ")
.append(name)
.append(" : ")
- .append(ae);
+ .append(ae);
getLogger().error(exceptionBuffer.toString());
//System.out.println(exceptionBuffer.toString());
//System.out.println(ae.getMessage());
@@ -686,7 +686,7 @@
.append("Problem checking password for ")
.append(name)
.append(" : ")
- .append(e);
+ .append(e);
getLogger().error(exceptionBuffer.toString());
//System.out.println(exceptionBuffer.toString());
//System.out.println(e.getMessage());
1.4 +1 -1 jakarta-james/src/java/org/apache/james/util/JDBCUtil.java
Index: JDBCUtil.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/util/JDBCUtil.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JDBCUtil.java 6 Jan 2003 17:08:49 -0000 1.3
+++ JDBCUtil.java 12 Jan 2003 22:38:35 -0000 1.4
@@ -17,7 +17,7 @@
/**
* <p>Helper class for managing common JDBC tasks.</p>
*
- * <p>This class is abstract to allow implementations to
+ * <p>This class is abstract to allow implementations to
* take advantage of different logging capabilities/interfaces in
* different parts of the code.</p>
*
1.7 +27 -27 jakarta-james/src/java/org/apache/james/util/RFC822Date.java
Index: RFC822Date.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/util/RFC822Date.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RFC822Date.java 7 Jan 2003 11:06:38 -0000 1.6
+++ RFC822Date.java 12 Jan 2003 22:38:35 -0000 1.7
@@ -16,9 +16,9 @@
import org.apache.mailet.dates.RFC822DateFormat;
/**
- * A utility class to allow creation of RFC822 date strings from Dates
+ * A utility class to allow creation of RFC822 date strings from Dates
* and dates from RFC822 strings<br>
- * It provides for conversion between timezones,
+ * It provides for conversion between timezones,
* And easy manipulation of RFC822 dates<br>
* example - current timestamp: String nowdate = new RFC822Date().toString()<br>
* example - convert into java.util.Date: Date usedate = new RFC822Date("3 Oct 2001 08:32:44 -0000").getDate()<br>
@@ -36,40 +36,40 @@
private static SimpleDateFormat dz;
private Date d;
private RFC822DateFormat rfc822Format = new RFC822DateFormat();
-
+
static {
df = new SimpleDateFormat("EE, d MMM yyyy HH:mm:ss", Locale.US);
dx = new SimpleDateFormat("EE, d MMM yyyy HH:mm:ss zzzzz", Locale.US);
dy = new SimpleDateFormat("EE d MMM yyyy HH:mm:ss zzzzz", Locale.US);
dz = new SimpleDateFormat("d MMM yyyy HH:mm:ss zzzzz", Locale.US);
- }
-
+ }
+
/**
- * creates a current timestamp
+ * creates a current timestamp
* using this machines system timezone<br>
- *
+ *
*/
public RFC822Date(){
d = new Date();
}
-
+
/**
- * creates object using date supplied
+ * creates object using date supplied
* and this machines system timezone<br>
* @param da java.util.Date, A date object
*/
public RFC822Date(Date da) {
d = da;
}
-
+
/**
- * creates object using date supplied
+ * creates object using date supplied
* and the timezone string supplied<br>
* useTZ can be either an abbreviation such as "PST",
- * a full name such as "America/Los_Angeles",<br>
+ * a full name such as "America/Los_Angeles",<br>
* or a custom ID such as "GMT-8:00".<br>
* Note that this is dependant on java.util.TimeZone<br>
- * Note that the support of abbreviations is for
+ * Note that the support of abbreviations is for
* JDK 1.1.x compatibility only and full names should be used.<br>
* @param da java.util.Date, a date object
* @param useTZ java.lang.Sting, a timezone string such as "America/Los_Angeles" or "GMT+02:00"
@@ -79,8 +79,8 @@
}
/**
- * creates object from
- * RFC822 date string supplied
+ * creates object from
+ * RFC822 date string supplied
* and the system default time zone <br>
* In practice it converts RFC822 date string to the local timezone<br>
* @param rfcdate java.lang.String - date in RFC822 format "3 Oct 2001 08:32:44 -0000"
@@ -89,26 +89,26 @@
setDate(rfcdate);
}
/**
- * creates object from
- * RFC822 date string supplied
+ * creates object from
+ * RFC822 date string supplied
* using the supplied time zone string<br>
* @param rfcdate java.lang.String - date in RFC822 format
* @param useTZ java.lang.String - timezone string *doesn't support Z style or UT*
- */
+ */
public RFC822Date(String rfcdate, String useTZ) {
setDate(rfcdate);
setTimeZone(useTZ);
- }
+ }
public void setDate(Date da){
d = da;
}
-
+
/**
* The following styles of rfc date strings can be parsed<br>
* Wed, 3 Oct 2001 06:42:27 GMT+02:10<br>
* Wed 3 Oct 2001 06:42:27 PST <br>
- * 3 October 2001 06:42:27 +0100 <br>
+ * 3 October 2001 06:42:27 +0100 <br>
* the military style timezones, ZM, ZA, etc cannot (yet) <br>
* @param rfcdate java.lang.String - date in RFC822 format
*/
@@ -131,19 +131,19 @@
d = new Date();
}
}
-
+
}
-
+
}
-
+
public void setTimeZone(TimeZone useTZ) {
rfc822Format.setTimeZone(useTZ);
}
-
+
public void setTimeZone(String useTZ) {
setTimeZone(TimeZone.getTimeZone(useTZ));
}
-
+
/**
* returns the java.util.Date object this RFC822Date represents.
@@ -157,7 +157,7 @@
* returns the date as a string formated for RFC822 compliance
* ,accounting for timezone and daylight saving.
* @return java.lang.String - date as a string formated for RFC822 compliance
- *
+ *
*/
public String toString() {
return rfc822Format.format(d);
1.7 +14 -14 jakarta-james/src/java/org/apache/james/util/SqlResources.java
Index: SqlResources.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/util/SqlResources.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SqlResources.java 6 Jan 2003 17:08:49 -0000 1.6
+++ SqlResources.java 12 Jan 2003 22:38:35 -0000 1.7
@@ -32,7 +32,7 @@
* This class allows SQL strings to be customised to particular
* database products, by detecting product information from the
* jdbc DatabaseMetaData object.
- *
+ *
* @author Darrell DeBoer <dd...@bigdaz.com>
*/
public class SqlResources
@@ -49,14 +49,14 @@
/**
* Configures a DbResources object to provide SQL statements from a file.
- *
+ *
* SQL statements returned may be specific to the particular type
* and version of the connected database, as well as the database driver.
- *
+ *
* Parameters encoded as $(parameter} in the input file are
* replace by values from the parameters Map, if the named parameter exists.
* Parameter values may also be specified in the resourceSection element.
- *
+ *
* @param sqlFile the input file containing the string definitions
* @param sqlDefsSection
* the xml element containing the strings to be used
@@ -75,7 +75,7 @@
// First process the database matcher, to determine the
// sql statements to use.
- Element dbMatcherElement =
+ Element dbMatcherElement =
(Element)(sqlDoc.getElementsByTagName("dbMatchers").item(0));
String dbProduct = null;
if ( dbMatcherElement != null ) {
@@ -108,7 +108,7 @@
// and use supplied parameters as overrides.
Map parameters = new HashMap();
// First read from the <params> element, if it exists.
- Element parametersElement =
+ Element parametersElement =
(Element)(sectionElement.getElementsByTagName("parameters").item(0));
if ( parametersElement != null ) {
NamedNodeMap params = parametersElement.getAttributes();
@@ -124,7 +124,7 @@
parameters.putAll(configParameters);
// 2 maps - one for storing default statements,
- // the other for statements with a "db" attribute matching this
+ // the other for statements with a "db" attribute matching this
// connection.
Map defaultSqlStatements = new HashMap();
Map dbProductSqlStatements = new HashMap();
@@ -186,7 +186,7 @@
* Compares the DatabaseProductName value for a jdbc Connection
* against a set of regular expressions defined in XML.
* The first successful match defines the name of the database product
- * connected to. This value is then used to choose the specific SQL
+ * connected to. This value is then used to choose the specific SQL
* expressions to use.
*
* @param conn the JDBC connection being tested
@@ -195,13 +195,13 @@
* @return the type of database to which James is connected
*
*/
- private String matchDbConnection(Connection conn,
+ private String matchDbConnection(Connection conn,
Element dbMatchersElement)
throws MalformedPerl5PatternException, SQLException
{
String dbProductName = conn.getMetaData().getDatabaseProductName();
-
- NodeList dbMatchers =
+
+ NodeList dbMatchers =
dbMatchersElement.getElementsByTagName("dbMatcher");
for ( int i = 0; i < dbMatchers.getLength(); i++ ) {
// Get the values for this matcher element.
@@ -229,7 +229,7 @@
* @param replace the string to replace with
* @return the substituted string
*/
- private String substituteSubString( String input,
+ private String substituteSubString( String input,
String find,
String replace )
{
@@ -254,7 +254,7 @@
/**
* Returns a named SQL string for the specified connection,
* replacing parameters with the values set.
- *
+ *
* @param name the name of the SQL resource required.
* @return the requested resource
*/
@@ -266,7 +266,7 @@
/**
* Returns a named SQL string for the specified connection,
* replacing parameters with the values set.
- *
+ *
* @param name the name of the SQL resource required.
* @param required true if the resource is required
* @return the requested resource
1.4 +6 -6 jakarta-james/src/java/org/apache/james/util/connection/ServerConnection.java
Index: ServerConnection.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/util/connection/ServerConnection.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ServerConnection.java 30 Oct 2002 10:34:58 -0000 1.3
+++ ServerConnection.java 12 Jan 2003 22:38:35 -0000 1.4
@@ -45,7 +45,7 @@
* This is a hack to deal with the fact that there appears to be
* no platform-independent way to break out of a ServerSocket
* accept() call. On some platforms closing either the ServerSocket
- * itself, or its associated InputStream, causes the accept
+ * itself, or its associated InputStream, causes the accept
* method to exit. Unfortunately, this behavior is not consistent
* across platforms. The deal with this, we introduce a polling
* loop of 20 seconds for the server socket. This introduces a
@@ -95,7 +95,7 @@
/**
* A collection of client connection runners.
*/
- private final ArrayList clientConnectionRunners = new ArrayList();
+ private final ArrayList clientConnectionRunners = new ArrayList();
/**
* The current number of open client connections.
@@ -142,7 +142,7 @@
}
/**
- * The dispose operation is called by the owning ConnectionManager
+ * The dispose operation is called by the owning ConnectionManager
* at the end of its lifecycle. Cleans up the server connection, forcing
* everything to finish.
*/
@@ -163,7 +163,7 @@
try {
serverSocket.close();
} catch (IOException ie) {
- // Ignored - we're doing this to break out of the
+ // Ignored - we're doing this to break out of the
// accept. This minimizes the time required to
// shutdown the server. Unfortunately, this is
// not guaranteed to work on all platforms. See
@@ -385,8 +385,8 @@
/**
* Provides the body for the thread of execution dealing with a particular client
- * connection. An appropriate ConnectionHandler is created, applied, executed,
- * and released.
+ * connection. An appropriate ConnectionHandler is created, applied, executed,
+ * and released.
*/
public void run() {
ConnectionHandler handler = null;
1.3 +9 -9 jakarta-james/src/java/org/apache/james/util/connection/SimpleConnectionManager.java
Index: SimpleConnectionManager.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/util/connection/SimpleConnectionManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SimpleConnectionManager.java 26 Oct 2002 04:02:55 -0000 1.2
+++ SimpleConnectionManager.java 12 Jan 2003 22:38:35 -0000 1.3
@@ -29,7 +29,7 @@
/**
* An implementation of ConnectionManager that supports configurable
- * idle timeouts and a configurable value for the maximum number of
+ * idle timeouts and a configurable value for the maximum number of
* client connections to a particular port.
*
* @author Andrei Ivanov
@@ -60,7 +60,7 @@
* manager.
*/
private final HashMap connectionMap = new HashMap();
-
+
/**
* The idle timeout for the individual sockets spawed from the server socket.
*/
@@ -95,7 +95,7 @@
.append(timeout)
.append(" is not a legal value.");
throw new ConfigurationException(exceptionBuffer.toString());
- }
+ }
if (maxOpenConn < 0) {
StringBuffer exceptionBuffer =
@@ -104,12 +104,12 @@
.append(maxOpenConn)
.append(" is not a legal value.");
throw new ConfigurationException(exceptionBuffer.toString());
- }
+ }
if (getLogger().isDebugEnabled()) {
- getLogger().debug("Connection timeout is "
+ getLogger().debug("Connection timeout is "
+ (timeout == 0 ? "unlimited" : Long.toString(timeout)));
- getLogger().debug("The maximum number of simultaneously open connections is "
+ getLogger().debug("The maximum number of simultaneously open connections is "
+ (maxOpenConn == 0 ? "unlimited" : Integer.toString(maxOpenConn)));
}
}
@@ -117,7 +117,7 @@
/**
* @see org.apache.avalon.framework.component.Composable#compose(ComponentManager)
*/
- public void compose(ComponentManager componentManager)
+ public void compose(ComponentManager componentManager)
throws ComponentException {
threadManager = (ThreadManager)componentManager.lookup( ThreadManager.ROLE );
}
@@ -145,7 +145,7 @@
getLogger().debug("Finishing SimpleConnectionManager dispose...");
}
}
-
+
/**
* Start managing a connection.
* Management involves accepting connections and farming them out to threads
@@ -248,7 +248,7 @@
throws Exception {
disconnect( name, false );
}
-
+
/**
* This shuts down a connection.
* If tearDown is true then it will forcefully the connection and try
1.2 +1 -1 jakarta-james/src/java/org/apache/james/util/watchdog/BytesReadResetInputStream.java
Index: BytesReadResetInputStream.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/util/watchdog/BytesReadResetInputStream.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BytesReadResetInputStream.java 26 Oct 2002 04:15:31 -0000 1.1
+++ BytesReadResetInputStream.java 12 Jan 2003 22:38:35 -0000 1.2
@@ -44,7 +44,7 @@
* @param lengthReset the number of bytes to be read in between trigger resets
*/
public BytesReadResetInputStream(InputStream in,
- Watchdog watchdog,
+ Watchdog watchdog,
int lengthReset) {
this.in = in;
this.watchdog = watchdog;
1.3 +1 -1 jakarta-james/src/java/org/apache/james/util/watchdog/SchedulerWatchdogFactory.java
Index: SchedulerWatchdogFactory.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/james/util/watchdog/SchedulerWatchdogFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SchedulerWatchdogFactory.java 28 Oct 2002 19:38:37 -0000 1.2
+++ SchedulerWatchdogFactory.java 12 Jan 2003 22:38:35 -0000 1.3
@@ -25,7 +25,7 @@
* scheduler = (TimeScheduler) compMgr.lookup(TimeScheduler.ROLE);
*
* and changing AbstractJamesService.getWatchdogFactory to look
- * something like:
+ * something like:
*
* protected WatchdogFactory getWatchdogFactory() {
* WatchdogFactory theWatchdogFactory = null;
1.5 +4 -4 jakarta-james/src/java/org/apache/mailet/GenericMatcher.java
Index: GenericMatcher.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/mailet/GenericMatcher.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- GenericMatcher.java 19 Aug 2002 18:57:08 -0000 1.4
+++ GenericMatcher.java 12 Jan 2003 22:38:35 -0000 1.5
@@ -16,7 +16,7 @@
* the lifecycle methods init and destroy and of the methods in the MatcherConfig
* interface. GenericMatcher also implements the log method, declared in the
* MatcherContext interface.</p>
- *
+ *
* <p>To write a generic matcher, you need only override the abstract match method.</p>
*
* @version 1.0.0, 24/04/1999
@@ -36,7 +36,7 @@
/**
* <p>Returns a String containing the value of the named initialization
* parameter, or null if the parameter does not exist.</p>
- *
+ *
* <p>This method is supplied for convenience. It gets the value of the
* named parameter from the matcher's MatcherConfig object.</p>
*
@@ -126,7 +126,7 @@
* @param msg - a String specifying the message to be written to the log file
*/
public void log(String message) {
- StringBuffer logBuffer =
+ StringBuffer logBuffer =
new StringBuffer(256)
.append(getMatcherName())
.append(": ")
@@ -142,7 +142,7 @@
* @param t - the java.lang.Throwable error or exception
*/
public void log(String message, Throwable t) {
- StringBuffer logBuffer =
+ StringBuffer logBuffer =
new StringBuffer(256)
.append(getMatcherName())
.append(": ")
1.5 +1 -1 jakarta-james/src/java/org/apache/mailet/Mail.java
Index: Mail.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/mailet/Mail.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Mail.java 7 Jan 2003 11:26:31 -0000 1.4
+++ Mail.java 12 Jan 2003 22:38:35 -0000 1.5
@@ -106,7 +106,7 @@
void setName(String name);
/**
* Method setLastUpdated. Used to set the internal timestamp of the Mail during processing.
- * @param date
+ * @param date
*/
void setLastUpdated(Date date);
/**
1.9 +7 -7 jakarta-james/src/java/org/apache/mailet/MailAddress.java
Index: MailAddress.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/mailet/MailAddress.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MailAddress.java 19 Aug 2002 18:57:08 -0000 1.8
+++ MailAddress.java 12 Jan 2003 22:38:35 -0000 1.9
@@ -15,7 +15,7 @@
* A representation of an email address.
* <p>This class encapsulates functionalities to access to different
* parts of an email address without dealing with its parsing.</p>
- *
+ *
* <p>A MailAddress is an address specified in the MAIL FROM and
* RCPT TO commands in SMTP sessions. These are either passed by
* an external server to the mailet-compliant SMTP server, or they
@@ -23,14 +23,14 @@
* send to another (external) SMTP server. Mailets and matchers
* use the MailAddress for the purpose of evaluating the sender
* and recipient(s) of a message.</p>
- *
+ *
* <p>MailAddress parses an email address as defined in RFC 821
* (SMTP) p. 30 and 31 where addresses are defined in BNF convention.
* As the mailet API does not support the aged "SMTP-relayed mail"
* addressing protocol, this leaves all addresses to be a <mailbox>,
* as per the spec. The MailAddress's "user" is the <local-part> of
* the <mailbox> and "host" is the <domain> of the mailbox.</p>
- *
+ *
* <p>This class is a good way to validate email addresses as there are
* some valid addresses which would fail with a simpler approach
* to parsing address. It also removes parsing burden from
@@ -40,7 +40,7 @@
* lokitech.com is the host). This means all current parsing to date
* is incorrect as we just find the first @ and use that to separate
* user from host.</p>
- *
+ *
* <p>This parses an address as per the BNF specification for <mailbox>
* from RFC 821 on page 30 and 31, section 4.1.2. COMMAND SYNTAX.
* http://www.freesoft.org/CIE/RFC/821/15.htm</p>
@@ -179,7 +179,7 @@
}
public String toString() {
- StringBuffer addressBuffer =
+ StringBuffer addressBuffer =
new StringBuffer(128)
.append(user)
.append("@")
@@ -420,8 +420,8 @@
break;
}
char ch = address.charAt(pos);
- if ((ch >= '0' && ch <= '9') ||
- (ch >= 'a' && ch <= 'z') ||
+ if ((ch >= '0' && ch <= '9') ||
+ (ch >= 'a' && ch <= 'z') ||
(ch >= 'A' && ch <= 'Z') ||
(ch == '-')) {
resultSB.append(ch);
1.2 +4 -4 jakarta-james/src/java/org/apache/mailet/MailetContextConstants.java
Index: MailetContextConstants.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/mailet/MailetContextConstants.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MailetContextConstants.java 7 Jan 2003 11:06:35 -0000 1.1
+++ MailetContextConstants.java 12 Jan 2003 22:38:35 -0000 1.2
@@ -1,18 +1,18 @@
/**
* Constants.java
- *
+ *
* Copyright (C) 07-Jan-2003 The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
- * the LICENSE file.
+ * the LICENSE file.
*
* Danny Angus
*/
package org.apache.mailet;
/**
* @author <A href="mailto:danny@apache.org">Danny Angus</a>
- *
+ *
* $Id$
*/
public interface MailetContextConstants {
1.2 +1 -1 jakarta-james/src/java/org/apache/mailet/RFC2822Headers.java
Index: RFC2822Headers.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/mailet/RFC2822Headers.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RFC2822Headers.java 7 Jan 2003 11:06:35 -0000 1.1
+++ RFC2822Headers.java 12 Jan 2003 22:38:35 -0000 1.2
@@ -64,7 +64,7 @@
public final static String MESSAGE_ID = "Message-ID";
/**
- * A common variation on the name of the RFC 2822 header that
+ * A common variation on the name of the RFC 2822 header that
* stores the message id. This is needed for certain filters and
* processing of incoming mail.
*/
1.2 +3 -3 jakarta-james/src/java/org/apache/mailet/SpoolRepository.java
Index: SpoolRepository.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/mailet/SpoolRepository.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SpoolRepository.java 6 Jan 2003 12:38:05 -0000 1.1
+++ SpoolRepository.java 12 Jan 2003 22:38:35 -0000 1.2
@@ -9,13 +9,13 @@
/**
* Interface for a Repository for Spooling Mails.
- * A spool repository is a transitory repository which should empty itself
+ * A spool repository is a transitory repository which should empty itself
* if inbound deliveries stop.
*
* @version 1.0.0, 24/04/1999
* @author Federico Barbieri <sc...@pop.systemy.it>
*/
-public interface SpoolRepository
+public interface SpoolRepository
extends MailRepository {
/**
@@ -26,7 +26,7 @@
/**
* Returns the key for an arbitrarily selected mail deposited in this Repository.
- * Usage: SpoolManager calls accept() to see if there are any unprocessed
+ * Usage: SpoolManager calls accept() to see if there are any unprocessed
* mails in the spool repository.
*
* @return the key for the mail
1.2 +1 -1 jakarta-james/src/java/org/apache/mailet/dates/RFC2980DateFormat.java
Index: RFC2980DateFormat.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/mailet/dates/RFC2980DateFormat.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RFC2980DateFormat.java 7 Jan 2003 11:06:39 -0000 1.1
+++ RFC2980DateFormat.java 12 Jan 2003 22:38:36 -0000 1.2
@@ -10,7 +10,7 @@
import java.util.Locale;
/**
- * A thread-safe date formatting class to produce dates formatted in accord with the
+ * A thread-safe date formatting class to produce dates formatted in accord with the
* specifications of section 3.2 of RFC 2980.
*
* @author Peter M. Goldstein <fa...@alum.mit.edu>
1.2 +1 -1 jakarta-james/src/java/org/apache/mailet/dates/RFC822DateFormat.java
Index: RFC822DateFormat.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/mailet/dates/RFC822DateFormat.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RFC822DateFormat.java 7 Jan 2003 11:06:39 -0000 1.1
+++ RFC822DateFormat.java 12 Jan 2003 22:38:36 -0000 1.2
@@ -22,7 +22,7 @@
/**
* A static instance of the RFC822DateFormat, used by toString
*/
- private static RFC822DateFormat instance;
+ private static RFC822DateFormat instance;
static {
instance = new RFC822DateFormat();
1.2 +2 -2 jakarta-james/src/java/org/apache/mailet/dates/RFC977DateFormat.java
Index: RFC977DateFormat.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/mailet/dates/RFC977DateFormat.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RFC977DateFormat.java 7 Jan 2003 11:06:39 -0000 1.1
+++ RFC977DateFormat.java 12 Jan 2003 22:38:36 -0000 1.2
@@ -13,7 +13,7 @@
import java.util.TimeZone;
/**
- * A thread-safe date formatting class to produce dates formatted in accord with the
+ * A thread-safe date formatting class to produce dates formatted in accord with the
* specifications of RFC 977.
*
* @author Peter M. Goldstein <fa...@alum.mit.edu>
@@ -39,7 +39,7 @@
}
/**
- * This method returns the long form of the RFC977 Date
+ * This method returns the long form of the RFC977 Date
*
* @return java.lang.String
* @param d Date
1.2 +1 -1 jakarta-james/src/java/org/apache/mailet/dates/SimplifiedDateFormat.java
Index: SimplifiedDateFormat.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/mailet/dates/SimplifiedDateFormat.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SimplifiedDateFormat.java 7 Jan 2003 11:06:39 -0000 1.1
+++ SimplifiedDateFormat.java 12 Jan 2003 22:38:36 -0000 1.2
@@ -21,7 +21,7 @@
* This difficulty leads us to approach the problem using composition
* rather than inheritance. In general classes that implement this
* interface will delegate these calls to an internal DateFormat object.</p>
- *
+ *
* @author Peter M. Goldstein <fa...@alum.mit.edu>
*/
public interface SimplifiedDateFormat {
1.2 +3 -3 jakarta-james/src/java/org/apache/mailet/dates/SynchronizedDateFormat.java
Index: SynchronizedDateFormat.java
===================================================================
RCS file: /home/cvs/jakarta-james/src/java/org/apache/mailet/dates/SynchronizedDateFormat.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SynchronizedDateFormat.java 7 Jan 2003 11:06:39 -0000 1.1
+++ SynchronizedDateFormat.java 12 Jan 2003 22:38:36 -0000 1.2
@@ -16,11 +16,11 @@
/**
- * This class is designed to be a synchronized wrapper for a
+ * This class is designed to be a synchronized wrapper for a
* <code>java.text.DateFormat</code> subclass. In general,
* these subclasses (most notably the <code>java.text.SimpleDateFormat</code>
- * classes are not thread safe, so we need to synchronize on the
- * internal DateFormat for all delegated calls.
+ * classes are not thread safe, so we need to synchronize on the
+ * internal DateFormat for all delegated calls.
*
* @author Peter M. Goldstein <fa...@alum.mit.edu>
*/
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>
RE: cvs commit ...
Posted by Danny Angus <da...@apache.org>.
nicked this from Ant..
/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
* any, must include the following acknowlegement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "James", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
> -----Original Message-----
> From: Serge Knystautas [mailto:sergek@lokitech.com]
> Sent: 13 January 2003 13:18
> To: James Developers List
> Subject: Re: cvs commit ...
>
>
> Danny Angus wrote:
> > perhaps we should be inserting the full licence boilerplate at the same
> > time?
>
> Yeah, good idea. Do you know where there is there a template for this?
>
> --
> Serge Knystautas
> Loki Technologies
> http://www.lokitech.com
>
>
> --
> To unsubscribe, e-mail:
> <ma...@jakarta.apache.org>
> For additional commands, e-mail:
> <ma...@jakarta.apache.org>
>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>
Re: cvs commit ...
Posted by Serge Knystautas <se...@lokitech.com>.
Danny Angus wrote:
> perhaps we should be inserting the full licence boilerplate at the same
> time?
Yeah, good idea. Do you know where there is there a template for this?
--
Serge Knystautas
Loki Technologies
http://www.lokitech.com
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>
RE: cvs commit ...
Posted by Danny Angus <da...@apache.org>.
perhaps we should be inserting the full licence boilerplate at the same
time?
> -----Original Message-----
> From: Serge Knystautas [mailto:sergek@lokitech.com]
> Sent: 12 January 2003 23:13
> To: James Developers List
> Subject: Re: cvs commit ...
>
>
> Noel J. Bergman wrote:
> >> Converted tabs to 4 spaces.
> >
> >
> > Looks like the primary change was trimming trailing spaces.
>
> I did just do search and replace on tabs to 4 spaces, but in saving the
> files it does remove trailing spaces as well.
>
>
> > While you're at it, I believe that we agreed to delete author
> tags from all
> > source files. I do not see any reason to affect such a change in the v2
> > branch, but we might as well do it on the HEAD.
>
> Sounds good.. I'll commit the removal of the author tags in a bit.
>
> --
> Serge Knystautas
> Loki Technologies
> http://www.lokitech.com/
>
>
> --
> To unsubscribe, e-mail:
> <ma...@jakarta.apache.org>
> For additional commands, e-mail:
> <ma...@jakarta.apache.org>
>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>
Re: cvs commit ...
Posted by Serge Knystautas <se...@lokitech.com>.
Noel J. Bergman wrote:
>> Converted tabs to 4 spaces.
>
>
> Looks like the primary change was trimming trailing spaces.
I did just do search and replace on tabs to 4 spaces, but in saving the
files it does remove trailing spaces as well.
> While you're at it, I believe that we agreed to delete author tags from all
> source files. I do not see any reason to affect such a change in the v2
> branch, but we might as well do it on the HEAD.
Sounds good.. I'll commit the removal of the author tags in a bit.
--
Serge Knystautas
Loki Technologies
http://www.lokitech.com/
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>
RE: cvs commit ...
Posted by "Noel J. Bergman" <no...@devtech.com>.
> Converted tabs to 4 spaces.
Looks like the primary change was trimming trailing spaces.
While you're at it, I believe that we agreed to delete author tags from all
source files. I do not see any reason to affect such a change in the v2
branch, but we might as well do it on the HEAD.
--- Noel
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>