ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [07/21] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-45' into ignite-556
Date Mon, 23 Mar 2015 15:06:52 GMT
Merge remote-tracking branch 'remotes/origin/ignite-45' into ignite-556


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

Branch: refs/heads/ignite-45
Commit: f2ae2e7a2a06527dc061b2827a7c2c1125a1da1d
Parents: e7c8809 e10fb96
Author: sboikov <sboikov@gridgain.com>
Authored: Mon Mar 23 14:40:23 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Mon Mar 23 14:40:23 2015 +0300

----------------------------------------------------------------------
 examples/schema-import/bin/h2-server.sh         |   2 +-
 .../datagrid/CacheContinuousQueryExample.java   |   2 +-
 .../hibernate/CacheHibernatePersonStore.java    |   6 +-
 .../store/jdbc/CacheJdbcPersonStore.java        |   2 +-
 .../java8/IgniteExamplesJ8SelfTestSuite.java    |  43 ------
 .../BasicExamplesMultiNodeSelfTest.java         |  28 ++++
 .../java8/examples/BasicExamplesSelfTest.java   |  83 +++++++++++
 .../CacheExamplesMultiNodeSelfTest.java         |  38 +++++
 .../java8/examples/CacheExamplesSelfTest.java   | 141 +++++++++++++++++++
 .../examples/CheckpointExamplesSelfTest.java    |  45 ++++++
 .../examples/ClusterGroupExampleSelfTest.java   |  39 +++++
 .../ContinuationExamplesMultiNodeSelfTest.java  |  28 ++++
 .../examples/ContinuationExamplesSelfTest.java  |  33 +++++
 ...ntinuousMapperExamplesMultiNodeSelfTest.java |  28 ++++
 .../ContinuousMapperExamplesSelfTest.java       |  33 +++++
 .../DeploymentExamplesMultiNodeSelfTest.java    |  30 ++++
 .../examples/DeploymentExamplesSelfTest.java    |  33 +++++
 .../EventsExamplesMultiNodeSelfTest.java        |  28 ++++
 .../java8/examples/EventsExamplesSelfTest.java  |  33 +++++
 ...ibernateL2CacheExampleMultiNodeSelfTest.java |  29 ++++
 .../HibernateL2CacheExampleSelfTest.java        |  33 +++++
 .../java8/examples/IgfsExamplesSelfTest.java    |  51 +++++++
 .../examples/LifecycleExamplesSelfTest.java     |  33 +++++
 .../MemcacheRestExamplesMultiNodeSelfTest.java  |  31 ++++
 .../examples/MemcacheRestExamplesSelfTest.java  |  41 ++++++
 .../examples/MessagingExamplesSelfTest.java     |  53 +++++++
 .../MonteCarloExamplesMultiNodeSelfTest.java    |  28 ++++
 .../examples/MonteCarloExamplesSelfTest.java    |  74 ++++++++++
 .../examples/SpringBeanExamplesSelfTest.java    |  33 +++++
 .../examples/TaskExamplesMultiNodeSelfTest.java |  28 ++++
 .../java8/examples/TaskExamplesSelfTest.java    |  40 ++++++
 .../IgniteExamplesJ8SelfTestSuite.java          |  73 ++++++++++
 .../src/main/java/org/apache/ignite/Ignite.java |   3 +-
 .../CacheEntryEventSerializableFilter.java      |  28 ++++
 .../cache/IgniteCacheEntryEventFilter.java      |  28 ----
 .../ignite/cache/query/ContinuousQuery.java     |   6 +-
 .../cache/store/CacheLoadOnlyStoreAdapter.java  |   2 +-
 .../apache/ignite/cache/store/CacheStore.java   |   2 +-
 .../ignite/cache/store/CacheStoreAdapter.java   |   2 +-
 .../ignite/cache/store/CacheStoreSession.java   |   2 +-
 .../store/jdbc/CacheAbstractJdbcStore.java      |   2 +-
 .../cache/store/jdbc/CacheJdbcBlobStore.java    |   2 +-
 .../ignite/events/CacheQueryExecutedEvent.java  |   7 +-
 .../ignite/events/CacheQueryReadEvent.java      |   6 +-
 .../cache/CacheStoreBalancingWrapper.java       |   4 +-
 .../cache/GridCacheLoaderWriterStore.java       |   2 +-
 .../processors/cache/GridCacheStoreManager.java |   2 +-
 .../cache/GridCacheWriteBehindStore.java        |   2 +-
 .../CacheDataStructuresManager.java             |   2 +-
 .../CacheContinuousQueryFilterEx.java           |   2 +-
 .../continuous/CacheContinuousQueryHandler.java |   6 +-
 .../continuous/CacheContinuousQueryManager.java |  12 +-
 .../transactions/TransactionProxyImpl.java      |  17 ---
 .../apache/ignite/transactions/Transaction.java |  29 ----
 .../store/GridCacheBalancingStoreSelfTest.java  |   2 +-
 .../cache/store/GridGeneratingTestStore.java    |   2 +-
 .../IgniteCacheExpiryStoreLoadSelfTest.java     |   2 +-
 .../GridCacheAbstractLocalStoreSelfTest.java    |   2 +-
 ...idCacheConfigurationConsistencySelfTest.java |   2 +-
 .../cache/GridCacheGenericTestStore.java        |   2 +-
 .../cache/GridCacheLifecycleAwareSelfTest.java  |   2 +-
 .../cache/GridCacheStorePutxSelfTest.java       |   2 +-
 .../processors/cache/GridCacheTestStore.java    |   2 +-
 .../IgniteCacheEntryListenerAbstractTest.java   |  12 +-
 .../IgniteTxStoreExceptionAbstractSelfTest.java |   2 +-
 .../IgniteCrossCacheTxStoreSelfTest.java        |   6 +-
 .../IgniteCacheStoreSessionAbstractTest.java    |  21 ++-
 ...acheStoreSessionWriteBehindAbstractTest.java |   2 +-
 .../IgniteCacheTxStoreSessionTest.java          |  14 +-
 ...ridCacheContinuousQueryAbstractSelfTest.java |   6 +-
 .../GridContinuousOperationsLoadTest.java       |   2 +-
 .../cache/GridAbstractCacheStoreSelfTest.java   |  34 ++---
 .../hibernate/CacheHibernateBlobStore.java      |   6 +-
 .../ignite/schema/ui/SchemaImportApp.java       |  13 +-
 74 files changed, 1309 insertions(+), 217 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2ae2e7a/modules/core/src/main/java/org/apache/ignite/Ignite.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/Ignite.java
