ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [11/24] incubator-ignite git commit: # IGNITE-191: Finished GG and Ignite product splitting.
Date Thu, 12 Feb 2015 14:10:25 GMT
# IGNITE-191: Finished GG and Ignite product splitting.


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

Branch: refs/heads/ignite-238
Commit: bb03c6e2cc245c87ed0336a0268d641be6c15019
Parents: 0c899a8
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Thu Feb 12 11:01:20 2015 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Thu Feb 12 11:01:20 2015 +0300

----------------------------------------------------------------------
 .../src/main/java/org/apache/ignite/Ignite.java |  3 +-
 .../ignite/internal/GridKernalContext.java      |  2 +-
 .../ignite/internal/GridKernalContextImpl.java  |  6 +--
 .../org/apache/ignite/internal/GridProduct.java | 29 +++++++++++
 .../apache/ignite/internal/GridProductImpl.java | 23 ++-------
 .../apache/ignite/internal/GridProperties.java  |  4 +-
 .../org/apache/ignite/internal/IgniteEx.java    |  7 +++
 .../apache/ignite/internal/IgniteKernal.java    | 54 +++++++++++++-------
 .../impl/GridRouterCommandLineStartup.java      |  2 +-
 .../ignite/internal/product/IgniteProduct.java  |  8 ---
 .../internal/product/IgniteProductLicense.java  |  6 ++-
 .../ipc/shmem/IpcSharedMemoryNativeLoader.java  |  5 +-
 .../startup/cmdline/CommandLineStartup.java     |  4 +-
 .../ignite/testframework/junits/IgniteMock.java |  3 +-
 ...idHadoopDefaultMapReducePlannerSelfTest.java | 10 ++--
 .../scala/org/apache/ignite/scalar/scalar.scala |  6 +--
 .../org/apache/ignite/IgniteSpringBean.java     |  3 +-
 .../ignite/visor/commands/VisorConsole.scala    | 20 +++-----
 .../scala/org/apache/ignite/visor/visor.scala   |  7 +--
 19 files changed, 113 insertions(+), 89 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bb03c6e2/modules/core/src/main/java/org/apache/ignite/Ignite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/Ignite.java b/modules/core/src/main/java/org/apache/ignite/Ignite.java
index 8f85b73..cee8301 100644
--- a/modules/core/src/main/java/org/apache/ignite/Ignite.java
+++ b/modules/core/src/main/java/org/apache/ignite/Ignite.java
@@ -21,6 +21,7 @@ import org.apache.ignite.cache.*;
 import org.apache.ignite.cache.affinity.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.*;
 import org.apache.ignite.internal.product.*;
 import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.lang.*;
