You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2013/07/05 12:08:59 UTC
[1/2] refactoring Cloud controller feature and changing the name of
the coloud controller component name
Updated Branches:
refs/heads/master 18034115a -> 10e80078f
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/10e80078/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/pom.xml
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/pom.xml b/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/pom.xml
deleted file mode 100644
index c444792..0000000
--- a/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/pom.xml
+++ /dev/null
@@ -1,282 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (c) 2009-2011, 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>cloud-controller-feature</artifactId>
- <version>2.1.0</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <version>2.1.1</version>
- <artifactId>org.wso2.carbon.stratos.cloud.controller.feature</artifactId>
- <packaging>pom</packaging>
- <name>WSO2 Carbon - Stratos Cloud Controller Feature</name>
- <url>http://wso2.org</url>
- <description>This feature contains the required bundles for the functionality of Cloud Controller</description>
- <dependencies>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.stratos.cloud.controller</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jclouds</groupId>
- <artifactId>jclouds-core</artifactId>
- <version>${jclouds.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jclouds</groupId>
- <artifactId>jclouds-compute</artifactId>
- <version>${jclouds.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jclouds.driver</groupId>
- <artifactId>jclouds-bouncycastle</artifactId>
- <version>${jclouds.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk16</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jclouds.driver</groupId>
- <artifactId>jclouds-sshj</artifactId>
- <version>${jclouds.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jclouds.driver</groupId>
- <artifactId>jclouds-log4j</artifactId>
- <version>${jclouds.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jclouds.driver</groupId>
- <artifactId>jclouds-enterprise</artifactId>
- <version>${jclouds.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jclouds.api</groupId>
- <artifactId>ec2</artifactId>
- <version>${jclouds.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jclouds.provider</groupId>
- <artifactId>aws-ec2</artifactId>
- <version>${jclouds.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jclouds.api</groupId>
- <artifactId>openstack-nova</artifactId>
- <version>${jclouds.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jclouds</groupId>
- <artifactId>jclouds-scriptbuilder</artifactId>
- <version>${jclouds.version}</version>
- </dependency>
- <dependency>
- <groupId>com.google.guava.wso2</groupId>
- <artifactId>guava</artifactId>
- <version>${google.guava.wso2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jclouds.common</groupId>
- <artifactId>aws-common</artifactId>
- <version>${jclouds.version}</version>
- </dependency>
- <dependency>
- <groupId>com.jamesmurty.utils.wso2</groupId>
- <artifactId>java-xmlbuilder</artifactId>
- <version>0.4.wso2v1</version>
- </dependency>
- <dependency>
- <groupId>org.jclouds.api</groupId>
- <artifactId>vcloud</artifactId>
- <version>1.6.0-wso2v1</version>
- </dependency>
- <dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- <version>${gson2.version}</version>
- </dependency>
- <dependency>
- <groupId>com.google.guice.wso2</groupId>
- <artifactId>guice</artifactId>
- <version>${google.guice.wso2.version}</version>
- </dependency>
- <dependency>
- <groupId>com.google.guice.assistedinject.wso2</groupId>
- <artifactId>guice-assistedinject</artifactId>
- <version>${com.google.guice.assistedinject.wso2.version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
- <version>${sun.jersey.version}</version>
- </dependency>
- <dependency>
- <groupId>net.oauth.core</groupId>
- <artifactId>oauth</artifactId>
- <version>20100527</version>
- </dependency>
- <dependency>
- <groupId>commons-io.wso2</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.0.0.wso2v1</version>
- </dependency>
- <dependency>
- <groupId>rhino.wso2</groupId>
- <artifactId>js</artifactId>
- <version>1.7.0.R1-wso2v3</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.cartridge.messages</artifactId>
- <version>2.1.1</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-resources</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>src/main/resources</outputDirectory>
- <resources>
- <resource>
- <directory>resources</directory>
- <includes>
- <include>conf/qpid-config.xml</include>
- <include>conf/qpid-virtualhosts.xml</include>
- <include>p2.inf</include>
- <include>build.properties</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.wso2.maven</groupId>
- <artifactId>carbon-p2-plugin</artifactId>
- <version>${carbon.p2.plugin.version}</version>
- <executions>
- <execution>
- <id>4-p2-feature-generation</id>
- <phase>package</phase>
- <goals>
- <goal>p2-feature-gen</goal>
- </goals>
- <configuration>
- <id>org.wso2.carbon.stratos.cloud.controller</id>
- <propertiesFile>../../../etc/feature.properties</propertiesFile>
- <adviceFile>
- <properties>
- <propertyDef>org.wso2.carbon.p2.category.type:server</propertyDef>
- <propertyDef>org.eclipse.equinox.p2.type.group:false</propertyDef>
- </properties>
- </adviceFile>
- <bundles>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.cartridge.messages:2.1.1</bundleDef>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.stratos.cloud.controller:2.1.1</bundleDef>
- <bundleDef>org.jclouds.driver:jclouds-bouncycastle:${jclouds.version}</bundleDef>
- <bundleDef>org.jclouds.driver:jclouds-sshj:${jclouds.version}</bundleDef>
- <bundleDef>org.jclouds.driver:jclouds-log4j:${jclouds.version}</bundleDef>
- <bundleDef>org.jclouds.driver:jclouds-enterprise:${jclouds.version}</bundleDef>
- <bundleDef>org.jclouds:jclouds-core:${jclouds.version}</bundleDef>
- <bundleDef>org.jclouds:jclouds-compute:${jclouds.version}</bundleDef>
- <bundleDef>org.jclouds.api:ec2:${jclouds.version}</bundleDef>
- <bundleDef>org.jclouds.api:openstack-nova:${jclouds.version}</bundleDef>
- <bundleDef>org.jclouds.api:vcloud:1.6.0-wso2v1</bundleDef>
- <bundleDef>com.jamesmurty.utils.wso2:java-xmlbuilder:0.4.wso2v1</bundleDef>
- <bundleDef>org.jclouds.common:openstack-common:${jclouds.version}</bundleDef>
- <bundleDef>org.jclouds.api:openstack-keystone:${jclouds.version}</bundleDef>
- <bundleDef>org.jclouds.provider:aws-ec2:${jclouds.version}</bundleDef>
- <bundleDef>com.google.guava.wso2:guava:${google.guava.wso2.version}</bundleDef>
- <bundleDef>org.jclouds.common:aws-common:${jclouds.version}</bundleDef>
- <bundleDef>com.google.code.gson:gson:${gson2.version}</bundleDef>
- <bundleDef>com.google.guice.wso2:guice:${google.guice.wso2.version}</bundleDef>
- <bundleDef>com.google.guice.assistedinject.wso2:guice-assistedinject:${com.google.guice.assistedinject.wso2.version}</bundleDef>
- <bundleDef>com.sun.jersey:jersey-core:${sun.jersey.version}</bundleDef>
- <bundleDef>org.jclouds:jclouds-scriptbuilder:${jclouds.version}</bundleDef>
- <bundleDef>org.apache.shindig.wso2:shindig:1.1.0.wso2v6</bundleDef>
- <bundleDef>org.99soft.guice.wso2:rocoto:6.1.wso2v1</bundleDef>
- <bundleDef>org.bouncycastle.wso2:bcprov-jdk16:1.45.wso2v1</bundleDef>
- <bundleDef>net.schmizz:sshj:0.8.0</bundleDef>
- <bundleDef>org.jclouds.driver:jclouds-joda:${jclouds.version}</bundleDef>
- <bundleDef>com.jcraft.wso2:jzlib:1.0.7.wso2v1</bundleDef>
- <bundleDef>org.jclouds.driver:jclouds-netty:${jclouds.version}</bundleDef>
- <bundleDef>io.netty:netty:3.3.0.Final</bundleDef>
- <bundleDef>commons-io.wso2:commons-io:2.0.0.wso2v1</bundleDef>
- <bundleDef>org.slf4j:slf4j-api:1.6.4</bundleDef>
- <bundleDef>org.slf4j:slf4j-log4j12:1.6.4</bundleDef>
- <bundleDef>org.jclouds.driver:jclouds-slf4j:${jclouds.version}</bundleDef>
- <bundleDef>com.google.common.wso2:google-collect:${google.collect.osgi.version}</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-->
-
- </bundles>
- <importBundles>
- </importBundles>
- <importFeatures>
- <importFeatureDef>org.wso2.carbon.core.server:${wso2carbon.version}</importFeatureDef>
- <importFeatureDef>org.wso2.carbon.lb.common:4.1.1</importFeatureDef>
- <importFeatureDef>org.wso2.carbon.ntask.core:${wso2carbon.version}</importFeatureDef>
- </importFeatures>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!--plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <id>clean resources</id>
- <phase>install</phase>
- <configuration>
- <tasks>
- <delete dir="src"/>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin-->
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/10e80078/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/build.properties
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/build.properties b/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/build.properties
deleted file mode 100644
index 93c4b10..0000000
--- a/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-custom = true
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/10e80078/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/cloud-controller.xml
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/cloud-controller.xml b/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/cloud-controller.xml
deleted file mode 100644
index 9850b53..0000000
--- a/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/cloud-controller.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!--
- ~ Copyright 2005-2011 WSO2, Inc. (http://wso2.com)
- ~
- ~ 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.
- -->
-
-<cloudController xmlns:svns="http://org.wso2.securevault/configuration">
-
- <svns:secureVault
- provider="org.wso2.securevault.secret.handler.SecretManagerSecretCallbackHandler" />
-
- <dataPublisher enable="false">
- <!-- BAM Server Info - default values are 'admin' and 'admin'
- Optional element. -->
- <bamServer>
- <!-- BAM server URL should be specified in carbon.xml -->
- <adminUserName>admin</adminUserName>
- <adminPassword svns:secretAlias="cloud.controller.bam.server.admin.password">admin</adminPassword>
- </bamServer>
- <!-- Default cron expression is '1 * * * * ? *' meaning 'first second of every minute'.
- Optional element. -->
- <cron>1 * * * * ? *</cron>
- <!-- Cassandra cluster related info -->
- <!--cassandraInfo>
- <connectionUrl>localhost:9160</connectionUrl>
- <userName>admin</userName>
- <password svns:secretAlias="cloud.controller.cassandra.server.password">admin</password>
- </cassandraInfo-->
- </dataPublisher>
-
- <topologySync enable="true">
- <!-- MB server info -->
- <mbServerUrl>localhost:5674</mbServerUrl>
- <cron>1 * * * * ? *</cron>
- </topologySync>
-
- <!-- Specify the properties that are common to an IaaS here. This element
- is not necessary [0..1]. But you can use this section to avoid specifying
- same property over and over again. -->
- <iaasProviders>
- <!--iaasProvider type="ec2" name="ec2 specific details">
- <className>org.wso2.carbon.stratos.cloud.controller.iaases.AWSEC2Iaas</className>
- <provider>aws-ec2</provider>
- <identity svns:secretAlias="elastic.scaler.openstack.identity">dhsaghfdal</identity>
- <credential svns:secretAlias="elastic.scaler.openstack.credential">jdkjaskd</credential>
- <scaleUpOrder>1</scaleUpOrder>
- <scaleDownOrder>2</scaleDownOrder>
- <property name="jclouds.ec2.ami-query" value="owner-id=XX-XX-XX;state=available;image-type=machine"/>
- <property name="availabilityZone" value="us-east-1c"/>
- <property name="securityGroups" value="manager,cep,mb,default"/>
- <property name="instanceType" value="m1.large"/>
- <property name="keyPair" value="nirmal-key"/>
- <imageId>us-east-1/ami-52409a3b</imageId>
- </iaasProvider-->
- <iaasProvider type="openstack" name="openstack specific details">
- <className>org.wso2.carbon.stratos.cloud.controller.iaases.OpenstackNovaIaas</className>
- <provider>openstack-nova</provider>
- <identity svns:secretAlias="cloud.controller.openstack.identity">demo:demo</identity>
- <credential svns:secretAlias="cloud.controller.openstack.credential">openstack</credential>
- <property name="jclouds.endpoint" value="http://192.168.16.20:5000/" />
- <property name="jclouds.openstack-nova.auto-create-floating-ips" value="false"/>
- <property name="jclouds.api-version" value="2.0/" />
- <scaleUpOrder>2</scaleUpOrder>
- <scaleDownOrder>3</scaleDownOrder>
- <property name="X" value="x" />
- <property name="Y" value="y" />
- <imageId>nova/dab37f0e-cf6f-4812-86fc-733acf22d5e6</imageId>
- </iaasProvider>
- </iaasProviders>
-</cloudController>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/10e80078/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/etc/cartridge.xsd
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/etc/cartridge.xsd b/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/etc/cartridge.xsd
deleted file mode 100644
index 222a510..0000000
--- a/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/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/10e80078/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/etc/cartridges.xsd
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/etc/cartridges.xsd b/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/etc/cartridges.xsd
deleted file mode 100644
index 1b383e4..0000000
--- a/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/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/10e80078/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/etc/service.xsd
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/etc/service.xsd b/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/etc/service.xsd
deleted file mode 100644
index 48a8532..0000000
--- a/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/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/10e80078/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/etc/services.xsd
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/etc/services.xsd b/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/etc/services.xsd
deleted file mode 100644
index 5fc9fb7..0000000
--- a/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/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/10e80078/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/p2.inf
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/p2.inf b/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/p2.inf
deleted file mode 100644
index 998f6e2..0000000
--- a/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/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/10e80078/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.3/pom.xml
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.3/pom.xml b/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.3/pom.xml
deleted file mode 100644
index 234d0d2..0000000
--- a/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.3/pom.xml
+++ /dev/null
@@ -1,293 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (c) 2009-2011, 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>cloud-controller-feature</artifactId>
- <version>2.1.0</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <version>2.1.3</version>
- <artifactId>org.wso2.carbon.stratos.cloud.controller.feature</artifactId>
- <packaging>pom</packaging>
- <name>WSO2 Carbon - Stratos Cloud Controller Feature</name>
- <url>http://wso2.org</url>
- <description>This feature contains the required bundles for the functionality of Cloud Controller</description>
- <dependencies>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.stratos.cloud.controller</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jclouds</groupId>
- <artifactId>jclouds-core</artifactId>
- <version>${jclouds.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jclouds</groupId>
- <artifactId>jclouds-compute</artifactId>
- <version>${jclouds.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jclouds.driver</groupId>
- <artifactId>jclouds-bouncycastle</artifactId>
- <version>${jclouds.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk16</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jclouds.driver</groupId>
- <artifactId>jclouds-sshj</artifactId>
- <version>${jclouds.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jclouds.driver</groupId>
- <artifactId>jclouds-log4j</artifactId>
- <version>${jclouds.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jclouds.driver</groupId>
- <artifactId>jclouds-enterprise</artifactId>
- <version>${jclouds.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jclouds.api</groupId>
- <artifactId>ec2</artifactId>
- <version>${jclouds.wso2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jclouds.provider</groupId>
- <artifactId>aws-ec2</artifactId>
- <version>${jclouds.wso2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jclouds.api</groupId>
- <artifactId>openstack-nova</artifactId>
- <version>${jclouds.wso2.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jclouds.api</groupId>
- <artifactId>openstack-keystone</artifactId>
- <version>${jclouds.wso2.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jclouds</groupId>
- <artifactId>jclouds-scriptbuilder</artifactId>
- <version>${jclouds.version}</version>
- </dependency>
- <dependency>
- <groupId>com.google.guava.wso2</groupId>
- <artifactId>guava</artifactId>
- <version>${google.guava.wso2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jclouds.common</groupId>
- <artifactId>aws-common</artifactId>
- <version>${jclouds.version}</version>
- </dependency>
- <dependency>
- <groupId>com.jamesmurty.utils.wso2</groupId>
- <artifactId>java-xmlbuilder</artifactId>
- <version>0.4.wso2v1</version>
- </dependency>
- <dependency>
- <groupId>org.jclouds.api</groupId>
- <artifactId>vcloud</artifactId>
- <version>1.6.0-wso2v1</version>
- </dependency>
- <dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- <version>${gson2.version}</version>
- </dependency>
- <dependency>
- <groupId>com.google.guice.wso2</groupId>
- <artifactId>guice</artifactId>
- <version>${google.guice.wso2.version}</version>
- </dependency>
- <dependency>
- <groupId>com.google.guice.assistedinject.wso2</groupId>
- <artifactId>guice-assistedinject</artifactId>
- <version>${com.google.guice.assistedinject.wso2.version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
- <version>${sun.jersey.version}</version>
- </dependency>
- <dependency>
- <groupId>net.oauth.core</groupId>
- <artifactId>oauth</artifactId>
- <version>20100527</version>
- </dependency>
- <dependency>
- <groupId>commons-io.wso2</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.0.0.wso2v1</version>
- </dependency>
- <dependency>
- <groupId>rhino.wso2</groupId>
- <artifactId>js</artifactId>
- <version>1.7.0.R1-wso2v3</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.cartridge.messages</artifactId>
- <version>2.1.1</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-resources</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>src/main/resources</outputDirectory>
- <resources>
- <resource>
- <directory>resources</directory>
- <includes>
- <include>conf/qpid-config.xml</include>
- <include>conf/qpid-virtualhosts.xml</include>
- <include>p2.inf</include>
- <include>build.properties</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.wso2.maven</groupId>
- <artifactId>carbon-p2-plugin</artifactId>
- <version>${carbon.p2.plugin.version}</version>
- <executions>
- <execution>
- <id>4-p2-feature-generation</id>
- <phase>package</phase>
- <goals>
- <goal>p2-feature-gen</goal>
- </goals>
- <configuration>
- <id>org.wso2.carbon.stratos.cloud.controller</id>
- <propertiesFile>../../../etc/feature.properties</propertiesFile>
- <adviceFile>
- <properties>
- <propertyDef>org.wso2.carbon.p2.category.type:server</propertyDef>
- <propertyDef>org.eclipse.equinox.p2.type.group:false</propertyDef>
- </properties>
- </adviceFile>
- <bundles>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.cartridge.messages:2.1.1</bundleDef>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.stratos.cloud.controller:2.1.3</bundleDef>
- <bundleDef>org.jclouds.driver:jclouds-bouncycastle:${jclouds.version}</bundleDef>
- <bundleDef>org.jclouds.driver:jclouds-sshj:${jclouds.version}</bundleDef>
- <bundleDef>org.jclouds.driver:jclouds-log4j:${jclouds.version}</bundleDef>
- <bundleDef>org.jclouds.driver:jclouds-enterprise:${jclouds.version}</bundleDef>
- <bundleDef>org.jclouds:jclouds-core:${jclouds.version}</bundleDef>
- <bundleDef>org.jclouds:jclouds-compute:${jclouds.version}</bundleDef>
- <bundleDef>org.jclouds.api:ec2:${jclouds.wso2.version}</bundleDef>
- <bundleDef>org.jclouds.api:openstack-nova:${jclouds.wso2.version}</bundleDef>
- <bundleDef>org.jclouds.api:vcloud:1.6.0-wso2v1</bundleDef>
- <bundleDef>com.jamesmurty.utils.wso2:java-xmlbuilder:0.4.wso2v1</bundleDef>
- <bundleDef>org.jclouds.common:openstack-common:${jclouds.version}</bundleDef>
- <bundleDef>org.jclouds.api:openstack-keystone:${jclouds.wso2.version}</bundleDef>
- <bundleDef>org.jclouds.provider:aws-ec2:${jclouds.wso2.version}</bundleDef>
- <bundleDef>com.google.guava.wso2:guava:${google.guava.wso2.version}</bundleDef>
- <bundleDef>org.jclouds.common:aws-common:${jclouds.version}</bundleDef>
- <bundleDef>com.google.code.gson:gson:${gson2.version}</bundleDef>
- <bundleDef>com.google.guice.wso2:guice:${google.guice.wso2.version}</bundleDef>
- <bundleDef>com.google.guice.assistedinject.wso2:guice-assistedinject:${com.google.guice.assistedinject.wso2.version}</bundleDef>
- <bundleDef>com.sun.jersey:jersey-core:${sun.jersey.version}</bundleDef>
- <bundleDef>org.jclouds:jclouds-scriptbuilder:${jclouds.version}</bundleDef>
- <bundleDef>org.apache.shindig.wso2:shindig:1.1.0.wso2v6</bundleDef>
- <bundleDef>org.99soft.guice.wso2:rocoto:6.1.wso2v1</bundleDef>
- <bundleDef>org.bouncycastle.wso2:bcprov-jdk16:1.45.wso2v1</bundleDef>
- <bundleDef>net.schmizz:sshj:0.8.0</bundleDef>
- <bundleDef>org.jclouds.driver:jclouds-joda:${jclouds.version}</bundleDef>
- <bundleDef>com.jcraft.wso2:jzlib:1.0.7.wso2v1</bundleDef>
- <bundleDef>org.jclouds.driver:jclouds-netty:${jclouds.version}</bundleDef>
- <bundleDef>io.netty:netty:3.3.0.Final</bundleDef>
- <bundleDef>commons-io.wso2:commons-io:2.0.0.wso2v1</bundleDef>
- <bundleDef>org.slf4j:slf4j-api:1.6.4</bundleDef>
- <bundleDef>org.slf4j:slf4j-log4j12:1.6.4</bundleDef>
- <bundleDef>org.jclouds.driver:jclouds-slf4j:${jclouds.version}</bundleDef>
- <bundleDef>com.google.common.wso2:google-collect:${google.collect.osgi.version}</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-->
-
- </bundles>
- <importBundles>
- </importBundles>
- <importFeatures>
- <importFeatureDef>org.wso2.carbon.core.server:${wso2carbon.version}</importFeatureDef>
- <importFeatureDef>org.wso2.carbon.lb.common:4.1.3</importFeatureDef>
- <importFeatureDef>org.wso2.carbon.ntask.core:${wso2carbon.version}</importFeatureDef>
- </importFeatures>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!--plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <id>clean resources</id>
- <phase>install</phase>
- <configuration>
- <tasks>
- <delete dir="src"/>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin-->
- </plugins>
- </build>
-
- <properties>
- <jclouds.wso2.version>1.5.0-beta.5.wso2v1</jclouds.wso2.version>
- </properties>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/10e80078/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.3/src/main/resources/build.properties
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.3/src/main/resources/build.properties b/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.3/src/main/resources/build.properties
deleted file mode 100644
index 93c4b10..0000000
--- a/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.3/src/main/resources/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-custom = true
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/10e80078/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.3/src/main/resources/conf/cloud-controller.xml
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.3/src/main/resources/conf/cloud-controller.xml b/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.3/src/main/resources/conf/cloud-controller.xml
deleted file mode 100644
index 9850b53..0000000
--- a/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.3/src/main/resources/conf/cloud-controller.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!--
- ~ Copyright 2005-2011 WSO2, Inc. (http://wso2.com)
- ~
- ~ 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.
- -->
-
-<cloudController xmlns:svns="http://org.wso2.securevault/configuration">
-
- <svns:secureVault
- provider="org.wso2.securevault.secret.handler.SecretManagerSecretCallbackHandler" />
-
- <dataPublisher enable="false">
- <!-- BAM Server Info - default values are 'admin' and 'admin'
- Optional element. -->
- <bamServer>
- <!-- BAM server URL should be specified in carbon.xml -->
- <adminUserName>admin</adminUserName>
- <adminPassword svns:secretAlias="cloud.controller.bam.server.admin.password">admin</adminPassword>
- </bamServer>
- <!-- Default cron expression is '1 * * * * ? *' meaning 'first second of every minute'.
- Optional element. -->
- <cron>1 * * * * ? *</cron>
- <!-- Cassandra cluster related info -->
- <!--cassandraInfo>
- <connectionUrl>localhost:9160</connectionUrl>
- <userName>admin</userName>
- <password svns:secretAlias="cloud.controller.cassandra.server.password">admin</password>
- </cassandraInfo-->
- </dataPublisher>
-
- <topologySync enable="true">
- <!-- MB server info -->
- <mbServerUrl>localhost:5674</mbServerUrl>
- <cron>1 * * * * ? *</cron>
- </topologySync>
-
- <!-- Specify the properties that are common to an IaaS here. This element
- is not necessary [0..1]. But you can use this section to avoid specifying
- same property over and over again. -->
- <iaasProviders>
- <!--iaasProvider type="ec2" name="ec2 specific details">
- <className>org.wso2.carbon.stratos.cloud.controller.iaases.AWSEC2Iaas</className>
- <provider>aws-ec2</provider>
- <identity svns:secretAlias="elastic.scaler.openstack.identity">dhsaghfdal</identity>
- <credential svns:secretAlias="elastic.scaler.openstack.credential">jdkjaskd</credential>
- <scaleUpOrder>1</scaleUpOrder>
- <scaleDownOrder>2</scaleDownOrder>
- <property name="jclouds.ec2.ami-query" value="owner-id=XX-XX-XX;state=available;image-type=machine"/>
- <property name="availabilityZone" value="us-east-1c"/>
- <property name="securityGroups" value="manager,cep,mb,default"/>
- <property name="instanceType" value="m1.large"/>
- <property name="keyPair" value="nirmal-key"/>
- <imageId>us-east-1/ami-52409a3b</imageId>
- </iaasProvider-->
- <iaasProvider type="openstack" name="openstack specific details">
- <className>org.wso2.carbon.stratos.cloud.controller.iaases.OpenstackNovaIaas</className>
- <provider>openstack-nova</provider>
- <identity svns:secretAlias="cloud.controller.openstack.identity">demo:demo</identity>
- <credential svns:secretAlias="cloud.controller.openstack.credential">openstack</credential>
- <property name="jclouds.endpoint" value="http://192.168.16.20:5000/" />
- <property name="jclouds.openstack-nova.auto-create-floating-ips" value="false"/>
- <property name="jclouds.api-version" value="2.0/" />
- <scaleUpOrder>2</scaleUpOrder>
- <scaleDownOrder>3</scaleDownOrder>
- <property name="X" value="x" />
- <property name="Y" value="y" />
- <imageId>nova/dab37f0e-cf6f-4812-86fc-733acf22d5e6</imageId>
- </iaasProvider>
- </iaasProviders>
-</cloudController>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/10e80078/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.3/src/main/resources/conf/etc/cartridge.xsd
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.3/src/main/resources/conf/etc/cartridge.xsd b/features/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/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/10e80078/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.3/src/main/resources/conf/etc/cartridges.xsd
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.3/src/main/resources/conf/etc/cartridges.xsd b/features/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/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/10e80078/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.3/src/main/resources/conf/etc/service.xsd
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.3/src/main/resources/conf/etc/service.xsd b/features/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/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/10e80078/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.3/src/main/resources/conf/etc/services.xsd
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.3/src/main/resources/conf/etc/services.xsd b/features/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/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/10e80078/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.3/src/main/resources/p2.inf
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.3/src/main/resources/p2.inf b/features/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/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/10e80078/features/cloud-controller/pom.xml
----------------------------------------------------------------------
diff --git a/features/cloud-controller/pom.xml b/features/cloud-controller/pom.xml
index fee4a14..aaf6ae8 100644
--- a/features/cloud-controller/pom.xml
+++ b/features/cloud-controller/pom.xml
@@ -20,20 +20,21 @@
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>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>stratos-features-parent</artifactId>
+ <version>2.0.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cloud-controller-feature</artifactId>
+ <version>2.0.0</version>
<packaging>pom</packaging>
- <name>WSO2 Carbon - Cloud Controller Feature Aggregator Module</name>
+ <name>Apache Cloud Controller Feature Aggregator Module</name>
<url>http://wso2.org</url>
<modules>
- <module>org.wso2.carbon.stratos.cloud.controller.feature/2.1.1</module>
+ <module>org.apache.stratos.cloud.controller.feature/2.1.3</module>
</modules>
<!-- <dependencyManagement>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/10e80078/features/pom.xml
----------------------------------------------------------------------
diff --git a/features/pom.xml b/features/pom.xml
index 51ed421..1d13a92 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -51,7 +51,7 @@
<modules>
<module>load-balancer</module>
- <module>autoscaler</module>
+ <module>autoscaler</module>
<module>tenantaware-load-balancer</module>
</modules>
@@ -79,6 +79,14 @@
<carbon.patch.version.4.1.1>4.1.1</carbon.patch.version.4.1.1>
<carbon.p2.plugin.version>1.5.2</carbon.p2.plugin.version>
<synapse.wso2.version>2.1.1-wso2v4</synapse.wso2.version>
+ <jclouds.version>1.5.0-beta.5</jclouds.version>
+ <google.guava.wso2.version>12.0.0.wso2v1</google.guava.wso2.version>
+ <google.guice.wso2.version>3.0.wso2v1</google.guice.wso2.version>
+ <com.google.guice.assistedinject.wso2.version>3.0.wso2v1</com.google.guice.assistedinject.wso2.version>
+ <com.google.guice.assistedinject.wso2.version>3.0.wso2v1</com.google.guice.assistedinject.wso2.version>
+ <sun.jersey.version>1.12</sun.jersey.version>
+ <gson2.version>2.2</gson2.version>
+ <google.collect.osgi.version>1.0.0.wso2v2</google.collect.osgi.version>
</properties>
</project>
[2/2] git commit: refactoring Cloud controller feature and changing
the name of the coloud controller component name
Posted by la...@apache.org.
refactoring Cloud controller feature and changing the name of the coloud controller component name
Signed-off-by: Lakmal Warusawithana <la...@wso2.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/10e80078
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/10e80078
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/10e80078
Branch: refs/heads/master
Commit: 10e80078feffcce3e23cc7cd4c041462dd10f42e
Parents: 1803411
Author: Udara Liyanage <ud...@wso2.com>
Authored: Fri Jul 5 13:58:26 2013 +0530
Committer: Lakmal Warusawithana <la...@wso2.com>
Committed: Fri Jul 5 15:38:16 2013 +0530
----------------------------------------------------------------------
.../2.1.3/pom.xml | 2 +-
.../2.1.1/pom.xml | 282 ++++++++++++++++++
.../2.1.1/src/main/resources/build.properties | 1 +
.../main/resources/conf/cloud-controller.xml | 82 ++++++
.../src/main/resources/conf/etc/cartridge.xsd | 133 +++++++++
.../src/main/resources/conf/etc/cartridges.xsd | 144 +++++++++
.../src/main/resources/conf/etc/service.xsd | 46 +++
.../src/main/resources/conf/etc/services.xsd | 51 ++++
.../2.1.1/src/main/resources/p2.inf | 8 +
.../2.1.3/pom.xml | 293 +++++++++++++++++++
.../2.1.3/src/main/resources/build.properties | 1 +
.../main/resources/conf/cloud-controller.xml | 82 ++++++
.../src/main/resources/conf/etc/cartridge.xsd | 133 +++++++++
.../src/main/resources/conf/etc/cartridges.xsd | 144 +++++++++
.../src/main/resources/conf/etc/service.xsd | 46 +++
.../src/main/resources/conf/etc/services.xsd | 51 ++++
.../2.1.3/src/main/resources/p2.inf | 8 +
.../2.1.1/pom.xml | 282 ------------------
.../2.1.1/src/main/resources/build.properties | 1 -
.../main/resources/conf/cloud-controller.xml | 82 ------
.../src/main/resources/conf/etc/cartridge.xsd | 133 ---------
.../src/main/resources/conf/etc/cartridges.xsd | 144 ---------
.../src/main/resources/conf/etc/service.xsd | 46 ---
.../src/main/resources/conf/etc/services.xsd | 51 ----
.../2.1.1/src/main/resources/p2.inf | 8 -
.../2.1.3/pom.xml | 293 -------------------
.../2.1.3/src/main/resources/build.properties | 1 -
.../main/resources/conf/cloud-controller.xml | 82 ------
.../src/main/resources/conf/etc/cartridge.xsd | 133 ---------
.../src/main/resources/conf/etc/cartridges.xsd | 144 ---------
.../src/main/resources/conf/etc/service.xsd | 46 ---
.../src/main/resources/conf/etc/services.xsd | 51 ----
.../2.1.3/src/main/resources/p2.inf | 8 -
features/cloud-controller/pom.xml | 11 +-
features/pom.xml | 10 +-
35 files changed, 1521 insertions(+), 1512 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/10e80078/components/org.apache.stratos.cloud.controller/2.1.3/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/2.1.3/pom.xml b/components/org.apache.stratos.cloud.controller/2.1.3/pom.xml
index 0626149..b461e7e 100644
--- a/components/org.apache.stratos.cloud.controller/2.1.3/pom.xml
+++ b/components/org.apache.stratos.cloud.controller/2.1.3/pom.xml
@@ -36,7 +36,7 @@
<artifactId>org.apache.stratos.cloud.controller</artifactId>
<packaging>bundle</packaging>
<version>2.1.3</version>
- <name>Apache - Stratos Cloud Controller</name>
+ <name>Apache Stratos Cloud Controller</name>
<url>http://apache.org</url>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/10e80078/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.1/pom.xml
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.1/pom.xml b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.1/pom.xml
new file mode 100644
index 0000000..c444792
--- /dev/null
+++ b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.1/pom.xml
@@ -0,0 +1,282 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (c) 2009-2011, 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>cloud-controller-feature</artifactId>
+ <version>2.1.0</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <version>2.1.1</version>
+ <artifactId>org.wso2.carbon.stratos.cloud.controller.feature</artifactId>
+ <packaging>pom</packaging>
+ <name>WSO2 Carbon - Stratos Cloud Controller Feature</name>
+ <url>http://wso2.org</url>
+ <description>This feature contains the required bundles for the functionality of Cloud Controller</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.stratos.cloud.controller</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jclouds</groupId>
+ <artifactId>jclouds-core</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jclouds</groupId>
+ <artifactId>jclouds-compute</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jclouds.driver</groupId>
+ <artifactId>jclouds-bouncycastle</artifactId>
+ <version>${jclouds.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk16</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jclouds.driver</groupId>
+ <artifactId>jclouds-sshj</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jclouds.driver</groupId>
+ <artifactId>jclouds-log4j</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jclouds.driver</groupId>
+ <artifactId>jclouds-enterprise</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jclouds.api</groupId>
+ <artifactId>ec2</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jclouds.provider</groupId>
+ <artifactId>aws-ec2</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jclouds.api</groupId>
+ <artifactId>openstack-nova</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jclouds</groupId>
+ <artifactId>jclouds-scriptbuilder</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava.wso2</groupId>
+ <artifactId>guava</artifactId>
+ <version>${google.guava.wso2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jclouds.common</groupId>
+ <artifactId>aws-common</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.jamesmurty.utils.wso2</groupId>
+ <artifactId>java-xmlbuilder</artifactId>
+ <version>0.4.wso2v1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jclouds.api</groupId>
+ <artifactId>vcloud</artifactId>
+ <version>1.6.0-wso2v1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>${gson2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guice.wso2</groupId>
+ <artifactId>guice</artifactId>
+ <version>${google.guice.wso2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guice.assistedinject.wso2</groupId>
+ <artifactId>guice-assistedinject</artifactId>
+ <version>${com.google.guice.assistedinject.wso2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ <version>${sun.jersey.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.oauth.core</groupId>
+ <artifactId>oauth</artifactId>
+ <version>20100527</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io.wso2</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.0.0.wso2v1</version>
+ </dependency>
+ <dependency>
+ <groupId>rhino.wso2</groupId>
+ <artifactId>js</artifactId>
+ <version>1.7.0.R1-wso2v3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.cartridge.messages</artifactId>
+ <version>2.1.1</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-resources</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>src/main/resources</outputDirectory>
+ <resources>
+ <resource>
+ <directory>resources</directory>
+ <includes>
+ <include>conf/qpid-config.xml</include>
+ <include>conf/qpid-virtualhosts.xml</include>
+ <include>p2.inf</include>
+ <include>build.properties</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.wso2.maven</groupId>
+ <artifactId>carbon-p2-plugin</artifactId>
+ <version>${carbon.p2.plugin.version}</version>
+ <executions>
+ <execution>
+ <id>4-p2-feature-generation</id>
+ <phase>package</phase>
+ <goals>
+ <goal>p2-feature-gen</goal>
+ </goals>
+ <configuration>
+ <id>org.wso2.carbon.stratos.cloud.controller</id>
+ <propertiesFile>../../../etc/feature.properties</propertiesFile>
+ <adviceFile>
+ <properties>
+ <propertyDef>org.wso2.carbon.p2.category.type:server</propertyDef>
+ <propertyDef>org.eclipse.equinox.p2.type.group:false</propertyDef>
+ </properties>
+ </adviceFile>
+ <bundles>
+ <bundleDef>org.wso2.carbon:org.wso2.carbon.cartridge.messages:2.1.1</bundleDef>
+ <bundleDef>org.wso2.carbon:org.wso2.carbon.stratos.cloud.controller:2.1.1</bundleDef>
+ <bundleDef>org.jclouds.driver:jclouds-bouncycastle:${jclouds.version}</bundleDef>
+ <bundleDef>org.jclouds.driver:jclouds-sshj:${jclouds.version}</bundleDef>
+ <bundleDef>org.jclouds.driver:jclouds-log4j:${jclouds.version}</bundleDef>
+ <bundleDef>org.jclouds.driver:jclouds-enterprise:${jclouds.version}</bundleDef>
+ <bundleDef>org.jclouds:jclouds-core:${jclouds.version}</bundleDef>
+ <bundleDef>org.jclouds:jclouds-compute:${jclouds.version}</bundleDef>
+ <bundleDef>org.jclouds.api:ec2:${jclouds.version}</bundleDef>
+ <bundleDef>org.jclouds.api:openstack-nova:${jclouds.version}</bundleDef>
+ <bundleDef>org.jclouds.api:vcloud:1.6.0-wso2v1</bundleDef>
+ <bundleDef>com.jamesmurty.utils.wso2:java-xmlbuilder:0.4.wso2v1</bundleDef>
+ <bundleDef>org.jclouds.common:openstack-common:${jclouds.version}</bundleDef>
+ <bundleDef>org.jclouds.api:openstack-keystone:${jclouds.version}</bundleDef>
+ <bundleDef>org.jclouds.provider:aws-ec2:${jclouds.version}</bundleDef>
+ <bundleDef>com.google.guava.wso2:guava:${google.guava.wso2.version}</bundleDef>
+ <bundleDef>org.jclouds.common:aws-common:${jclouds.version}</bundleDef>
+ <bundleDef>com.google.code.gson:gson:${gson2.version}</bundleDef>
+ <bundleDef>com.google.guice.wso2:guice:${google.guice.wso2.version}</bundleDef>
+ <bundleDef>com.google.guice.assistedinject.wso2:guice-assistedinject:${com.google.guice.assistedinject.wso2.version}</bundleDef>
+ <bundleDef>com.sun.jersey:jersey-core:${sun.jersey.version}</bundleDef>
+ <bundleDef>org.jclouds:jclouds-scriptbuilder:${jclouds.version}</bundleDef>
+ <bundleDef>org.apache.shindig.wso2:shindig:1.1.0.wso2v6</bundleDef>
+ <bundleDef>org.99soft.guice.wso2:rocoto:6.1.wso2v1</bundleDef>
+ <bundleDef>org.bouncycastle.wso2:bcprov-jdk16:1.45.wso2v1</bundleDef>
+ <bundleDef>net.schmizz:sshj:0.8.0</bundleDef>
+ <bundleDef>org.jclouds.driver:jclouds-joda:${jclouds.version}</bundleDef>
+ <bundleDef>com.jcraft.wso2:jzlib:1.0.7.wso2v1</bundleDef>
+ <bundleDef>org.jclouds.driver:jclouds-netty:${jclouds.version}</bundleDef>
+ <bundleDef>io.netty:netty:3.3.0.Final</bundleDef>
+ <bundleDef>commons-io.wso2:commons-io:2.0.0.wso2v1</bundleDef>
+ <bundleDef>org.slf4j:slf4j-api:1.6.4</bundleDef>
+ <bundleDef>org.slf4j:slf4j-log4j12:1.6.4</bundleDef>
+ <bundleDef>org.jclouds.driver:jclouds-slf4j:${jclouds.version}</bundleDef>
+ <bundleDef>com.google.common.wso2:google-collect:${google.collect.osgi.version}</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-->
+
+ </bundles>
+ <importBundles>
+ </importBundles>
+ <importFeatures>
+ <importFeatureDef>org.wso2.carbon.core.server:${wso2carbon.version}</importFeatureDef>
+ <importFeatureDef>org.wso2.carbon.lb.common:4.1.1</importFeatureDef>
+ <importFeatureDef>org.wso2.carbon.ntask.core:${wso2carbon.version}</importFeatureDef>
+ </importFeatures>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!--plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <id>clean resources</id>
+ <phase>install</phase>
+ <configuration>
+ <tasks>
+ <delete dir="src"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin-->
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/10e80078/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.1/src/main/resources/build.properties
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.1/src/main/resources/build.properties b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.1/src/main/resources/build.properties
new file mode 100644
index 0000000..93c4b10
--- /dev/null
+++ b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.1/src/main/resources/build.properties
@@ -0,0 +1 @@
+custom = true
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/10e80078/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/cloud-controller.xml
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/cloud-controller.xml b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/cloud-controller.xml
new file mode 100644
index 0000000..9850b53
--- /dev/null
+++ b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/cloud-controller.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+ ~ Copyright 2005-2011 WSO2, Inc. (http://wso2.com)
+ ~
+ ~ 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.
+ -->
+
+<cloudController xmlns:svns="http://org.wso2.securevault/configuration">
+
+ <svns:secureVault
+ provider="org.wso2.securevault.secret.handler.SecretManagerSecretCallbackHandler" />
+
+ <dataPublisher enable="false">
+ <!-- BAM Server Info - default values are 'admin' and 'admin'
+ Optional element. -->
+ <bamServer>
+ <!-- BAM server URL should be specified in carbon.xml -->
+ <adminUserName>admin</adminUserName>
+ <adminPassword svns:secretAlias="cloud.controller.bam.server.admin.password">admin</adminPassword>
+ </bamServer>
+ <!-- Default cron expression is '1 * * * * ? *' meaning 'first second of every minute'.
+ Optional element. -->
+ <cron>1 * * * * ? *</cron>
+ <!-- Cassandra cluster related info -->
+ <!--cassandraInfo>
+ <connectionUrl>localhost:9160</connectionUrl>
+ <userName>admin</userName>
+ <password svns:secretAlias="cloud.controller.cassandra.server.password">admin</password>
+ </cassandraInfo-->
+ </dataPublisher>
+
+ <topologySync enable="true">
+ <!-- MB server info -->
+ <mbServerUrl>localhost:5674</mbServerUrl>
+ <cron>1 * * * * ? *</cron>
+ </topologySync>
+
+ <!-- Specify the properties that are common to an IaaS here. This element
+ is not necessary [0..1]. But you can use this section to avoid specifying
+ same property over and over again. -->
+ <iaasProviders>
+ <!--iaasProvider type="ec2" name="ec2 specific details">
+ <className>org.wso2.carbon.stratos.cloud.controller.iaases.AWSEC2Iaas</className>
+ <provider>aws-ec2</provider>
+ <identity svns:secretAlias="elastic.scaler.openstack.identity">dhsaghfdal</identity>
+ <credential svns:secretAlias="elastic.scaler.openstack.credential">jdkjaskd</credential>
+ <scaleUpOrder>1</scaleUpOrder>
+ <scaleDownOrder>2</scaleDownOrder>
+ <property name="jclouds.ec2.ami-query" value="owner-id=XX-XX-XX;state=available;image-type=machine"/>
+ <property name="availabilityZone" value="us-east-1c"/>
+ <property name="securityGroups" value="manager,cep,mb,default"/>
+ <property name="instanceType" value="m1.large"/>
+ <property name="keyPair" value="nirmal-key"/>
+ <imageId>us-east-1/ami-52409a3b</imageId>
+ </iaasProvider-->
+ <iaasProvider type="openstack" name="openstack specific details">
+ <className>org.wso2.carbon.stratos.cloud.controller.iaases.OpenstackNovaIaas</className>
+ <provider>openstack-nova</provider>
+ <identity svns:secretAlias="cloud.controller.openstack.identity">demo:demo</identity>
+ <credential svns:secretAlias="cloud.controller.openstack.credential">openstack</credential>
+ <property name="jclouds.endpoint" value="http://192.168.16.20:5000/" />
+ <property name="jclouds.openstack-nova.auto-create-floating-ips" value="false"/>
+ <property name="jclouds.api-version" value="2.0/" />
+ <scaleUpOrder>2</scaleUpOrder>
+ <scaleDownOrder>3</scaleDownOrder>
+ <property name="X" value="x" />
+ <property name="Y" value="y" />
+ <imageId>nova/dab37f0e-cf6f-4812-86fc-733acf22d5e6</imageId>
+ </iaasProvider>
+ </iaasProviders>
+</cloudController>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/10e80078/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/etc/cartridge.xsd
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/etc/cartridge.xsd b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/etc/cartridge.xsd
new file mode 100644
index 0000000..222a510
--- /dev/null
+++ b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/etc/cartridge.xsd
@@ -0,0 +1,133 @@
+<?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/10e80078/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/etc/cartridges.xsd
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/etc/cartridges.xsd b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/etc/cartridges.xsd
new file mode 100644
index 0000000..1b383e4
--- /dev/null
+++ b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/etc/cartridges.xsd
@@ -0,0 +1,144 @@
+<?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/10e80078/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/etc/service.xsd
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/etc/service.xsd b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/etc/service.xsd
new file mode 100644
index 0000000..48a8532
--- /dev/null
+++ b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/etc/service.xsd
@@ -0,0 +1,46 @@
+<?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/10e80078/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/etc/services.xsd
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/etc/services.xsd b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/etc/services.xsd
new file mode 100644
index 0000000..5fc9fb7
--- /dev/null
+++ b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/etc/services.xsd
@@ -0,0 +1,51 @@
+<?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/10e80078/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.1/src/main/resources/p2.inf
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.1/src/main/resources/p2.inf b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.1/src/main/resources/p2.inf
new file mode 100644
index 0000000..998f6e2
--- /dev/null
+++ b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.1/src/main/resources/p2.inf
@@ -0,0 +1,8 @@
+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/10e80078/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.3/pom.xml
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.3/pom.xml b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.3/pom.xml
new file mode 100644
index 0000000..ae16e27
--- /dev/null
+++ b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.3/pom.xml
@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (c) 2009-2011, 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.apache.stratos</groupId>
+ <artifactId>cloud-controller-feature</artifactId>
+ <version>2.0.0</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <version>2.1.3</version>
+ <artifactId>org.wso2.carbon.stratos.cloud.controller.feature</artifactId>
+ <packaging>pom</packaging>
+ <name>WSO2 Carbon - Stratos Cloud Controller Feature</name>
+ <url>http://wso2.org</url>
+ <description>This feature contains the required bundles for the functionality of Cloud Controller</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.cloud.controller</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jclouds</groupId>
+ <artifactId>jclouds-core</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jclouds</groupId>
+ <artifactId>jclouds-compute</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jclouds.driver</groupId>
+ <artifactId>jclouds-bouncycastle</artifactId>
+ <version>${jclouds.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk16</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jclouds.driver</groupId>
+ <artifactId>jclouds-sshj</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jclouds.driver</groupId>
+ <artifactId>jclouds-log4j</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jclouds.driver</groupId>
+ <artifactId>jclouds-enterprise</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jclouds.api</groupId>
+ <artifactId>ec2</artifactId>
+ <version>${jclouds.wso2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jclouds.provider</groupId>
+ <artifactId>aws-ec2</artifactId>
+ <version>${jclouds.wso2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jclouds.api</groupId>
+ <artifactId>openstack-nova</artifactId>
+ <version>${jclouds.wso2.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jclouds.api</groupId>
+ <artifactId>openstack-keystone</artifactId>
+ <version>${jclouds.wso2.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jclouds</groupId>
+ <artifactId>jclouds-scriptbuilder</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava.wso2</groupId>
+ <artifactId>guava</artifactId>
+ <version>${google.guava.wso2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jclouds.common</groupId>
+ <artifactId>aws-common</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.jamesmurty.utils.wso2</groupId>
+ <artifactId>java-xmlbuilder</artifactId>
+ <version>0.4.wso2v1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jclouds.api</groupId>
+ <artifactId>vcloud</artifactId>
+ <version>1.6.0-wso2v1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>${gson2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guice.wso2</groupId>
+ <artifactId>guice</artifactId>
+ <version>${google.guice.wso2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guice.assistedinject.wso2</groupId>
+ <artifactId>guice-assistedinject</artifactId>
+ <version>${com.google.guice.assistedinject.wso2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ <version>${sun.jersey.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.oauth.core</groupId>
+ <artifactId>oauth</artifactId>
+ <version>20100527</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io.wso2</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.0.0.wso2v1</version>
+ </dependency>
+ <dependency>
+ <groupId>rhino.wso2</groupId>
+ <artifactId>js</artifactId>
+ <version>1.7.0.R1-wso2v3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.cartridge.messages</artifactId>
+ <version>2.1.1</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-resources</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>src/main/resources</outputDirectory>
+ <resources>
+ <resource>
+ <directory>resources</directory>
+ <includes>
+ <include>conf/qpid-config.xml</include>
+ <include>conf/qpid-virtualhosts.xml</include>
+ <include>p2.inf</include>
+ <include>build.properties</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.wso2.maven</groupId>
+ <artifactId>carbon-p2-plugin</artifactId>
+ <version>${carbon.p2.plugin.version}</version>
+ <executions>
+ <execution>
+ <id>4-p2-feature-generation</id>
+ <phase>package</phase>
+ <goals>
+ <goal>p2-feature-gen</goal>
+ </goals>
+ <configuration>
+ <id>org.wso2.carbon.stratos.cloud.controller</id>
+ <propertiesFile>../../../etc/feature.properties</propertiesFile>
+ <adviceFile>
+ <properties>
+ <propertyDef>org.wso2.carbon.p2.category.type:server</propertyDef>
+ <propertyDef>org.eclipse.equinox.p2.type.group:false</propertyDef>
+ </properties>
+ </adviceFile>
+ <bundles>
+ <bundleDef>org.apache.stratos:org.apache.stratos.cartridge.messages:2.1.1</bundleDef>
+ <bundleDef>org.apache.stratos:org.apache.stratos.cloud.controller:2.1.3</bundleDef>
+ <bundleDef>org.jclouds.driver:jclouds-bouncycastle:${jclouds.version}</bundleDef>
+ <bundleDef>org.jclouds.driver:jclouds-sshj:${jclouds.version}</bundleDef>
+ <bundleDef>org.jclouds.driver:jclouds-log4j:${jclouds.version}</bundleDef>
+ <bundleDef>org.jclouds.driver:jclouds-enterprise:${jclouds.version}</bundleDef>
+ <bundleDef>org.jclouds:jclouds-core:${jclouds.version}</bundleDef>
+ <bundleDef>org.jclouds:jclouds-compute:${jclouds.version}</bundleDef>
+ <bundleDef>org.jclouds.api:ec2:${jclouds.wso2.version}</bundleDef>
+ <bundleDef>org.jclouds.api:openstack-nova:${jclouds.wso2.version}</bundleDef>
+ <bundleDef>org.jclouds.api:vcloud:1.6.0-wso2v1</bundleDef>
+ <bundleDef>com.jamesmurty.utils.wso2:java-xmlbuilder:0.4.wso2v1</bundleDef>
+ <bundleDef>org.jclouds.common:openstack-common:${jclouds.version}</bundleDef>
+ <bundleDef>org.jclouds.api:openstack-keystone:${jclouds.wso2.version}</bundleDef>
+ <bundleDef>org.jclouds.provider:aws-ec2:${jclouds.wso2.version}</bundleDef>
+ <bundleDef>com.google.guava.wso2:guava:${google.guava.wso2.version}</bundleDef>
+ <bundleDef>org.jclouds.common:aws-common:${jclouds.version}</bundleDef>
+ <bundleDef>com.google.code.gson:gson:${gson2.version}</bundleDef>
+ <bundleDef>com.google.guice.wso2:guice:${google.guice.wso2.version}</bundleDef>
+ <bundleDef>com.google.guice.assistedinject.wso2:guice-assistedinject:${com.google.guice.assistedinject.wso2.version}</bundleDef>
+ <bundleDef>com.sun.jersey:jersey-core:${sun.jersey.version}</bundleDef>
+ <bundleDef>org.jclouds:jclouds-scriptbuilder:${jclouds.version}</bundleDef>
+ <bundleDef>org.apache.shindig.wso2:shindig:1.1.0.wso2v6</bundleDef>
+ <bundleDef>org.99soft.guice.wso2:rocoto:6.1.wso2v1</bundleDef>
+ <bundleDef>org.bouncycastle.wso2:bcprov-jdk16:1.45.wso2v1</bundleDef>
+ <bundleDef>net.schmizz:sshj:0.8.0</bundleDef>
+ <bundleDef>org.jclouds.driver:jclouds-joda:${jclouds.version}</bundleDef>
+ <bundleDef>com.jcraft.wso2:jzlib:1.0.7.wso2v1</bundleDef>
+ <bundleDef>org.jclouds.driver:jclouds-netty:${jclouds.version}</bundleDef>
+ <bundleDef>io.netty:netty:3.3.0.Final</bundleDef>
+ <bundleDef>commons-io.wso2:commons-io:2.0.0.wso2v1</bundleDef>
+ <bundleDef>org.slf4j:slf4j-api:1.6.4</bundleDef>
+ <bundleDef>org.slf4j:slf4j-log4j12:1.6.4</bundleDef>
+ <bundleDef>org.jclouds.driver:jclouds-slf4j:${jclouds.version}</bundleDef>
+ <bundleDef>com.google.common.wso2:google-collect:${google.collect.osgi.version}</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-->
+
+ </bundles>
+ <importBundles>
+ </importBundles>
+ <importFeatures>
+ <importFeatureDef>org.wso2.carbon.core.server:${wso2carbon.version}</importFeatureDef>
+ <importFeatureDef>org.wso2.carbon.lb.common:4.1.3</importFeatureDef>
+ <importFeatureDef>org.wso2.carbon.ntask.core:${wso2carbon.version}</importFeatureDef>
+ </importFeatures>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!--plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <id>clean resources</id>
+ <phase>install</phase>
+ <configuration>
+ <tasks>
+ <delete dir="src"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin-->
+ </plugins>
+ </build>
+
+ <properties>
+ <jclouds.wso2.version>1.5.0-beta.5.wso2v1</jclouds.wso2.version>
+ </properties>
+
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/10e80078/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.3/src/main/resources/build.properties
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.3/src/main/resources/build.properties b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.3/src/main/resources/build.properties
new file mode 100644
index 0000000..93c4b10
--- /dev/null
+++ b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.3/src/main/resources/build.properties
@@ -0,0 +1 @@
+custom = true
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/10e80078/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.3/src/main/resources/conf/cloud-controller.xml
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.3/src/main/resources/conf/cloud-controller.xml b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.3/src/main/resources/conf/cloud-controller.xml
new file mode 100644
index 0000000..9850b53
--- /dev/null
+++ b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.3/src/main/resources/conf/cloud-controller.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+ ~ Copyright 2005-2011 WSO2, Inc. (http://wso2.com)
+ ~
+ ~ 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.
+ -->
+
+<cloudController xmlns:svns="http://org.wso2.securevault/configuration">
+
+ <svns:secureVault
+ provider="org.wso2.securevault.secret.handler.SecretManagerSecretCallbackHandler" />
+
+ <dataPublisher enable="false">
+ <!-- BAM Server Info - default values are 'admin' and 'admin'
+ Optional element. -->
+ <bamServer>
+ <!-- BAM server URL should be specified in carbon.xml -->
+ <adminUserName>admin</adminUserName>
+ <adminPassword svns:secretAlias="cloud.controller.bam.server.admin.password">admin</adminPassword>
+ </bamServer>
+ <!-- Default cron expression is '1 * * * * ? *' meaning 'first second of every minute'.
+ Optional element. -->
+ <cron>1 * * * * ? *</cron>
+ <!-- Cassandra cluster related info -->
+ <!--cassandraInfo>
+ <connectionUrl>localhost:9160</connectionUrl>
+ <userName>admin</userName>
+ <password svns:secretAlias="cloud.controller.cassandra.server.password">admin</password>
+ </cassandraInfo-->
+ </dataPublisher>
+
+ <topologySync enable="true">
+ <!-- MB server info -->
+ <mbServerUrl>localhost:5674</mbServerUrl>
+ <cron>1 * * * * ? *</cron>
+ </topologySync>
+
+ <!-- Specify the properties that are common to an IaaS here. This element
+ is not necessary [0..1]. But you can use this section to avoid specifying
+ same property over and over again. -->
+ <iaasProviders>
+ <!--iaasProvider type="ec2" name="ec2 specific details">
+ <className>org.wso2.carbon.stratos.cloud.controller.iaases.AWSEC2Iaas</className>
+ <provider>aws-ec2</provider>
+ <identity svns:secretAlias="elastic.scaler.openstack.identity">dhsaghfdal</identity>
+ <credential svns:secretAlias="elastic.scaler.openstack.credential">jdkjaskd</credential>
+ <scaleUpOrder>1</scaleUpOrder>
+ <scaleDownOrder>2</scaleDownOrder>
+ <property name="jclouds.ec2.ami-query" value="owner-id=XX-XX-XX;state=available;image-type=machine"/>
+ <property name="availabilityZone" value="us-east-1c"/>
+ <property name="securityGroups" value="manager,cep,mb,default"/>
+ <property name="instanceType" value="m1.large"/>
+ <property name="keyPair" value="nirmal-key"/>
+ <imageId>us-east-1/ami-52409a3b</imageId>
+ </iaasProvider-->
+ <iaasProvider type="openstack" name="openstack specific details">
+ <className>org.wso2.carbon.stratos.cloud.controller.iaases.OpenstackNovaIaas</className>
+ <provider>openstack-nova</provider>
+ <identity svns:secretAlias="cloud.controller.openstack.identity">demo:demo</identity>
+ <credential svns:secretAlias="cloud.controller.openstack.credential">openstack</credential>
+ <property name="jclouds.endpoint" value="http://192.168.16.20:5000/" />
+ <property name="jclouds.openstack-nova.auto-create-floating-ips" value="false"/>
+ <property name="jclouds.api-version" value="2.0/" />
+ <scaleUpOrder>2</scaleUpOrder>
+ <scaleDownOrder>3</scaleDownOrder>
+ <property name="X" value="x" />
+ <property name="Y" value="y" />
+ <imageId>nova/dab37f0e-cf6f-4812-86fc-733acf22d5e6</imageId>
+ </iaasProvider>
+ </iaasProviders>
+</cloudController>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/10e80078/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.3/src/main/resources/conf/etc/cartridge.xsd
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.3/src/main/resources/conf/etc/cartridge.xsd b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.3/src/main/resources/conf/etc/cartridge.xsd
new file mode 100644
index 0000000..222a510
--- /dev/null
+++ b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.3/src/main/resources/conf/etc/cartridge.xsd
@@ -0,0 +1,133 @@
+<?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/10e80078/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.3/src/main/resources/conf/etc/cartridges.xsd
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.3/src/main/resources/conf/etc/cartridges.xsd b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.3/src/main/resources/conf/etc/cartridges.xsd
new file mode 100644
index 0000000..1b383e4
--- /dev/null
+++ b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.3/src/main/resources/conf/etc/cartridges.xsd
@@ -0,0 +1,144 @@
+<?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/10e80078/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.3/src/main/resources/conf/etc/service.xsd
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.3/src/main/resources/conf/etc/service.xsd b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.3/src/main/resources/conf/etc/service.xsd
new file mode 100644
index 0000000..48a8532
--- /dev/null
+++ b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.3/src/main/resources/conf/etc/service.xsd
@@ -0,0 +1,46 @@
+<?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/10e80078/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.3/src/main/resources/conf/etc/services.xsd
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.3/src/main/resources/conf/etc/services.xsd b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.3/src/main/resources/conf/etc/services.xsd
new file mode 100644
index 0000000..5fc9fb7
--- /dev/null
+++ b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.3/src/main/resources/conf/etc/services.xsd
@@ -0,0 +1,51 @@
+<?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/10e80078/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.3/src/main/resources/p2.inf
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.3/src/main/resources/p2.inf b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.3/src/main/resources/p2.inf
new file mode 100644
index 0000000..d3b634f
--- /dev/null
+++ b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/2.1.3/src/main/resources/p2.inf
@@ -0,0 +1,8 @@
+instructions.configure = \
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.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.apache.stratos.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.apache.stratos.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.apache.stratos.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.apache.stratos.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);\