# Renaming

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

Branch: refs/heads/master
Commit: f2f4a3259af0e0a94b1d5ff8bc10835cdbb313f2
Parents: b69a23c
Author: sboikov <sboi...@gridgain.com>
Authored: Fri Dec 5 17:11:02 2014 +0300
Committer: sboikov <sboi...@gridgain.com>
Committed: Fri Dec 5 17:11:02 2014 +0300

----------------------------------------------------------------------
 .../src/test/resources/spring-server-node.xml   |   2 +-
 .../test/resources/spring-server-ssl-node.xml   |   2 +-
 .../configuration/IgniteConfiguration.java      |  15 ++-
 .../org/apache/ignite/spi/IgniteSpiAdapter.java |   4 +-
 .../spi/securesession/SecureSessionSpi.java     |  84 ++++++++++++++
 .../noop/NoopSecureSessionSpi.java              | 115 +++++++++++++++++++
 .../noop/NoopSecureSessionSpiMBean.java         |  21 ++++
 .../ignite/spi/securesession/noop/package.html  |  15 +++
 .../ignite/spi/securesession/package.html       |  15 +++
 .../org/gridgain/grid/kernal/GridGainEx.java    |   8 +-
 .../org/gridgain/grid/kernal/GridKernal.java    |   4 +-
 .../grid/spi/securesession/noop/package.html    |  15 ---
 .../grid/spi/securesession/package.html         |  15 ---
 13 files changed, 267 insertions(+), 48 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2f4a325/modules/clients/src/test/resources/spring-server-node.xml
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/resources/spring-server-node.xml 
b/modules/clients/src/test/resources/spring-server-node.xml
index 4712d9e..c77c119 100644
--- a/modules/clients/src/test/resources/spring-server-node.xml
+++ b/modules/clients/src/test/resources/spring-server-node.xml
@@ -272,7 +272,7 @@
             Use remember me secure session SPI.
         -->
         <property name="secureSessionSpi">
-            <bean 
class="org.gridgain.grid.spi.securesession.rememberme.GridRememberMeSecureSessionSpi">
+            <bean 
class="org.apache.ignite.spi.securesession.rememberme.GridRememberMeSecureSessionSpi">
                 <!-- Session TTL = 1 hour -->
                 <property name="ttl" value="3600000"/>
             </bean>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2f4a325/modules/clients/src/test/resources/spring-server-ssl-node.xml
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/resources/spring-server-ssl-node.xml 
b/modules/clients/src/test/resources/spring-server-ssl-node.xml
index a40d4b5..08c4ddb 100644
--- a/modules/clients/src/test/resources/spring-server-ssl-node.xml
+++ b/modules/clients/src/test/resources/spring-server-ssl-node.xml
@@ -239,7 +239,7 @@
             Use remember me secure session SPI.
         -->
         <property name="secureSessionSpi">
-            <bean 
class="org.gridgain.grid.spi.securesession.rememberme.GridRememberMeSecureSessionSpi">
+            <bean 
class="org.apache.ignite.spi.securesession.rememberme.GridRememberMeSecureSessionSpi">
                 <!-- Session TTL = 1 hour -->
                 <property name="ttl" value="3600000"/>
             </bean>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2f4a325/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 f8b2547..e3dd068 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
@@ -36,8 +36,7 @@ import org.apache.ignite.spi.discovery.*;
 import org.apache.ignite.spi.eventstorage.*;
 import org.apache.ignite.spi.failover.*;
 import org.apache.ignite.spi.loadbalancing.*;
-import org.gridgain.grid.spi.securesession.*;
-import org.gridgain.grid.spi.securesession.noop.*;
+import org.apache.ignite.spi.securesession.*;
 import org.gridgain.grid.spi.swapspace.*;
 import org.gridgain.grid.spi.swapspace.file.*;
 import org.gridgain.grid.util.typedef.internal.*;
