refactor index service into a service package

modules/elasticsearch/src/main/java/org/elasticsearch/action/terms/TransportTermsAction.java

@@ -34,9 +34,9 @@ import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.routing.GroupShardsIterator;
 import org.elasticsearch.cluster.routing.ShardRouting;
-import org.elasticsearch.index.IndexService;
 import org.elasticsearch.index.engine.Engine;
 import org.elasticsearch.index.mapper.FieldMapper;
+import org.elasticsearch.index.service.IndexService;
 import org.elasticsearch.index.shard.service.IndexShard;
 import org.elasticsearch.indices.IndicesService;
 import org.elasticsearch.threadpool.ThreadPool;

modules/elasticsearch/src/main/java/org/elasticsearch/cluster/metadata/MetaDataService.java

@@ -32,10 +32,10 @@ import org.elasticsearch.cluster.routing.IndexRoutingTable;
 import org.elasticsearch.cluster.routing.RoutingTable;
 import org.elasticsearch.cluster.routing.strategy.ShardsRoutingStrategy;
 import org.elasticsearch.index.Index;
-import org.elasticsearch.index.IndexService;
 import org.elasticsearch.index.mapper.DocumentMapper;
 import org.elasticsearch.index.mapper.InvalidTypeNameException;
 import org.elasticsearch.index.mapper.MapperService;
+import org.elasticsearch.index.service.IndexService;
 import org.elasticsearch.indices.IndexAlreadyExistsException;
 import org.elasticsearch.indices.IndexMissingException;
 import org.elasticsearch.indices.IndicesService;

modules/elasticsearch/src/main/java/org/elasticsearch/index/IndexModule.java

@@ -20,6 +20,8 @@
 package org.elasticsearch.index;
 
 import com.google.inject.AbstractModule;
+import org.elasticsearch.index.service.IndexService;
+import org.elasticsearch.index.service.InternalIndexService;
 
 /**
  * @author kimchy (Shay Banon)

modules/elasticsearch/src/main/java/org/elasticsearch/index/IndexServiceManagement.java

@@ -20,6 +20,7 @@
 package org.elasticsearch.index;
 
 import com.google.inject.Inject;
+import org.elasticsearch.index.service.IndexService;
 import org.elasticsearch.index.settings.IndexSettings;
 import org.elasticsearch.jmx.JmxService;
 import org.elasticsearch.jmx.MBean;

modules/elasticsearch/src/main/java/org/elasticsearch/index/service/IndexService.java

@@ -17,10 +17,13 @@
  * under the License.
  */
 
-package org.elasticsearch.index;
+package org.elasticsearch.index.service;
 
 import com.google.inject.Injector;
 import org.elasticsearch.ElasticSearchException;
+import org.elasticsearch.index.IndexComponent;
+import org.elasticsearch.index.IndexLifecycle;
+import org.elasticsearch.index.IndexShardMissingException;
 import org.elasticsearch.index.cache.filter.FilterCache;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.index.query.IndexQueryParserService;

modules/elasticsearch/src/main/java/org/elasticsearch/index/service/InternalIndexService.java

@@ -17,13 +17,14 @@
  * under the License.
  */
 
-package org.elasticsearch.index;
+package org.elasticsearch.index.service;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.UnmodifiableIterator;
 import com.google.inject.Inject;
 import com.google.inject.Injector;
 import org.elasticsearch.ElasticSearchException;
+import org.elasticsearch.index.*;
 import org.elasticsearch.index.cache.filter.FilterCache;
 import org.elasticsearch.index.deletionpolicy.DeletionPolicyModule;
 import org.elasticsearch.index.engine.Engine;

modules/elasticsearch/src/main/java/org/elasticsearch/indices/IndicesMemoryCleaner.java

@@ -20,9 +20,9 @@
 package org.elasticsearch.indices;
 
 import com.google.inject.Inject;
