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 09:27:28 UTC
[2/2] git commit: removing billing and cloud controller features from
former stratos directory
removing billing and cloud controller features from former stratos directory
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/9dc3f6a7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/9dc3f6a7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/9dc3f6a7
Branch: refs/heads/master
Commit: 9dc3f6a7aefb472a101bda0809e6a2f3831efe28
Parents: d6b584f
Author: Lahiru Sandaruwan <la...@wso2.com>
Authored: Fri Jul 5 13:02:35 2013 +0530
Committer: Lahiru Sandaruwan <la...@wso2.com>
Committed: Fri Jul 5 13:02:35 2013 +0530
----------------------------------------------------------------------
.../2.1.0/pom.xml | 103 -------
.../2.1.1/pom.xml | 109 -------
.../2.1.3/pom.xml | 109 -------
.../2.1.0/pom.xml | 85 ------
features/manager/billing/pom.xml | 36 ---
.../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/manager/cloud-controller/pom.xml | 54 ----
22 files changed, 2001 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9dc3f6a7/features/manager/billing/org.wso2.carbon.billing.server.feature/2.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/billing/org.wso2.carbon.billing.server.feature/2.1.0/pom.xml b/features/manager/billing/org.wso2.carbon.billing.server.feature/2.1.0/pom.xml
deleted file mode 100644
index 33ea9b4..0000000
--- a/features/manager/billing/org.wso2.carbon.billing.server.feature/2.1.0/pom.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (c) WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <parent>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>billing-feature</artifactId>
- <version>2.1.0</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>org.wso2.carbon.billing.server.feature</artifactId>
- <packaging>pom</packaging>
- <version>2.1.0</version>
- <name>WSO2 Stratos - Billing Server Feature</name>
- <url>http://wso2.org</url>
- <description>This feature contains the bundles required for billing server</description>
-
- <dependencies>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.billing.core</artifactId>
- <version>2.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.billing.mgt</artifactId>
- <version>2.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.rule.kernel</artifactId>
- <version>4.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.rule.common</artifactId>
- <version>4.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.rule.backend</artifactId>
- <version>4.1.0</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.wso2.maven</groupId>
- <artifactId>carbon-p2-plugin</artifactId>
- <version>${carbon.p2.plugin.version}</version>
- <executions>
- <execution>
- <id>p2-feature-generation</id>
- <phase>package</phase>
- <goals>
- <goal>p2-feature-gen</goal>
- </goals>
- <configuration>
- <id>org.wso2.carbon.billing.server</id>
- <propertiesFile>../../../../etc/feature.properties</propertiesFile>
- <adviceFile>
- <properties>
- <propertyDef>org.wso2.carbon.p2.category.type:console</propertyDef>
- <propertyDef>org.eclipse.equinox.p2.type.group:false</propertyDef>
- </properties>
- </adviceFile>
- <bundles>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.billing.core</bundleDef>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.billing.mgt</bundleDef>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.rule.kernel</bundleDef>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.rule.common</bundleDef>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.rule.backend</bundleDef>
- </bundles>
- <!--importFeatures>
- <importFeatureDef>org.wso2.carbon.stratos.common:${wso2carbon.version}</importFeatureDef>
- </importFeatures-->
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9dc3f6a7/features/manager/billing/org.wso2.carbon.billing.server.feature/2.1.1/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/billing/org.wso2.carbon.billing.server.feature/2.1.1/pom.xml b/features/manager/billing/org.wso2.carbon.billing.server.feature/2.1.1/pom.xml
deleted file mode 100644
index b94e4b0..0000000
--- a/features/manager/billing/org.wso2.carbon.billing.server.feature/2.1.1/pom.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (c) WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <parent>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>billing-feature</artifactId>
- <version>2.1.0</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>org.wso2.carbon.billing.server.feature</artifactId>
- <packaging>pom</packaging>
- <version>2.1.1</version>
- <name>WSO2 Stratos - Billing Server Feature</name>
- <url>http://wso2.org</url>
- <description>This feature contains the bundles required for billing server</description>
-
- <dependencies>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.billing.core</artifactId>
- <version>2.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.billing.mgt</artifactId>
- <version>2.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.rule.kernel</artifactId>
- <version>4.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.rule.common</artifactId>
- <version>4.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.rule.backend</artifactId>
- <version>4.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.email.sender</artifactId>
- <version>2.1.0</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.wso2.maven</groupId>
- <artifactId>carbon-p2-plugin</artifactId>
- <version>${carbon.p2.plugin.version}</version>
- <executions>
- <execution>
- <id>p2-feature-generation</id>
- <phase>package</phase>
- <goals>
- <goal>p2-feature-gen</goal>
- </goals>
- <configuration>
- <id>org.wso2.carbon.billing.server</id>
- <propertiesFile>../../../../etc/feature.properties</propertiesFile>
- <adviceFile>
- <properties>
- <propertyDef>org.wso2.carbon.p2.category.type:console</propertyDef>
- <propertyDef>org.eclipse.equinox.p2.type.group:false</propertyDef>
- </properties>
- </adviceFile>
- <bundles>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.billing.core</bundleDef>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.billing.mgt</bundleDef>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.rule.kernel</bundleDef>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.rule.common</bundleDef>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.rule.backend</bundleDef>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.email.sender:2.1.0</bundleDef>
- </bundles>
- <!--importFeatures>
- <importFeatureDef>org.wso2.carbon.stratos.common:${wso2carbon.version}</importFeatureDef>
- </importFeatures-->
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9dc3f6a7/features/manager/billing/org.wso2.carbon.billing.server.feature/2.1.3/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/billing/org.wso2.carbon.billing.server.feature/2.1.3/pom.xml b/features/manager/billing/org.wso2.carbon.billing.server.feature/2.1.3/pom.xml
deleted file mode 100644
index baeb861..0000000
--- a/features/manager/billing/org.wso2.carbon.billing.server.feature/2.1.3/pom.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (c) WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <parent>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>billing-feature</artifactId>
- <version>2.1.0</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>org.wso2.carbon.billing.server.feature</artifactId>
- <packaging>pom</packaging>
- <version>2.1.3</version>
- <name>WSO2 Stratos - Billing Server Feature</name>
- <url>http://wso2.org</url>
- <description>This feature contains the bundles required for billing server</description>
-
- <dependencies>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.billing.core</artifactId>
- <version>2.1.3</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.billing.mgt</artifactId>
- <version>2.1.3</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.rule.kernel</artifactId>
- <version>4.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.rule.common</artifactId>
- <version>4.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.rule.backend</artifactId>
- <version>4.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.email.sender</artifactId>
- <version>2.1.0</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.wso2.maven</groupId>
- <artifactId>carbon-p2-plugin</artifactId>
- <version>${carbon.p2.plugin.version}</version>
- <executions>
- <execution>
- <id>p2-feature-generation</id>
- <phase>package</phase>
- <goals>
- <goal>p2-feature-gen</goal>
- </goals>
- <configuration>
- <id>org.wso2.carbon.billing.server</id>
- <propertiesFile>../../../../etc/feature.properties</propertiesFile>
- <adviceFile>
- <properties>
- <propertyDef>org.wso2.carbon.p2.category.type:console</propertyDef>
- <propertyDef>org.eclipse.equinox.p2.type.group:false</propertyDef>
- </properties>
- </adviceFile>
- <bundles>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.billing.core</bundleDef>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.billing.mgt</bundleDef>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.rule.kernel</bundleDef>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.rule.common</bundleDef>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.rule.backend</bundleDef>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.email.sender:2.1.0</bundleDef>
- </bundles>
- <!--importFeatures>
- <importFeatureDef>org.wso2.carbon.stratos.common:${wso2carbon.version}</importFeatureDef>
- </importFeatures-->
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9dc3f6a7/features/manager/billing/org.wso2.carbon.billing.ui.feature/2.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/billing/org.wso2.carbon.billing.ui.feature/2.1.0/pom.xml b/features/manager/billing/org.wso2.carbon.billing.ui.feature/2.1.0/pom.xml
deleted file mode 100644
index c525a0a..0000000
--- a/features/manager/billing/org.wso2.carbon.billing.ui.feature/2.1.0/pom.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (c) WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <parent>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>billing-feature</artifactId>
- <version>2.1.0</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>org.wso2.carbon.billing.ui.feature</artifactId>
- <version>2.1.0</version>
- <packaging>pom</packaging>
- <name>WSO2 Stratos - Billing UI Feature</name>
- <url>http://wso2.org</url>
- <description>This feature contains the bundles required for billing UI</description>
-
- <dependencies>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.billing.mgt.stub</artifactId>
- <version>4.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.billing.mgt.ui</artifactId>
- <version>2.1.0</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.wso2.maven</groupId>
- <artifactId>carbon-p2-plugin</artifactId>
- <version>${carbon.p2.plugin.version}</version>
- <executions>
- <execution>
- <id>p2-feature-generation</id>
- <phase>package</phase>
- <goals>
- <goal>p2-feature-gen</goal>
- </goals>
- <configuration>
- <id>org.wso2.carbon.billing.ui</id>
- <propertiesFile>../../../../etc/feature.properties</propertiesFile>
- <adviceFile>
- <properties>
- <propertyDef>org.wso2.carbon.p2.category.type:console</propertyDef>
- <propertyDef>org.eclipse.equinox.p2.type.group:false</propertyDef>
- </properties>
- </adviceFile>
- <bundles>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.billing.mgt.stub</bundleDef>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.billing.mgt.ui</bundleDef>
- </bundles>
- <!--importFeatures>
- <importFeatureDef>org.wso2.carbon.stratos.common:${wso2carbon.version}</importFeatureDef>
- </importFeatures-->
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9dc3f6a7/features/manager/billing/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/billing/pom.xml b/features/manager/billing/pom.xml
deleted file mode 100644
index 53414da..0000000
--- a/features/manager/billing/pom.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (c) WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>stratos-features</artifactId>
- <version>2.1.0</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>billing-feature</artifactId>
- <packaging>pom</packaging>
- <name>WSO2 Stratos - Billing Feature Aggregator Module</name>
- <url>http://wso2.org</url>
- <modules>
- <module>org.wso2.carbon.billing.server.feature/2.1.0</module>
- <module>org.wso2.carbon.billing.ui.feature/2.1.0</module>
- </modules>
-</project>
-
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9dc3f6a7/features/manager/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/pom.xml b/features/manager/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/pom.xml
deleted file mode 100644
index c444792..0000000
--- a/features/manager/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/9dc3f6a7/features/manager/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/build.properties
----------------------------------------------------------------------
diff --git a/features/manager/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/build.properties b/features/manager/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/manager/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/9dc3f6a7/features/manager/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/cloud-controller.xml
----------------------------------------------------------------------
diff --git a/features/manager/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/cloud-controller.xml b/features/manager/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/manager/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/9dc3f6a7/features/manager/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/etc/cartridge.xsd
----------------------------------------------------------------------
diff --git a/features/manager/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/etc/cartridge.xsd b/features/manager/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/manager/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/9dc3f6a7/features/manager/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/etc/cartridges.xsd
----------------------------------------------------------------------
diff --git a/features/manager/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/etc/cartridges.xsd b/features/manager/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/manager/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/9dc3f6a7/features/manager/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/etc/service.xsd
----------------------------------------------------------------------
diff --git a/features/manager/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/etc/service.xsd b/features/manager/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/manager/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/9dc3f6a7/features/manager/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/etc/services.xsd
----------------------------------------------------------------------
diff --git a/features/manager/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/conf/etc/services.xsd b/features/manager/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/manager/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/9dc3f6a7/features/manager/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/p2.inf
----------------------------------------------------------------------
diff --git a/features/manager/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.1/src/main/resources/p2.inf b/features/manager/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/manager/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/9dc3f6a7/features/manager/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.3/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.3/pom.xml b/features/manager/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.3/pom.xml
deleted file mode 100644
index 234d0d2..0000000
--- a/features/manager/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/9dc3f6a7/features/manager/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.3/src/main/resources/build.properties
----------------------------------------------------------------------
diff --git a/features/manager/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.3/src/main/resources/build.properties b/features/manager/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/manager/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/9dc3f6a7/features/manager/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.3/src/main/resources/conf/cloud-controller.xml
----------------------------------------------------------------------
diff --git a/features/manager/cloud-controller/org.wso2.carbon.stratos.cloud.controller.feature/2.1.3/src/main/resources/conf/cloud-controller.xml b/features/manager/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/manager/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>