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

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/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/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/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/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.Injector;
 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/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/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/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/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/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/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/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/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/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 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
 /**
  * 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/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 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
 /**
  * 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/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/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/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/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/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/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/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/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.Charsets;
 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.common.collect.ImmutableList;
 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.DataSegment;
 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.JsonProperty;
 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.JsonProperty;
 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.JsonProperty;
 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 @@ package druid.examples.web;
 
 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/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/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/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/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;

indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidIndexerConfig.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.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -38,12 +38,6 @@ import com.metamx.common.ISE;
 import com.metamx.common.MapUtils;
 import com.metamx.common.guava.FunctionalIterable;
 import com.metamx.common.logger.Logger;
-import com.metamx.druid.indexer.granularity.GranularitySpec;
-import com.metamx.druid.indexer.granularity.UniformGranularitySpec;
-import com.metamx.druid.indexer.partitions.PartitionsSpec;
-import com.metamx.druid.indexer.path.PathSpec;
-import com.metamx.druid.indexer.rollup.DataRollupSpec;
-import com.metamx.druid.indexer.updater.DbUpdaterJobSpec;
 import io.druid.client.DataSegment;
 import io.druid.common.utils.JodaUtils;
 import io.druid.data.input.DataSpec;
@@ -51,6 +45,12 @@ import io.druid.data.input.InputRow;
 import io.druid.data.input.StringInputRowParser;
 import io.druid.data.input.TimestampSpec;
 import io.druid.data.input.ToLowercaseDataSpec;
+import io.druid.indexer.granularity.GranularitySpec;
+import io.druid.indexer.granularity.UniformGranularitySpec;
+import io.druid.indexer.partitions.PartitionsSpec;
+import io.druid.indexer.path.PathSpec;
+import io.druid.indexer.rollup.DataRollupSpec;
+import io.druid.indexer.updater.DbUpdaterJobSpec;
 import io.druid.jackson.DefaultObjectMapper;
 import io.druid.query.aggregation.AggregatorFactory;
 import io.druid.segment.serde.Registererer;

indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidIndexerJob.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.google.common.base.Throwables;
 import com.google.common.collect.Lists;

indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidIndexerMain.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;

indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidIndexerMapper.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.metamx.common.RE;
 import io.druid.data.input.InputRow;

indexing-hadoop/src/main/java/io/druid/indexer/HadoopDruidIndexerNode.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,19 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.indexer;
-
-import java.io.Closeable;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-import org.joda.time.Interval;
+package io.druid.indexer;
 
 import com.fasterxml.jackson.databind.jsontype.NamedType;
 import com.google.common.base.Preconditions;
@@ -38,6 +26,16 @@ import com.google.common.io.CharStreams;
 import com.google.common.io.InputSupplier;
 import com.metamx.common.lifecycle.LifecycleStart;
 import com.metamx.common.lifecycle.LifecycleStop;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.joda.time.Interval;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  */

indexing-hadoop/src/main/java/io/druid/indexer/HadoopIOPeon.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 io.druid.segment.data.IOPeon;
 import org.apache.hadoop.fs.Path;

indexing-hadoop/src/main/java/io/druid/indexer/HadoopyShardSpec.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.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

indexing-hadoop/src/main/java/io/druid/indexer/IndexGeneratorJob.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.base.Optional;
@@ -32,10 +32,10 @@ import com.google.common.primitives.Longs;
 import com.metamx.common.IAE;
 import com.metamx.common.ISE;
 import com.metamx.common.logger.Logger;
-import com.metamx.druid.indexer.rollup.DataRollupSpec;
 import io.druid.client.DataSegment;
 import io.druid.data.input.InputRow;
 import io.druid.data.input.StringInputRowParser;
+import io.druid.indexer.rollup.DataRollupSpec;
 import io.druid.query.aggregation.AggregatorFactory;
 import io.druid.segment.IndexIO;
 import io.druid.segment.IndexMerger;

indexing-hadoop/src/main/java/io/druid/indexer/Jobby.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;
 
 /**
  */

indexing-hadoop/src/main/java/io/druid/indexer/SortableBytes.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.base.Charsets;
 import org.apache.hadoop.io.BytesWritable;

indexing-hadoop/src/main/java/io/druid/indexer/StringIntervalFunction.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.base.Function;
 import org.joda.time.Interval;

indexing-hadoop/src/main/java/io/druid/indexer/Utils.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.fasterxml.jackson.databind.ObjectMapper;

indexing-hadoop/src/main/java/io/druid/indexer/granularity/ArbitraryGranularitySpec.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.granularity;
+package io.druid.indexer.granularity;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -26,7 +26,6 @@ import com.google.common.collect.Iterators;
 import com.google.common.collect.PeekingIterator;
 import com.google.common.collect.Sets;
 import com.metamx.common.guava.Comparators;
-
 import org.joda.time.DateTime;
 import org.joda.time.Interval;
 

indexing-hadoop/src/main/java/io/druid/indexer/granularity/GranularitySpec.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,12 +17,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.indexer.granularity;
+package io.druid.indexer.granularity;
 
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.google.common.base.Optional;
-
 import org.joda.time.DateTime;
 import org.joda.time.Interval;
 

