# ignite-63

apache · Jan 22, 2015 · b1018cc · b1018cc
1 parent b9288ff
commit b1018cc
Show file tree

Hide file tree

Showing 174 changed files with 338 additions and 360 deletions.
diff --git a/config/router/default-router.xml b/config/router/default-router.xml
@@ -39,7 +39,7 @@
     <!--
         Configuration of TCP router.
     -->
-    <bean id="tcp.router.cfg" class="org.gridgain.client.router.GridTcpRouterConfiguration">
+    <bean id="tcp.router.cfg" class="org.apache.ignite.client.router.GridTcpRouterConfiguration">
 
         <property name="logger" ref="router.log" />
     </bean>

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.gridgain.client.GridClientConfiguration">
+    <bean id="grid.client.cfg" class="org.apache.ignite.client.GridClientConfiguration">
         <!-- Data configurations. -->
         <property name="dataConfigurations">
             <list>
-                <bean class="org.gridgain.client.GridClientDataConfiguration">
+                <bean class="org.apache.ignite.client.GridClientDataConfiguration">
                     <property name="name" value="partitioned"/>
                     <property name="affinity">
-                        <bean class="org.gridgain.client.GridClientPartitionAffinity"/>
+                        <bean class="org.apache.ignite.client.GridClientPartitionAffinity"/>
                     </property>
                 </bean>
             </list>

diff --git a/...dClientAbstractMultiThreadedSelfTest.java → ...dClientAbstractMultiThreadedSelfTest.java b/...dClientAbstractMultiThreadedSelfTest.java → ...dClientAbstractMultiThreadedSelfTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.client;
+package org.apache.ignite.client;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
@@ -24,9 +24,9 @@
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.resources.*;
-import org.gridgain.client.balancer.*;
-import org.gridgain.client.impl.*;
-import org.gridgain.client.ssl.*;
+import org.apache.ignite.client.balancer.*;
+import org.apache.ignite.client.impl.*;
+import org.apache.ignite.client.ssl.*;
 import org.gridgain.grid.cache.affinity.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.processors.affinity.*;

diff --git a/...lient/GridClientDefaultCacheSelfTest.java → ...lient/GridClientDefaultCacheSelfTest.java b/...lient/GridClientDefaultCacheSelfTest.java → ...lient/GridClientDefaultCacheSelfTest.java
@@ -15,11 +15,10 @@
  * limitations under the License.
  */
 
-package org.gridgain.client;
+package org.apache.ignite.client;
 
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
@@ -28,7 +27,7 @@
 
 import java.util.*;
 
-import static org.gridgain.client.GridClientProtocol.*;
+import static org.apache.ignite.client.GridClientProtocol.*;
 import static org.apache.ignite.IgniteSystemProperties.*;
 
 /**

diff --git a/...ain/client/GridClientGetAffinityTask.java → ...ite/client/GridClientGetAffinityTask.java b/...ain/client/GridClientGetAffinityTask.java → ...ite/client/GridClientGetAffinityTask.java
@@ -15,13 +15,12 @@
  * limitations under the License.
  */
 
-package org.gridgain.client;
+package org.apache.ignite.client;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.resources.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.util.typedef.internal.*;
 
 import java.util.*;

diff --git a/...g/gridgain/client/GridClientHttpTask.java → ...che/ignite/client/GridClientHttpTask.java b/...g/gridgain/client/GridClientHttpTask.java → ...che/ignite/client/GridClientHttpTask.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.client;
+package org.apache.ignite.client;
 
 import net.sf.json.*;
 import org.apache.ignite.*;

diff --git a/...ridgain/client/GridClientNodeStartup.java → .../ignite/client/GridClientNodeStartup.java b/...ridgain/client/GridClientNodeStartup.java → .../ignite/client/GridClientNodeStartup.java
@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 
-package org.gridgain.client;
+package org.apache.ignite.client;
 
 import org.apache.ignite.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;
 

diff --git a/...lient/GridClientPortableArgumentTask.java → ...lient/GridClientPortableArgumentTask.java b/...lient/GridClientPortableArgumentTask.java → ...lient/GridClientPortableArgumentTask.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.client;
+package org.apache.ignite.client;
 
 import org.apache.ignite.*;
 import org.apache.ignite.portables.*;

diff --git a/...ain/client/GridClientPutPortableTask.java → ...ite/client/GridClientPutPortableTask.java b/...ain/client/GridClientPutPortableTask.java → ...ite/client/GridClientPutPortableTask.java
@@ -15,11 +15,10 @@
  * limitations under the License.
  */
 
-package org.gridgain.client;
+package org.apache.ignite.client;
 
 import org.apache.ignite.*;
 import org.apache.ignite.resources.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 
 /**

diff --git a/...lient/GridClientReconnectionSelfTest.java → ...lient/GridClientReconnectionSelfTest.java b/...lient/GridClientReconnectionSelfTest.java → ...lient/GridClientReconnectionSelfTest.java
@@ -15,17 +15,17 @@
  * limitations under the License.
  */
 
-package org.gridgain.client;
+package org.apache.ignite.client;
 
 import org.apache.ignite.*;
