Author: matthieu
Date: Fri Dec 11 12:34:09 2015
New Revision: 1719388
URL: http://svn.apache.org/viewvc?rev=1719388&view=rev
Log:
JAMES-1644 move ImmutableCollectors to util-java8 project
Added:
james/project/trunk/server/container/util-java8/
james/project/trunk/server/container/util-java8/pom.xml
- copied, changed from r1719387,
james/project/trunk/backends-common/cassandra/pom.xml
james/project/trunk/server/container/util-java8/src/
james/project/trunk/server/container/util-java8/src/main/
james/project/trunk/server/container/util-java8/src/main/java/
james/project/trunk/server/container/util-java8/src/main/java/org/
james/project/trunk/server/container/util-java8/src/main/java/org/apache/
james/project/trunk/server/container/util-java8/src/main/java/org/apache/james/
james/project/trunk/server/container/util-java8/src/main/java/org/apache/james/util/
james/project/trunk/server/container/util-java8/src/main/java/org/apache/james/util/streams/
james/project/trunk/server/container/util-java8/src/main/java/org/apache/james/util/streams/Collectors.java
- copied, changed from r1719387,
james/project/trunk/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/utils/Collectors.java
james/project/trunk/server/container/util-java8/src/test/
james/project/trunk/server/container/util-java8/src/test/java/
james/project/trunk/server/container/util-java8/src/test/java/org/
james/project/trunk/server/container/util-java8/src/test/java/org/apache/
james/project/trunk/server/container/util-java8/src/test/java/org/apache/james/
james/project/trunk/server/container/util-java8/src/test/java/org/apache/james/util/
james/project/trunk/server/container/util-java8/src/test/java/org/apache/james/util/streams/
james/project/trunk/server/container/util-java8/src/test/java/org/apache/james/util/streams/CollectorsTest.java
- copied, changed from r1719387,
james/project/trunk/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/utils/CollectorsTest.java
Removed:
james/project/trunk/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/utils/Collectors.java
james/project/trunk/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/utils/CollectorsTest.java
Modified:
james/project/trunk/backends-common/cassandra/pom.xml
james/project/trunk/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/CassandraModuleComposite.java
james/project/trunk/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/CassandraTypesProvider.java
james/project/trunk/backends-common/pom.xml
james/project/trunk/server/pom.xml
james/project/trunk/server/protocols/jmap/pom.xml
Modified: james/project/trunk/backends-common/cassandra/pom.xml
URL:
http://svn.apache.org/viewvc/james/project/trunk/backends-common/cassandra/pom.xml?rev=1719388&r1=1719387&r2=1719388&view=diff
==============================================================================
--- james/project/trunk/backends-common/cassandra/pom.xml (original)
+++ james/project/trunk/backends-common/cassandra/pom.xml Fri Dec 11 12:34:09
2015
@@ -125,7 +125,12 @@
<activation>
<jdk>[1.8,)</jdk>
</activation>
- <dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-util-java8</artifactId>
+ <version>3.0.0-beta5-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>com.datastax.cassandra</groupId>
<artifactId>cassandra-driver-core</artifactId>
Modified:
james/project/trunk/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/CassandraModuleComposite.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/CassandraModuleComposite.java?rev=1719388&r1=1719387&r2=1719388&view=diff
==============================================================================
---
james/project/trunk/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/CassandraModuleComposite.java
(original)
+++
james/project/trunk/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/CassandraModuleComposite.java
Fri Dec 11 12:34:09 2015
@@ -22,12 +22,13 @@ package org.apache.james.backends.cassan
import java.util.Arrays;
import java.util.List;
-import com.google.common.collect.ImmutableList;
import org.apache.james.backends.cassandra.components.CassandraIndex;
import org.apache.james.backends.cassandra.components.CassandraModule;
import org.apache.james.backends.cassandra.components.CassandraTable;
import org.apache.james.backends.cassandra.components.CassandraType;
-import org.apache.james.backends.cassandra.utils.Collectors;
+import org.apache.james.util.streams.Collectors;
+
+import com.google.common.collect.ImmutableList;
public class CassandraModuleComposite implements CassandraModule {
Modified:
james/project/trunk/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/CassandraTypesProvider.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/CassandraTypesProvider.java?rev=1719388&r1=1719387&r2=1719388&view=diff
==============================================================================
---
james/project/trunk/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/CassandraTypesProvider.java
(original)
+++
james/project/trunk/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/CassandraTypesProvider.java
Fri Dec 11 12:34:09 2015
@@ -23,12 +23,13 @@ import java.util.Optional;
import javax.inject.Inject;
+import org.apache.james.backends.cassandra.components.CassandraModule;
+import org.apache.james.backends.cassandra.components.CassandraType;
+import org.apache.james.util.streams.Collectors;
+
import com.datastax.driver.core.Session;
import com.datastax.driver.core.UserType;
import com.google.common.collect.ImmutableMap;
-import org.apache.james.backends.cassandra.components.CassandraModule;
-import org.apache.james.backends.cassandra.components.CassandraType;
-import org.apache.james.backends.cassandra.utils.Collectors;
public class CassandraTypesProvider {
private final ImmutableMap<String, UserType> userTypes;
Modified: james/project/trunk/backends-common/pom.xml
URL:
http://svn.apache.org/viewvc/james/project/trunk/backends-common/pom.xml?rev=1719388&r1=1719387&r2=1719388&view=diff
==============================================================================
--- james/project/trunk/backends-common/pom.xml (original)
+++ james/project/trunk/backends-common/pom.xml Fri Dec 11 12:34:09 2015
@@ -40,6 +40,11 @@
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-util-java8</artifactId>
+ <version>3.0.0-beta5-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>16.0</version>
Copied: james/project/trunk/server/container/util-java8/pom.xml (from r1719387,
james/project/trunk/backends-common/cassandra/pom.xml)
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/container/util-java8/pom.xml?p2=james/project/trunk/server/container/util-java8/pom.xml&p1=james/project/trunk/backends-common/cassandra/pom.xml&r1=1719387&r2=1719388&rev=1719388&view=diff
==============================================================================
--- james/project/trunk/backends-common/cassandra/pom.xml (original)
+++ james/project/trunk/server/container/util-java8/pom.xml Fri Dec 11 12:34:09
2015
@@ -17,18 +17,22 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
-
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>james-backends-common</artifactId>
+ <artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
- <version>1.8.3-SNAPSHOT</version>
+ <version>3.0.0-beta5-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>apache-james-backends-cassandra</artifactId>
- <name>Apache James Cassandra backend</name>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-util-java8</artifactId>
+ <packaging>bundle</packaging>
+
+ <name>Apache James :: Server :: Common Utilities :: Java 8</name>
<profiles>
<profile>
@@ -125,53 +129,26 @@
<activation>
<jdk>[1.8,)</jdk>
</activation>
- <dependencies>
- <dependency>
- <groupId>com.datastax.cassandra</groupId>
- <artifactId>cassandra-driver-core</artifactId>
- <version>2.1.8</version>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
- </dependency>
- <dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- </dependency>
- <dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.cassandraunit</groupId>
- <artifactId>cassandra-unit</artifactId>
- <version>2.1.9.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <version>3.2.0</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
<build>
<plugins>
<plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
-
<mainClass>fully.qualified.MainClass</mainClass>
- </manifest>
- </archive>
- <descriptorRefs>
-
<descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
@@ -204,5 +181,13 @@
</profile>
</profiles>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
Copied:
james/project/trunk/server/container/util-java8/src/main/java/org/apache/james/util/streams/Collectors.java
(from r1719387,
james/project/trunk/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/utils/Collectors.java)
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/container/util-java8/src/main/java/org/apache/james/util/streams/Collectors.java?p2=james/project/trunk/server/container/util-java8/src/main/java/org/apache/james/util/streams/Collectors.java&p1=james/project/trunk/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/utils/Collectors.java&r1=1719387&r2=1719388&rev=1719388&view=diff
==============================================================================
---
james/project/trunk/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/utils/Collectors.java
(original)
+++
james/project/trunk/server/container/util-java8/src/main/java/org/apache/james/util/streams/Collectors.java
Fri Dec 11 12:34:09 2015
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.backends.cassandra.utils;
+package org.apache.james.util.streams;
import java.util.ArrayList;
import java.util.List;
@@ -45,3 +45,4 @@ public class Collectors {
ImmutableMap.Builder::build);
}
}
+
Copied:
james/project/trunk/server/container/util-java8/src/test/java/org/apache/james/util/streams/CollectorsTest.java
(from r1719387,
james/project/trunk/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/utils/CollectorsTest.java)
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/container/util-java8/src/test/java/org/apache/james/util/streams/CollectorsTest.java?p2=james/project/trunk/server/container/util-java8/src/test/java/org/apache/james/util/streams/CollectorsTest.java&p1=james/project/trunk/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/utils/CollectorsTest.java&r1=1719387&r2=1719388&rev=1719388&view=diff
==============================================================================
---
james/project/trunk/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/utils/CollectorsTest.java
(original)
+++
james/project/trunk/server/container/util-java8/src/test/java/org/apache/james/util/streams/CollectorsTest.java
Fri Dec 11 12:34:09 2015
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.backends.cassandra.utils;
+package org.apache.james.util.streams;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.data.MapEntry.entry;
@@ -87,3 +87,4 @@ public class CollectorsTest {
}
}
+
Modified: james/project/trunk/server/pom.xml
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/pom.xml?rev=1719388&r1=1719387&r2=1719388&view=diff
==============================================================================
--- james/project/trunk/server/pom.xml (original)
+++ james/project/trunk/server/pom.xml Fri Dec 11 12:34:09 2015
@@ -67,6 +67,7 @@
<module>container/mailbox-adapter</module>
<module>container/spring</module>
<module>container/util</module>
+ <module>container/util-java8</module>
<module>mailet/mailetcontainer-api</module>
<module>mailet/mailetcontainer-camel</module>
@@ -673,6 +674,11 @@
<artifactId>james-server-mailets</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-util-java8</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/project/trunk/server/protocols/jmap/pom.xml
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/protocols/jmap/pom.xml?rev=1719388&r1=1719387&r2=1719388&view=diff
==============================================================================
--- james/project/trunk/server/protocols/jmap/pom.xml (original)
+++ james/project/trunk/server/protocols/jmap/pom.xml Fri Dec 11 12:34:09 2015
@@ -151,6 +151,10 @@
<dependencies>
<dependency>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-util-java8</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
