From 38251f6361d5909cb327e864f69a479eaefa61b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Bon=C3=A9r?= <jonasremove@jonasboner.com>
Date: Sun, 7 Mar 2010 11:14:56 +0100
Subject: [PATCH] added java fun tests back to sbt project

---
 akka-fun-test-java/pom.xml      | 134 ++++++++++++++++++++++++++++++++
 project/build/AkkaProject.scala |   2 +-
 2 files changed, 135 insertions(+), 1 deletion(-)
 create mode 100755 akka-fun-test-java/pom.xml

diff --git a/akka-fun-test-java/pom.xml b/akka-fun-test-java/pom.xml
new file mode 100755
index 0000000000..5c55cf0be5
--- /dev/null
+++ b/akka-fun-test-java/pom.xml
@@ -0,0 +1,134 @@
+<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>
+
+  <name>Akka Functional Tests in Java</name>
+  <artifactId>akka-fun-test-java</artifactId>
+  <groupId>se.scalablesolutions.akka</groupId>
+  <version>0.7-SNAPSHOT</version>
+  <packaging>jar</packaging>
+
+  <properties>
+    <scala.version>2.7.7</scala.version>
+    <atmosphere.version>0.5.2</atmosphere.version>
+    <jersey.version>1.1.5</jersey.version>
+    <grizzly.version>1.9.18-i</grizzly.version>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <artifactId>akka-kernel</artifactId>
+      <groupId>se.scalablesolutions.akka</groupId>
+      <version>0.7-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>se.scalablesolutions.akka</groupId>
+      <artifactId>akka-persistence-cassandra</artifactId>
+      <version>0.7-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
+      <version>2.2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.jackson</groupId>
+      <artifactId>jackson-core-asl</artifactId>
+      <version>1.2.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.jackson</groupId>
+      <artifactId>jackson-mapper-asl</artifactId>
+      <version>1.2.1</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.grizzly</groupId>
+      <artifactId>grizzly-servlet-webserver</artifactId>
+      <version>${grizzly.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-server</artifactId>
+      <version>${jersey.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-json</artifactId>
+      <version>${jersey.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-client</artifactId>
+      <version>${jersey.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-atom</artifactId>
+      <version>${jersey.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jmock</groupId>
+      <artifactId>jmock</artifactId>
+      <version>2.4.0</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <sourceDirectory>src/main/java</sourceDirectory>
+    <testSourceDirectory>src/test/java</testSourceDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.5</source>
+          <target>1.5</target>
+          <includes>
+            <include>**/*</include>
+          </includes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <excludes>
+            <exclude>**/*Persistent*</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+    </plugins>
+    <resources>
+      <resource>
+        <filtering>false</filtering>
+        <directory>src/test/resources</directory>
+      </resource>
+      <resource>
+        <filtering>false</filtering>
+        <directory>src/test/java</directory>
+        <includes>
+          <include>**</include>
+        </includes>
+        <excludes>
+          <exclude>**/*.java</exclude>
+        </excludes>
+      </resource>
+    </resources>
+  </build>
+  <reporting>
+    <plugins></plugins>
+  </reporting>
+</project>
diff --git a/project/build/AkkaProject.scala b/project/build/AkkaProject.scala
index 25779c260f..2af245cdc4 100644
--- a/project/build/AkkaProject.scala
+++ b/project/build/AkkaProject.scala
@@ -85,7 +85,7 @@ class AkkaParent(info: ProjectInfo) extends ParentProject(info) {
     val jackson_core = "org.codehaus.jackson" % "jackson-core-asl" % "1.2.1" % "compile"
     val voldemort = "voldemort.store.compress" % "h2-lzf" % "1.0" % "compile"
     val javautils = "org.scala-tools" % "javautils" % "2.7.4-0.1" % "compile"
-    val netty = "org.jboss.netty" % "netty" % "3.2.0.ALPHA3" % "compile"
+    val netty = "org.jboss.netty" % "netty" % "3.2.0.BETA1" % "compile"
     // testing
     val scalatest = "org.scalatest" % "scalatest" % "1.0" % "test"
     val junit = "junit" % "junit" % "4.5" % "test"