ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [30/50] [abbrv] incubator-ignite git commit: # IGNITE-133: Fixed imports and package names in scala files.
Date Tue, 27 Jan 2015 10:56:12 GMT
# IGNITE-133: Fixed imports and package names in scala files.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1ebc69e3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1ebc69e3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1ebc69e3

Branch: refs/heads/ignite-99-2
Commit: 1ebc69e39576d9b51cc9700adb8aca1a187e5481
Parents: 7faa36f
Author: AKuznetsov <akuznetsov@gridgain.com>
Authored: Mon Jan 26 17:01:29 2015 +0700
Committer: AKuznetsov <akuznetsov@gridgain.com>
Committed: Mon Jan 26 17:01:30 2015 +0700

----------------------------------------------------------------------
 .../examples/ScalarCacheAffinityExample1.scala  |  9 +--
 .../examples/ScalarCacheAffinityExample2.scala  |  9 +--
 .../ScalarCacheAffinitySimpleExample.scala      |  4 +-
 .../scalar/examples/ScalarCacheExample.scala    | 13 ++--
 .../ScalarCachePopularNumbersExample.scala      | 14 ++---
 .../examples/ScalarCacheQueryExample.scala      | 11 ++--
 .../scalar/examples/ScalarClosureExample.scala  |  6 +-
 .../examples/ScalarContinuationExample.scala    | 11 ++--
 .../examples/ScalarCreditRiskExample.scala      |  7 ++-
 .../scalar/examples/ScalarJvmCloudExample.scala | 13 ++--
 .../examples/ScalarPiCalculationExample.scala   |  7 ++-
 .../scalar/examples/ScalarPingPongExample.scala |  7 ++-
 .../scalar/examples/ScalarPrimeExample.scala    | 10 +--
 .../scalar/examples/ScalarScheduleExample.scala |  6 +-
 .../examples/ScalarSnowflakeSchemaExample.scala | 15 ++---
 .../examples/ScalarStartStopExample.scala       |  6 +-
 .../scalar/examples/ScalarTaskExample.scala     | 12 ++--
 .../examples/ScalarWorldShortestMapReduce.scala |  6 +-
 .../tests/examples/ScalarExamplesSelfTest.scala |  7 +--
 modules/scalar/readme.txt                       |  4 +-
 .../ignite/scalar/ScalarConversions.scala       | 19 +++---
 .../org/apache/ignite/scalar/lang/Packet.scala  |  4 +-
 .../ignite/scalar/lang/ScalarAbsClosure.scala   |  4 +-
 .../scalar/lang/ScalarAbsClosureFunction.scala  |  2 +-
 .../ignite/scalar/lang/ScalarAbsClosureX.scala  |  2 +-
 .../scalar/lang/ScalarAbsClosureXFunction.scala |  4 +-
 .../ignite/scalar/lang/ScalarAbsPredicate.scala |  2 +-
 .../lang/ScalarAbsPredicateFunction.scala       |  4 +-
 .../scalar/lang/ScalarAbsPredicateX.scala       |  2 +-
 .../lang/ScalarAbsPredicateXFunction.scala      |  2 +-
 .../ignite/scalar/lang/ScalarClosure.scala      |  2 +-
 .../ignite/scalar/lang/ScalarClosure2.scala     |  2 +-
 .../scalar/lang/ScalarClosure2Function.scala    |  2 +-
 .../ignite/scalar/lang/ScalarClosure2X.scala    |  2 +-
 .../scalar/lang/ScalarClosure2XFunction.scala   |  4 +-
 .../ignite/scalar/lang/ScalarClosure3.scala     |  2 +-
 .../scalar/lang/ScalarClosure3Function.scala    |  4 +-
 .../ignite/scalar/lang/ScalarClosure3X.scala    |  2 +-
 .../scalar/lang/ScalarClosure3XFunction.scala   |  4 +-
 .../scalar/lang/ScalarClosureFunction.scala     |  2 +-
 .../ignite/scalar/lang/ScalarClosureX.scala     |  2 +-
 .../scalar/lang/ScalarClosureXFunction.scala    |  2 +-
 .../ignite/scalar/lang/ScalarInClosure.scala    |  2 +-
 .../ignite/scalar/lang/ScalarInClosure2.scala   |  2 +-
 .../scalar/lang/ScalarInClosure2Function.scala  |  2 +-
 .../ignite/scalar/lang/ScalarInClosure2X.scala  |  2 +-
 .../scalar/lang/ScalarInClosure2XFunction.scala |  2 +-
 .../ignite/scalar/lang/ScalarInClosure3.scala   |  2 +-
 .../scalar/lang/ScalarInClosure3Function.scala  |  4 +-
 .../ignite/scalar/lang/ScalarInClosure3X.scala  |  2 +-
 .../scalar/lang/ScalarInClosure3XFunction.scala |  4 +-
 .../scalar/lang/ScalarInClosureFunction.scala   |  2 +-
 .../ignite/scalar/lang/ScalarInClosureX.scala   |  2 +-
 .../scalar/lang/ScalarInClosureXFunction.scala  |  4 +-
 .../apache/ignite/scalar/lang/ScalarJob.scala   |  2 +-
 .../ignite/scalar/lang/ScalarOutClosure.scala   |  7 ++-
 .../scalar/lang/ScalarOutClosureFunction.scala  |  2 +-
 .../ignite/scalar/lang/ScalarOutClosureX.scala  |  2 +-
 .../scalar/lang/ScalarOutClosureXFunction.scala |  4 +-
 .../ignite/scalar/lang/ScalarPredicate.scala    |  2 +-
 .../ignite/scalar/lang/ScalarPredicate2.scala   |  2 +-
 .../scalar/lang/ScalarPredicate2Function.scala  |  2 +-
 .../ignite/scalar/lang/ScalarPredicate2X.scala  |  2 +-
 .../scalar/lang/ScalarPredicate2XFunction.scala |  2 +-
 .../ignite/scalar/lang/ScalarPredicate3.scala   |  2 +-
 .../scalar/lang/ScalarPredicate3Function.scala  |  4 +-
 .../ignite/scalar/lang/ScalarPredicate3X.scala  |  2 +-
 .../scalar/lang/ScalarPredicate3XFunction.scala |  4 +-
 .../scalar/lang/ScalarPredicateFunction.scala   |  2 +-
 .../ignite/scalar/lang/ScalarPredicateX.scala   |  2 +-
 .../scalar/lang/ScalarPredicateXFunction.scala  |  2 +-
 .../ignite/scalar/lang/ScalarReducer.scala      |  4 +-
 .../ignite/scalar/lang/ScalarReducer2.scala     |  5 +-
 .../scalar/lang/ScalarReducer2Function.scala    |  4 +-
 .../ignite/scalar/lang/ScalarReducer3.scala     |  5 +-
 .../scalar/lang/ScalarReducer3Function.scala    |  4 +-
 .../scalar/lang/ScalarReducerFunction.scala     |  2 +-
 .../org/apache/ignite/scalar/pimps/Packet.scala |  4 +-
 .../apache/ignite/scalar/pimps/PimpedType.scala |  2 +-
 .../ignite/scalar/pimps/ScalarCachePimp.scala   |  2 +-
 .../pimps/ScalarCacheProjectionPimp.scala       | 18 +++---
 .../ignite/scalar/pimps/ScalarGridPimp.scala    |  5 +-
 .../scalar/pimps/ScalarProjectionPimp.scala     | 64 ++++++++++----------
 .../scalar/pimps/ScalarTaskThreadContext.scala  |  5 +-
 .../scala/org/apache/ignite/scalar/scalar.scala | 14 +++--
 .../test/resources/spring-ping-pong-partner.xml |  2 +-
 .../tests/ScalarAffinityRoutingSpec.scala       | 13 ++--
 .../tests/ScalarCacheProjectionSpec.scala       |  8 +--
 .../scalar/tests/ScalarCacheQueriesSpec.scala   |  9 ++-
 .../ignite/scalar/tests/ScalarCacheSpec.scala   | 17 +++---
 .../scalar/tests/ScalarConversionsSpec.scala    | 12 ++--
 .../scalar/tests/ScalarProjectionSpec.scala     | 14 +++--
 .../scalar/tests/ScalarReturnableSpec.scala     | 11 ++--
 .../apache/ignite/scalar/tests/ScalarSpec.scala |  8 +--
 .../scalar/testsuites/ScalarSelfTestSuite.scala |  4 +-
 .../config/VisorConfigurationCommand.scala      |  3 +-
 96 files changed, 285 insertions(+), 281 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample1.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample1.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample1.scala