indexing-hadoop/src/main/java/io/druid/indexer/granularity/UniformGranularitySpec.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.granularity;
+package io.druid.indexer.granularity;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -26,7 +26,6 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.metamx.common.Granularity;
-
 import org.joda.time.DateTime;
 import org.joda.time.Interval;
 

indexing-hadoop/src/main/java/io/druid/indexer/hadoop/FSSpideringIterator.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.hadoop;
+package io.druid.indexer.hadoop;
 
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileSystem;

indexing-hadoop/src/main/java/io/druid/indexer/partitions/PartitionsSpec.java

@@ -1,4 +1,23 @@
-package com.metamx.druid.indexer.partitions;
+/*
+ * Druid - a distributed column store.
+ * 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+package io.druid.indexer.partitions;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;

indexing-hadoop/src/main/java/io/druid/indexer/path/GranularUnprocessedPathSpec.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.path;
+package io.druid.indexer.path;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Preconditions;
@@ -25,14 +25,13 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import com.metamx.common.Granularity;
 import com.metamx.common.guava.Comparators;
-import com.metamx.druid.indexer.HadoopDruidIndexerConfig;
-import com.metamx.druid.indexer.granularity.UniformGranularitySpec;
-import com.metamx.druid.indexer.hadoop.FSSpideringIterator;
+import io.druid.indexer.HadoopDruidIndexerConfig;
+import io.druid.indexer.granularity.UniformGranularitySpec;
+import io.druid.indexer.hadoop.FSSpideringIterator;
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.mapreduce.Job;
-
 import org.joda.time.DateTime;
 import org.joda.time.Interval;
 

indexing-hadoop/src/main/java/io/druid/indexer/path/GranularityPathSpec.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,21 +17,20 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.indexer.path;
+package io.druid.indexer.path;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.Sets;
 import com.metamx.common.Granularity;
 import com.metamx.common.guava.Comparators;
 import com.metamx.common.logger.Logger;
-import com.metamx.druid.indexer.HadoopDruidIndexerConfig;
-import com.metamx.druid.indexer.hadoop.FSSpideringIterator;
+import io.druid.indexer.HadoopDruidIndexerConfig;
+import io.druid.indexer.hadoop.FSSpideringIterator;
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.mapreduce.Job;
 import org.apache.hadoop.mapreduce.lib.input.FileInputFormat;
-
 import org.joda.time.DateTime;
 import org.joda.time.Interval;
 import org.joda.time.format.DateTimeFormat;

indexing-hadoop/src/main/java/io/druid/indexer/path/PathSpec.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,11 +17,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.indexer.path;
+package io.druid.indexer.path;
 
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.metamx.druid.indexer.HadoopDruidIndexerConfig;
+import io.druid.indexer.HadoopDruidIndexerConfig;
 import org.apache.hadoop.mapreduce.Job;
 
 import java.io.IOException;

indexing-hadoop/src/main/java/io/druid/indexer/path/StaticPathSpec.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,11 +17,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.indexer.path;
+package io.druid.indexer.path;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.metamx.common.logger.Logger;
-import com.metamx.druid.indexer.HadoopDruidIndexerConfig;
+import io.druid.indexer.HadoopDruidIndexerConfig;
 import org.apache.hadoop.mapreduce.Job;
 import org.apache.hadoop.mapreduce.lib.input.FileInputFormat;
 

indexing-hadoop/src/main/java/io/druid/indexer/rollup/DataRollupSpec.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.rollup;
+package io.druid.indexer.rollup;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.druid.granularity.QueryGranularity;

indexing-hadoop/src/main/java/io/druid/indexer/updater/DbUpdaterJobSpec.java

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

indexing-hadoop/src/test/java/io/druid/indexer/HadoopDruidIndexerConfigTest.java

@@ -17,15 +17,15 @@
  * 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.base.Throwables;
 import com.google.common.collect.Lists;
-import com.metamx.druid.indexer.granularity.UniformGranularitySpec;
-import com.metamx.druid.indexer.partitions.PartitionsSpec;
-import com.metamx.druid.indexer.updater.DbUpdaterJobSpec;
 import io.druid.db.DbConnectorConfig;
+import io.druid.indexer.granularity.UniformGranularitySpec;
+import io.druid.indexer.partitions.PartitionsSpec;
+import io.druid.indexer.updater.DbUpdaterJobSpec;
 import io.druid.jackson.DefaultObjectMapper;
 import org.apache.hadoop.fs.LocalFileSystem;
 import org.apache.hadoop.fs.Path;

indexing-hadoop/src/test/java/io/druid/indexer/SortableBytesTest.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.base.Charsets;
 import org.apache.hadoop.io.WritableComparator;

indexing-hadoop/src/test/java/io/druid/indexer/granularity/ArbitraryGranularityTest.java

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

indexing-hadoop/src/test/java/io/druid/indexer/granularity/UniformGranularityTest.java

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

indexing-hadoop/src/test/java/io/druid/indexer/hadoop/FSSpideringIteratorTest.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.hadoop;
+package io.druid.indexer.hadoop;
 
 import com.google.common.base.Function;
 import com.google.common.base.Throwables;

indexing-service/src/main/java/com/metamx/druid/indexing/common/actions/LockListAction.java

@@ -1,33 +0,0 @@
-package com.metamx.druid.indexing.common.actions;
-
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.metamx.druid.indexing.common.TaskLock;
-import com.metamx.druid.indexing.common.task.Task;
-
-import java.util.List;
-
-public class LockListAction implements TaskAction<List<TaskLock>>
-{
-  public TypeReference<List<TaskLock>> getReturnTypeReference()
-  {
-    return new TypeReference<List<TaskLock>>() {};
-  }
-
-  @Override
-  public List<TaskLock> perform(Task task, TaskActionToolbox toolbox)
-  {
-    return toolbox.getTaskLockbox().findLocksForTask(task);
-  }
-
-  @Override
-  public boolean isAudited()
-  {
-    return false;
-  }
-
-  @Override
-  public String toString()
-  {
-    return "LockListAction{}";
-  }
-}

indexing-service/src/main/java/com/metamx/druid/indexing/common/actions/TaskActionClient.java

@@ -1,8 +0,0 @@
-package com.metamx.druid.indexing.common.actions;
-
-import java.io.IOException;
-
-public interface TaskActionClient
-{
-  public <RetType> RetType submit(TaskAction<RetType> taskAction) throws IOException;
-}

indexing-service/src/main/java/com/metamx/druid/indexing/common/config/TaskLogConfig.java

@@ -1,20 +0,0 @@
-package com.metamx.druid.indexing.common.config;
-
-import org.skife.config.Config;
-import org.skife.config.Default;
-import org.skife.config.DefaultNull;
-
-public abstract class TaskLogConfig
-{
-  @Config("druid.indexer.logs.type")
-  @Default("noop")
-  public abstract String getLogType();
-
-  @Config("druid.indexer.logs.s3bucket")
-  @DefaultNull
-  public abstract String getLogStorageBucket();
-
-  @Config("druid.indexer.logs.s3prefix")
-  @DefaultNull
-  public abstract String getLogStoragePrefix();
-}

indexing-service/src/main/java/com/metamx/druid/indexing/common/index/EventReceiver.java

@@ -1,9 +0,0 @@
-package com.metamx.druid.indexing.common.index;
-
-import java.util.Collection;
-import java.util.Map;
-
-public interface EventReceiver
-{
-  public void addAll(Collection<Map<String, Object>> events);
-}

indexing-service/src/main/java/com/metamx/druid/indexing/common/tasklogs/NoopTaskLogs.java

@@ -1,26 +0,0 @@
-package com.metamx.druid.indexing.common.tasklogs;
-
-import com.google.common.base.Optional;
-import com.google.common.io.InputSupplier;
-import com.metamx.common.logger.Logger;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-
-public class NoopTaskLogs implements TaskLogs
-{
-  private final Logger log = new Logger(TaskLogs.class);
-
-  @Override
-  public Optional<InputSupplier<InputStream>> streamTaskLog(String taskid, long offset) throws IOException
-  {
-    return Optional.absent();
-  }
-
-  @Override
-  public void pushTaskLog(String taskid, File logFile) throws IOException
-  {
-    log.info("Not pushing logs for task: %s", taskid);
-  }
-}

indexing-service/src/main/java/com/metamx/druid/indexing/common/tasklogs/TaskLogPusher.java

@@ -1,12 +0,0 @@
-package com.metamx.druid.indexing.common.tasklogs;
-
-import java.io.File;
-import java.io.IOException;
-
-/**
- * Something that knows how to persist local task logs to some form of long-term storage.
- */
-public interface TaskLogPusher
-{
-  public void pushTaskLog(String taskid, File logFile) throws IOException;
-}