@@ -178,7 +179,7 @@ public interface Ignite extends AutoCloseable {
      *
      * @return Instance of product.
      */
-    public IgniteProduct product();
+    public GridProduct product();
 
     /**
      * Gets Ignite version.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bb03c6e2/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
index 9ae4304..46030bd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
@@ -96,7 +96,7 @@ public interface GridKernalContext extends Iterable<GridComponent>
{
      *
      * @return Grid product.
      */
-    public IgniteProduct product();
+    public GridProduct product();
 
     /**
      * Gets list of compatible versions.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bb03c6e2/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
index 9d325c5..d018058 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
@@ -298,7 +298,7 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
     private ExecutorService utilityCachePool;
 
     /** */
-    private IgniteProduct product;
+    private GridProduct product;
 
     /** */
     private IgniteConfiguration cfg;
@@ -764,12 +764,12 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
     /**
      * @param product Product.
      */
-    public void product(IgniteProduct product) {
+    public void product(GridProduct product) {
         this.product = product;
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteProduct product() {
+    @Override public GridProduct product() {
         return product;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bb03c6e2/modules/core/src/main/java/org/apache/ignite/internal/GridProduct.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridProduct.java b/modules/core/src/main/java/org/apache/ignite/internal/GridProduct.java
new file mode 100644
index 0000000..1fab504
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridProduct.java
@@ -0,0 +1,29 @@
+package org.apache.ignite.internal;
+
+import org.apache.ignite.internal.product.*;
+import org.jetbrains.annotations.*;
+
+/**
+ *
+ */
+public interface GridProduct {
+    /**
+     * Gets license descriptor for enterprise edition or {@code null} for open source edition.
+     *
+     * @return License descriptor.
+     */
+    @Nullable public IgniteProductLicense license();
+
+    /**
+     * Updates to a new license in enterprise edition. This method is no-op in open source
edition.
+     *
+     * @param lic The content of the license.
+     * @throws IgniteProductLicenseException If license could not be updated.
+     */
+    public void updateLicense(String lic) throws IgniteProductLicenseException;
+
+    /**
+     * @return Grace period left.
+     */
+    public long gracePeriodLeft();
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bb03c6e2/modules/core/src/main/java/org/apache/ignite/internal/GridProductImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridProductImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/GridProductImpl.java
index a017bbc..6a7b8ec 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridProductImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridProductImpl.java
@@ -23,15 +23,12 @@ import org.jetbrains.annotations.*;
 import java.io.*;
 
 /**
- * {@link IgniteProduct} implementation.
+ * {@link GridProduct} implementation.
  */
-public class GridProductImpl extends IgniteProduct {
+public class GridProductImpl implements GridProduct {
     /** */
     private GridKernalContext ctx;
 
-    /** Update notifier. */
-    private GridUpdateNotifier verChecker;
-
     /**
      * Required by {@link Externalizable}.
      */
@@ -41,11 +38,9 @@ public class GridProductImpl extends IgniteProduct {
 
     /**
      * @param ctx Kernal context.
-     * @param verChecker Update notifier.
      */
-    public GridProductImpl(GridKernalContext ctx, GridUpdateNotifier verChecker) {
+    public GridProductImpl(GridKernalContext ctx) {
         this.ctx = ctx;
-        this.verChecker = verChecker;
     }
 
     /** {@inheritDoc} */
@@ -83,16 +78,4 @@ public class GridProductImpl extends IgniteProduct {
             ctx.gateway().readUnlock();
         }
     }
-
-    /** {@inheritDoc} */
-    @Nullable @Override public String latestVersion() {
-        ctx.gateway().readLock();
-
-        try {
-            return verChecker != null ? verChecker.latestVersion() : null;
-        }
-        finally {
-            ctx.gateway().readUnlock();
-        }
-    }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bb03c6e2/modules/core/src/main/java/org/apache/ignite/internal/GridProperties.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridProperties.java b/modules/core/src/main/java/org/apache/ignite/internal/GridProperties.java
index 7c2b211..6f11e9b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridProperties.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridProperties.java
@@ -17,6 +17,8 @@
 
 package org.apache.ignite.internal;
 
+import org.apache.ignite.internal.product.*;
+
 import java.io.*;
 import java.util.*;
 
@@ -44,7 +46,7 @@ public class GridProperties {
      * @param throwExc Flag indicating whether to throw an exception or not.
      */
     private static void readProperties(String path, boolean throwExc) {
-        try (InputStream is = GridProductImpl.class.getClassLoader().getResourceAsStream(path))
{
+        try (InputStream is = IgniteProduct.class.getClassLoader().getResourceAsStream(path))
{
             if (is == null) {
                 if (throwExc)
                     throw new RuntimeException("Failed to find properties file: " + path);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bb03c6e2/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java
index fccd9c0..bc1da76 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java
@@ -135,4 +135,11 @@ public interface IgniteEx extends Ignite, ClusterGroupEx, IgniteCluster
{
      * @return Hadoop.
      */
     public GridHadoop hadoop();
+
+    /**
+     * Get latest version in string form.
+     *
+     * @return Latest version.
+     */
+    @Nullable public String latestVersion();
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bb03c6e2/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index dd76a3a..58975f9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -207,6 +207,10 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx,
Ignit
     @GridToStringExclude
     private final AtomicBoolean stopGuard = new AtomicBoolean();
 
+    /** Version checker. */
+    @GridToStringExclude
+    private GridUpdateNotifier verChecker;
+
     /**
      * No-arg constructor is required by externalization.
      */
@@ -267,7 +271,7 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx,
Ignit
 
     /** {@inheritDoc} */
     @Override public String getCopyright() {
-        return IgniteProduct.COPYRIGHT;
+        return COPYRIGHT;
     }
 
     /** {@inheritDoc} */
@@ -602,13 +606,13 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx,
Ignit
 
         boolean notifyEnabled = IgniteSystemProperties.getBoolean(IGNITE_UPDATE_NOTIFIER,
true);
 
-        GridUpdateNotifier verChecker0 = null;
+        verChecker = null;
 
         if (notifyEnabled) {
             try {
-                verChecker0 = new GridUpdateNotifier(gridName, VER_STR, SITE, gw, false);
+                verChecker = new GridUpdateNotifier(gridName, VER_STR, SITE, gw, false);
 
-                verChecker0.checkForNewVersion(execSvc, log);
+                verChecker.checkForNewVersion(execSvc, log);
             }
             catch (IgniteCheckedException e) {
                 if (log.isDebugEnabled())
@@ -616,7 +620,7 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx,
Ignit
             }
         }
 
-        final GridUpdateNotifier verChecker = verChecker0;
+        final GridUpdateNotifier verChecker0 = verChecker;
 
         // Ack 3-rd party licenses location.
         if (log.isInfoEnabled() && cfg.getIgniteHome() != null)
@@ -657,7 +661,7 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx,
Ignit
 
             rsrcProc.setSpringContext(rsrcCtx);
 
-            ctx.product(new GridProductImpl(ctx, verChecker));
+            ctx.product(new GridProductImpl(ctx));
 
             scheduler = new IgniteSchedulerImpl(ctx);
 
@@ -812,30 +816,30 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx,
Ignit
         startTime = U.currentTimeMillis();
 
         // Ack latest version information.
-        if (verChecker != null)
-            verChecker.reportStatus(log);
+        if (verChecker0 != null)
+            verChecker0.reportStatus(log);
 
         if (notifyEnabled) {
-            assert verChecker != null;
+            assert verChecker0 != null;
 
-            verChecker.reportOnlyNew(true);
-            verChecker.licenseProcessor(ctx.license());
+            verChecker0.reportOnlyNew(true);
+            verChecker0.licenseProcessor(ctx.license());
 
             updateNtfTimer = new Timer("ignite-update-notifier-timer");
 
             // Setup periodic version check.
             updateNtfTimer.scheduleAtFixedRate(new GridTimerTask() {
                 @Override public void safeRun() throws InterruptedException {
-                    verChecker.topologySize(nodes().size());
+                    verChecker0.topologySize(nodes().size());
 
-                    verChecker.checkForNewVersion(execSvc, log);
+                    verChecker0.checkForNewVersion(execSvc, log);
 
                     // Just wait for 10 secs.
                     Thread.sleep(PERIODIC_VER_CHECK_CONN_TIMEOUT);
 
                     // Report status if one is available.
                     // No-op if status is NOT available.
-                    verChecker.reportStatus(log);
+                    verChecker0.reportStatus(log);
                 }
             }, PERIODIC_VER_CHECK_DELAY, PERIODIC_VER_CHECK_DELAY);
         }
@@ -1438,7 +1442,7 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx,
Ignit
         // Set all node attributes into discovery manager,
         // so they can be distributed to all nodes.
         if (mgr instanceof GridDiscoveryManager)
-            ((GridDiscoveryManager)mgr).setNodeAttributes(attrs, IgniteProduct.VER);
+            ((GridDiscoveryManager)mgr).setNodeAttributes(attrs, VER);
 
         // Add manager to registry before it starts to avoid
         // cases when manager is started but registry does not
@@ -1581,7 +1585,7 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx,
Ignit
                     "/___/\\___/_/|_/___/ /_/ /___/  ",
                     " ",
                     ver,
-                    IgniteProduct.COPYRIGHT,
+                    COPYRIGHT,
                     "",
                     "Quiet mode.");
 
@@ -1601,7 +1605,7 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx,
Ignit
                     ">>> /___/\\___/_/|_/___/ /_/ /___/   " + NL +
                     ">>> " + NL +
                     ">>> " + ver + NL +
-                    ">>> " + IgniteProduct.COPYRIGHT + NL
+                    ">>> " + COPYRIGHT + NL
                 );
             }
         }
@@ -3045,13 +3049,25 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx,
Ignit
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteProduct product() {
+    @Override public GridProduct product() {
         return ctx.product();
     }
 
     /** {@inheritDoc} */
     @Override public IgniteProductVersion version() {
-        return IgniteProduct.VER;
+        return VER;
+    }
+
+    /** {@inheritDoc} */
+    @Override public String latestVersion() {
+        ctx.gateway().readLock();
+
+        try {
+            return verChecker != null ? verChecker.latestVersion() : null;
+        }
+        finally {
+            ctx.gateway().readUnlock();
+        }
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bb03c6e2/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridRouterCommandLineStartup.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridRouterCommandLineStartup.java
b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridRouterCommandLineStartup.java
index 09f62ef..592249a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridRouterCommandLineStartup.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridRouterCommandLineStartup.java
@@ -105,7 +105,7 @@ public class GridRouterCommandLineStartup {
             " ",
             "Ignite Router Command Line Loader",
             "ver. " + ACK_VER_STR,
-            IgniteProduct.COPYRIGHT,
+            COPYRIGHT,
             " "
         );
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bb03c6e2/modules/core/src/main/java/org/apache/ignite/internal/product/IgniteProduct.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/product/IgniteProduct.java
b/modules/core/src/main/java/org/apache/ignite/internal/product/IgniteProduct.java
index 11a9c6a..4c31931 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/product/IgniteProduct.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/product/IgniteProduct.java
@@ -94,12 +94,4 @@ public abstract class IgniteProduct {
      * @return Grace period left.
      */
     public abstract long gracePeriodLeft();
-
-    /**
-     * Gets latest version available for download or
-     * {@code null} if information is not available.
-     *
-     * @return Latest version string or {@code null} if information is not available.
-     */
-    @Nullable public abstract String latestVersion();
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bb03c6e2/modules/core/src/main/java/org/apache/ignite/internal/product/IgniteProductLicense.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/product/IgniteProductLicense.java
b/modules/core/src/main/java/org/apache/ignite/internal/product/IgniteProductLicense.java
index 9a0c866..72f1f2d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/product/IgniteProductLicense.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/product/IgniteProductLicense.java
@@ -17,6 +17,8 @@
 
 package org.apache.ignite.internal.product;
 
+import org.apache.ignite.internal.*;
+
 import org.jetbrains.annotations.*;
 
 import java.io.*;
@@ -25,8 +27,8 @@ import java.util.*;
 /**
  * Ignite license descriptor. Ignite license is available for
  * information purposes and is checked automatically by Ignite software.
- * License descriptor can be obtains by calling {@link IgniteProduct#license()} method.
- * @see IgniteProduct#license()
+ * License descriptor can be obtains by calling {@link GridProduct#license()} method.
+ * @see GridProduct#license()
  */
 public interface IgniteProductLicense extends Serializable {
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bb03c6e2/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java
index 3b18125..ee327d2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryNativeLoader.java
@@ -18,7 +18,6 @@
 package org.apache.ignite.internal.util.ipc.shmem;
 
 import org.apache.ignite.*;
-import org.apache.ignite.internal.product.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 
 import java.io.*;
@@ -27,6 +26,8 @@ import java.nio.channels.*;
 import java.security.*;
 import java.util.*;
 
+import static org.apache.ignite.internal.product.IgniteProduct.*;
+
 /**
  * Shared memory native loader.
  */
@@ -42,7 +43,7 @@ public class IpcSharedMemoryNativeLoader {
     private static final File LOCK_FILE = new File(System.getProperty("java.io.tmpdir"),
"igniteshmem.lock");
 
     /** Library name. */
-    static final String LIB_NAME = LIB_NAME_BASE + "-" + IgniteProduct.VER_STR;
+    static final String LIB_NAME = LIB_NAME_BASE + "-" + VER_STR;
 
     /**
      * @return Operating system name to resolve path to library.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bb03c6e2/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineStartup.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineStartup.java
b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineStartup.java
index 29b162b..b056b88 100644
--- a/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineStartup.java
+++ b/modules/core/src/main/java/org/apache/ignite/startup/cmdline/CommandLineStartup.java
@@ -112,7 +112,7 @@ public final class CommandLineStartup {
                 new InvocationHandler() {
                     @Override public Object invoke(Object proxy, Method mtd, Object[] args)
throws Throwable {
                         AboutDialog.centerShow("Ignite Node", bannerUrl.toExternalForm(),
VER_STR,
-                            releaseDate, IgniteProduct.COPYRIGHT);
+                            releaseDate, COPYRIGHT);
 
                         return null;
                     }
@@ -249,7 +249,7 @@ public final class CommandLineStartup {
     public static void main(String[] args) {
         if (!QUITE) {
             X.println("Ignite Command Line Startup, ver. " + ACK_VER_STR);
-            X.println(IgniteProduct.COPYRIGHT);
+            X.println(COPYRIGHT);
             X.println();
         }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bb03c6e2/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java
index d4b31d4..1fae8ae 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java
@@ -22,6 +22,7 @@ import org.apache.ignite.cache.*;
 import org.apache.ignite.cache.affinity.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.marshaller.Marshaller;
 import org.apache.ignite.internal.product.*;
@@ -153,7 +154,7 @@ public class IgniteMock implements Ignite {
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteProduct product() {
+    @Override public GridProduct product() {
         return null;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bb03c6e2/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java
b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java
index c76f0c4..161b1a6 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java
@@ -979,11 +979,6 @@ public class GridHadoopDefaultMapReducePlannerSelfTest extends GridHadoopAbstrac
         }
 
         /** {@inheritDoc} */
-        @Override public long licenseGracePeriodLeft() {
-            return 0;
-        }
-
-        /** {@inheritDoc} */
         @Override public boolean isJmxRemoteEnabled() {
             return false;
         }
@@ -1226,5 +1221,10 @@ public class GridHadoopDefaultMapReducePlannerSelfTest extends GridHadoopAbstrac
         @Override public ClusterGroup forCacheNodes(@Nullable String cacheName, Set<CacheDistributionMode>
distributionModes) {
             return null;
         }
+
+        /** {@inheritDoc} */
+        @Override public String latestVersion() {
+            return null;
+        }
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bb03c6e2/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala
index b457484..12bb9b8 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala
@@ -21,8 +21,7 @@ import org.apache.ignite.cache.GridCache
 import org.apache.ignite.cache.query.{CacheQuerySqlField, CacheQueryTextField}
 import org.apache.ignite.cluster.ClusterNode
 import org.apache.ignite.configuration.IgniteConfiguration
-import org.apache.ignite.internal.GridProductImpl
-import org.apache.ignite.internal.product.IgniteProduct
+import org.apache.ignite.internal.product.IgniteProduct._
 import org.apache.ignite.{Ignite, IgniteDataLoader, IgniteState, Ignition}
 import org.jetbrains.annotations.Nullable
 
@@ -128,9 +127,6 @@ import scala.annotation.meta.field
  * </pre>
  */
 object scalar extends ScalarConversions {
-    /** Visor copyright blurb. */
-    private val COPYRIGHT = IgniteProduct.COPYRIGHT
-
     /** Type alias for `CacheQuerySqlField`. */
     type ScalarCacheQuerySqlField = CacheQuerySqlField @field
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bb03c6e2/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java b/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java
index ebd333e..6e4564b 100644
--- a/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java
+++ b/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java
@@ -21,6 +21,7 @@ import org.apache.ignite.cache.*;
 import org.apache.ignite.cache.affinity.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.plugin.*;
 import org.apache.ignite.internal.product.*;
@@ -131,7 +132,7 @@ public class IgniteSpringBean implements Ignite, DisposableBean, InitializingBea
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteProduct product() {
+    @Override public GridProduct product() {
         assert g != null;
 
         return g.product();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bb03c6e2/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/VisorConsole.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/VisorConsole.scala
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/VisorConsole.scala
index 01ab834..70fc21e 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/VisorConsole.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/VisorConsole.scala
@@ -17,20 +17,16 @@
 
 package org.apache.ignite.visor.commands
 
-import org.apache.ignite.internal.GridProductImpl
-import org.apache.ignite.internal.product.IgniteProduct
-import org.apache.ignite.internal.util.IgniteUtils
-import org.apache.ignite.internal.util.typedef.internal.U
-import org.apache.ignite.internal.util.scala.impl
-
-import org.apache.ignite.startup.cmdline.AboutDialog
-
-import javax.swing.ImageIcon
 import java.awt.Image
 import java.io.File
 import java.text.SimpleDateFormat
 import java.util
+import javax.swing.ImageIcon
 
+import org.apache.ignite.internal.product.IgniteProduct._
+import org.apache.ignite.internal.util.IgniteUtils
+import org.apache.ignite.internal.util.scala.impl
+import org.apache.ignite.startup.cmdline.AboutDialog
 import org.apache.ignite.visor.visor
 
 import scala.tools.jline.console.ConsoleReader
@@ -60,13 +56,13 @@ import org.apache.ignite.visor.commands.vvm.VisorVvmCommand
  */
 object VisorConsole extends App {
     /** Version number. */
-    private final val VISOR_VER = IgniteProduct.VER_STR
+    private final val VISOR_VER = VER_STR
 
     /** Release date. */
-    private final val VISOR_RELEASE_DATE = IgniteProduct.RELEASE_DATE_STR
+    private final val VISOR_RELEASE_DATE = RELEASE_DATE_STR
 
     /** Copyright. */
-    private final val VISOR_COPYRIGHT = IgniteProduct.COPYRIGHT
+    private final val VISOR_COPYRIGHT = COPYRIGHT
 
     /** Release date (another format). */
     private final val releaseDate = new SimpleDateFormat("ddMMyyyy").parse(VISOR_RELEASE_DATE)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bb03c6e2/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
index 53fd668..30a11d8 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
@@ -32,14 +32,14 @@ import org.apache.ignite.internal.IgniteComponentType._
 import org.apache.ignite.internal.IgniteNodeAttributes._
 import org.apache.ignite.internal.cluster.ClusterGroupEmptyCheckedException
 import org.apache.ignite.internal.processors.spring.IgniteSpringProcessor
-import org.apache.ignite.internal.product.IgniteProduct
+import org.apache.ignite.internal.product.IgniteProduct._
 import org.apache.ignite.internal.util.lang.{GridFunc => F}
 import org.apache.ignite.internal.util.typedef._
 import org.apache.ignite.internal.util.{GridConfigurationFinder, IgniteUtils}
 import org.apache.ignite.internal.visor.VisorTaskArgument
 import org.apache.ignite.internal.visor.node.VisorNodeEventsCollectorTask
 import org.apache.ignite.internal.visor.node.VisorNodeEventsCollectorTask.VisorNodeEventsCollectorTaskArg
-import org.apache.ignite.internal.{IgniteEx, GridProductImpl}
+import org.apache.ignite.internal.IgniteEx
 import org.apache.ignite.lang.{IgniteNotPeerDeployable, IgnitePredicate}
 import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi
 import org.apache.ignite.thread.IgniteThreadPoolExecutor
@@ -158,9 +158,6 @@ object visor extends VisorTag {
     /** Node stop listener. */
     private var nodeStopLsnr: IgnitionListener = null
 
-    /** Visor copyright blurb. */
-    private final val COPYRIGHT = IgniteProduct.COPYRIGHT
-
     /** */
     @volatile private var isCon: Boolean = false
 


Mime
View raw message