@@ -354,7 +353,7 @@ public class IgniteConfiguration {
     private AuthenticationSpi authSpi;
 
     /** Secure session SPI. */
-    private GridSecureSessionSpi sesSpi;
+    private SecureSessionSpi sesSpi;
 
     /** Deployment SPI. */
     private DeploymentSpi deploySpi;
@@ -1991,22 +1990,22 @@ public class IgniteConfiguration {
 
     /**
      * Should return fully configured secure session SPI implementation. If 
not provided,
-     * {@link GridNoopSecureSessionSpi} will be used.
+     * {@link org.apache.ignite.spi.securesession.noop.NoopSecureSessionSpi} 
will be used.
      *
      * @return Grid secure session SPI implementation or {@code null} to use 
default implementation.
      */
-    public GridSecureSessionSpi getSecureSessionSpi() {
+    public SecureSessionSpi getSecureSessionSpi() {
         return sesSpi;
     }
 
     /**
-     * Sets fully configured instance of {@link GridSecureSessionSpi}.
+     * Sets fully configured instance of {@link 
org.apache.ignite.spi.securesession.SecureSessionSpi}.
      *
-     * @param sesSpi Fully configured instance of {@link GridSecureSessionSpi} 
or
+     * @param sesSpi Fully configured instance of {@link 
org.apache.ignite.spi.securesession.SecureSessionSpi} or
      * {@code null} if no SPI provided.
      * @see IgniteConfiguration#getSecureSessionSpi()
      */
-    public void setSecureSessionSpi(GridSecureSessionSpi sesSpi) {
+    public void setSecureSessionSpi(SecureSessionSpi sesSpi) {
         this.sesSpi = sesSpi;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2f4a325/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java 
b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
index 2dca36a..9969650 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
@@ -19,7 +19,7 @@ import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.managers.communication.*;
 import org.gridgain.grid.kernal.managers.eventstorage.*;
 import org.gridgain.grid.security.*;
-import org.gridgain.grid.spi.securesession.*;
+import org.apache.ignite.spi.securesession.*;
 import org.gridgain.grid.spi.swapspace.*;
 import org.gridgain.grid.util.direct.*;
 import org.gridgain.grid.util.typedef.*;
@@ -139,7 +139,7 @@ public abstract class IgniteSpiAdapter implements 
IgniteSpi, IgniteSpiManagement
 
         // Always run consistency check for security SPIs.
         final boolean secSpi = 
AuthenticationSpi.class.isAssignableFrom(getClass()) ||
-            GridSecureSessionSpi.class.isAssignableFrom(getClass());
+            SecureSessionSpi.class.isAssignableFrom(getClass());
 
         final boolean check = secSpi || 
!Boolean.getBoolean(GG_SKIP_CONFIGURATION_CONSISTENCY_CHECK);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2f4a325/modules/core/src/main/java/org/apache/ignite/spi/securesession/SecureSessionSpi.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/securesession/SecureSessionSpi.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/securesession/SecureSessionSpi.java
new file mode 100644
index 0000000..4fbff22
--- /dev/null
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/securesession/SecureSessionSpi.java
@@ -0,0 +1,84 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.spi.securesession;
+
+import org.apache.ignite.spi.*;
+import org.gridgain.grid.security.*;
+import org.jetbrains.annotations.*;
+
+import java.util.*;
+
+/**
+ * Secure session SPI allows for session creation and validation, typically 
after authentication
+ * has successfully happened. The main purpose of this SPI is to ensure that 
remote clients are
+ * authenticated only once and upon successful authentication get issued a 
secure session token
+ * to reuse for consequent requests (very much the same way like HTTP sessions 
work).
+ * <p>
+ * The default secure session SPI is {@link 
org.apache.ignite.spi.securesession.noop.NoopSecureSessionSpi}
+ * which permits any request.
+ * <p>
+ * Gridgain provides the following {@code GridSecureSessionSpi} 
implementations:
+ * <ul>
+ * <li>
+ *     {@link org.apache.ignite.spi.securesession.noop.NoopSecureSessionSpi} - 
permits any request.
+ * </li>
+ * <li>
+ *     {@code GridRememberMeSecureSessionSpi} -
+ *     validates client session with remember-me session token.
+ * </li>
+ * </ul>
+ * <p>
+ * <b>NOTE:</b> that multiple secure session SPIs may be started on the same 
grid node. In this case
+ * GridGain will differentiate between them based on {@link 
#supported(GridSecuritySubjectType)}
+ * value. The first SPI which returns {@code true} for a given subject type 
will be used for
+ * session validation.
+ * <p>
+ * <b>NOTE:</b> this SPI (i.e. methods in this interface) should never be used 
directly. SPIs provide
+ * internal view on the subsystem and is used internally by GridGain kernal. 
In rare use cases when
+ * access to a specific implementation of this SPI is required - an instance 
of this SPI can be obtained
+ * via {@link org.apache.ignite.Ignite#configuration()} method to check its 
configuration properties or call other non-SPI
+ * methods. Note again that calling methods from this interface on the 
obtained instance can lead
+ * to undefined behavior and explicitly not supported.
+ */
+public interface SecureSessionSpi extends IgniteSpi {
+    /**
+     * Checks if given subject is supported by this SPI. If not, then next 
secure session SPI
+     * in the list will be checked.
+     *
+     * @param subjType Subject type.
+     * @return {@code True} if subject type is supported, {@code false} 
otherwise.
+     */
+    public boolean supported(GridSecuritySubjectType subjType);
+
+    /**
+     * Validates given session token.
+     *
+     * @param subjType Subject type.
+     * @param subjId Unique subject ID such as local or remote node ID, client 
ID, etc.
+     * @param tok Token to validate.
+     * @param params Additional implementation-specific parameters.
+     * @return {@code True} if session token is valid, {@code false} otherwise.
+     * @throws org.apache.ignite.spi.IgniteSpiException If validation resulted 
in system error. Note that
+     *      bad credentials should not cause this exception.
+     */
+    public boolean validate(GridSecuritySubjectType subjType, UUID subjId, 
byte[] tok,
+        @Nullable Object params) throws IgniteSpiException;
+
+    /**
+     * Generates new session token.
+     *
+     * @param subjType Subject type.
+     * @param subjId Unique subject ID such as local or remote node ID, client 
ID, etc.
+     * @param params Additional implementation-specific parameters.
+     * @return Session token that should be used for further validation.
+     */
+    public byte[] generateSessionToken(GridSecuritySubjectType subjType, UUID 
subjId, @Nullable Object params)
+        throws IgniteSpiException;
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2f4a325/modules/core/src/main/java/org/apache/ignite/spi/securesession/noop/NoopSecureSessionSpi.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/securesession/noop/NoopSecureSessionSpi.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/securesession/noop/NoopSecureSessionSpi.java
new file mode 100644
index 0000000..e281f02
--- /dev/null
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/securesession/noop/NoopSecureSessionSpi.java
@@ -0,0 +1,115 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.spi.securesession.noop;
+
+import org.apache.ignite.*;
+import org.apache.ignite.resources.*;
+import org.apache.ignite.spi.*;
+import org.gridgain.grid.security.*;
+import org.apache.ignite.spi.securesession.*;
+import org.gridgain.grid.util.typedef.internal.*;
+import org.jetbrains.annotations.*;
+
+import java.util.*;
+
+/**
+ * Default no-op implementation of the secure session SPI which supports all 
subject types and denies any token.
+ * <p>
+ * <h1 class="header">Configuration</h1>
+ * <h2 class="header">Mandatory</h2>
+ * This SPI has no mandatory configuration parameters.
+ * <h2 class="header">Optional</h2>
+ * This SPI has no optional configuration parameters.
+ * <h2 class="header">Java Example</h2>
+ * GridNoopSecureSessionSpi is used by default and has no parameters to be 
explicitly configured.
+ * <pre name="code" class="java">
+ * GridNoopSecureSessionSpi spi = new GridNoopSecureSessionSpi();
+ *
+ * GridConfiguration cfg = new GridConfiguration();
+ *
+ * // Override default SecureSession SPI.
+ * cfg.setSecureSessionSpi(spi);
+ *
+ * // Start grid.
+ * GridGain.start(cfg);
+ * </pre>
+ * <h2 class="header">Spring Example</h2>
+ * GridNoopSecureSessionSpi can be configured from Spring XML configuration 
file:
+ * <pre name="code" class="xml">
+ * &lt;bean id="grid.custom.cfg" class="org.gridgain.grid.GridConfiguration" 
singleton="true"&gt;
+ *         ...
+ *         &lt;property name="secureSessionSpi"&gt;
+ *             &lt;bean 
class="org.gridgain.grid.spi.SecureSession.noop.GridNoopSecureSessionSpi"/&gt;
+ *         &lt;/property&gt;
+ *         ...
+ * &lt;/bean&gt;
+ * </pre>
+ * <p>
+ * <img src="http://www.gridgain.com/images/spring-small.png";>
+ * <br>
+ * For information about Spring framework visit <a 
href="http://www.springframework.org/";>www.springframework.org</a>
+ * @see org.apache.ignite.spi.securesession.SecureSessionSpi
+ */
+@IgniteSpiNoop
+@IgniteSpiMultipleInstancesSupport(true)
+public class NoopSecureSessionSpi extends IgniteSpiAdapter
+    implements SecureSessionSpi, NoopSecureSessionSpiMBean {
+    /** Empty bytes array. */
+    private static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
+
+    /** Injected grid logger. */
+    @IgniteLoggerResource
+    private IgniteLogger log;
+
+    /** {@inheritDoc} */
+    @Override public boolean supported(GridSecuritySubjectType subjType) {
+        // If this SPI is included, then session management is disabled.
+        return true;
+    }
+
+    /** {@inheritDoc} */
+    @Override public boolean validate(GridSecuritySubjectType subjType, UUID 
subjId, @Nullable byte[] tok,
+        @Nullable Object params) throws IgniteSpiException {
+        // Never validate any token - all tokens are invalid.
+        return false;
+    }
+
+    /** {@inheritDoc} */
+    @Override public byte[] generateSessionToken(GridSecuritySubjectType 
subjType, UUID subjId,
+        @Nullable Object params) {
+        return EMPTY_BYTE_ARRAY;
+    }
+
+    /** {@inheritDoc} */
+    @Override public void spiStart(String gridName) throws IgniteSpiException {
+        // Start SPI start stopwatch.
+        startStopwatch();
+
+        registerMBean(gridName, this, NoopSecureSessionSpiMBean.class);
+
+        // Ack ok start.
+        if (log.isDebugEnabled())
+            log.debug(startInfo());
+    }
+
+    /** {@inheritDoc} */
+    @Override public void spiStop() throws IgniteSpiException {
+        unregisterMBean();
+
+        // Ack ok stop.
+        if (log.isDebugEnabled())
+            log.debug(stopInfo());
+    }
+
+    /** {@inheritDoc} */
+    @Override public String toString() {
+        return S.toString(NoopSecureSessionSpi.class, this);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2f4a325/modules/core/src/main/java/org/apache/ignite/spi/securesession/noop/NoopSecureSessionSpiMBean.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/securesession/noop/NoopSecureSessionSpiMBean.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/securesession/noop/NoopSecureSessionSpiMBean.java
new file mode 100644
index 0000000..fe91568
--- /dev/null
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/securesession/noop/NoopSecureSessionSpiMBean.java
@@ -0,0 +1,21 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.spi.securesession.noop;
+
+import org.apache.ignite.mbean.*;
+import org.apache.ignite.spi.*;
+
+/**
+ * Management bean for {@link NoopSecureSessionSpi}.
+ */
+@IgniteMBeanDescription("MBean that provides access to no-op secure session 
SPI configuration.")
+public interface NoopSecureSessionSpiMBean extends IgniteSpiManagementMBean {
+    // No-op.
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2f4a325/modules/core/src/main/java/org/apache/ignite/spi/securesession/noop/package.html
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/securesession/noop/package.html
 
b/modules/core/src/main/java/org/apache/ignite/spi/securesession/noop/package.html
new file mode 100644
index 0000000..0590db2
--- /dev/null
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/securesession/noop/package.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
+<!--
+    @html.file.header
+    _________        _____ __________________        _____
+    __  ____/___________(_)______  /__  ____/______ ____(_)_______
+    _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+    / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+    \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+-->
+<html>
+<body>
+    <!-- Package description. -->
+    Contains <b>default</b> no-op implementation for secure session SPI.
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2f4a325/modules/core/src/main/java/org/apache/ignite/spi/securesession/package.html
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/securesession/package.html 
b/modules/core/src/main/java/org/apache/ignite/spi/securesession/package.html
new file mode 100644
index 0000000..4328ca2
--- /dev/null
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/securesession/package.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
+<!--
+    @html.file.header
+    _________        _____ __________________        _____
+    __  ____/___________(_)______  /__  ____/______ ____(_)_______
+    _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+    / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+    \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+-->
+<html>
+<body>
+    <!-- Package description. -->
+    Contains APIs for secure session SPI.
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2f4a325/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java 
b/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
index 454b9c7..2adda16 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
@@ -50,8 +50,8 @@ import org.apache.ignite.spi.failover.*;
 import org.apache.ignite.spi.failover.always.*;
 import org.apache.ignite.spi.loadbalancing.*;
 import org.apache.ignite.spi.loadbalancing.roundrobin.*;
-import org.gridgain.grid.spi.securesession.*;
-import org.gridgain.grid.spi.securesession.noop.*;
+import org.apache.ignite.spi.securesession.*;
+import org.apache.ignite.spi.securesession.noop.*;
 import org.gridgain.grid.spi.swapspace.*;
 import org.gridgain.grid.spi.swapspace.file.*;
 import org.gridgain.grid.spi.swapspace.noop.*;
@@ -1468,7 +1468,7 @@ public class GridGainEx {
             EventStorageSpi evtSpi = cfg.getEventStorageSpi();
             CollisionSpi colSpi = cfg.getCollisionSpi();
             AuthenticationSpi authSpi = cfg.getAuthenticationSpi();
-            GridSecureSessionSpi sesSpi = cfg.getSecureSessionSpi();
+            SecureSessionSpi sesSpi = cfg.getSecureSessionSpi();
             DeploymentSpi deploySpi = cfg.getDeploymentSpi();
             CheckpointSpi[] cpSpi = cfg.getCheckpointSpi();
             FailoverSpi[] failSpi = cfg.getFailoverSpi();
@@ -1689,7 +1689,7 @@ public class GridGainEx {
                 authSpi = new NoopAuthenticationSpi();
 
             if (sesSpi == null)
-                sesSpi = new GridNoopSecureSessionSpi();
+                sesSpi = new NoopSecureSessionSpi();
 
             if (deploySpi == null)
                 deploySpi = new LocalDeploymentSpi();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2f4a325/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java 
b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
index cc9fd05..1f64654 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
@@ -63,7 +63,7 @@ import org.gridgain.grid.kernal.processors.streamer.*;
 import org.gridgain.grid.kernal.processors.task.*;
 import org.gridgain.grid.kernal.processors.timeout.*;
 import org.gridgain.grid.security.*;
-import org.gridgain.grid.spi.securesession.noop.*;
+import org.apache.ignite.spi.securesession.noop.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.future.*;
 import org.gridgain.grid.util.lang.*;
@@ -1194,7 +1194,7 @@ public class GridKernal extends ClusterGroupAdapter 
implements GridEx, IgniteMBe
         if (!F.isEmpty(cfg.getSegmentationResolvers()))
             msgs.add("Network segmentation detection.");
 
-        if (cfg.getSecureSessionSpi() != null && !(cfg.getSecureSessionSpi() 
instanceof GridNoopSecureSessionSpi))
+        if (cfg.getSecureSessionSpi() != null && !(cfg.getSecureSessionSpi() 
instanceof NoopSecureSessionSpi))
             msgs.add("Secure session SPI.");
 
         if (cfg.getAuthenticationSpi() != null && !(cfg.getAuthenticationSpi() 
instanceof NoopAuthenticationSpi))

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2f4a325/modules/core/src/main/java/org/gridgain/grid/spi/securesession/noop/package.html
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/gridgain/grid/spi/securesession/noop/package.html
 
b/modules/core/src/main/java/org/gridgain/grid/spi/securesession/noop/package.html
deleted file mode 100644
index 0590db2..0000000
--- 
a/modules/core/src/main/java/org/gridgain/grid/spi/securesession/noop/package.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
-<!--
-    @html.file.header
-    _________        _____ __________________        _____
-    __  ____/___________(_)______  /__  ____/______ ____(_)_______
-    _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
-    / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
-    \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
--->
-<html>
-<body>
-    <!-- Package description. -->
-    Contains <b>default</b> no-op implementation for secure session SPI.
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2f4a325/modules/core/src/main/java/org/gridgain/grid/spi/securesession/package.html
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/gridgain/grid/spi/securesession/package.html 
b/modules/core/src/main/java/org/gridgain/grid/spi/securesession/package.html
deleted file mode 100644
index 4328ca2..0000000
--- 
a/modules/core/src/main/java/org/gridgain/grid/spi/securesession/package.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
-<!--
-    @html.file.header
-    _________        _____ __________________        _____
-    __  ____/___________(_)______  /__  ____/______ ____(_)_______
-    _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
-    / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
-    \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
--->
-<html>
-<body>
-    <!-- Package description. -->
-    Contains APIs for secure session SPI.
-</body>
-</html>

Reply via email to