Repository: stratos Updated Branches: refs/heads/docker-integration c4ad65c30 -> 53d745251
Making deployerType property optional Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/1ce36086 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/1ce36086 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/1ce36086 Branch: refs/heads/docker-integration Commit: 1ce360862059241f22e22d39d561385ec8b309e0 Parents: 1ba7d7f Author: sajhak <[email protected]> Authored: Mon Sep 15 18:12:48 2014 +0530 Committer: sajhak <[email protected]> Committed: Mon Sep 15 18:12:48 2014 +0530 ---------------------------------------------------------------------- .../manager/deploy/cartridge/CartridgeDeploymentManager.java | 4 ++-- .../src/main/webapp/stratos/WEB-INF/schemas/schema.xsd | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/1ce36086/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/cartridge/CartridgeDeploymentManager.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/cartridge/CartridgeDeploymentManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/cartridge/CartridgeDeploymentManager.java index 65a6834..920b0ff 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/cartridge/CartridgeDeploymentManager.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/deploy/cartridge/CartridgeDeploymentManager.java @@ -22,10 +22,10 @@ package org.apache.stratos.manager.deploy.cartridge; public class CartridgeDeploymentManager { public static CartridgeDeployer getDeploymentManager(String deployerType){ - if(deployerType.equals("kubernetes")) { + if(deployerType != null && deployerType.equals("kubernetes")) { return new DockerCartridgeDeployer(); } else { return new DefaultCartridgeDeployer(); - } + } } } http://git-wip-us.apache.org/repos/asf/stratos/blob/1ce36086/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/schemas/schema.xsd ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/schemas/schema.xsd b/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/schemas/schema.xsd index 9bc7a9b..3d51481 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/schemas/schema.xsd +++ b/components/org.apache.stratos.rest.endpoint/src/main/webapp/stratos/WEB-INF/schemas/schema.xsd @@ -109,7 +109,7 @@ <xs:element name="version" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/> <xs:element name="defaultAutoscalingPolicy" type="xs:string" minOccurs="0" maxOccurs="1" nillable="false"/> <xs:element name="multiTenant" type="xs:boolean" minOccurs="1" maxOccurs="1" nillable="false"/> - <xs:element name="deployerType" type="xs:string" minOccurs="1" maxOccurs="1" nillable="false"/> + <xs:element name="deployerType" type="xs:string" minOccurs="0" maxOccurs="1" nillable="false"/> <xs:element name="portMapping" minOccurs="1" maxOccurs="unbounded"> <xs:complexType> <xs:all>
