Updated Branches: refs/heads/master d6b584f66 -> 9dc3f6a7a
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9dc3f6a7/features/manager/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.3/src/main/resources/conf/etc/cartridge.xsd ---------------------------------------------------------------------- diff --git a/features/manager/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.3/src/main/resources/conf/etc/cartridge.xsd b/features/manager/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.3/src/main/resources/conf/etc/cartridge.xsd deleted file mode 100644 index 222a510..0000000 --- a/features/manager/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.3/src/main/resources/conf/etc/cartridge.xsd +++ /dev/null @@ -1,133 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1" ?> -<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema";> - <xs:element name="cartridge"> - <xs:annotation> - <xs:documentation>You can have 1..n cartridge elements.</xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:choice maxOccurs="unbounded"> - <xs:element name="property" maxOccurs="unbounded" - minOccurs="0"> - <xs:annotation> - <xs:documentation> - cartridge element can have 0..n properties, and - they'll be overwritten by the properties - specified under iaasProvider child elements of - cartridge element. - </xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:simpleContent> - <xs:extension base="xs:string"> - <xs:attribute type="xs:string" name="name" /> - <xs:attribute type="xs:string" name="value" /> - </xs:extension> - </xs:simpleContent> - </xs:complexType> - </xs:element> - <xs:element name="displayName" maxOccurs="1" minOccurs="0" /> - <xs:element name="description" maxOccurs="1" minOccurs="0" /> - <xs:element name="iaasProvider" maxOccurs="unbounded" - minOccurs="1"> - <xs:annotation> - <xs:documentation> - A cartridge element should add a reference to an - existing IaaS provider (specified in the above - &lt;iaasProviders&gt; section) or it can - create a completely new IaaS Provider (which - should have a unique "type" attribute. - </xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:choice maxOccurs="unbounded"> - <xs:element type="xs:string" name="scaleUpOrder" - minOccurs="0" maxOccurs="1" /> - <xs:element type="xs:string" name="scaleDownOrder" - minOccurs="0" maxOccurs="1" /> - <xs:element type="xs:string" name="maxInstanceLimit" - minOccurs="0" maxOccurs="1" /> - <xs:element type="xs:string" name="imageId" - minOccurs="0" maxOccurs="1" /> - <xs:element name="property" - maxOccurs="unbounded" minOccurs="0"> - <xs:complexType> - <xs:simpleContent> - <xs:extension base="xs:string"> - <xs:attribute type="xs:string" - name="name" /> - <xs:attribute type="xs:string" - name="value" /> - </xs:extension> - </xs:simpleContent> - </xs:complexType> - </xs:element> - </xs:choice> - <xs:attribute type="xs:string" name="type" /> - </xs:complexType> - </xs:element> - <xs:element name="deployment" maxOccurs="1" minOccurs="1"> - <xs:complexType> - <xs:choice maxOccurs="unbounded"> - <xs:element name="dir" maxOccurs="unbounded" - minOccurs="0" type="xs:string"> - </xs:element> - </xs:choice> - <xs:attribute name="baseDir" type="xs:string"> - </xs:attribute> - </xs:complexType> - </xs:element> - <xs:element name="portMapping" maxOccurs="1" - minOccurs="1"> - <xs:complexType> - <xs:choice maxOccurs="unbounded"> - <xs:element name="http" maxOccurs="1" - minOccurs="1"> - <xs:complexType> - <xs:attribute name="port" - type="xs:string" /> - <xs:attribute name="proxyPort" - type="xs:string" /> - </xs:complexType> - </xs:element> - <xs:element name="https" maxOccurs="1" - minOccurs="0"> - <xs:complexType> - <xs:attribute name="port" - type="xs:string" /> - <xs:attribute name="proxyPort" - type="xs:string" /> - </xs:complexType> - </xs:element> - </xs:choice> - </xs:complexType> - </xs:element> - <xs:element name="appTypes" maxOccurs="1" - minOccurs="1"> - <xs:complexType> - <xs:choice maxOccurs="unbounded"> - <xs:element name="appType" maxOccurs="unbounded" - minOccurs="1"> - <xs:complexType> - <xs:attribute name="name" type="xs:string" use="required" /> - <xs:attribute name="appSpecificMapping" - type="xs:string" /> - </xs:complexType> - </xs:element> - </xs:choice> - </xs:complexType> - </xs:element> - </xs:choice> - <xs:attribute type="xs:string" name="type" /> - <xs:attribute type="xs:string" name="host" /> - <xs:attribute type="xs:string" name="provider" /> - <xs:attribute type="xs:string" name="version" /> - <xs:attribute type="xs:boolean" name="multiTenant" /> - </xs:complexType> - </xs:element> - - <!-- <xs:complexType name="deploymentType"> - <xs:sequence> - <xs:element name="dir" type="xs:string" maxOccurs="1" minOccurs="1"></xs:element> - </xs:sequence> - </xs:complexType> --> -</xs:schema> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9dc3f6a7/features/manager/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.3/src/main/resources/conf/etc/cartridges.xsd ---------------------------------------------------------------------- diff --git a/features/manager/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.3/src/main/resources/conf/etc/cartridges.xsd b/features/manager/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.3/src/main/resources/conf/etc/cartridges.xsd deleted file mode 100644 index 1b383e4..0000000 --- a/features/manager/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.3/src/main/resources/conf/etc/cartridges.xsd +++ /dev/null @@ -1,144 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1" ?> -<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema";> - <xs:element name="cartridges" > - <xs:annotation> - <xs:documentation>Use below section to specify properties that are needed in order to start Cartridges.</xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:sequence> - <xs:choice maxOccurs="unbounded"> - <xs:element name="cartridge" maxOccurs="unbounded" minOccurs="1"> - <xs:annotation> - <xs:documentation>You can have 1..n cartridge elements.</xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:choice maxOccurs="unbounded"> - <xs:element name="property" maxOccurs="unbounded" - minOccurs="0"> - <xs:annotation> - <xs:documentation> - cartridge element can have 0..n properties, - and they'll be overwritten by the properties - specified under iaasProvider child elements - of cartridge element. - </xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:simpleContent> - <xs:extension base="xs:string"> - <xs:attribute type="xs:string" - name="name" /> - <xs:attribute type="xs:string" - name="value" /> - </xs:extension> - </xs:simpleContent> - </xs:complexType> - </xs:element> - <xs:element name="displayName" maxOccurs="1" - minOccurs="0" /> - <xs:element name="description" maxOccurs="1" - minOccurs="0" /> - <xs:element name="iaasProvider" maxOccurs="unbounded" - minOccurs="1"> - <xs:annotation> - <xs:documentation> - A cartridge element should add a reference - to an existing IaaS provider (specified in - the above &lt;iaasProviders&gt; - section) or it can create a completely new - IaaS Provider (which should have a unique - "type" attribute. - </xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:choice maxOccurs="unbounded"> - <xs:element type="xs:string" name="scaleUpOrder" - minOccurs="0" maxOccurs="1" /> - <xs:element type="xs:string" name="scaleDownOrder" - minOccurs="0" maxOccurs="1" /> - <xs:element type="xs:string" name="maxInstanceLimit" - minOccurs="0" maxOccurs="1" /> - <xs:element type="xs:string" name="imageId" - minOccurs="0" maxOccurs="1" /> - <xs:element name="property" - maxOccurs="unbounded" minOccurs="0"> - <xs:complexType> - <xs:simpleContent> - <xs:extension - base="xs:string"> - <xs:attribute - type="xs:string" name="name" /> - <xs:attribute - type="xs:string" name="value" /> - </xs:extension> - </xs:simpleContent> - </xs:complexType> - </xs:element> - </xs:choice> - <xs:attribute type="xs:string" name="type" /> - </xs:complexType> - </xs:element> - <xs:element name="deployment" maxOccurs="1"> - <xs:complexType> - <xs:choice maxOccurs="unbounded"> - <xs:element name="dir" maxOccurs="unbounded" - minOccurs="0" type="xs:string"> - </xs:element> - </xs:choice> - <xs:attribute name="baseDir" type="xs:string"> - </xs:attribute> - </xs:complexType> - </xs:element> - <xs:element name="portMapping" maxOccurs="1" - minOccurs="1"> - <xs:complexType> - <xs:choice maxOccurs="unbounded"> - <xs:element name="http" maxOccurs="1" - minOccurs="1"> - <xs:complexType> - <xs:attribute name="port" - type="xs:string" /> - <xs:attribute name="proxyPort" - type="xs:string" /> - </xs:complexType> - </xs:element> - <xs:element name="https" maxOccurs="1" - minOccurs="0"> - <xs:complexType> - <xs:attribute name="port" - type="xs:string" /> - <xs:attribute name="proxyPort" - type="xs:string" /> - </xs:complexType> - </xs:element> - </xs:choice> - </xs:complexType> - </xs:element> - <xs:element name="appTypes" maxOccurs="1" - minOccurs="1"> - <xs:complexType> - <xs:choice maxOccurs="unbounded"> - <xs:element name="appType" maxOccurs="unbounded" - minOccurs="1"> - <xs:complexType> - <xs:attribute name="name" type="xs:string" use="required" /> - <xs:attribute name="appSpecificMapping" - type="xs:string" /> - </xs:complexType> - </xs:element> - </xs:choice> - </xs:complexType> - </xs:element> - </xs:choice> - <xs:attribute type="xs:string" name="type"/> - <xs:attribute type="xs:string" name="host" /> - <xs:attribute type="xs:string" name="provider" /> - <xs:attribute type="xs:string" name="version" /> - <xs:attribute type="xs:boolean" name="multiTenant" /> - </xs:complexType> - </xs:element> - </xs:choice> - </xs:sequence> - </xs:complexType> - </xs:element> -</xs:schema> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9dc3f6a7/features/manager/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.3/src/main/resources/conf/etc/service.xsd ---------------------------------------------------------------------- diff --git a/features/manager/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.3/src/main/resources/conf/etc/service.xsd b/features/manager/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.3/src/main/resources/conf/etc/service.xsd deleted file mode 100644 index 48a8532..0000000 --- a/features/manager/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.3/src/main/resources/conf/etc/service.xsd +++ /dev/null @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1" ?> -<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema";> - <xs:element name="service"> - <xs:annotation> - <xs:documentation>you can have 0..n service elements</xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:choice maxOccurs="unbounded"> - <xs:element name="cartridge"> - <xs:annotation> - <xs:documentation> - this element's value should be a reference - to an existing cartridge - </xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:simpleContent> - <xs:extension base="xs:string"> - <xs:attribute type="xs:string" - name="type" /> - </xs:extension> - </xs:simpleContent> - </xs:complexType> - </xs:element> - <xs:element name="payload" type="xs:string" maxOccurs="1" minOccurs="0"></xs:element> - <xs:element name="host" type="xs:string" maxOccurs="1" minOccurs="0"></xs:element> - <xs:element name="property" - maxOccurs="unbounded" minOccurs="0"> - <xs:complexType> - <xs:simpleContent> - <xs:extension base="xs:string"> - <xs:attribute type="xs:string" - name="name" /> - <xs:attribute type="xs:string" - name="value" /> - </xs:extension> - </xs:simpleContent> - </xs:complexType> - </xs:element> - </xs:choice> - <xs:attribute type="xs:string" name="domain" /> - <xs:attribute type="xs:string" name="tenantRange" /> - <xs:attribute type="xs:string" name="subDomain" /> - </xs:complexType> - </xs:element> -</xs:schema> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9dc3f6a7/features/manager/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.3/src/main/resources/conf/etc/services.xsd ---------------------------------------------------------------------- diff --git a/features/manager/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.3/src/main/resources/conf/etc/services.xsd b/features/manager/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.3/src/main/resources/conf/etc/services.xsd deleted file mode 100644 index 5fc9fb7..0000000 --- a/features/manager/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.3/src/main/resources/conf/etc/services.xsd +++ /dev/null @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1" ?> -<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema";> - <xs:element name="services"> - <xs:annotation> - <xs:documentation>Here you specify the service domains related details.</xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:choice maxOccurs="unbounded"> - <xs:element name="service" maxOccurs="unbounded" minOccurs="1"> - <xs:annotation> - <xs:documentation>you can have 0..n service elements</xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:choice maxOccurs="unbounded"> - <xs:element name="cartridge"> - <xs:annotation> - <xs:documentation>this element's value should be a reference to an existing cartridge</xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:simpleContent> - <xs:extension base="xs:string"> - <xs:attribute type="xs:string" name="type"/> - </xs:extension> - </xs:simpleContent> - </xs:complexType> - </xs:element> - <xs:element name="payload" type="xs:string" maxOccurs="1" minOccurs="0"></xs:element> - <xs:element name="host" type="xs:string" maxOccurs="1" minOccurs="0"></xs:element> - <xs:element name="property" - maxOccurs="unbounded" minOccurs="0"> - <xs:complexType> - <xs:simpleContent> - <xs:extension base="xs:string"> - <xs:attribute type="xs:string" - name="name" /> - <xs:attribute type="xs:string" - name="value" /> - </xs:extension> - </xs:simpleContent> - </xs:complexType> - </xs:element> - </xs:choice> - <xs:attribute type="xs:string" name="domain"/> - <xs:attribute type="xs:string" name="subDomain"/> - <xs:attribute type="xs:string" name="tenantRange" /> - </xs:complexType> - </xs:element> - </xs:choice> - </xs:complexType> - </xs:element> -</xs:schema> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9dc3f6a7/features/manager/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.3/src/main/resources/p2.inf ---------------------------------------------------------------------- diff --git a/features/manager/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.3/src/main/resources/p2.inf b/features/manager/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.3/src/main/resources/p2.inf deleted file mode 100644 index 998f6e2..0000000 --- a/features/manager/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.3/src/main/resources/p2.inf +++ /dev/null @@ -1,8 +0,0 @@ -instructions.configure = \ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.wso2.carbon.stratos.cloud.controller_${feature.version}/conf/cloud-controller.xml,target:${installFolder}/../conf/cloud-controller.xml,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.wso2.carbon.stratos.cloud.controller_${feature.version}/conf/etc/cartridge.xsd,target:${installFolder}/../conf/etc/cartridge.xsd,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.wso2.carbon.stratos.cloud.controller_${feature.version}/conf/etc/cartridges.xsd,target:${installFolder}/../conf/etc/cartridges.xsd,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.wso2.carbon.stratos.cloud.controller_${feature.version}/conf/etc/service.xsd,target:${installFolder}/../conf/etc/service.xsd,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.wso2.carbon.stratos.cloud.controller_${feature.version}/conf/etc/services.xsd,target:${installFolder}/../conf/etc/services.xsd,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../deployment/server/cartridges);\ -org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../deployment/server/services);\ http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9dc3f6a7/features/manager/cloud-controller/pom.xml ---------------------------------------------------------------------- diff --git a/features/manager/cloud-controller/pom.xml b/features/manager/cloud-controller/pom.xml deleted file mode 100644 index fee4a14..0000000 --- a/features/manager/cloud-controller/pom.xml +++ /dev/null @@ -1,54 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - ~ Copyright (c) WSO2 Inc. (http://www.wso2.org) All Rights Reserved. - ~ - ~ Licensed 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.wso2.carbon</groupId> - <artifactId>stratos-features</artifactId> - <version>2.1.0</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>cloud-controller-feature</artifactId> - <packaging>pom</packaging> - <name>WSO2 Carbon - Cloud Controller Feature Aggregator Module</name> - <url>http://wso2.org</url> - - <modules> - <module>org.wso2.carbon.stratos.cloud.controller.feature/2.1.1</module> - </modules> - -<!-- <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.wso2.carbon</groupId> - <artifactId>org.wso2.carbon.stratos.cloud.controller</artifactId> - <version>${wso2carbon.version.cc.mgt}</version> - </dependency> - </dependencies> - </dependencyManagement> - - <properties> - <wso2carbon.version.cc.mgt>2.1.1</wso2carbon.version.cc.mgt> - </properties>--> - -</project> -