index e984a38..2598e93 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample1.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample1.scala
@@ -15,14 +15,15 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.examples
+package org.apache.ignite.scalar.examples
 
+import org.apache.ignite._
 import org.apache.ignite.cache.CacheName
 import org.apache.ignite.cache.affinity.CacheAffinityKeyMapped
-import org.gridgain.scalar.scalar
-import scalar._
-import org.apache.ignite._
+import org.apache.ignite.scalar.scalar
+import org.apache.ignite.scalar.scalar._
 import org.jetbrains.annotations.Nullable
+
 import java.util.concurrent.Callable
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample2.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample2.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample2.scala
index ab422d2..bc6f0a1 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample2.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample2.scala
@@ -15,12 +15,13 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.examples
+package org.apache.ignite.scalar.examples
 
 import org.apache.ignite.Ignite
-import org.gridgain.scalar.scalar
-import scalar._
-import collection.JavaConversions._
+import org.apache.ignite.scalar.scalar
+import org.apache.ignite.scalar.scalar._
+
+import scala.collection.JavaConversions._
 import scala.util.control.Breaks._
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinitySimpleExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinitySimpleExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinitySimpleExample.scala
index e3959a0..103bcb3 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinitySimpleExample.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinitySimpleExample.scala
@@ -18,8 +18,8 @@
 package org.apache.ignite.scalar.examples
 
 import org.apache.ignite.cache.GridCache
