#ignite-128: WIP.

apache · Feb 3, 2015 · 4127b4d · 4127b4d
1 parent b88a101
commit 4127b4d
Show file tree

Hide file tree

Showing 35 changed files with 52 additions and 55 deletions.
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
@@ -25,10 +25,10 @@
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.internal.*;
 import org.apache.ignite.internal.client.*;
+import org.apache.ignite.internal.client.balancer.*;
 import org.apache.ignite.internal.client.ssl.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.resources.*;
-import org.apache.ignite.client.balancer.*;
 import org.apache.ignite.client.impl.*;
 import org.apache.ignite.internal.processors.affinity.*;
 import org.apache.ignite.spi.discovery.tcp.*;

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
@@ -18,9 +18,9 @@
 package org.apache.ignite.client;
 
 import org.apache.ignite.configuration.*;
-import org.apache.ignite.client.balancer.*;
 import org.apache.ignite.client.impl.*;
 import org.apache.ignite.internal.client.*;
+import org.apache.ignite.internal.client.balancer.*;
 import org.apache.ignite.internal.client.ssl.*;
 import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.internal.util.typedef.internal.*;

diff --git a/modules/clients/src/test/java/org/apache/ignite/client/ClientTestRestServer.java b/modules/clients/src/test/java/org/apache/ignite/client/ClientTestRestServer.java
@@ -18,8 +18,8 @@
 package org.apache.ignite.client;
 
 import org.apache.ignite.*;
-import org.apache.ignite.client.marshaller.*;
-import org.apache.ignite.client.marshaller.optimized.*;
+import org.apache.ignite.internal.client.marshaller.*;
+import org.apache.ignite.internal.client.marshaller.optimized.*;
 import org.apache.ignite.internal.processors.rest.client.message.*;
 import org.apache.ignite.internal.processors.rest.protocols.tcp.*;
 import org.apache.ignite.internal.util.nio.*;

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.balancer.*;
 import org.apache.ignite.internal.client.*;
+import org.apache.ignite.internal.client.balancer.*;
 import org.apache.ignite.internal.util.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.testframework.junits.common.*;

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
@@ -24,6 +24,7 @@
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.internal.*;
 import org.apache.ignite.internal.client.*;
+import org.apache.ignite.internal.client.balancer.*;
 import org.apache.ignite.internal.client.ssl.*;
 import org.apache.ignite.internal.processors.cache.*;
 import org.apache.ignite.internal.processors.cache.distributed.*;
@@ -35,7 +36,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.balancer.*;
 import org.apache.ignite.internal.managers.communication.*;
 import org.apache.ignite.internal.processors.cache.transactions.*;
 import org.apache.ignite.internal.util.direct.*;

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
@@ -21,8 +21,8 @@
 import org.apache.ignite.compute.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.internal.client.*;
+import org.apache.ignite.internal.client.balancer.*;
 import org.apache.ignite.resources.*;
-import org.apache.ignite.client.balancer.*;
 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/...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.balancer.*;
 import org.apache.ignite.internal.client.*;
+import org.apache.ignite.internal.client.balancer.*;
 import org.apache.ignite.internal.util.typedef.*;
 
 import java.net.*;

diff --git a/...es/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestBinaryClient.java b/...es/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestBinaryClient.java
@@ -18,10 +18,10 @@
 package org.apache.ignite.internal.processors.rest;
 
 import org.apache.ignite.*;
+import org.apache.ignite.internal.client.marshaller.*;
+import org.apache.ignite.internal.client.marshaller.optimized.*;
 import org.apache.ignite.internal.util.*;
 import org.apache.ignite.logger.java.*;
-import org.apache.ignite.client.marshaller.*;
-import org.apache.ignite.client.marshaller.optimized.*;
 import org.apache.ignite.internal.processors.rest.client.message.*;
 import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.internal.util.typedef.internal.*;

diff --git a/.../java/org/apache/ignite/internal/processors/rest/protocols/tcp/TcpRestParserSelfTest.java b/.../java/org/apache/ignite/internal/processors/rest/protocols/tcp/TcpRestParserSelfTest.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.processors.rest.protocols.tcp;
 
-import org.apache.ignite.client.marshaller.*;
-import org.apache.ignite.client.marshaller.optimized.*;
+import org.apache.ignite.internal.client.marshaller.*;
+import org.apache.ignite.internal.client.marshaller.optimized.*;
 import org.apache.ignite.internal.processors.rest.client.message.*;
 import org.apache.ignite.internal.util.nio.*;
 import org.apache.ignite.internal.util.typedef.*;

