Using Stable version of Fabric Exam.

hekonsek · Apr 15, 2014 · bcc526a · bcc526a
1 parent 5d47e14
commit bcc526a
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 68 deletions.
diff --git a/fuse-pocs-fabric/fuse-pocs-fabric-itest/pom.xml b/fuse-pocs-fabric/fuse-pocs-fabric-itest/pom.xml
@@ -13,7 +13,8 @@
     <artifactId>fuse-pocs-fabric-itest</artifactId>
 
     <properties>
-        <fabric-version>1.0.0.redhat-346</fabric-version>
+        <fabric-version>1.0.0.redhat-379</fabric-version>
+        <activemq-version>5.9.0.redhat-610379</activemq-version>
     </properties>
 
     <dependencies>
@@ -42,33 +43,18 @@
         <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-client</artifactId>
-            <version>5.9.0.redhat-610346</version>
+            <version>${activemq-version}</version>
         </dependency>
-        <!--<dependency>-->
-        <!--<groupId>org.apache.activemq</groupId>-->
-        <!--<artifactId>activemq-karaf</artifactId>-->
-        <!--<version>5.9.0</version>-->
-        <!--</dependency>-->
         <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-osgi</artifactId>
-            <version>5.9.0.redhat-610346</version>
+            <version>${activemq-version}</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.amq</groupId>
             <artifactId>mq-fabric</artifactId>
-            <version>6.1.0.redhat-346</version>
+            <version>6.1.0.redhat-379</version>
         </dependency>
-        <!--<dependency>-->
-        <!--<groupId>org.apache.xbean</groupId>-->
-        <!--<artifactId>xbean-classloader</artifactId>-->
-        <!--<version>3.16</version>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-        <!--<groupId>org.apache.xbean</groupId>-->
-        <!--<artifactId>xbean-spring</artifactId>-->
-        <!--<version>3.16</version>-->
-        <!--</dependency>-->
 
         <dependency>
             <groupId>org.springframework</groupId>
@@ -93,54 +79,12 @@
             <version>2.4</version>
         </dependency>
 
-        <!-- Fabric Dependencies -->
-        <!--<dependency>-->
-        <!--<groupId>io.fabric8</groupId>-->
-        <!--<artifactId>fabric-api</artifactId>-->
-        <!--<version>${fabric-version}</version>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-        <!--<groupId>io.fabric8</groupId>-->
-        <!--<artifactId>fabric-core</artifactId>-->
-        <!--<version>${fabric-version}</version>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-        <!--<groupId>io.fabric8</groupId>-->
-        <!--<artifactId>fabric-maven-proxy</artifactId>-->
-        <!--<version>${fabric-version}</version>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-        <!--<groupId>io.fabric8</groupId>-->
-        <!--<artifactId>fabric-core-agent-ssh</artifactId>-->
-        <!--<version>${fabric-version}</version>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-        <!--<groupId>io.fabric8</groupId>-->
-        <!--<artifactId>fabric-git-hawtio</artifactId>-->
-        <!--<version>${fabric-version}</version>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-        <!--<groupId>io.fabric8</groupId>-->
-        <!--<artifactId>fabric-zookeeper</artifactId>-->
-        <!--<version>${fabric-version}</version>-->
-        <!--&lt;!&ndash; Excluding this as it can cause issues with multiple versions of commons-logging &ndash;&gt;-->
-        <!--<exclusions>-->
-        <!--<exclusion>-->
-        <!--<groupId>commons-logging</groupId>-->
-        <!--<artifactId>commons-logging</artifactId>-->
-        <!--</exclusion>-->
-        <!--<exclusion>-->
-        <!--<groupId>commons-logging</groupId>-->
-        <!--<artifactId>commons-logging-api</artifactId>-->
-        <!--</exclusion>-->
-        <!--</exclusions>-->
-        <!--</dependency>-->
     </dependencies>
 
     <repositories>
         <repository>
-            <id>jboss-fuse-ea</id>
-            <url>https://repository.jboss.org/nexus/content/groups/ea</url>
+            <id>jboss-fuse</id>
+            <url>https://repository.jboss.org/nexus/content/groups/fs-public</url>
         </repository>
     </repositories>
 

diff --git a/fuse-pocs-fabric/fuse-pocs-fabric-itest/src/test/java/camelpoc/AmqBrokerTest.java b/fuse-pocs-fabric/fuse-pocs-fabric-itest/src/test/java/camelpoc/AmqBrokerTest.java
@@ -17,6 +17,8 @@
 package camelpoc;
 
 import io.fabric8.api.Container;
+import io.fabric8.api.FabricService;
+import io.fabric8.api.ServiceProxy;
 import io.fabric8.itests.paxexam.support.FabricTestSupport;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.junit.After;
