No more com.metamx.druid, it is now all io.druid!

common/src/main/java/io/druid/guice/guice/ConfigProvider.java → common/src/main/java/io/druid/guice/ConfigProvider.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.guice.guice;
+package io.druid.guice;
 
 import com.google.common.base.Preconditions;
 import com.google.inject.Binder;

common/src/main/java/io/druid/guice/guice/DbConnectorModule.java → common/src/main/java/io/druid/guice/DbConnectorModule.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.guice.guice;
+package io.druid.guice;
 
 import com.google.inject.Binder;
 import com.google.inject.Module;

common/src/main/java/io/druid/guice/guice/DruidGuiceExtensions.java → common/src/main/java/io/druid/guice/DruidGuiceExtensions.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.guice.guice;
+package io.druid.guice;
 
 import com.google.inject.Binder;
 import com.google.inject.Module;

common/src/main/java/io/druid/guice/guice/DruidScopes.java → common/src/main/java/io/druid/guice/DruidScopes.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.guice.guice;
+package io.druid.guice;
 
 import com.google.inject.Inject;
 import com.google.inject.Key;

common/src/main/java/io/druid/guice/guice/DruidSecondaryModule.java → common/src/main/java/io/druid/guice/DruidSecondaryModule.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.guice.guice;
+package io.druid.guice;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.introspect.AnnotationIntrospectorPair;
@@ -29,8 +29,8 @@
 import com.google.inject.Key;
 import com.google.inject.Module;
 import com.google.inject.Provides;
-import io.druid.guice.guice.annotations.Json;
-import io.druid.guice.guice.annotations.Smile;
+import io.druid.guice.annotations.Json;
+import io.druid.guice.annotations.Smile;
 import org.skife.config.ConfigurationObjectFactory;
 
 import javax.validation.Validator;

common/src/main/java/io/druid/guice/guice/JacksonConfigManagerModule.java → common/src/main/java/io/druid/guice/JacksonConfigManagerModule.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.guice.guice;
+package io.druid.guice;
 
 import com.google.common.base.Supplier;
 import com.google.inject.Binder;

common/src/main/java/io/druid/guice/guice/JacksonConfigProvider.java → common/src/main/java/io/druid/guice/JacksonConfigProvider.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.guice.guice;
+package io.druid.guice;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.google.common.base.Supplier;

common/src/main/java/io/druid/guice/guice/JsonConfigProvider.java → common/src/main/java/io/druid/guice/JsonConfigProvider.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.guice.guice;
+package io.druid.guice;
 
 import com.google.common.base.Supplier;
 import com.google.common.base.Suppliers;

common/src/main/java/io/druid/guice/guice/JsonConfigurator.java → common/src/main/java/io/druid/guice/JsonConfigurator.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.guice.guice;
+package io.druid.guice;
 
 import com.fasterxml.jackson.annotation.JacksonInject;
 import com.fasterxml.jackson.annotation.JsonProperty;

common/src/main/java/io/druid/guice/guice/LazySingleton.java → common/src/main/java/io/druid/guice/LazySingleton.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.guice.guice;
+package io.druid.guice;
 
 import com.google.inject.ScopeAnnotation;
 

common/src/main/java/io/druid/guice/guice/LifecycleModule.java → common/src/main/java/io/druid/guice/LifecycleModule.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.guice.guice;
+package io.druid.guice;
 
 import com.google.common.base.Preconditions;
 import com.google.inject.Binder;

common/src/main/java/io/druid/guice/guice/LifecycleScope.java → common/src/main/java/io/druid/guice/LifecycleScope.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.guice.guice;
+package io.druid.guice;
 
 import com.google.common.collect.Lists;
 import com.google.inject.Key;

common/src/main/java/io/druid/guice/guice/ListProvider.java → common/src/main/java/io/druid/guice/ListProvider.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.guice.guice;
+package io.druid.guice;
 
 import com.google.common.collect.Lists;
 import com.google.inject.Inject;

common/src/main/java/io/druid/guice/guice/ManageLifecycle.java → common/src/main/java/io/druid/guice/ManageLifecycle.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.guice.guice;
+package io.druid.guice;
 
 import com.google.inject.ScopeAnnotation;
 
@@ -30,7 +30,7 @@
 /**
  * Marks the object to be managed by {@link com.metamx.common.lifecycle.Lifecycle}
  *
- * This Scope gets defined by {@link io.druid.guice.guice.LifecycleModule}
+ * This Scope gets defined by {@link io.druid.guice.LifecycleModule}
  */
 @Target({ ElementType.TYPE, ElementType.METHOD })
 @Retention(RUNTIME)

