ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject incubator-ignite git commit: # ignite-213 : IgniteConfiguration.licenceUrl property was deleted
Date Tue, 10 Feb 2015 09:58:24 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-213 fdeced539 -> 19a3a9acc


# ignite-213 :  IgniteConfiguration.licenceUrl property was deleted


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

Branch: refs/heads/ignite-213
Commit: 19a3a9acc7012bc1f947937e043aa7a3c1f1befe
Parents: fdeced5
Author: Artem Shutak <ashutak@gridgain.com>
Authored: Mon Feb 9 20:34:12 2015 +0300
Committer: Artem Shutak <ashutak@gridgain.com>
Committed: Mon Feb 9 20:34:12 2015 +0300

----------------------------------------------------------------------
 .../configuration/IgniteConfiguration.java      | 35 ++++----------------
 .../apache/ignite/internal/IgniteKernal.java    |  9 +----
 .../org/apache/ignite/internal/IgnitionEx.java  |  1 -
 .../visor/node/VisorBasicConfiguration.java     | 18 ----------
 .../org/apache/ignite/mxbean/IgniteMXBean.java  |  8 -----
 .../config/VisorConfigurationCommand.scala      | 11 +++---
 6 files changed, 11 insertions(+), 71 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19a3a9ac/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index 5ec0924..d15685d 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@ -20,20 +20,18 @@ package org.apache.ignite.configuration;
 import org.apache.ignite.*;
 import org.apache.ignite.client.ssl.*;
 import org.apache.ignite.events.*;
-import org.apache.ignite.internal.processors.hadoop.*;
 import org.apache.ignite.internal.managers.eventstorage.*;
+import org.apache.ignite.internal.processors.hadoop.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.lifecycle.*;
-import org.apache.ignite.services.*;
 import org.apache.ignite.marshaller.*;
 import org.apache.ignite.plugin.*;
-import org.apache.ignite.portables.*;
-import org.apache.ignite.spi.authentication.*;
-import org.apache.ignite.spi.indexing.*;
-import org.apache.ignite.streamer.*;
 import org.apache.ignite.plugin.security.*;
 import org.apache.ignite.plugin.segmentation.*;
+import org.apache.ignite.portables.*;
+import org.apache.ignite.services.*;
+import org.apache.ignite.spi.authentication.*;
 import org.apache.ignite.spi.checkpoint.*;
 import org.apache.ignite.spi.collision.*;
 import org.apache.ignite.spi.communication.*;
@@ -41,9 +39,11 @@ import org.apache.ignite.spi.deployment.*;
 import org.apache.ignite.spi.discovery.*;
 import org.apache.ignite.spi.eventstorage.*;
 import org.apache.ignite.spi.failover.*;
+import org.apache.ignite.spi.indexing.*;
 import org.apache.ignite.spi.loadbalancing.*;
 import org.apache.ignite.spi.securesession.*;
 import org.apache.ignite.spi.swapspace.*;
+import org.apache.ignite.streamer.*;
 
 import javax.management.*;
 import java.lang.management.*;
