Moved ccr source code to its own gradle module after xpack split.

x-pack/plugin/ccr/build.gradle

@@ -0,0 +1,40 @@
+apply plugin: 'elasticsearch.esplugin'
+esplugin {
+    name 'x-pack-ccr'
+    description 'Elasticsearch Expanded Pack Plugin - CCR'
+    classname 'org.elasticsearch.xpack.ccr.Ccr'
+    hasNativeController false
+    requiresKeystore true
+    extendedPlugins = ['x-pack-core']
+    licenseFile project(':x-pack-elasticsearch').file('LICENSE.txt')
+    noticeFile project(':x-pack-elasticsearch').file('NOTICE.txt')
+}
+archivesBaseName = 'x-pack-ccr'
+
+// TODO: enable this once we have tests
+licenseHeaders.enabled = false
+
+integTest.enabled = false
+
+dependencies {
+    provided "org.elasticsearch:elasticsearch:${version}"
+
+    provided "org.elasticsearch.plugin:x-pack-core:${version}"
+    testCompile project(path: ':x-pack-elasticsearch:plugin:core', configuration: 'testArtifacts')
+}
+
+dependencyLicenses {
+    ignoreSha 'x-pack-core'
+}
+
+// TODO: Fix unchecked warnings
+compileTestJava.options.compilerArgs << "-Xlint:-unchecked"
+
+// TODO: Enable this gradle config:
+// I ran into the following error: Task [run#copyPlugins] cannot add plugin [:x-pack-elasticsearch:plugin:core]
+// with version [7.0.0-alpha1-SNAPSHOT] to project's [:x-pack-elasticsearch:plugin:ccr] dependencies:
+// the plugin is not an esplugin or es_meta_plugin)
+
+//run {
+//    plugin ':x-pack-elasticsearch:plugin:core'
+//}

x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/Ccr.java

@@ -8,21 +8,35 @@ package org.elasticsearch.xpack.ccr;
 import org.elasticsearch.action.ActionRequest;
 import org.elasticsearch.action.ActionResponse;
 import org.elasticsearch.client.Client;
+import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
+import org.elasticsearch.cluster.node.DiscoveryNodes;
+import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
+import org.elasticsearch.common.settings.ClusterSettings;
+import org.elasticsearch.common.settings.IndexScopedSettings;
 import org.elasticsearch.common.settings.Setting;
 import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.common.settings.SettingsFilter;
 import org.elasticsearch.common.xcontent.NamedXContentRegistry;
+import org.elasticsearch.env.Environment;
+import org.elasticsearch.env.NodeEnvironment;
 import org.elasticsearch.index.IndexSettings;
 import org.elasticsearch.index.engine.EngineFactory;
-import org.elasticsearch.plugins.ActionPlugin.ActionHandler;
+import org.elasticsearch.license.XPackLicenseState;
+import org.elasticsearch.plugins.ActionPlugin;
+import org.elasticsearch.plugins.EnginePlugin;
+import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.rest.RestController;
 import org.elasticsearch.rest.RestHandler;
+import org.elasticsearch.script.ScriptService;
 import org.elasticsearch.tasks.Task;
 import org.elasticsearch.threadpool.ExecutorBuilder;
 import org.elasticsearch.threadpool.FixedExecutorBuilder;
 import org.elasticsearch.threadpool.ThreadPool;
+import org.elasticsearch.watcher.ResourceWatcherService;
 import org.elasticsearch.xpack.XPackClientActionPlugin;
+import org.elasticsearch.xpack.XPackPlugin;
 import org.elasticsearch.xpack.ccr.action.FollowExistingIndexAction;
 import org.elasticsearch.xpack.ccr.action.ShardChangesAction;
 import org.elasticsearch.xpack.ccr.action.ShardFollowTask;
@@ -33,13 +47,23 @@ import org.elasticsearch.xpack.ccr.action.bulk.TransportBulkShardOperationsActio
 import org.elasticsearch.xpack.ccr.index.engine.FollowingEngineFactory;
 import org.elasticsearch.xpack.ccr.rest.RestFollowExistingIndexAction;
 import org.elasticsearch.xpack.ccr.rest.RestUnfollowIndexAction;