diff --git a/...ients/src/test/java/org/apache/ignite/loadtests/client/ClientMarshallerBenchmarkTest.java b/...ients/src/test/java/org/apache/ignite/loadtests/client/ClientMarshallerBenchmarkTest.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.loadtests.client;
 
-import org.apache.ignite.client.marshaller.*;
-import org.apache.ignite.client.marshaller.jdk.*;
-import org.apache.ignite.client.marshaller.optimized.*;
+import org.apache.ignite.internal.client.marshaller.*;
+import org.apache.ignite.internal.client.marshaller.jdk.*;
+import org.apache.ignite.internal.client.marshaller.optimized.*;
 import org.apache.ignite.internal.processors.rest.client.message.*;
 import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.testframework.junits.common.*;

diff --git a/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientAbstractProjection.java b/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientAbstractProjection.java
@@ -18,9 +18,9 @@
 package org.apache.ignite.client.impl;
 
 import org.apache.ignite.*;
-import org.apache.ignite.client.balancer.*;
 import org.apache.ignite.client.impl.connection.*;
 import org.apache.ignite.internal.client.*;
+import org.apache.ignite.internal.client.balancer.*;
 import org.apache.ignite.internal.client.util.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 import org.jetbrains.annotations.*;

diff --git a/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientComputeImpl.java b/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientComputeImpl.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.client.impl;
 
-import org.apache.ignite.client.balancer.*;
 import org.apache.ignite.client.impl.connection.*;
 import org.apache.ignite.internal.client.*;
+import org.apache.ignite.internal.client.balancer.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 import org.jetbrains.annotations.*;
 

diff --git a/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientDataImpl.java b/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientDataImpl.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.client.impl;
 
-import org.apache.ignite.client.balancer.*;
 import org.apache.ignite.client.impl.connection.*;
 import org.apache.ignite.internal.client.*;
+import org.apache.ignite.internal.client.balancer.*;
 import org.apache.ignite.internal.client.util.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 

diff --git a/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientImpl.java b/modules/core/src/main/java/org/apache/ignite/client/impl/GridClientImpl.java
@@ -18,9 +18,9 @@
 package org.apache.ignite.client.impl;
 
 import org.apache.ignite.*;
-import org.apache.ignite.client.balancer.*;
 import org.apache.ignite.client.impl.connection.*;
 import org.apache.ignite.internal.client.*;
+import org.apache.ignite.internal.client.balancer.*;
 import org.apache.ignite.internal.client.ssl.*;
 import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.internal.util.typedef.internal.*;

diff --git a/...re/src/main/java/org/apache/ignite/client/impl/connection/GridClientNioTcpConnection.java b/...re/src/main/java/org/apache/ignite/client/impl/connection/GridClientNioTcpConnection.java
@@ -19,10 +19,10 @@
 
 import org.apache.ignite.*;
 import org.apache.ignite.client.impl.*;
-import org.apache.ignite.client.marshaller.*;
-import org.apache.ignite.client.marshaller.jdk.*;
-import org.apache.ignite.client.marshaller.optimized.*;
 import org.apache.ignite.internal.client.*;
+import org.apache.ignite.internal.client.marshaller.*;
+import org.apache.ignite.internal.client.marshaller.jdk.*;
+import org.apache.ignite.internal.client.marshaller.optimized.*;
 import org.apache.ignite.internal.processors.rest.client.message.*;
 import org.apache.ignite.internal.util.nio.*;
 import org.apache.ignite.internal.util.nio.ssl.*;

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClient.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClient.java
@@ -17,8 +17,6 @@
 
 package org.apache.ignite.internal.client;
 