indexing-service/src/main/java/com/metamx/druid/indexing/common/tasklogs/TaskLogStreamer.java

@@ -1,23 +0,0 @@
-package com.metamx.druid.indexing.common.tasklogs;
-
-import com.google.common.base.Optional;
-import com.google.common.io.InputSupplier;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * Something that knows how to stream logs for tasks.
- */
-public interface TaskLogStreamer
-{
-  /**
-   * Stream log for a task.
-   *
-   * @param offset If zero, stream the entire log. If positive, attempt to read from this position onwards. If
-   *               negative, attempt to read this many bytes from the end of the file (like <tt>tail -n</tt>).
-   *
-   * @return input supplier for this log, if available from this provider
-   */
-  public Optional<InputSupplier<InputStream>> streamTaskLog(String taskid, long offset) throws IOException;
-}

indexing-service/src/main/java/com/metamx/druid/indexing/common/tasklogs/TaskLogs.java

@@ -1,5 +0,0 @@
-package com.metamx.druid.indexing.common.tasklogs;
-
-public interface TaskLogs extends TaskLogStreamer, TaskLogPusher
-{
-}

indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/TaskExistsException.java

@@ -1,22 +0,0 @@
-package com.metamx.druid.indexing.coordinator;
-
-public class TaskExistsException extends RuntimeException
-{
-  private final String taskId;
-
-  public TaskExistsException(String taskId, Throwable t)
-  {
-    super(String.format("Task exists: %s", taskId), t);
-    this.taskId = taskId;
-  }
-
-  public TaskExistsException(String taskId)
-  {
-    this(taskId, null);
-  }
-
-  public String getTaskId()
-  {
-    return taskId;
-  }
-}

