Repository: incubator-ignite Updated Branches: refs/heads/sprint-2 11efb9187 -> 96714719d
#ignite-239: remove individual configuration copy from IgnitionEx.start0(GridStartContext startCtx). Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/522b23b4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/522b23b4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/522b23b4 Branch: refs/heads/sprint-2 Commit: 522b23b4a0776795251956a0e6ce4c21dd25ce13 Parents: 41f3243 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Mon Feb 16 12:35:16 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Mon Feb 16 12:35:16 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/internal/IgnitionEx.java | 50 +------------------- 1 file changed, 1 insertion(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/522b23b4/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java index 86ac31c..16dffc4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java @@ -1307,7 +1307,7 @@ public class IgnitionEx { if (cfg == null) cfg = new IgniteConfiguration(); - IgniteConfiguration myCfg = new IgniteConfiguration(); + IgniteConfiguration myCfg = new IgniteConfiguration(cfg); String ggHome = cfg.getIgniteHome(); @@ -1359,34 +1359,6 @@ public class IgnitionEx { myCfg.setIgniteHome(ggHome); - // Copy values that don't need extra processing. - myCfg.setPeerClassLoadingEnabled(cfg.isPeerClassLoadingEnabled()); - myCfg.setDeploymentMode(cfg.getDeploymentMode()); - myCfg.setNetworkTimeout(cfg.getNetworkTimeout()); - myCfg.setClockSyncSamples(cfg.getClockSyncSamples()); - myCfg.setClockSyncFrequency(cfg.getClockSyncFrequency()); - myCfg.setDiscoveryStartupDelay(cfg.getDiscoveryStartupDelay()); - myCfg.setMetricsHistorySize(cfg.getMetricsHistorySize()); - myCfg.setMetricsExpireTime(cfg.getMetricsExpireTime()); - myCfg.setMetricsUpdateFrequency(cfg.getMetricsUpdateFrequency()); - myCfg.setLifecycleBeans(cfg.getLifecycleBeans()); - myCfg.setLocalEventListeners(cfg.getLocalEventListeners()); - myCfg.setPeerClassLoadingMissedResourcesCacheSize(cfg.getPeerClassLoadingMissedResourcesCacheSize()); - myCfg.setIncludeEventTypes(cfg.getIncludeEventTypes()); - myCfg.setDaemon(cfg.isDaemon()); - myCfg.setIncludeProperties(cfg.getIncludeProperties()); - myCfg.setLifeCycleEmailNotification(cfg.isLifeCycleEmailNotification()); - myCfg.setMetricsLogFrequency(cfg.getMetricsLogFrequency()); - myCfg.setNetworkSendRetryDelay(cfg.getNetworkSendRetryDelay()); - myCfg.setNetworkSendRetryCount(cfg.getNetworkSendRetryCount()); - myCfg.setServiceConfiguration(cfg.getServiceConfiguration()); - myCfg.setWarmupClosure(cfg.getWarmupClosure()); - myCfg.setPluginConfigurations(cfg.getPluginConfigurations()); - myCfg.setTransactionConfiguration(new TransactionConfiguration(cfg.getTransactionConfiguration())); - myCfg.setQueryConfiguration(cfg.getQueryConfiguration()); - myCfg.setClassLoader(cfg.getClassLoader()); - myCfg.setAtomicConfiguration(cfg.getAtomicConfiguration()); - ConnectorConfiguration clientCfg = cfg.getConnectorConfiguration(); if (clientCfg != null) @@ -1649,23 +1621,9 @@ public class IgnitionEx { myCfg.setSwapSpaceSpi(swapspaceSpi); myCfg.setIndexingSpi(indexingSpi); - myCfg.setAddressResolver(cfg.getAddressResolver()); - - // Set SMTP configuration. - myCfg.setSmtpFromEmail(cfg.getSmtpFromEmail()); - myCfg.setSmtpHost(cfg.getSmtpHost()); - myCfg.setSmtpPort(cfg.getSmtpPort()); - myCfg.setSmtpSsl(cfg.isSmtpSsl()); - myCfg.setSmtpUsername(cfg.getSmtpUsername()); - myCfg.setSmtpPassword(cfg.getSmtpPassword()); - myCfg.setAdminEmails(cfg.getAdminEmails()); - // REST configuration. myCfg.setConnectorConfiguration(clientCfg); - // Hadoop configuration. - myCfg.setHadoopConfiguration(cfg.getHadoopConfiguration()); - // Validate segmentation configuration. GridSegmentationPolicy segPlc = cfg.getSegmentationPolicy(); @@ -1676,12 +1634,6 @@ public class IgnitionEx { "on start?) [segPlc=" + segPlc + ", wait=false]"); } - myCfg.setSegmentationResolvers(cfg.getSegmentationResolvers()); - myCfg.setSegmentationPolicy(segPlc); - myCfg.setSegmentCheckFrequency(cfg.getSegmentCheckFrequency()); - myCfg.setWaitForSegmentOnStart(cfg.isWaitForSegmentOnStart()); - myCfg.setAllSegmentationResolversPassRequired(cfg.isAllSegmentationResolversPassRequired()); - // Override SMTP configuration from system properties // and environment variables, if specified. String fromEmail = IgniteSystemProperties.getString(IGNITE_SMTP_FROM);
