ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [03/50] [abbrv] incubator-ignite git commit: #gg-9809: Fix AbstractDiscoverySelfTest.
Date Tue, 24 Feb 2015 09:26:31 GMT
#gg-9809: Fix AbstractDiscoverySelfTest.


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

Branch: refs/heads/ignite-298
Commit: f7230aa172f73a87850c45ac4487fb95d63a776b
Parents: 7f06ab0
Author: ivasilinets <ivasilinets@gridgain.com>
Authored: Wed Feb 18 17:08:34 2015 +0300
Committer: ivasilinets <ivasilinets@gridgain.com>
Committed: Wed Feb 18 17:08:34 2015 +0300

----------------------------------------------------------------------
 .../managers/discovery/GridDiscoveryManager.java    |  6 ++----
 .../processors/security/GridSecurityProcessor.java  |  1 +
 .../spi/discovery/AbstractDiscoverySelfTest.java    | 16 ----------------
 3 files changed, 3 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7230aa1/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index d5449ec..3863a29 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -239,8 +239,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi>
{
 
         if (ctx.security().enabled()) {
             getSpi().setAuthenticator(new DiscoverySpiNodeAuthenticator() {
-                @Override
-                public SecurityContext authenticateNode(ClusterNode node, GridSecurityCredentials
cred) {
+                @Override public SecurityContext authenticateNode(ClusterNode node, GridSecurityCredentials
cred) {
                     try {
                         return ctx.security().authenticateNode(node, cred);
                     }
@@ -249,8 +248,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi>
{
                     }
                 }
 
-                @Override
-                public boolean isGlobalNodeAuthentication() {
+                @Override public boolean isGlobalNodeAuthentication() {
                     return ctx.security().isGlobalNodeAuthentication();
                 }
             });

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7230aa1/modules/core/src/main/java/org/apache/ignite/internal/processors/security/GridSecurityProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/security/GridSecurityProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/security/GridSecurityProcessor.java
index 66c692f..d886154 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/security/GridSecurityProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/security/GridSecurityProcessor.java
@@ -87,6 +87,7 @@ public interface GridSecurityProcessor extends GridProcessor {
      * Create security context.
      *
      * @subj Security subject.
+     * @return Security context.
      */
     public SecurityContext createSecurityContext(GridSecuritySubject subj);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7230aa1/modules/core/src/test/java/org/apache/ignite/spi/discovery/AbstractDiscoverySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/AbstractDiscoverySelfTest.java
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/AbstractDiscoverySelfTest.java
index e0717f4..7352943 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/AbstractDiscoverySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/AbstractDiscoverySelfTest.java
@@ -19,11 +19,8 @@ package org.apache.ignite.spi.discovery;
 
 import mx4j.tools.adaptor.http.*;
 import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.security.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.marshaller.*;
-import org.apache.ignite.plugin.security.*;
 import org.apache.ignite.spi.*;
 import org.apache.ignite.testframework.config.*;
 import org.apache.ignite.testframework.junits.*;
@@ -390,19 +387,6 @@ public abstract class AbstractDiscoverySelfTest<T extends IgniteSpi>
extends Gri
                     }
                 });
 
-                spi.setAuthenticator(new DiscoverySpiNodeAuthenticator() {
-                    @Override public SecurityContext authenticateNode(ClusterNode n, GridSecurityCredentials
cred) {
-                        GridSecuritySubject subj = getGridSecuritySubject(GridSecuritySubjectType.REMOTE_NODE,
n.id());
-
-                        return ((IgniteKernal) grid()).context().security().createSecurityContext(subj);
-                    }
-
-                    @Override public boolean isGlobalNodeAuthentication() {
-                        return false;
-                    }
-                });
-
-
                 spi.spiStart(getTestGridName() + i);
 
                 spis.add(spi);


Mime
View raw message