indexing-service/src/main/java/com/metamx/druid/indexing/worker/config/ChatHandlerProviderConfig.java

@@ -1,18 +0,0 @@
-package com.metamx.druid.indexing.worker.config;
-
-import org.skife.config.Config;
-
-public abstract class ChatHandlerProviderConfig
-{
-  @Config("druid.indexer.chathandler.publishDiscovery")
-  public boolean isPublishDiscovery()
-  {
-    return false;
-  }
-
-  @Config("druid.host")
-  public abstract String getHost();
-
-  @Config("druid.port")
-  public abstract int getPort();
-}

indexing-service/src/main/java/com/metamx/druid/indexing/worker/executor/ChatHandlerResource.java

@@ -1,36 +0,0 @@
-package com.metamx.druid.indexing.worker.executor;
-
-import com.google.common.base.Optional;
-import com.google.inject.Inject;
-import com.metamx.druid.indexing.common.index.ChatHandler;
-import com.metamx.druid.indexing.common.index.ChatHandlerProvider;
-
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.core.Response;
-
-@Path("/druid/worker/v1")
-public class ChatHandlerResource
-{
-  private final ChatHandlerProvider handlers;
-
-  @Inject
-  public ChatHandlerResource(ChatHandlerProvider handlers)
-  {
-    this.handlers = handlers;
-  }
-
-  @Path("/chat/{id}")
-  public Object doTaskChat(
-      @PathParam("id") String handlerId
-  )
-  {
-    final Optional<ChatHandler> handler = handlers.get(handlerId);
-
-    if (handler.isPresent()) {
-      return handler.get();
-    } else {
-      return Response.status(Response.Status.NOT_FOUND).build();
-    }
-  }
-}

indexing-service/src/main/java/com/metamx/druid/indexing/worker/executor/ExecutorLifecycleFactory.java

@@ -1,25 +0,0 @@
-package com.metamx.druid.indexing.worker.executor;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.metamx.druid.indexing.coordinator.TaskRunner;
-
-import java.io.File;
-
-public class ExecutorLifecycleFactory
-{
-  private final File taskFile;
-  private final File statusFile;
-
-  public ExecutorLifecycleFactory(File taskFile, File statusFile)
-  {
-    this.taskFile = taskFile;
-    this.statusFile = statusFile;
-  }
-
-  public ExecutorLifecycle build(TaskRunner taskRunner, ObjectMapper jsonMapper)
-  {
-    return new ExecutorLifecycle(
-        new ExecutorLifecycleConfig().setTaskFile(taskFile).setStatusFile(statusFile), taskRunner, jsonMapper
-    );
-  }
-}

indexing-service/src/main/java/io/druid/guice/IndexingServiceModuleHelper.java

@@ -17,11 +17,11 @@
  * 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.metamx.druid.indexing.coordinator.config.ForkingTaskRunnerConfig;
-import com.metamx.druid.indexing.coordinator.config.RemoteTaskRunnerConfig;
+import io.druid.indexing.coordinator.config.ForkingTaskRunnerConfig;
+import io.druid.indexing.coordinator.config.RemoteTaskRunnerConfig;
 
 /**
  */

indexing-service/src/main/java/io/druid/guice/MiddleManagerModule.java

@@ -17,18 +17,18 @@
  * 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;
 import com.google.inject.Provides;