@@ -70,10 +72,12 @@ public void tearDown() throws InterruptedException {
     @Test
     public void shouldCreateAmqBroker() throws Exception {
         // Given
+        ServiceProxy<FabricService> fabricService = ServiceProxy.createServiceProxy(bundleContext, FabricService.class);
+
         String message = "message";
         String queue = "queue";
         System.err.println(executeCommand("fabric:create -n"));
-        containers = create().withName("router-container").withProfiles("mq-amq").
+        containers = create(fabricService).withName("router-container").withProfiles("mq-amq").
                 assertProvisioningResult().build();
         ConnectionFactory connectionFactory = new ActiveMQConnectionFactory("admin", "admin", "discovery:(fabric:default)");
         JmsTemplate jms = new JmsTemplate(connectionFactory);

diff --git a/fuse-pocs-fabric/fuse-pocs-fabric-itest/src/test/java/camelpoc/MasterTest.java b/fuse-pocs-fabric/fuse-pocs-fabric-itest/src/test/java/camelpoc/MasterTest.java
@@ -17,6 +17,8 @@
 package camelpoc;
 
 import io.fabric8.api.Container;
+import io.fabric8.api.FabricService;
+import io.fabric8.api.ServiceProxy;
 import io.fabric8.itests.paxexam.support.ContainerBuilder;
 import io.fabric8.itests.paxexam.support.FabricTestSupport;
 import org.apache.commons.io.IOUtils;
@@ -40,18 +42,20 @@ public class MasterTest extends FabricTestSupport {
 
     @Test
     public void shouldKeepSingletonNetty() throws Exception {
+        ServiceProxy<FabricService> fabricService = ServiceProxy.createServiceProxy(bundleContext, FabricService.class);
+
         System.err.println(executeCommand("fabric:create -n"));
         System.err.println(executeCommand("fabric:profile-create --parents feature-camel foo"));
         System.err.println(executeCommand("fabric:profile-edit --features camel-netty-http foo"));
         System.err.println(executeCommand("fabric:profile-edit --bundles mvn:fuse-pocs/fuse-pocs-fabric-bundle/1.0-SNAPSHOT foo"));
 
-        Container master = (Container) ContainerBuilder.create().withName("master").withProfiles("foo").assertProvisioningResult().build().iterator().next();
+        Container master = (Container) ContainerBuilder.create(fabricService).withName("master").withProfiles("foo").assertProvisioningResult().build().iterator().next();
 
         InputStream inputStream = new URL("http://localhost:18081/").openStream();
         String response = IOUtils.toString(inputStream);
         assertEquals("master", response);
 
-        Container slave = (Container) ContainerBuilder.create().withName("slave").withProfiles("foo").assertProvisioningResult().build().iterator().next();
+        Container slave = (Container) ContainerBuilder.create(fabricService).withName("slave").withProfiles("foo").assertProvisioningResult().build().iterator().next();
         master.destroy();
 
         inputStream = new URL("http://localhost:18081/").openStream();

diff --git a/fuse-pocs-fabric/fuse-pocs-fabric-itest/src/test/java/camelpoc/SimpleFabricTest.java b/fuse-pocs-fabric/fuse-pocs-fabric-itest/src/test/java/camelpoc/SimpleFabricTest.java
@@ -2,6 +2,8 @@
 
 import fuse.pocs.fabric.NettyHttpRoute;
 import io.fabric8.api.Container;
+import io.fabric8.api.FabricService;
+import io.fabric8.api.ServiceProxy;
 import io.fabric8.itests.paxexam.support.ContainerBuilder;
 import io.fabric8.itests.paxexam.support.FabricTestSupport;
 import org.apache.commons.io.IOUtils;
@@ -44,12 +46,14 @@ public void tearDown() throws InterruptedException {
 
     @Test
     public void shouldCreateCamelRouter() throws Exception {
+        ServiceProxy<FabricService> fabricService = ServiceProxy.createServiceProxy(bundleContext, FabricService.class);
+
         // Given
         err.println(executeCommand("fabric:create -n"));
         err.println(executeCommand("fabric:profile-create --parents feature-camel netty-http-server"));
         err.println(executeCommand("fabric:profile-edit --features camel-netty-http netty-http-server"));
         err.println(executeCommand("fabric:profile-edit --bundles mvn:fuse-pocs/fuse-pocs-fabric-bundle/1.0-SNAPSHOT netty-http-server"));
-        containers = ContainerBuilder.create().
+        containers = ContainerBuilder.create(fabricService).
                 withName("router-container").withProfiles("netty-http-server").
                 assertProvisioningResult().build();
         InputStream inputStream = new URL("http://localhost:18080/").openStream();

diff --git a/fuse-pocs-fabric/fuse-pocs-fabric-itest/src/test/java/camelpoc/SshTest.java b/fuse-pocs-fabric/fuse-pocs-fabric-itest/src/test/java/camelpoc/SshTest.java
@@ -17,6 +17,8 @@
 package camelpoc;
 
 import io.fabric8.api.Container;
+import io.fabric8.api.FabricService;
+import io.fabric8.api.ServiceProxy;
 import io.fabric8.itests.paxexam.support.ContainerBuilder;
 import io.fabric8.itests.paxexam.support.FabricTestSupport;
 import org.junit.After;
@@ -56,11 +58,12 @@ public void tearDown() throws InterruptedException {
     @Test
     public void shouldListBundleOnRemoteMachine() throws Exception {
         // Given
+        ServiceProxy<FabricService> fabricService = ServiceProxy.createServiceProxy(bundleContext, FabricService.class);
         System.err.println(executeCommand("fabric:create -n"));
         System.err.println(executeCommand("fabric:profile-create --parents feature-camel netty-http-server"));
         System.err.println(executeCommand("fabric:profile-edit --features camel-netty-http netty-http-server"));
         System.err.println(executeCommand("fabric:profile-edit --bundles mvn:fuse-pocs/fuse-pocs-fabric-bundle/1.0-SNAPSHOT netty-http-server"));
-        containers = create().withName("router-container").withProfiles("netty-http-server").
+        containers = create(fabricService).withName("router-container").withProfiles("netty-http-server").
                 assertProvisioningResult().build();
         Container container = containers.iterator().next();
         String[] containerSshUrl = container.getSshUrl().split(":");