-import org.gridgain.scalar.scalar
-import scalar._
+import org.apache.ignite.scalar.scalar
+import org.apache.ignite.scalar.scalar._
 
 /**
  * This example demonstrates the simplest code that populates the distributed cache

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheExample.scala
index 5d8e72a..574006f 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheExample.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheExample.scala
@@ -15,15 +15,16 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.examples
+package org.apache.ignite.scalar.examples
 
 import org.apache.ignite.cache.CacheEntry
-import org.apache.ignite.events.{IgniteEventType, IgniteEvent}
+import org.apache.ignite.events.IgniteEvent
+import org.apache.ignite.events.IgniteEventType._
 import org.apache.ignite.lang.IgnitePredicate
-import org.gridgain.scalar.scalar
-import scalar._
-import IgniteEventType._
-import collection.JavaConversions._
+import org.apache.ignite.scalar.scalar
+import org.apache.ignite.scalar.scalar._
+
+import scala.collection.JavaConversions._
 
 /**
  * Demonstrates basic In-Memory Data Grid operations with Scalar.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCachePopularNumbersExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCachePopularNumbersExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCachePopularNumbersExample.scala
index e67972a..4cf0b04 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCachePopularNumbersExample.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCachePopularNumbersExample.scala
@@ -15,20 +15,14 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.examples
+package org.apache.ignite.scalar.examples
 
-import javax.cache.processor.{MutableEntry, EntryProcessor}
-
-import org.apache.ignite.dataload.IgniteDataLoadCacheUpdater
+import org.apache.ignite.IgniteCheckedException
 import org.apache.ignite.examples.datagrid.CacheNodeStartup
-import org.apache.ignite.{IgniteCache, IgniteCheckedException}
+import org.apache.ignite.scalar.scalar
+import org.apache.ignite.scalar.scalar._
 
-import java.util
 import java.util.Timer
-import java.util.Map.Entry
-
-import org.gridgain.scalar.scalar
-import org.gridgain.scalar.scalar._
 
 import scala.util.Random
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheQueryExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheQueryExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheQueryExample.scala
index 7a53588..99334f4 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheQueryExample.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheQueryExample.scala
@@ -17,13 +17,14 @@
 
 package org.apache.ignite.scalar.examples
 
-import org.apache.ignite.cache.{CacheMode, CacheProjection}
+import org.apache.ignite.Ignite
+import org.apache.ignite.cache.CacheMode._
+import org.apache.ignite.cache.CacheProjection
 import org.apache.ignite.cache.affinity.CacheAffinityKey
 import org.apache.ignite.internal.processors.cache.CacheFlag
-import org.gridgain.scalar._
-import scalar._
-import org.apache.ignite.Ignite
-import CacheMode._
+import org.apache.ignite.scalar.scalar
+import org.apache.ignite.scalar.scalar._
+
 import java.util._
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarClosureExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarClosureExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarClosureExample.scala
index 70ee3f2..3587356 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarClosureExample.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarClosureExample.scala
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.examples
+package org.apache.ignite.scalar.examples
 
 import org.apache.ignite.cluster.ClusterNode
-import org.gridgain.scalar.scalar
-import scalar._
+import org.apache.ignite.scalar.scalar
+import org.apache.ignite.scalar.scalar._
 
 /**
  * Demonstrates various closure executions on the cloud using Scalar.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarContinuationExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarContinuationExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarContinuationExample.scala
index cd97c49..f3855a3 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarContinuationExample.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarContinuationExample.scala
@@ -15,15 +15,16 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.examples
+package org.apache.ignite.scalar.examples
 
 import org.apache.ignite.compute.ComputeJobContext
-import org.apache.ignite.lang.{IgniteFuture, IgniteClosure}
+import org.apache.ignite.lang.{IgniteClosure, IgniteFuture}
 import org.apache.ignite.resources.IgniteJobContextResource
-import org.gridgain.scalar._
-import scalar._
-import java.math._
+import org.apache.ignite.scalar.scalar
+import org.apache.ignite.scalar.scalar._
 import org.jetbrains.annotations.Nullable
+
+import java.math._
 import java.util
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCreditRiskExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCreditRiskExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCreditRiskExample.scala
index afeb076..1affeb9 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCreditRiskExample.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCreditRiskExample.scala
@@ -15,10 +15,11 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.examples
+package org.apache.ignite.scalar.examples
+
+import org.apache.ignite.scalar.scalar
+import org.apache.ignite.scalar.scalar._
 
-import org.gridgain.scalar.scalar
-import scalar._
 import scala.util.Random
 import scala.util.control.Breaks._
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarJvmCloudExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarJvmCloudExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarJvmCloudExample.scala
index 98ff2c1..d1d4b12 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarJvmCloudExample.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarJvmCloudExample.scala
@@ -15,16 +15,17 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.examples
+package org.apache.ignite.scalar.examples
 
-import java.util.concurrent.Executors
-import java.util.concurrent.TimeUnit._
-import javax.swing.{JComponent, JLabel, JOptionPane}
 import org.apache.ignite.configuration.IgniteConfiguration
+import org.apache.ignite.internal.util.scala.impl
+import org.apache.ignite.scalar.scalar
 import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder
-import org.apache.ignite.internal.util.scala.impl
-import org.gridgain.scalar.scalar
+
+import javax.swing.{JComponent, JLabel, JOptionPane}
+import java.util.concurrent.Executors
+import java.util.concurrent.TimeUnit._
 
 /**
  * This example demonstrates how you can easily startup multiple nodes

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPiCalculationExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPiCalculationExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPiCalculationExample.scala
index 047a1ce..3064108 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPiCalculationExample.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPiCalculationExample.scala
@@ -15,10 +15,11 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.examples
+package org.apache.ignite.scalar.examples
+
+import org.apache.ignite.scalar.scalar
+import org.apache.ignite.scalar.scalar._
 
-import org.gridgain.scalar._
-import scalar._
 import scala.math._
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPingPongExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPingPongExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPingPongExample.scala
index 2a05c41..bff48a4 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPingPongExample.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPingPongExample.scala
@@ -15,11 +15,12 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.examples
+package org.apache.ignite.scalar.examples
 
 import org.apache.ignite.messaging.MessagingListenActor
-import org.gridgain.scalar.scalar
-import scalar._
+import org.apache.ignite.scalar.scalar
+import org.apache.ignite.scalar.scalar._
+
 import java.util.UUID
 import java.util.concurrent.CountDownLatch
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPrimeExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPrimeExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPrimeExample.scala
index aa18612..102b52b 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPrimeExample.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPrimeExample.scala
@@ -15,13 +15,15 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.examples
+package org.apache.ignite.scalar.examples
+
+import org.apache.ignite.scalar.scalar
+import org.apache.ignite.scalar.scalar._
 
-import org.gridgain.scalar.scalar
-import scalar._
-import scala.util.control.Breaks._
 import java.util
 
+import scala.util.control.Breaks._
+
 /**
  * Prime Number calculation example based on Scalar.
  *

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarScheduleExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarScheduleExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarScheduleExample.scala
index 58d146e..a5b79ca 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarScheduleExample.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarScheduleExample.scala
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.examples
+package org.apache.ignite.scalar.examples
 
-import org.gridgain.scalar.scalar
-import scalar._
+import org.apache.ignite.scalar.scalar
+import org.apache.ignite.scalar.scalar._
 
 /**
  * Demonstrates a cron-based `Runnable` execution scheduling.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarSnowflakeSchemaExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarSnowflakeSchemaExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarSnowflakeSchemaExample.scala
index d3375f5..574a816 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarSnowflakeSchemaExample.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarSnowflakeSchemaExample.scala
@@ -15,17 +15,18 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.examples
+package org.apache.ignite.scalar.examples
 
 import org.apache.ignite.cache.CacheProjection
-import org.gridgain.scalar.scalar
-import org.gridgain.scalar.scalar._
-import scala.collection.JavaConversions._
-import scala.StringBuilder
-import java.util.ConcurrentModificationException
-import java.util
+import org.apache.ignite.scalar.scalar
+import org.apache.ignite.scalar.scalar._
 import org.jdk8.backport.ThreadLocalRandom8
 
+import java.util
+import java.util.ConcurrentModificationException
+
+import scala.collection.JavaConversions._
+
 /**
  * <a href="http://en.wikipedia.org/wiki/Snowflake_schema">Snowflake Schema</a> is a logical
  * arrangement of data in which data is split into `dimensions`  and `facts`

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarStartStopExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarStartStopExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarStartStopExample.scala
index d96ea90..e5042a1 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarStartStopExample.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarStartStopExample.scala
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.examples
+package org.apache.ignite.scalar.examples
 
 import org.apache.ignite.Ignite
-import org.gridgain.scalar.scalar
-import scalar._
+import org.apache.ignite.scalar.scalar
+import org.apache.ignite.scalar.scalar._
 
 /**
  * Demonstrates various starting and stopping ways of grid using Scalar.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarTaskExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarTaskExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarTaskExample.scala
index 8cc87fd..cd98f06 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarTaskExample.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarTaskExample.scala
@@ -15,14 +15,16 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.examples
+package org.apache.ignite.scalar.examples
+
+import org.apache.ignite.compute.{ComputeJob, ComputeJobResult, ComputeTaskSplitAdapter}
+import org.apache.ignite.scalar.scalar
+import org.apache.ignite.scalar.scalar._
 
-import org.apache.ignite.compute.{ComputeTaskSplitAdapter, ComputeJob, ComputeJobResult}
-import org.gridgain.scalar.scalar
-import scalar._
-import collection.JavaConversions._
 import java.util
 
+import scala.collection.JavaConversions._
+
 /**
  * Demonstrates use of full grid task API using Scalar. Note that using task-based
  * grid enabling gives you all the advanced features of GridGain such as custom topology

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarWorldShortestMapReduce.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarWorldShortestMapReduce.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarWorldShortestMapReduce.scala
index d68a61e..674c69a 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarWorldShortestMapReduce.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarWorldShortestMapReduce.scala
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.examples
+package org.apache.ignite.scalar.examples
 
-import org.gridgain.scalar.scalar
-import scalar._
+import org.apache.ignite.scalar.scalar
+import org.apache.ignite.scalar.scalar._
 
 /**
  * Shows the world's shortest MapReduce application that calculates non-space

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/examples/src/test/scala/org/apache/ignite/scalar/tests/examples/ScalarExamplesSelfTest.scala
----------------------------------------------------------------------
diff --git a/examples/src/test/scala/org/apache/ignite/scalar/tests/examples/ScalarExamplesSelfTest.scala b/examples/src/test/scala/org/apache/ignite/scalar/tests/examples/ScalarExamplesSelfTest.scala
index f026747..63858d3 100644
--- a/examples/src/test/scala/org/apache/ignite/scalar/tests/examples/ScalarExamplesSelfTest.scala
+++ b/examples/src/test/scala/org/apache/ignite/scalar/tests/examples/ScalarExamplesSelfTest.scala
@@ -17,11 +17,10 @@
 
 package org.apache.ignite.scalar.tests.examples
 
-import org.apache.ignite.scalar.examples.{ScalarCacheQueryExample, ScalarCacheAffinitySimpleExample}
-import org.gridgain.scalar.examples._
-import org.gridgain.scalar.scalar
-import org.scalatest.junit.JUnitSuiteLike
+import org.apache.ignite.scalar.examples._
+import org.apache.ignite.scalar.scalar
 import org.apache.ignite.testframework.junits.common.GridAbstractExamplesTest
+import org.scalatest.junit.JUnitSuiteLike
 
 /**
  * Scalar examples self test.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/readme.txt
----------------------------------------------------------------------
diff --git a/modules/scalar/readme.txt b/modules/scalar/readme.txt
index 40885ab..6f32a08 100644
--- a/modules/scalar/readme.txt
+++ b/modules/scalar/readme.txt
@@ -22,8 +22,8 @@ interested in):
     <dependencies>
         ...
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-scalar</artifactId>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-scalar</artifactId>
             <version>${ignite.version}</version>
         </dependency>
         ...

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/ScalarConversions.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/ScalarConversions.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/ScalarConversions.scala
index 898d66d..0a6f06b 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/ScalarConversions.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/ScalarConversions.scala
@@ -15,22 +15,23 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar
+package org.apache.ignite.scalar
 
 import org.apache.ignite.Ignite
-import org.apache.ignite.cache.{CacheEntry, GridCache, CacheProjection}
+import org.apache.ignite.cache._
 import org.apache.ignite.cluster.ClusterGroup
 import org.apache.ignite.compute.ComputeJob
+import org.apache.ignite.internal.util.lang._
 import org.apache.ignite.lang._
-import org.gridgain.scalar.lang._
-import org.gridgain.scalar.pimps._
+import org.apache.ignite.scalar.lang._
+import org.apache.ignite.scalar.pimps._
 import org.jetbrains.annotations._
-import collection._
-import scala.util.control.Breaks._
-import java.util.concurrent._
+
 import java.util.TimerTask
-import org.apache.ignite.internal.util.lang._
-import scala.Tuple2
+import java.util.concurrent._
+
+import scala.collection._
+import scala.util.control.Breaks._
 
 /**
  * ==Overview==

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/Packet.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/Packet.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/Packet.scala
index 913cf76..19dbe2d 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/Packet.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/Packet.scala
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar
+package org.apache.ignite.scalar
 
 /**
  * Contains Scala side adapters for implicits conversion.
  */
