Merge branch 'sprint-3' into ignite-tests-todo
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/522939e6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/522939e6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/522939e6 Branch: refs/heads/ignite-tests-todo Commit: 522939e64dcdb62c55dad182c51805f31ddc6547 Parents: ba2390d 98c9ac1 Author: Artem Shutak <ashu...@gridgain.com> Authored: Thu Mar 26 15:20:57 2015 +0300 Committer: Artem Shutak <ashu...@gridgain.com> Committed: Thu Mar 26 15:20:57 2015 +0300 ---------------------------------------------------------------------- examples/pom-standalone.xml | 16 +- examples/pom.xml | 106 +- examples/schema-import/pom.xml | 11 +- .../examples/datagrid/CacheQueryExample.java | 12 +- .../datagrid/CacheTransactionExample.java | 6 +- modules/aop/pom.xml | 25 +- modules/aws/pom.xml | 43 +- modules/clients/pom.xml | 43 +- modules/codegen/pom.xml | 15 +- modules/core/pom.xml | 77 +- .../src/main/java/org/apache/ignite/Ignite.java | 84 +- .../java/org/apache/ignite/IgniteCache.java | 59 +- .../java/org/apache/ignite/IgniteCluster.java | 4 +- .../java/org/apache/ignite/IgniteCompute.java | 161 +-- .../java/org/apache/ignite/IgniteEvents.java | 60 +- .../java/org/apache/ignite/IgniteMessaging.java | 56 +- .../java/org/apache/ignite/IgniteServices.java | 40 +- .../org/apache/ignite/IgniteTransactions.java | 26 +- .../apache/ignite/cache/CacheInterceptor.java | 3 +- .../apache/ignite/cache/affinity/Affinity.java | 49 +- .../org/apache/ignite/cluster/ClusterGroup.java | 180 ++- .../org/apache/ignite/cluster/ClusterNode.java | 49 +- .../cluster/ClusterTopologyException.java | 2 +- .../configuration/CacheConfiguration.java | 3 - .../configuration/IgniteConfiguration.java | 32 +- .../ignite/internal/IgniteComponentType.java | 7 + .../discovery/GridDiscoveryManager.java | 3 +- .../processors/cache/GridCacheEntryEx.java | 1 + .../processors/cache/GridCacheMapEntry.java | 11 +- .../GridDistributedTxRemoteAdapter.java | 16 +- .../GridFutureRemapTimeoutObject.java | 73 ++ .../dht/GridPartitionedGetFuture.java | 26 +- .../dht/atomic/GridDhtAtomicCache.java | 3 + .../distributed/near/GridNearAtomicCache.java | 2 + .../distributed/near/GridNearCacheEntry.java | 22 +- .../distributed/near/GridNearGetFuture.java | 77 +- .../distributed/near/GridNearLockFuture.java | 4 +- .../near/GridNearTxPrepareFuture.java | 2 +- .../processors/query/GridQueryProcessor.java | 15 + .../service/GridServiceProcessor.java | 4 +- .../org/apache/ignite/lang/IgnitePredicate.java | 3 +- .../apache/ignite/transactions/Transaction.java | 8 +- .../processors/cache/GridCacheTestEntryEx.java | 1 + .../cache/IgniteDynamicCacheStartSelfTest.java | 33 + .../ignite/messaging/GridMessagingSelfTest.java | 13 +- modules/extdata/p2p/pom.xml | 23 +- modules/extdata/uri/pom.xml | 25 +- modules/geospatial/pom.xml | 43 +- modules/hadoop/pom.xml | 38 +- modules/hibernate/pom.xml | 32 +- modules/indexing/pom.xml | 43 +- modules/jcl/pom.xml | 16 +- modules/jta/pom.xml | 30 +- modules/log4j/pom.xml | 16 +- modules/rest-http/pom.xml | 14 +- modules/scalar/pom.xml | 51 +- modules/schedule/pom.xml | 16 +- modules/schema-import/pom.xml | 14 +- modules/slf4j/pom.xml | 14 +- modules/spring/pom.xml | 20 +- modules/ssh/pom.xml | 20 +- modules/tools/pom.xml | 11 +- .../ant/beautifier/GridJavadocAntTask.java | 2 +- modules/urideploy/pom.xml | 52 +- modules/visor-console/pom.xml | 24 +- modules/visor-plugins/pom.xml | 14 +- modules/web/pom.xml | 26 +- modules/yardstick/pom.xml | 22 +- parent/pom.xml | 711 +++++++++++ pom.xml | 1146 ++---------------- 70 files changed, 1917 insertions(+), 1992 deletions(-) ----------------------------------------------------------------------
