incubator-kafka-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nehanarkh...@apache.org
Subject svn commit: r1211616 - in /incubator/kafka/trunk: bin/ contrib/hadoop-consumer/lib/ contrib/hadoop-producer/lib/ core/src/main/scala/kafka/utils/ lib/ project/build/
Date Wed, 07 Dec 2011 20:14:15 GMT
Author: nehanarkhede
Date: Wed Dec  7 20:14:15 2011
New Revision: 1211616

URL: http://svn.apache.org/viewvc?rev=1211616&view=rev
Log:
KAFKA 222 Mavenize contrib;patched by nehanarkhede; reviewed jakobhoman and junrao

Removed:
    incubator/kafka/trunk/contrib/hadoop-consumer/lib/avro-1.4.0.jar
    incubator/kafka/trunk/contrib/hadoop-consumer/lib/commons-logging-1.0.4.jar
    incubator/kafka/trunk/contrib/hadoop-consumer/lib/hadoop-0.20.2-core.jar
    incubator/kafka/trunk/contrib/hadoop-consumer/lib/jackson-core-asl-1.5.5.jar
    incubator/kafka/trunk/contrib/hadoop-consumer/lib/jackson-mapper-asl-1.5.5.jar
    incubator/kafka/trunk/contrib/hadoop-producer/lib/avro-1.4.0.jar
    incubator/kafka/trunk/contrib/hadoop-producer/lib/commons-logging-1.0.4.jar
    incubator/kafka/trunk/contrib/hadoop-producer/lib/hadoop-0.20.2-core.jar
    incubator/kafka/trunk/contrib/hadoop-producer/lib/jackson-core-asl-1.5.5.jar
    incubator/kafka/trunk/contrib/hadoop-producer/lib/jackson-mapper-asl-1.5.5.jar
    incubator/kafka/trunk/lib/apache-rat-0.8-SNAPSHOT.jar
Modified:
    incubator/kafka/trunk/bin/run-rat.sh
    incubator/kafka/trunk/core/src/main/scala/kafka/utils/Logging.scala
    incubator/kafka/trunk/project/build/KafkaProject.scala

Modified: incubator/kafka/trunk/bin/run-rat.sh
URL: http://svn.apache.org/viewvc/incubator/kafka/trunk/bin/run-rat.sh?rev=1211616&r1=1211615&r2=1211616&view=diff
==============================================================================
--- incubator/kafka/trunk/bin/run-rat.sh (original)
+++ incubator/kafka/trunk/bin/run-rat.sh Wed Dec  7 20:14:15 2011
@@ -23,7 +23,7 @@ else
   JAVA="$JAVA_HOME/bin/java"
 fi
 
-rat_command="$JAVA -jar $base_dir/lib/apache-rat-0.8-SNAPSHOT.jar --dir $base_dir "
+rat_command="$JAVA -jar $base_dir/lib_managed/scala_2.8.0/compile/apache-rat-0.8.jar --dir
$base_dir "
 
 for f in $(cat $rat_excludes_file);
 do

Modified: incubator/kafka/trunk/core/src/main/scala/kafka/utils/Logging.scala
URL: http://svn.apache.org/viewvc/incubator/kafka/trunk/core/src/main/scala/kafka/utils/Logging.scala?rev=1211616&r1=1211615&r2=1211616&view=diff
==============================================================================
--- incubator/kafka/trunk/core/src/main/scala/kafka/utils/Logging.scala (original)
+++ incubator/kafka/trunk/core/src/main/scala/kafka/utils/Logging.scala Wed Dec  7 20:14:15
2011
@@ -1,3 +1,20 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package kafka.utils
 
 import org.apache.log4j.Logger