-import org.gridgain.client.impl.connection.*;
+import org.apache.ignite.client.impl.connection.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.testframework.junits.common.*;
 
 import java.nio.channels.*;
 import java.util.*;
 
-import static org.gridgain.client.GridClientTestRestServer.*;
+import static org.apache.ignite.client.GridClientTestRestServer.*;
 
 /**
  *

diff --git a/...gain/client/GridClientSslNodeStartup.java → ...nite/client/GridClientSslNodeStartup.java b/...gain/client/GridClientSslNodeStartup.java → ...nite/client/GridClientSslNodeStartup.java
@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 
-package org.gridgain.client;
+package org.apache.ignite.client;
 
 import org.apache.ignite.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;
 

diff --git a/...dgain/client/GridClientStartNodeTask.java → ...gnite/client/GridClientStartNodeTask.java b/...dgain/client/GridClientStartNodeTask.java → ...gnite/client/GridClientStartNodeTask.java
@@ -15,13 +15,12 @@
  * limitations under the License.
  */
 
-package org.gridgain.client;
+package org.apache.ignite.client;
 
 import org.apache.ignite.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.resources.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.springframework.beans.factory.*;

diff --git a/...idgain/client/GridClientStopNodeTask.java → ...ignite/client/GridClientStopNodeTask.java b/...idgain/client/GridClientStopNodeTask.java → ...ignite/client/GridClientStopNodeTask.java
@@ -15,12 +15,11 @@
  * limitations under the License.
  */
 
-package org.gridgain.client;
+package org.apache.ignite.client;
 
 import org.apache.ignite.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.resources.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.util.typedef.*;
 
 import java.util.*;

diff --git a/...in/client/GridClientStringLengthTask.java → ...te/client/GridClientStringLengthTask.java b/...in/client/GridClientStringLengthTask.java → ...te/client/GridClientStringLengthTask.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.client;
+package org.apache.ignite.client;
 
 import org.apache.ignite.*;
 import org.apache.ignite.compute.*;

diff --git a/...t/GridClientTcpMultiThreadedSelfTest.java → ...t/GridClientTcpMultiThreadedSelfTest.java b/...t/GridClientTcpMultiThreadedSelfTest.java → ...t/GridClientTcpMultiThreadedSelfTest.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.gridgain.client;
+package org.apache.ignite.client;
 
-import org.gridgain.client.ssl.*;
+import org.apache.ignite.client.ssl.*;
 
 /**
  * Runs multi-threaded tests on tcp binary protocol (ssl is disabled).

diff --git a/...idClientTcpSslAuthenticationSelfTest.java → ...idClientTcpSslAuthenticationSelfTest.java b/...idClientTcpSslAuthenticationSelfTest.java → ...idClientTcpSslAuthenticationSelfTest.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.gridgain.client;
+package org.apache.ignite.client;
 
 import org.apache.ignite.configuration.*;
-import org.gridgain.client.balancer.*;
-import org.gridgain.client.impl.*;
-import org.gridgain.client.ssl.*;
+import org.apache.ignite.client.balancer.*;
+import org.apache.ignite.client.impl.*;
+import org.apache.ignite.client.ssl.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.testframework.*;

diff --git a/...ridClientTcpSslMultiThreadedSelfTest.java → ...ridClientTcpSslMultiThreadedSelfTest.java b/...ridClientTcpSslMultiThreadedSelfTest.java → ...ridClientTcpSslMultiThreadedSelfTest.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.gridgain.client;
+package org.apache.ignite.client;
 
-import org.gridgain.client.ssl.*;
+import org.apache.ignite.client.ssl.*;
 import org.gridgain.testframework.*;
 
 /**

diff --git a/...rg/gridgain/client/GridClientTcpTask.java → ...ache/ignite/client/GridClientTcpTask.java b/...rg/gridgain/client/GridClientTcpTask.java → ...ache/ignite/client/GridClientTcpTask.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.client;
+package org.apache.ignite.client;
 
 import org.apache.ignite.*;
 import org.apache.ignite.compute.*;

diff --git a/...xecutionAfterTopologyRestartSelfTest.java → ...xecutionAfterTopologyRestartSelfTest.java b/...xecutionAfterTopologyRestartSelfTest.java → ...xecutionAfterTopologyRestartSelfTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.client;
+package org.apache.ignite.client;
 
 import org.apache.ignite.configuration.*;
 import org.gridgain.testframework.junits.common.*;

diff --git a/...idgain/client/GridClientTestPortable.java → ...ignite/client/GridClientTestPortable.java b/...idgain/client/GridClientTestPortable.java → ...ignite/client/GridClientTestPortable.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.client;
+package org.apache.ignite.client;
 
 import org.apache.ignite.portables.*;
 import org.gridgain.grid.util.typedef.internal.*;

diff --git a/...ridClientTestPortableAffinityKeyTask.java → ...ridClientTestPortableAffinityKeyTask.java b/...ridClientTestPortableAffinityKeyTask.java → ...ridClientTestPortableAffinityKeyTask.java
@@ -15,14 +15,13 @@
  * limitations under the License.
  */
 