-package object lang
\ No newline at end of file
+package object lang

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarAbsClosure.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarAbsClosure.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarAbsClosure.scala
index f7eb429..9d1832d 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarAbsClosure.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarAbsClosure.scala
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
-import org.apache.ignite.lang.IgniteRunnable
 import org.apache.ignite.internal.util.lang.GridPeerDeployAwareAdapter
+import org.apache.ignite.lang.IgniteRunnable
 
 /**
  * Peer deploy aware adapter for Java's `GridRunnable`.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarAbsClosureFunction.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarAbsClosureFunction.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarAbsClosureFunction.scala
index 10d8833..fe0d0f4 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarAbsClosureFunction.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarAbsClosureFunction.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
 /**
  * Wrapping Scala function for `GridAbsClosure`.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarAbsClosureX.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarAbsClosureX.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarAbsClosureX.scala
index 3a64fa8..cc4444a 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarAbsClosureX.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarAbsClosureX.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
 import org.apache.ignite._
 import org.apache.ignite.internal.util.lang.GridAbsClosureX

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarAbsClosureXFunction.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarAbsClosureXFunction.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarAbsClosureXFunction.scala
index 5940293..f9b3d9d 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarAbsClosureXFunction.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarAbsClosureXFunction.scala
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
-import org.apache.ignite.internal.util.lang.{GridAbsClosureX}
+import org.apache.ignite.internal.util.lang.GridAbsClosureX
 
 /**
  * Wrapping Scala function for `GridAbsClosureX`.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarAbsPredicate.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarAbsPredicate.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarAbsPredicate.scala
index 0937a97..f9f0b5a 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarAbsPredicate.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarAbsPredicate.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
 import org.apache.ignite.internal.util.lang.GridAbsPredicate
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarAbsPredicateFunction.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarAbsPredicateFunction.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarAbsPredicateFunction.scala
index f3c5750..4e4098c 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarAbsPredicateFunction.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarAbsPredicateFunction.scala
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
-import org.apache.ignite.internal.util.lang.{GridAbsPredicate}
+import org.apache.ignite.internal.util.lang.GridAbsPredicate
 
 /**
  * Wrapping Scala function for `GridAbsPredicate`.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarAbsPredicateX.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarAbsPredicateX.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarAbsPredicateX.scala
index f1579d7..91ae29a 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarAbsPredicateX.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarAbsPredicateX.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
 import org.apache.ignite._
 import org.apache.ignite.internal.util.lang.GridAbsPredicateX

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarAbsPredicateXFunction.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarAbsPredicateXFunction.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarAbsPredicateXFunction.scala
index 1535125..66cf155 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarAbsPredicateXFunction.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarAbsPredicateXFunction.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
 import org.apache.ignite.internal.util.lang.GridAbsPredicateX
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosure.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosure.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosure.scala
index 4c1918a..6a9d7ca 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosure.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosure.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
 import org.apache.ignite.lang.IgniteClosure
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosure2.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosure2.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosure2.scala
index 56f17c7..1362290 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosure2.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosure2.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
 import org.apache.ignite.lang.IgniteBiClosure
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosure2Function.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosure2Function.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosure2Function.scala
index 39d44dd..2f4c89b 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosure2Function.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosure2Function.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
 import org.apache.ignite.lang.IgniteBiClosure
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosure2X.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosure2X.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosure2X.scala
index 78af6d8..23c42b8 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosure2X.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosure2X.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
 import org.apache.ignite._
 import org.apache.ignite.internal.util.lang.IgniteClosure2X

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosure2XFunction.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosure2XFunction.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosure2XFunction.scala
index 444359b..0317a6a 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosure2XFunction.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosure2XFunction.scala
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
-import org.apache.ignite.internal.util.lang.{IgniteClosure2X}
+import org.apache.ignite.internal.util.lang.IgniteClosure2X
 
 /**
  * Wrapping Scala function for `GridClosure2X`.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosure3.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosure3.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosure3.scala
index 18b938d..1d89028 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosure3.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosure3.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
 import org.apache.ignite.internal.util.lang.GridClosure3
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosure3Function.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosure3Function.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosure3Function.scala
index 820f454..18e9f78 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosure3Function.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosure3Function.scala
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
-import org.apache.ignite.internal.util.lang.{GridClosure3}
+import org.apache.ignite.internal.util.lang.GridClosure3
 
 /**
  * Wrapping Scala function for `GridClosure3`.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosure3X.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosure3X.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosure3X.scala
index c9c1f6f..6ba5dec 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosure3X.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosure3X.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
 import org.apache.ignite._
 import org.apache.ignite.internal.util.lang.GridClosure3X

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosure3XFunction.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosure3XFunction.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosure3XFunction.scala
index e7b90d0..3b4a6fe 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosure3XFunction.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosure3XFunction.scala
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
-import org.apache.ignite.internal.util.lang.{GridClosure3X}
+import org.apache.ignite.internal.util.lang.GridClosure3X
 
 /**
  * Wrapping Scala function for `GridClosure3X`.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosureFunction.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosureFunction.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosureFunction.scala
index 8cdd142..67e6603 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosureFunction.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosureFunction.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
 import org.apache.ignite.lang.IgniteClosure
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosureX.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosureX.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosureX.scala
index 26d6301..8230733 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosureX.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosureX.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
 import org.apache.ignite._
 import org.apache.ignite.internal.util.lang.IgniteClosureX

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosureXFunction.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosureXFunction.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosureXFunction.scala
index 89153ca..3dfbaae 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosureXFunction.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarClosureXFunction.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
 import org.apache.ignite.internal.util.lang.IgniteClosureX
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosure.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosure.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosure.scala
index 04b4919..fe3ff0f 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosure.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosure.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
 import org.apache.ignite.lang.IgniteInClosure
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosure2.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosure2.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosure2.scala
index 0e4bf59..b27cf04 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosure2.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosure2.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
 import org.apache.ignite.lang.IgniteBiInClosure
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosure2Function.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosure2Function.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosure2Function.scala
index 1802f35..1f31adb 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosure2Function.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosure2Function.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
 import org.apache.ignite.lang.IgniteBiInClosure
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosure2X.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosure2X.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosure2X.scala
index ece217d..5064a45 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosure2X.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosure2X.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
 import org.apache.ignite._
 import org.apache.ignite.internal.util.lang.IgniteInClosure2X

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosure2XFunction.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosure2XFunction.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosure2XFunction.scala
index 913b9c2..9602304 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosure2XFunction.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosure2XFunction.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
 import org.apache.ignite.internal.util.lang.IgniteInClosure2X
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosure3.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosure3.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosure3.scala
index a1c0298..766d538 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosure3.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosure3.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
 import org.apache.ignite.internal.util.lang.GridInClosure3
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosure3Function.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosure3Function.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosure3Function.scala
index daaceee..73b11bc 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosure3Function.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosure3Function.scala
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
-import org.apache.ignite.internal.util.lang.{GridInClosure3}
+import org.apache.ignite.internal.util.lang.GridInClosure3
 
 /**
  * Wrapping Scala function for `GridInClosure3`.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosure3X.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosure3X.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosure3X.scala
index 7612522..ac1c0e6 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosure3X.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosure3X.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
 import org.apache.ignite._
 import org.apache.ignite.internal.util.lang.GridInClosure3X

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosure3XFunction.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosure3XFunction.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosure3XFunction.scala
index ef650de..b21ef52 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosure3XFunction.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosure3XFunction.scala
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
-import org.apache.ignite.internal.util.lang.{GridInClosure3X}
+import org.apache.ignite.internal.util.lang.GridInClosure3X
 
 /**
  * Wrapping Scala function for `GridInClosure3X`.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosureFunction.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosureFunction.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosureFunction.scala
index fbcdfb5..4f76660 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosureFunction.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosureFunction.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
 import org.apache.ignite.lang.IgniteInClosure
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosureX.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosureX.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosureX.scala
index 531e0be..f3108fc 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosureX.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosureX.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
 import org.apache.ignite._
 import org.apache.ignite.internal.util.lang.IgniteInClosureX

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosureXFunction.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosureXFunction.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosureXFunction.scala
index e64bc38..cb4facf 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosureXFunction.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarInClosureXFunction.scala
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
-import org.apache.ignite.internal.util.lang.{IgniteInClosureX}
+import org.apache.ignite.internal.util.lang.IgniteInClosureX
 
 /**
  * Wrapping Scala function for `GridInClosureX`.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarJob.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarJob.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarJob.scala
index 0a263c6..cfc10c2 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarJob.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarJob.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
 import org.apache.ignite.compute.ComputeJobAdapter
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarOutClosure.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarOutClosure.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarOutClosure.scala
index 994a39a..b2bd1b0 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarOutClosure.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarOutClosure.scala
@@ -15,11 +15,12 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
-import java.util.concurrent.Callable
-import org.apache.ignite.lang.IgniteOutClosure
 import org.apache.ignite.internal.util.lang.GridPeerDeployAwareAdapter
+import org.apache.ignite.lang.IgniteOutClosure
+
+import java.util.concurrent.Callable
 
 /**
  * Peer deploy aware adapter for Java's `GridOutClosure`.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarOutClosureFunction.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarOutClosureFunction.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarOutClosureFunction.scala
index 0fb3fc7..9216bbd 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarOutClosureFunction.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarOutClosureFunction.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
 import java.util.concurrent.Callable
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarOutClosureX.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarOutClosureX.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarOutClosureX.scala
index daf7d2e..949e720 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarOutClosureX.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarOutClosureX.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
 import org.apache.ignite._
 import org.apache.ignite.internal.util.lang.IgniteOutClosureX

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarOutClosureXFunction.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarOutClosureXFunction.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarOutClosureXFunction.scala
index dee618a..7f63a7b 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarOutClosureXFunction.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarOutClosureXFunction.scala
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
-import org.apache.ignite.internal.util.lang.{IgniteOutClosureX}
+import org.apache.ignite.internal.util.lang.IgniteOutClosureX
 
 /**
  * Wrapping Scala function for `GridOutClosureX`.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicate.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicate.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicate.scala
index 73fa53d..82e007a 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicate.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicate.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
 import org.apache.ignite.lang.IgnitePredicate
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicate2.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicate2.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicate2.scala
index ddeeae2..866e6e1 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicate2.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicate2.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
 import org.apache.ignite.lang.IgniteBiPredicate
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicate2Function.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicate2Function.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicate2Function.scala
index f727bd9..413ca74 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicate2Function.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicate2Function.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
 import org.apache.ignite.lang.IgniteBiPredicate
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicate2X.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicate2X.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicate2X.scala
index b131e98..b737192 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicate2X.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicate2X.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
 import org.apache.ignite._
 import org.apache.ignite.internal.util.lang.IgnitePredicate2X

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicate2XFunction.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicate2XFunction.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicate2XFunction.scala
index d9ae654..fb326e7 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicate2XFunction.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicate2XFunction.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
 import org.apache.ignite.internal.util.lang.IgnitePredicate2X
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicate3.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicate3.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicate3.scala
index f3c576c..1890f65 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicate3.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicate3.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
 import org.apache.ignite.internal.util.lang.GridPredicate3
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicate3Function.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicate3Function.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicate3Function.scala
index 5d2672d..daddee8 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicate3Function.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicate3Function.scala
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
-import org.apache.ignite.internal.util.lang.{GridPredicate3}
+import org.apache.ignite.internal.util.lang.GridPredicate3
 
 /**
  * Wrapping Scala function for `GridPredicate3`.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicate3X.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicate3X.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicate3X.scala
index 0e4e08d..bdbce23 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicate3X.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicate3X.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
 import org.apache.ignite._
 import org.apache.ignite.internal.util.lang.GridPredicate3X

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicate3XFunction.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicate3XFunction.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicate3XFunction.scala
index 8272c5d..b8a218f 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicate3XFunction.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicate3XFunction.scala
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
-import org.apache.ignite.internal.util.lang.{GridPredicate3X}
+import org.apache.ignite.internal.util.lang.GridPredicate3X
 
 /**
  * Wrapping Scala function for `GridPredicate3X`.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicateFunction.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicateFunction.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicateFunction.scala
index f583d54..495efbc 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicateFunction.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicateFunction.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
 import org.apache.ignite.lang.IgnitePredicate
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicateX.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicateX.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicateX.scala
index 3ecf4ca..c8676f3 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicateX.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicateX.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
 import org.apache.ignite._
 import org.apache.ignite.internal.util.lang.IgnitePredicateX

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicateXFunction.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicateXFunction.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicateXFunction.scala
index 7b26126..831b53e 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicateXFunction.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarPredicateXFunction.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
 import org.apache.ignite.internal.util.lang.IgnitePredicateX
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarReducer.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarReducer.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarReducer.scala
index 56645eb..d855e3d 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarReducer.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarReducer.scala
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
 import org.apache.ignite.lang.IgniteReducer
 
-import collection._
+import scala.collection._
 
 /**
  * Peer deploy aware adapter for Java's `GridReducer`.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarReducer2.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarReducer2.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarReducer2.scala
index f3f9377..8c96498 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarReducer2.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarReducer2.scala
@@ -15,11 +15,12 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
-import collection._
 import org.apache.ignite.internal.util.lang.IgniteReducer2
 
+import scala.collection._
+
 /**
  * Peer deploy aware adapter for Java's `GridReducer2`.
  */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarReducer2Function.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarReducer2Function.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarReducer2Function.scala
