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 ba...@apache.org on 2007/07/04 18:22:24 UTC
svn commit: r553256 - in /james/server/trunk: core-library/
imap-codec-library/ imap-command-library/ imap-mailbox-processor-function/
phoenix-deployment/
smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/
Author: bago
Date: Wed Jul 4 09:22:22 2007
New Revision: 553256
URL: http://svn.apache.org/viewvc?view=rev&rev=553256
Log:
tab to spaces - another attempt
Modified:
james/server/trunk/core-library/pom.xml
james/server/trunk/imap-codec-library/pom.xml
james/server/trunk/imap-command-library/pom.xml
james/server/trunk/imap-mailbox-processor-function/pom.xml
james/server/trunk/phoenix-deployment/JAMES_PHOENIX.txt
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ValidSenderDomainHandler.java
Modified: james/server/trunk/core-library/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/pom.xml?view=diff&rev=553256&r1=553255&r2=553256
==============================================================================
--- james/server/trunk/core-library/pom.xml (original)
+++ james/server/trunk/core-library/pom.xml Wed Jul 4 09:22:22 2007
@@ -57,10 +57,10 @@
<artifactId>avalon-framework-api</artifactId>
<version>4.3</version>
<exclusions>
- <exclusion>
- <artifactId>avalon-logkit</artifactId>
- <groupId>avalon-logkit</groupId>
- </exclusion>
+ <exclusion>
+ <artifactId>avalon-logkit</artifactId>
+ <groupId>avalon-logkit</groupId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -68,19 +68,19 @@
<artifactId>commons-logging</artifactId>
<version>1.1</version>
<exclusions>
- <exclusion>
+ <exclusion>
<artifactId>logkit</artifactId>
<groupId>logkit</groupId>
</exclusion>
- <exclusion>
+ <exclusion>
<artifactId>avalon-framework</artifactId>
<groupId>avalon-framework</groupId>
</exclusion>
- <exclusion>
+ <exclusion>
<artifactId>log4j</artifactId>
<groupId>log4j</groupId>
</exclusion>
- <exclusion>
+ <exclusion>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
@@ -96,7 +96,7 @@
<artifactId>commons-pool</artifactId>
<version>1.2</version>
<exclusions>
- <exclusion>
+ <exclusion>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</exclusion>
Modified: james/server/trunk/imap-codec-library/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/pom.xml?view=diff&rev=553256&r1=553255&r2=553256
==============================================================================
--- james/server/trunk/imap-codec-library/pom.xml (original)
+++ james/server/trunk/imap-codec-library/pom.xml Wed Jul 4 09:22:22 2007
@@ -1,53 +1,53 @@
<?xml version="1.0" encoding="ISO-8859-15"?>
<project>
- <parent>
- <artifactId>james-server</artifactId>
- <groupId>org.apache.james</groupId>
- <version>3.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-imap-codec-library</artifactId>
- <name>Apache JAMES Server IMAP Codec Library</name>
- <dependencies>
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.4.1ea-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>mailet</artifactId>
- <version>3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-imap-api</artifactId>
- <version>3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework-api</artifactId>
- <version>4.3</version>
- <exclusions>
- <exclusion>
- <artifactId>avalon-logkit</artifactId>
- <groupId>avalon-logkit</groupId>
- </exclusion>
- </exclusions>
- </dependency>
+ <parent>
+ <artifactId>james-server</artifactId>
+ <groupId>org.apache.james</groupId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-imap-codec-library</artifactId>
+ <name>Apache JAMES Server IMAP Codec Library</name>
+ <dependencies>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>1.4.1ea-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>mailet</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-imap-api</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ <version>4.3</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>avalon-logkit</artifactId>
+ <groupId>avalon-logkit</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jmock</groupId>
- <artifactId>jmock</artifactId>
- <version>1.1.0</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jmock</groupId>
+ <artifactId>jmock</artifactId>
+ <version>1.1.0</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
Modified: james/server/trunk/imap-command-library/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-command-library/pom.xml?view=diff&rev=553256&r1=553255&r2=553256
==============================================================================
--- james/server/trunk/imap-command-library/pom.xml (original)
+++ james/server/trunk/imap-command-library/pom.xml Wed Jul 4 09:22:22 2007
@@ -1,47 +1,47 @@
<?xml version="1.0" encoding="ISO-8859-15"?>
<project>
- <parent>
- <artifactId>james-server</artifactId>
- <groupId>org.apache.james</groupId>
- <version>3.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-imap-command-library</artifactId>
- <name>Apache JAMES Server IMAP Command Library</name>
- <dependencies>
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.4.1ea-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>mailet</artifactId>
- <version>3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-imap-api</artifactId>
- <version>3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework-api</artifactId>
- <version>4.3</version>
- <exclusions>
- <exclusion>
- <artifactId>avalon-logkit</artifactId>
- <groupId>avalon-logkit</groupId>
- </exclusion>
- </exclusions>
- </dependency>
+ <parent>
+ <artifactId>james-server</artifactId>
+ <groupId>org.apache.james</groupId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-imap-command-library</artifactId>
+ <name>Apache JAMES Server IMAP Command Library</name>
+ <dependencies>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>1.4.1ea-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>mailet</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-imap-api</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ <version>4.3</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>avalon-logkit</artifactId>
+ <groupId>avalon-logkit</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
Modified: james/server/trunk/imap-mailbox-processor-function/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-mailbox-processor-function/pom.xml?view=diff&rev=553256&r1=553255&r2=553256
==============================================================================
--- james/server/trunk/imap-mailbox-processor-function/pom.xml (original)
+++ james/server/trunk/imap-mailbox-processor-function/pom.xml Wed Jul 4 09:22:22 2007
@@ -1,59 +1,59 @@
<?xml version="1.0" encoding="ISO-8859-15"?>
<project>
- <parent>
- <artifactId>james-server</artifactId>
- <groupId>org.apache.james</groupId>
- <version>3.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.james</groupId>
- <artifactId>
- james-server-imap-mailbox-processor-function
- </artifactId>
- <name>Apache JAMES Server IMAP Mailbox Processor function</name>
- <dependencies>
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.4.1ea-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>mailet</artifactId>
- <version>3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework-api</artifactId>
- <version>4.3</version>
- <exclusions>
- <exclusion>
- <artifactId>avalon-logkit</artifactId>
- <groupId>avalon-logkit</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-imap-api</artifactId>
- <version>3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-imapmailbox-library</artifactId>
- <version>3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-imap-codec-library</artifactId>
- <version>3.0-SNAPSHOT</version>
- </dependency>
+ <parent>
+ <artifactId>james-server</artifactId>
+ <groupId>org.apache.james</groupId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.james</groupId>
+ <artifactId>
+ james-server-imap-mailbox-processor-function
+ </artifactId>
+ <name>Apache JAMES Server IMAP Mailbox Processor function</name>
+ <dependencies>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>1.4.1ea-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>mailet</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ <version>4.3</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>avalon-logkit</artifactId>
+ <groupId>avalon-logkit</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-imap-api</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-imapmailbox-library</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-imap-codec-library</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
Modified: james/server/trunk/phoenix-deployment/JAMES_PHOENIX.txt
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/JAMES_PHOENIX.txt?view=diff&rev=553256&r1=553255&r2=553256
==============================================================================
--- james/server/trunk/phoenix-deployment/JAMES_PHOENIX.txt (original)
+++ james/server/trunk/phoenix-deployment/JAMES_PHOENIX.txt Wed Jul 4 09:22:22 2007
@@ -41,8 +41,8 @@
File newBase = new File(base, newBaseDirectory);
final ArrayList urls = new ArrayList();
if (newBase.exists() && newBase.isDirectory()) {
- final PathMatcher matcher = new PathMatcher( includes, excludes );
- scanDir( newBase, matcher, "", urls );
+ final PathMatcher matcher = new PathMatcher( includes, excludes );
+ scanDir( newBase, matcher, "", urls );
}
return (URL[]) urls.toArray( new URL[urls.size()] );
}
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ValidSenderDomainHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ValidSenderDomainHandler.java?view=diff&rev=553256&r1=553255&r2=553256
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ValidSenderDomainHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/core/filter/fastfail/ValidSenderDomainHandler.java Wed Jul 4 09:22:22 2007
@@ -115,7 +115,7 @@
}
if (records == null || records.size() == 0) {
- session.getState().remove(SMTPSession.SENDER);
+ session.getState().remove(SMTPSession.SENDER);
return true;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org