@@ -439,9 +439,6 @@ public class IgniteConfiguration {
     /** Property names to include into node attributes. */
     private String[] includeProps;
 
-    /** License custom URL. */
-    private String licUrl;
-
     /** Frequency of metrics log print out. */
     @SuppressWarnings("RedundantFieldInitialization")
     private long metricsLogFreq = DFLT_METRICS_LOG_FREQ;
@@ -583,7 +580,6 @@ public class IgniteConfiguration {
         inclEvtTypes = cfg.getIncludeEventTypes();
         includeProps = cfg.getIncludeProperties();
         jettyPath = cfg.getRestJettyPath();
-        licUrl = cfg.getLicenseUrl();
         lifecycleBeans = cfg.getLifecycleBeans();
         lifeCycleEmailNtf = cfg.isLifeCycleEmailNotification();
         locHost = cfg.getLocalHost();
@@ -667,16 +663,6 @@ public class IgniteConfiguration {
     }
 
     /**
-     * Gets custom license file URL to be used instead of default license file location.
-     *
-     * @return Custom license file URL or {@code null} to use the default
-     *      {@code $IGNITE_HOME}-related location.
-     */
-    public String getLicenseUrl() {
-        return licUrl;
-    }
-
-    /**
      * Whether or not to use SSL fot SMTP. Default is {@link #DFLT_SMTP_SSL}.
      * <p>
      * Note that Ignite uses SMTP to send emails in critical
@@ -818,15 +804,6 @@ public class IgniteConfiguration {
     }
 
     /**
-     * Sets license URL different from the default location of the license file.
-     *
-     * @param licUrl License URl to set.
-     */
-    public void setLicenseUrl(String licUrl) {
-        this.licUrl = licUrl;
-    }
-
-    /**
      * Sets whether or not to enable lifecycle email notifications.
      *
      * @param lifeCycleEmailNtf {@code True} to enable lifecycle email notifications.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19a3a9ac/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 7425813..a8422f5 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
@@ -94,9 +94,9 @@ import java.util.concurrent.atomic.*;
 
 import static org.apache.ignite.IgniteSystemProperties.*;
 import static org.apache.ignite.internal.GridKernalState.*;
-import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 import static org.apache.ignite.internal.GridProductImpl.*;
 import static org.apache.ignite.internal.IgniteComponentType.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
 import static org.apache.ignite.internal.processors.license.GridLicenseSubsystem.*;
 import static org.apache.ignite.internal.util.nodestart.IgniteNodeStartUtils.*;
 import static org.apache.ignite.lifecycle.LifecycleEventType.*;
@@ -296,13 +296,6 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx,
Ignit
     }
 
     /** {@inheritDoc} */
-    @Override public String getLicenseFilePath() {
-        assert cfg != null;
-
-        return cfg.getLicenseUrl();
-    }
-
-    /** {@inheritDoc} */
     @Override public long getStartTimestamp() {
         return startTime;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19a3a9ac/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index 6ce285a..6ececb3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -1399,7 +1399,6 @@ public class IgnitionEx {
             myCfg.setIgniteHome(ggHome);
 
             // Copy values that don't need extra processing.
-            myCfg.setLicenseUrl(cfg.getLicenseUrl());
             myCfg.setPeerClassLoadingEnabled(cfg.isPeerClassLoadingEnabled());
             myCfg.setDeploymentMode(cfg.getDeploymentMode());
             myCfg.setNetworkTimeout(cfg.getNetworkTimeout());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19a3a9ac/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorBasicConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorBasicConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorBasicConfiguration.java
index d91f2a1..977eec2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorBasicConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorBasicConfiguration.java
@@ -66,9 +66,6 @@ public class VisorBasicConfiguration implements Serializable {
     /** Network timeout. */
     private long netTimeout;
 
-    /** Node license URL */
-    private String licenseUrl;
-
     /** Logger used on node. */
     private String log;
 
@@ -120,7 +117,6 @@ public class VisorBasicConfiguration implements Serializable {
         cfg.jmxRemote(g.isJmxRemoteEnabled());
         cfg.restart(g.isRestartEnabled());
         cfg.networkTimeout(c.getNetworkTimeout());
-        cfg.licenseUrl(c.getLicenseUrl());
         cfg.logger(compactClass(c.getGridLogger()));
         cfg.discoStartupDelay(c.getDiscoveryStartupDelay());
         cfg.mBeanServer(compactClass(c.getMBeanServer()));
@@ -277,20 +273,6 @@ public class VisorBasicConfiguration implements Serializable {
     }
 
     /**
-     * @return Node license URL
-     */
-    @Nullable public String licenseUrl() {
-        return licenseUrl;
-    }
-
-    /**
-     * @param licenseUrl New node license URL
-     */
-    public void licenseUrl(@Nullable String licenseUrl) {
-        this.licenseUrl = licenseUrl;
-    }
-
-    /**
      * @return Logger used on node.
      */
     public String logger() {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19a3a9ac/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java b/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java
index 9c9f973..e8c2491 100644
--- a/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java
@@ -26,14 +26,6 @@ import java.util.*;
 @MXBeanDescription("MBean that provides access to Kernal information.")
 public interface IgniteMXBean {
     /**
-     * Gets file path of the license.
-     *
-     * @return File path of the license.
-     */
-    @MXBeanDescription("File path of the license.")
-    public String getLicenseFilePath();
-
-    /**
      * Gets string presentation of the version.
      *
      * @return String presentation of the version.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19a3a9ac/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
index 5971573..bcf64fb 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
@@ -17,19 +17,17 @@
 
 package org.apache.ignite.visor.commands.config
 
-import org.apache.ignite.internal.util.IgniteUtils
-import org.apache.ignite.internal.visor.node.VisorNodeConfigurationCollectorTask
+import java.lang.System._
 
 import org.apache.ignite._
 import org.apache.ignite.cluster.ClusterNode
+import org.apache.ignite.internal.util.IgniteUtils
+import org.apache.ignite.internal.visor.node.VisorNodeConfigurationCollectorTask
 import org.apache.ignite.lang.IgniteBiTuple
-
-import java.lang.System._
-
 import org.apache.ignite.visor.VisorTag
 import org.apache.ignite.visor.commands.cache.VisorCacheCommand
 import org.apache.ignite.visor.commands.{VisorConsoleCommand, VisorTextTable}
-import visor.visor._
+import org.apache.ignite.visor.visor._
 
 import scala.collection.JavaConversions._
 import scala.language.implicitConversions
@@ -232,7 +230,6 @@ class VisorConfigurationCommand {
             cmnT += ("Remote JMX", bool2Str(cfg.basic().jmxRemote()))
             cmnT += ("Restart", bool2Str(cfg.basic().restart()))
             cmnT += ("Network timeout", cfg.basic().networkTimeout() + "ms")
-            cmnT += ("License URL", safe(cfg.basic().licenseUrl(), DFLT))
             cmnT += ("Grid logger", safe(cfg.basic().logger(), DFLT))
             cmnT += ("Discovery startup delay", cfg.basic().discoStartupDelay() + "ms")
             cmnT += ("MBean server", safe(cfg.basic().mBeanServer(), DFLT))


Mime
View raw message