ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vkuliche...@apache.org
Subject [34/50] [abbrv] incubator-ignite git commit: # Removed shmem from communication
Date Sun, 15 Mar 2015 05:05:56 GMT
# Removed shmem from communication


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

Branch: refs/heads/ignite-471
Commit: 3f23de3ddf79c2dc1b2a08202d5d9c42c86d9a1e
Parents: fba3155
Author: Valentin Kulichenko <vkulichenko@gridgain.com>
Authored: Fri Mar 13 16:50:51 2015 -0700
Committer: Valentin Kulichenko <vkulichenko@gridgain.com>
Committed: Fri Mar 13 16:50:51 2015 -0700

----------------------------------------------------------------------
 modules/core/pom.xml                            | 14 ++++++++++++++
 .../igfs/IgfsIpcEndpointConfiguration.java      | 20 ++++++++++----------
 ...cpCommunicationSpiMultithreadedSelfTest.java |  2 +-
 3 files changed, 25 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3f23de3d/modules/core/pom.xml
----------------------------------------------------------------------
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 42c892d..f78a6df 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -35,6 +35,13 @@
 
     <artifactId>ignite-core</artifactId>
 
+    <repositories>
+        <repository>
+            <id>Maven Central Staging</id>
+            <url>https://oss.sonatype.org/content/repositories/orggridgain-1246</url>
+        </repository>
+    </repositories>
+
     <dependencies>
         <dependency>
             <groupId>javax.cache</groupId>
@@ -126,6 +133,13 @@
             <classifier>jdk15</classifier>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.gridgain</groupId>
+            <artifactId>ignite-shmem</artifactId>
+            <version>RELEASE</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3f23de3d/modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointConfiguration.java
index 6aaf739..0b0e9cc 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsIpcEndpointConfiguration.java
@@ -26,8 +26,8 @@ import static org.apache.ignite.igfs.IgfsIpcEndpointType.*;
  * IGFS IPC endpoint configuration.
  */
 public class IgfsIpcEndpointConfiguration {
-    /** Default endpoint type; TCP for Windows, SHMEM otherwise. */
-    public static IgfsIpcEndpointType DFLT_TYP = U.isWindows() ? TCP : SHMEM;
+    /** Default endpoint type is TCP. */
+    public static IgfsIpcEndpointType DFLT_TYPE = TCP;
 
     /** Default host. */
     public static String DFLT_HOST = "127.0.0.1";
@@ -48,7 +48,7 @@ public class IgfsIpcEndpointConfiguration {
     public static final String DFLT_TOKEN_DIR_PATH = "ipc/shmem";
 
     /** Endpoint type. */
-    private IgfsIpcEndpointType typ = DFLT_TYP;
+    private IgfsIpcEndpointType type = DFLT_TYPE;
 
     /** Host. */
     private String host = DFLT_HOST;
@@ -75,7 +75,7 @@ public class IgfsIpcEndpointConfiguration {
      * @param cfg Configuration to copy.
      */
     public IgfsIpcEndpointConfiguration(IgfsIpcEndpointConfiguration cfg) {
-        typ = cfg.getType();
+        type = cfg.getType();
         host = cfg.getHost();
         port = cfg.getPort();
         memSize = cfg.getMemorySize();
@@ -88,12 +88,12 @@ public class IgfsIpcEndpointConfiguration {
      * <p>
      * Shared memory is recommended approach for Linux-based systems. For Windows TCP is
the only available option.
      * <p>
-     * Defaults to {@link #DFLT_TYP}.
+     * Defaults to {@link #DFLT_TYPE}.
      *
      * @return Endpoint type.
      */
     public IgfsIpcEndpointType getType() {
-        return typ;
+        return type;
     }
 
     /**
@@ -102,12 +102,12 @@ public class IgfsIpcEndpointConfiguration {
      * <p>
      * Shared memory is recommended approach for Linux-based systems. For Windows TCP is
the only available option.
      * <p>
-     * Defaults to {@link #DFLT_TYP}.
+     * Defaults to {@link #DFLT_TYPE}.
      *
-     * @param typ Endpoint type.
+     * @param type Endpoint type.
      */
-    public void setType(IgfsIpcEndpointType typ) {
-        this.typ = typ;
+    public void setType(IgfsIpcEndpointType type) {
+        this.type = type;
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3f23de3d/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java
index 03cd4d2..938b2bf 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridTcpCommunicationSpiMultithreadedSelfTest.java
@@ -80,7 +80,7 @@ public class GridTcpCommunicationSpiMultithreadedSelfTest extends GridSpiAbstrac
 
     /**
      */
-    protected GridTcpCommunicationSpiMultithreadedSelfTest() {
+    public GridTcpCommunicationSpiMultithreadedSelfTest() {
         super(false);
     }
 


Mime
View raw message