+import org.elasticsearch.xpack.persistent.CompletionPersistentTaskAction;
 import org.elasticsearch.xpack.persistent.PersistentTaskParams;
+import org.elasticsearch.xpack.persistent.PersistentTasksClusterService;
 import org.elasticsearch.xpack.persistent.PersistentTasksExecutor;
+import org.elasticsearch.xpack.persistent.PersistentTasksExecutorRegistry;
+import org.elasticsearch.xpack.persistent.PersistentTasksService;
+import org.elasticsearch.xpack.persistent.RemovePersistentTaskAction;
+import org.elasticsearch.xpack.persistent.StartPersistentTaskAction;
+import org.elasticsearch.xpack.persistent.UpdatePersistentTaskStatusAction;
 
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+import java.util.function.Supplier;
 
 import static java.util.Collections.emptyList;
 import static org.elasticsearch.xpack.ccr.CcrSettings.CCR_ENABLED_SETTING;
@@ -48,7 +72,7 @@ import static org.elasticsearch.xpack.ccr.CcrSettings.CCR_FOLLOWING_INDEX_SETTIN
 /**
  * Container class for CCR functionality.
  */
-public final class Ccr {
+public class Ccr extends Plugin implements ActionPlugin, EnginePlugin {
 
     public static final String CCR_THREAD_POOL_NAME = "ccr";
 
@@ -69,6 +93,26 @@ public final class Ccr {
         this.tribeNodeClient = XPackClientActionPlugin.isTribeClientNode(settings);
     }
 
+    // TODO: Persistent tasks infra was all moved to ml after the xpack split. Need to move this to a common place where ML can use it too.
+    @Override
+    public Collection<Object> createComponents(Client client, ClusterService clusterService, ThreadPool threadPool,
+                                               ResourceWatcherService resourceWatcherService, ScriptService scriptService,
+                                               NamedXContentRegistry xContentRegistry, Environment environment,
+                                               NodeEnvironment nodeEnvironment, NamedWriteableRegistry namedWriteableRegistry) {
+        List<Object> components = new ArrayList<>();
+        PersistentTasksService persistentTasksService = new PersistentTasksService(settings, clusterService, threadPool, client);
+
+        List<PersistentTasksExecutor<?>> tasksExecutors = new ArrayList<>();
+        tasksExecutors.addAll(createPersistentTasksExecutors(client, threadPool));
+
+        PersistentTasksExecutorRegistry registry = new PersistentTasksExecutorRegistry(settings, tasksExecutors);
+        PersistentTasksClusterService persistentTasksClusterService = new PersistentTasksClusterService(settings, registry, clusterService);
+        components.add(persistentTasksClusterService);
+        components.add(persistentTasksService);
+        components.add(registry);
+        return components;
+    }
+
     public List<PersistentTasksExecutor<?>> createPersistentTasksExecutors(Client client, ThreadPool threadPool) {
         return Collections.singletonList(new ShardFollowTasksExecutor(settings, client, threadPool));
     }
@@ -82,10 +126,20 @@ public final class Ccr {
                 new ActionHandler<>(ShardChangesAction.INSTANCE, ShardChangesAction.TransportAction.class),
                 new ActionHandler<>(FollowExistingIndexAction.INSTANCE, FollowExistingIndexAction.TransportAction.class),
                 new ActionHandler<>(UnfollowIndexAction.INSTANCE, UnfollowIndexAction.TransportAction.class),
-                new ActionHandler<>(BulkShardOperationsAction.INSTANCE, TransportBulkShardOperationsAction.class));
+                new ActionHandler<>(BulkShardOperationsAction.INSTANCE, TransportBulkShardOperationsAction.class),
+
+                // TODO: See not above createComponents(...) method:
+                new ActionHandler<>(StartPersistentTaskAction.INSTANCE, StartPersistentTaskAction.TransportAction.class),
+                new ActionHandler<>(UpdatePersistentTaskStatusAction.INSTANCE, UpdatePersistentTaskStatusAction.TransportAction.class),
+                new ActionHandler<>(RemovePersistentTaskAction.INSTANCE, RemovePersistentTaskAction.TransportAction.class),
+                new ActionHandler<>(CompletionPersistentTaskAction.INSTANCE, CompletionPersistentTaskAction.TransportAction.class)
+        );
     }
 
