You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2015/01/20 14:46:28 UTC

[1/2] karaf git commit: Upgrade to Pax CDI 0.10.0

Repository: karaf
Updated Branches:
  refs/heads/karaf-2.x a9e92757e -> 59e2a161a


Upgrade to Pax CDI 0.10.0


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/3f92e63d
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/3f92e63d
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/3f92e63d

Branch: refs/heads/karaf-2.x
Commit: 3f92e63d83da7496d5c3a32257151f073ce5efa6
Parents: a9e9275
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Tue Jan 20 14:27:16 2015 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Tue Jan 20 14:27:16 2015 +0100

----------------------------------------------------------------------
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/3f92e63d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 376f335..cf47db5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -198,7 +198,7 @@
         <osgi.version>5.0.0</osgi.version>
         <org.json.version>20140107</org.json.version>
         <pax.base.version>1.5.0</pax.base.version>
-        <pax.cdi.version>0.10.0-SNAPSHOT</pax.cdi.version>
+        <pax.cdi.version>0.10.0</pax.cdi.version>
         <pax.exam.version>4.3.0</pax.exam.version>
         <pax.logging.version>1.8.1</pax.logging.version>
         <pax.url.version>2.3.0</pax.url.version>


[2/2] karaf git commit: Improve JmsTest itest with using OSGi service lookup instead of sleep

Posted by jb...@apache.org.
Improve JmsTest itest with using OSGi service lookup instead of sleep


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/59e2a161
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/59e2a161
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/59e2a161

Branch: refs/heads/karaf-2.x
Commit: 59e2a161a36f8017be500aab11bc05dc2de07e4f
Parents: 3f92e63
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Tue Jan 20 14:46:05 2015 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Tue Jan 20 14:46:05 2015 +0100

----------------------------------------------------------------------
 itests/pom.xml                                            | 6 ++++++
 itests/src/test/java/org/apache/karaf/itests/JmsTest.java | 5 +++--
 2 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/59e2a161/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index cf9a792..c63d1f2 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -80,6 +80,12 @@
         </dependency>
 
         <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jms_1.1_spec</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
             <groupId>org.ops4j.pax.url</groupId>
             <artifactId>pax-url-aether</artifactId>
             <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/karaf/blob/59e2a161/itests/src/test/java/org/apache/karaf/itests/JmsTest.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/apache/karaf/itests/JmsTest.java b/itests/src/test/java/org/apache/karaf/itests/JmsTest.java
index 66ab608..b2b2a07 100644
--- a/itests/src/test/java/org/apache/karaf/itests/JmsTest.java
+++ b/itests/src/test/java/org/apache/karaf/itests/JmsTest.java
@@ -23,6 +23,7 @@ import org.ops4j.pax.exam.spi.reactors.PerClass;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertEquals;
 
+import javax.jms.ConnectionFactory;
 import javax.management.MBeanServerConnection;
 import javax.management.ObjectName;
 import javax.management.remote.JMXConnector;
@@ -45,7 +46,7 @@ public class JmsTest extends KarafTestSupport {
         // jms:create command
         System.out.println(executeCommand("jms:create -t ActiveMQ -u karaf -p karaf --url tcp://localhost:61616 test"));
         // give time to fileinstall to load the blueprint file
-        Thread.sleep(5000);
+        getOsgiService(ConnectionFactory.class, "name=test", 30000);
         // jms:connectionfactories command
         String connectionFactories = executeCommand("jms:connectionfactories");
         System.out.println(connectionFactories);
@@ -98,7 +99,7 @@ public class JmsTest extends KarafTestSupport {
             ObjectName name = new ObjectName("org.apache.karaf:type=jms,name=root");
             // create operation
             connection.invoke(name, "create", new String[]{ "testMBean", "activemq", "tcp://localhost:61616", "karaf", "karaf" }, new String[]{ "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String", "java.lang.String" });
-            Thread.sleep(5000);
+            getOsgiService(ConnectionFactory.class, "name=testMBean", 30000);
             List<String> connectionFactories = (List<String>) connection.getAttribute(name, "Connectionfactories");
             assertEquals(true, connectionFactories.size() >= 1);
             // send operation