-import com.metamx.druid.indexing.coordinator.ForkingTaskRunner;
-import com.metamx.druid.indexing.coordinator.TaskRunner;
-import com.metamx.druid.indexing.worker.Worker;
-import com.metamx.druid.indexing.worker.WorkerCuratorCoordinator;
-import com.metamx.druid.indexing.worker.WorkerTaskMonitor;
-import com.metamx.druid.indexing.worker.config.WorkerConfig;
-import io.druid.guice.guice.annotations.Self;
+import io.druid.guice.annotations.Self;
+import io.druid.indexing.coordinator.ForkingTaskRunner;
+import io.druid.indexing.coordinator.TaskRunner;
+import io.druid.indexing.worker.Worker;
+import io.druid.indexing.worker.WorkerCuratorCoordinator;
+import io.druid.indexing.worker.WorkerTaskMonitor;
+import io.druid.indexing.worker.config.WorkerConfig;
 import io.druid.server.DruidNode;
 
 /**

indexing-service/src/main/java/io/druid/guice/OverlordModule.java

@@ -17,42 +17,42 @@
  * 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.Key;
 import com.google.inject.Module;
 import com.google.inject.TypeLiteral;
 import com.google.inject.multibindings.MapBinder;
-import com.metamx.druid.indexing.common.actions.LocalTaskActionClientFactory;
-import com.metamx.druid.indexing.common.actions.TaskActionClientFactory;
-import com.metamx.druid.indexing.common.actions.TaskActionToolbox;
-import com.metamx.druid.indexing.common.tasklogs.SwitchingTaskLogStreamer;
-import com.metamx.druid.indexing.common.tasklogs.TaskLogStreamer;
-import com.metamx.druid.indexing.common.tasklogs.TaskLogs;
-import com.metamx.druid.indexing.common.tasklogs.TaskRunnerTaskLogStreamer;
-import com.metamx.druid.indexing.coordinator.DbTaskStorage;
-import com.metamx.druid.indexing.coordinator.ForkingTaskRunnerFactory;
-import com.metamx.druid.indexing.coordinator.HeapMemoryTaskStorage;
-import com.metamx.druid.indexing.coordinator.IndexerDBCoordinator;
-import com.metamx.druid.indexing.coordinator.RemoteTaskRunnerFactory;
-import com.metamx.druid.indexing.coordinator.TaskLockbox;
-import com.metamx.druid.indexing.coordinator.TaskMaster;
-import com.metamx.druid.indexing.coordinator.TaskQueue;
-import com.metamx.druid.indexing.coordinator.TaskRunnerFactory;
-import com.metamx.druid.indexing.coordinator.TaskStorage;
-import com.metamx.druid.indexing.coordinator.TaskStorageQueryAdapter;
-import com.metamx.druid.indexing.coordinator.http.OverlordRedirectInfo;
-import com.metamx.druid.indexing.coordinator.scaling.AutoScalingStrategy;
-import com.metamx.druid.indexing.coordinator.scaling.EC2AutoScalingStrategy;
-import com.metamx.druid.indexing.coordinator.scaling.NoopAutoScalingStrategy;
-import com.metamx.druid.indexing.coordinator.scaling.ResourceManagementSchedulerConfig;
-import com.metamx.druid.indexing.coordinator.scaling.ResourceManagementSchedulerFactory;
-import com.metamx.druid.indexing.coordinator.scaling.ResourceManagementSchedulerFactoryImpl;
-import com.metamx.druid.indexing.coordinator.scaling.ResourceManagementStrategy;
-import com.metamx.druid.indexing.coordinator.scaling.SimpleResourceManagementConfig;
-import com.metamx.druid.indexing.coordinator.scaling.SimpleResourceManagementStrategy;
-import com.metamx.druid.indexing.coordinator.setup.WorkerSetupData;
+import io.druid.indexing.common.actions.LocalTaskActionClientFactory;
+import io.druid.indexing.common.actions.TaskActionClientFactory;
+import io.druid.indexing.common.actions.TaskActionToolbox;
+import io.druid.indexing.common.tasklogs.SwitchingTaskLogStreamer;
+import io.druid.indexing.common.tasklogs.TaskLogStreamer;
+import io.druid.indexing.common.tasklogs.TaskLogs;
+import io.druid.indexing.common.tasklogs.TaskRunnerTaskLogStreamer;
+import io.druid.indexing.coordinator.DbTaskStorage;
+import io.druid.indexing.coordinator.ForkingTaskRunnerFactory;
+import io.druid.indexing.coordinator.HeapMemoryTaskStorage;
+import io.druid.indexing.coordinator.IndexerDBCoordinator;
+import io.druid.indexing.coordinator.RemoteTaskRunnerFactory;
+import io.druid.indexing.coordinator.TaskLockbox;
+import io.druid.indexing.coordinator.TaskMaster;
+import io.druid.indexing.coordinator.TaskQueue;
+import io.druid.indexing.coordinator.TaskRunnerFactory;
+import io.druid.indexing.coordinator.TaskStorage;
+import io.druid.indexing.coordinator.TaskStorageQueryAdapter;
+import io.druid.indexing.coordinator.http.OverlordRedirectInfo;
+import io.druid.indexing.coordinator.scaling.AutoScalingStrategy;
+import io.druid.indexing.coordinator.scaling.EC2AutoScalingStrategy;
+import io.druid.indexing.coordinator.scaling.NoopAutoScalingStrategy;
+import io.druid.indexing.coordinator.scaling.ResourceManagementSchedulerConfig;
+import io.druid.indexing.coordinator.scaling.ResourceManagementSchedulerFactory;
+import io.druid.indexing.coordinator.scaling.ResourceManagementSchedulerFactoryImpl;
+import io.druid.indexing.coordinator.scaling.ResourceManagementStrategy;
+import io.druid.indexing.coordinator.scaling.SimpleResourceManagementConfig;
+import io.druid.indexing.coordinator.scaling.SimpleResourceManagementStrategy;
+import io.druid.indexing.coordinator.setup.WorkerSetupData;
 import io.druid.server.http.RedirectFilter;
 import io.druid.server.http.RedirectInfo;
 

indexing-service/src/main/java/io/druid/guice/PeonModule.java

@@ -17,27 +17,27 @@
  * 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.Key;
 import com.google.inject.Module;
 import com.google.inject.multibindings.MapBinder;
-import com.metamx.druid.indexing.common.RetryPolicyConfig;
-import com.metamx.druid.indexing.common.RetryPolicyFactory;
-import com.metamx.druid.indexing.common.TaskToolboxFactory;
-import com.metamx.druid.indexing.common.actions.RemoteTaskActionClientFactory;
-import com.metamx.druid.indexing.common.actions.TaskActionClientFactory;
-import com.metamx.druid.indexing.common.config.TaskConfig;
-import com.metamx.druid.indexing.common.index.ChatHandlerProvider;
-import com.metamx.druid.indexing.common.index.EventReceivingChatHandlerProvider;
-import com.metamx.druid.indexing.common.index.NoopChatHandlerProvider;
-import com.metamx.druid.indexing.coordinator.TaskRunner;
-import com.metamx.druid.indexing.coordinator.ThreadPoolTaskRunner;
-import com.metamx.druid.indexing.worker.executor.ExecutorLifecycle;
-import com.metamx.druid.indexing.worker.executor.ExecutorLifecycleConfig;
-import com.metamx.druid.loading.DataSegmentKiller;
-import com.metamx.druid.loading.S3DataSegmentKiller;
+import io.druid.indexing.common.RetryPolicyConfig;
+import io.druid.indexing.common.RetryPolicyFactory;
+import io.druid.indexing.common.TaskToolboxFactory;
+import io.druid.indexing.common.actions.RemoteTaskActionClientFactory;
+import io.druid.indexing.common.actions.TaskActionClientFactory;
+import io.druid.indexing.common.config.TaskConfig;
+import io.druid.indexing.common.index.ChatHandlerProvider;
+import io.druid.indexing.common.index.EventReceivingChatHandlerProvider;
+import io.druid.indexing.common.index.NoopChatHandlerProvider;
+import io.druid.indexing.coordinator.TaskRunner;
+import io.druid.indexing.coordinator.ThreadPoolTaskRunner;
+import io.druid.indexing.worker.executor.ExecutorLifecycle;
+import io.druid.indexing.worker.executor.ExecutorLifecycleConfig;
+import io.druid.segment.loading.DataSegmentKiller;
+import io.druid.segment.loading.S3DataSegmentKiller;
 
 /**
  */