index 34818c1..9b1a1c6 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarReducer2Function.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarReducer2Function.scala
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
-import org.apache.ignite.internal.util.lang.{IgniteReducer2}
+import org.apache.ignite.internal.util.lang.IgniteReducer2
 
 /**
  * Wrapping Scala function for `GridReducer2`.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarReducer3.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarReducer3.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarReducer3.scala
index 56761dc..448e5ae 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarReducer3.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarReducer3.scala
@@ -15,11 +15,12 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
-import collection._
 import org.apache.ignite.internal.util.lang.IgniteReducer3
 
+import scala.collection._
+
 /**
  * Peer deploy aware adapter for Java's `GridReducer3`.
  */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarReducer3Function.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarReducer3Function.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarReducer3Function.scala
index f697986..d1d8255 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarReducer3Function.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarReducer3Function.scala
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
-import org.apache.ignite.internal.util.lang.{IgniteReducer3}
+import org.apache.ignite.internal.util.lang.IgniteReducer3
 
 /**
  * Wrapping Scala function for `GridReducer3`.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarReducerFunction.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarReducerFunction.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarReducerFunction.scala
index b0ad4c0..5c86427 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarReducerFunction.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/lang/ScalarReducerFunction.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.lang
+package org.apache.ignite.scalar.lang
 
 import org.apache.ignite.lang.IgniteReducer
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/Packet.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/Packet.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/Packet.scala
index 79e5eb8..997b15c 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/Packet.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/Packet.scala
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar
+package org.apache.ignite.scalar
 
 /**
  * Contains Scala "Pimp" implementations for main GridGain entities.
  */
