You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2015/10/23 11:52:31 UTC

[48/50] [abbrv] ignite git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-950-new

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-950-new


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

Branch: refs/heads/ignite-950-new
Commit: 7d9d156efe020879ba880d04cdbdab404a97fd25
Parents: 54e0b63 0bc1d6f
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Thu Oct 22 15:52:27 2015 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Thu Oct 22 15:52:27 2015 +0300

----------------------------------------------------------------------
 DEVNOTES.txt                                    |   3 +-
 assembly/dependencies-hadoop.xml                |   1 +
 assembly/release-fabric-lgpl.xml                |  63 ++++
 assembly/release-hadoop-lgpl.xml                |  39 ++
 examples-lgpl/README.txt                        |  27 ++
 examples-lgpl/config/example-cache.xml          |  73 ++++
 examples-lgpl/config/example-ignite.xml         |  83 +++++
 examples-lgpl/config/hibernate/README.txt       |   8 +
 .../hibernate/example-hibernate-L2-cache.xml    |  64 ++++
 examples-lgpl/pom-standalone.xml                | 186 ++++++++++
 examples-lgpl/pom.xml                           | 128 +++++++
 .../hibernate/HibernateL2CacheExample.java      | 245 +++++++++++++
 .../examples/datagrid/hibernate/Post.java       | 130 +++++++
 .../examples/datagrid/hibernate/User.java       | 154 ++++++++
 .../datagrid/hibernate/package-info.java        |  22 ++
 .../hibernate/CacheHibernatePersonStore.java    | 122 +++++++
 .../hibernate/CacheHibernateStoreExample.java   | 151 ++++++++
 .../datagrid/store/hibernate/Person.hbm.xml     |  34 ++
 .../datagrid/store/hibernate/hibernate.cfg.xml  |  41 +++
 .../datagrid/store/hibernate/package-info.java  |  22 ++
 .../misc/schedule/ComputeScheduleExample.java   |  82 +++++
 .../examples/misc/schedule/package-info.java    |  22 ++
 .../misc/schedule/ComputeScheduleExample.java   |  68 ++++
 .../java8/misc/schedule/package-info.java       |  22 ++
 .../ignite/examples/java8/package-info.java     |  23 ++
 .../scalar/examples/ScalarScheduleExample.scala |  66 ++++
 ...ibernateL2CacheExampleMultiNodeSelfTest.java |  31 ++
 .../HibernateL2CacheExampleSelfTest.java        |  33 ++
 .../IgniteLgplExamplesSelfTestSuite.java        |  48 +++
 ...ibernateL2CacheExampleMultiNodeSelfTest.java |  29 ++
 .../HibernateL2CacheExampleSelfTest.java        |  37 ++
 .../IgniteLgplExamplesJ8SelfTestSuite.java      |  46 +++
 .../ScalarLgplExamplesMultiNodeSelfTest.scala   |  33 ++
 .../examples/ScalarLgplExamplesSelfTest.scala   |  36 ++
 .../ScalarLgplExamplesSelfTestSuite.scala       |  37 ++
 examples/config/hibernate/README.txt            |   8 -
 .../hibernate/example-hibernate-L2-cache.xml    |  64 ----
 examples/pom-standalone.xml                     |  12 -
 examples/pom.xml                                |  12 -
 .../hibernate/HibernateL2CacheExample.java      | 245 -------------
 .../examples/datagrid/hibernate/Post.java       | 130 -------
 .../examples/datagrid/hibernate/User.java       | 154 --------
 .../datagrid/hibernate/package-info.java        |  22 --
 .../hibernate/CacheHibernatePersonStore.java    | 122 -------
 .../hibernate/CacheHibernateStoreExample.java   | 151 --------
 .../datagrid/store/hibernate/Person.hbm.xml     |  34 --
 .../datagrid/store/hibernate/hibernate.cfg.xml  |  41 ---
 .../datagrid/store/hibernate/package-info.java  |  22 --
 .../misc/schedule/ComputeScheduleExample.java   |  82 -----
 .../examples/misc/schedule/package-info.java    |  22 --
 .../misc/schedule/ComputeScheduleExample.java   |  68 ----
 .../java8/misc/schedule/package-info.java       |  22 --
 .../scalar/examples/ScalarScheduleExample.scala |  66 ----
 ...ibernateL2CacheExampleMultiNodeSelfTest.java |  31 --
 .../HibernateL2CacheExampleSelfTest.java        |  33 --
 .../testsuites/IgniteExamplesSelfTestSuite.java |   4 -
 ...ibernateL2CacheExampleMultiNodeSelfTest.java |  29 --
 .../HibernateL2CacheExampleSelfTest.java        |  37 --
 .../tests/examples/ScalarExamplesSelfTest.scala |   5 -
 modules/apache-license-gen/pom.xml              |   3 +
 .../JettyRestProcessorAbstractSelfTest.java     |   4 +-
 .../internal/portable/PortableContext.java      |  12 +-
 .../processors/cache/GridCacheAdapter.java      | 357 +++++++++++--------
 .../cache/GridCacheClearAllRunnable.java        |  18 +-
 .../cache/GridCacheConcurrentMap.java           |   4 +-
 .../processors/cache/GridCacheProxyImpl.java    |  14 +-
 .../processors/cache/IgniteCacheProxy.java      |   2 +-
 .../processors/cache/IgniteInternalCache.java   |  19 +-
 .../distributed/dht/GridDhtCacheAdapter.java    |   6 +-
 .../distributed/near/GridNearCacheAdapter.java  |  21 +-
 .../near/GridNearCacheClearAllRunnable.java     |   9 +-
 .../processors/igfs/IgfsMetaManager.java        |  10 +-
 .../ignite/internal/util/nio/GridNioServer.java |   2 +-
 .../ignite/spi/deployment/DeploymentSpi.java    |   8 +-
 modules/core/src/test/config/tests.properties   |   3 +
 .../cache/CacheAffinityCallSelfTest.java        |   4 +-
 .../cache/GridCacheClearSelfTest.java           | 308 ++++++++++++++++
 .../CacheAbstractRestartSelfTest.java           | 247 +++++++++++++
 ...NearDisabledAtomicInvokeRestartSelfTest.java | 179 ++++++++++
 ...abledTransactionalInvokeRestartSelfTest.java | 173 +++++++++
 ...edTransactionalWriteReadRestartSelfTest.java | 124 +++++++
 ...niteCacheClientNodeChangingTopologyTest.java |   4 +-
 .../dht/GridCacheDhtEntrySelfTest.java          |   2 +-
 .../dht/GridCacheTxNodeFailureSelfTest.java     |   2 +
 ...gniteAtomicLongChangingTopologySelfTest.java |   4 +-
 ...ledFairAffinityMultiNodeFullApiSelfTest.java |   8 +-
 ...icOffHeapTieredMultiNodeFullApiSelfTest.java |   7 +-
 .../replicated/GridReplicatedTxPreloadTest.java |   7 +-
 .../nio/IgniteExceptionInNioWorkerSelfTest.java | 105 ++++++
 .../ignite/testsuites/IgniteBasicTestSuite.java |   3 +
 .../IgniteCacheFullApiSelfTestSuite.java        |   8 +-
 .../IgniteCacheLoadConsistencyTestSuite.java    |  42 +++
 modules/extdata/uri/pom.xml                     |  11 +-
 .../hadoop/igfs/HadoopIgfsWrapper.java          |  54 +--
 .../HadoopIgfs20FileSystemAbstractSelfTest.java |  22 +-
 .../CacheHibernateBlobStoreSelfTest.java        |   6 +-
 .../cache/SqlFieldsQuerySelfTest.java           | 172 +++++++++
 .../IgniteCacheQuerySelfTestSuite.java          |   2 +
 .../main/cpp/common/project/vs/common.vcxproj   |   4 +-
 .../http/jetty/GridJettyRestHandler.java        |   2 +-
 .../spi/deployment/uri/UriDeploymentSpi.java    |  93 +++--
 .../scanners/http/UriDeploymentHttpScanner.java |  10 +-
 .../http/GridHttpDeploymentSelfTest.java        | 132 ++++++-
 pom.xml                                         |  79 +++-
 104 files changed, 4219 insertions(+), 1712 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/7d9d156e/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java
----------------------------------------------------------------------
diff --cc examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java
index baa23fc,57ff3ff..f68ce95
--- a/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java
+++ b/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java
@@@ -93,12 -88,7 +90,11 @@@ public class IgniteExamplesSelfTestSuit
          suite.addTest(new TestSuite(TaskExamplesMultiNodeSelfTest.class));
          suite.addTest(new TestSuite(MemcacheRestExamplesMultiNodeSelfTest.class));
          suite.addTest(new TestSuite(MonteCarloExamplesMultiNodeSelfTest.class));
-         suite.addTest(new TestSuite(HibernateL2CacheExampleMultiNodeSelfTest.class));
  
 +        // Portable.
 +        suite.addTest(new TestSuite(CacheClientPortableExampleTest.class));
 +        suite.addTest(new TestSuite(ComputeClientPortableExampleTest.class));
 +
          return suite;
      }
  }

http://git-wip-us.apache.org/repos/asf/ignite/blob/7d9d156e/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/7d9d156e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/7d9d156e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
----------------------------------------------------------------------