#ignite-189: GridSecurityManager from GridManager to GridProcessor.

modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java

@@ -394,14 +394,14 @@ public interface GridKernalContext extends Iterable<GridComponent> {
      *
      * @return Authentication manager.
      */
-    public GridSecurityManager security();
+    public GridSecurityProcessor security();
 
     /**
      * Gets secure session manager.
      *
      * @return Secure session manager.
      */
-    public GridSecureSessionManager secureSession();
+    public GridSecureSessionProcessor secureSession();
 
     /**
      * Gets load balancing manager.

modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java

@@ -127,11 +127,11 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
 
     /** */
     @GridToStringExclude
-    private GridSecurityManager authMgr;
+    private GridSecurityProcessor authProc;
 
     /** */
     @GridToStringExclude
-    private GridSecureSessionManager sesMgr;
+    private GridSecureSessionProcessor sesMgr;
 
     /** */
     @GridToStringExclude
@@ -416,10 +416,10 @@ else if (comp instanceof GridFailoverManager)
             failoverMgr = (GridFailoverManager)comp;
         else if (comp instanceof GridCollisionManager)
             colMgr = (GridCollisionManager)comp;
-        else if (comp instanceof GridSecurityManager)
-            authMgr = (GridSecurityManager)comp;
-        else if (comp instanceof GridSecureSessionManager)
-            sesMgr = (GridSecureSessionManager)comp;
+        else if (comp instanceof GridSecurityProcessor)
+            authProc = (GridSecurityProcessor)comp;
+        else if (comp instanceof GridSecureSessionProcessor)
+            sesMgr = (GridSecureSessionProcessor)comp;
         else if (comp instanceof GridLoadBalancerManager)
             loadMgr = (GridLoadBalancerManager)comp;
         else if (comp instanceof GridSwapSpaceManager)
@@ -652,12 +652,12 @@ public void addHelper(Object helper) {
     }
 
     /** {@inheritDoc} */
-    @Override public GridSecurityManager security() {
-        return authMgr;
+    @Override public GridSecurityProcessor security() {
+        return authProc;
     }
 
     /** {@inheritDoc} */
-    @Override public GridSecureSessionManager secureSession() {
+    @Override public GridSecureSessionProcessor secureSession() {
         return sesMgr;
     }
 

modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java

@@ -725,8 +725,9 @@ public void start(final IgniteConfiguration cfg, ExecutorService utilityCachePoo
 
             // Start SPI managers.
             // NOTE: that order matters as there are dependencies between managers.
-            startManager(ctx, createComponent(GridSecurityManager.class, ctx), attrs);
-            startManager(ctx, createComponent(GridSecureSessionManager.class, ctx), attrs);
+            startProcessor(ctx, createComponent(GridSecurityProcessor.class, ctx), attrs);
+            startProcessor(ctx, createComponent(GridSecureSessionProcessor.class, ctx), attrs);
+
             startManager(ctx, new GridIoManager(ctx), attrs);
             startManager(ctx, new GridCheckpointManager(ctx), attrs);
 

modules/core/src/main/java/org/apache/ignite/internal/managers/GridNoopManagerAdapter.java

@@ -20,6 +20,7 @@
 import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.internal.*;
+import org.apache.ignite.internal.processors.*;
 import org.apache.ignite.spi.*;
 import org.jetbrains.annotations.*;
 
@@ -28,7 +29,7 @@
 /**
  * No-op {@link GridManager} adapter.
  */
-public class GridNoopManagerAdapter implements GridManager {
+public class GridNoopManagerAdapter implements GridProcessor {
     /**
      * @param ctx Kernal context.
      */
@@ -37,15 +38,10 @@ public GridNoopManagerAdapter(GridKernalContext ctx) {
     }
 
     /** {@inheritDoc} */
-    @Override public void addSpiAttributes(Map<String, Object> attrs) throws IgniteCheckedException {
+    @Override public void addAttributes(Map<String, Object> attrs) throws IgniteCheckedException {
         // No-op.
     }
 
-    /** {@inheritDoc} */
-    @Override public boolean enabled() {
-        return false;
-    }
-
     /** {@inheritDoc} */
     @Override public void start() throws IgniteCheckedException {
         // No-op.

modules/core/src/main/java/org/apache/ignite/internal/managers/securesession/GridSecureSessionManager.java → modules/core/src/main/java/org/apache/ignite/internal/managers/securesession/GridSecureSessionProcessor.java

@@ -18,8 +18,8 @@
 package org.apache.ignite.internal.managers.securesession;
 
 import org.apache.ignite.*;
-import org.apache.ignite.internal.managers.*;
 import org.apache.ignite.internal.managers.security.*;
+import org.apache.ignite.internal.processors.*;
 import org.apache.ignite.plugin.security.*;
 import org.jetbrains.annotations.*;
 
@@ -28,7 +28,7 @@
 /**
  * This interface defines a grid secure session manager.
  */
-public interface GridSecureSessionManager extends GridManager {
+public interface GridSecureSessionProcessor extends GridProcessor {
     /**
      * @param subjType Subject type.
      * @param subjId Subject ID.
@@ -51,4 +51,10 @@ public GridSecureSession validateSession(GridSecuritySubjectType subjType, UUID
      */
     public byte[] updateSession(GridSecuritySubjectType subjType, UUID subjId, GridSecurityContext subjCtx,
         @Nullable Object params) throws IgniteCheckedException;
+
+    /**
+     * @return Returns {@code true} if at least one SPI does not have a {@code NO-OP}
+     *      implementation, {@code false} otherwise.
+     */
+    public boolean enabled();
 }

modules/core/src/main/java/org/apache/ignite/internal/managers/securesession/os/GridOsSecureSessionManager.java → modules/core/src/main/java/org/apache/ignite/internal/managers/securesession/os/GridOsSecureSessionProcessor.java

@@ -28,16 +28,16 @@
 import java.util.*;
 
 /**
- * No-op implementation for {@link GridSecureSessionManager}.
+ * No-op implementation for {@link org.apache.ignite.internal.managers.securesession.GridSecureSessionProcessor}.
  */
-public class GridOsSecureSessionManager extends GridNoopManagerAdapter implements GridSecureSessionManager {
+public class GridOsSecureSessionProcessor extends GridNoopManagerAdapter implements GridSecureSessionProcessor {
     /** Empty bytes. */
     private static final byte[] EMPTY_BYTES = new byte[0];
 
     /**
      * @param ctx Kernal context.
      */
-    public GridOsSecureSessionManager(GridKernalContext ctx) {
+    public GridOsSecureSessionProcessor(GridKernalContext ctx) {
         super(ctx);
     }
 
@@ -53,4 +53,9 @@ public GridOsSecureSessionManager(GridKernalContext ctx) {
         @Nullable Object params) {
         return EMPTY_BYTES;
     }
+
+    /** {@inheritDoc} */
+    @Override public boolean enabled() {
+        return false;
+    }
 }

modules/core/src/main/java/org/apache/ignite/internal/managers/security/GridSecurityImpl.java

@@ -33,7 +33,7 @@ public class GridSecurityImpl implements GridSecurity, Externalizable {
     private static final long serialVersionUID = 0L;
 
     /** Security manager. */
-    private GridSecurityManager secMgr;
+    private GridSecurityProcessor secProc;
 
     /** Context. */
     private GridKernalContext ctx;
@@ -49,14 +49,14 @@ public GridSecurityImpl() {
      * @param ctx Context.
      */
     public GridSecurityImpl(GridKernalContext ctx) {
-        this.secMgr = ctx.security();
+        this.secProc = ctx.security();
         this.ctx = ctx;
     }
 
     /** {@inheritDoc} */
     @Override public Collection<GridSecuritySubject> authenticatedSubjects() throws IgniteException {
         try {
-            return secMgr.authenticatedSubjects();
+            return secProc.authenticatedSubjects();
         }
         catch (IgniteCheckedException e) {
             throw U.convertException(e);
@@ -66,7 +66,7 @@ public GridSecurityImpl(GridKernalContext ctx) {
     /** {@inheritDoc} */
     @Override public GridSecuritySubject authenticatedSubject(UUID subjId) throws IgniteException {
         try {
-            return secMgr.authenticatedSubject(subjId);
+            return secProc.authenticatedSubject(subjId);
         }
         catch (IgniteCheckedException e) {
             throw U.convertException(e);

modules/core/src/main/java/org/apache/ignite/internal/managers/security/GridSecurityManager.java → modules/core/src/main/java/org/apache/ignite/internal/managers/security/GridSecurityProcessor.java

@@ -19,7 +19,7 @@
 
 import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
-import org.apache.ignite.internal.managers.*;
+import org.apache.ignite.internal.processors.*;
 import org.apache.ignite.plugin.security.*;
 import org.apache.ignite.spi.authentication.*;
 import org.jetbrains.annotations.*;
@@ -29,7 +29,7 @@
 /**
  * This interface defines a grid authentication manager.
  */
-public interface GridSecurityManager extends GridManager {
+public interface GridSecurityProcessor extends GridProcessor {
     /**
      * Authenticates grid node with it's attributes via underlying {@link org.apache.ignite.spi.authentication.AuthenticationSpi}s.
      *
@@ -90,4 +90,10 @@ public void authorize(String name, GridSecurityPermission perm, @Nullable GridSe
      * @param subjId Subject ID.
      */
     public void onSessionExpired(UUID subjId);
+
+    /**
+     * @return Returns {@code true} if at least one SPI does not have a {@code NO-OP}
+     *      implementation, {@code false} otherwise.
+     */
+    public boolean enabled();
 }

modules/core/src/main/java/org/apache/ignite/internal/managers/security/os/GridOsSecurityManager.java → modules/core/src/main/java/org/apache/ignite/internal/managers/security/os/GridOsSecurityProcessor.java

@@ -31,13 +31,13 @@
 import java.util.*;
 
 /**
- * No-op implementation for {@link GridSecurityManager}.
+ * No-op implementation for {@link GridSecurityProcessor}.
  */
-public class GridOsSecurityManager extends GridNoopManagerAdapter implements GridSecurityManager {
+public class GridOsSecurityProcessor extends GridNoopManagerAdapter implements GridSecurityProcessor {
     /**
      * @param ctx Kernal context.
      */
-    public GridOsSecurityManager(GridKernalContext ctx) {
+    public GridOsSecurityProcessor(GridKernalContext ctx) {
         super(ctx);
     }
 
@@ -94,4 +94,9 @@ public GridOsSecurityManager(GridKernalContext ctx) {
     @Override public void onSessionExpired(UUID subjId) {
         // No-op.
     }
+
+    /** {@inheritDoc} */
+    @Override public boolean enabled() {
+        return false;
+    }
 }