#ignite-128: WIP.

apache · Feb 3, 2015 · 4234765 · 4234765
1 parent 43e835b
commit 4234765
Show file tree

Hide file tree

Showing 94 changed files with 108 additions and 102 deletions.
diff --git a/modules/clients/config/grid-client-spring-config.xml b/modules/clients/config/grid-client-spring-config.xml
@@ -39,14 +39,14 @@
     <!--
         Configuration below demonstrates how to setup caches within grid nodes.
     -->
-    <bean id="grid.client.cfg" class="org.apache.ignite.client.GridClientConfiguration">
+    <bean id="grid.client.cfg" class="org.apache.ignite.internal.client.GridClientConfiguration">
         <!-- Data configurations. -->
         <property name="dataConfigurations">
             <list>
-                <bean class="org.apache.ignite.client.GridClientDataConfiguration">
+                <bean class="org.apache.ignite.internal.client.GridClientDataConfiguration">
                     <property name="name" value="partitioned"/>
                     <property name="affinity">
-                        <bean class="org.apache.ignite.client.GridClientPartitionAffinity"/>
+                        <bean class="org.apache.ignite.internal.client.GridClientPartitionAffinity"/>
                     </property>
                 </bean>
             </list>

diff --git a/...s/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java b/...s/clients/src/test/java/org/apache/ignite/client/ClientAbstractMultiThreadedSelfTest.java
@@ -24,6 +24,7 @@
 import org.apache.ignite.compute.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.internal.*;
+import org.apache.ignite.internal.client.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.resources.*;
 import org.apache.ignite.client.balancer.*;

diff --git a/modules/clients/src/test/java/org/apache/ignite/client/ClientDefaultCacheSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/ClientDefaultCacheSelfTest.java
@@ -18,6 +18,7 @@
 package org.apache.ignite.client;
 
 import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.client.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
@@ -27,7 +28,7 @@
 
 import java.util.*;
 
