Merge branches 'ignite-368' and 'sprint-2' of 
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-368


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

Branch: refs/heads/ignite-368
Commit: b330068febe72ef63c88770679a6507b966577d4
Parents: ab6119e 42ee9ae
Author: AKuznetsov <akuznet...@gridgain.com>
Authored: Mon Mar 16 10:36:55 2015 +0700
Committer: AKuznetsov <akuznet...@gridgain.com>
Committed: Mon Mar 16 10:36:55 2015 +0700

----------------------------------------------------------------------
 assembly/dependencies-hadoop.xml                |    7 +-
 bin/ignite-schema-import.bat                    |   27 +-
 bin/ignite-schema-import.sh                     |    8 +-
 bin/include/igniteservice.exe                   |  Bin 6144 -> 0 bytes
 examples/config/store/example-database.script   |   22 +-
 .../config/store/example-jdbc-pojo-store.xml    |  142 --
 examples/pom.xml                                |    7 +
 .../store/CacheNodeWithStoreStartup.java        |   45 +-
 .../datagrid/store/CacheStoreExample.java       |   19 +
 .../store/jdbc/CacheJdbcPojoPersonStore.java    |   11 -
 .../examples/datagrid/store/model/Person.java   |    2 +-
 .../datagrid/store/model/PersonKey.java         |   97 -
 modules/core/pom.xml                            |    7 +
 .../META-INF/native/linux64/libigniteshmem.so   |  Bin 138345 -> 0 bytes
 .../META-INF/native/osx/libigniteshmem.dylib    |  Bin 33116 -> 0 bytes
 .../java/org/apache/ignite/IgniteCache.java     |   55 +-
 .../igfs/IgfsIpcEndpointConfiguration.java      |   20 +-
 .../apache/ignite/igfs/IgfsIpcEndpointType.java |    2 +-
 .../processors/cache/CacheProjection.java       |   60 +
 .../processors/cache/GridCacheAdapter.java      |  173 +-
 .../cache/GridCacheProjectionImpl.java          |   25 +
 .../processors/cache/GridCacheProxyImpl.java    |   60 +
 .../processors/cache/IgniteCacheProxy.java      |   61 +
 .../ignite/internal/util/IgniteUtils.java       |   27 +-
 .../util/nio/GridShmemCommunicationClient.java  |  146 --
 .../communication/tcp/TcpCommunicationSpi.java  |  392 +----
 .../tcp/TcpCommunicationSpiMBean.java           |    8 -
 .../core/src/test/bin/start-nodes-custom.bat    |    3 +-
 .../src/test/config/io-manager-benchmark.xml    |    1 -
 .../config/spring-cache-put-remove-load.xml     |    6 -
 .../core/src/test/config/store/jdbc/Ignite.xml  |    2 +-
 .../cache/store/jdbc/model/Organization.java    |    2 +-
 .../cache/store/jdbc/model/OrganizationKey.java |    2 +-
 .../ignite/cache/store/jdbc/model/Person.java   |    2 +-
 .../store/jdbc/model/PersonComplexKey.java      |    2 +-
 .../cache/store/jdbc/model/PersonKey.java       |    2 +-
 .../cache/GridCacheAbstractFullApiSelfTest.java |  195 ++
 .../IgniteCacheContainsKeyAbstractSelfTest.java |    2 -
 .../GridCacheAtomicTimeoutSelfTest.java         |    6 -
 .../IgniteCrossCacheTxStoreSelfTest.java        |    6 -
 .../igfs/IgfsExUniversalFileSystemAdapter.java  |   17 +
 .../igfs/UniversalFileSystemAdapter.java        |   17 +
 .../communication/GridIoManagerBenchmark0.java  |    1 -
 .../spi/GridTcpSpiForwardingSelfTest.java       |    1 -
 .../GridTcpCommunicationSpiAbstractTest.java    |   17 +-
 ...mmunicationSpiConcurrentConnectSelfTest.java |    1 -
 .../GridTcpCommunicationSpiConfigSelfTest.java  |    2 -
 ...cpCommunicationSpiMultithreadedSelfTest.java |   13 +-
 ...pCommunicationSpiMultithreadedShmemTest.java |   28 -
 ...ommunicationSpiMultithreadedTcpSelfTest.java |   28 -
 ...dTcpCommunicationSpiRecoveryAckSelfTest.java |    1 -
 ...GridTcpCommunicationSpiRecoverySelfTest.java |    1 -
 .../GridTcpCommunicationSpiShmemSelfTest.java   |   31 -
 .../tcp/GridTcpCommunicationSpiTcpSelfTest.java |    6 +-
 .../GridCacheStoreValueBytesNode.java           |    5 -
 .../IgniteSpiCommunicationSelfTestSuite.java    |    4 +-
 modules/hadoop/pom.xml                          |    6 +
 .../HadoopIgfs20FileSystemAbstractSelfTest.java |   11 -
 ...oopSecondaryFileSystemConfigurationTest.java |   12 -
 .../IgniteHadoopFileSystemAbstractSelfTest.java |   14 -
 ...IgniteHadoopFileSystemHandshakeSelfTest.java |    7 -
 .../IgniteHadoopFileSystemIpcCacheSelfTest.java |    7 -
 .../hadoop/HadoopAbstractSelfTest.java          |    6 -
 modules/schema-import/pom.xml                   |    6 -
 .../schema-import/src/main/java/media/style.css |   19 +-
 .../ignite/schema/generator/XmlGenerator.java   |   28 +-
 .../apache/ignite/schema/model/IndexItem.java   |   54 +
 .../ignite/schema/model/PojoDescriptor.java     |    9 +-
 .../org/apache/ignite/schema/ui/MessageBox.java |   16 +-
 .../ignite/schema/ui/SchemaImportApp.java       |   61 +-
 .../schema/test/AbstractSchemaImportTest.java   |   19 +-
 .../util/nodestart/IgniteNodeCallableImpl.java  |   42 +-
 .../commands/cache/VisorCacheCommand.scala      |    8 +-
 modules/winservice/IgniteService.sln            |   22 -
 .../winservice/IgniteService/IgniteService.cs   |  170 --
 .../IgniteService/IgniteService.csproj          |   90 -
 modules/winservice/README.md                    |   20 -
 modules/yardstick/config/ignite-base-config.xml |    6 -
 .../yardstick/config/ignite-store-config.xml    |    6 -
 pom.xml                                         |   88 +-
 .../basic-concepts/async-support.md             |   92 -
 .../basic-concepts/getting-started.md           |  235 ---
 .../basic-concepts/ignite-life-cycel.md         |  122 --
 .../documentation/basic-concepts/maven-setup.md |   85 -
 .../basic-concepts/what-is-ignite.md            |   48 -
 .../basic-concepts/zero-deployment.md           |   73 -
 wiki/documentation/clustering/aws-config.md     |   59 -
 wiki/documentation/clustering/cluster-config.md |  193 --
 wiki/documentation/clustering/cluster-groups.md |  227 ---
 wiki/documentation/clustering/cluster.md        |  145 --
 .../documentation/clustering/leader-election.md |   76 -
 wiki/documentation/clustering/network-config.md |  118 --
 wiki/documentation/clustering/node-local-map.md |   52 -
 .../documentation/compute-grid/checkpointing.md |  255 ---
 .../compute-grid/collocate-compute-and-data.md  |   46 -
 wiki/documentation/compute-grid/compute-grid.md |   73 -
 .../documentation/compute-grid/compute-tasks.md |  122 --
 .../compute-grid/distributed-closures.md        |  124 --
 .../compute-grid/executor-service.md            |   40 -
 .../compute-grid/fault-tolerance.md             |   96 -
 .../compute-grid/job-scheduling.md              |   86 -
 .../compute-grid/load-balancing.md              |   76 -
 .../data-grid/affinity-collocation.md           |   95 -
 .../data-grid/automatic-db-integration.md       |  119 --
 wiki/documentation/data-grid/cache-modes.md     |  254 ---
 wiki/documentation/data-grid/cache-queries.md   |  181 --
 wiki/documentation/data-grid/data-grid.md       |   85 -
 wiki/documentation/data-grid/data-loading.md    |   94 -
 wiki/documentation/data-grid/evictions.md       |  103 --
 .../data-grid/hibernate-l2-cache.md             |  190 --
 wiki/documentation/data-grid/jcache.md          |  116 --
 wiki/documentation/data-grid/off-heap-memory.md |  197 ---
 .../documentation/data-grid/persistent-store.md |  128 --
 wiki/documentation/data-grid/rebalancing.md     |  122 --
 wiki/documentation/data-grid/transactions.md    |  144 --
 .../data-grid/web-session-clustering.md         |  253 ---
 .../distributed-data-structures/atomic-types.md |  114 --
 .../countdownlatch.md                           |   41 -
 .../distributed-data-structures/id-generator.md |   57 -
 .../queue-and-set.md                            |  133 --
 .../distributed-events/automatic-batching.md    |   33 -
 wiki/documentation/distributed-events/events.md |  118 --
 .../distributed-file-system/igfs.md             |   18 -
 .../distributed-messaging/messaging.md          |   90 -
 wiki/documentation/http/configuration.md        |   67 -
 wiki/documentation/http/rest-api.md             | 1663 ------------------
 .../release-notes/release-notes.md              |   30 -
 .../service-grid/cluster-singletons.md          |  111 --
 .../service-grid/service-configuration.md       |   50 -
 .../service-grid/service-example.md             |  111 --
 wiki/documentation/service-grid/service-grid.md |   79 -
 wiki/licence-prepender.sh                       |   51 -
 132 files changed, 982 insertions(+), 8862 deletions(-)
----------------------------------------------------------------------


Reply via email to