Remove deployment spi

docs/_docs/code-snippets/java/pom.xml

@@ -57,11 +57,6 @@
             <artifactId>ignite-spring</artifactId>
             <version>${ignite.version}</version>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>ignite-urideploy</artifactId>
-            <version>${ignite.version}</version>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>ignite-zookeeper</artifactId>

modules/bom/pom.xml

@@ -146,11 +146,6 @@
                 <artifactId>ignite-tools</artifactId>
                 <version>${revision}</version>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>ignite-urideploy</artifactId>
-                <version>${revision}</version>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>ignite-yardstick</artifactId>

modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java

@@ -29,7 +29,6 @@
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.CheckpointWriteOrder;
 import org.apache.ignite.configuration.DataStorageConfiguration;
-import org.apache.ignite.configuration.DeploymentMode;
 import org.apache.ignite.configuration.DiskPageCompression;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.internal.cache.query.index.sorted.inline.InlineRecommender;
@@ -369,17 +368,6 @@ public final class IgniteSystemProperties extends IgniteCommonsSystemProperties
         "overrides the settings set via IgniteConfiguration", type = String.class)
     public static final String IGNITE_LOCAL_HOST = "IGNITE_LOCAL_HOST";
 
-    /**
-     * System property to override deployment mode configuration parameter.
-     * Valid values for property are: PRIVATE, ISOLATED, SHARED or CONTINUOUS.
-     *
-     * @see org.apache.ignite.configuration.DeploymentMode
-     * @see org.apache.ignite.configuration.IgniteConfiguration#getDeploymentMode()
-     */
-    @SystemProperty(value = "Sets deployment mode configuration parameter. Valid " +
-        "values for property are: PRIVATE, ISOLATED, SHARED or CONTINUOUS", type = DeploymentMode.class)
-    public static final String IGNITE_DEP_MODE_OVERRIDE = "IGNITE_DEPLOYMENT_MODE_OVERRIDE";
-
     /**
      * Property controlling size of buffer holding completed transaction versions. Such buffer
      * is used to detect duplicate transaction and has a default value of {@code 102400}. In

modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java

@@ -62,7 +62,6 @@
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.ConnectorConfiguration;
 import org.apache.ignite.configuration.DataStorageConfiguration;
-import org.apache.ignite.configuration.DeploymentMode;
 import org.apache.ignite.configuration.ExecutorConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.configuration.TransactionConfiguration;
@@ -128,7 +127,6 @@
 import static org.apache.ignite.IgniteState.STOPPED_ON_SEGMENTATION;
 import static org.apache.ignite.IgniteSystemProperties.IGNITE_CACHE_CLIENT;
 import static org.apache.ignite.IgniteSystemProperties.IGNITE_CONFIG_URL;
-import static org.apache.ignite.IgniteSystemProperties.IGNITE_DEP_MODE_OVERRIDE;
 import static org.apache.ignite.IgniteSystemProperties.IGNITE_LOCAL_HOST;
 import static org.apache.ignite.IgniteSystemProperties.IGNITE_NO_SHUTDOWN_HOOK;
 import static org.apache.ignite.IgniteSystemProperties.IGNITE_OVERRIDE_CONSISTENT_ID;
@@ -1879,29 +1877,6 @@ private IgniteConfiguration initializeConfiguration(IgniteConfiguration cfg)
                     myCfg.setClientMode(threadClient);
             }
 
-            // Check for deployment mode override.
-            String depModeName = IgniteSystemProperties.getString(IGNITE_DEP_MODE_OVERRIDE);
-
-            if (!F.isEmpty(depModeName)) {
-                if (!F.isEmpty(myCfg.getCacheConfiguration())) {
-                    U.quietAndInfo(log, "Skipping deployment mode override for caches (custom closure " +
-                        "execution may not work for console Visor)");
-                }
-                else {
-                    try {
-                        DeploymentMode depMode = DeploymentMode.valueOf(depModeName);
-
-                        if (myCfg.getDeploymentMode() != depMode)
-                            myCfg.setDeploymentMode(depMode);
-                    }
-                    catch (IllegalArgumentException e) {
-                        throw new IgniteCheckedException("Failed to override deployment mode using system property " +
-                            "(are there any misspellings?)" +
-                            "[name=" + IGNITE_DEP_MODE_OVERRIDE + ", value=" + depModeName + ']', e);
-                    }
-                }
-            }
-
             if (myCfg.getUserAttributes() == null)
                 myCfg.setUserAttributes(Collections.emptyMap());
 

modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java

@@ -19,7 +19,6 @@
 
 import org.apache.ignite.Ignite;
 import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.configuration.DeploymentMode;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.internal.IgniteEx;
 import org.apache.ignite.marshaller.Marshallers;
@@ -30,8 +29,6 @@
 import static org.apache.ignite.IgniteSystemProperties.IGNITE_BINARY_MARSHALLER_USE_STRING_SERIALIZATION_VER_2;
 import static org.apache.ignite.IgniteSystemProperties.IGNITE_OPTIMIZED_MARSHALLER_USE_DEFAULT_SUID;
 import static org.apache.ignite.IgniteSystemProperties.IGNITE_SECURITY_COMPATIBILITY_MODE;
-import static org.apache.ignite.configuration.DeploymentMode.CONTINUOUS;
-import static org.apache.ignite.configuration.DeploymentMode.SHARED;
 
 /**
  * Tests for node attributes consistency checks.
@@ -40,9 +37,6 @@ public class GridDiscoveryManagerAttributesSelfTest extends GridCommonAbstractTe
     /** */
     private static final String PREFER_IPV4 = "java.net.preferIPv4Stack";
 
