Author: bago
Date: Tue Jan 18 15:20:48 2011
New Revision: 1060411
URL: http://svn.apache.org/viewvc?rev=1060411&view=rev
Log:
Moved MailetContextLog to "mailets" package so to remove commons-logging
dependency from "util".
Modified:
james/server/trunk/core/pom.xml
james/server/trunk/filesystem-api/pom.xml
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SieveMailet.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
james/server/trunk/util/pom.xml
Modified: james/server/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/core/pom.xml?rev=1060411&r1=1060410&r2=1060411&view=diff
==============================================================================
--- james/server/trunk/core/pom.xml (original)
+++ james/server/trunk/core/pom.xml Tue Jan 18 15:20:48 2011
@@ -43,12 +43,17 @@
<groupId>org.apache.james</groupId>
<artifactId>james-server-util</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-lifecycle-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mailet</artifactId>
</dependency>
+ <!-- RFC2822Headers constants imported from mailet-base (undetected by
bytecode analyzers because constants are inlined) -->
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mailet-base</artifactId>
Modified: james/server/trunk/filesystem-api/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/filesystem-api/pom.xml?rev=1060411&r1=1060410&r2=1060411&view=diff
==============================================================================
--- james/server/trunk/filesystem-api/pom.xml (original)
+++ james/server/trunk/filesystem-api/pom.xml Tue Jan 18 15:20:48 2011
@@ -60,15 +60,4 @@
</plugin>
</plugins>
</build>
-
- <dependencies>
- <dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- </dependencies>
</project>
\ No newline at end of file
Modified:
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java?rev=1060411&r1=1060410&r2=1060411&view=diff
==============================================================================
---
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
(original)
+++
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
Tue Jan 18 15:20:48 2011
@@ -31,7 +31,7 @@ import org.apache.james.queue.api.MailQu
import org.apache.james.queue.api.MailQueueFactory;
import org.apache.james.queue.api.MailQueue.MailQueueException;
import org.apache.james.queue.api.MailQueue.MailQueueItem;
-import org.apache.james.util.MailetContextLog;
+import org.apache.james.transport.util.MailetContextLog;
import org.apache.james.util.TimeConverter;
import org.apache.mailet.base.GenericMailet;
import org.apache.mailet.HostAddress;
Modified:
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SieveMailet.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SieveMailet.java?rev=1060411&r1=1060410&r2=1060411&view=diff
==============================================================================
---
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SieveMailet.java
(original)
+++
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SieveMailet.java
Tue Jan 18 15:20:48 2011
@@ -35,7 +35,7 @@ import org.apache.james.mailbox.MailboxS
import org.apache.james.mailbox.MessageManager;
import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.api.UsersRepositoryException;
-import org.apache.james.util.MailetContextLog;
+import org.apache.james.transport.util.MailetContextLog;
import org.apache.jsieve.mailet.Poster;
import org.apache.jsieve.mailet.SieveMailboxMailet;
import org.apache.mailet.Mail;
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=1060411&r1=1060410&r2=1060411&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 Jan 18 15:20:48 2011
@@ -39,7 +39,7 @@ import org.apache.james.mailbox.MessageR
import org.apache.james.mailbox.util.FetchGroupImpl;
import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.api.model.JamesUser;
-import org.apache.james.util.MailetContextLog;
+import org.apache.james.transport.util.MailetContextLog;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
import org.apache.mailet.MailetContext;
Modified: james/server/trunk/util/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/util/pom.xml?rev=1060411&r1=1060410&r2=1060411&view=diff
==============================================================================
--- james/server/trunk/util/pom.xml (original)
+++ james/server/trunk/util/pom.xml Tue Jan 18 15:20:48 2011
@@ -65,14 +65,6 @@
<dependencies>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-lifecycle-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-dnsservice-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
<artifactId>apache-mailet</artifactId>
</dependency>
<dependency>
@@ -84,11 +76,5 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-dnsservice-api</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
