ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agoncha...@apache.org
Subject [01/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-189' into ignite-189
Date Fri, 13 Feb 2015 20:27:59 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-52 09dc44430 -> e91f214f8


Merge remote-tracking branch 'origin/ignite-189' into ignite-189

Conflicts:
	modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.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/bca0c22e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bca0c22e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bca0c22e

Branch: refs/heads/ignite-52
Commit: bca0c22ec82a86084771c437e5e15be20f2d18eb
Parents: 04da506 655b239
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Fri Feb 13 16:21:43 2015 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Fri Feb 13 16:21:43 2015 +0300

----------------------------------------------------------------------
 .../ignite/events/AuthenticationEvent.java      | 172 -------------
 .../ignite/events/AuthorizationEvent.java       | 146 -----------
 .../org/apache/ignite/events/EventType.java     | 120 +--------
 .../ignite/events/SecureSessionEvent.java       | 154 ------------
 .../ignite/internal/GridKernalContext.java      |   4 +-
 .../ignite/internal/GridKernalContextImpl.java  |   4 +-
 .../apache/ignite/internal/IgniteKernal.java    |   9 +-
 .../ignite/internal/IgniteNodeAttributes.java   |   4 -
 .../managers/GridNoopManagerAdapter.java        |  89 -------
 .../discovery/GridDiscoveryManager.java         |   2 +-
 .../securesession/GridSecureSession.java        |  54 ----
 .../GridSecureSessionProcessor.java             |  60 -----
 .../os/GridOsSecureSessionProcessor.java        |  61 -----
 .../managers/securesession/os/package.html      |  24 --
 .../managers/securesession/package.html         |  24 --
 .../security/GridAllowAllPermissionSet.java     |  55 ----
 .../managers/security/GridSecurityContext.java  | 248 -------------------
 .../security/GridSecurityProcessor.java         |  99 --------
 .../security/GridSecuritySubjectAdapter.java    | 131 ----------
 .../security/os/GridOsSecurityProcessor.java    | 102 --------
 .../internal/managers/security/os/package.html  |  24 --
 .../internal/managers/security/package.html     |  24 --
 .../processors/GridNoopProcessorAdapter.java    |  88 +++++++
 .../processors/rest/GridRestProcessor.java      |   7 +-
 .../securesession/GridSecureSession.java        |  60 +++++
 .../GridSecureSessionProcessor.java             |  59 +++++
 .../os/GridOsSecureSessionProcessor.java        |  61 +++++
 .../security/GridSecurityContext.java           | 248 +++++++++++++++++++
 .../security/GridSecurityProcessor.java         |  97 ++++++++
 .../security/os/GridOsSecurityProcessor.java    | 218 ++++++++++++++++
 .../ignite/internal/util/IgniteUtils.java       |   2 +-
 .../event/VisorGridAuthenticationEvent.java     |   2 +-
 .../event/VisorGridAuthorizationEvent.java      |   2 +-
 .../node/VisorNodeEventsCollectorTask.java      |  21 +-
 .../internal/visor/util/VisorTaskUtils.java     |  25 +-
 .../optimized/optimized-classnames.properties   |   6 +-
 .../plugin/security/AuthenticationContext.java  | 110 ++++++++
 .../AuthenticationAclProvider.java              |  41 ---
 .../authentication/AuthenticationContext.java   |  56 -----
 .../AuthenticationContextAdapter.java           | 112 ---------
 .../ignite/spi/authentication/noop/package.html |  24 --
 .../ignite/spi/authentication/package.html      |  24 --
 .../DiscoverySpiNodeAuthenticator.java          |   2 +-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |   2 +-
 .../ignite/spi/securesession/noop/package.html  |  24 --
 .../ignite/spi/securesession/package.html       |  24 --
 .../discovery/AbstractDiscoverySelfTest.java    |   7 +-
 .../tcp/TcpDiscoverySpiStartStopSelfTest.java   |   7 +-
 .../junits/spi/GridSpiAbstractTest.java         |  70 +++++-
 .../commands/events/VisorEventsCommand.scala    |   6 -
 50 files changed, 1032 insertions(+), 1983 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bca0c22e/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index 8be3095,618a0ff..d70200e
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@@ -9169,16 -9169,4 +9169,16 @@@ public abstract class IgniteUtils 
  
          return cnt;
      }
 +
 +    /**
 +     * Throws exception with uniform error message if given parameter's assertion condition
 +     * is {@code false}.
 +     *
 +     * @param cond Assertion condition to check.
 +     * @param condDesc Description of failed condition.
 +     */
 +    public static void assertParameter(boolean cond, String condDesc) throws IgniteException
{
 +        if (!cond)
-             throw new IgniteException("Parameter failed condition check: " + condDesc);
++            throw new IgniteException("SPI parameter failed condition check: " + condDesc);
 +    }
  }


Mime
View raw message