ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject incubator-ignite git commit: remove additional params from jetty configuration
Date Thu, 26 Mar 2015 14:46:04 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-tc-jclient 20ea17796 -> 1f47b02cc


remove additional params from jetty configuration


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

Branch: refs/heads/ignite-tc-jclient
Commit: 1f47b02cc206ffde47dac6362575ee231c91763c
Parents: 20ea177
Author: Artem Shutak <ashutak@gridgain.com>
Authored: Thu Mar 26 17:46:29 2015 +0300
Committer: Artem Shutak <ashutak@gridgain.com>
Committed: Thu Mar 26 17:46:29 2015 +0300

----------------------------------------------------------------------
 .../JettyRestProcessorUnsignedSelfTest.java     |  2 +-
 .../src/test/resources/jetty/rest-jetty.xml     | 64 ++++++++++----------
 2 files changed, 33 insertions(+), 33 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f47b02c/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorUnsignedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorUnsignedSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorUnsignedSelfTest.java
index 231872e..fd9bf7a 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorUnsignedSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorUnsignedSelfTest.java
@@ -65,7 +65,7 @@ public class JettyRestProcessorUnsignedSelfTest extends JettyRestProcessorAbstra
         assert cfg.getConnectorConfiguration() == null;
         ConnectorConfiguration clientCfg = new ConnectorConfiguration();
 
-//        clientCfg.setJettyPath("modules/clients/src/test/resources/jetty/rest-jetty.xml");
// From ClientDefaultCacheSelfTest
+        clientCfg.setJettyPath("modules/clients/src/test/resources/jetty/rest-jetty.xml");
// From ClientDefaultCacheSelfTest
         
         cfg.setConnectorConfiguration(clientCfg);
         TcpDiscoverySpi disco = new TcpDiscoverySpi();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f47b02c/modules/clients/src/test/resources/jetty/rest-jetty.xml
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/resources/jetty/rest-jetty.xml b/modules/clients/src/test/resources/jetty/rest-jetty.xml
index bbb68a4..1ad0af4 100644
--- a/modules/clients/src/test/resources/jetty/rest-jetty.xml
+++ b/modules/clients/src/test/resources/jetty/rest-jetty.xml
@@ -20,13 +20,13 @@
 <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
-    <Arg name="threadPool">
-        <!-- Default queued blocking thread pool -->
-        <New class="org.eclipse.jetty.util.thread.QueuedThreadPool">
-            <Set name="minThreads">20</Set>
-            <Set name="maxThreads">200</Set>
-        </New>
-    </Arg>
+    <!--<Arg name="threadPool">-->
+        <!--&lt;!&ndash; Default queued blocking thread pool &ndash;&gt;-->
+        <!--<New class="org.eclipse.jetty.util.thread.QueuedThreadPool">-->
+            <!--<Set name="minThreads">20</Set>-->
+            <!--<Set name="maxThreads">200</Set>-->
+        <!--</New>-->
+    <!--</Arg>-->
 
     <New id="httpCfg" class="org.eclipse.jetty.server.HttpConfiguration">
         <Set name="secureScheme">https</Set>
@@ -39,39 +39,39 @@
         <Arg>
             <New class="org.eclipse.jetty.server.ServerConnector">
                 <Arg name="server"><Ref refid="Server"/></Arg>
-                <Arg>
-                    <Array type="org.eclipse.jetty.server.ConnectionFactory">
-                        <Item>
-                            <New class="org.eclipse.jetty.server.HttpConnectionFactory">
-                                <Ref refid="httpCfg"/>
-                            </New>
-                        </Item>
-                    </Array>
-                </Arg>
+                <!--<Arg>-->
+                    <!--<Array type="org.eclipse.jetty.server.ConnectionFactory">-->
+                        <!--<Item>-->
+                            <!--<New class="org.eclipse.jetty.server.HttpConnectionFactory">-->
+                                <!--<Ref refid="httpCfg"/>-->
+                            <!--</New>-->
+                        <!--</Item>-->
+                    <!--</Array>-->
+                <!--</Arg>-->
                 <!--
                     Note that in order to override local host and port values,
                     system properties must have names IGNITE_JETTY_HOST and
                     IGNITE_JETTY_PORT accordingly.
                 -->
-                <Set name="host"><SystemProperty name="IGNITE_JETTY_HOST" default="localhost"/></Set>
-                <Set name="port"><SystemProperty name="IGNITE_JETTY_PORT" default="11080"/></Set>
-                <Set name="idleTimeout">30000</Set>
-                <Set name="reuseAddress">true</Set>
+                <!--<Set name="host"><SystemProperty name="IGNITE_JETTY_HOST"
default="localhost"/></Set>-->
+                <!--<Set name="port"><SystemProperty name="IGNITE_JETTY_PORT"
default="11080"/></Set>-->
+                <!--<Set name="idleTimeout">30000</Set>-->
+                <!--<Set name="reuseAddress">true</Set>-->
             </New>
         </Arg>
     </Call>
 
-    <Set name="handler">
-        <New id="Handlers" class="org.eclipse.jetty.server.handler.HandlerCollection">
-            <Set name="handlers">
-                <Array type="org.eclipse.jetty.server.Handler">
-                    <Item>
-                        <New id="Contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection"/>
-                    </Item>
-                </Array>
-            </Set>
-        </New>
-    </Set>
+    <!--<Set name="handler">-->
+        <!--<New id="Handlers" class="org.eclipse.jetty.server.handler.HandlerCollection">-->
+            <!--<Set name="handlers">-->
+                <!--<Array type="org.eclipse.jetty.server.Handler">-->
+                    <!--<Item>-->
+                        <!--<New id="Contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection"/>-->
+                    <!--</Item>-->
+                <!--</Array>-->
+            <!--</Set>-->
+        <!--</New>-->
+    <!--</Set>-->
 
-    <Set name="stopAtShutdown">false</Set>
+    <!--<Set name="stopAtShutdown">false</Set>-->
 </Configure>


Mime
View raw message