Merge remote-tracking branch 'remotes/community/ignite-1.7.2' into 
UPSTREAM_master

# Conflicts:
#       
modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformConfigurationEx.java
#       
modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java
#       
modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cpp/PlatformCppConfigurationEx.java
#       
modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationEx.java
#       modules/platforms/dotnet/Apache.Ignite.AspNet/Properties/AssemblyInfo.cs
#       modules/platforms/dotnet/Apache.Ignite.sln


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

Branch: refs/heads/master
Commit: 0b7512a445acc39daf8cfb2108e199212be2f228
Parents: dddf6ba 799f190
Author: Pavel Tupitsyn <ptupit...@apache.org>
Authored: Fri Sep 16 17:56:32 2016 +0300
Committer: Pavel Tupitsyn <ptupit...@apache.org>
Committed: Fri Sep 16 17:56:32 2016 +0300

----------------------------------------------------------------------
 .../ignite/internal/binary/BinaryContext.java   |   5 +
 .../platform/PlatformConfigurationEx.java       |   7 +
 .../platform/PlatformContextImpl.java           |   3 -
 .../processors/platform/PlatformProcessor.java  |  10 +-
 .../platform/PlatformProcessorImpl.java         |  72 ++-
 .../platform/cache/PlatformCache.java           | 114 +++-
 .../platform/cache/PlatformCacheExtension.java  |  47 ++
 .../cpp/PlatformCppConfigurationEx.java         |   7 +
 .../dotnet/PlatformDotNetConfigurationEx.java   |   9 +
 .../PlatformDotNetSessionCacheExtension.java    | 144 +++++
 .../websession/PlatformDotNetSessionData.java   | 260 +++++++++
 .../PlatformDotNetSessionLockProcessor.java     |  84 +++
 .../PlatformDotNetSessionLockResult.java        | 106 ++++
 ...tformDotNetSessionSetAndUnlockProcessor.java | 179 +++++++
 .../Apache.Ignite.AspNet.Tests.csproj           |  77 +++
 .../Apache.Ignite.AspNet.Tests.snk              | Bin 0 -> 596 bytes
 .../Apache.Ignite.AspNet.Tests/App.config       |  72 +++
 .../ExpiryCacheHolderTest.cs                    | 492 +++++++++++++++++
 .../IgniteOutputCacheProviderTest.cs            | 172 ++++++
 .../IgniteSessionStateItemCollectionTest.cs     | 267 ++++++++++
 .../IgniteSessionStateStoreDataTest.cs          | 117 ++++
 .../IgniteSessionStateStoreProviderTest.cs      | 425 +++++++++++++++
 .../Properties/AssemblyInfo.cs                  |  42 ++
 .../Apache.Ignite.AspNet.Tests/packages.config  |  22 +
 .../Apache.Ignite.AspNet.csproj                 |   6 +
 .../Apache.Ignite.AspNet.ruleset                |   3 +
 .../IgniteOutputCacheProvider.cs                | 120 +----
 .../IgniteSessionStateStoreProvider.cs          | 494 +++++++++++++++++
 .../Apache.Ignite.AspNet/Impl/ConfigUtil.cs     | 109 ++++
 .../Impl/ExpiryCacheHolder.cs                   | 113 ++++
 .../Impl/IgniteSessionStateItemCollection.cs    | 534 +++++++++++++++++++
 .../Impl/IgniteSessionStateStoreData.cs         | 116 ++++
 .../Impl/SessionStateLockResult.cs              |  91 ++++
 .../Properties/AssemblyInfo.cs                  |   3 +
 .../Apache.Ignite.Core.Tests.csproj             |   6 -
 .../AspNet/IgniteOutputCacheProviderTest.cs     | 172 ------
 .../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs  |  15 +
 .../Apache.Ignite.Core/Impl/Cache/CacheOp.cs    |   3 +-
 .../Impl/Cache/ICacheInternal.cs                |  14 +
 .../Impl/Unmanaged/UnmanagedCallbacks.cs        |   1 -
 .../Properties/AssemblyInfo.cs                  |   1 +
 modules/platforms/dotnet/Apache.Ignite.sln      |  14 +
 42 files changed, 4222 insertions(+), 326 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/0b7512a4/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformConfigurationEx.java
----------------------------------------------------------------------
diff --cc 
modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformConfigurationEx.java
index 96e4643,b7c8895..a58510d
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformConfigurationEx.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformConfigurationEx.java
@@@ -17,9 -17,10 +17,11 @@@
  
  package org.apache.ignite.internal.processors.platform;
  
 +import org.apache.ignite.internal.logger.platform.PlatformLogger;
+ import 
org.apache.ignite.internal.processors.platform.cache.PlatformCacheExtension;
  import 
