Pulling latest master, v0.6 into the compression branch

Author: Neha Narkhede

.classpath

@@ -1,2 +1,8 @@
 dist
 *classes
+target/
+lib_managed/
+src_managed/
+project/boot/
+project/plugins/project/
+project/sbt_project_definition.iml

.gitignore

@@ -5,3 +5,6 @@ Neha Narkhede
 Fatih Emekci
 Lin Guo
 Shirshanka Das
+Roshan Sumbaly
+Sam Shah
+Chris Burroughs

CONTRIBUTORS

@@ -11,10 +11,45 @@ Kafka is aimed at providing a publish-subscribe solution that can handle all act
 
 See our [web site](http://sna-projects.com/kafka) for more details on the project.
 
+## Contribution ##
+
 Kafka is a new project, and we are interested in building the community; we would welcome any thoughts or patches. You can reach us [here](http://groups.google.com/group/kafka-dev). 
 
 To get kafka code:
   git clone [email protected]:kafka-dev/kafka.git kafka
 
-To run unit tests:
-  ant test (you need to make sure that scala 2.8.0 is in your PATH)
+To build: 
+
+1. ./sbt
+2. update - This downloads all the dependencies for all sub projects
+3. package - This will compile all sub projects and creates all the jars
+
+Here are some useful sbt commands, to be executed at the sbt command prompt (./sbt) -
+
+actions : Lists all the sbt commands and their descriptions
+
+clean : Deletes all generated files (the target directory).
+
+clean-cache : Deletes the cache of artifacts downloaded for automatically managed dependencies.
+
+clean-lib : Deletes the managed library directory.
+
+compile : Compile all the sub projects, but not create the jars
+
+test : Run all unit tests in all sub projects
+
+release-zip : Create all the jars, run unit tests and create a deployable release zip
+
+package-all: Creates jars for src, test, docs etc
+
+projects : List all the sub projects 
+
+project sub_project_name : Switch to a particular sub-project. For example, to switch to the core kafka code, use "project core-kafka"
+
+Following commands can be run only on a particular sub project -
+
+test-only package.test.TestName : Runs only the specified test in the current sub project
+
+run : Provides options to run any of the classes that have a main method. For example, you can switch to project java-examples, and run the examples there by executing "project java-examples" followed by "run" 
+
+

README.md

@@ -5,7 +5,3 @@ log4j.appender.stderr.target=System.err
 log4j.appender.stderr.layout=org.apache.log4j.PatternLayout
 log4j.appender.stderr.layout.ConversionPattern=[%d] %p %m (%c)%n
 
-# Turn on all our debugging info
-#log4j.logger=DEBUG
-#log4j.logger.httpclient.wire=DEBUG
-log4j.logger.org.mortbay.log=WARN

contrib/deploy/resources/log4j-stderr.properties bin/kafka-console-consumer-log4j.properties

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+base_dir=$(dirname $0)
+export KAFKA_OPTS="-Xmx512M -server -Dcom.sun.management.jmxremote -Dlog4j.configuration=file:$base_dir/kafka-console-consumer-log4j.properties"
+$base_dir/kafka-run-class.sh kafka.consumer.ConsoleConsumer $@

bin/kafka-console-consumer.sh

@@ -8,28 +8,40 @@ fi
 
 base_dir=$(dirname $0)/..
 
-#CLASSPATH=$CLASSPATH:bin
-
-for file in $base_dir/dist/*.jar;
+for file in $base_dir/project/boot/scala-2.8.0/lib/*.jar;
 do
   CLASSPATH=$CLASSPATH:$file
 done
 
-for file in $base_dir/lib/*.jar;
+for file in $base_dir/core/target/scala_2.8.0/*.jar;
 do
   CLASSPATH=$CLASSPATH:$file
 done
 
-CLASSPATH=dist:$CLASSPATH
+for file in $base_dir/core/lib/*.jar;
+do
+  CLASSPATH=$CLASSPATH:$file
+done
 
+for file in $base_dir/core/lib_managed/scala_2.8.0/compile/*.jar;
+do
+  if [ ${file##*/} != "sbt-launch.jar" ]; then
+    CLASSPATH=$CLASSPATH:$file
+  fi
+done
+if [ -z "$KAFKA_JMX_OPTS" ]; then
+  KAFKA_JMX_OPTS="-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false  -Dcom.sun.management.jmxremote.ssl=false "
+fi
 if [ -z "$KAFKA_OPTS" ]; then
-  KAFKA_OPTS="-Xmx512M -server -Dcom.sun.management.jmxremote"
+  KAFKA_OPTS="-Xmx512M -server  -Dlog4j.configuration=file:$base_dir/config/log4j.properties"
+fi
+if [  $JMX_PORT ]; then
+  KAFKA_JMX_OPTS="$KAFKA_JMX_OPTS -Dcom.sun.management.jmxremote.port=$JMX_PORT "
 fi
-
 if [ -z "$JAVA_HOME" ]; then
   JAVA="java"
 else
   JAVA="$JAVA_HOME/bin/java"
 fi
 
-$JAVA $KAFKA_OPTS -cp $CLASSPATH $@
+$JAVA $KAFKA_OPTS $KAFKA_JMX_OPTS -cp $CLASSPATH $@

bin/kafka-consumer-perf-test.sh

@@ -6,4 +6,6 @@ then
 	exit 1
 fi
 
+export JMX_PORT="9999"
+
 $(dirname $0)/kafka-run-class.sh kafka.Kafka $@

bin/kafka-producer-perf-test.sh

@@ -0,0 +1,2 @@
+lib
+classes