-    /** */
-    private static DeploymentMode mode;
-
     /** */
     private static boolean p2pEnabled;
 
@@ -54,7 +48,6 @@ public class GridDiscoveryManagerAttributesSelfTest extends GridCommonAbstractTe
         IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
 
         cfg.setIncludeProperties(PREFER_IPV4);
-        cfg.setDeploymentMode(mode);
         cfg.setPeerClassLoadingEnabled(p2pEnabled);
 
         if (secEnabled)
@@ -65,8 +58,6 @@ public class GridDiscoveryManagerAttributesSelfTest extends GridCommonAbstractTe
 
     /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
-        mode = SHARED;
-
         p2pEnabled = false;
     }
 
@@ -315,28 +306,6 @@ private void doTestCompatibilityEnabled(String prop, Object first, Object second
         }
     }
 
-    /**
-     * @throws Exception If failed.
-     */
-    @Test
-    public void testDifferentDeploymentModes() throws Exception {
-        IgniteEx g = startGrid(0);
-
-        checkIsClientFlag(g);
-
-        mode = CONTINUOUS;
-
-        try {
-            startClientGrid(1);
-
-            fail();
-        }
-        catch (IgniteCheckedException e) {
-            if (!e.getCause().getMessage().startsWith("Remote node has deployment mode different from"))
-                throw e;
-        }
-    }
-
     /**
      * @throws Exception If failed.
      */

modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java

@@ -35,7 +35,6 @@
 import org.apache.ignite.cache.eviction.sorted.SortedEvictionPolicyFactory;
 import org.apache.ignite.cluster.ClusterNode;
 import org.apache.ignite.configuration.CacheConfiguration;
-import org.apache.ignite.configuration.DeploymentMode;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.configuration.NearCacheConfiguration;
 import org.apache.ignite.internal.util.typedef.C1;
@@ -56,8 +55,6 @@
 import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_ASYNC;
 import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
 import static org.apache.ignite.configuration.CacheConfiguration.DFLT_CACHE_MODE;
-import static org.apache.ignite.configuration.DeploymentMode.CONTINUOUS;
-import static org.apache.ignite.configuration.DeploymentMode.SHARED;
 
 /**
  *
@@ -73,9 +70,6 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac
     /** */
     private CacheMode cacheMode = REPLICATED;
 
