You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ra...@apache.org on 2015/10/28 13:38:13 UTC

[1/2] ignite git commit: Ignite JMS 1.1 Streamer tests: Remove dependency on KahaDB & persistence.

Repository: ignite
Updated Branches:
  refs/heads/ignite-1790 80bfe09b3 -> 5fa3420ca


Ignite JMS 1.1 Streamer tests: Remove dependency on KahaDB & persistence.


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

Branch: refs/heads/ignite-1790
Commit: 7f0b3fce5ae6ed0652f3dbf64f0482e63d36c38d
Parents: e769c3a
Author: Raul Kripalani <ra...@apache.org>
Authored: Wed Oct 28 12:37:38 2015 +0000
Committer: Raul Kripalani <ra...@apache.org>
Committed: Wed Oct 28 12:37:38 2015 +0000

----------------------------------------------------------------------
 modules/jms11/pom.xml                                       | 7 -------
 .../apache/ignite/stream/jms11/IgniteJmsStreamerTest.java   | 9 +++++++--
 2 files changed, 7 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/7f0b3fce/modules/jms11/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jms11/pom.xml b/modules/jms11/pom.xml
index 72a643b..3c37e7f 100644
--- a/modules/jms11/pom.xml
+++ b/modules/jms11/pom.xml
@@ -66,13 +66,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-kahadb-store</artifactId>
-            <version>${activemq.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.ignite</groupId>
             <artifactId>ignite-log4j</artifactId>
             <version>${project.version}</version>

http://git-wip-us.apache.org/repos/asf/ignite/blob/7f0b3fce/modules/jms11/src/test/java/org/apache/ignite/stream/jms11/IgniteJmsStreamerTest.java
----------------------------------------------------------------------
diff --git a/modules/jms11/src/test/java/org/apache/ignite/stream/jms11/IgniteJmsStreamerTest.java b/modules/jms11/src/test/java/org/apache/ignite/stream/jms11/IgniteJmsStreamerTest.java
index 0e110a5..238d939 100644
--- a/modules/jms11/src/test/java/org/apache/ignite/stream/jms11/IgniteJmsStreamerTest.java
+++ b/modules/jms11/src/test/java/org/apache/ignite/stream/jms11/IgniteJmsStreamerTest.java
@@ -83,14 +83,19 @@ public class IgniteJmsStreamerTest extends GridCommonAbstractTest {
         grid().<Integer, String>getOrCreateCache(defaultCacheConfiguration());
 
         broker = new BrokerService();
-        broker.deleteAllMessages();
+        broker.setDeleteAllMessagesOnStartup(true);
         broker.setPersistent(false);
+        broker.setPersistenceAdapter(null);
+        broker.setPersistenceFactory(null);
 
         PolicyMap policyMap = new PolicyMap();
         PolicyEntry policy = new PolicyEntry();
+
         policy.setQueuePrefetch(1);
+
         broker.setDestinationPolicy(policyMap);
         broker.getDestinationPolicy().setDefaultEntry(policy);
+        broker.setSchedulerSupport(false);
 
         broker.start(true);
 
@@ -102,8 +107,8 @@ public class IgniteJmsStreamerTest extends GridCommonAbstractTest {
     public void afterTest() throws Exception {
         grid().cache(null).clear();
 
-        broker.deleteAllMessages();
         broker.stop();
+        broker.deleteAllMessages();
     }
 
     public void testQueueFromName() throws Exception {


[2/2] ignite git commit: Merge branch 'master' into ignite-1790

Posted by ra...@apache.org.
Merge branch 'master' into ignite-1790


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

Branch: refs/heads/ignite-1790
Commit: 5fa3420ca582da0b4b452e0231d56d3860ea367d
Parents: 80bfe09 7f0b3fc
Author: Raul Kripalani <ra...@apache.org>
Authored: Wed Oct 28 12:38:02 2015 +0000
Committer: Raul Kripalani <ra...@apache.org>
Committed: Wed Oct 28 12:38:02 2015 +0000

----------------------------------------------------------------------
 modules/jms11/pom.xml                                       | 7 -------
 .../apache/ignite/stream/jms11/IgniteJmsStreamerTest.java   | 9 +++++++--
 2 files changed, 7 insertions(+), 9 deletions(-)
----------------------------------------------------------------------