-package object pimps
\ No newline at end of file
+package object pimps

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/PimpedType.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/PimpedType.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/PimpedType.scala
index 20dff39..61ddd0d 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/PimpedType.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/PimpedType.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.pimps
+package org.apache.ignite.scalar.pimps
 
 /**
  * Sub class to create a wrapper type for `X` as documentation that the sub class follows the

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarCachePimp.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarCachePimp.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarCachePimp.scala
index 02b30f1..a790a29 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarCachePimp.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarCachePimp.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.pimps
+package org.apache.ignite.scalar.pimps
 
 import org.apache.ignite.cache.GridCache
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarCacheProjectionPimp.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarCacheProjectionPimp.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarCacheProjectionPimp.scala
index 12c91fd..c92a984 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarCacheProjectionPimp.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarCacheProjectionPimp.scala
@@ -15,20 +15,18 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.pimps
+package org.apache.ignite.scalar.pimps
 
+import org.apache.ignite._
 import org.apache.ignite.cache.{CacheEntry, CacheProjection}
 import org.apache.ignite.cluster.ClusterGroup
-import org.apache.ignite.lang.{IgnitePredicate, IgniteReducer, IgniteClosure, IgniteBiTuple}
-
-import collection._
-import collection.JavaConversions._
-import org.jetbrains.annotations.Nullable
-import org.apache.ignite._
-import org.apache.ignite.internal.util.lang.{GridFunc => F}
 import org.apache.ignite.internal.util.scala.impl
-import org.gridgain.scalar._
-import scalar._
+import org.apache.ignite.lang.{IgniteBiTuple, IgniteClosure, IgnitePredicate, IgniteReducer}
+import org.apache.ignite.scalar.scalar._
+import org.jetbrains.annotations.Nullable
+
+import scala.collection.JavaConversions._
+import scala.collection._
 
 /**
  * Companion object.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ebc69e3/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarGridPimp.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarGridPimp.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarGridPimp.scala
index 1c47485..f61266d 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarGridPimp.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarGridPimp.scala
@@ -15,11 +15,10 @@
  * limitations under the License.
  */
 
-package org.gridgain.scalar.pimps
+package org.apache.ignite.scalar.pimps
 
 import org.apache.ignite.scheduler.SchedulerFuture
-import org.apache.ignite.{IgniteCluster, Ignite}
-import org.apache.ignite._
+import org.apache.ignite.{Ignite, IgniteCluster}
 import org.jetbrains.annotations.Nullable
 
 /**


Mime
View raw message