ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [47/49] incubator-ignite git commit: #ignite-164: JettyRestProcessorAbstractSelfTest
Date Fri, 06 Feb 2015 13:18:14 GMT
#ignite-164: JettyRestProcessorAbstractSelfTest


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

Branch: refs/heads/ignite-164v2stable
Commit: 7dcd1641b4bba71e61350545ffe1ddd563eda3b1
Parents: 33301b9
Author: ivasilinets <vasilinetc.ira@gmail.com>
Authored: Fri Feb 6 15:34:09 2015 +0300
Committer: ivasilinets <vasilinetc.ira@gmail.com>
Committed: Fri Feb 6 15:34:09 2015 +0300

----------------------------------------------------------------------
 .../processors/rest/JettyRestProcessorAbstractSelfTest.java  | 2 +-
 .../main/java/org/apache/ignite/internal/GridDiagnostic.java | 2 +-
 .../rest/protocols/http/jetty/GridJettyRestHandler.java      | 2 +-
 .../internal/processors/rest/protocols/http/jetty/rest.html  | 2 +-
 pom.xml                                                      | 8 ++++----
 5 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7dcd1641/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
index bf954b2..c5a6b00 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
@@ -65,7 +65,7 @@ abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestProcessorS
      * @throws Exception If failed.
      */
     private String content(Map<String, String> params) throws Exception {
-        String addr = "http://" + LOC_HOST + ":" + restPort() + "/gridgain?";
+        String addr = "http://" + LOC_HOST + ":" + restPort() + "/ignite?";
 
         for (Map.Entry<String, String> e : params.entrySet())
             addr += e.getKey() + '=' + e.getValue() + '&';

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7dcd1641/modules/core/src/main/java/org/apache/ignite/internal/GridDiagnostic.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridDiagnostic.java b/modules/core/src/main/java/org/apache/ignite/internal/GridDiagnostic.java
index e6b52a7..2ed3e14 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridDiagnostic.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridDiagnostic.java
@@ -111,7 +111,7 @@ final class GridDiagnostic {
                     if (!U.isSufficientlyTestedOs()) {
                         U.warn(log, "This operating system has been tested less rigorously:
" + U.osString() +
                             ". Our team will appreciate the feedback if you experience any
problems running " +
-                            "gridgain in this environment. You can always send your feedback
to support@gridgain.com",
+                            "ignite in this environment. You can always send your feedback
to support@gridgain.com",
                             "This OS is tested less rigorously: " + U.osString());
                     }
                 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7dcd1641/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 c046098..f6efd2b 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
@@ -175,7 +175,7 @@ public class GridJettyRestHandler extends AbstractHandler {
         if (log.isDebugEnabled())
             log.debug("Handling request [target=" + target + ", req=" + req + ", srvReq="
+ srvReq + ']');
 
-        if (target.startsWith("/gridgain")) {
+        if (target.startsWith("/ignite")) {
             processRequest(target, srvReq, res);
 
             req.setHandled(true);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7dcd1641/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/rest.html
----------------------------------------------------------------------
diff --git a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/rest.html
b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/rest.html
index 44568c0..0dff0bb 100644
--- a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/rest.html
+++ b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/rest.html
@@ -69,7 +69,7 @@
             <p>
             Note that PHP REST example is included with Ignite distribution.
             <p>
-            All REST HTTP commands have the following format: <code>http://1.2.3.4:8080/gridgain?cmd=CMD&amp;...</code>,
where
+            All REST HTTP commands have the following format: <code>http://1.2.3.4:8080/ignite?cmd=CMD&amp;...</code>,
where
             <code>'cmd'</code> is the name of the command followed by other command
parameters. Every command may have
             different parameters, some of which may be mandatory and some optional. The commands
parameters may be
             passed either via HTTP GET or POST, whichever one is preferred.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7dcd1641/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3980367..7a0fa17 100644
--- a/pom.xml
+++ b/pom.xml
@@ -946,7 +946,7 @@
                                     </groups>
                                     <header>
                                         <![CDATA[
-                                    GridGain - In-Memory Data Fabric
+                                    Apache Ignite - In-Memory Data Fabric
                                 ]]>
                                     </header>
                                     <bottom>
@@ -990,7 +990,7 @@
                                                 <tbody style="padding: 0; margin: 0">
                                                     <tr style="padding: 0; margin: 0">
                                                         <td>
-                                                            <b>GridGain Fabric</b>
+                                                            <b>Apache Ignite Fabric</b>
                                                         </td>
                                                         <td>:&nbsp;&nbsp;
                                                             ver. <strong>${ignite.version}</strong>
@@ -1067,7 +1067,7 @@
                                         <![CDATA[
                                     Java Client
                                     <br>
-                                    GridGain ver. <b>${ignite.version}</b>
+                                    Apache Ignite ver. <b>${ignite.version}</b>
                                 ]]>
                                     </header>
                                     <bottom>
@@ -1075,7 +1075,7 @@
                                     <table width="100%" border="0">
                                         <tr>
                                             <td>
-                                                <nobr>GridGain&#153; - Java Client,
ver. <strong>${ignite.version}</strong></nobr>
+                                                <nobr>Apache Ignite&#153; - Java
Client, ver. <strong>${ignite.version}</strong></nobr>
                                                 <br>
                                                 <a target=_blank href="https://incubator.apache.org/projects/ignite.html"><nobr>2015
Copyright &#169; Apache Software Foundation</nobr></a>
                                             </td>


Mime
View raw message