common/src/main/java/io/druid/guice/guice/ManageLifecycleLast.java → common/src/main/java/io/druid/guice/ManageLifecycleLast.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.guice.guice;
+package io.druid.guice;
 
 import com.google.inject.ScopeAnnotation;
 
@@ -30,7 +30,7 @@
 /**
  * Marks the object to be managed by {@link com.metamx.common.lifecycle.Lifecycle} and set to be on Stage.LAST
  *
- * This Scope gets defined by {@link io.druid.guice.guice.LifecycleModule}
+ * This Scope gets defined by {@link io.druid.guice.LifecycleModule}
  */
 @Target({ ElementType.TYPE, ElementType.METHOD })
 @Retention(RUNTIME)

common/src/main/java/io/druid/guice/guice/PolyBind.java → common/src/main/java/io/druid/guice/PolyBind.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.guice.guice;
+package io.druid.guice;
 
 import com.google.inject.Binder;
 import com.google.inject.Inject;

common/src/main/java/io/druid/guice/guice/SupplierProvider.java → common/src/main/java/io/druid/guice/SupplierProvider.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.guice.guice;
+package io.druid.guice;
 
 import com.google.common.base.Supplier;
 import com.google.inject.Inject;

common/src/main/java/io/druid/guice/guice/annotations/Global.java → common/src/main/java/io/druid/guice/annotations/Global.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.guice.guice.annotations;
+package io.druid.guice.annotations;
 
 import com.google.inject.BindingAnnotation;
 

common/src/main/java/io/druid/guice/guice/annotations/Json.java → common/src/main/java/io/druid/guice/annotations/Json.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.guice.guice.annotations;
+package io.druid.guice.annotations;
 
 import com.google.inject.BindingAnnotation;
 

common/src/main/java/io/druid/guice/guice/annotations/Self.java → common/src/main/java/io/druid/guice/annotations/Self.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.guice.guice.annotations;
+package io.druid.guice.annotations;
 
 import com.google.inject.BindingAnnotation;
 

common/src/main/java/io/druid/guice/guice/annotations/Smile.java → common/src/main/java/io/druid/guice/annotations/Smile.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.guice.guice.annotations;
+package io.druid.guice.annotations;
 
 import com.google.inject.BindingAnnotation;
 

common/src/test/java/io/druid/guice/guice/LifecycleScopeTest.java → common/src/test/java/io/druid/guice/LifecycleScopeTest.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.guice.guice;
+package io.druid.guice;
 
 import com.google.inject.Binder;
 import com.google.inject.Guice;

common/src/test/java/io/druid/guice/guice/PolyBindTest.java → common/src/test/java/io/druid/guice/PolyBindTest.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package io.druid.guice.guice;
+package io.druid.guice;
 
 import com.google.common.collect.Iterables;
 import com.google.inject.Binder;

examples/src/main/java/druid/examples/flights/FlightsFirehoseFactory.java

@@ -25,10 +25,10 @@
 import com.google.common.base.Throwables;
 import com.google.common.collect.Iterators;
 import com.google.common.io.Closeables;
-import com.metamx.druid.realtime.firehose.Firehose;
-import com.metamx.druid.realtime.firehose.FirehoseFactory;
 import io.druid.data.input.InputRow;
 import io.druid.data.input.StringInputRowParser;
+import io.druid.segment.realtime.firehose.Firehose;
+import io.druid.segment.realtime.firehose.FirehoseFactory;
 
 import java.io.BufferedReader;
 import java.io.File;

examples/src/main/java/druid/examples/guice/RealtimeExampleModule.java

@@ -25,10 +25,6 @@
 import com.google.inject.Binder;
 import com.google.inject.TypeLiteral;
 import com.metamx.common.logger.Logger;
-import com.metamx.druid.loading.DataSegmentPusher;
-import com.metamx.druid.realtime.FireDepartment;
-import com.metamx.druid.realtime.RealtimeManager;
-import com.metamx.druid.realtime.SegmentPublisher;
 import druid.examples.flights.FlightsFirehoseFactory;
 import druid.examples.rand.RandomFirehoseFactory;
 import druid.examples.twitter.TwitterSpritzerFirehoseFactory;
@@ -37,12 +33,16 @@
 import io.druid.client.DruidServer;
 import io.druid.client.InventoryView;
 import io.druid.client.ServerView;