org.apache.ignite.internal.processors.platform.callback.PlatformCallbackGateway;
  import 
org.apache.ignite.internal.processors.platform.memory.PlatformMemoryManagerImpl;
+ import org.jetbrains.annotations.Nullable;
  
  import java.util.Collection;
  
@@@ -48,7 -49,7 +50,12 @@@ public interface PlatformConfigurationE
      public Collection<String> warnings();
  
      /**
 +     * @return Platform logger.
 +     */
 +    public PlatformLogger logger();
++
++    /**
+      * @return Available cache extensions.
+      */
+     @Nullable public Collection<PlatformCacheExtension> cacheExtensions();
  }

http://git-wip-us.apache.org/repos/asf/ignite/blob/0b7512a4/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/0b7512a4/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java
----------------------------------------------------------------------
diff --cc 
modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java
index e367768,b364c4a..548145e
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java
@@@ -120,8 -126,8 +127,11 @@@ public class PlatformProcessorImpl exte
  
          platformCtx = new PlatformContextImpl(ctx, interopCfg.gate(), 
interopCfg.memory(), interopCfg.platform());
  
+         // Initialize cache extensions (if any).
+         cacheExts = prepareCacheExtensions(interopCfg.cacheExtensions());
++
 +        if (interopCfg.logger() != null)
 +            interopCfg.logger().setContext(platformCtx);
      }
  
      /** {@inheritDoc} */
@@@ -417,61 -423,16 +427,68 @@@
  
          IgniteCacheProxy cache = 
(IgniteCacheProxy)ctx.grid().getOrCreateNearCache(cacheName, cfg);
  
-         return new PlatformCache(platformCtx, cache.keepBinary(), false);
+         return createPlatformCache(cache);
+     }
+ 
+     /**
+      * Creates new platform cache.
+      */
+     private PlatformTarget createPlatformCache(IgniteCacheProxy cache) {
+         return new PlatformCache(platformCtx, cache, false, cacheExts);
      }
  
 +    /** {@inheritDoc} */
 +    @Override public boolean loggerIsLevelEnabled(int level) {
 +        IgniteLogger log = ctx.grid().log();
 +
 +        switch (level) {
 +            case PlatformLogger.LVL_TRACE:
 +                return log.isTraceEnabled();
 +            case PlatformLogger.LVL_DEBUG:
 +                return log.isDebugEnabled();
 +            case PlatformLogger.LVL_INFO:
 +                return log.isInfoEnabled();
 +            case PlatformLogger.LVL_WARN:
 +                return true;
 +            case PlatformLogger.LVL_ERROR:
 +                return true;
 +            default:
 +                assert false;
 +        }
 +
 +        return false;
 +    }
 +
 +    /** {@inheritDoc} */
 +    @Override public void loggerLog(int level, String message, String 
category, String errorInfo) {
 +        IgniteLogger log = ctx.grid().log();
 +
 +        if (category != null)
 +            log = log.getLogger(category);
 +
 +        Throwable err = errorInfo == null ? null : new 
IgniteException("Platform error:" + errorInfo);
 +
 +        switch (level) {
 +            case PlatformLogger.LVL_TRACE:
 +                log.trace(message);
 +                break;
 +            case PlatformLogger.LVL_DEBUG:
 +                log.debug(message);
 +                break;
 +            case PlatformLogger.LVL_INFO:
 +                log.info(message);
 +                break;
 +            case PlatformLogger.LVL_WARN:
 +                log.warning(message, err);
 +                break;
 +            case PlatformLogger.LVL_ERROR:
 +                log.error(message, err);
 +                break;
 +            default:
 +                assert false;
 +        }
 +    }
 +
      /**
       * Gets the near cache config.
       *

http://git-wip-us.apache.org/repos/asf/ignite/blob/0b7512a4/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cpp/PlatformCppConfigurationEx.java
----------------------------------------------------------------------
diff --cc 
modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cpp/PlatformCppConfigurationEx.java
index 75c48ef,931a18e..4f6bb2d
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cpp/PlatformCppConfigurationEx.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cpp/PlatformCppConfigurationEx.java
@@@ -17,8 -17,8 +17,9 @@@
  
  package org.apache.ignite.internal.processors.platform.cpp;
  
 +import org.apache.ignite.internal.logger.platform.PlatformLogger;
  import org.apache.ignite.internal.processors.platform.PlatformConfigurationEx;
+ import 
org.apache.ignite.internal.processors.platform.cache.PlatformCacheExtension;
  import 
org.apache.ignite.internal.processors.platform.callback.PlatformCallbackGateway;
  import 
org.apache.ignite.internal.processors.platform.memory.PlatformMemoryManagerImpl;
  import org.apache.ignite.internal.processors.platform.utils.PlatformUtils;
@@@ -75,10 -76,10 +77,15 @@@ public class PlatformCppConfigurationE
      }
  
      /** {@inheritDoc} */
 +    @Override public PlatformLogger logger() {
 +        return null;
 +    }
 +
