ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [05/31] incubator-ignite git commit: Merge branch 'sprint-1' into ignite-239
Date Mon, 02 Mar 2015 14:06:16 GMT
Merge branch 'sprint-1' into ignite-239

Conflicts:
	modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java


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

Branch: refs/heads/sprint-2
Commit: d9c86fcecdebe856fa6433080a494d715f3f8a4b
Parents: 9e058a1 a2b5123
Author: ivasilinets <ivasilinets@gridgain.com>
Authored: Mon Feb 16 17:12:52 2015 +0300
Committer: ivasilinets <ivasilinets@gridgain.com>
Committed: Mon Feb 16 17:12:52 2015 +0300

----------------------------------------------------------------------
 .../examples/datagrid/CacheQueryExample.java    |   25 +-
 .../starschema/CacheStarSchemaExample.java      |   11 +-
 .../datastructures/IgniteQueueExample.java      |    2 +-
 .../examples/ScalarCacheAffinityExample1.scala  |    6 +-
 .../examples/ScalarCacheAffinityExample2.scala  |    4 +-
 .../ScalarCacheAffinitySimpleExample.scala      |   10 +-
 .../scalar/examples/ScalarCacheExample.scala    |   49 +-
 .../ScalarCachePopularNumbersExample.scala      |   13 +-
 .../examples/ScalarCacheQueryExample.scala      |   48 +-
 .../examples/ScalarSnowflakeSchemaExample.scala |   37 +-
 .../src/main/java/org/apache/ignite/Ignite.java |   27 -
 .../apache/ignite/IgniteSystemProperties.java   |  120 --
 .../configuration/IgniteConfiguration.java      |  353 ---
 .../ignite/internal/GridKernalContext.java      |    8 -
 .../ignite/internal/GridKernalContextImpl.java  |   12 -
 .../ignite/internal/IgniteComponentType.java    |    7 -
 .../org/apache/ignite/internal/IgniteEx.java    |   12 -
 .../apache/ignite/internal/IgniteKernal.java    |  217 +-
 .../org/apache/ignite/internal/IgnitionEx.java  |   39 -
 .../continuous/CacheContinuousQueryManager.java |   49 +-
 .../processors/email/GridEmailHolder.java       |  111 -
 .../email/IgniteEmailProcessorAdapter.java      |   84 -
 .../email/IgniteNoopEmailProcessor.java         |   55 -
 .../internal/processors/email/package.html      |   24 -
 .../visor/node/VisorEmailConfiguration.java     |  177 --
 .../visor/node/VisorGridConfiguration.java      |   18 -
 .../visor/node/VisorLifecycleConfiguration.java |   19 -
 .../ignite/startup/BasicWarmupClosure.java      |    6 +-
 .../GridCacheFieldsQueryNoDataSelfTest.java     |    4 +-
 .../cache/GridCacheOffHeapSelfTest.java         |    4 +-
 .../cache/GridCacheSwapPreloadSelfTest.java     |    3 +-
 .../IgniteClientAffinityAssignmentSelfTest.java |    5 +-
 .../cache/IgnitePutAllLargeBatchSelfTest.java   |    8 +-
 ...tAllUpdateNonPreloadedPartitionSelfTest.java |    4 +-
 .../cache/IgniteTxMultiNodeAbstractTest.java    |    3 +-
 ...dCacheMultithreadedFailoverAbstractTest.java |    3 +-
 .../GridCacheNodeFailureAbstractTest.java       |    3 +-
 ...chePartitionedReloadAllAbstractSelfTest.java |    8 +-
 ...ridCacheContinuousQueryAbstractSelfTest.java |    4 +-
 ...dCacheAbstractReduceFieldsQuerySelfTest.java |    4 +-
 .../GridDataLoaderProcessorSelfTest.java        |    2 +-
 .../processors/igfs/IgfsCacheSelfTest.java      |    5 +-
 .../ignite/testframework/junits/IgniteMock.java |   10 -
 modules/email/licenses/apache-2.0.txt           |  202 --
 modules/email/pom.xml                           |   51 -
 modules/email/readme.txt                        |   34 -
 .../processors/email/IgniteEmailProcessor.java  |  296 ---
 ...idHadoopDefaultMapReducePlannerSelfTest.java |   10 -
 ...idHibernateL2CacheConfigurationSelfTest.java |    3 +-
 .../hibernate/GridHibernateL2CacheSelfTest.java |    3 +-
 .../GridCacheAbstractFieldsQuerySelfTest.java   |    3 +-
 .../cache/GridCacheAbstractQuerySelfTest.java   |    5 +-
 .../cache/GridCacheCrossCacheQuerySelfTest.java |   12 +-
 .../GridCacheCrossCacheQuerySelfTestNewApi.java |    7 +-
 .../processors/cache/GridCacheSwapSelfTest.java |    4 +-
 .../near/GridCachePartitionedQuerySelfTest.java |    2 +-
 .../GridCacheReplicatedQuerySelfTest.java       |    6 +-
 .../ignite/scalar/ScalarConversions.scala       |   47 +-
 .../ignite/scalar/pimps/ScalarCachePimp.scala   |  662 +++++-
 .../pimps/ScalarCacheProjectionPimp.scala       | 2004 ------------------
 .../scala/org/apache/ignite/scalar/scalar.scala |   25 +-
 .../tests/ScalarAffinityRoutingSpec.scala       |   12 +-
 .../scalar/tests/ScalarCacheQueriesSpec.scala   |  466 +---
 .../ignite/scalar/tests/ScalarCacheSpec.scala   |   10 +-
 .../org/apache/ignite/IgniteSpringBean.java     |   20 +-
 .../ignite/cache/spring/SpringCacheManager.java |    2 +-
 .../commands/alert/VisorAlertCommand.scala      |   83 +-
 .../config/VisorConfigurationCommand.scala      |   15 -
 .../commands/alert/VisorAlertCommandSpec.scala  |    1 -
 .../config/VisorConfigurationCommandSpec.scala  |    1 -
 .../disco/VisorDiscoveryCommandSpec.scala       |    1 -
 .../events/VisorEventsCommandSpec.scala         |    1 -
 .../visor/commands/gc/VisorGcCommandSpec.scala  |    1 -
 .../commands/tasks/VisorTasksCommandSpec.scala  |    2 -
 pom.xml                                         |    1 -
 75 files changed, 906 insertions(+), 4699 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d9c86fce/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index 13a59c2,72ab928..2ea4040
--- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@@ -490,15 -449,7 +449,8 @@@ public class IgniteConfiguration 
          segResolvers = cfg.getSegmentationResolvers();
          sndRetryCnt = cfg.getNetworkSendRetryCount();
          sndRetryDelay = cfg.getNetworkSendRetryDelay();
-         smtpHost = cfg.getSmtpHost();
-         smtpPort = cfg.getSmtpPort();
-         smtpUsername = cfg.getSmtpUsername();
-         smtpPwd = cfg.getSmtpPassword();
-         smtpFromEmail = cfg.getSmtpFromEmail();
-         smtpSsl = cfg.isSmtpSsl();
-         smtpStartTls = cfg.isSmtpStartTls();
          streamerCfg = cfg.getStreamerConfiguration();
 +        svcCfgs = cfg.getServiceConfiguration();
          sysPoolSize = cfg.getSystemThreadPoolSize();
          timeSrvPortBase = cfg.getTimeServerPortBase();
          timeSrvPortRange = cfg.getTimeServerPortRange();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d9c86fce/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index 64ed4cf,2f365fb..064ed23
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@@ -1636,40 -1661,12 +1631,6 @@@ public class IgnitionEx 
                      "on start?) [segPlc=" + segPlc + ", wait=false]");
              }
  
-             // Override SMTP configuration from system properties
-             // and environment variables, if specified.
-             String fromEmail = IgniteSystemProperties.getString(IGNITE_SMTP_FROM);
- 
-             if (fromEmail != null)
-                 myCfg.setSmtpFromEmail(fromEmail);
- 
-             String smtpHost = IgniteSystemProperties.getString(IGNITE_SMTP_HOST);
- 
-             if (smtpHost != null)
-                 myCfg.setSmtpHost(smtpHost);
- 
-             String smtpUsername = IgniteSystemProperties.getString(IGNITE_SMTP_USERNAME);
- 
-             if (smtpUsername != null)
-                 myCfg.setSmtpUsername(smtpUsername);
- 
-             String smtpPwd = IgniteSystemProperties.getString(IGNITE_SMTP_PWD);
- 
-             if (smtpPwd != null)
-                 myCfg.setSmtpPassword(smtpPwd);
- 
-             int smtpPort = IgniteSystemProperties.getInteger(IGNITE_SMTP_PORT, -1);
- 
-             if(smtpPort != -1)
-                 myCfg.setSmtpPort(smtpPort);
- 
-             myCfg.setSmtpSsl(IgniteSystemProperties.getBoolean(IGNITE_SMTP_SSL));
- 
-             String adminEmails = IgniteSystemProperties.getString(IGNITE_ADMIN_EMAILS);
- 
-             if (adminEmails != null)
-                 myCfg.setAdminEmails(adminEmails.split(","));
 -            myCfg.setSegmentationResolvers(cfg.getSegmentationResolvers());
 -            myCfg.setSegmentationPolicy(segPlc);
 -            myCfg.setSegmentCheckFrequency(cfg.getSegmentCheckFrequency());
 -            myCfg.setWaitForSegmentOnStart(cfg.isWaitForSegmentOnStart());
 -            myCfg.setAllSegmentationResolversPassRequired(cfg.isAllSegmentationResolversPassRequired());
--
              CacheConfiguration[] cacheCfgs = cfg.getCacheConfiguration();
  
              final boolean hasHadoop = IgniteComponentType.HADOOP.inClassPath();


Mime
View raw message