ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [12/23] incubator-ignite git commit: #ignite-164: remove gridgain from hadoop and ignite-rest-http.
Date Mon, 09 Feb 2015 09:43:04 GMT
#ignite-164: remove gridgain from hadoop and ignite-rest-http.


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

Branch: refs/heads/sprint-1
Commit: 1ac099ae95a384d41e76dff77a1bcaa55cc7cd7a
Parents: 501f622
Author: ivasilinets <vasilinetc.ira@gmail.com>
Authored: Fri Feb 6 16:28:05 2015 +0300
Committer: ivasilinets <vasilinetc.ira@gmail.com>
Committed: Fri Feb 6 16:28:05 2015 +0300

----------------------------------------------------------------------
 .../ignite/client/hadoop/GridHadoopClientProtocol.java       | 4 ++--
 .../ignite/internal/processors/hadoop/GridHadoopSetup.java   | 2 +-
 .../ignite/internal/processors/hadoop/GridHadoopUtils.java   | 8 ++++----
 .../processors/hadoop/counter/GridHadoopFSCounterWriter.java | 2 +-
 .../processors/hadoop/GridHadoopPopularWordsTest.java        | 4 ++--
 .../ignite/internal/processors/hadoop/GridHadoopStartup.java | 2 +-
 .../rest/protocols/http/jetty/GridJettyRestHandler.java      | 4 ++--
 7 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ac099ae/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java
b/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java
index e0fe5e5..cf99155 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocol.java
@@ -46,13 +46,13 @@ import static org.apache.ignite.internal.processors.hadoop.GridHadoopUtils.*;
  */
 public class GridHadoopClientProtocol implements ClientProtocol {
     /** Ignite framework name property. */
-    public static final String FRAMEWORK_NAME = "gridgain";
+    public static final String FRAMEWORK_NAME = "ignite";
 
     /** Protocol version. */
     private static final long PROTO_VER = 1L;
 
     /** Default Ignite system directory. */
-    private static final String SYS_DIR = ".gridgain/system";
+    private static final String SYS_DIR = ".ignite/system";
 
     /** Configuration. */
     private final Configuration conf;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ac099ae/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopSetup.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopSetup.java
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopSetup.java
index 9fe660e..cc018f3 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopSetup.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopSetup.java
@@ -179,7 +179,7 @@ public class GridHadoopSetup {
         Collection<File> jarFiles = new ArrayList<>();
 
         addJarsInFolder(jarFiles, igniteLibs);
-        addJarsInFolder(jarFiles, new File(igniteLibs, "gridgain-hadoop"));
+        addJarsInFolder(jarFiles, new File(igniteLibs, "ignite-hadoop"));
 
         boolean jarsLinksCorrect = true;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ac099ae/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopUtils.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopUtils.java
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopUtils.java
index b6ff150..b94b561 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopUtils.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopUtils.java
@@ -37,16 +37,16 @@ import java.util.*;
  */
 public class GridHadoopUtils {
     /** Property to store timestamp of new job id request. */
-    public static final String REQ_NEW_JOBID_TS_PROPERTY = "gridgain.job.requestNewIdTs";
+    public static final String REQ_NEW_JOBID_TS_PROPERTY = "ignite.job.requestNewIdTs";
 
     /** Property to store timestamp of response of new job id request. */
-    public static final String RESPONSE_NEW_JOBID_TS_PROPERTY = "gridgain.job.responseNewIdTs";
+    public static final String RESPONSE_NEW_JOBID_TS_PROPERTY = "ignite.job.responseNewIdTs";
 
     /** Property to store timestamp of job submission. */
-    public static final String JOB_SUBMISSION_START_TS_PROPERTY = "gridgain.job.submissionStartTs";
+    public static final String JOB_SUBMISSION_START_TS_PROPERTY = "ignite.job.submissionStartTs";
 
     /** Property to set custom writer of job statistics. */
-    public static final String JOB_COUNTER_WRITER_PROPERTY = "gridgain.counters.writer";
+    public static final String JOB_COUNTER_WRITER_PROPERTY = "ignite.counters.writer";
 
     /** Staging constant. */
     private static final String STAGING_CONSTANT = ".staging";

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ac099ae/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/counter/GridHadoopFSCounterWriter.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/counter/GridHadoopFSCounterWriter.java
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/counter/GridHadoopFSCounterWriter.java
index 5e9f9af..55dcc4c 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/counter/GridHadoopFSCounterWriter.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/counter/GridHadoopFSCounterWriter.java
@@ -38,7 +38,7 @@ public class GridHadoopFSCounterWriter implements GridHadoopCounterWriter
{
     private static final String DEFAULT_USER_NAME = "anonymous";
 
     /** */
-    public static final String COUNTER_WRITER_DIR_PROPERTY = "gridgain.counters.fswriter.directory";
+    public static final String COUNTER_WRITER_DIR_PROPERTY = "ignite.counters.fswriter.directory";
 
     /** */
     private static final String USER_MACRO = "${USER}";

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ac099ae/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopPopularWordsTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopPopularWordsTest.java
b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopPopularWordsTest.java
index 33c8fc3..3e8a95a 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopPopularWordsTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopPopularWordsTest.java
@@ -50,11 +50,11 @@ public class GridHadoopPopularWordsTest {
 
     /** The path to the input directory. ALl files in that directory will be processed. */
     private static final Path BOOKS_LOCAL_DIR =
-        new Path("file:" + IGNITE_HOME, "modules/tests/java/org/gridgain/grid/hadoop/books");
+        new Path("file:" + IGNITE_HOME, "modules/tests/java/org/apache/ignite/grid/hadoop/books");
 
     /** The path to the output directory. THe result file will be written to this location.
*/
     private static final Path RESULT_LOCAL_DIR =
-        new Path("file:" + IGNITE_HOME, "modules/tests/java/org/gridgain/grid/hadoop/output");
+        new Path("file:" + IGNITE_HOME, "modules/tests/java/org/apache/ignite/grid/hadoop/output");
 
     /** Popular books source dir in DFS. */
     private static final Path BOOKS_DFS_DIR = new Path("tmp/word-count-example/in");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ac099ae/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopStartup.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopStartup.java
b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopStartup.java
index 7f3fc46..c7e1d7c 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopStartup.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopStartup.java
@@ -46,7 +46,7 @@ public class GridHadoopStartup {
 
         cfg.set("dfs.client.block.write.replace-datanode-on-failure.policy", "NEVER");
 
-        cfg.set("mapreduce.framework.name", "gridgain");
+        cfg.set("mapreduce.framework.name", "ignite");
         cfg.set("mapreduce.jobtracker.address", "localhost:11211");
 
         return cfg;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ac099ae/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java
----------------------------------------------------------------------
diff --git a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java
b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java
index f6efd2b..f02a3cb 100644
--- a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java
+++ b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java
@@ -444,9 +444,9 @@ public class GridJettyRestHandler extends AbstractHandler {
 
         restReq.command(cmd);
 
-        if (params.containsKey("gridgain.login") || params.containsKey("gridgain.password"))
{
+        if (params.containsKey("ignite.login") || params.containsKey("ignite.password"))
{
             GridSecurityCredentials cred = new GridSecurityCredentials(
-                (String)params.get("gridgain.login"), (String)params.get("gridgain.password"));
+                (String)params.get("ignite.login"), (String)params.get("ignite.password"));
 
             restReq.credentials(cred);
         }


Mime
View raw message