From 6628c109b786cfc3c429400eaa258298bcc77ec0 Mon Sep 17 00:00:00 2001
From: Mark Roberts <wizzat@gmail.com>
Date: Wed, 23 Apr 2014 00:04:09 -0700
Subject: [PATCH] Move kafka-src to servers/0.8.0/kafka-src, move
 test/resources to servers/0.8.0/resources, update fixtures, add
 build_integration.sh for getting started with development

---
 .gitmodules                                            | 6 +++---
 build_integration.sh                                   | 4 ++++
 kafka-src => servers/0.8.0/kafka-src                   | 0
 {test => servers/0.8.0}/resources/kafka.properties     | 0
 {test => servers/0.8.0}/resources/log4j.properties     | 0
 {test => servers/0.8.0}/resources/zookeeper.properties | 0
 test/fixtures.py                                       | 7 ++++---
 tox.ini                                                | 3 ---
 8 files changed, 11 insertions(+), 9 deletions(-)
 create mode 100755 build_integration.sh
 rename kafka-src => servers/0.8.0/kafka-src (100%)
 rename {test => servers/0.8.0}/resources/kafka.properties (100%)
 rename {test => servers/0.8.0}/resources/log4j.properties (100%)
 rename {test => servers/0.8.0}/resources/zookeeper.properties (100%)

diff --git a/.gitmodules b/.gitmodules
index 9b9fae9..9f003c2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "kafka-src"]
-	path = kafka-src
-	url = git://github.com/apache/kafka.git
+[submodule "servers/0.8.0/kafka-src"]
+	path = servers/0.8.0/kafka-src
+	url = https://github.com/apache/kafka.git
diff --git a/build_integration.sh b/build_integration.sh
new file mode 100755
index 0000000..cc5b9fc
--- /dev/null
+++ b/build_integration.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+git submodule update --init
+(cd servers/0.8.0/kafka-src && ./sbt update package assembly-package-dependency)
diff --git a/kafka-src b/servers/0.8.0/kafka-src
similarity index 100%
rename from kafka-src
rename to servers/0.8.0/kafka-src
diff --git a/test/resources/kafka.properties b/servers/0.8.0/resources/kafka.properties
similarity index 100%
rename from test/resources/kafka.properties
rename to servers/0.8.0/resources/kafka.properties
diff --git a/test/resources/log4j.properties b/servers/0.8.0/resources/log4j.properties
similarity index 100%
rename from test/resources/log4j.properties
rename to servers/0.8.0/resources/log4j.properties
diff --git a/test/resources/zookeeper.properties b/servers/0.8.0/resources/zookeeper.properties
similarity index 100%
rename from test/resources/zookeeper.properties
rename to servers/0.8.0/resources/zookeeper.properties
diff --git a/test/fixtures.py b/test/fixtures.py
index bb6bc87..af4c145 100644
--- a/test/fixtures.py
+++ b/test/fixtures.py
@@ -11,14 +11,15 @@ from .service import ExternalService, SpawnedService
 from .testutil import get_open_port
 
 class Fixture(object):
-    project_root = os.environ.get('PROJECT_ROOT', os.path.abspath(os.path.join(os.path.dirname(__file__), "..")))
+    kafka_version = os.environ.get('KAFKA_VERSION', '0.8.0')
     scala_version = os.environ.get("SCALA_VERSION", '2.8.0')
-    kafka_root = os.environ.get("KAFKA_ROOT", os.path.join(project_root, "kafka-src"))
+    project_root = os.environ.get('PROJECT_ROOT', os.path.abspath(os.path.join(os.path.dirname(__file__), "..")))
+    kafka_root = os.environ.get("KAFKA_ROOT", os.path.join(project_root, 'servers', kafka_version, "kafka-src"))
     ivy_root = os.environ.get('IVY_ROOT', os.path.expanduser("~/.ivy2/cache"))
 
     @classmethod
     def test_resource(cls, filename):
-        return os.path.join(cls.project_root, "test", "resources", filename)
+        return os.path.join(cls.project_root, "servers", cls.kafka_version, "resources", filename)
 
     @classmethod
     def test_classpath(cls):
diff --git a/tox.ini b/tox.ini
index 49df902..d58faa2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,6 +10,3 @@ commands =
     nosetests --with-coverage --cover-erase --cover-package kafka []
 setenv =
     PROJECT_ROOT = {toxinidir}
-    KAFKA_ROOT = {toxinidir}/kafka-src
-[pytest]
-norecursedirs = .git .tox build dist kafka-src