indexing-service/src/main/java/io/druid/guice/TaskLogsModule.java

@@ -17,17 +17,17 @@
  * 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.Key;
 import com.google.inject.Module;
 import com.google.inject.multibindings.MapBinder;
-import com.metamx.druid.indexing.common.tasklogs.NoopTaskLogs;
-import com.metamx.druid.indexing.common.tasklogs.S3TaskLogs;
-import com.metamx.druid.indexing.common.tasklogs.S3TaskLogsConfig;
-import com.metamx.druid.indexing.common.tasklogs.TaskLogPusher;
-import com.metamx.druid.indexing.common.tasklogs.TaskLogs;
+import io.druid.indexing.common.tasklogs.NoopTaskLogs;
+import io.druid.indexing.common.tasklogs.S3TaskLogs;
+import io.druid.indexing.common.tasklogs.S3TaskLogsConfig;
+import io.druid.indexing.common.tasklogs.TaskLogPusher;
+import io.druid.indexing.common.tasklogs.TaskLogs;
 
 /**
  */

indexing-service/src/main/java/io/druid/indexing/common/RetryPolicy.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.indexing.common;
+package io.druid.indexing.common;
 
 import com.metamx.emitter.EmittingLogger;
 import org.joda.time.Duration;

indexing-service/src/main/java/io/druid/indexing/common/RetryPolicyConfig.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.indexing.common;
+package io.druid.indexing.common;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.joda.time.Period;

indexing-service/src/main/java/io/druid/indexing/common/RetryPolicyFactory.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.indexing.common;
+package io.druid.indexing.common;
 
 import com.google.inject.Inject;
 

indexing-service/src/main/java/io/druid/indexing/common/TaskLock.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,11 +17,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.indexing.common;
+package io.druid.indexing.common;
 
