ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [45/50] [abbrv] incubator-ignite git commit: #ignite-189: Remove from IgniteConfiguration GridSecurityCredentialsProvider.
Date Fri, 13 Feb 2015 16:26:12 GMT
#ignite-189: Remove from IgniteConfiguration GridSecurityCredentialsProvider.


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

Branch: refs/heads/sprint-1
Commit: 3ca365a713105771d8b5795c69b03bf21c94b809
Parents: 52e3b54
Author: ivasilinets <ivasilinets@gridgain.com>
Authored: Fri Feb 13 16:51:08 2015 +0300
Committer: ivasilinets <ivasilinets@gridgain.com>
Committed: Fri Feb 13 16:51:08 2015 +0300

----------------------------------------------------------------------
 .../configuration/IgniteConfiguration.java      | 24 --------------------
 .../org/apache/ignite/internal/IgnitionEx.java  |  1 -
 .../visor/node/VisorBasicConfiguration.java     |  1 -
 .../security/GridSecurityCredentials.java       |  2 +-
 .../GridSecurityCredentialsProvider.java        |  2 +-
 5 files changed, 2 insertions(+), 28 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ca365a7/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 c8e8e63..d4d43e6 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
@@ -28,7 +28,6 @@ import org.apache.ignite.marshaller.*;
 import org.apache.ignite.plugin.*;
 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.services.*;
 import org.apache.ignite.spi.checkpoint.*;
@@ -390,9 +389,6 @@ public class IgniteConfiguration {
     /** Streamer configuration. */
     private StreamerConfiguration[] streamerCfg;
 
-    /** Security credentials. */
-    private GridSecurityCredentialsProvider securityCred;
-
     /** Service configuration. */
     private ServiceConfiguration[] svcCfgs;
 
@@ -488,8 +484,6 @@ public class IgniteConfiguration {
         p2pMissedCacheSize = cfg.getPeerClassLoadingMissedResourcesCacheSize();
         p2pPoolSize = cfg.getPeerClassLoadingThreadPoolSize();
         pluginCfgs = cfg.getPluginConfigurations();
-        qryCfg = cfg.getQueryConfiguration();
-        securityCred = cfg.getSecurityCredentialsProvider();
         segChkFreq = cfg.getSegmentCheckFrequency();
         segPlc = cfg.getSegmentationPolicy();
         segResolveAttempts = cfg.getSegmentationResolveAttempts();
@@ -2140,24 +2134,6 @@ public class IgniteConfiguration {
     }
 
     /**
-     * Gets security credentials.
-     *
-     * @return Security credentials.
-     */
-    public GridSecurityCredentialsProvider getSecurityCredentialsProvider() {
-        return securityCred;
-    }
-
-    /**
-     * Sets security credentials.
-     *
-     * @param securityCred Security credentials.
-     */
-    public void setSecurityCredentialsProvider(GridSecurityCredentialsProvider securityCred)
{
-        this.securityCred = securityCred;
-    }
-
-    /**
      * @return Connector configuration.
      */
     public ConnectorConfiguration getConnectorConfiguration() {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ca365a7/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 4b5338c..a4c8eac 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
@@ -1378,7 +1378,6 @@ public class IgnitionEx {
             myCfg.setMetricsLogFrequency(cfg.getMetricsLogFrequency());
             myCfg.setNetworkSendRetryDelay(cfg.getNetworkSendRetryDelay());
             myCfg.setNetworkSendRetryCount(cfg.getNetworkSendRetryCount());
-            myCfg.setSecurityCredentialsProvider(cfg.getSecurityCredentialsProvider());
             myCfg.setServiceConfiguration(cfg.getServiceConfiguration());
             myCfg.setWarmupClosure(cfg.getWarmupClosure());
             myCfg.setPluginConfigurations(cfg.getPluginConfigurations());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ca365a7/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 977eec2..d69c1c5 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
@@ -127,7 +127,6 @@ public class VisorBasicConfiguration implements Serializable {
         cfg.quiet(boolValue(IGNITE_QUIET, true));
         cfg.successFile(getProperty(IGNITE_SUCCESS_FILE));
         cfg.updateNotifier(boolValue(IGNITE_UPDATE_NOTIFIER, true));
-        cfg.securityCredentialsProvider(compactClass(c.getSecurityCredentialsProvider()));
 
         return cfg;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ca365a7/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentials.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentials.java
b/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentials.java
index 79dafd3..609a6f5 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentials.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentials.java
@@ -31,7 +31,7 @@ import java.io.*;
  * client or node startup in configuration.
  * <p>
  * For grid node, security credentials provider is specified in
- * {@link IgniteConfiguration#setSecurityCredentialsProvider(GridSecurityCredentialsProvider)}
+ * {@link GridPluginConfiguration#setSecurityCredentialsProvider(GridSecurityCredentialsProvider)}
  * configuration property. For Java clients, you can provide credentials in
  * {@code GridClientConfiguration.setSecurityCredentialsProvider(...)} method.
  * <p>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ca365a7/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentialsProvider.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentialsProvider.java
b/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentialsProvider.java
index 500d50e8..d414eb4 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentialsProvider.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/security/GridSecurityCredentialsProvider.java
@@ -24,7 +24,7 @@ import org.apache.ignite.*;
  * Security credentials used for client or node authentication.
  * <p>
  * For grid node, security credentials provider is specified in
- * {@link org.apache.ignite.configuration.IgniteConfiguration#setSecurityCredentialsProvider(GridSecurityCredentialsProvider)}
+ * {@link org.apache.ignite.plugin.PluginConfiguration}
  * configuration property. For Java clients, you can provide credentials in
  * {@code GridClientConfiguration.setSecurityCredentialsProvider(...)} method.
  * <p>


Mime
View raw message