Yep,
(I had difficulties to get the 5.4.1 from the mvn mirrors).
Will commit the fix.
Eric
On 27/09/2010 14:27, Norman Maurer wrote:
Prolly a mistake but you changed the version of activemq to 5.4.0
+<activemq.version>5.4.0</activemq.version>
Bye,
Norman
2010/9/27<[email protected]>:
Author: eric
Date: Mon Sep 27 12:26:33 2010
New Revision: 1001703
URL: http://svn.apache.org/viewvc?rev=1001703&view=rev
Log:
Move interfaces and abstract to dnservice-api + move netmatcher and inetnetwork
to common-utils (JAMES-1050)
Added:
james/server/trunk/common-util/src/main/java/org/apache/james/api/
james/server/trunk/common-util/src/main/java/org/apache/james/api/dnsservice/
james/server/trunk/common-util/src/main/java/org/apache/james/api/dnsservice/model/
- copied from r1001670,
james/server/trunk/dnsservice-api/src/main/java/org/apache/james/api/dnsservice/model/
james/server/trunk/common-util/src/main/java/org/apache/james/api/dnsservice/util/
james/server/trunk/common-util/src/main/java/org/apache/james/api/dnsservice/util/InetNetworkBuilder.java
- copied unchanged from r1001670,
james/server/trunk/dnsservice-api/src/main/java/org/apache/james/api/dnsservice/util/InetNetworkBuilder.java
james/server/trunk/common-util/src/main/java/org/apache/james/api/dnsservice/util/NetMatcher.java
- copied unchanged from r1001670,
james/server/trunk/dnsservice-api/src/main/java/org/apache/james/api/dnsservice/util/NetMatcher.java
james/server/trunk/common-util/src/test/java/org/apache/james/api/
james/server/trunk/common-util/src/test/java/org/apache/james/api/dnsservice/
james/server/trunk/common-util/src/test/java/org/apache/james/api/dnsservice/model/
- copied from r1001670,
james/server/trunk/dnsservice-api/src/test/java/org/apache/james/api/dnsservice/model/
james/server/trunk/common-util/src/test/java/org/apache/james/api/dnsservice/util/
james/server/trunk/common-util/src/test/java/org/apache/james/api/dnsservice/util/InetNetworkBuilderTest.java
- copied unchanged from r1001670,
james/server/trunk/dnsservice-api/src/test/java/org/apache/james/api/dnsservice/util/InetNetworkBuilderTest.java
james/server/trunk/common-util/src/test/java/org/apache/james/api/dnsservice/util/NetMatcherTest.java
- copied unchanged from r1001670,
james/server/trunk/dnsservice-api/src/test/java/org/apache/james/api/dnsservice/util/NetMatcherTest.java
james/server/trunk/dnsservice-api/src/main/java/org/apache/james/dnsserver/
james/server/trunk/dnsservice-api/src/main/java/org/apache/james/dnsserver/DNSServerMBean.java
- copied unchanged from r1001670,
james/server/trunk/dnsservice-dnsjava/src/main/java/org/apache/james/dnsserver/DNSServerMBean.java
james/server/trunk/dnsservice-dnsjava/src/test/java/org/apache/james/api/
Removed:
james/server/trunk/dnsservice-api/src/main/java/org/apache/james/api/dnsservice/model/
james/server/trunk/dnsservice-api/src/main/java/org/apache/james/api/dnsservice/util/
james/server/trunk/dnsservice-api/src/test/java/org/apache/james/api/dnsservice/model/
james/server/trunk/dnsservice-api/src/test/java/org/apache/james/api/dnsservice/util/
james/server/trunk/dnsservice-dnsjava/src/main/java/org/apache/james/dnsserver/DNSServerMBean.java
Modified:
james/server/trunk/common-util/pom.xml
james/server/trunk/dnsservice-dnsjava/pom.xml
james/server/trunk/pom.xml
Modified: james/server/trunk/common-util/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/common-util/pom.xml?rev=1001703&r1=1001702&r2=1001703&view=diff
==============================================================================
--- james/server/trunk/common-util/pom.xml (original)
+++ james/server/trunk/common-util/pom.xml Mon Sep 27 12:26:33 2010
@@ -89,6 +89,10 @@
<groupId>org.apache.james</groupId>
<artifactId>james-server-core-api</artifactId>
</dependency>
+<dependency>
+<groupId>org.apache.james</groupId>
+<artifactId>james-server-dnsservice-api</artifactId>
+</dependency>
<dependency>
<groupId>oro</groupId>
<artifactId>oro</artifactId>
@@ -102,5 +106,11 @@
<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>
Modified: james/server/trunk/dnsservice-dnsjava/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/dnsservice-dnsjava/pom.xml?rev=1001703&r1=1001702&r2=1001703&view=diff
==============================================================================
--- james/server/trunk/dnsservice-dnsjava/pom.xml (original)
+++ james/server/trunk/dnsservice-dnsjava/pom.xml Mon Sep 27 12:26:33 2010
@@ -74,6 +74,10 @@
</plugins>
</build>
<dependencies>
+<dependency>
+<groupId>org.apache.james</groupId>
+<artifactId>james-server-dnsservice-api</artifactId>
+</dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mailet</artifactId>
@@ -82,10 +86,6 @@
<groupId>org.apache.james</groupId>
<artifactId>james-server-core-api</artifactId>
</dependency>
-<dependency>
-<groupId>org.apache.james</groupId>
-<artifactId>james-server-dnsservice-api</artifactId>
-</dependency>
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
Modified: james/server/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=1001703&r1=1001702&r2=1001703&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Mon Sep 27 12:26:33 2010
@@ -42,7 +42,7 @@
<module>dnsservice-dnsjava</module>
<module>user-function</module>
<module>user-library</module>
-<module>mail-library</module>
+<module>mail-library</module>
<module>domain-library</module>
<module>domain-function</module>
<module>core-library</module>
@@ -238,6 +238,13 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
+<artifactId>james-server-dnsservice-api</artifactId>
+<type>test-jar</type>
+<scope>test</scope>
+<version>${project.version}</version>
+</dependency>
+<dependency>
+<groupId>org.apache.james</groupId>
<artifactId>james-server-dnsservice-dnsjava</artifactId>
<version>${project.version}</version>
</dependency>
@@ -403,13 +410,6 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
-<artifactId>james-server-dnsservice-api</artifactId>
-<version>${project.version}</version>
-<scope>test</scope>
-<type>test-jar</type>
-</dependency>
-<dependency>
-<groupId>org.apache.james</groupId>
<artifactId>james-server-domain-library</artifactId>
<version>${project.version}</version>
</dependency>
@@ -1140,7 +1140,7 @@
<productName>Apache-James Mail Server</productName>
<derby.version>10.5.3.0_1</derby.version>
<camel.version>2.4.0</camel.version>
-<activemq.version>5.4.1</activemq.version>
+<activemq.version>5.4.0</activemq.version>
<spring.version>3.0.2.RELEASE</spring.version>
<imap.version>0.2-SNAPSHOT</imap.version>
<protocols.version>1.2-SNAPSHOT</protocols.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