-import com.google.common.base.Objects;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.common.base.Objects;
 import org.joda.time.Interval;
 
 /**

indexing-service/src/main/java/io/druid/indexing/common/TaskStatus.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.indexing.common;
+package io.druid.indexing.common;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;

indexing-service/src/main/java/io/druid/indexing/common/TaskToolbox.java

@@ -17,26 +17,26 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.indexing.common;
+package io.druid.indexing.common;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.Maps;
-import com.metamx.druid.indexing.common.actions.TaskActionClient;
-import com.metamx.druid.indexing.common.actions.TaskActionClientFactory;
-import com.metamx.druid.indexing.common.config.TaskConfig;
-import com.metamx.druid.indexing.common.task.Task;
-import com.metamx.druid.loading.DataSegmentKiller;
-import com.metamx.druid.loading.DataSegmentPusher;
-import com.metamx.druid.loading.MMappedQueryableIndexFactory;
-import com.metamx.druid.loading.S3DataSegmentPuller;
-import com.metamx.druid.loading.SegmentLoaderConfig;
-import com.metamx.druid.loading.SegmentLoadingException;
-import com.metamx.druid.loading.SingleSegmentLoader;
-import com.metamx.druid.query.QueryRunnerFactoryConglomerate;
 import com.metamx.emitter.service.ServiceEmitter;
 import com.metamx.metrics.MonitorScheduler;
 import io.druid.client.DataSegment;
 import io.druid.client.ServerView;
+import io.druid.indexing.common.actions.TaskActionClient;
+import io.druid.indexing.common.actions.TaskActionClientFactory;
+import io.druid.indexing.common.config.TaskConfig;
+import io.druid.indexing.common.task.Task;
+import io.druid.query.QueryRunnerFactoryConglomerate;
+import io.druid.segment.loading.DataSegmentKiller;
+import io.druid.segment.loading.DataSegmentPusher;
+import io.druid.segment.loading.MMappedQueryableIndexFactory;
+import io.druid.segment.loading.S3DataSegmentPuller;
+import io.druid.segment.loading.SegmentLoaderConfig;
+import io.druid.segment.loading.SegmentLoadingException;
+import io.druid.segment.loading.SingleSegmentLoader;
 import io.druid.server.coordination.DataSegmentAnnouncer;
 import org.jets3t.service.impl.rest.httpclient.RestS3Service;
 

indexing-service/src/main/java/io/druid/indexing/common/TaskToolboxFactory.java

@@ -17,19 +17,19 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.indexing.common;
+package io.druid.indexing.common;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.inject.Inject;
-import com.metamx.druid.indexing.common.actions.TaskActionClientFactory;
-import com.metamx.druid.indexing.common.config.TaskConfig;
-import com.metamx.druid.indexing.common.task.Task;
-import com.metamx.druid.loading.DataSegmentKiller;
-import com.metamx.druid.loading.DataSegmentPusher;
-import com.metamx.druid.query.QueryRunnerFactoryConglomerate;
 import com.metamx.emitter.service.ServiceEmitter;
 import com.metamx.metrics.MonitorScheduler;
 import io.druid.client.ServerView;
+import io.druid.indexing.common.actions.TaskActionClientFactory;
+import io.druid.indexing.common.config.TaskConfig;
+import io.druid.indexing.common.task.Task;
+import io.druid.query.QueryRunnerFactoryConglomerate;
+import io.druid.segment.loading.DataSegmentKiller;
+import io.druid.segment.loading.DataSegmentPusher;
 import io.druid.server.coordination.DataSegmentAnnouncer;
 import org.jets3t.service.impl.rest.httpclient.RestS3Service;
 

indexing-service/src/main/java/io/druid/indexing/common/actions/LocalTaskActionClient.java

@@ -1,8 +1,27 @@
-package com.metamx.druid.indexing.common.actions;
+/*
+ * Druid - a distributed column store.
+ * 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+package io.druid.indexing.common.actions;
 
-import com.metamx.druid.indexing.common.task.Task;
-import com.metamx.druid.indexing.coordinator.TaskStorage;
 import com.metamx.emitter.EmittingLogger;
+import io.druid.indexing.common.task.Task;
+import io.druid.indexing.coordinator.TaskStorage;
 
 import java.io.IOException;
 

indexing-service/src/main/java/io/druid/indexing/common/actions/LocalTaskActionClientFactory.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,11 +17,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.indexing.common.actions;
+package io.druid.indexing.common.actions;
 
 import com.google.inject.Inject;
-import com.metamx.druid.indexing.common.task.Task;
-import com.metamx.druid.indexing.coordinator.TaskStorage;
+import io.druid.indexing.common.task.Task;
+import io.druid.indexing.coordinator.TaskStorage;
 
 /**
  */

indexing-service/src/main/java/io/druid/indexing/common/actions/LockAcquireAction.java

@@ -1,12 +1,31 @@
-package com.metamx.druid.indexing.common.actions;
+/*
+ * Druid - a distributed column store.
+ * 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+package io.druid.indexing.common.actions;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.google.common.base.Throwables;
-import com.metamx.druid.indexing.common.TaskLock;
-import com.metamx.druid.indexing.common.task.Task;
+import io.druid.indexing.common.TaskLock;
+import io.druid.indexing.common.task.Task;
 import org.joda.time.Interval;
 
 public class LockAcquireAction implements TaskAction<TaskLock>

indexing-service/src/main/java/io/druid/indexing/common/actions/LockListAction.java

@@ -0,0 +1,52 @@
+/*
+ * Druid - a distributed column store.
+ * 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+package io.druid.indexing.common.actions;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import io.druid.indexing.common.TaskLock;
+import io.druid.indexing.common.task.Task;
+
+import java.util.List;
+
+public class LockListAction implements TaskAction<List<TaskLock>>
+{
+  public TypeReference<List<TaskLock>> getReturnTypeReference()
+  {
+    return new TypeReference<List<TaskLock>>() {};
+  }
+
+  @Override
+  public List<TaskLock> perform(Task task, TaskActionToolbox toolbox)
+  {
+    return toolbox.getTaskLockbox().findLocksForTask(task);
+  }
+
+  @Override
+  public boolean isAudited()
+  {
+    return false;
+  }
+
+  @Override
+  public String toString()
+  {
+    return "LockListAction{}";
+  }
+}

indexing-service/src/main/java/io/druid/indexing/common/actions/LockReleaseAction.java

@@ -1,10 +1,29 @@
-package com.metamx.druid.indexing.common.actions;
+/*
+ * Druid - a distributed column store.
+ * 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+package io.druid.indexing.common.actions;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.metamx.druid.indexing.common.task.Task;
+import io.druid.indexing.common.task.Task;
 import org.joda.time.Interval;
 
 public class LockReleaseAction implements TaskAction<Void>

indexing-service/src/main/java/io/druid/indexing/common/actions/RemoteTaskActionClient.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.indexing.common.actions;
+package io.druid.indexing.common.actions;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -25,13 +25,13 @@ import com.google.common.base.Charsets;
 import com.google.common.base.Throwables;
 import com.metamx.common.ISE;
 import com.metamx.common.logger.Logger;
-import com.metamx.druid.client.indexing.IndexingServiceSelector;
-import com.metamx.druid.indexing.common.RetryPolicy;
-import com.metamx.druid.indexing.common.RetryPolicyFactory;
-import com.metamx.druid.indexing.common.task.Task;
 import com.metamx.http.client.HttpClient;
 import com.metamx.http.client.response.ToStringResponseHandler;
+import io.druid.client.indexing.IndexingServiceSelector;
 import io.druid.client.selector.Server;
+import io.druid.indexing.common.RetryPolicy;
+import io.druid.indexing.common.RetryPolicyFactory;
+import io.druid.indexing.common.task.Task;
 import org.joda.time.Duration;
 
 import java.io.IOException;

indexing-service/src/main/java/io/druid/indexing/common/actions/RemoteTaskActionClientFactory.java

@@ -17,15 +17,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.indexing.common.actions;
+package io.druid.indexing.common.actions;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.inject.Inject;
-import com.metamx.druid.client.indexing.IndexingServiceSelector;
-import com.metamx.druid.indexing.common.RetryPolicyFactory;
-import com.metamx.druid.indexing.common.task.Task;
 import com.metamx.http.client.HttpClient;
-import io.druid.guice.guice.annotations.Global;
+import io.druid.client.indexing.IndexingServiceSelector;
+import io.druid.guice.annotations.Global;
+import io.druid.indexing.common.RetryPolicyFactory;
+import io.druid.indexing.common.task.Task;
 
 /**
  */