-import org.apache.ignite.client.balancer.*;
-
 import java.util.*;
 
 /**
@@ -85,7 +83,7 @@ public interface GridClient extends AutoCloseable {
     /**
      * Gets a default compute projection. Default compute projection will include all nodes
      * in remote grid. Selection of node that will be connected to perform operations will be
-     * done according to {@link GridClientLoadBalancer} provided in client configuration or
+     * done according to {@link org.apache.ignite.internal.client.balancer.GridClientLoadBalancer} provided in client configuration or
      * according to affinity if projection call involves affinity key.
      * <p>
      * More restricted projection configurations may be created with {@link GridClientCompute} methods.

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCompute.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCompute.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.client;
 
-import org.apache.ignite.client.balancer.*;
+import org.apache.ignite.internal.client.balancer.*;
 import org.jetbrains.annotations.*;
 
 import java.util.*;

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java
@@ -17,12 +17,11 @@
 
 package org.apache.ignite.internal.client;
 
+import org.apache.ignite.internal.client.balancer.*;
+import org.apache.ignite.internal.client.marshaller.*;
+import org.apache.ignite.internal.client.marshaller.optimized.*;
 import org.apache.ignite.internal.client.ssl.*;
 import org.apache.ignite.portables.*;
-import org.apache.ignite.client.balancer.*;
-import org.apache.ignite.client.marshaller.*;
-import org.apache.ignite.client.marshaller.jdk.*;
-import org.apache.ignite.client.marshaller.optimized.*;
 import org.apache.ignite.plugin.security.*;
 import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
@@ -613,7 +612,7 @@ public void setExecutorService(ExecutorService executor) {
      * <ul>
      *     <li>{@link GridClientOptimizedMarshaller} (default) - GridGain's optimized marshaller.</li>
      *     <li>{@code GridClientPortableMarshaller} - Marshaller that supports portable objects.</li>
-     *     <li>{@link GridClientJdkMarshaller} - JDK marshaller (not recommended).</li>
+     *     <li>{@link org.apache.ignite.internal.client.marshaller.jdk.GridClientJdkMarshaller} - JDK marshaller (not recommended).</li>
      * </ul>
      *
      * @return A marshaller to use.

diff --git a/...les/core/src/main/java/org/apache/ignite/internal/client/GridClientDataConfiguration.java b/...les/core/src/main/java/org/apache/ignite/internal/client/GridClientDataConfiguration.java
@@ -17,7 +17,7 @@
 
 package org.apache.ignite.internal.client;
 
-import org.apache.ignite.client.balancer.*;
+import org.apache.ignite.internal.client.balancer.*;
 
 /**
  * Java client data configuration.

diff --git a/...t/balancer/GridClientBalancerAdapter.java → ...t/balancer/GridClientBalancerAdapter.java b/...t/balancer/GridClientBalancerAdapter.java → ...t/balancer/GridClientBalancerAdapter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.client.balancer;
+package org.apache.ignite.internal.client.balancer;
 
 import org.apache.ignite.internal.client.*;
 import org.apache.ignite.lang.*;

diff --git a/...ient/balancer/GridClientLoadBalancer.java → ...ient/balancer/GridClientLoadBalancer.java b/...ient/balancer/GridClientLoadBalancer.java → ...ient/balancer/GridClientLoadBalancer.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.client.balancer;
+package org.apache.ignite.internal.client.balancer;
 
 import org.apache.ignite.internal.client.*;
 

diff --git a/...nt/balancer/GridClientRandomBalancer.java → ...nt/balancer/GridClientRandomBalancer.java b/...nt/balancer/GridClientRandomBalancer.java → ...nt/balancer/GridClientRandomBalancer.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.client.balancer;
+package org.apache.ignite.internal.client.balancer;
 
 import org.apache.ignite.internal.client.*;
 

diff --git a/...alancer/GridClientRoundRobinBalancer.java → ...alancer/GridClientRoundRobinBalancer.java b/...alancer/GridClientRoundRobinBalancer.java → ...alancer/GridClientRoundRobinBalancer.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.client.balancer;
+package org.apache.ignite.internal.client.balancer;
 
 import org.apache.ignite.internal.client.*;
 import org.apache.ignite.internal.util.typedef.internal.*;

diff --git a/...ient/marshaller/GridClientMarshaller.java → ...ient/marshaller/GridClientMarshaller.java b/...ient/marshaller/GridClientMarshaller.java → ...ient/marshaller/GridClientMarshaller.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.client.marshaller;
+package org.apache.ignite.internal.client.marshaller;
 
 import java.io.*;
 import java.nio.*;

diff --git a/...rshaller/jdk/GridClientJdkMarshaller.java → ...rshaller/jdk/GridClientJdkMarshaller.java b/...rshaller/jdk/GridClientJdkMarshaller.java → ...rshaller/jdk/GridClientJdkMarshaller.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.client.marshaller.jdk;
+package org.apache.ignite.internal.client.marshaller.jdk;
 
-import org.apache.ignite.client.marshaller.*;
+import org.apache.ignite.internal.client.marshaller.*;
 import org.apache.ignite.internal.util.io.*;
 
 import java.io.*;

diff --git a/...imized/GridClientOptimizedMarshaller.java → ...imized/GridClientOptimizedMarshaller.java b/...imized/GridClientOptimizedMarshaller.java → ...imized/GridClientOptimizedMarshaller.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.client.marshaller.optimized;
+package org.apache.ignite.internal.client.marshaller.optimized;
 
 import org.apache.ignite.*;
+import org.apache.ignite.internal.client.marshaller.*;
 import org.apache.ignite.marshaller.optimized.*;
-import org.apache.ignite.client.marshaller.*;
 import org.apache.ignite.internal.processors.rest.client.message.*;
 
 import java.io.*;
@@ -28,7 +28,7 @@
 
 /**
  * Wrapper, that adapts {@link org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller} to
- * {@link GridClientMarshaller} interface.
+ * {@link org.apache.ignite.internal.client.marshaller.GridClientMarshaller} interface.
  */
 public class GridClientOptimizedMarshaller implements GridClientMarshaller {
     /** ID. */

diff --git a/...n/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioListenerAdapter.java b/...n/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioListenerAdapter.java
@@ -18,10 +18,10 @@
 package org.apache.ignite.internal.client.router.impl;
 
 import org.apache.ignite.*;
-import org.apache.ignite.client.marshaller.*;
-import org.apache.ignite.client.marshaller.jdk.*;
-import org.apache.ignite.client.marshaller.optimized.*;
 import org.apache.ignite.internal.client.*;
+import org.apache.ignite.internal.client.marshaller.*;
+import org.apache.ignite.internal.client.marshaller.jdk.*;
+import org.apache.ignite.internal.client.marshaller.optimized.*;
 import org.apache.ignite.internal.processors.rest.client.message.*;
 import org.apache.ignite.internal.util.nio.*;
 import org.apache.ignite.internal.util.typedef.internal.*;

diff --git a/...e/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioParser.java b/...e/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioParser.java
@@ -18,7 +18,7 @@
 package org.apache.ignite.internal.client.router.impl;
 
 import org.apache.ignite.*;
-import org.apache.ignite.client.marshaller.*;
+import org.apache.ignite.internal.client.marshaller.*;
 import org.apache.ignite.internal.processors.rest.client.message.*;
 import org.apache.ignite.internal.processors.rest.protocols.tcp.*;
 import org.apache.ignite.internal.util.nio.*;

diff --git a/...e/src/main/java/org/apache/ignite/internal/processors/portable/GridPortableProcessor.java b/...e/src/main/java/org/apache/ignite/internal/processors/portable/GridPortableProcessor.java
@@ -17,9 +17,9 @@
 
 package org.apache.ignite.internal.processors.portable;
 
+import org.apache.ignite.internal.client.marshaller.*;
 import org.apache.ignite.internal.processors.*;
 import org.apache.ignite.portables.*;
-import org.apache.ignite.client.marshaller.*;
 import org.jetbrains.annotations.*;
 
 import java.nio.*;

diff --git a/.../main/java/org/apache/ignite/internal/processors/portable/os/GridOsPortableProcessor.java b/.../main/java/org/apache/ignite/internal/processors/portable/os/GridOsPortableProcessor.java
@@ -18,10 +18,10 @@
 package org.apache.ignite.internal.processors.portable.os;
 
 import org.apache.ignite.internal.*;
+import org.apache.ignite.internal.client.marshaller.*;
 import org.apache.ignite.internal.processors.*;
 import org.apache.ignite.internal.processors.portable.*;
 import org.apache.ignite.portables.*;
-import org.apache.ignite.client.marshaller.*;
 import org.jetbrains.annotations.*;
 
 import java.nio.*;

diff --git a/...ava/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestDirectParser.java b/...ava/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestDirectParser.java
@@ -18,7 +18,7 @@
 package org.apache.ignite.internal.processors.rest.protocols.tcp;
 
 import org.apache.ignite.*;
-import org.apache.ignite.client.marshaller.*;
+import org.apache.ignite.internal.client.marshaller.*;
 import org.apache.ignite.internal.processors.rest.client.message.*;
 import org.apache.ignite.internal.util.direct.*;
 import org.apache.ignite.internal.util.nio.*;

diff --git a/...java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestNioListener.java b/...java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestNioListener.java
@@ -19,7 +19,7 @@
 
 import org.apache.ignite.*;
 import org.apache.ignite.internal.*;
-import org.apache.ignite.client.marshaller.*;
+import org.apache.ignite.internal.client.marshaller.*;
 import org.apache.ignite.internal.processors.rest.*;
 import org.apache.ignite.internal.processors.rest.client.message.*;
 import org.apache.ignite.internal.processors.rest.handlers.cache.*;

diff --git a/...main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java b/...main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java
@@ -18,10 +18,10 @@
 package org.apache.ignite.internal.processors.rest.protocols.tcp;
 
 import org.apache.ignite.*;
+import org.apache.ignite.internal.client.marshaller.*;
 import org.apache.ignite.internal.util.*;
 import org.apache.ignite.marshaller.*;
 import org.apache.ignite.marshaller.jdk.*;
-import org.apache.ignite.client.marshaller.*;
 import org.apache.ignite.internal.processors.rest.client.message.*;
 import org.apache.ignite.internal.util.nio.*;
 import org.apache.ignite.internal.util.typedef.internal.*;