You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gearpump.apache.org by ma...@apache.org on 2016/06/06 08:32:04 UTC
incubator-gearpump git commit: fix GEARPUMP-139 correct shaded
libraries's package name
Repository: incubator-gearpump
Updated Branches:
refs/heads/master ec04cf766 -> ae3204930
fix GEARPUMP-139 correct shaded libraries's package name
Author: huafengw <fv...@gmail.com>
Closes #35 from huafengw/rename.
Project: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/commit/ae320493
Tree: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/tree/ae320493
Diff: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/diff/ae320493
Branch: refs/heads/master
Commit: ae3204930e93bac5a64ea561ad16c67cdc44da0f
Parents: ec04cf7
Author: huafengw <fv...@gmail.com>
Authored: Mon Jun 6 16:31:57 2016 +0800
Committer: manuzhang <ow...@gmail.com>
Committed: Mon Jun 6 16:31:57 2016 +0800
----------------------------------------------------------------------
.../org/apache/gearpump/transport/netty/MessageBatch.java | 2 +-
.../main/scala/org/apache/gearpump/cluster/UserConfig.scala | 2 +-
.../scala/org/apache/gearpump/metrics/AkkaReporter.scala | 2 +-
.../src/main/scala/org/apache/gearpump/metrics/Counter.scala | 4 ++--
.../main/scala/org/apache/gearpump/metrics/Histogram.scala | 4 ++--
.../scala/org/apache/gearpump/metrics/JvmMetricsSet.scala | 4 ++--
core/src/main/scala/org/apache/gearpump/metrics/Meter.scala | 2 +-
.../src/main/scala/org/apache/gearpump/metrics/Metrics.scala | 2 +-
.../org/apache/gearpump/metrics/MetricsReporterService.scala | 4 ++--
.../org/apache/gearpump/serializer/FastKryoSerializer.scala | 6 +++---
.../apache/gearpump/serializer/GearpumpSerialization.scala | 2 +-
core/src/main/scala/org/apache/gearpump/util/FileUtils.scala | 2 +-
.../test/scala/org/apache/gearpump/metrics/MetricsSpec.scala | 2 +-
.../org/apache/gearpump/serializer/SerializerSpec.scala | 4 ++--
.../test/scala/org/apache/gearpump/util/FileUtilsSpec.scala | 2 +-
.../test/scala/org/apache/gearpump/util/FileServerSpec.scala | 2 +-
project/Build.scala | 8 ++++----
.../apache/gearpump/streaming/appmaster/ClockService.scala | 2 +-
.../gearpump/streaming/metrics/ProcessorAggregator.scala | 2 +-
.../apache/gearpump/streaming/task/SerializerResolver.scala | 2 +-
.../org/apache/gearpump/streaming/task/Subscription.scala | 2 +-
.../scala/org/apache/gearpump/streaming/task/TaskActor.scala | 2 +-
22 files changed, 32 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ae320493/core/src/main/java/org/apache/gearpump/transport/netty/MessageBatch.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/gearpump/transport/netty/MessageBatch.java b/core/src/main/java/org/apache/gearpump/transport/netty/MessageBatch.java
index 7ee85f3..d9de871 100644
--- a/core/src/main/java/org/apache/gearpump/transport/netty/MessageBatch.java
+++ b/core/src/main/java/org/apache/gearpump/transport/netty/MessageBatch.java
@@ -18,7 +18,7 @@
package org.apache.gearpump.transport.netty;
-import io.gearpump.google.common.io.Closeables;
+import org.apache.gearpump.google.common.io.Closeables;
import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.buffer.ChannelBufferOutputStream;
import org.jboss.netty.buffer.ChannelBuffers;
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ae320493/core/src/main/scala/org/apache/gearpump/cluster/UserConfig.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/gearpump/cluster/UserConfig.scala b/core/src/main/scala/org/apache/gearpump/cluster/UserConfig.scala
index 28a4907..3f42808 100644
--- a/core/src/main/scala/org/apache/gearpump/cluster/UserConfig.scala
+++ b/core/src/main/scala/org/apache/gearpump/cluster/UserConfig.scala
@@ -21,7 +21,7 @@ package org.apache.gearpump.cluster
import akka.actor.{ActorSystem, ExtendedActorSystem}
import akka.serialization.JavaSerializer
-import io.gearpump.google.common.io.BaseEncoding
+import org.apache.gearpump.google.common.io.BaseEncoding
/**
* Immutable configuration
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ae320493/core/src/main/scala/org/apache/gearpump/metrics/AkkaReporter.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/gearpump/metrics/AkkaReporter.scala b/core/src/main/scala/org/apache/gearpump/metrics/AkkaReporter.scala
index 7010048..acd9493 100644
--- a/core/src/main/scala/org/apache/gearpump/metrics/AkkaReporter.scala
+++ b/core/src/main/scala/org/apache/gearpump/metrics/AkkaReporter.scala
@@ -22,7 +22,7 @@ import scala.collection.JavaConverters._
import akka.actor.{ActorRef, ActorSystem}
-import io.gearpump.codahale.metrics.{Gauge => CodaGauge, MetricRegistry}
+import org.apache.gearpump.codahale.metrics.{Gauge => CodaGauge, MetricRegistry}
import org.apache.gearpump.metrics.Metrics.{Counter => CounterData, Gauge => GaugeData, Histogram => HistogramData, Meter => MeterData}
import org.apache.gearpump.metrics.MetricsReporterService.ReportTo
import org.apache.gearpump.util.LogUtil
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ae320493/core/src/main/scala/org/apache/gearpump/metrics/Counter.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/gearpump/metrics/Counter.scala b/core/src/main/scala/org/apache/gearpump/metrics/Counter.scala
index a6ce799..2a4a195 100644
--- a/core/src/main/scala/org/apache/gearpump/metrics/Counter.scala
+++ b/core/src/main/scala/org/apache/gearpump/metrics/Counter.scala
@@ -18,10 +18,10 @@
package org.apache.gearpump.metrics
-import io.gearpump.codahale.metrics.{Counter => CodaHaleCounter}
+import org.apache.gearpump.codahale.metrics.{Counter => CodaHaleCounter}
/**
- * @see io.gearpump.codahale.metrics.Counter
+ * @see org.apache.gearpump.codahale.metrics.Counter
*/
class Counter(val name: String, counter: CodaHaleCounter, sampleRate: Int = 1) {
private var sampleCount = 0L
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ae320493/core/src/main/scala/org/apache/gearpump/metrics/Histogram.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/gearpump/metrics/Histogram.scala b/core/src/main/scala/org/apache/gearpump/metrics/Histogram.scala
index 7d7e19b..9d1e500 100644
--- a/core/src/main/scala/org/apache/gearpump/metrics/Histogram.scala
+++ b/core/src/main/scala/org/apache/gearpump/metrics/Histogram.scala
@@ -18,10 +18,10 @@
package org.apache.gearpump.metrics
-import io.gearpump.codahale.metrics.{Histogram => CodaHaleHistogram}
+import org.apache.gearpump.codahale.metrics.{Histogram => CodaHaleHistogram}
/**
- * @see io.gearpump.codahale.metrics.Histogram
+ * @see org.apache.gearpump.codahale.metrics.Histogram
*/
class Histogram(val name: String, histogram: CodaHaleHistogram, sampleRate: Int = 1) {
private var sampleCount = 0L
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ae320493/core/src/main/scala/org/apache/gearpump/metrics/JvmMetricsSet.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/gearpump/metrics/JvmMetricsSet.scala b/core/src/main/scala/org/apache/gearpump/metrics/JvmMetricsSet.scala
index 87db442..436d14f 100644
--- a/core/src/main/scala/org/apache/gearpump/metrics/JvmMetricsSet.scala
+++ b/core/src/main/scala/org/apache/gearpump/metrics/JvmMetricsSet.scala
@@ -21,8 +21,8 @@ package org.apache.gearpump.metrics
import java.util
import scala.collection.JavaConverters._
-import io.gearpump.codahale.metrics.jvm.{MemoryUsageGaugeSet, ThreadStatesGaugeSet}
-import io.gearpump.codahale.metrics.{Metric, MetricSet}
+import org.apache.gearpump.codahale.metrics.jvm.{MemoryUsageGaugeSet, ThreadStatesGaugeSet}
+import org.apache.gearpump.codahale.metrics.{Metric, MetricSet}
class JvmMetricsSet(name: String) extends MetricSet {
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ae320493/core/src/main/scala/org/apache/gearpump/metrics/Meter.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/gearpump/metrics/Meter.scala b/core/src/main/scala/org/apache/gearpump/metrics/Meter.scala
index 6d89456..d4b7871 100644
--- a/core/src/main/scala/org/apache/gearpump/metrics/Meter.scala
+++ b/core/src/main/scala/org/apache/gearpump/metrics/Meter.scala
@@ -18,7 +18,7 @@
package org.apache.gearpump.metrics
-import io.gearpump.codahale.metrics.{Meter => CodaHaleMeter}
+import org.apache.gearpump.codahale.metrics.{Meter => CodaHaleMeter}
/** See org.apache.gearpump.codahale.metrics.Meter */
class Meter(val name: String, meter: CodaHaleMeter, sampleRate: Int = 1) {
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ae320493/core/src/main/scala/org/apache/gearpump/metrics/Metrics.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/gearpump/metrics/Metrics.scala b/core/src/main/scala/org/apache/gearpump/metrics/Metrics.scala
index 54d8c6a..1ee3798 100644
--- a/core/src/main/scala/org/apache/gearpump/metrics/Metrics.scala
+++ b/core/src/main/scala/org/apache/gearpump/metrics/Metrics.scala
@@ -23,7 +23,7 @@ import scala.collection.JavaConverters._
import akka.actor._
import org.slf4j.Logger
-import io.gearpump.codahale.metrics._
+import org.apache.gearpump.codahale.metrics._
import org.apache.gearpump.metrics
import org.apache.gearpump.util.LogUtil
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ae320493/core/src/main/scala/org/apache/gearpump/metrics/MetricsReporterService.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/gearpump/metrics/MetricsReporterService.scala b/core/src/main/scala/org/apache/gearpump/metrics/MetricsReporterService.scala
index 9b506af..94aa114 100644
--- a/core/src/main/scala/org/apache/gearpump/metrics/MetricsReporterService.scala
+++ b/core/src/main/scala/org/apache/gearpump/metrics/MetricsReporterService.scala
@@ -24,8 +24,8 @@ import scala.concurrent.duration._
import akka.actor.{Actor, ActorRef}
-import io.gearpump.codahale.metrics.graphite.{Graphite, GraphiteReporter}
-import io.gearpump.codahale.metrics.{MetricFilter, Slf4jReporter}
+import org.apache.gearpump.codahale.metrics.graphite.{Graphite, GraphiteReporter}
+import org.apache.gearpump.codahale.metrics.{MetricFilter, Slf4jReporter}
import org.apache.gearpump.metrics.Metrics.{DemandMoreMetrics, ReportMetrics}
import org.apache.gearpump.metrics.MetricsReporterService.ReportTo
import org.apache.gearpump.util.Constants._
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ae320493/core/src/main/scala/org/apache/gearpump/serializer/FastKryoSerializer.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/gearpump/serializer/FastKryoSerializer.scala b/core/src/main/scala/org/apache/gearpump/serializer/FastKryoSerializer.scala
index ed1e347..f258c0f 100644
--- a/core/src/main/scala/org/apache/gearpump/serializer/FastKryoSerializer.scala
+++ b/core/src/main/scala/org/apache/gearpump/serializer/FastKryoSerializer.scala
@@ -20,9 +20,9 @@ package org.apache.gearpump.serializer
import akka.actor.ExtendedActorSystem
-import io.gearpump.esotericsoftware.kryo.Kryo.DefaultInstantiatorStrategy
-import io.gearpump.objenesis.strategy.StdInstantiatorStrategy
-import io.gearpump.romix.serialization.kryo.KryoSerializerWrapper
+import org.apache.gearpump.esotericsoftware.kryo.Kryo.DefaultInstantiatorStrategy
+import org.apache.gearpump.objenesis.strategy.StdInstantiatorStrategy
+import org.apache.gearpump.romix.serialization.kryo.KryoSerializerWrapper
import org.apache.gearpump.serializer.FastKryoSerializer.KryoSerializationException
import org.apache.gearpump.util.LogUtil
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ae320493/core/src/main/scala/org/apache/gearpump/serializer/GearpumpSerialization.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/gearpump/serializer/GearpumpSerialization.scala b/core/src/main/scala/org/apache/gearpump/serializer/GearpumpSerialization.scala
index f9c6299..524089d 100644
--- a/core/src/main/scala/org/apache/gearpump/serializer/GearpumpSerialization.scala
+++ b/core/src/main/scala/org/apache/gearpump/serializer/GearpumpSerialization.scala
@@ -21,7 +21,7 @@ package org.apache.gearpump.serializer
import com.typesafe.config.Config
import org.slf4j.Logger
-import io.gearpump.esotericsoftware.kryo.{Kryo, Serializer => KryoSerializer}
+import org.apache.gearpump.esotericsoftware.kryo.{Kryo, Serializer => KryoSerializer}
import org.apache.gearpump.util.{Constants, LogUtil}
class GearpumpSerialization(config: Config) {
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ae320493/core/src/main/scala/org/apache/gearpump/util/FileUtils.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/gearpump/util/FileUtils.scala b/core/src/main/scala/org/apache/gearpump/util/FileUtils.scala
index d13f514..e3df37b 100644
--- a/core/src/main/scala/org/apache/gearpump/util/FileUtils.scala
+++ b/core/src/main/scala/org/apache/gearpump/util/FileUtils.scala
@@ -21,7 +21,7 @@ package org.apache.gearpump.util
import java.io.{File, IOException}
import java.nio.charset.Charset
-import io.gearpump.google.common.io.Files
+import org.apache.gearpump.google.common.io.Files
object FileUtils {
private val UTF8 = Charset.forName("UTF-8")
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ae320493/core/src/test/scala/org/apache/gearpump/metrics/MetricsSpec.scala
----------------------------------------------------------------------
diff --git a/core/src/test/scala/org/apache/gearpump/metrics/MetricsSpec.scala b/core/src/test/scala/org/apache/gearpump/metrics/MetricsSpec.scala
index aa27d8f..5881640 100644
--- a/core/src/test/scala/org/apache/gearpump/metrics/MetricsSpec.scala
+++ b/core/src/test/scala/org/apache/gearpump/metrics/MetricsSpec.scala
@@ -23,7 +23,7 @@ import org.mockito.Mockito._
import org.scalatest.mock.MockitoSugar
import org.scalatest.{FlatSpec, Matchers}
-import io.gearpump.codahale.metrics.{Counter => CodaHaleCounter, Histogram => CodaHaleHistogram, Meter => CodaHaleMeter}
+import org.apache.gearpump.codahale.metrics.{Counter => CodaHaleCounter, Histogram => CodaHaleHistogram, Meter => CodaHaleMeter}
class MetricsSpec extends FlatSpec with Matchers with MockitoSugar {
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ae320493/core/src/test/scala/org/apache/gearpump/serializer/SerializerSpec.scala
----------------------------------------------------------------------
diff --git a/core/src/test/scala/org/apache/gearpump/serializer/SerializerSpec.scala b/core/src/test/scala/org/apache/gearpump/serializer/SerializerSpec.scala
index d4f4167..f4bd114 100644
--- a/core/src/test/scala/org/apache/gearpump/serializer/SerializerSpec.scala
+++ b/core/src/test/scala/org/apache/gearpump/serializer/SerializerSpec.scala
@@ -28,8 +28,8 @@ import org.scalatest.mock.MockitoSugar
import org.scalatest.{FlatSpec, Matchers}
import org.apache.gearpump.cluster.TestUtil
-import io.gearpump.esotericsoftware.kryo.io.{Input, Output}
-import io.gearpump.esotericsoftware.kryo.{Kryo, Serializer => KryoSerializer}
+import org.apache.gearpump.esotericsoftware.kryo.io.{Input, Output}
+import org.apache.gearpump.esotericsoftware.kryo.{Kryo, Serializer => KryoSerializer}
import org.apache.gearpump.serializer.SerializerSpec._
class SerializerSpec extends FlatSpec with Matchers with MockitoSugar {
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ae320493/core/src/test/scala/org/apache/gearpump/util/FileUtilsSpec.scala
----------------------------------------------------------------------
diff --git a/core/src/test/scala/org/apache/gearpump/util/FileUtilsSpec.scala b/core/src/test/scala/org/apache/gearpump/util/FileUtilsSpec.scala
index 7ad83ce..66abc36 100644
--- a/core/src/test/scala/org/apache/gearpump/util/FileUtilsSpec.scala
+++ b/core/src/test/scala/org/apache/gearpump/util/FileUtilsSpec.scala
@@ -23,7 +23,7 @@ import java.util
import org.scalatest.FlatSpec
-import io.gearpump.google.common.io.Files
+import org.apache.gearpump.google.common.io.Files
class FileUtilsSpec extends FlatSpec {
val TXT =
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ae320493/daemon/src/test/scala/org/apache/gearpump/util/FileServerSpec.scala
----------------------------------------------------------------------
diff --git a/daemon/src/test/scala/org/apache/gearpump/util/FileServerSpec.scala b/daemon/src/test/scala/org/apache/gearpump/util/FileServerSpec.scala
index b33c801..4b17951 100644
--- a/daemon/src/test/scala/org/apache/gearpump/util/FileServerSpec.scala
+++ b/daemon/src/test/scala/org/apache/gearpump/util/FileServerSpec.scala
@@ -27,7 +27,7 @@ import akka.actor.ActorSystem
import org.scalatest.{BeforeAndAfterAll, Matchers, WordSpecLike}
import org.apache.gearpump.cluster.TestUtil
-import io.gearpump.google.common.io.Files
+import org.apache.gearpump.google.common.io.Files
import org.apache.gearpump.jarstore.FilePath
import org.apache.gearpump.util.FileServer._
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ae320493/project/Build.scala
----------------------------------------------------------------------
diff --git a/project/Build.scala b/project/Build.scala
index 7588478..82f4e8f 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -160,16 +160,16 @@ object Build extends sbt.Build {
val streamingDependencies = Seq(
libraryDependencies ++= Seq(
- "com.github.intel-hadoop" % "gearpump-shaded-gs-collections" % gsCollectionsVersion
+ "org.apache.gearpump" % "gearpump-shaded-gs-collections" % gsCollectionsVersion
)
)
val coreDependencies = Seq(
libraryDependencies ++= Seq(
- "com.github.intel-hadoop" % "gearpump-shaded-metrics-graphite" % codahaleVersion,
+ "org.apache.gearpump" % "gearpump-shaded-metrics-graphite" % codahaleVersion,
"org.slf4j" % "slf4j-api" % slf4jVersion,
"org.slf4j" % "slf4j-log4j12" % slf4jVersion,
- "com.github.intel-hadoop" % "gearpump-shaded-guava" % guavaVersion,
+ "org.apache.gearpump" % "gearpump-shaded-guava" % guavaVersion,
"commons-lang" % "commons-lang" % commonsLangVersion,
"com.google.code.findbugs" % "jsr305" % "1.3.9" % "compile",
@@ -192,7 +192,7 @@ object Build extends sbt.Build {
"com.typesafe.akka" %% "akka-agent" % akkaVersion,
"com.typesafe.akka" %% "akka-slf4j" % akkaVersion,
"com.typesafe.akka" %% "akka-kernel" % akkaVersion,
- "com.github.intel-hadoop" %% "gearpump-shaded-akka-kryo" % kryoVersion,
+ "org.apache.gearpump" %% "gearpump-shaded-akka-kryo" % kryoVersion,
"org.scala-lang" % "scala-reflect" % scalaVersionNumber,
"org.scala-lang.modules" %% "scala-parser-combinators" % "1.0.4",
"com.typesafe.akka" %% "akka-testkit" % akkaVersion % "test",
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ae320493/streaming/src/main/scala/org/apache/gearpump/streaming/appmaster/ClockService.scala
----------------------------------------------------------------------
diff --git a/streaming/src/main/scala/org/apache/gearpump/streaming/appmaster/ClockService.scala b/streaming/src/main/scala/org/apache/gearpump/streaming/appmaster/ClockService.scala
index 458fded..bff0f67 100644
--- a/streaming/src/main/scala/org/apache/gearpump/streaming/appmaster/ClockService.scala
+++ b/streaming/src/main/scala/org/apache/gearpump/streaming/appmaster/ClockService.scala
@@ -23,7 +23,7 @@ import java.util.Date
import java.util.concurrent.TimeUnit
import akka.actor.{Actor, Cancellable, Stash}
-import io.gearpump.google.common.primitives.Longs
+import org.apache.gearpump.google.common.primitives.Longs
import org.apache.gearpump.TimeStamp
import org.apache.gearpump.cluster.ClientToMaster.GetStallingTasks
import org.apache.gearpump.streaming.AppMasterToMaster.StallingTasks
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ae320493/streaming/src/main/scala/org/apache/gearpump/streaming/metrics/ProcessorAggregator.scala
----------------------------------------------------------------------
diff --git a/streaming/src/main/scala/org/apache/gearpump/streaming/metrics/ProcessorAggregator.scala b/streaming/src/main/scala/org/apache/gearpump/streaming/metrics/ProcessorAggregator.scala
index 6721cfc..d045def 100644
--- a/streaming/src/main/scala/org/apache/gearpump/streaming/metrics/ProcessorAggregator.scala
+++ b/streaming/src/main/scala/org/apache/gearpump/streaming/metrics/ProcessorAggregator.scala
@@ -25,7 +25,7 @@ import com.typesafe.config.Config
import org.apache.gearpump.TimeStamp
import org.apache.gearpump.cluster.ClientToMaster.ReadOption
import org.apache.gearpump.cluster.MasterToClient.HistoryMetricsItem
-import io.gearpump.google.common.collect.Iterators
+import org.apache.gearpump.google.common.collect.Iterators
import org.apache.gearpump.metrics.Metrics.{Histogram, Meter}
import org.apache.gearpump.metrics.MetricsAggregator
import org.apache.gearpump.streaming.metrics.ProcessorAggregator._
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ae320493/streaming/src/main/scala/org/apache/gearpump/streaming/task/SerializerResolver.scala
----------------------------------------------------------------------
diff --git a/streaming/src/main/scala/org/apache/gearpump/streaming/task/SerializerResolver.scala b/streaming/src/main/scala/org/apache/gearpump/streaming/task/SerializerResolver.scala
index 4c7867b..902c663 100644
--- a/streaming/src/main/scala/org/apache/gearpump/streaming/task/SerializerResolver.scala
+++ b/streaming/src/main/scala/org/apache/gearpump/streaming/task/SerializerResolver.scala
@@ -18,7 +18,7 @@
package org.apache.gearpump.streaming.task
-import io.gearpump.esotericsoftware.kryo.util.{IntMap, ObjectMap}
+import org.apache.gearpump.esotericsoftware.kryo.util.{IntMap, ObjectMap}
import org.apache.gearpump.streaming.task.SerializerResolver.Registration
private[task] class SerializerResolver {
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ae320493/streaming/src/main/scala/org/apache/gearpump/streaming/task/Subscription.scala
----------------------------------------------------------------------
diff --git a/streaming/src/main/scala/org/apache/gearpump/streaming/task/Subscription.scala b/streaming/src/main/scala/org/apache/gearpump/streaming/task/Subscription.scala
index 9accae2..d9fbc82 100644
--- a/streaming/src/main/scala/org/apache/gearpump/streaming/task/Subscription.scala
+++ b/streaming/src/main/scala/org/apache/gearpump/streaming/task/Subscription.scala
@@ -20,7 +20,7 @@ package org.apache.gearpump.streaming.task
import org.slf4j.Logger
-import io.gearpump.google.common.primitives.Shorts
+import org.apache.gearpump.google.common.primitives.Shorts
import org.apache.gearpump.partitioner.{MulticastPartitioner, Partitioner, UnicastPartitioner}
import org.apache.gearpump.streaming.AppMasterToExecutor.MsgLostException
import org.apache.gearpump.streaming.LifeTime
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/ae320493/streaming/src/main/scala/org/apache/gearpump/streaming/task/TaskActor.scala
----------------------------------------------------------------------
diff --git a/streaming/src/main/scala/org/apache/gearpump/streaming/task/TaskActor.scala b/streaming/src/main/scala/org/apache/gearpump/streaming/task/TaskActor.scala
index 14742d0..d12aac1 100644
--- a/streaming/src/main/scala/org/apache/gearpump/streaming/task/TaskActor.scala
+++ b/streaming/src/main/scala/org/apache/gearpump/streaming/task/TaskActor.scala
@@ -25,7 +25,7 @@ import akka.actor._
import org.slf4j.Logger
import org.apache.gearpump.cluster.UserConfig
-import io.gearpump.gs.collections.impl.map.mutable.primitive.IntShortHashMap
+import org.apache.gearpump.gs.collections.impl.map.mutable.primitive.IntShortHashMap
import org.apache.gearpump.metrics.Metrics
import org.apache.gearpump.serializer.SerializationFramework
import org.apache.gearpump.streaming.AppMasterToExecutor._