index 84ae15f,d21f2f7..2e3ea0e
--- a/modules/core/src/main/java/org/apache/ignite/Ignite.java
+++ b/modules/core/src/main/java/org/apache/ignite/Ignite.java
@@@ -256,18 -225,10 +256,19 @@@ public interface Ignite extends AutoClo
       * @param nearCfg Near cache configuration for client.
       * @return {@code IgniteCache} instance.
       */
-     public <K, V> IgniteCache<K, V> getOrCreateCache(CacheConfiguration<K,
V> cacheCfg, NearCacheConfiguration<K, V> nearCfg);
+     public <K, V> IgniteCache<K, V> getOrCreateCache(CacheConfiguration<K,
V> cacheCfg,
+         NearCacheConfiguration<K, V> nearCfg);
  
      /**
 +     * Gets existing cache with the given cache configuration or creates one if it does
not exist.
 +     *
 +     * @param springCfgPath Spring XML configuration file for cache path or URL.
 +     * @param nearSpringCfgPath Spring XML configuration file for near cache path or URL.
 +     * @return {@code IgniteCache} instance.
 +     */
 +    public <K, V> IgniteCache<K, V> getOrCreateCache(String springCfgPath, String
nearSpringCfgPath);
 +
 +    /**
       * Starts a near cache on local node if cache was previously started with one of the
       * {@link #createCache(CacheConfiguration)} or {@link #createCache(CacheConfiguration,
NearCacheConfiguration)}
       * methods.


Mime
View raw message