-import io.druid.guice.guice.FireDepartmentsProvider;
-import io.druid.guice.guice.JsonConfigProvider;
-import io.druid.guice.guice.ManageLifecycle;
-import io.druid.guice.guice.NoopSegmentPublisherProvider;
-import io.druid.guice.guice.RealtimeManagerConfig;
+import io.druid.guice.FireDepartmentsProvider;
+import io.druid.guice.JsonConfigProvider;
+import io.druid.guice.ManageLifecycle;
+import io.druid.guice.NoopSegmentPublisherProvider;
+import io.druid.guice.RealtimeManagerConfig;
 import io.druid.initialization.DruidModule;
+import io.druid.segment.loading.DataSegmentPusher;
+import io.druid.segment.realtime.FireDepartment;
+import io.druid.segment.realtime.RealtimeManager;
+import io.druid.segment.realtime.SegmentPublisher;
 import io.druid.server.coordination.DataSegmentAnnouncer;
 
 import java.io.File;

examples/src/main/java/druid/examples/rand/RandomFirehoseFactory.java

@@ -24,10 +24,10 @@
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.google.common.collect.Maps;
 import com.metamx.common.logger.Logger;
-import com.metamx.druid.realtime.firehose.Firehose;
-import com.metamx.druid.realtime.firehose.FirehoseFactory;
 import io.druid.data.input.InputRow;
 import io.druid.data.input.MapBasedInputRow;
+import io.druid.segment.realtime.firehose.Firehose;
+import io.druid.segment.realtime.firehose.FirehoseFactory;
 
 import java.io.IOException;
 import java.util.LinkedList;

examples/src/main/java/druid/examples/twitter/TwitterSpritzerFirehoseFactory.java

@@ -24,10 +24,10 @@
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.google.common.collect.Lists;
 import com.metamx.common.logger.Logger;
-import com.metamx.druid.realtime.firehose.Firehose;
-import com.metamx.druid.realtime.firehose.FirehoseFactory;
 import io.druid.data.input.InputRow;
 import io.druid.data.input.MapBasedInputRow;
+import io.druid.segment.realtime.firehose.Firehose;
+import io.druid.segment.realtime.firehose.FirehoseFactory;
 import twitter4j.ConnectionLifeCycleListener;
 import twitter4j.HashtagEntity;
 import twitter4j.StallWarning;

examples/src/main/java/druid/examples/web/WebFirehoseFactory.java

@@ -24,12 +24,12 @@
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.google.common.base.Throwables;
 import com.metamx.common.parsers.TimestampParser;
-import com.metamx.druid.realtime.firehose.Firehose;
-import com.metamx.druid.realtime.firehose.FirehoseFactory;
 import com.metamx.emitter.EmittingLogger;
 import io.druid.common.guava.Runnables;
 import io.druid.data.input.InputRow;
 import io.druid.data.input.MapBasedInputRow;
+import io.druid.segment.realtime.firehose.Firehose;
+import io.druid.segment.realtime.firehose.FirehoseFactory;
 import org.joda.time.DateTime;
 
 import java.io.IOException;

examples/src/test/java/druid/examples/web/WebFirehoseFactoryTest.java

@@ -21,8 +21,8 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
-import com.metamx.druid.realtime.firehose.Firehose;
 import io.druid.data.input.InputRow;
+import io.druid.segment.realtime.firehose.Firehose;
 import org.joda.time.DateTime;
 import org.junit.Assert;
 import org.junit.Before;

indexing-hadoop/src/main/java/com/metamx/druid/indexer/Bucket.java → indexing-hadoop/src/main/java/io/druid/indexer/Bucket.java

@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.indexer;
+package io.druid.indexer;
 
 import com.metamx.common.Pair;
 import org.joda.time.DateTime;

indexing-hadoop/src/main/java/com/metamx/druid/indexer/DbUpdaterJob.java → indexing-hadoop/src/main/java/io/druid/indexer/DbUpdaterJob.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.indexer;
+package io.druid.indexer;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableMap;

indexing-hadoop/src/main/java/com/metamx/druid/indexer/DeterminePartitionsJob.java → indexing-hadoop/src/main/java/io/druid/indexer/DeterminePartitionsJob.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.indexer;
+package io.druid.indexer;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.google.common.base.Function;

indexing-hadoop/src/main/java/com/metamx/druid/indexer/HadoopDruidIndexer.java → indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidIndexer.java

@@ -1,6 +1,6 @@
 /*
  * Druid - a distributed column store.
- * Copyright (C) 2012  Metamarkets Group Inc.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.indexer;
+package io.druid.indexer;
 
 import com.google.common.collect.ImmutableList;
 import com.metamx.common.Pair;