++    /** {@inheritDoc} */
+     @Override @Nullable public Collection<PlatformCacheExtension> 
cacheExtensions() {
+         return null;
+     }
+ 
      /**
       * @param warnings Warnings.
       */

http://git-wip-us.apache.org/repos/asf/ignite/blob/0b7512a4/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationEx.java
----------------------------------------------------------------------
diff --cc 
modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationEx.java
index 906080e,78fb755..34e7ce2
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationEx.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationEx.java
@@@ -17,8 -17,8 +17,9 @@@
  
  package org.apache.ignite.internal.processors.platform.dotnet;
  
 +import org.apache.ignite.internal.logger.platform.PlatformLogger;
  import org.apache.ignite.internal.processors.platform.PlatformConfigurationEx;
+ import 
org.apache.ignite.internal.processors.platform.cache.PlatformCacheExtension;
  import 
org.apache.ignite.internal.processors.platform.callback.PlatformCallbackGateway;
  import 
org.apache.ignite.internal.processors.platform.memory.PlatformMemoryManagerImpl;
  import org.apache.ignite.internal.processors.platform.utils.PlatformUtils;
@@@ -79,10 -78,10 +83,15 @@@ public class PlatformDotNetConfiguratio
      }
  
      /** {@inheritDoc} */
 +    @Override public PlatformLogger logger() {
 +        return logger;
 +    }
 +
++    /** {@inheritDoc} */
+     @Nullable @Override public Collection<PlatformCacheExtension> 
cacheExtensions() {
+         return Collections.<PlatformCacheExtension>singleton(new 
PlatformDotNetSessionCacheExtension());
+     }
+ 
      /**
       * @param warnings Warnings.
       */

http://git-wip-us.apache.org/repos/asf/ignite/blob/0b7512a4/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
----------------------------------------------------------------------
diff --cc 
modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
index 1d7b245,b1e0dbe..aa74939
--- 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
@@@ -53,28 -49,11 +53,26 @@@
      <Reference Include="System.configuration" />
      <Reference Include="System.Core" />
      <Reference Include="System.Runtime.Serialization" />
-     <Reference Include="System.Web" />
      <Reference Include="System.ServiceProcess" />
      <Reference Include="System.XML" />
 +    <Reference Include="System.Xml.Linq" />
    </ItemGroup>
    <ItemGroup>
 +    <Compile Include="Binary\BinaryReaderWriterTest.cs" />
 +    <Compile Include="Binary\IO\BinaryStreamsTest.cs" />
 +    <Compile Include="Binary\JavaTypeMappingTest.cs" />
 +    <Compile Include="Binary\TypeResolverTest.cs" />
 +    <Compile Include="Cache\Affinity\AffinityKeyTest.cs" />
 +    <Compile Include="Cache\Affinity\AffinityTopologyVersionTest.cs" />
 +    <Compile Include="Cache\CacheResultTest.cs" />
 +    <Compile Include="Cache\Store\CacheStoreAdapterTest.cs" />
 +    <Compile Include="Collections\MultiValueDictionaryTest.cs" />
 +    <Compile Include="Collections\ReadOnlyCollectionTest.cs" />
 +    <Compile Include="Collections\ReadOnlyDictionaryTest.cs" />
 +    <Compile Include="Common\IgniteGuidTest.cs" />
 +    <Compile Include="Log\DefaultLoggerTest.cs" />
 +    <Compile Include="Log\NLogLoggerTest.cs" />
      <Compile Include="TestAppConfig.cs" />
-     <Compile Include="AspNet\IgniteOutputCacheProviderTest.cs" />
      <Compile Include="Binary\BinaryBuilderSelfTestFullFooter.cs" />
      <Compile Include="Binary\BinaryCompactFooterInteropTest.cs" />
      <Compile Include="Binary\BinarySelfTestFullFooter.cs" />