-import static org.apache.ignite.client.GridClientProtocol.*;
+import static org.apache.ignite.internal.client.GridClientProtocol.*;
 import static org.apache.ignite.IgniteSystemProperties.*;
 
 /**

diff --git a/modules/clients/src/test/java/org/apache/ignite/client/ClientReconnectionSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/ClientReconnectionSelfTest.java
@@ -19,6 +19,7 @@
 
 import org.apache.ignite.*;
 import org.apache.ignite.client.impl.connection.*;
+import org.apache.ignite.internal.client.*;
 import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.testframework.junits.common.*;
 

diff --git a/modules/clients/src/test/java/org/apache/ignite/client/ClientTcpMultiThreadedSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/ClientTcpMultiThreadedSelfTest.java
@@ -18,6 +18,7 @@
 package org.apache.ignite.client;
 
 import org.apache.ignite.client.ssl.*;
+import org.apache.ignite.internal.client.*;
 
 /**
  * Runs multi-threaded tests on tcp binary protocol (ssl is disabled).

diff --git a/...es/clients/src/test/java/org/apache/ignite/client/ClientTcpSslAuthenticationSelfTest.java b/...es/clients/src/test/java/org/apache/ignite/client/ClientTcpSslAuthenticationSelfTest.java
@@ -21,6 +21,7 @@
 import org.apache.ignite.client.balancer.*;
 import org.apache.ignite.client.impl.*;
 import org.apache.ignite.client.ssl.*;
+import org.apache.ignite.internal.client.*;
 import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.testframework.*;

diff --git a/...les/clients/src/test/java/org/apache/ignite/client/ClientTcpSslMultiThreadedSelfTest.java b/...les/clients/src/test/java/org/apache/ignite/client/ClientTcpSslMultiThreadedSelfTest.java
@@ -18,6 +18,7 @@
 package org.apache.ignite.client;
 
 import org.apache.ignite.client.ssl.*;
+import org.apache.ignite.internal.client.*;
 import org.apache.ignite.testframework.*;
 
 /**

diff --git a/...est/java/org/apache/ignite/client/ClientTcpTaskExecutionAfterTopologyRestartSelfTest.java b/...est/java/org/apache/ignite/client/ClientTcpTaskExecutionAfterTopologyRestartSelfTest.java
@@ -18,6 +18,7 @@
 package org.apache.ignite.client;
 
 import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.client.*;
 import org.apache.ignite.testframework.junits.common.*;
 
 import java.util.*;

diff --git a/modules/clients/src/test/java/org/apache/ignite/client/ClientTopologyCacheSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/ClientTopologyCacheSelfTest.java
@@ -19,6 +19,7 @@
 
 import org.apache.ignite.cache.*;
 import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.client.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;

diff --git a/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientCacheFlagsCodecTest.java b/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientCacheFlagsCodecTest.java
@@ -18,15 +18,15 @@
 package org.apache.ignite.client.impl;
 
 import junit.framework.*;
-import org.apache.ignite.client.*;
 import org.apache.ignite.client.impl.connection.*;
+import org.apache.ignite.internal.client.*;
 import org.apache.ignite.internal.processors.cache.*;
 import org.apache.ignite.internal.processors.rest.handlers.cache.*;
 import org.apache.ignite.internal.util.typedef.*;
 
 import java.util.*;
 
-import static org.apache.ignite.client.GridClientCacheFlag.*;
+import static org.apache.ignite.internal.client.GridClientCacheFlag.*;
 
 /**
  * Tests conversions between GridClientCacheFlag and CacheFlag.

diff --git a/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientComputeImplSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientComputeImplSelfTest.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.client.impl;
 
-import org.apache.ignite.client.*;
+import org.apache.ignite.internal.client.*;
 import org.apache.ignite.testframework.junits.common.*;
 
 import java.util.*;

diff --git a/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientDataImplSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientDataImplSelfTest.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.client.impl;
 
-import org.apache.ignite.client.*;
+import org.apache.ignite.internal.client.*;
 import org.apache.ignite.testframework.junits.common.*;
 
 import java.util.concurrent.*;

diff --git a/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientFutureAdapterSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientFutureAdapterSelfTest.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.client.impl;
 
-import org.apache.ignite.client.*;
+import org.apache.ignite.internal.client.*;
 import org.apache.ignite.testframework.junits.common.*;
 
 import java.util.*;
@@ -46,7 +46,7 @@ public void testFinished() {
     /**
      * Test chained futures behaviour.
      *
-     * @throws GridClientException On any exception.
+     * @throws org.apache.ignite.internal.client.GridClientException On any exception.
      */
     public void testChains() throws GridClientException {
         // Synchronous notifications.

diff --git a/.../clients/src/test/java/org/apache/ignite/client/impl/ClientPartitionAffinitySelfTest.java b/.../clients/src/test/java/org/apache/ignite/client/impl/ClientPartitionAffinitySelfTest.java
@@ -20,7 +20,7 @@
 import org.apache.ignite.cache.affinity.*;
 import org.apache.ignite.cache.affinity.consistenthash.*;
 import org.apache.ignite.cluster.*;
-import org.apache.ignite.client.*;
+import org.apache.ignite.internal.client.*;
 import org.apache.ignite.internal.processors.affinity.*;
 import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.testframework.*;

diff --git a/...ts/src/test/java/org/apache/ignite/client/impl/ClientPropertiesConfigurationSelfTest.java b/...ts/src/test/java/org/apache/ignite/client/impl/ClientPropertiesConfigurationSelfTest.java
@@ -18,8 +18,8 @@
 package org.apache.ignite.client.impl;
 
 import org.apache.commons.io.*;
-import org.apache.ignite.client.*;
 import org.apache.ignite.client.balancer.*;
+import org.apache.ignite.internal.client.*;
 import org.apache.ignite.internal.util.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.testframework.junits.common.*;
@@ -29,7 +29,7 @@
 import java.net.*;
 import java.util.*;
 
-import static org.apache.ignite.client.GridClientConfiguration.*;
+import static org.apache.ignite.internal.client.GridClientConfiguration.*;
 
 /**
  * Properties-based configuration self test.

diff --git a/...rc/test/java/org/apache/ignite/client/integration/ClientAbstractConnectivitySelfTest.java b/...rc/test/java/org/apache/ignite/client/integration/ClientAbstractConnectivitySelfTest.java
@@ -18,8 +18,8 @@
 package org.apache.ignite.client.integration;
 
 import org.apache.ignite.*;
+import org.apache.ignite.internal.client.*;
 import org.apache.ignite.lang.*;
-import org.apache.ignite.client.*;
 import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.testframework.*;

diff --git a/...s/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java b/...s/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java
@@ -23,6 +23,7 @@
 import org.apache.ignite.compute.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.internal.*;
+import org.apache.ignite.internal.client.*;
 import org.apache.ignite.internal.processors.cache.*;
 import org.apache.ignite.internal.processors.cache.distributed.*;
 import org.apache.ignite.internal.processors.cache.version.*;
@@ -33,7 +34,6 @@
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.client.*;
 import org.apache.ignite.client.balancer.*;
 import org.apache.ignite.client.ssl.*;
 import org.apache.ignite.internal.managers.communication.*;

diff --git a/...es/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java b/...es/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractSelfTest.java
@@ -26,12 +26,12 @@
 import org.apache.ignite.cache.store.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.client.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
 import org.apache.ignite.spi.swapspace.file.*;
-import org.apache.ignite.client.*;
 import org.apache.ignite.client.ssl.*;
 import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.internal.util.typedef.internal.*;

diff --git a/...lients/src/test/java/org/apache/ignite/client/integration/ClientPreferDirectSelfTest.java b/...lients/src/test/java/org/apache/ignite/client/integration/ClientPreferDirectSelfTest.java
@@ -20,8 +20,8 @@
 import org.apache.ignite.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.client.*;
 import org.apache.ignite.resources.*;
-import org.apache.ignite.client.*;
 import org.apache.ignite.client.balancer.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.*;

diff --git a/...nts/src/test/java/org/apache/ignite/client/integration/ClientTcpConnectivitySelfTest.java b/...nts/src/test/java/org/apache/ignite/client/integration/ClientTcpConnectivitySelfTest.java
@@ -19,8 +19,8 @@
 
 import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
-import org.apache.ignite.client.*;
 import org.apache.ignite.internal.*;
+import org.apache.ignite.internal.client.*;
 import org.apache.ignite.internal.util.typedef.*;
 import org.jetbrains.annotations.*;
 

diff --git a/.../src/test/java/org/apache/ignite/client/integration/ClientTcpDirectMultiNodeSelfTest.java b/.../src/test/java/org/apache/ignite/client/integration/ClientTcpDirectMultiNodeSelfTest.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.client.integration;
 
-import org.apache.ignite.client.*;
+import org.apache.ignite.internal.client.*;
 
 import java.util.*;
 

diff --git a/...s/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpDirectSelfTest.java b/...s/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpDirectSelfTest.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.client.integration;
 
-import org.apache.ignite.client.*;
 import org.apache.ignite.client.ssl.*;
+import org.apache.ignite.internal.client.*;
 
 import java.util.*;
 

diff --git a/...lients/src/test/java/org/apache/ignite/client/integration/ClientTcpMultiNodeSelfTest.java b/...lients/src/test/java/org/apache/ignite/client/integration/ClientTcpMultiNodeSelfTest.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.client.integration;
 
-import org.apache.ignite.client.*;
+import org.apache.ignite.internal.client.*;
 
 /**
  * Test for TCP binary rest protocol.

diff --git a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpSelfTest.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.client.integration;
 
-import org.apache.ignite.client.*;
 import org.apache.ignite.client.ssl.*;
+import org.apache.ignite.internal.client.*;
 
 /**
  * Tests TCP protocol.

diff --git a/...c/test/java/org/apache/ignite/client/integration/ClientTcpSslDirectMultiNodeSelfTest.java b/...c/test/java/org/apache/ignite/client/integration/ClientTcpSslDirectMultiNodeSelfTest.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.client.integration;
 
-import org.apache.ignite.client.*;
 import org.apache.ignite.client.ssl.*;
+import org.apache.ignite.internal.client.*;
 import org.apache.ignite.testframework.*;
 
 import java.util.*;

diff --git a/...lients/src/test/java/org/apache/ignite/client/integration/ClientTcpSslDirectSelfTest.java b/...lients/src/test/java/org/apache/ignite/client/integration/ClientTcpSslDirectSelfTest.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.client.integration;
 
-import org.apache.ignite.client.*;
 import org.apache.ignite.client.ssl.*;
+import org.apache.ignite.internal.client.*;
 import org.apache.ignite.testframework.*;
 
 import java.util.*;

diff --git a/...nts/src/test/java/org/apache/ignite/client/integration/ClientTcpSslMultiNodeSelfTest.java b/...nts/src/test/java/org/apache/ignite/client/integration/ClientTcpSslMultiNodeSelfTest.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.client.integration;
 
-import org.apache.ignite.client.*;
 import org.apache.ignite.client.ssl.*;
+import org.apache.ignite.internal.client.*;
 import org.apache.ignite.testframework.*;
 
 /**

diff --git a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpSslSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientTcpSslSelfTest.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.client.integration;
 
-import org.apache.ignite.client.*;
 import org.apache.ignite.client.ssl.*;
+import org.apache.ignite.internal.client.*;
 import org.apache.ignite.testframework.*;
 
 /**

diff --git a/...test/java/org/apache/ignite/client/integration/ClientTcpUnreachableMultiNodeSelfTest.java b/...test/java/org/apache/ignite/client/integration/ClientTcpUnreachableMultiNodeSelfTest.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.client.integration;
 
-import org.apache.ignite.client.*;
 import org.apache.ignite.client.balancer.*;
+import org.apache.ignite.internal.client.*;
 import org.apache.ignite.internal.util.typedef.*;
 
 import java.net.*;

diff --git a/modules/clients/src/test/java/org/apache/ignite/client/router/ClientFailedInitSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/router/ClientFailedInitSelfTest.java
@@ -20,8 +20,8 @@
 import org.apache.ignite.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.configuration.*;
-import org.apache.ignite.client.*;
 import org.apache.ignite.client.impl.connection.*;
+import org.apache.ignite.internal.client.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
@@ -30,7 +30,7 @@
 
 import java.util.*;
 
-import static org.apache.ignite.client.GridClientProtocol.*;
+import static org.apache.ignite.internal.client.GridClientProtocol.*;
 import static org.apache.ignite.client.integration.ClientAbstractSelfTest.*;
 import static org.apache.ignite.IgniteSystemProperties.*;
 

diff --git a/modules/clients/src/test/java/org/apache/ignite/client/router/TcpRouterAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/router/TcpRouterAbstractSelfTest.java
@@ -18,8 +18,8 @@
 package org.apache.ignite.client.router;
 
 import org.apache.ignite.*;
+import org.apache.ignite.internal.client.*;
 import org.apache.ignite.logger.log4j.*;
-import org.apache.ignite.client.*;
 import org.apache.ignite.client.integration.*;
 import org.apache.ignite.client.router.impl.*;
 import org.apache.ignite.internal.util.typedef.*;

diff --git a/...les/clients/src/test/java/org/apache/ignite/client/router/TcpRouterMultiNodeSelfTest.java b/...les/clients/src/test/java/org/apache/ignite/client/router/TcpRouterMultiNodeSelfTest.java
@@ -18,8 +18,8 @@
 package org.apache.ignite.client.router;
 
 import org.apache.ignite.*;
+import org.apache.ignite.internal.client.*;
 import org.apache.ignite.logger.log4j.*;
-import org.apache.ignite.client.*;
 import org.apache.ignite.client.integration.*;
 import org.apache.ignite.client.router.impl.*;
 

diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java
@@ -21,8 +21,8 @@
 import org.apache.ignite.compute.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.events.*;
+import org.apache.ignite.internal.client.*;
 import org.apache.ignite.lang.*;
-import org.apache.ignite.client.*;
 import org.apache.ignite.testframework.*;
 import org.apache.ignite.testframework.junits.common.*;
 import org.jetbrains.annotations.*;

diff --git a/.../src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorStartSelfTest.java b/.../src/test/java/org/apache/ignite/internal/processors/rest/RestProcessorStartSelfTest.java
@@ -19,9 +19,9 @@
 
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.internal.*;
+import org.apache.ignite.internal.client.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.spi.*;
-import org.apache.ignite.client.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;

diff --git a/.../src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java b/.../src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java
@@ -21,8 +21,8 @@
 import org.apache.ignite.cache.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.configuration.*;
-import org.apache.ignite.client.*;
 import org.apache.ignite.internal.*;
+import org.apache.ignite.internal.client.*;
 import org.apache.ignite.internal.processors.rest.handlers.*;
 import org.apache.ignite.internal.processors.rest.handlers.task.*;
 import org.apache.ignite.spi.discovery.tcp.*;
@@ -36,7 +36,7 @@
 
 import java.util.*;
 
-import static org.apache.ignite.client.GridClientProtocol.*;
+import static org.apache.ignite.internal.client.GridClientProtocol.*;
 import static org.apache.ignite.cache.CacheMode.*;
 import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;