-    public List<RestHandler> getRestHandlers(Settings settings, RestController restController) {
+    public List<RestHandler> getRestHandlers(Settings settings, RestController restController, ClusterSettings clusterSettings,
+                                             IndexScopedSettings indexScopedSettings, SettingsFilter settingsFilter,
+                                             IndexNameExpressionResolver indexNameExpressionResolver,
+                                             Supplier<DiscoveryNodes> nodesInCluster) {
         return Arrays.asList(
                 new RestUnfollowIndexAction(settings, restController),
                 new RestFollowExistingIndexAction(settings, restController)
@@ -150,4 +204,6 @@ public final class Ccr {
         return Collections.singletonList(ccrTp);
     }
 
+    protected XPackLicenseState getLicenseState() { return XPackPlugin.getSharedLicenseState(); }
+
 }

x-pack/plugin/ccr/src/main/plugin-metadata/plugin-security.policy

@@ -0,0 +1,50 @@
+grant {
+  // needed because of problems in unbound LDAP library
+  permission java.util.PropertyPermission "*", "read,write";
+
+  // required to configure the custom mailcap for watcher
+  permission java.lang.RuntimePermission "setFactory";
+
+  // needed when sending emails for javax.activation
+  // otherwise a classnotfound exception is thrown due to trying
+  // to load the class with the application class loader
+  permission java.lang.RuntimePermission "setContextClassLoader";
+  permission java.lang.RuntimePermission "getClassLoader";
+  // TODO: remove use of this jar as soon as possible!!!!
+  permission java.lang.RuntimePermission "accessClassInPackage.com.sun.activation.registries";
+
+  // bouncy castle
+  permission java.security.SecurityPermission "putProviderProperty.BC";
+
+  // needed for x-pack security extension
+  permission java.security.SecurityPermission "createPolicy.JavaPolicy";
+  permission java.security.SecurityPermission "getPolicy";
+  permission java.security.SecurityPermission "setPolicy";
+
+  // needed for multiple server implementations used in tests
+  permission java.net.SocketPermission "*", "accept,connect";
+
+  // needed for Windows named pipes in machine learning
+  permission java.io.FilePermission "\\\\.\\pipe\\*", "read,write";
+};
+
+grant codeBase "${codebase.netty-common}" {
+   // for reading the system-wide configuration for the backlog of established sockets
+   permission java.io.FilePermission "/proc/sys/net/core/somaxconn", "read";
+};
+
+grant codeBase "${codebase.netty-transport}" {
+   // Netty NioEventLoop wants to change this, because of https://bugs.openjdk.java.net/browse/JDK-6427854
+   // the bug says it only happened rarely, and that its fixed, but apparently it still happens rarely!
+   permission java.util.PropertyPermission "sun.nio.ch.bugLevel", "write";
+};
+
+grant codeBase "${codebase.elasticsearch-rest-client}" {
+  // rest client uses system properties which gets the default proxy
+  permission java.net.NetPermission "getProxySelector";
+};
+
+grant codeBase "${codebase.httpasyncclient}" {
+  // rest client uses system properties which gets the default proxy
+  permission java.net.NetPermission "getProxySelector";
+};

x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/LocalStateCcr.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+package org.elasticsearch.xpack.ccr;
+
+import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.license.XPackLicenseState;
+import org.elasticsearch.xpack.LocalStateCompositeXPackPlugin;
+
+import java.nio.file.Path;
+
+public class LocalStateCcr extends LocalStateCompositeXPackPlugin {
+
+    public LocalStateCcr(final Settings settings, final Path configPath) throws Exception {
+        super(settings, configPath);
+        LocalStateCcr thisVar = this;
+
+        plugins.add(new Ccr(settings){
+            @Override
+            protected XPackLicenseState getLicenseState() {
+                return thisVar.getLicenseState();
+            }
+        });
+    }
+}
+

x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/ShardChangesIT.java

@@ -79,7 +79,7 @@ public class ShardChangesIT extends ESIntegTestCase {
 
     @Override
     protected Collection<Class<? extends Plugin>> nodePlugins() {
-        return Arrays.asList(XPackPlugin.class, CommonAnalysisPlugin.class);
+        return Arrays.asList(LocalStateCcr.class, CommonAnalysisPlugin.class);
     }
 
     @Override