http://git-wip-us.apache.org/repos/asf/ignite/blob/0b7512a4/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedCallbacks.cs
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/0b7512a4/modules/platforms/dotnet/Apache.Ignite.sln
----------------------------------------------------------------------
diff --cc modules/platforms/dotnet/Apache.Ignite.sln
index b2dd535,8a3bf04..1f5163d
--- a/modules/platforms/dotnet/Apache.Ignite.sln
+++ b/modules/platforms/dotnet/Apache.Ignite.sln
@@@ -36,8 -36,8 +36,10 @@@ Project("{FAE04EC0-301F-11D3-BF4B-00C04
  EndProject
  Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apache.Ignite.AspNet", 
"Apache.Ignite.AspNet\Apache.Ignite.AspNet.csproj", 
"{13EA96FC-CC83-4164-A7C0-4F30ED797460}"
  EndProject
 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apache.Ignite.NLog", 
"Apache.Ignite.NLog\Apache.Ignite.NLog.csproj", 
"{C6B58E4A-A2E9-4554-AD02-68CE6DA5CFB7}"
 +EndProject
+ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = 
"Apache.Ignite.AspNet.Tests", 
"Apache.Ignite.AspNet.Tests\Apache.Ignite.AspNet.Tests.csproj", 
"{18EA4C71-A11D-4AB1-8042-418F7559D84F}"
+ EndProject
  Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Any CPU = Debug|Any CPU
@@@ -176,18 -176,18 +178,30 @@@
                {13EA96FC-CC83-4164-A7C0-4F30ED797460}.Release|x64.Build.0 = 
Release|Any CPU
                {13EA96FC-CC83-4164-A7C0-4F30ED797460}.Release|x86.ActiveCfg = 
Release|Any CPU
                {13EA96FC-CC83-4164-A7C0-4F30ED797460}.Release|x86.Build.0 = 
Release|Any CPU
+               {18EA4C71-A11D-4AB1-8042-418F7559D84F}.Debug|Any CPU.ActiveCfg 
= Debug|Any CPU
+               {18EA4C71-A11D-4AB1-8042-418F7559D84F}.Debug|Any CPU.Build.0 = 
Debug|Any CPU
+               {18EA4C71-A11D-4AB1-8042-418F7559D84F}.Debug|x64.ActiveCfg = 
Debug|Any CPU
+               {18EA4C71-A11D-4AB1-8042-418F7559D84F}.Debug|x64.Build.0 = 
Debug|Any CPU
+               {18EA4C71-A11D-4AB1-8042-418F7559D84F}.Debug|x86.ActiveCfg = 
Debug|Any CPU
+               {18EA4C71-A11D-4AB1-8042-418F7559D84F}.Debug|x86.Build.0 = 
Debug|Any CPU
+               {18EA4C71-A11D-4AB1-8042-418F7559D84F}.Release|Any 
CPU.ActiveCfg = Release|Any CPU
+               {18EA4C71-A11D-4AB1-8042-418F7559D84F}.Release|Any CPU.Build.0 
= Release|Any CPU
+               {18EA4C71-A11D-4AB1-8042-418F7559D84F}.Release|x64.ActiveCfg = 
Release|Any CPU
+               {18EA4C71-A11D-4AB1-8042-418F7559D84F}.Release|x64.Build.0 = 
Release|Any CPU
+               {18EA4C71-A11D-4AB1-8042-418F7559D84F}.Release|x86.ActiveCfg = 
Release|Any CPU
+               {18EA4C71-A11D-4AB1-8042-418F7559D84F}.Release|x86.Build.0 = 
Release|Any CPU
 +              {C6B58E4A-A2E9-4554-AD02-68CE6DA5CFB7}.Debug|Any CPU.ActiveCfg 
= Debug|Any CPU
 +              {C6B58E4A-A2E9-4554-AD02-68CE6DA5CFB7}.Debug|Any CPU.Build.0 = 
Debug|Any CPU
 +              {C6B58E4A-A2E9-4554-AD02-68CE6DA5CFB7}.Debug|x64.ActiveCfg = 
Debug|Any CPU
 +              {C6B58E4A-A2E9-4554-AD02-68CE6DA5CFB7}.Debug|x64.Build.0 = 
Debug|Any CPU
 +              {C6B58E4A-A2E9-4554-AD02-68CE6DA5CFB7}.Debug|x86.ActiveCfg = 
Debug|Any CPU
 +              {C6B58E4A-A2E9-4554-AD02-68CE6DA5CFB7}.Debug|x86.Build.0 = 
Debug|Any CPU
 +              {C6B58E4A-A2E9-4554-AD02-68CE6DA5CFB7}.Release|Any 
CPU.ActiveCfg = Release|Any CPU
 +              {C6B58E4A-A2E9-4554-AD02-68CE6DA5CFB7}.Release|Any CPU.Build.0 
= Release|Any CPU
 +              {C6B58E4A-A2E9-4554-AD02-68CE6DA5CFB7}.Release|x64.ActiveCfg = 
Release|Any CPU
 +              {C6B58E4A-A2E9-4554-AD02-68CE6DA5CFB7}.Release|x64.Build.0 = 
Release|Any CPU
 +              {C6B58E4A-A2E9-4554-AD02-68CE6DA5CFB7}.Release|x86.ActiveCfg = 
Release|Any CPU
 +              {C6B58E4A-A2E9-4554-AD02-68CE6DA5CFB7}.Release|x86.Build.0 = 
Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

Reply via email to