Author: bago Date: Sat Sep 27 05:39:46 2008 New Revision: 699629 URL: http://svn.apache.org/viewvc?rev=699629&view=rev Log: Update stage and code to latest james-imap trunk after "repackaging/remoduling"
Added: james/server/trunk/stage/org.apache.james/jars/apache-james-imap-decode-0.1-SNAPSHOT.jar (with props) james/server/trunk/stage/org.apache.james/jars/apache-james-imap-message-0.1-SNAPSHOT.jar (with props) james/server/trunk/stage/org.apache.james/poms/apache-james-imap-decode-0.1-SNAPSHOT.pom (with props) james/server/trunk/stage/org.apache.james/poms/apache-james-imap-message-0.1-SNAPSHOT.pom (with props) Removed: james/server/trunk/stage/org.apache.james/jars/apache-james-imap-codec-0.1-SNAPSHOT.jar james/server/trunk/stage/org.apache.james/poms/apache-james-imap-codec-0.1-SNAPSHOT.pom Modified: james/server/trunk/imapserver-function/pom.xml james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/DefaultImapFactory.java james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapHandler.java james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.java james/server/trunk/phoenix-deployment-refactor/pom.xml james/server/trunk/phoenix-deployment/pom.xml james/server/trunk/pom.xml james/server/trunk/stage/org.apache.james/jars/apache-james-imap-api-0.1-SNAPSHOT.jar james/server/trunk/stage/org.apache.james/jars/apache-james-imap-mailbox-0.1-SNAPSHOT.jar james/server/trunk/stage/org.apache.james/jars/apache-james-imap-processor-0.1-SNAPSHOT.jar james/server/trunk/stage/org.apache.james/jars/apache-james-imap-seda-0.1-SNAPSHOT.jar james/server/trunk/stage/org.apache.james/jars/apache-james-imap-torque-0.1-SNAPSHOT.jar james/server/trunk/stage/org.apache.james/poms/apache-james-imap-0.1-SNAPSHOT.pom james/server/trunk/stage/org.apache.james/poms/apache-james-imap-processor-0.1-SNAPSHOT.pom james/server/trunk/stage/org.apache.james/poms/apache-james-imap-seda-0.1-SNAPSHOT.pom james/server/trunk/stage/pom.xml Modified: james/server/trunk/imapserver-function/pom.xml URL: http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/pom.xml?rev=699629&r1=699628&r2=699629&view=diff ============================================================================== --- james/server/trunk/imapserver-function/pom.xml (original) +++ james/server/trunk/imapserver-function/pom.xml Sat Sep 27 05:39:46 2008 @@ -65,7 +65,11 @@ </dependency> <dependency> <groupId>org.apache.james</groupId> - <artifactId>apache-james-imap-codec</artifactId> + <artifactId>apache-james-imap-decode</artifactId> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>apache-james-imap-message</artifactId> </dependency> <dependency> <groupId>org.apache.james</groupId> Modified: james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/DefaultImapFactory.java URL: http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/DefaultImapFactory.java?rev=699629&r1=699628&r2=699629&view=diff ============================================================================== --- james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/DefaultImapFactory.java (original) +++ james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/DefaultImapFactory.java Sat Sep 27 05:39:46 2008 @@ -23,12 +23,12 @@ import org.apache.avalon.framework.logger.Logger; import org.apache.james.api.imap.process.ImapProcessor; import org.apache.james.api.user.UsersRepository; -import org.apache.james.experimental.imapserver.DefaultImapDecoderFactory; -import org.apache.james.experimental.imapserver.ImapRequestHandler; -import org.apache.james.imapserver.codec.decode.ImapDecoder; -import org.apache.james.imapserver.codec.encode.ImapEncoder; -import org.apache.james.imapserver.codec.encode.main.DefaultImapEncoderFactory; -import org.apache.james.imapserver.processor.main.DefaultImapProcessorFactory; +import org.apache.james.imap.main.DefaultImapDecoderFactory; +import org.apache.james.imap.main.ImapRequestHandler; +import org.apache.james.imap.decode.ImapDecoder; +import org.apache.james.imap.encode.ImapEncoder; +import org.apache.james.imap.encode.main.DefaultImapEncoderFactory; +import org.apache.james.imap.processor.main.DefaultImapProcessorFactory; import org.apache.james.mailboxmanager.torque.DefaultMailboxManagerProvider; import org.apache.james.mailboxmanager.torque.DefaultMailboxManager; import org.apache.james.mailboxmanager.torque.DefaultUserManager; Modified: james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapHandler.java URL: http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapHandler.java?rev=699629&r1=699628&r2=699629&view=diff ============================================================================== --- james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapHandler.java (original) +++ james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapHandler.java Sat Sep 27 05:39:46 2008 @@ -26,11 +26,11 @@ import org.apache.avalon.framework.container.ContainerUtil; import org.apache.avalon.framework.logger.Logger; import org.apache.james.api.imap.process.ImapSession; -import org.apache.james.experimental.imapserver.ImapRequestHandler; -import org.apache.james.experimental.imapserver.ImapSessionImpl; -import org.apache.james.experimental.imapserver.encode.writer.OutputStreamImapResponseWriter; -import org.apache.james.imapserver.codec.encode.ImapResponseComposer; -import org.apache.james.imapserver.codec.encode.base.ImapResponseComposerImpl; +import org.apache.james.imap.main.ImapRequestHandler; +import org.apache.james.imap.main.ImapSessionImpl; +import org.apache.james.imap.main.OutputStreamImapResponseWriter; +import org.apache.james.imap.encode.ImapResponseComposer; +import org.apache.james.imap.encode.base.ImapResponseComposerImpl; import org.apache.james.socket.ProtocolHandler; import org.apache.james.socket.ProtocolHandlerHelper; Modified: james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.java URL: http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.java?rev=699629&r1=699628&r2=699629&view=diff ============================================================================== --- james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.java (original) +++ james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServer.java Sat Sep 27 05:39:46 2008 @@ -26,7 +26,7 @@ import org.apache.james.Constants; import org.apache.james.api.imap.ImapConstants; import org.apache.james.api.user.UsersRepository; -import org.apache.james.experimental.imapserver.ImapRequestHandler; +import org.apache.james.imap.main.ImapRequestHandler; import org.apache.james.imapserver.DefaultImapFactory; import org.apache.james.services.FileSystem; import org.apache.james.socket.AbstractJamesService; Modified: james/server/trunk/phoenix-deployment-refactor/pom.xml URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment-refactor/pom.xml?rev=699629&r1=699628&r2=699629&view=diff ============================================================================== --- james/server/trunk/phoenix-deployment-refactor/pom.xml (original) +++ james/server/trunk/phoenix-deployment-refactor/pom.xml Sat Sep 27 05:39:46 2008 @@ -113,7 +113,11 @@ </dependency> <dependency> <groupId>org.apache.james</groupId> - <artifactId>apache-james-imap-codec</artifactId> + <artifactId>apache-james-imap-decode</artifactId> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>apache-james-imap-message</artifactId> </dependency> <dependency> <groupId>org.apache.james</groupId> Modified: james/server/trunk/phoenix-deployment/pom.xml URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/pom.xml?rev=699629&r1=699628&r2=699629&view=diff ============================================================================== --- james/server/trunk/phoenix-deployment/pom.xml (original) +++ james/server/trunk/phoenix-deployment/pom.xml Sat Sep 27 05:39:46 2008 @@ -102,7 +102,11 @@ </dependency> <dependency> <groupId>org.apache.james</groupId> - <artifactId>apache-james-imap-codec</artifactId> + <artifactId>apache-james-imap-decode</artifactId> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>apache-james-imap-message</artifactId> </dependency> <dependency> <groupId>org.apache.james</groupId> Modified: james/server/trunk/pom.xml URL: http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=699629&r1=699628&r2=699629&view=diff ============================================================================== --- james/server/trunk/pom.xml (original) +++ james/server/trunk/pom.xml Sat Sep 27 05:39:46 2008 @@ -336,7 +336,12 @@ </dependency> <dependency> <groupId>org.apache.james</groupId> - <artifactId>apache-james-imap-codec</artifactId> + <artifactId>apache-james-imap-decode</artifactId> + <version>0.1-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>apache-james-imap-message</artifactId> <version>0.1-SNAPSHOT</version> </dependency> <dependency> Modified: james/server/trunk/stage/org.apache.james/jars/apache-james-imap-api-0.1-SNAPSHOT.jar URL: http://svn.apache.org/viewvc/james/server/trunk/stage/org.apache.james/jars/apache-james-imap-api-0.1-SNAPSHOT.jar?rev=699629&r1=699628&r2=699629&view=diff ============================================================================== Binary files - no diff available. Added: james/server/trunk/stage/org.apache.james/jars/apache-james-imap-decode-0.1-SNAPSHOT.jar URL: http://svn.apache.org/viewvc/james/server/trunk/stage/org.apache.james/jars/apache-james-imap-decode-0.1-SNAPSHOT.jar?rev=699629&view=auto ============================================================================== Binary file - no diff available. Propchange: james/server/trunk/stage/org.apache.james/jars/apache-james-imap-decode-0.1-SNAPSHOT.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: james/server/trunk/stage/org.apache.james/jars/apache-james-imap-mailbox-0.1-SNAPSHOT.jar URL: http://svn.apache.org/viewvc/james/server/trunk/stage/org.apache.james/jars/apache-james-imap-mailbox-0.1-SNAPSHOT.jar?rev=699629&r1=699628&r2=699629&view=diff ============================================================================== Binary files - no diff available. Added: james/server/trunk/stage/org.apache.james/jars/apache-james-imap-message-0.1-SNAPSHOT.jar URL: http://svn.apache.org/viewvc/james/server/trunk/stage/org.apache.james/jars/apache-james-imap-message-0.1-SNAPSHOT.jar?rev=699629&view=auto ============================================================================== Binary file - no diff available. Propchange: james/server/trunk/stage/org.apache.james/jars/apache-james-imap-message-0.1-SNAPSHOT.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: james/server/trunk/stage/org.apache.james/jars/apache-james-imap-processor-0.1-SNAPSHOT.jar URL: http://svn.apache.org/viewvc/james/server/trunk/stage/org.apache.james/jars/apache-james-imap-processor-0.1-SNAPSHOT.jar?rev=699629&r1=699628&r2=699629&view=diff ============================================================================== Binary files - no diff available. Modified: james/server/trunk/stage/org.apache.james/jars/apache-james-imap-seda-0.1-SNAPSHOT.jar URL: http://svn.apache.org/viewvc/james/server/trunk/stage/org.apache.james/jars/apache-james-imap-seda-0.1-SNAPSHOT.jar?rev=699629&r1=699628&r2=699629&view=diff ============================================================================== Binary files - no diff available. Modified: james/server/trunk/stage/org.apache.james/jars/apache-james-imap-torque-0.1-SNAPSHOT.jar URL: http://svn.apache.org/viewvc/james/server/trunk/stage/org.apache.james/jars/apache-james-imap-torque-0.1-SNAPSHOT.jar?rev=699629&r1=699628&r2=699629&view=diff ============================================================================== Binary files - no diff available. Modified: james/server/trunk/stage/org.apache.james/poms/apache-james-imap-0.1-SNAPSHOT.pom URL: http://svn.apache.org/viewvc/james/server/trunk/stage/org.apache.james/poms/apache-james-imap-0.1-SNAPSHOT.pom?rev=699629&r1=699628&r2=699629&view=diff ============================================================================== --- james/server/trunk/stage/org.apache.james/poms/apache-james-imap-0.1-SNAPSHOT.pom (original) +++ james/server/trunk/stage/org.apache.james/poms/apache-james-imap-0.1-SNAPSHOT.pom Sat Sep 27 05:39:46 2008 @@ -36,7 +36,8 @@ <modules> <module>stage</module> <module>api</module> - <module>codec</module> + <module>message</module> + <module>decode</module> <module>mailbox</module> <module>processor</module> <module>torque</module> @@ -209,7 +210,12 @@ </dependency> <dependency> <groupId>org.apache.james</groupId> - <artifactId>apache-james-imap-codec</artifactId> + <artifactId>apache-james-imap-message</artifactId> + <version>0.1-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>apache-james-imap-decode</artifactId> <version>0.1-SNAPSHOT</version> </dependency> <dependency> @@ -272,7 +278,7 @@ <dependency> <groupId>org.apache.geronimo.javamail</groupId> <artifactId>geronimo-javamail_1.4_mail</artifactId> - <version>1.5</version> + <version>1.6</version> </dependency> <dependency> <groupId>commons-collections</groupId> Added: james/server/trunk/stage/org.apache.james/poms/apache-james-imap-decode-0.1-SNAPSHOT.pom URL: http://svn.apache.org/viewvc/james/server/trunk/stage/org.apache.james/poms/apache-james-imap-decode-0.1-SNAPSHOT.pom?rev=699629&view=auto ============================================================================== --- james/server/trunk/stage/org.apache.james/poms/apache-james-imap-decode-0.1-SNAPSHOT.pom (added) +++ james/server/trunk/stage/org.apache.james/poms/apache-james-imap-decode-0.1-SNAPSHOT.pom Sat Sep 27 05:39:46 2008 @@ -0,0 +1,79 @@ +<?xml version="1.0" encoding="ISO-8859-15"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> +<project> + <parent> + <artifactId>apache-james-imap</artifactId> + <groupId>org.apache.james</groupId> + <version>0.1-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.apache.james</groupId> + <artifactId>apache-james-imap-decode</artifactId> + <name>Apache JAMES IMAP Decode Library</name> + + <profiles> + <profile> + <!-- Geronimo Mail module do not declare runtime dependency on Activation --> + <id>geronimo</id> + <dependencies> + <dependency> + <groupId>${javax.activation.groupId}</groupId> + <artifactId>${javax.activation.artifactId}</artifactId> + </dependency> + </dependencies> + </profile> + </profiles> + + <dependencies> + <dependency> + <groupId>${javax.mail.groupId}</groupId> + <artifactId>${javax.mail.artifactId}</artifactId> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>apache-james-imap-api</artifactId> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>apache-james-imap-api</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>jmock</groupId> + <artifactId>jmock</artifactId> + <scope>test</scope> + </dependency> + </dependencies> +</project> Propchange: james/server/trunk/stage/org.apache.james/poms/apache-james-imap-decode-0.1-SNAPSHOT.pom ------------------------------------------------------------------------------ svn:eol-style = native Added: james/server/trunk/stage/org.apache.james/poms/apache-james-imap-message-0.1-SNAPSHOT.pom URL: http://svn.apache.org/viewvc/james/server/trunk/stage/org.apache.james/poms/apache-james-imap-message-0.1-SNAPSHOT.pom?rev=699629&view=auto ============================================================================== --- james/server/trunk/stage/org.apache.james/poms/apache-james-imap-message-0.1-SNAPSHOT.pom (added) +++ james/server/trunk/stage/org.apache.james/poms/apache-james-imap-message-0.1-SNAPSHOT.pom Sat Sep 27 05:39:46 2008 @@ -0,0 +1,79 @@ +<?xml version="1.0" encoding="ISO-8859-15"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> +<project> + <parent> + <artifactId>apache-james-imap</artifactId> + <groupId>org.apache.james</groupId> + <version>0.1-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.apache.james</groupId> + <artifactId>apache-james-imap-message</artifactId> + <name>Apache JAMES IMAP Message Library</name> + + <profiles> + <profile> + <!-- Geronimo Mail module do not declare runtime dependency on Activation --> + <id>geronimo</id> + <dependencies> + <dependency> + <groupId>${javax.activation.groupId}</groupId> + <artifactId>${javax.activation.artifactId}</artifactId> + </dependency> + </dependencies> + </profile> + </profiles> + + <dependencies> + <dependency> + <groupId>${javax.mail.groupId}</groupId> + <artifactId>${javax.mail.artifactId}</artifactId> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>apache-james-imap-api</artifactId> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>apache-james-imap-api</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>jmock</groupId> + <artifactId>jmock</artifactId> + <scope>test</scope> + </dependency> + </dependencies> +</project> Propchange: james/server/trunk/stage/org.apache.james/poms/apache-james-imap-message-0.1-SNAPSHOT.pom ------------------------------------------------------------------------------ svn:eol-style = native Modified: james/server/trunk/stage/org.apache.james/poms/apache-james-imap-processor-0.1-SNAPSHOT.pom URL: http://svn.apache.org/viewvc/james/server/trunk/stage/org.apache.james/poms/apache-james-imap-processor-0.1-SNAPSHOT.pom?rev=699629&r1=699628&r2=699629&view=diff ============================================================================== --- james/server/trunk/stage/org.apache.james/poms/apache-james-imap-processor-0.1-SNAPSHOT.pom (original) +++ james/server/trunk/stage/org.apache.james/poms/apache-james-imap-processor-0.1-SNAPSHOT.pom Sat Sep 27 05:39:46 2008 @@ -60,7 +60,7 @@ </dependency> <dependency> <groupId>org.apache.james</groupId> - <artifactId>apache-james-imap-codec</artifactId> + <artifactId>apache-james-imap-message</artifactId> </dependency> <dependency> <groupId>org.apache.james</groupId> Modified: james/server/trunk/stage/org.apache.james/poms/apache-james-imap-seda-0.1-SNAPSHOT.pom URL: http://svn.apache.org/viewvc/james/server/trunk/stage/org.apache.james/poms/apache-james-imap-seda-0.1-SNAPSHOT.pom?rev=699629&r1=699628&r2=699629&view=diff ============================================================================== --- james/server/trunk/stage/org.apache.james/poms/apache-james-imap-seda-0.1-SNAPSHOT.pom (original) +++ james/server/trunk/stage/org.apache.james/poms/apache-james-imap-seda-0.1-SNAPSHOT.pom Sat Sep 27 05:39:46 2008 @@ -26,7 +26,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.apache.james</groupId> <artifactId>apache-james-imap-seda</artifactId> - <name>Apache JAMES *Experimental* IMAP function</name> + <name>Apache JAMES IMAP function</name> <dependencies> <dependency> <groupId>org.apache.james</groupId> @@ -34,7 +34,11 @@ </dependency> <dependency> <groupId>org.apache.james</groupId> - <artifactId>apache-james-imap-codec</artifactId> + <artifactId>apache-james-imap-message</artifactId> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>apache-james-imap-decode</artifactId> </dependency> <dependency> <groupId>concurrent</groupId> Modified: james/server/trunk/stage/pom.xml URL: http://svn.apache.org/viewvc/james/server/trunk/stage/pom.xml?rev=699629&r1=699628&r2=699629&view=diff ============================================================================== --- james/server/trunk/stage/pom.xml (original) +++ james/server/trunk/stage/pom.xml Sat Sep 27 05:39:46 2008 @@ -85,7 +85,11 @@ </dependency> <dependency> <groupId>org.apache.james</groupId> - <artifactId>apache-james-imap-codec</artifactId> + <artifactId>apache-james-imap-decode</artifactId> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>apache-james-imap-message</artifactId> </dependency> <dependency> <groupId>org.apache.james</groupId> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]