Modified: james/protocols/trunk/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/pom.xml?rev=1327280&r1=1327279&r2=1327280&view=diff ============================================================================== --- james/protocols/trunk/pom.xml (original) +++ james/protocols/trunk/pom.xml Tue Apr 17 21:04:01 2012 @@ -118,6 +118,12 @@ <version>1.5</version> </dependency> <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>${version.commons-lang}</version> + </dependency> + + <dependency> <groupId>io.netty</groupId> <artifactId>netty</artifactId> <version>3.3.1.Final</version> @@ -227,7 +233,7 @@ <version.commons-lang>2.4</version.commons-lang> <version.commons-collections>3.2.1</version.commons-collections> <version.apache-mime4j>0.7</version.apache-mime4j> - <version.mailbox>0.4</version.mailbox> + <version.mailbox>0.5-SNAPSHOT</version.mailbox> <version.jmock>2.5.1</version.jmock> </properties> </project>
Modified: james/server/trunk/mailets/pom.xml URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/pom.xml?rev=1327280&r1=1327279&r2=1327280&view=diff ============================================================================== --- james/server/trunk/mailets/pom.xml (original) +++ james/server/trunk/mailets/pom.xml Tue Apr 17 21:04:01 2012 @@ -131,10 +131,12 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> +<!-- <dependency> <groupId>org.apache.james</groupId> <artifactId>apache-james-imap-processor</artifactId> </dependency> + --> <dependency> <groupId>org.apache.james</groupId> <artifactId>apache-james-mailbox-api</artifactId> Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java?rev=1327280&r1=1327279&r2=1327280&view=diff ============================================================================== --- james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java (original) +++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java Tue Apr 17 21:04:01 2012 @@ -26,12 +26,12 @@ import java.util.Locale; import javax.annotation.Resource; import javax.mail.MessagingException; -import org.apache.james.imap.processor.base.FetchGroupImpl; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MessageManager; import org.apache.james.mailbox.exception.BadCredentialsException; import org.apache.james.mailbox.exception.MailboxException; +import org.apache.james.mailbox.model.FetchGroupImpl; import org.apache.james.mailbox.model.MailboxMetaData; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.model.MailboxQuery; Modified: james/server/trunk/pom.xml URL: http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=1327280&r1=1327279&r2=1327280&view=diff ============================================================================== --- james/server/trunk/pom.xml (original) +++ james/server/trunk/pom.xml Tue Apr 17 21:04:01 2012 @@ -438,6 +438,7 @@ <artifactId>apache-james-mailbox-lucene</artifactId> <version>${mailbox.version}</version> </dependency> +<!-- <dependency> <groupId>org.apache.james</groupId> <artifactId>apache-james-imap-message</artifactId> @@ -449,6 +450,19 @@ </exclusion> </exclusions> </dependency> + --> + <dependency> + <groupId>org.apache.james.protocols</groupId> + <artifactId>protocols-imap</artifactId> + <version>${protocols.version}</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>org.apache.james</groupId> <artifactId>james-server-data-ldap</artifactId> @@ -521,6 +535,7 @@ </exclusion> </exclusions> </dependency> +<!-- <dependency> <groupId>org.apache.james</groupId> <artifactId>apache-james-imap-processor</artifactId> @@ -532,6 +547,7 @@ </exclusion> </exclusions> </dependency> + --> <dependency> <groupId>org.apache.james</groupId> <artifactId>james-server-lifecycle-spring</artifactId> @@ -544,6 +560,7 @@ <type>test-jar</type> <scope>test</scope> </dependency> +<!-- <dependency> <groupId>org.apache.james</groupId> <artifactId>apache-james-imap-api</artifactId> @@ -555,7 +572,7 @@ </exclusion> </exclusions> </dependency> - + --> <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> Modified: james/server/trunk/protocols-imap4/pom.xml URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-imap4/pom.xml?rev=1327280&r1=1327279&r2=1327280&view=diff ============================================================================== --- james/server/trunk/protocols-imap4/pom.xml (original) +++ james/server/trunk/protocols-imap4/pom.xml Tue Apr 17 21:04:01 2012 @@ -51,6 +51,7 @@ <groupId>org.apache.james</groupId> <artifactId>james-server-filesystem-api</artifactId> </dependency> +<!-- <dependency> <groupId>org.apache.james</groupId> <artifactId>apache-james-imap-api</artifactId> @@ -59,6 +60,14 @@ <groupId>org.apache.james</groupId> <artifactId>apache-james-imap-message</artifactId> </dependency> + --> + + <dependency> + <groupId>org.apache.james.protocols</groupId> + <artifactId>protocols-imap</artifactId> + <version>${protocols.version}</version> + </dependency> + <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> Modified: james/server/trunk/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/AbstractNettyImapRequestLineReader.java URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/AbstractNettyImapRequestLineReader.java?rev=1327280&r1=1327279&r2=1327280&view=diff ============================================================================== --- james/server/trunk/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/AbstractNettyImapRequestLineReader.java (original) +++ james/server/trunk/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/AbstractNettyImapRequestLineReader.java Tue Apr 17 21:04:01 2012 @@ -18,8 +18,8 @@ ****************************************************************/ package org.apache.james.imapserver.netty; -import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestLineReader; +import org.apache.james.protocols.imap.DecodingException; import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.buffer.ChannelBuffers; import org.jboss.netty.channel.Channel; Modified: james/server/trunk/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapRequestLineReader.java URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapRequestLineReader.java?rev=1327280&r1=1327279&r2=1327280&view=diff ============================================================================== --- james/server/trunk/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapRequestLineReader.java (original) +++ james/server/trunk/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyImapRequestLineReader.java Tue Apr 17 21:04:01 2012 @@ -23,9 +23,9 @@ import java.io.InputStream; import org.apache.commons.io.input.BoundedInputStream; import org.apache.james.imap.api.display.HumanReadableText; -import org.apache.james.imap.decode.DecodingException; import org.apache.james.imap.decode.ImapRequestLineReader; -import org.apache.james.imap.decode.base.EolInputStream; +import org.apache.james.protocols.imap.DecodingException; +import org.apache.james.protocols.imap.utils.EolInputStream; import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.buffer.ChannelBufferInputStream; import org.jboss.netty.channel.Channel; Modified: james/server/trunk/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyStreamImapRequestLineReader.java URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyStreamImapRequestLineReader.java?rev=1327280&r1=1327279&r2=1327280&view=diff ============================================================================== --- james/server/trunk/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyStreamImapRequestLineReader.java (original) +++ james/server/trunk/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/NettyStreamImapRequestLineReader.java Tue Apr 17 21:04:01 2012 @@ -22,9 +22,9 @@ import java.io.IOException; import java.io.InputStream; import org.apache.james.imap.api.display.HumanReadableText; -import org.apache.james.imap.decode.DecodingException; -import org.apache.james.imap.decode.base.EolInputStream; -import org.apache.james.imap.decode.base.FixedLengthInputStream; +import org.apache.james.protocols.imap.DecodingException; +import org.apache.james.protocols.imap.utils.EolInputStream; +import org.apache.james.protocols.imap.utils.FixedLengthInputStream; import org.jboss.netty.channel.Channel; public class NettyStreamImapRequestLineReader extends AbstractNettyImapRequestLineReader { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