indexing-service/src/main/java/io/druid/indexing/common/actions/SegmentInsertAction.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.indexing.common.actions;
+package io.druid.indexing.common.actions;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -25,9 +25,9 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.google.common.collect.ImmutableSet;
 import com.metamx.common.ISE;
-import com.metamx.druid.indexing.common.task.Task;
 import com.metamx.emitter.service.ServiceMetricEvent;
 import io.druid.client.DataSegment;
+import io.druid.indexing.common.task.Task;
 
 import java.io.IOException;
 import java.util.Set;

indexing-service/src/main/java/io/druid/indexing/common/actions/SegmentListUnusedAction.java

@@ -17,14 +17,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.indexing.common.actions;
+package io.druid.indexing.common.actions;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.metamx.druid.indexing.common.task.Task;
 import io.druid.client.DataSegment;
+import io.druid.indexing.common.task.Task;
 import org.joda.time.Interval;
 
 import java.io.IOException;

indexing-service/src/main/java/io/druid/indexing/common/actions/SegmentListUsedAction.java

@@ -17,14 +17,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.indexing.common.actions;
+package io.druid.indexing.common.actions;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.metamx.druid.indexing.common.task.Task;
 import io.druid.client.DataSegment;
+import io.druid.indexing.common.task.Task;
 import org.joda.time.Interval;
 
 import java.io.IOException;

indexing-service/src/main/java/io/druid/indexing/common/actions/SegmentNukeAction.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.indexing.common.actions;
+package io.druid.indexing.common.actions;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -25,9 +25,9 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.google.common.collect.ImmutableSet;
 import com.metamx.common.ISE;
-import com.metamx.druid.indexing.common.task.Task;
 import com.metamx.emitter.service.ServiceMetricEvent;
 import io.druid.client.DataSegment;
+import io.druid.indexing.common.task.Task;
 
 import java.io.IOException;
 import java.util.Set;

indexing-service/src/main/java/io/druid/indexing/common/actions/SpawnTasksAction.java

@@ -1,11 +1,30 @@
-package com.metamx.druid.indexing.common.actions;
+/*
+ * Druid - a distributed column store.
+ * 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+package io.druid.indexing.common.actions;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.google.common.collect.ImmutableList;
-import com.metamx.druid.indexing.common.task.Task;
+import io.druid.indexing.common.task.Task;
 
 import java.util.List;
 

indexing-service/src/main/java/io/druid/indexing/common/actions/TaskAction.java

@@ -1,9 +1,28 @@
-package com.metamx.druid.indexing.common.actions;
+/*
+ * Druid - a distributed column store.
+ * 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+package io.druid.indexing.common.actions;
 
-import com.metamx.druid.indexing.common.task.Task;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.core.type.TypeReference;
+import io.druid.indexing.common.task.Task;
 
 import java.io.IOException;
 

indexing-service/src/main/java/io/druid/indexing/common/actions/TaskActionClient.java

@@ -0,0 +1,27 @@
+/*
+ * Druid - a distributed column store.
+ * 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+package io.druid.indexing.common.actions;
+
+import java.io.IOException;
+
+public interface TaskActionClient
+{
+  public <RetType> RetType submit(TaskAction<RetType> taskAction) throws IOException;
+}

indexing-service/src/main/java/io/druid/indexing/common/actions/TaskActionClientFactory.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,9 +17,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package com.metamx.druid.indexing.common.actions;
+package io.druid.indexing.common.actions;
 
-import com.metamx.druid.indexing.common.task.Task;
+import io.druid.indexing.common.task.Task;
 
 /**
  */