You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2015/09/10 10:48:53 UTC
[5/5] ignite git commit: Restoring platforms API.
Restoring platforms API.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/87fd9ace
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/87fd9ace
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/87fd9ace
Branch: refs/heads/ignite-1282
Commit: 87fd9acefebe5cd3c54dde9e6a664ca13f81d333
Parents: e7cbbdb
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Thu Sep 10 11:49:15 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Thu Sep 10 11:49:15 2015 +0300
----------------------------------------------------------------------
.../configuration/IgniteConfiguration.java | 22 ++++++++++++++++++++
.../apache/ignite/internal/IgniteKernal.java | 10 ++++-----
.../platform/PlatformProcessorImpl.java | 2 +-
.../cpp/PlatformCppConfigurationClosure.java | 4 ++--
.../PlatformDotNetConfigurationClosure.java | 4 ++--
5 files changed, 31 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/87fd9ace/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index ecae356..3d38ed9 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@ -424,6 +424,9 @@ public class IgniteConfiguration {
/** SSL connection factory. */
private Factory<SSLContext> sslCtxFactory;
+ /** Platform configuration. */
+ private PlatformConfiguration platformCfg;
+
/**
* Creates valid grid configuration with all default values.
*/
@@ -498,6 +501,7 @@ public class IgniteConfiguration {
p2pLocClsPathExcl = cfg.getPeerClassLoadingLocalClassPathExclude();
p2pMissedCacheSize = cfg.getPeerClassLoadingMissedResourcesCacheSize();
p2pPoolSize = cfg.getPeerClassLoadingThreadPoolSize();
+ platformCfg = cfg.getPlatformConfiguration();
pluginCfgs = cfg.getPluginConfigurations();
pubPoolSize = cfg.getPublicThreadPoolSize();
segChkFreq = cfg.getSegmentCheckFrequency();
@@ -2379,6 +2383,24 @@ public class IgniteConfiguration {
return this;
}
+ /**
+ * Gets platform configuration.
+ *
+ * @return Platform configuration.
+ */
+ public PlatformConfiguration getPlatformConfiguration() {
+ return platformCfg;
+ }
+
+ /**
+ * Sets platform configuration.
+ *
+ * @param platformCfg Platform configuration.
+ */
+ public void setPlatformConfiguration(PlatformConfiguration platformCfg) {
+ this.platformCfg = platformCfg;
+ }
+
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(IgniteConfiguration.class, this);
http://git-wip-us.apache.org/repos/asf/ignite/blob/87fd9ace/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 9b615b1..ca3f84b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -1256,7 +1256,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
// Warn about loopback.
if (ips.isEmpty() && macs.isEmpty())
U.warn(log, "Ignite is starting on loopback address... Only nodes on the same physical " +
- "computer can participate in topology.",
+ "computer can participate in topology.",
"Ignite is starting on loopback address...");
// Stick in network context into attributes.
@@ -3085,11 +3085,9 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
String clsName;
// Handle special case for PlatformProcessor
- if (cls.equals(PlatformProcessor.class)) {
- clsName = PlatformNoopProcessor.class.getName();
-// clsName = ctx.config().getPlatformConfiguration() == null ?
-// PlatformNoopProcessor.class.getName() : cls.getName() + "Impl";
- }
+ if (cls.equals(PlatformProcessor.class))
+ clsName = ctx.config().getPlatformConfiguration() == null ?
+ PlatformNoopProcessor.class.getName() : cls.getName() + "Impl";
else
clsName = componentClassName(cls);
http://git-wip-us.apache.org/repos/asf/ignite/blob/87fd9ace/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java
index 31fceb5..40b1334 100644
--- a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java
+++ b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java
@@ -98,7 +98,7 @@ public class PlatformProcessorImpl extends GridProcessorAdapter implements Platf
log = ctx.log(PlatformProcessorImpl.class);
- PlatformConfiguration interopCfg0 = null; //ctx.config().getPlatformConfiguration();
+ PlatformConfiguration interopCfg0 = ctx.config().getPlatformConfiguration();
assert interopCfg0 != null : "Must be checked earlier during component creation.";
http://git-wip-us.apache.org/repos/asf/ignite/blob/87fd9ace/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cpp/PlatformCppConfigurationClosure.java
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cpp/PlatformCppConfigurationClosure.java b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cpp/PlatformCppConfigurationClosure.java
index de793a8..648726b 100644
--- a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cpp/PlatformCppConfigurationClosure.java
+++ b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cpp/PlatformCppConfigurationClosure.java
@@ -50,7 +50,7 @@ public class PlatformCppConfigurationClosure extends PlatformAbstractConfigurati
@SuppressWarnings("deprecation")
@Override protected void apply0(IgniteConfiguration igniteCfg) {
// 3. Validate and copy Interop configuration setting environment pointer along the way.
- PlatformConfiguration interopCfg = null;//igniteCfg.getPlatformConfiguration();
+ PlatformConfiguration interopCfg = igniteCfg.getPlatformConfiguration();
if (interopCfg != null && !(interopCfg instanceof PlatformCppConfiguration))
throw new IgniteException("Illegal interop configuration (must be of type " +
@@ -65,7 +65,7 @@ public class PlatformCppConfigurationClosure extends PlatformAbstractConfigurati
PlatformCppConfigurationEx cppCfg0 = new PlatformCppConfigurationEx(cppCfg, gate, memMgr);
- //igniteCfg.setPlatformConfiguration(cppCfg0);
+ igniteCfg.setPlatformConfiguration(cppCfg0);
// Check marshaller
Marshaller marsh = igniteCfg.getMarshaller();
http://git-wip-us.apache.org/repos/asf/ignite/blob/87fd9ace/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java
index aa1b75d..56351e6 100644
--- a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java
+++ b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetConfigurationClosure.java
@@ -73,7 +73,7 @@ public class PlatformDotNetConfigurationClosure extends PlatformAbstractConfigur
@SuppressWarnings("deprecation")
@Override protected void apply0(IgniteConfiguration igniteCfg) {
// 3. Validate and copy Interop configuration setting environment pointer along the way.
- PlatformConfiguration interopCfg = null; //igniteCfg.getPlatformConfiguration();
+ PlatformConfiguration interopCfg = igniteCfg.getPlatformConfiguration();
if (interopCfg != null && !(interopCfg instanceof PlatformDotNetConfiguration))
throw new IgniteException("Illegal platform configuration (must be of type " +
@@ -88,7 +88,7 @@ public class PlatformDotNetConfigurationClosure extends PlatformAbstractConfigur
PlatformDotNetConfigurationEx dotNetCfg0 = new PlatformDotNetConfigurationEx(dotNetCfg, gate, memMgr);
- //igniteCfg.setPlatformConfiguration(dotNetCfg0);
+ igniteCfg.setPlatformConfiguration(dotNetCfg0);
// Check marshaller
Marshaller marsh = igniteCfg.getMarshaller();