-    /** */
-    private DeploymentMode depMode = SHARED;
-
     /** */
     private C1<CacheConfiguration, Void> initCache;
 
@@ -105,8 +99,6 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac
             cfg.setGridLogger(strLog);
         }
 
-        cfg.setDeploymentMode(depMode);
-
         if (cacheEnabled) {
             CacheConfiguration cacheCfg = defaultCacheConfiguration();
 
@@ -185,7 +177,6 @@ public void testNullCacheMode() throws Exception {
         cacheEnabled = true;
         cacheName = "myCache";
         cacheMode = null;
-        depMode = SHARED;
 
         assert startGrid(1).cache("myCache").getConfiguration(CacheConfiguration.class).getCacheMode() == DFLT_CACHE_MODE;
     }
@@ -197,15 +188,13 @@ public void testNullCacheMode() throws Exception {
     public void testWithCacheAndWithoutCache() throws Exception {
         // 1st grid without cache.
         cacheEnabled = false;
-        depMode = SHARED;
 
         startGrid(2);
 
         // 2nd grid with replicated cache on board.
         cacheEnabled = true;
         cacheName = "myCache";
         cacheMode = REPLICATED;
-        depMode = SHARED;
 
         startGrid(1);
     }
@@ -219,15 +208,13 @@ public void testSameCacheDifferentModes() throws Exception {
         cacheEnabled = true;
         cacheName = "myCache";
         cacheMode = REPLICATED;
-        depMode = SHARED;
 
         startGrid(1);
 
         // 2nd grid with partitioned cache.
         cacheEnabled = true;
         cacheName = "myCache";
         cacheMode = PARTITIONED;
-        depMode = SHARED;
 
         try {
             startGrid(2);
@@ -248,53 +235,24 @@ public void testDifferentCacheDifferentModes() throws Exception {
         cacheEnabled = true;
         cacheName = "replicated";
         cacheMode = REPLICATED;
-        depMode = SHARED;
 
         startGrid(2);
 
         // 3d grid with partitioned cache.
         cacheEnabled = true;
         cacheName = "partitioned";
         cacheMode = PARTITIONED;
-        depMode = SHARED;
 
         startGrid(3);
 
         // 4th grid with null cache mode (legal case, it should turn to REPLICATED mode).
         cacheEnabled = true;
         cacheName = "partitioned";
         cacheMode = null;
-        depMode = SHARED;
 
         startGrid(4);
     }
 
-    /**
-     * @throws Exception If failed.
-     */
-    @Test
-    public void testDifferentDeploymentModes() throws Exception {
-        // 1st grid with SHARED mode.
-        cacheEnabled = true;
-        cacheName = "partitioned";
-        cacheMode = PARTITIONED;
-        depMode = SHARED;
-
-        startGrid(1);
-
-        // 2nd grid with CONTINUOUS mode.
-        cacheEnabled = true;
-        cacheName = "partitioned";
-        cacheMode = PARTITIONED;
-        depMode = CONTINUOUS;
-
-        GridTestUtils.assertThrows(log, new Callable<Object>() {
-            @Override public Object call() throws Exception {
-                return startGrid(2);
-            }
-        }, IgniteCheckedException.class, null);
-    }
-
     /**
      * @throws Exception If failed.
      */

modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java

@@ -42,7 +42,6 @@
 import org.apache.ignite.compute.ComputeJobContext;
 import org.apache.ignite.compute.ComputeTaskFuture;
 import org.apache.ignite.configuration.CacheConfiguration;
-import org.apache.ignite.configuration.DeploymentMode;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.configuration.NearCacheConfiguration;
 import org.apache.ignite.internal.IgniteKernal;
@@ -659,8 +658,6 @@ protected CacheAtomicityMode atomicityMode() {
 
         cfg.setPeerClassLoadingEnabled(false);
 
-        cfg.setDeploymentMode(DeploymentMode.CONTINUOUS);
-
         TcpDiscoverySpi discoverySpi = (TcpDiscoverySpi)cfg.getDiscoverySpi();
 
         discoverySpi.setAckTimeout(60000);