-import org.elasticsearch.index.IndexService;
 import org.elasticsearch.index.engine.Engine;
 import org.elasticsearch.index.engine.FlushNotAllowedEngineException;
+import org.elasticsearch.index.service.IndexService;
 import org.elasticsearch.index.shard.IllegalIndexShardStateException;
 import org.elasticsearch.index.shard.IndexShardState;
 import org.elasticsearch.index.shard.service.IndexShard;

modules/elasticsearch/src/main/java/org/elasticsearch/indices/IndicesService.java

@@ -22,7 +22,7 @@ package org.elasticsearch.indices;
 import org.elasticsearch.ElasticSearchException;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.routing.GroupShardsIterator;
-import org.elasticsearch.index.IndexService;
+import org.elasticsearch.index.service.IndexService;
 import org.elasticsearch.util.component.LifecycleComponent;
 import org.elasticsearch.util.concurrent.ThreadSafe;
 import org.elasticsearch.util.settings.Settings;

modules/elasticsearch/src/main/java/org/elasticsearch/indices/InternalIndicesService.java

@@ -37,6 +37,7 @@ import org.elasticsearch.index.gateway.IndexGatewayModule;
 import org.elasticsearch.index.mapper.MapperServiceModule;
 import org.elasticsearch.index.query.IndexQueryParserModule;
 import org.elasticsearch.index.routing.OperationRoutingModule;
+import org.elasticsearch.index.service.IndexService;
 import org.elasticsearch.index.settings.IndexSettingsModule;
 import org.elasticsearch.index.similarity.SimilarityModule;
 import org.elasticsearch.indices.cluster.IndicesClusterStateService;

modules/elasticsearch/src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java

@@ -37,12 +37,12 @@ import org.elasticsearch.cluster.routing.IndexShardRoutingTable;
 import org.elasticsearch.cluster.routing.RoutingNode;
 import org.elasticsearch.cluster.routing.RoutingTable;
 import org.elasticsearch.cluster.routing.ShardRouting;
-import org.elasticsearch.index.IndexService;
 import org.elasticsearch.index.IndexShardAlreadyExistsException;
 import org.elasticsearch.index.gateway.IgnoreGatewayRecoveryException;
 import org.elasticsearch.index.gateway.IndexShardGatewayService;
 import org.elasticsearch.index.mapper.DocumentMapper;
 import org.elasticsearch.index.mapper.MapperService;
+import org.elasticsearch.index.service.IndexService;
 import org.elasticsearch.index.shard.IndexShardState;
 import org.elasticsearch.index.shard.recovery.IgnoreRecoveryException;
 import org.elasticsearch.index.shard.recovery.RecoveryAction;

modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchService.java

@@ -27,8 +27,8 @@ import org.codehaus.jackson.JsonParser;
 import org.codehaus.jackson.JsonToken;
 import org.elasticsearch.ElasticSearchException;
 import org.elasticsearch.cluster.ClusterService;
-import org.elasticsearch.index.IndexService;
 import org.elasticsearch.index.engine.Engine;
+import org.elasticsearch.index.service.IndexService;
 import org.elasticsearch.index.shard.service.IndexShard;
 import org.elasticsearch.indices.IndicesService;
 import org.elasticsearch.search.dfs.CachedDfSource;

modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/SearchContext.java

@@ -22,13 +22,13 @@ package org.elasticsearch.search.internal;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.Sort;
 import org.elasticsearch.ElasticSearchException;
-import org.elasticsearch.index.IndexService;
 import org.elasticsearch.index.cache.filter.FilterCache;
 import org.elasticsearch.index.engine.Engine;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.index.query.IndexQueryParser;
 import org.elasticsearch.index.query.IndexQueryParserMissingException;
 import org.elasticsearch.index.query.IndexQueryParserService;
+import org.elasticsearch.index.service.IndexService;
 import org.elasticsearch.index.similarity.SimilarityService;
 import org.elasticsearch.search.Scroll;
 import org.elasticsearch.search.SearchShardTarget;