You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2014/09/12 17:08:19 UTC
git commit: Fix Jclouds dependency issue,
Fix KubernetesMaster attribute cardinality
Repository: stratos
Updated Branches:
refs/heads/docker-integration 91fd66206 -> 57a19044d
Fix Jclouds dependency issue, Fix KubernetesMaster attribute cardinality
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/57a19044
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/57a19044
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/57a19044
Branch: refs/heads/docker-integration
Commit: 57a19044da5ca07af82552f91756a34936227ec2
Parents: 91fd662
Author: Akila Perera <ra...@gmail.com>
Authored: Fri Sep 12 20:37:54 2014 +0530
Committer: Akila Perera <ra...@gmail.com>
Committed: Fri Sep 12 20:37:54 2014 +0530
----------------------------------------------------------------------
.../common/kubernetes/KubernetesGroup.java | 10 ++++----
.../bean/kubernetes/KubernetesGroup.java | 10 ++++----
.../pom.xml | 25 ++++++++++++++++----
3 files changed, 30 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/57a19044/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/kubernetes/KubernetesGroup.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/kubernetes/KubernetesGroup.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/kubernetes/KubernetesGroup.java
index 2c8c53c..ce67963 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/kubernetes/KubernetesGroup.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/kubernetes/KubernetesGroup.java
@@ -29,7 +29,7 @@ public class KubernetesGroup implements Serializable {
private String groupId;
private List<KubernetesHost> kubernetesHosts;
- private List<KubernetesMaster> kubernetesMasters;
+ private KubernetesMaster kubernetesMaster;
private PortRange portRange;
private String description;
private Properties properties = new Properties();
@@ -50,12 +50,12 @@ public class KubernetesGroup implements Serializable {
this.kubernetesHosts = kubernetesHosts;
}
- public List<KubernetesMaster> getKubernetesMasters() {
- return kubernetesMasters;
+ public KubernetesMaster getKubernetesMasters() {
+ return kubernetesMaster;
}
- public void setKubernetesMasters(List<KubernetesMaster> kubernetesMasters) {
- this.kubernetesMasters = kubernetesMasters;
+ public void setKubernetesMasters(KubernetesMaster kubernetesMasters) {
+ this.kubernetesMaster = kubernetesMasters;
}
public PortRange getPortRange() {
http://git-wip-us.apache.org/repos/asf/stratos/blob/57a19044/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/kubernetes/KubernetesGroup.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/kubernetes/KubernetesGroup.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/kubernetes/KubernetesGroup.java
index c99e7c3..a7c596a 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/kubernetes/KubernetesGroup.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/kubernetes/KubernetesGroup.java
@@ -30,7 +30,7 @@ public class KubernetesGroup {
private String groupId;
private String description;
private List<KubernetesHost> kubernetesHosts;
- private List<KubernetesMaster> kubernetesMasters;
+ private KubernetesMaster kubernetesMaster;
private PortRange portRange;
private List<PropertyBean> property;
@@ -50,12 +50,12 @@ public class KubernetesGroup {
this.kubernetesHosts = kubernetesHosts;
}
- public List<KubernetesMaster> getKubernetesMasters() {
- return kubernetesMasters;
+ public KubernetesMaster getKubernetesMaster() {
+ return kubernetesMaster;
}
- public void setKubernetesMasters(List<KubernetesMaster> kubernetesMasters) {
- this.kubernetesMasters = kubernetesMasters;
+ public void setKubernetesMaster(KubernetesMaster kubernetesMaster) {
+ this.kubernetesMaster = kubernetesMaster;
}
public PortRange getPortRange() {
http://git-wip-us.apache.org/repos/asf/stratos/blob/57a19044/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 23efdf6..c620909 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
@@ -200,6 +200,26 @@
<artifactId>andes-client</artifactId>
<version>0.13.wso2v8</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.jsch-agentproxy-jsch</artifactId>
+ <version>0.0.7_1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.jcraft</groupId>
+ <artifactId>jsch.agentproxy.usocket-jna</artifactId>
+ <version>0.0.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.jsch-agentproxy-sshj</artifactId>
+ <version>0.0.7_1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.jzlib</artifactId>
+ <version>1.1.1_1</version>
+ </dependency>
</dependencies>
<build>
@@ -255,7 +275,6 @@
</bundleDef>
<bundleDef>org.apache.jclouds.driver:jclouds-bouncycastle:${jclouds.version}</bundleDef>
<bundleDef>org.apache.jclouds.driver:jclouds-sshj:${jclouds.version}</bundleDef>
- <!--bundleDef>org.apache.jclouds.driver:jclouds-log4j:${jclouds.version}</bundleDef-->
<bundleDef>org.apache.jclouds.driver:jclouds-enterprise:${jclouds.version}</bundleDef>
<bundleDef>org.apache.jclouds:jclouds-core:${jclouds.version}</bundleDef>
<bundleDef>org.apache.jclouds:jclouds-compute:${jclouds.version}</bundleDef>
@@ -269,8 +288,6 @@
<bundleDef>org.apache.jclouds.api:openstack-keystone:${jclouds.version}</bundleDef>
<bundleDef>org.apache.stratos:aws-ec2:1.8.0-stratos</bundleDef>
<bundleDef>com.google.guava:guava:17.0</bundleDef>
-
-
<bundleDef>
org.apache.servicemix.bundles:org.apache.servicemix.bundles.jsch-agentproxy-jsch:0.0.7_1
</bundleDef>
@@ -285,7 +302,6 @@
<bundleDef>net.schmizz:sshj:0.9.0</bundleDef>
<bundleDef>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jzlib:1.1.1_1
</bundleDef>
-
<bundleDef>com.google.code.gson:gson:${gson2.version}</bundleDef>
<bundleDef>com.google.guice.wso2:guice:${google.guice.wso2.version}</bundleDef>
<bundleDef>
@@ -307,7 +323,6 @@
</bundleDef>
<bundleDef>jdom.wso2:jdom:1.0.0.wso2v1</bundleDef>
<bundleDef>org.json.wso2:json:1.0.0.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}