fix conflict

.gitignore

@@ -22,3 +22,5 @@ _release
 .lein-deps-sum
 *.iml
 
+/.project/
+/.lein-plugins/

bin/build_release.sh

@@ -1,29 +1,35 @@
 #!/bin/bash
+function quit {
+    exit 1
+}
+trap quit 1 2 3 15  #Ctrl+C exits.
 
 RELEASE=`head -1 project.clj | awk '{print $3}' | sed -e 's/\"//' | sed -e 's/\"//'`
+LEIN=`which lein2 || which lein` 
+export LEIN_ROOT=1
 
 echo Making release $RELEASE
 
 DIR=_release/storm-$RELEASE
 
 rm -rf _release
-export LEIN_ROOT=1
-rm *.zip
-rm *jar
-rm -rf lib
-rm -rf classes
-lein deps
-lein jar
-mkdir -p $DIR
-mkdir $DIR/lib
-cp storm*jar $DIR/
-cp lib/*.jar $DIR/lib
+rm -f *.zip 
+$LEIN with-profile release clean
+$LEIN with-profile release deps
+$LEIN with-profile release jar
+$LEIN with-profile release pom
+mvn dependency:copy-dependencies
+
+mkdir -p $DIR/lib
+cp target/storm-*.jar $DIR/storm-${RELEASE}.jar
+cp target/dependency/*.jar $DIR/lib
 cp CHANGELOG.md $DIR/
 
 echo $RELEASE > $DIR/RELEASE
 
-cp -R log4j $DIR/
-mkdir $DIR/logs
+mkdir -p $DIR/logback
+mkdir -p $DIR/logs
+cp -R logback/cluster.xml $DIR/logback/cluster.xml
 
 mkdir $DIR/conf
 cp conf/storm.yaml.example $DIR/conf/storm.yaml

bin/storm

@@ -239,10 +239,10 @@ def nimbus(klass="backtype.storm.daemon.nimbus"):
     See Setting up a Storm cluster for more information.
     (https://github.com/nathanmarz/storm/wiki/Setting-up-a-Storm-cluster)
     """
-    cppaths = [STORM_DIR + "/log4j", STORM_DIR + "/conf"]
+    cppaths = [STORM_DIR + "/conf"]
     jvmopts = parse_args(confvalue("nimbus.childopts", cppaths)) + [
         "-Dlogfile.name=nimbus.log",
-        "-Dlog4j.configuration=storm.log.properties",
+        "-Dlogback.configurationFile=" + STORM_DIR + "/logback/cluster.xml",
     ]
     exec_storm_class(
         klass, 
@@ -259,10 +259,10 @@ def supervisor(klass="backtype.storm.daemon.supervisor"):
     See Setting up a Storm cluster for more information.
     (https://github.com/nathanmarz/storm/wiki/Setting-up-a-Storm-cluster)
     """
-    cppaths = [STORM_DIR + "/log4j", STORM_DIR + "/conf"]
+    cppaths = [STORM_DIR + "/conf"]
     jvmopts = parse_args(confvalue("supervisor.childopts", cppaths)) + [
         "-Dlogfile.name=supervisor.log",
-        "-Dlog4j.configuration=storm.log.properties",
+        "-Dlogback.configurationFile=" + STORM_DIR + "/logback/cluster.xml",
     ]
     exec_storm_class(
         klass, 
@@ -280,16 +280,16 @@ def ui():
     See Setting up a Storm cluster for more information.
     (https://github.com/nathanmarz/storm/wiki/Setting-up-a-Storm-cluster)
     """
-    cppaths = [STORM_DIR + "/log4j", STORM_DIR + "/conf"]
+    cppaths = [STORM_DIR + "/conf"]
     jvmopts = parse_args(confvalue("ui.childopts", cppaths)) + [
         "-Dlogfile.name=ui.log",
-        "-Dlog4j.configuration=storm.log.properties",
+        "-Dlogback.configurationFile=" + STORM_DIR + "/logback/cluster.xml",
     ]
     exec_storm_class(
         "backtype.storm.ui.core", 
         jvmtype="-server", 
         jvmopts=jvmopts, 
-        extrajars=[STORM_DIR + "/log4j", STORM_DIR, STORM_DIR + "/conf"])
+        extrajars=[STORM_DIR, STORM_DIR + "/conf"])
 
 def drpc():
     """Syntax: [storm drpc]
@@ -300,12 +300,15 @@ def drpc():
     See Distributed RPC for more information.
     (https://github.com/nathanmarz/storm/wiki/Distributed-RPC)
     """
-    jvmopts = ["-Xmx768m", "-Dlogfile.name=drpc.log", "-Dlog4j.configuration=storm.log.properties"]
+    jvmopts = ["-Xmx768m", 
+        "-Dlogfile.name=drpc.log", 
+        "-Dlogback.configurationFile=" + STORM_DIR + "/logback/cluster.xml"
+    ]
     exec_storm_class(
         "backtype.storm.daemon.drpc", 
         jvmtype="-server", 
         jvmopts=jvmopts, 
-        extrajars=[STORM_DIR + "/log4j", STORM_DIR + "/conf"])
+        extrajars=[STORM_DIR + "/conf"])
 
 def dev_zookeeper():
     """Syntax: [storm dev-zookeeper]
@@ -314,11 +317,11 @@ def dev_zookeeper():
     "storm.zookeeper.port" as its port. This is only intended for development/testing, the
     Zookeeper instance launched is not configured to be used in production.
     """
-    cppaths = [STORM_DIR + "/log4j", STORM_DIR + "/conf"]
+    cppaths = [STORM_DIR + "/conf"]
     exec_storm_class(
         "backtype.storm.command.dev_zookeeper", 
         jvmtype="-server", 
-        extrajars=[STORM_DIR + "/log4j", STORM_DIR + "/conf"])
+        extrajars=[STORM_DIR + "/conf"])
 
 def version():
   """Syntax: [storm version]

bin/to_maven.sh

@@ -1,22 +1,30 @@
-#!/bin/bash
+#!/bin/bash 
+function quit {
+    exit 1
+}
+trap quit 1 2 3 15  #Ctrl+C exits.
 
 RELEASE=`head -1 project.clj | awk '{print $3}' | sed -e 's/\"//' | sed -e 's/\"//'`
+LEIN=`which lein2 || which lein`
+
+echo ==== Storm Jar ====
+$LEIN with-profile release clean
+$LEIN with-profile release jar
+$LEIN with-profile release pom
+scp target/storm*jar pom.xml clojars@clojars.org:
+rm -Rf target *.xml
+
+echo ==== Storm-Lib Jar ====
+rm conf/logback.xml
+$LEIN with-profile lib clean
+$LEIN with-profile lib jar
+$LEIN with-profile lib pom
+sed -i '' -e 's/artifactId\>storm/artifactId\>storm-lib/g' pom.xml
+mv target/storm-$RELEASE.jar target/storm-lib-$RELEASE.jar
+scp target/storm*jar pom.xml clojars@clojars.org:
+rm -Rf target *.xml
+
+git checkout conf/logback.xml
+
 
-rm -rf classes
-rm *jar
-rm *xml
-lein jar
-lein pom
-scp storm*jar pom.xml clojars@clojars.org:
 
-rm *jar
-rm -rf classes
-rm conf/log4j.properties
-lein jar
-mv pom.xml old-pom.xml
-sed 's/artifactId\>storm/artifactId\>storm-lib/g' old-pom.xml > pom.xml
-mv storm-$RELEASE.jar storm-lib-$RELEASE.jar
-scp storm*jar pom.xml clojars@clojars.org:
-rm *xml
-rm *jar
-git checkout conf/log4j.properties

conf/logback.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<configuration scan="true" scanPeriod="30 seconds">
+  <appender name="A1" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%-4r [%t] %-5p %c - %m%n</pattern>
+    </encoder>
+  </appender>
+  <logger name="org.apache.zookeeper" level="WARN"/>
+  <root level="INFO">
+    <appender-ref ref="A1"/>
+  </root>
+</configuration>

logback/cluster.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<configuration scan="true" scanPeriod="60 seconds">
+ <appender name="A1" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${storm.home}/logs/${logfile.name}</file>
+    <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+      <fileNamePattern>${storm.home}/logs/${logfile.name}.%i</fileNamePattern>
+      <minIndex>1</minIndex>
+      <maxIndex>9</maxIndex>
+    </rollingPolicy>
+
+    <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+      <maxFileSize>100MB</maxFileSize>
+    </triggeringPolicy>
+
+    <encoder>
+      <pattern>%d{yyyy-MM-dd HH:mm:ss} %c{1} [%p] %m%n</pattern>
+    </encoder>
+  </appender> 
+
+  <root level="INFO">
+    <appender-ref ref="A1"/>
+  </root>
+</configuration>

project.clj

@@ -1,38 +1,50 @@
-(defproject storm "0.8.2-wip1"
-  :source-path "src/clj"
-  :test-path "test/clj"
-  :java-source-path "src/jvm"
-  :javac-options {:debug "true" :fork "true"}
-  :resources-path "conf"
-  :dev-resources-path "src/dev"
-  :repositories {"sonatype" "http://oss.sonatype.org/content/groups/public/"}
+
+(defproject storm/storm "0.9.0-SNAPSHOT"
+  :url "http://storm-project.clj"
+  :description "Distributed and fault-tolerant realtime computation"
+  :license {:name "Eclipse Public License - Version 1.0" :url "https://github.com/nathanmarz/storm/blob/master/LICENSE.html"}
   :dependencies [[org.clojure/clojure "1.4.0"]
                  [commons-io "1.4"]
                  [org.apache.commons/commons-exec "1.1"]
-                 [storm/libthrift7 "0.7.0"]
+                 [storm/libthrift7 "0.7.0"
+                  :exclusions [org.slf4j/slf4j-api]]
                  [clj-time "0.4.1"]
-                 [log4j/log4j "1.2.16"]
-                 [com.netflix.curator/curator-framework "1.0.1"]
+                 [com.netflix.curator/curator-framework "1.0.1"
+                  :exclusions [log4j/log4j]]
                  [backtype/jzmq "2.1.0"]
                  [com.googlecode.json-simple/json-simple "1.1"]
                  [compojure "0.6.4"]
                  [hiccup "0.3.6"]
                  [ring/ring-jetty-adapter "0.3.11"]
                  [org.clojure/tools.logging "0.2.3"]
                  [org.clojure/math.numeric-tower "0.0.1"]
-                 [org.slf4j/slf4j-log4j12 "1.5.8"]
                  [storm/carbonite "1.5.0"]
                  [org.yaml/snakeyaml "1.9"]
                  [org.apache.httpcomponents/httpclient "4.1.1"]
                  [storm/tools.cli "0.2.2"]
                  [com.googlecode.disruptor/disruptor "2.10.1"]
                  [storm/jgrapht "0.8.3"]
-                 [com.google.guava/guava "13.0"]
-                 ]
-  :dev-dependencies [
-                     [swank-clojure "1.4.0-SNAPSHOT" :exclusions [org.clojure/clojure]]
-                    ]
+                 [com.google.guava/guava "13.0"]]
+
+  :source-paths ["src/clj"]
+  :java-source-paths ["src/jvm"]
+  :test-paths ["test/clj"]
+  :resource-paths ["conf"]
+
+  :profiles {:dev {:resource-paths ["src/dev"]
+                   :dependencies [[ch.qos.logback/logback-classic "1.0.6"]
+                                  [org.slf4j/log4j-over-slf4j "1.6.6"]]}
+             :release {:dependencies [[ch.qos.logback/logback-classic "1.0.6"]
+                                      [org.slf4j/log4j-over-slf4j "1.6.6"]]}
+             :lib {:dependencies [[log4j/log4j "1.2.16"]]}}
+
+  :plugins [[lein-swank "1.4.4"]]
+
+  :repositories {"sonatype"
+                 "http://oss.sonatype.org/content/groups/public/"}
+
+  :javac-options {:debug true}
   :jvm-opts ["-Djava.library.path=/usr/local/lib:/opt/local/lib:/usr/lib"]
-  :extra-classpath-dirs ["src/ui"]
+
   :aot :all
-)
+  :min-lein-version "2.0.0")

src/clj/backtype/storm/bootstrap.clj

@@ -28,7 +28,7 @@
                       [event :as event] [process-simulator :as psim]]))
      (require (quote [clojure.set :as set]))
      (require (quote [backtype.storm [stats :as stats] [disruptor :as disruptor]]))
-     (import (quote [org.apache.log4j PropertyConfigurator Logger]))
+     (import (quote [org.slf4j Logger]))
 
      (import (quote [backtype.storm.generated Nimbus Nimbus$Processor
                      Nimbus$Iface StormTopology ShellComponent

src/clj/backtype/storm/daemon/supervisor.clj

@@ -411,7 +411,7 @@
                        " -Djava.library.path=" (conf JAVA-LIBRARY-PATH)
                        " -Dlogfile.name=" logfilename
                        " -Dstorm.home=" (System/getProperty "storm.home")
-                       " -Dlog4j.configuration=storm.log.properties"
+                       " -Dlogback.configurationFile=logback/cluster.xml"
                        " -cp " classpath " backtype.storm.daemon.worker "
                        (java.net.URLEncoder/encode storm-id) " " (:supervisor-id supervisor)
                        " " port " " worker-id)]

src/clj/backtype/storm/daemon/worker.clj

@@ -324,7 +324,7 @@
   (log-message "Launching worker for " storm-id " on " supervisor-id ":" port " with id " worker-id
                " and conf " conf)
   (if-not (local-mode? conf)
-    (redirect-stdio-to-log4j!))
+    (redirect-stdio-to-slf4j!))
   ;; because in local mode, its not a separate
   ;; process. supervisor will register it in this case
   (when (= :distributed (cluster-mode conf))

src/clj/backtype/storm/util.clj

@@ -675,7 +675,7 @@
 (defn throw-runtime [& strs]
   (throw (RuntimeException. (apply str strs))))
 
-(defn redirect-stdio-to-log4j! []
+(defn redirect-stdio-to-slf4j! []
   ;; set-var-root doesn't work with *out* and *err*, so digging much deeper here
   ;; Unfortunately, this code seems to work at the REPL but not when spawned as worker processes
   ;; it might have something to do with being a child process

src/jvm/backtype/storm/StormSubmitter.java

@@ -7,7 +7,8 @@
 import java.nio.ByteBuffer;
 import java.util.HashMap;
 import java.util.Map;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.thrift7.TException;
 import org.json.simple.JSONValue;
 
@@ -17,7 +18,7 @@
  * submit your topologies.
  */
 public class StormSubmitter {
-    public static Logger LOG = Logger.getLogger(StormSubmitter.class);    
+    public static Logger LOG = LoggerFactory.getLogger(StormSubmitter.class);    
 
     private static Nimbus.Iface localNimbus = null;
 

src/jvm/backtype/storm/coordination/BatchBoltExecutor.java

@@ -11,10 +11,11 @@
 import backtype.storm.utils.Utils;
 import java.util.HashMap;
 import java.util.Map;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class BatchBoltExecutor implements IRichBolt, FinishedCallback, TimeoutCallback {
-    public static Logger LOG = Logger.getLogger(BatchBoltExecutor.class);    
+    public static Logger LOG = LoggerFactory.getLogger(BatchBoltExecutor.class);    
 
     byte[] _boltSer;
     Map<Object, IBatchBolt> _openTransactions;