Modified: incubator/kafka/trunk/project/build/KafkaProject.scala
URL: http://svn.apache.org/viewvc/incubator/kafka/trunk/project/build/KafkaProject.scala?rev=1211616&r1=1211615&r2=1211616&view=diff
==============================================================================
--- incubator/kafka/trunk/project/build/KafkaProject.scala (original)
+++ incubator/kafka/trunk/project/build/KafkaProject.scala Wed Dec  7 20:14:15 2011
@@ -31,16 +31,13 @@ class KafkaProject(info: ProjectInfo) ex
   lazy val releaseZip = releaseZipTask dependsOn(core.corePackageAction, core.test, examples.examplesPackageAction,
     contrib.producerPackageAction, contrib.consumerPackageAction) describedAs releaseZipDescription
 
-  // Not sure why rat does not get pulled from a Maven repo automatically.
-  val rat = "org.apache.rat" % "apache-rat-project" % "0.7"
-
   val runRatDescription = "Runs Apache rat on Kafka"
   lazy val runRatTask = task {
-    val rat = "org.apache.rat" % "apache-rat-project" % "0.7"
     Runtime.getRuntime().exec("bin/run-rat.sh")
     None
   } describedAs runRatDescription
 
+  val rat = "org.apache.rat" % "apache-rat" % "0.8"
 
   class CoreKafkaProject(info: ProjectInfo) extends DefaultProject(info)
      with IdeaProject with CoreDependencies with TestDependencies with CompressionDependencies
{
@@ -200,7 +197,7 @@ class KafkaProject(info: ProjectInfo) ex
 
     class HadoopProducerProject(info: ProjectInfo) extends DefaultProject(info)
       with IdeaProject
-      with CoreDependencies {
+      with CoreDependencies with HadoopDependencies {
       val producerPackageAction = packageAllAction
       override def ivyXML =
        <dependencies>
@@ -210,11 +207,11 @@ class KafkaProject(info: ProjectInfo) ex
            <exclude module="jmxtools"/>
            <exclude module="mail"/>
            <exclude module="jms"/>
+         <dependency org="org.apache.hadoop" name="hadoop-core" rev="0.20.2">
+           <exclude module="junit"/>
+         </dependency>
        </dependencies>
 
-      val avro = "org.apache.avro" % "avro" % "1.4.1"
-      val jacksonCore = "org.codehaus.jackson" % "jackson-core-asl" % "1.5.5"
-      val jacksonMapper = "org.codehaus.jackson" % "jackson-mapper-asl" % "1.5.5"
     }
 
     class HadoopConsumerProject(info: ProjectInfo) extends DefaultProject(info)
@@ -229,10 +226,13 @@ class KafkaProject(info: ProjectInfo) ex
            <exclude module="jmxtools"/>
            <exclude module="mail"/>
            <exclude module="jms"/>
+           <exclude module=""/>
+         <dependency org="org.apache.hadoop" name="hadoop-core" rev="0.20.2">
+           <exclude module="junit"/>
+         </dependency>
        </dependencies>
 
       val jodaTime = "joda-time" % "joda-time" % "1.6"
-      val httpclient = "commons-httpclient" % "commons-httpclient" % "3.1"
     }
   }
 
@@ -247,6 +247,14 @@ class KafkaProject(info: ProjectInfo) ex
     val jopt = "net.sf.jopt-simple" % "jopt-simple" % "3.2"
   }
   
+  trait HadoopDependencies {
+    val avro = "org.apache.avro" % "avro" % "1.4.0"
+    val commonsLogging = "commons-logging" % "commons-logging" % "1.0.4"
+    val jacksonCore = "org.codehaus.jackson" % "jackson-core-asl" % "1.5.5"
+    val jacksonMapper = "org.codehaus.jackson" % "jackson-mapper-asl" % "1.5.5"
+    val hadoop = "org.apache.hadoop" % "hadoop-core" % "0.20.2"
+  }
+
   trait CompressionDependencies {
     val snappy = "org.xerial.snappy" % "snappy-java" % "1.0.4.1"	
   }



Mime
View raw message