stratos-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From im...@apache.org
Subject [01/12] stratos git commit: Migrating Kubernetes API client to Fabric8
Date Mon, 15 Jun 2015 12:43:06 GMT
Repository: stratos
Updated Branches:
  refs/heads/master 7db006b56 -> 3414e7cee


http://git-wip-us.apache.org/repos/asf/stratos/blob/3414e7ce/dependencies/fabric8/kubernetes-model/src/test/java/io/fabric8/kubernetes/api/model/InlineTest.java
----------------------------------------------------------------------
diff --git a/dependencies/fabric8/kubernetes-model/src/test/java/io/fabric8/kubernetes/api/model/InlineTest.java
b/dependencies/fabric8/kubernetes-model/src/test/java/io/fabric8/kubernetes/api/model/InlineTest.java
new file mode 100644
index 0000000..72e6617
--- /dev/null
+++ b/dependencies/fabric8/kubernetes-model/src/test/java/io/fabric8/kubernetes/api/model/InlineTest.java
@@ -0,0 +1,18 @@
+package io.fabric8.kubernetes.api.model;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class InlineTest {
+
+    @Test
+    public void testIntOrString() throws JsonProcessingException {
+        ServicePort port = new ServicePortBuilder().withNewTargetPort(2181).build();
+        assertEquals(2181, port.getTargetPort().getIntVal().intValue());
+
+        port = new ServicePortBuilder().withNewTargetPort("2181").build();
+        assertEquals("2181", port.getTargetPort().getStrVal());
+    }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/3414e7ce/dependencies/fabric8/kubernetes-model/src/test/java/io/fabric8/kubernetes/api/model/KubernetesListTest.java
----------------------------------------------------------------------
diff --git a/dependencies/fabric8/kubernetes-model/src/test/java/io/fabric8/kubernetes/api/model/KubernetesListTest.java
b/dependencies/fabric8/kubernetes-model/src/test/java/io/fabric8/kubernetes/api/model/KubernetesListTest.java
new file mode 100644
index 0000000..e7b994d
--- /dev/null
+++ b/dependencies/fabric8/kubernetes-model/src/test/java/io/fabric8/kubernetes/api/model/KubernetesListTest.java
@@ -0,0 +1,85 @@
+package io.fabric8.kubernetes.api.model;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import org.hamcrest.CoreMatchers;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class KubernetesListTest {
+
+    @Test
+    public void testDefaultValues() throws JsonProcessingException {
+        Service service = new ServiceBuilder()
+                .withNewMetadata()
+                    .withName("test-service")
+                .endMetadata()
+                .build();
+        assertNotNull(service.getApiVersion());
+        assertEquals(service.getKind(), "Service");
+        
+        ReplicationController replicationController = new ReplicationControllerBuilder()
+                .withNewMetadata()
+                .withName("test-controller")
+                .endMetadata()
+                .build();
+        assertNotNull(replicationController.getApiVersion());
+        assertEquals(replicationController.getKind(), "ReplicationController");
+        
+        KubernetesList kubernetesList = new KubernetesListBuilder()
+                .addNewServiceItem()
+                .withNewMetadata()
+                    .withName("test-service")
+                .endMetadata()
+                .and()
+                .addNewReplicationControllerItem()
+                .withNewMetadata()
+                    .withName("test-controller")
+                .endMetadata()
+                .and()
+                .build();
+        
+        assertNotNull(kubernetesList.getApiVersion());
+        assertEquals(kubernetesList.getKind(), "List");
+        assertThat(kubernetesList.getItems(), CoreMatchers.hasItem(service));
+        assertThat(kubernetesList.getItems(), CoreMatchers.hasItem(replicationController));
+    }
+
+    @Test
+    public void testVisitor() throws JsonProcessingException {
+        KubernetesList list = new KubernetesListBuilder()
+                .addNewPodItem()
+                    .withNewSpec()
+                        .addNewContainer()
+                            .withName("my-container")
+                            .withImage("my/image")
+                        .endContainer()
+                    .endSpec()
+                .and()
+                .build();
+
+        list = new KubernetesListBuilder(list).accept(new io.fabric8.common.Visitor() {
+            public void visit(Object item) {
+                if (item instanceof io.fabric8.kubernetes.api.model.PodSpecBuilder) {
+                    ((io.fabric8.kubernetes.api.model.PodSpecBuilder)item).addNewContainer()
+                            .withName("other-container")
+                            .withImage("other/image")
+                            .and();
+                }
+            }
+        }).build();
+    }
+
+
+    @Test
+    public void testDefaultNullValues() throws JsonProcessingException {
+        Container container = new ContainerBuilder().build();
+        assertNull(container.getLifecycle());
+        assertNull(container.getLivenessProbe());
+
+
+        Pod pod = new PodBuilder().build();
+        assertNull(pod.getSpec());
+        assertNull(pod.getStatus());
+    }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/3414e7ce/dependencies/fabric8/kubernetes-model/src/test/java/io/fabric8/kubernetes/api/model/UnmarshallTest.java
----------------------------------------------------------------------
diff --git a/dependencies/fabric8/kubernetes-model/src/test/java/io/fabric8/kubernetes/api/model/UnmarshallTest.java
b/dependencies/fabric8/kubernetes-model/src/test/java/io/fabric8/kubernetes/api/model/UnmarshallTest.java
new file mode 100644
index 0000000..cd6d9df
--- /dev/null
+++ b/dependencies/fabric8/kubernetes-model/src/test/java/io/fabric8/kubernetes/api/model/UnmarshallTest.java
@@ -0,0 +1,66 @@
+package io.fabric8.kubernetes.api.model;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.fabric8.common.Visitor;
+import io.fabric8.kubernetes.api.model.resource.Quantity;
+import io.fabric8.openshift.api.model.template.Template;
+import io.fabric8.openshift.api.model.template.TemplateBuilder;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static org.junit.Assert.assertEquals;
+
+public class UnmarshallTest {
+
+    @Test
+    public void testUnmarshallInt64ToLong() throws Exception {
+        ObjectMapper mapper = new ObjectMapper(); // can reuse, share globally
+        Pod pod = (Pod) mapper.readValue(getClass().getResourceAsStream("/valid-pod.json"),
KubernetesResource.class);
+        assertEquals(pod.getSpec().getContainers().get(0).getResources().getLimits().get("memory"),
new Quantity("5Mi"));
+        assertEquals(pod.getSpec().getContainers().get(0).getResources().getLimits().get("cpu"),
new Quantity("1"));
+    }
+
+    @Test
+    public void testUnmarshallWithVisitors() throws Exception {
+        ObjectMapper mapper = new ObjectMapper(); // can reuse, share globally
+        KubernetesList list = (KubernetesList) mapper.readValue(getClass().getResourceAsStream("/simple-list.json"),
KubernetesResource.class);
+        final AtomicInteger integer = new AtomicInteger();
+        new KubernetesListBuilder(list).accept(new Visitor() {
+            public void visit(Object o) {
+                integer.incrementAndGet();
+            }
+        });
+
+        //We just want to make sure that it visits nested objects when deserialization from
json is used.
+        // The exact number is volatile so we just care about the minimum number of objects
(list, pod and service).
+        Assert.assertTrue(integer.intValue() >= 3);
+
+
+        Template template = (Template) mapper.readValue(getClass().getResourceAsStream("/simple-template.json"),
KubernetesResource.class);
+        integer.set(0);
+        new TemplateBuilder(template).accept(new Visitor() {
+            public void visit(Object o) {
+                integer.incrementAndGet();
+            }
+        });
+
+        //We just want to make sure that it visits nested objects when deserialization from
json is used.
+        // The exact number is volatile so we just care about the minimum number of objects
(list, pod and service).
+        Assert.assertTrue(integer.intValue() >= 2);
+
+
+        ServiceList serviceList = (ServiceList) mapper.readValue(getClass().getResourceAsStream("/service-list.json"),
KubernetesResource.class);
+        integer.set(0);
+        new ServiceListBuilder(serviceList).accept(new Visitor() {
+            public void visit(Object o) {
+                integer.incrementAndGet();
+            }
+        });
+
+        //We just want to make sure that it visits nested objects when deserialization from
json is used.
+        // The exact number is volatile so we just care about the minimum number of objects
(list, pod and service).
+        Assert.assertTrue(integer.intValue() >= 2);
+    }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/3414e7ce/dependencies/fabric8/kubernetes-model/src/test/resources/service-list.json
----------------------------------------------------------------------
diff --git a/dependencies/fabric8/kubernetes-model/src/test/resources/service-list.json b/dependencies/fabric8/kubernetes-model/src/test/resources/service-list.json
new file mode 100644
index 0000000..ef87d15
--- /dev/null
+++ b/dependencies/fabric8/kubernetes-model/src/test/resources/service-list.json
@@ -0,0 +1,239 @@
+{
+  "kind": "ServiceList",
+  "apiVersion": "v1beta3",
+  "metadata": {
+    "selfLink": "/api/v1beta3/services",
+    "resourceVersion": "443"
+  },
+  "items": [
+    {
+      "metadata": {
+        "name": "app-library",
+        "namespace": "default",
+        "selfLink": "/api/v1beta3/namespaces/default/services/app-library",
+        "uid": "d2907fce-02e4-11e5-8091-08002719a237",
+        "resourceVersion": "79",
+        "creationTimestamp": "2015-05-25T13:49:11Z",
+        "labels": {
+          "component": "AppLibrary",
+          "provider": "fabric8"
+        }
+      },
+      "spec": {
+        "ports": [
+          {
+            "name": "",
+            "protocol": "TCP",
+            "port": 80,
+            "targetPort": 8080
+          }
+        ],
+        "selector": {
+          "component": "AppLibrary",
+          "provider": "fabric8"
+        },
+        "portalIP": "172.30.17.111",
+        "sessionAffinity": "None"
+      },
+      "status": {}
+    },
+    {
+      "metadata": {
+        "name": "app-library-jolokia",
+        "namespace": "default",
+        "selfLink": "/api/v1beta3/namespaces/default/services/app-library-jolokia",
+        "uid": "d2a01536-02e4-11e5-8091-08002719a237",
+        "resourceVersion": "81",
+        "creationTimestamp": "2015-05-25T13:49:11Z"
+      },
+      "spec": {
+        "ports": [
+          {
+            "name": "",
+            "protocol": "TCP",
+            "port": 8778,
+            "targetPort": 8778
+          }
+        ],
+        "selector": {
+          "component": "AppLibrary",
+          "provider": "fabric8"
+        },
+        "portalIP": "172.30.17.8",
+        "sessionAffinity": "None"
+      },
+      "status": {}
+    },
+    {
+      "metadata": {
+        "name": "docker-registry",
+        "namespace": "default",
+        "selfLink": "/api/v1beta3/namespaces/default/services/docker-registry",
+        "uid": "d1058b17-02e4-11e5-8091-08002719a237",
+        "resourceVersion": "58",
+        "creationTimestamp": "2015-05-25T13:49:08Z",
+        "labels": {
+          "docker-registry": "default"
+        }
+      },
+      "spec": {
+        "ports": [
+          {
+            "name": "",
+            "protocol": "TCP",
+            "port": 5000,
+            "targetPort": 5000
+          }
+        ],
+        "selector": {
+          "docker-registry": "default"
+        },
+        "portalIP": "172.30.17.117",
+        "sessionAffinity": "None"
+      },
+      "status": {}
+    },
+    {
+      "metadata": {
+        "name": "fabric8-console-service",
+        "namespace": "default",
+        "selfLink": "/api/v1beta3/namespaces/default/services/fabric8-console-service",
+        "uid": "d3ec3762-02e4-11e5-8091-08002719a237",
+        "resourceVersion": "93",
+        "creationTimestamp": "2015-05-25T13:49:13Z"
+      },
+      "spec": {
+        "ports": [
+          {
+            "name": "",
+            "protocol": "TCP",
+            "port": 80,
+            "targetPort": 9090
+          }
+        ],
+        "selector": {
+          "component": "fabric8Console"
+        },
+        "portalIP": "172.30.17.249",
+        "sessionAffinity": "None"
+      },
+      "status": {}
+    },
+    {
+      "metadata": {
+        "name": "fabric8-forge",
+        "namespace": "default",
+        "selfLink": "/api/v1beta3/namespaces/default/services/fabric8-forge",
+        "uid": "d3615083-02e4-11e5-8091-08002719a237",
+        "resourceVersion": "88",
+        "creationTimestamp": "2015-05-25T13:49:12Z",
+        "labels": {
+          "component": "fabric8Forge",
+          "provider": "fabric8"
+        }
+      },
+      "spec": {
+        "ports": [
+          {
+            "name": "",
+            "protocol": "TCP",
+            "port": 80,
+            "targetPort": 8080
+          }
+        ],
+        "selector": {
+          "component": "fabric8Forge",
+          "provider": "fabric8"
+        },
+        "portalIP": "172.30.17.159",
+        "sessionAffinity": "None"
+      },
+      "status": {}
+    },
+    {
+      "metadata": {
+        "name": "kubernetes",
+        "namespace": "default",
+        "selfLink": "/api/v1beta3/namespaces/default/services/kubernetes",
+        "uid": "bc84b6f4-02e4-11e5-8091-08002719a237",
+        "resourceVersion": "5",
+        "creationTimestamp": "2015-05-25T13:48:34Z",
+        "labels": {
+          "component": "apiserver",
+          "provider": "kubernetes"
+        }
+      },
+      "spec": {
+        "ports": [
+          {
+            "name": "",
+            "protocol": "TCP",
+            "port": 443,
+            "targetPort": 443
+          }
+        ],
+        "selector": null,
+        "portalIP": "172.30.17.2",
+        "sessionAffinity": "None"
+      },
+      "status": {}
+    },
+    {
+      "metadata": {
+        "name": "kubernetes-ro",
+        "namespace": "default",
+        "selfLink": "/api/v1beta3/namespaces/default/services/kubernetes-ro",
+        "uid": "bc85c655-02e4-11e5-8091-08002719a237",
+        "resourceVersion": "4",
+        "creationTimestamp": "2015-05-25T13:48:34Z",
+        "labels": {
+          "component": "apiserver",
+          "provider": "kubernetes"
+        }
+      },
+      "spec": {
+        "ports": [
+          {
+            "name": "",
+            "protocol": "TCP",
+            "port": 80,
+            "targetPort": 80
+          }
+        ],
+        "selector": null,
+        "portalIP": "172.30.17.1",
+        "sessionAffinity": "None"
+      },
+      "status": {}
+    },
+    {
+      "metadata": {
+        "name": "router",
+        "namespace": "default",
+        "selfLink": "/api/v1beta3/namespaces/default/services/router",
+        "uid": "d0391be9-02e4-11e5-8091-08002719a237",
+        "resourceVersion": "52",
+        "creationTimestamp": "2015-05-25T13:49:07Z",
+        "labels": {
+          "router": "router"
+        }
+      },
+      "spec": {
+        "ports": [
+          {
+            "name": "",
+            "protocol": "TCP",
+            "port": 80,
+            "targetPort": 80
+          }
+        ],
+        "selector": {
+          "router": "router"
+        },
+        "portalIP": "172.30.17.219",
+        "sessionAffinity": "None"
+      },
+      "status": {}
+    }
+  ]
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/3414e7ce/dependencies/fabric8/kubernetes-model/src/test/resources/simple-list.json
----------------------------------------------------------------------
diff --git a/dependencies/fabric8/kubernetes-model/src/test/resources/simple-list.json b/dependencies/fabric8/kubernetes-model/src/test/resources/simple-list.json
new file mode 100644
index 0000000..7d0ac22
--- /dev/null
+++ b/dependencies/fabric8/kubernetes-model/src/test/resources/simple-list.json
@@ -0,0 +1,64 @@
+{
+  "kind": "List",
+  "apiVersion": "v1beta3",
+  "items": [
+    {
+      "apiVersion": "v1beta3",
+      "kind": "Pod",
+      "metadata": {
+        "name": "simple-pod"
+      },
+      "labels": {
+        "name": "simple-pod"
+      },
+      "spec": {
+        "containers": [
+          {
+            "name": "simple-container",
+            "image": "simple-image",
+            "resources": {
+              "limits": {
+                "cpu": "1",
+                "memory": "5Mi"
+              }
+            }
+          }
+        ]
+      }
+    },
+    {
+      "apiVersion": "v1beta3",
+      "kind": "Service",
+      "metadata": {
+        "annotations": {},
+        "labels": {
+          "component": "simple",
+          "provider": "simple",
+          "group": "simple"
+        },
+        "name": "simple-service"
+      },
+      "spec": {
+        "ports": [
+          {
+            "port": 8080,
+            "protocol": "TCP",
+            "targetPort": 8181
+          }
+        ],
+        "publicIPs": [],
+        "selector": {
+          "component": "simple",
+          "provider": "simple",
+          "group": "simple"
+        }
+      }
+    }
+  ]
+}
+
+
+
+
+
+

http://git-wip-us.apache.org/repos/asf/stratos/blob/3414e7ce/dependencies/fabric8/kubernetes-model/src/test/resources/simple-template.json
----------------------------------------------------------------------
diff --git a/dependencies/fabric8/kubernetes-model/src/test/resources/simple-template.json
b/dependencies/fabric8/kubernetes-model/src/test/resources/simple-template.json
new file mode 100644
index 0000000..d10f517
--- /dev/null
+++ b/dependencies/fabric8/kubernetes-model/src/test/resources/simple-template.json
@@ -0,0 +1,45 @@
+{
+  "apiVersion": "v1beta3",
+  "kind": "Template",
+  "labels": {},
+  "metadata": {
+    "annotations": {},
+    "labels": {},
+    "name": "console"
+  },
+  "objects": [
+    {
+      "apiVersion": "v1beta3",
+      "kind": "Service",
+      "metadata": {
+        "annotations": {},
+        "labels": {
+          "component": "console",
+          "provider": "simple"
+        },
+        "name": "simple"
+      },
+      "spec": {
+        "ports": [
+          {
+            "port": 80,
+            "protocol": "TCP",
+            "targetPort": 9090
+          }
+        ],
+        "publicIPs": ["${DOMAIN}"],
+        "selector": {
+          "component": "console",
+          "provider": "simple"
+        }
+      }
+    }
+  ],
+  "parameters": [
+    {
+      "description": "The target port",
+      "name": "DOMAIN",
+      "value": "my.domain.org"
+    }
+  ]
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/3414e7ce/dependencies/fabric8/kubernetes-model/src/test/resources/valid-pod.json
----------------------------------------------------------------------
diff --git a/dependencies/fabric8/kubernetes-model/src/test/resources/valid-pod.json b/dependencies/fabric8/kubernetes-model/src/test/resources/valid-pod.json
new file mode 100644
index 0000000..2802a24
--- /dev/null
+++ b/dependencies/fabric8/kubernetes-model/src/test/resources/valid-pod.json
@@ -0,0 +1,22 @@
+{
+  "apiVersion":"v1beta3",
+  "kind": "Pod",
+  "metadata": {
+    "name": "valid-pod"
+  },
+  "labels": {
+    "name": "valid-pod"
+  },
+  "spec": {
+    "containers": [{
+      "name": "kubernetes-serve-hostname",
+      "image": "gcr.io/google_containers/serve_hostname",
+      "resources": {
+        "limits": {
+          "cpu": "1",
+          "memory": "5Mi"
+        }
+      }
+    }]
+  }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/3414e7ce/dependencies/fabric8/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/fabric8/pom.xml b/dependencies/fabric8/pom.xml
new file mode 100644
index 0000000..1421ddf
--- /dev/null
+++ b/dependencies/fabric8/pom.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <parent>
+        <groupId>org.apache.stratos</groupId>
+        <artifactId>stratos-dependents</artifactId>
+        <version>4.1.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>stratos-dependencies-fabric8</artifactId>
+    <packaging>pom</packaging>
+    <name>Fabric8</name>
+    <description>Fabric8 fork</description>
+
+    <modules>
+        <module>kubernetes-model</module>
+        <module>kubernetes-api</module>
+    </modules>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <encoding>UTF-8</encoding>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
+

http://git-wip-us.apache.org/repos/asf/stratos/blob/3414e7ce/dependencies/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 46bed08..6b4877c 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -34,10 +34,11 @@
 
     <modules>
         <module>jclouds/apis/vcloud/1.8.1-stratos</module>
-	<module>jclouds/apis/openstack-neutron/1.8.1-stratos</module>
+	    <module>jclouds/apis/openstack-neutron/1.8.1-stratos</module>
         <module>jclouds/apis/gce/1.8.1-stratos</module>
         <module>jclouds/provider/aws-ec2/1.8.1-stratos</module>
         <module>org.wso2.carbon.ui</module>
+        <module>fabric8</module>
     </modules>
 </project>
 

http://git-wip-us.apache.org/repos/asf/stratos/blob/3414e7ce/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml
b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml
index ee41fb4..838dfb3 100644
--- a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml
+++ b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml
@@ -250,6 +250,17 @@
             <artifactId>org.apache.servicemix.bundles.jzlib</artifactId>
             <version>1.1.1_1</version>
         </dependency>
+        <!-- Dependencies for fabric8 kubernetes api client -->
+        <dependency>
+            <groupId>org.apache.stratos</groupId>
+            <artifactId>kubernetes-api</artifactId>
+            <version>2.1.11-stratosv1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.stratos</groupId>
+            <artifactId>kubernetes-model</artifactId>
+            <version>2.1.11-stratosv1</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -351,10 +362,11 @@
                                 <bundleDef>org.json.wso2:json:1.0.0.wso2v1</bundleDef>
                                 <bundleDef>org.apache.httpcomponents.wso2:httpcore:4.3.0.wso2v1</bundleDef>
                                 <bundleDef>org.apache.httpcomponents.wso2:httpclient:4.2.5.wso2v1</bundleDef>
-                                <!--bundleDef>org.jaggeryjs:0.9.0.ALPHA2-wso2v2</bundleDef-->
                                 <bundleDef>org.apache.jclouds.api:sts:${jclouds.version}</bundleDef>
                                 <bundleDef>javax.ws.rs:jsr311-api:1.1.1</bundleDef>
                                 <bundleDef>org.apache.stratos:org.apache.stratos.messaging:${project.version}</bundleDef>
+                                <bundleDef>org.apache.stratos:kubernetes-api:2.1.11-stratosv1</bundleDef>
+                                <bundleDef>org.apache.stratos:kubernetes-model:2.1.11-stratosv1</bundleDef>
                             </bundles>
                             <importBundles>
                             </importBundles>

http://git-wip-us.apache.org/repos/asf/stratos/blob/3414e7ce/features/common/org.apache.stratos.common.server.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/common/org.apache.stratos.common.server.feature/pom.xml b/features/common/org.apache.stratos.common.server.feature/pom.xml
index 52322fc..d0df9aa 100644
--- a/features/common/org.apache.stratos.common.server.feature/pom.xml
+++ b/features/common/org.apache.stratos.common.server.feature/pom.xml
@@ -45,11 +45,6 @@
             <artifactId>org.apache.stratos.landing.page.deployer</artifactId>
             <version>${project.version}</version>
         </dependency-->
-        <dependency>
-            <groupId>org.apache.stratos</groupId>
-            <artifactId>org.apache.stratos.activation</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <!--<dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.sample.installer</artifactId>
@@ -193,7 +188,6 @@
                             <bundles>
                                 <bundleDef>org.apache.stratos:org.apache.stratos.common:${project.version}</bundleDef>
                                 <bundleDef>org.wso2.carbon:org.wso2.carbon.redirector.servlet:2.2.1</bundleDef>
-                                <bundleDef>org.apache.stratos:org.apache.stratos.activation:${project.version}</bundleDef>
                                 <!--<bundleDef>org.wso2.carbon:org.wso2.carbon.sample.installer:${stratos.version}</bundleDef>-->
                                 <!--
                                                                 <bundleDef>org.apache.stratos:org.apache.stratos.tenant.dispatcher</bundleDef>

http://git-wip-us.apache.org/repos/asf/stratos/blob/3414e7ce/features/manager/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/pom.xml b/features/manager/pom.xml
index e2eb501..d5d0eef 100644
--- a/features/manager/pom.xml
+++ b/features/manager/pom.xml
@@ -57,11 +57,6 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.apache.stratos</groupId>
-                <artifactId>org.apache.stratos.activation</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.sample.installer</artifactId>
                 <version>${stratos.version}</version>

http://git-wip-us.apache.org/repos/asf/stratos/blob/3414e7ce/products/stratos/modules/distribution/src/main/license/LICENSE
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/license/LICENSE b/products/stratos/modules/distribution/src/main/license/LICENSE
index 09eb09d..92d8060 100644
--- a/products/stratos/modules/distribution/src/main/license/LICENSE
+++ b/products/stratos/modules/distribution/src/main/license/LICENSE
@@ -357,7 +357,6 @@ org.apache.jasper.glassfish_2.2.2.v201205150955.jar,
 org.apache.servicemix.bundles.jsch-agentproxy-jsch_0.0.7.1.jar,
 org.apache.servicemix.bundles.jsch-agentproxy-sshj_0.0.7.1.jar,
 org.apache.servicemix.bundles.jzlib_1.1.1.1.jar,
-org.apache.stratos.activation_4.1.0.SNAPSHOT.jar,
 org.apache.stratos.autoscaler.service.stub_4.1.0.SNAPSHOT.jar,
 org.apache.stratos.autoscaler_4.1.0.SNAPSHOT.jar,
 org.apache.stratos.cloud.controller.service.stub_4.1.0.SNAPSHOT.jar,


Mime
View raw message