ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [52/53] [abbrv] incubator-ignite git commit: Merge branch 'sprint-1' into ignite-164
Date Wed, 04 Feb 2015 14:38:26 GMT
Merge branch 'sprint-1' into ignite-164

Conflicts:
	modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java


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

Branch: refs/heads/ignite-164
Commit: 39a2d02b6a355f0874af685c70d494af0e8a6e0d
Parents: 6563e8a 53d1b80
Author: Artem SHutak <ashutak@gridgain.com>
Authored: Wed Feb 4 17:36:01 2015 +0300
Committer: Artem SHutak <ashutak@gridgain.com>
Committed: Wed Feb 4 17:36:01 2015 +0300

----------------------------------------------------------------------
 .../apache/ignite/examples/ComputeExample.java  |  10 +-
 .../ignite/examples/MessagingExample.java       |  48 ++++-----
 .../client/ClientDefaultCacheSelfTest.java      |  70 ++++++++++++-
 .../apache/ignite/IgniteCheckedException.java   |  24 -----
 .../java/org/apache/ignite/IgniteException.java |  26 +----
 .../ignite/internal/util/IgniteUtils.java       |  22 ----
 .../apache/ignite/internal/util/typedef/X.java  |  36 -------
 .../IgniteExceptionHelpLinksSelfTest.java       | 105 -------------------
 .../ignite/testsuites/IgniteBasicTestSuite.java |   2 +-
 .../http/jetty/GridJettyRestHandler.java        |  17 +++
 10 files changed, 116 insertions(+), 244 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/39a2d02b/modules/clients/src/test/java/org/apache/ignite/client/ClientDefaultCacheSelfTest.java
----------------------------------------------------------------------
diff --cc modules/clients/src/test/java/org/apache/ignite/client/ClientDefaultCacheSelfTest.java
index 9de72d8,8452a99..affd878
--- a/modules/clients/src/test/java/org/apache/ignite/client/ClientDefaultCacheSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/client/ClientDefaultCacheSelfTest.java
@@@ -61,9 -74,9 +74,9 @@@ public class ClientDefaultCacheSelfTes
  
      /** {@inheritDoc} */
      @Override protected void afterTestsStopped() throws Exception {
 -        stopGrid();
 +        stopIgnite();
  
-         System.clearProperty (IGNITE_JETTY_PORT);
+         System.clearProperty(IGNITE_JETTY_PORT);
      }
  
      /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/39a2d02b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/39a2d02b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
index 0c34b3a,6399dad..6208574
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteBasicTestSuite.java
@@@ -55,23 -55,22 +55,23 @@@ public class IgniteBasicTestSuite exten
          if (U.isLinux() || U.isMacOs())
              suite.addTest(IgniteIpcSharedMemorySelfTestSuite.suite());
  
 -        suite.addTestSuite(GridTopologyBuildVersionSelfTest.class);
 -        suite.addTestSuite(GridReleaseTypeSelfTest.class);
 -        suite.addTestSuite(GridProductVersionSelfTest.class);
 -        suite.addTestSuite(GridAffinityProcessorConsistentHashSelfTest.class);
 -        suite.addTestSuite(GridAffinityProcessorRendezvousSelfTest.class);
 -        suite.addTestSuite(GridClosureProcessorSelfTest.class);
 -        suite.addTestSuite(GridStartStopSelfTest.class);
 -        suite.addTestSuite(GridProjectionForCachesSelfTest.class);
 -        suite.addTestSuite(GridSpiLocalHostInjectionTest.class);
 -        suite.addTestSuite(GridLifecycleBeanSelfTest.class);
 -        suite.addTestSuite(GridStopWithCancelSelfTest.class);
 -        suite.addTestSuite(GridReduceSelfTest.class);
 -        suite.addTestSuite(GridEventConsumeSelfTest.class);
 +        suite.addTestSuite(IgniteTopologyBuildVersionSelfTest.class);
 +        suite.addTestSuite(IgniteReleaseTypeSelfTest.class);
 +        suite.addTestSuite(IgniteProductVersionSelfTest.class);
 +        suite.addTestSuite(IgniteAffinityProcessorConsistentHashSelfTest.class);
 +        suite.addTestSuite(IgniteAffinityProcessorRendezvousSelfTest.class);
 +        suite.addTestSuite(IgniteClosureProcessorSelfTest.class);
 +        suite.addTestSuite(IgniteStartStopSelfTest.class);
 +        suite.addTestSuite(IgniteProjectionForCachesSelfTest.class);
 +        suite.addTestSuite(IgniteSpiLocalHostInjectionTest.class);
 +        suite.addTestSuite(IgniteLifecycleBeanSelfTest.class);
 +        suite.addTestSuite(IgniteStopWithCancelSelfTest.class);
 +        suite.addTestSuite(IgniteReduceSelfTest.class);
 +        suite.addTestSuite(IgniteEventConsumeSelfTest.class);
-         suite.addTestSuite(IgniteExceptionHelpLinksSelfTest.class);
++        suite.addTestSuite(IgniteExceptionHelpLinksSelfTest.class);//TODO should be deleted
after merge ?
          suite.addTestSuite(GridSuppressedExceptionSelfTest.class);
 -        suite.addTestSuite(GridLifecycleAwareSelfTest.class);
 -        suite.addTestSuite(GridMessageListenSelfTest.class);
 +        suite.addTestSuite(IgniteLifecycleAwareSelfTest.class);
 +        suite.addTestSuite(IgniteMessageListenSelfTest.class);
  
          // Streamer.
          suite.addTest(IgniteStreamerSelfTestSuite.suite());


Mime
View raw message