-package org.gridgain.client;
+package org.apache.ignite.client;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.portables.*;
 import org.apache.ignite.resources.*;
-import org.gridgain.grid.*;
 import org.jetbrains.annotations.*;
 
 import java.util.*;

diff --git a/...gain/client/GridClientTestRestServer.java → ...nite/client/GridClientTestRestServer.java b/...gain/client/GridClientTestRestServer.java → ...nite/client/GridClientTestRestServer.java
@@ -15,12 +15,11 @@
  * limitations under the License.
  */
 
-package org.gridgain.client;
+package org.apache.ignite.client;
 
 import org.apache.ignite.*;
-import org.gridgain.client.marshaller.*;
-import org.gridgain.client.marshaller.optimized.*;
-import org.gridgain.grid.*;
+import org.apache.ignite.client.marshaller.*;
+import org.apache.ignite.client.marshaller.optimized.*;
 import org.gridgain.grid.kernal.processors.rest.client.message.*;
 import org.gridgain.grid.kernal.processors.rest.protocols.tcp.*;
 import org.gridgain.grid.util.nio.*;

diff --git a/...ient/GridClientTopologyCacheSelfTest.java → ...ient/GridClientTopologyCacheSelfTest.java b/...ient/GridClientTopologyCacheSelfTest.java → ...ient/GridClientTopologyCacheSelfTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.client;
+package org.apache.ignite.client;
 
 import org.apache.ignite.cache.*;
 import org.apache.ignite.configuration.*;

diff --git a/...org/gridgain/client/GridHashMapStore.java → ...pache/ignite/client/GridHashMapStore.java b/...org/gridgain/client/GridHashMapStore.java → ...pache/ignite/client/GridHashMapStore.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.client;
+package org.apache.ignite.client;
 
 import org.apache.ignite.cache.store.*;
 import org.apache.ignite.lang.*;

diff --git a/...rg/gridgain/client/GridSleepTestTask.java → ...ache/ignite/client/GridSleepTestTask.java b/...rg/gridgain/client/GridSleepTestTask.java → ...ache/ignite/client/GridSleepTestTask.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.client;
+package org.apache.ignite.client;
 
 import org.apache.ignite.*;
 import org.apache.ignite.compute.*;

diff --git a/...client/GridTaskSingleJobSplitAdapter.java → ...client/GridTaskSingleJobSplitAdapter.java b/...client/GridTaskSingleJobSplitAdapter.java → ...client/GridTaskSingleJobSplitAdapter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.client;
+package org.apache.ignite.client;
 
 import org.apache.ignite.*;
 import org.apache.ignite.compute.*;

diff --git a/...t/impl/GridClientCacheFlagsCodecTest.java → ...t/impl/GridClientCacheFlagsCodecTest.java b/...t/impl/GridClientCacheFlagsCodecTest.java → ...t/impl/GridClientCacheFlagsCodecTest.java
@@ -15,18 +15,18 @@
  * limitations under the License.
  */
 
-package org.gridgain.client.impl;
+package org.apache.ignite.client.impl;
 
 import junit.framework.*;
-import org.gridgain.client.*;
-import org.gridgain.client.impl.connection.*;
+import org.apache.ignite.client.*;
+import org.apache.ignite.client.impl.connection.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.processors.rest.handlers.cache.*;
 import org.gridgain.grid.util.typedef.*;
 
 import java.util.*;
 
-import static org.gridgain.client.GridClientCacheFlag.*;
+import static org.apache.ignite.client.GridClientCacheFlag.*;
 
 /**
  * Tests conversions between GridClientCacheFlag and GridCacheFlag.

diff --git a/...t/impl/GridClientComputeImplSelfTest.java → ...t/impl/GridClientComputeImplSelfTest.java b/...t/impl/GridClientComputeImplSelfTest.java → ...t/impl/GridClientComputeImplSelfTest.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.gridgain.client.impl;
+package org.apache.ignite.client.impl;
 
-import org.gridgain.client.*;
+import org.apache.ignite.client.*;
 import org.gridgain.testframework.junits.common.*;
 
 import java.util.*;

diff --git a/...ient/impl/GridClientDataImplSelfTest.java → ...ient/impl/GridClientDataImplSelfTest.java b/...ient/impl/GridClientDataImplSelfTest.java → ...ient/impl/GridClientDataImplSelfTest.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.gridgain.client.impl;
+package org.apache.ignite.client.impl;
 
-import org.gridgain.client.*;
+import org.apache.ignite.client.*;
 import org.gridgain.testframework.junits.common.*;
 
 import java.util.concurrent.*;

diff --git a/...impl/GridClientFutureAdapterSelfTest.java → ...impl/GridClientFutureAdapterSelfTest.java b/...impl/GridClientFutureAdapterSelfTest.java → ...impl/GridClientFutureAdapterSelfTest.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.gridgain.client.impl;
+package org.apache.ignite.client.impl;
 
-import org.gridgain.client.*;
+import org.apache.ignite.client.*;
 import org.gridgain.testframework.junits.common.*;
 
 import java.util.*;