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: rest-jetty-simple.xml 2
Date Thu, 26 Mar 2015 15:05:33 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-tc-jclient d1ceb5b53 -> 895e49fff


rest-jetty-simple.xml 2


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

Branch: refs/heads/ignite-tc-jclient
Commit: 895e49fff0c8c18016532e9b2d2661b14df2ea84
Parents: d1ceb5b
Author: Artem Shutak <ashutak@gridgain.com>
Authored: Thu Mar 26 18:06:01 2015 +0300
Committer: Artem Shutak <ashutak@gridgain.com>
Committed: Thu Mar 26 18:06:01 2015 +0300

----------------------------------------------------------------------
 .../JettyRestProcessorUnsignedSelfTest.java     | 26 +-------------------
 1 file changed, 1 insertion(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/895e49ff/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 b004d01..7c33fbe 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
@@ -30,30 +30,6 @@ import java.net.*;
 public class JettyRestProcessorUnsignedSelfTest extends JettyRestProcessorAbstractSelfTest
{
     /** IP finder. */
     private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
-    
-    /** {@inheritDoc} */
-    protected IgniteConfiguration getConfiguration2(String gridName) throws Exception {
-        // GridAbstractTest
-        IgniteConfiguration cfg = getConfiguration(gridName, getTestResources());
-        cfg.setNodeId(null);
-        // ClientDefaultCacheSelfTest
-        cfg.setLocalHost(LOC_HOST);
-        assert cfg.getConnectorConfiguration() == null;
-        ConnectorConfiguration clientCfg = new ConnectorConfiguration();
-        
-        clientCfg.setJettyPath("modules/clients/src/test/resources/jetty/rest-jetty-simple.xml");
-        
-        cfg.setConnectorConfiguration(clientCfg);
-        TcpDiscoverySpi disco = new TcpDiscoverySpi();
-        disco.setIpFinder(IP_FINDER);
-        cfg.setDiscoverySpi(disco);
-        CacheConfiguration ccfg = defaultCacheConfiguration();
-        
-        // ----
-        
-        cfg.setCacheConfiguration(ccfg);
-        return cfg;
-    }
 
     /** {@inheritDoc} */
     @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception
{
@@ -65,7 +41,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-simple.xml");
// From ClientDefaultCacheSelfTest
         
         cfg.setConnectorConfiguration(clientCfg);
         TcpDiscoverySpi disco = new TcpDiscoverySpi();


Mime
View raw message