Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-189
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
modules/core/src/main/java/org/apache/ignite/internal/managers/security/GridSecurityImpl.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8d2eb772
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8d2eb772
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8d2eb772
Branch: refs/heads/ignite-189
Commit: 8d2eb7727c839db86bd4cce389fe091787f52dfc
Parents: 54f90f8 a4f9375
Author: ivasilinets <[email protected]>
Authored: Wed Feb 11 19:07:59 2015 +0300
Committer: ivasilinets <[email protected]>
Committed: Wed Feb 11 19:07:59 2015 +0300
----------------------------------------------------------------------
modules/clients/src/test/keystore/generate.sh | 25 ++---
.../src/main/java/org/apache/ignite/Ignite.java | 11 +--
.../java/org/apache/ignite/IgniteServices.java | 2 +-
.../org/apache/ignite/cache/CacheManager.java | 15 +--
.../ignite/events/AuthorizationEvent.java | 2 +-
.../org/apache/ignite/events/CacheEvent.java | 2 +-
.../apache/ignite/events/CheckpointEvent.java | 2 +-
.../apache/ignite/events/DeploymentEvent.java | 2 +-
.../java/org/apache/ignite/events/JobEvent.java | 2 +-
.../ignite/internal/GridKernalContext.java | 5 -
.../ignite/internal/GridKernalContextImpl.java | 13 +--
.../apache/ignite/internal/GridProductImpl.java | 11 ++-
.../apache/ignite/internal/IgniteKernal.java | 56 +----------
.../internal/managers/GridManagerAdapter.java | 14 ++-
.../managers/security/GridSecurityImpl.java | 95 -------------------
.../processors/cache/CacheEntryEvent.java | 5 +-
.../processors/cache/CacheEntryImpl.java | 6 +-
.../processors/cache/CacheEntryImpl0.java | 6 +-
.../processors/cache/CacheInvokeEntry.java | 8 +-
.../processors/cache/GridCacheStoreManager.java | 3 +-
.../processors/cache/GridCacheUtils.java | 4 +-
.../processors/cache/IgniteCacheProxy.java | 6 +-
.../processors/rest/GridRestProcessor.java | 2 +-
.../ignite/internal/product/IgniteProduct.java | 8 ++
.../optimized/optimized-classnames.properties | 57 ++++++------
.../ignite/plugin/security/GridSecurity.java | 97 --------------------
.../plugin/security/GridSecuritySubject.java | 1 -
modules/core/src/test/config/tests.properties | 6 +-
.../junits/GridTestKernalContext.java | 3 +-
.../ignite/testframework/junits/IgniteMock.java | 6 --
.../http/jetty/GridJettyRestHandler.java | 2 +-
.../schema-load/src/main/java/media/style.css | 5 +
.../org/apache/ignite/schema/ui/MessageBox.java | 8 +-
.../apache/ignite/schema/ui/SchemaLoadApp.java | 2 +-
.../org/apache/ignite/IgniteSpringBean.java | 7 --
.../cache/websession/GridWebSessionFilter.java | 2 +-
pom.xml | 51 ++++++----
37 files changed, 165 insertions(+), 387 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8d2eb772/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8d2eb772/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8d2eb772/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --cc
modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 792f80b,620b1fe..76aa71e
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@@ -77,7 -77,7 +77,6 @@@ import org.apache.ignite.mxbean.*
import org.apache.ignite.plugin.*;
import org.apache.ignite.plugin.security.*;
import org.apache.ignite.spi.*;
- import org.apache.ignite.spi.securesession.noop.*;
-import org.apache.ignite.spi.authentication.*;
import org.jetbrains.annotations.*;
import javax.management.*;
@@@ -1346,10 -1350,10 +1309,8 @@@ public class IgniteKernal extends Clust
addAttributes(attrs, cfg.getEventStorageSpi());
addAttributes(attrs, cfg.getCheckpointSpi());
addAttributes(attrs, cfg.getLoadBalancingSpi());
- addAttributes(attrs, cfg.getAuthenticationSpi());
- addAttributes(attrs, cfg.getSecureSessionSpi());
addAttributes(attrs, cfg.getDeploymentSpi());
-
-
// Set user attributes for this node.
if (cfg.getUserAttributes() != null) {
for (Map.Entry<String, ?> e : cfg.getUserAttributes().entrySet())
{
