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/16 13:48:58 UTC
git commit: Refactor manager-tenant-mgt-feature
Updated Branches:
refs/heads/master d262b123a -> b47799ad6
Refactor manager-tenant-mgt-feature
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/b47799ad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/b47799ad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/b47799ad
Branch: refs/heads/master
Commit: b47799ad6f7625ece2cd0a5fdc19b3c7e13809a9
Parents: d262b12
Author: Manula Thantriwatte <ma...@wso2.com>
Authored: Tue Jul 16 15:07:50 2013 +0530
Committer: Lakmal Warusawithana <la...@wso2.com>
Committed: Tue Jul 16 17:18:43 2013 +0530
----------------------------------------------------------------------
.../pom.xml | 124 +++++++++++++++
.../resources/build.properties | 2 +
.../resources/conf/cloud-services-desc.xml | 150 +++++++++++++++++++
.../resources/p2.inf | 2 +
.../src/main/resources/build.properties | 2 +
.../main/resources/conf/cloud-services-desc.xml | 150 +++++++++++++++++++
.../src/main/resources/p2.inf | 2 +
.../pom.xml | 91 +++++++++++
.../2.1.0/pom.xml | 122 ---------------
.../2.1.0/resources/build.properties | 2 -
.../resources/conf/cloud-services-desc.xml | 150 -------------------
.../2.1.0/resources/p2.inf | 2 -
.../2.1.0/pom.xml | 91 -----------
features/manager/tenant-mgt/pom.xml | 72 ++++-----
14 files changed, 560 insertions(+), 402 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b47799ad/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/pom.xml b/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/pom.xml
new file mode 100644
index 0000000..f374c7b
--- /dev/null
+++ b/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/pom.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ # Licensed to the Apache Software Foundation (ASF) under one
+ # or more contributor license agreements. See the NOTICE file
+ # distributed with this work for additional information
+ # regarding copyright ownership. The ASF licenses this file
+ # to you 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>tenant-mgt-feature</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>org.apache.stratos.tenant.mgt.core.feature</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Stratos - Multitenancy Tenant Management Server Feature</name>
+ <url>http://apache.org</url>
+ <description>This feature contains the core bundles required for Back-end Multitenancy Tenant Management Core functionality</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.tenant.mgt.core</artifactId>
+ <version>${apache.stratos.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.keystore.mgt</artifactId>
+ <version>${apache.stratos.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.theme.mgt</artifactId>
+ <version>${apache.stratos.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.common</artifactId>
+ <version>${apache.stratos.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>prefilter-resources</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>src/main/resources</outputDirectory>
+ <resources>
+ <resource>
+ <directory>resources</directory>
+ <includes>
+ <include>**/cloud-services-desc.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>p2-feature-generation</id>
+ <phase>package</phase>
+ <goals>
+ <goal>p2-feature-gen</goal>
+ </goals>
+ <configuration>
+ <id>org.apache.stratos.tenant.mgt.core</id>
+ <propertiesFile>../../../../etc/feature.properties</propertiesFile>
+ <adviceFile>
+ <properties>
+ <propertyDef>org.wso2.carbon.p2.category.type:server</propertyDef>
+ </properties>
+ </adviceFile>
+ <!--bundles>
+ </bundles-->
+ <importBundles>
+ <importBundleDef>org.apache.stratos:org.apache.stratos.common</importBundleDef>
+ <importBundleDef>org.apache.stratos:org.apache.stratos.tenant.mgt.core</importBundleDef>
+ <importBundleDef>org.apache.stratos:org.apache.stratos.theme.mgt</importBundleDef>
+ <importBundleDef>org.apache.stratos:org.apache.stratos.keystore.mgt</importBundleDef>
+ </importBundles>
+ <importFeatures>
+
+ </importFeatures>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b47799ad/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/resources/build.properties
----------------------------------------------------------------------
diff --git a/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/resources/build.properties b/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/resources/build.properties
new file mode 100644
index 0000000..59417f4
--- /dev/null
+++ b/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/resources/build.properties
@@ -0,0 +1,2 @@
+custom = true
+root.tenant.core=conf
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b47799ad/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/resources/conf/cloud-services-desc.xml
----------------------------------------------------------------------
diff --git a/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/resources/conf/cloud-services-desc.xml b/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/resources/conf/cloud-services-desc.xml
new file mode 100644
index 0000000..7f797b1
--- /dev/null
+++ b/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/resources/conf/cloud-services-desc.xml
@@ -0,0 +1,150 @@
+<!--
+ This has the configurations for the cloud services.
+ Label, link, icon, description, and the other similar information for each of the services are
+ given here.
+ -->
+<cloudServices xmlns="http://wso2.com/carbon/cloud/mgt/services">
+ <cloudService name="WSO2 Stratos Manager">
+ <key>manager</key>
+ <link>https://cloud.wso2.com</link>
+ </cloudService>
+ <cloudService name="WSO2 Enterprise Service Bus" default="true">
+ <key>ESB</key>
+ <label>Enterprise Service Bus</label>
+ <link>https://esb.cloud.wso2.com</link>
+ <icon>
+ https://localhost:9443/cloud-services-icons/esb.gif
+ </icon>
+ <productPageURL>http://wso2.com/products/enterprise-service-bus/</productPageURL>
+ <description>Enterprise Service Bus in the cloud.</description>
+ </cloudService>
+ <cloudService name="Application Server" default="true">
+ <key>AS</key>
+ <label>Application Server</label>
+ <link>https://appserver.cloud.wso2.com</link>
+ <icon>
+ https://localhost:9443/cloud-services-icons/appserver.gif
+ </icon>
+ <productPageURL>http://wso2.com/products/application-server/</productPageURL>
+ <description>Application Server in the cloud.</description>
+ </cloudService>
+ <cloudService name="WSO2 Data Services Server" default="true">
+ <key>DSS</key>
+ <label>WSO2 Data Services Server</label>
+ <link>https://dss.cloud.wso2.com</link>
+ <icon>
+ https://localhost:9443/cloud-services-icons/ds.gif
+ </icon>
+ <productPageURL>http://wso2.com/products/data-services-server/</productPageURL>
+ <description>Data Services Server in the cloud.</description>
+ </cloudService>
+ <cloudService name="WSO2 Governance Registry" default="true">
+ <key>Greg</key>
+ <label>Governance</label>
+ <link>https://governance.cloud.wso2.com</link>
+ <description>Governance in the cloud.</description>
+ <icon>
+ https://localhost:9443/cloud-services-icons/governance.gif
+ </icon>
+ <productPageURL>http://wso2.com/products/governance-registry/</productPageURL>
+ </cloudService>
+ <cloudService name="WSO2 Identity Server" default="true">
+ <key>IS</key>
+ <label>WSO2 Identity Server</label>
+ <link>https://identity.cloud.wso2.com</link>
+ <icon>
+ https://localhost:9443/cloud-services-icons/identity.gif
+ </icon>
+ <description>Identity in the cloud.</description>
+ <productPageURL>http://wso2.com/products/identity-server/</productPageURL>
+ </cloudService>
+ <cloudService name="WSO2 Business Activity Monitor" default="true">
+ <label>Business Activity Monitor</label>
+ <link>https://bam.cloud.wso2.com</link>
+ <icon>
+ https://localhost:9443/cloud-services-icons/bam.gif
+ </icon>
+ <description>Business Activity Monitor in the cloud.</description>
+ <productPageURL>http://wso2.com/products/business-activity-monitor/</productPageURL>
+ </cloudService>
+ <cloudService name="WSO2 Business Process Server" default="true">
+ <key>BPS</key>
+ <label>Business Process Server</label>
+ <link>https://bps.cloud.wso2.com</link>
+ <icon>
+ https://localhost:9443/cloud-services-icons/bps.gif
+ </icon>
+ <description>Business Process Server in the cloud.</description>
+ <productPageURL>http://wso2.com/products/business-process-server/</productPageURL>
+ </cloudService>
+ <cloudService name="WSO2 Business Rule Server" default="true">
+ <key>BRS</key>
+ <label>Business Rule Server</label>
+ <link>https://brs.cloud.wso2.com</link>
+ <icon>
+ https://localhost:9443/cloud-services-icons/brs.gif
+ </icon>
+ <description>Business Rules Server in the cloud.</description>
+ <productPageURL>http://wso2.com/products/business-rules-server/</productPageURL>
+ </cloudService>
+ <cloudService name="WSO2 Mashup Server" default="true">
+ <key>MB</key>
+ <label>Mashup Server</label>
+ <link>https://mashup.cloud.wso2.com</link>
+ <icon>
+ https://localhost:9443/cloud-services-icons/mashup.gif
+ </icon>
+ <description>Mashup Server in the cloud.</description>
+ <productPageURL>http://wso2.com/products/mashup-server/</productPageURL>
+ </cloudService>
+ <cloudService name="WSO2 Gadget Server" default="true">
+ <key>GS</key>
+ <label>Gadget Server</label>
+ <link>https://gadget.cloud.wso2.com</link>
+ <icon>
+ https://localhost:9443/cloud-services-icons/gadget.gif
+ </icon>
+ <description>Gadgets in the cloud.</description>
+ <productPageURL>http://wso2.com/products/gadget-server/</productPageURL>
+ </cloudService>
+ <cloudService name="Cloud Gateway" default="true">
+ <key>CG</key>
+ <label>Cloud Gateway</label>
+ <link>https://cg.stratoslive.wso2.com</link>
+ <icon>
+ https://localhost:9443/cloud-services-icons/csg.gif
+ </icon>
+ <description>Cloud Gateway in the cloud.</description>
+ <productPageURL>http://wso2.com/products/cloud-services-gateway/</productPageURL> <!-- FIXME, put the correct project home -->
+ </cloudService>
+ <cloudService name="WSO2 Complex Event Processor" default="true">
+ <key>CEP</key>
+ <label>Complex Event Processor</label>
+ <link>https://cep.cloud.wso2.com</link>
+ <icon>
+ https://localhost:9443/cloud-services-icons/cep.gif
+ </icon>
+ <productPageURL>http://wso2.com/products/complex-event-processing-server/</productPageURL> <!-- FIXME, put the correct project home -->
+ <description>Complex Event Processor in the cloud.</description>
+ </cloudService>
+ <cloudService name="WSO2 Message Broker" default="true">
+ <key>MB</key>
+ <label>Message Broker</label>
+ <link>https://mb.cloud.wso2.com</link>
+ <icon>
+ https://localhost:9443/cloud-services-icons/mb.gif
+ </icon>
+ <productPageURL>http://wso2.com/products/message-broker/</productPageURL>
+ <description>Message Broker in the cloud.</description>
+ </cloudService>
+ <cloudService name="WSO2 Storage Server" default="true">
+ <key>SS</key>
+ <label>WSO2 Storage Server</label>
+ <link>https://ss.stratoslive.wso2.com</link>
+ <icon>
+ https://localhost:9443/cloud-services-icons/ss.gif
+ </icon>
+ <description>WSO2 Storage Server.</description>
+ <productPageURL>http://wso2.com/products/storage-server/</productPageURL>
+ </cloudService>
+</cloudServices>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b47799ad/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/resources/p2.inf
----------------------------------------------------------------------
diff --git a/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/resources/p2.inf b/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/resources/p2.inf
new file mode 100644
index 0000000..644de8e
--- /dev/null
+++ b/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/resources/p2.inf
@@ -0,0 +1,2 @@
+instructions.configure = \
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.wso2.carbon.tenant.mgt.core_${feature.version}/conf/cloud-services-desc.xml,target:${installFolder}/../conf/cloud-services-desc.xml,overwrite:true);
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b47799ad/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/src/main/resources/build.properties
----------------------------------------------------------------------
diff --git a/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/src/main/resources/build.properties b/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/src/main/resources/build.properties
new file mode 100644
index 0000000..59417f4
--- /dev/null
+++ b/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/src/main/resources/build.properties
@@ -0,0 +1,2 @@
+custom = true
+root.tenant.core=conf
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b47799ad/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/src/main/resources/conf/cloud-services-desc.xml
----------------------------------------------------------------------
diff --git a/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/src/main/resources/conf/cloud-services-desc.xml b/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/src/main/resources/conf/cloud-services-desc.xml
new file mode 100644
index 0000000..7f797b1
--- /dev/null
+++ b/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/src/main/resources/conf/cloud-services-desc.xml
@@ -0,0 +1,150 @@
+<!--
+ This has the configurations for the cloud services.
+ Label, link, icon, description, and the other similar information for each of the services are
+ given here.
+ -->
+<cloudServices xmlns="http://wso2.com/carbon/cloud/mgt/services">
+ <cloudService name="WSO2 Stratos Manager">
+ <key>manager</key>
+ <link>https://cloud.wso2.com</link>
+ </cloudService>
+ <cloudService name="WSO2 Enterprise Service Bus" default="true">
+ <key>ESB</key>
+ <label>Enterprise Service Bus</label>
+ <link>https://esb.cloud.wso2.com</link>
+ <icon>
+ https://localhost:9443/cloud-services-icons/esb.gif
+ </icon>
+ <productPageURL>http://wso2.com/products/enterprise-service-bus/</productPageURL>
+ <description>Enterprise Service Bus in the cloud.</description>
+ </cloudService>
+ <cloudService name="Application Server" default="true">
+ <key>AS</key>
+ <label>Application Server</label>
+ <link>https://appserver.cloud.wso2.com</link>
+ <icon>
+ https://localhost:9443/cloud-services-icons/appserver.gif
+ </icon>
+ <productPageURL>http://wso2.com/products/application-server/</productPageURL>
+ <description>Application Server in the cloud.</description>
+ </cloudService>
+ <cloudService name="WSO2 Data Services Server" default="true">
+ <key>DSS</key>
+ <label>WSO2 Data Services Server</label>
+ <link>https://dss.cloud.wso2.com</link>
+ <icon>
+ https://localhost:9443/cloud-services-icons/ds.gif
+ </icon>
+ <productPageURL>http://wso2.com/products/data-services-server/</productPageURL>
+ <description>Data Services Server in the cloud.</description>
+ </cloudService>
+ <cloudService name="WSO2 Governance Registry" default="true">
+ <key>Greg</key>
+ <label>Governance</label>
+ <link>https://governance.cloud.wso2.com</link>
+ <description>Governance in the cloud.</description>
+ <icon>
+ https://localhost:9443/cloud-services-icons/governance.gif
+ </icon>
+ <productPageURL>http://wso2.com/products/governance-registry/</productPageURL>
+ </cloudService>
+ <cloudService name="WSO2 Identity Server" default="true">
+ <key>IS</key>
+ <label>WSO2 Identity Server</label>
+ <link>https://identity.cloud.wso2.com</link>
+ <icon>
+ https://localhost:9443/cloud-services-icons/identity.gif
+ </icon>
+ <description>Identity in the cloud.</description>
+ <productPageURL>http://wso2.com/products/identity-server/</productPageURL>
+ </cloudService>
+ <cloudService name="WSO2 Business Activity Monitor" default="true">
+ <label>Business Activity Monitor</label>
+ <link>https://bam.cloud.wso2.com</link>
+ <icon>
+ https://localhost:9443/cloud-services-icons/bam.gif
+ </icon>
+ <description>Business Activity Monitor in the cloud.</description>
+ <productPageURL>http://wso2.com/products/business-activity-monitor/</productPageURL>
+ </cloudService>
+ <cloudService name="WSO2 Business Process Server" default="true">
+ <key>BPS</key>
+ <label>Business Process Server</label>
+ <link>https://bps.cloud.wso2.com</link>
+ <icon>
+ https://localhost:9443/cloud-services-icons/bps.gif
+ </icon>
+ <description>Business Process Server in the cloud.</description>
+ <productPageURL>http://wso2.com/products/business-process-server/</productPageURL>
+ </cloudService>
+ <cloudService name="WSO2 Business Rule Server" default="true">
+ <key>BRS</key>
+ <label>Business Rule Server</label>
+ <link>https://brs.cloud.wso2.com</link>
+ <icon>
+ https://localhost:9443/cloud-services-icons/brs.gif
+ </icon>
+ <description>Business Rules Server in the cloud.</description>
+ <productPageURL>http://wso2.com/products/business-rules-server/</productPageURL>
+ </cloudService>
+ <cloudService name="WSO2 Mashup Server" default="true">
+ <key>MB</key>
+ <label>Mashup Server</label>
+ <link>https://mashup.cloud.wso2.com</link>
+ <icon>
+ https://localhost:9443/cloud-services-icons/mashup.gif
+ </icon>
+ <description>Mashup Server in the cloud.</description>
+ <productPageURL>http://wso2.com/products/mashup-server/</productPageURL>
+ </cloudService>
+ <cloudService name="WSO2 Gadget Server" default="true">
+ <key>GS</key>
+ <label>Gadget Server</label>
+ <link>https://gadget.cloud.wso2.com</link>
+ <icon>
+ https://localhost:9443/cloud-services-icons/gadget.gif
+ </icon>
+ <description>Gadgets in the cloud.</description>
+ <productPageURL>http://wso2.com/products/gadget-server/</productPageURL>
+ </cloudService>
+ <cloudService name="Cloud Gateway" default="true">
+ <key>CG</key>
+ <label>Cloud Gateway</label>
+ <link>https://cg.stratoslive.wso2.com</link>
+ <icon>
+ https://localhost:9443/cloud-services-icons/csg.gif
+ </icon>
+ <description>Cloud Gateway in the cloud.</description>
+ <productPageURL>http://wso2.com/products/cloud-services-gateway/</productPageURL> <!-- FIXME, put the correct project home -->
+ </cloudService>
+ <cloudService name="WSO2 Complex Event Processor" default="true">
+ <key>CEP</key>
+ <label>Complex Event Processor</label>
+ <link>https://cep.cloud.wso2.com</link>
+ <icon>
+ https://localhost:9443/cloud-services-icons/cep.gif
+ </icon>
+ <productPageURL>http://wso2.com/products/complex-event-processing-server/</productPageURL> <!-- FIXME, put the correct project home -->
+ <description>Complex Event Processor in the cloud.</description>
+ </cloudService>
+ <cloudService name="WSO2 Message Broker" default="true">
+ <key>MB</key>
+ <label>Message Broker</label>
+ <link>https://mb.cloud.wso2.com</link>
+ <icon>
+ https://localhost:9443/cloud-services-icons/mb.gif
+ </icon>
+ <productPageURL>http://wso2.com/products/message-broker/</productPageURL>
+ <description>Message Broker in the cloud.</description>
+ </cloudService>
+ <cloudService name="WSO2 Storage Server" default="true">
+ <key>SS</key>
+ <label>WSO2 Storage Server</label>
+ <link>https://ss.stratoslive.wso2.com</link>
+ <icon>
+ https://localhost:9443/cloud-services-icons/ss.gif
+ </icon>
+ <description>WSO2 Storage Server.</description>
+ <productPageURL>http://wso2.com/products/storage-server/</productPageURL>
+ </cloudService>
+</cloudServices>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b47799ad/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/src/main/resources/p2.inf
----------------------------------------------------------------------
diff --git a/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/src/main/resources/p2.inf b/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/src/main/resources/p2.inf
new file mode 100644
index 0000000..644de8e
--- /dev/null
+++ b/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.core.feature/src/main/resources/p2.inf
@@ -0,0 +1,2 @@
+instructions.configure = \
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.wso2.carbon.tenant.mgt.core_${feature.version}/conf/cloud-services-desc.xml,target:${installFolder}/../conf/cloud-services-desc.xml,overwrite:true);
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b47799ad/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.server.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.server.feature/pom.xml b/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.server.feature/pom.xml
new file mode 100644
index 0000000..a0b6c39
--- /dev/null
+++ b/features/manager/tenant-mgt/org.apache.stratos.tenant.mgt.server.feature/pom.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ # Licensed to the Apache Software Foundation (ASF) under one
+ # or more contributor license agreements. See the NOTICE file
+ # distributed with this work for additional information
+ # regarding copyright ownership. The ASF licenses this file
+ # to you 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>tenant-mgt-feature</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>org.apache.stratos.tenant.mgt.server.feature</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Stratos - Multitenancy Tenant Management Server Feature</name>
+ <url>http://apache.org</url>
+ <description>This feature contains the core bundles required for Back-end Multitenancy Tenant Management Core functionality</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.tenant.mgt.core</artifactId>
+ <version>${apache.stratos.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.tenant.mgt</artifactId>
+ <version>${apache.stratos.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.email.verification</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.tenant.mgt.server</id>
+ <propertiesFile>../../../../etc/feature.properties</propertiesFile>
+ <adviceFile>
+ <properties>
+ <propertyDef>org.wso2.carbon.p2.category.type:server</propertyDef>
+ </properties>
+ </adviceFile>
+ <bundles>
+ <bundleDef>org.apache.stratos:org.apache.stratos.tenant.mgt.core</bundleDef>
+ <bundleDef>org.apache.stratos:org.apache.stratos.tenant.mgt</bundleDef>
+ <bundleDef>org.wso2.carbon:org.wso2.carbon.email.verification</bundleDef>
+ </bundles>
+ <importFeatures>
+ <importFeatureDef>org.wso2.carbon.core.server</importFeatureDef>
+ <!-- <importFeatureDef>org.wso2.carbon.registry.core.server.feature</importFeatureDef>-->
+ </importFeatures>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b47799ad/features/manager/tenant-mgt/org.wso2.carbon.tenant.mgt.core.feature/2.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/tenant-mgt/org.wso2.carbon.tenant.mgt.core.feature/2.1.0/pom.xml b/features/manager/tenant-mgt/org.wso2.carbon.tenant.mgt.core.feature/2.1.0/pom.xml
deleted file mode 100644
index 0dca9ce..0000000
--- a/features/manager/tenant-mgt/org.wso2.carbon.tenant.mgt.core.feature/2.1.0/pom.xml
+++ /dev/null
@@ -1,122 +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>tenant-mgt-feature</artifactId>
- <version>2.1.0</version>
-<relativePath>../../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>org.wso2.carbon.tenant.mgt.core.feature</artifactId>
- <packaging>pom</packaging>
- <name>WSO2 Stratos - Multitenancy Tenant Management Server Feature</name>
- <url>http://wso2.org</url>
- <description>This feature contains the core bundles required for Back-end Multitenancy Tenant Management Core functionality</description>
-
- <dependencies>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.tenant.mgt.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.keystore.mgt</artifactId>
- <version>${stratos.version}</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.theme.mgt</artifactId>
- <version>${stratos.version}</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.stratos.common</artifactId>
- <version>${stratos.version}</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>prefilter-resources</id>
- <phase>package</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>src/main/resources</outputDirectory>
- <resources>
- <resource>
- <directory>resources</directory>
- <includes>
- <include>**/cloud-services-desc.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>p2-feature-generation</id>
- <phase>package</phase>
- <goals>
- <goal>p2-feature-gen</goal>
- </goals>
- <configuration>
- <id>org.wso2.carbon.tenant.mgt.core</id>
- <propertiesFile>../../../../etc/feature.properties</propertiesFile>
- <adviceFile>
- <properties>
- <propertyDef>org.wso2.carbon.p2.category.type:server</propertyDef>
- </properties>
- </adviceFile>
- <!--bundles>
- </bundles-->
- <importBundles>
- <importBundleDef>org.wso2.carbon:org.wso2.carbon.stratos.common</importBundleDef>
- <importBundleDef>org.wso2.carbon:org.wso2.carbon.tenant.mgt.core</importBundleDef>
- <importBundleDef>org.wso2.carbon:org.wso2.carbon.theme.mgt</importBundleDef>
- <importBundleDef>org.wso2.carbon:org.wso2.carbon.keystore.mgt</importBundleDef>
- </importBundles>
- <importFeatures>
-
- </importFeatures>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b47799ad/features/manager/tenant-mgt/org.wso2.carbon.tenant.mgt.core.feature/2.1.0/resources/build.properties
----------------------------------------------------------------------
diff --git a/features/manager/tenant-mgt/org.wso2.carbon.tenant.mgt.core.feature/2.1.0/resources/build.properties b/features/manager/tenant-mgt/org.wso2.carbon.tenant.mgt.core.feature/2.1.0/resources/build.properties
deleted file mode 100644
index 59417f4..0000000
--- a/features/manager/tenant-mgt/org.wso2.carbon.tenant.mgt.core.feature/2.1.0/resources/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-custom = true
-root.tenant.core=conf
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b47799ad/features/manager/tenant-mgt/org.wso2.carbon.tenant.mgt.core.feature/2.1.0/resources/conf/cloud-services-desc.xml
----------------------------------------------------------------------
diff --git a/features/manager/tenant-mgt/org.wso2.carbon.tenant.mgt.core.feature/2.1.0/resources/conf/cloud-services-desc.xml b/features/manager/tenant-mgt/org.wso2.carbon.tenant.mgt.core.feature/2.1.0/resources/conf/cloud-services-desc.xml
deleted file mode 100644
index 7f797b1..0000000
--- a/features/manager/tenant-mgt/org.wso2.carbon.tenant.mgt.core.feature/2.1.0/resources/conf/cloud-services-desc.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<!--
- This has the configurations for the cloud services.
- Label, link, icon, description, and the other similar information for each of the services are
- given here.
- -->
-<cloudServices xmlns="http://wso2.com/carbon/cloud/mgt/services">
- <cloudService name="WSO2 Stratos Manager">
- <key>manager</key>
- <link>https://cloud.wso2.com</link>
- </cloudService>
- <cloudService name="WSO2 Enterprise Service Bus" default="true">
- <key>ESB</key>
- <label>Enterprise Service Bus</label>
- <link>https://esb.cloud.wso2.com</link>
- <icon>
- https://localhost:9443/cloud-services-icons/esb.gif
- </icon>
- <productPageURL>http://wso2.com/products/enterprise-service-bus/</productPageURL>
- <description>Enterprise Service Bus in the cloud.</description>
- </cloudService>
- <cloudService name="Application Server" default="true">
- <key>AS</key>
- <label>Application Server</label>
- <link>https://appserver.cloud.wso2.com</link>
- <icon>
- https://localhost:9443/cloud-services-icons/appserver.gif
- </icon>
- <productPageURL>http://wso2.com/products/application-server/</productPageURL>
- <description>Application Server in the cloud.</description>
- </cloudService>
- <cloudService name="WSO2 Data Services Server" default="true">
- <key>DSS</key>
- <label>WSO2 Data Services Server</label>
- <link>https://dss.cloud.wso2.com</link>
- <icon>
- https://localhost:9443/cloud-services-icons/ds.gif
- </icon>
- <productPageURL>http://wso2.com/products/data-services-server/</productPageURL>
- <description>Data Services Server in the cloud.</description>
- </cloudService>
- <cloudService name="WSO2 Governance Registry" default="true">
- <key>Greg</key>
- <label>Governance</label>
- <link>https://governance.cloud.wso2.com</link>
- <description>Governance in the cloud.</description>
- <icon>
- https://localhost:9443/cloud-services-icons/governance.gif
- </icon>
- <productPageURL>http://wso2.com/products/governance-registry/</productPageURL>
- </cloudService>
- <cloudService name="WSO2 Identity Server" default="true">
- <key>IS</key>
- <label>WSO2 Identity Server</label>
- <link>https://identity.cloud.wso2.com</link>
- <icon>
- https://localhost:9443/cloud-services-icons/identity.gif
- </icon>
- <description>Identity in the cloud.</description>
- <productPageURL>http://wso2.com/products/identity-server/</productPageURL>
- </cloudService>
- <cloudService name="WSO2 Business Activity Monitor" default="true">
- <label>Business Activity Monitor</label>
- <link>https://bam.cloud.wso2.com</link>
- <icon>
- https://localhost:9443/cloud-services-icons/bam.gif
- </icon>
- <description>Business Activity Monitor in the cloud.</description>
- <productPageURL>http://wso2.com/products/business-activity-monitor/</productPageURL>
- </cloudService>
- <cloudService name="WSO2 Business Process Server" default="true">
- <key>BPS</key>
- <label>Business Process Server</label>
- <link>https://bps.cloud.wso2.com</link>
- <icon>
- https://localhost:9443/cloud-services-icons/bps.gif
- </icon>
- <description>Business Process Server in the cloud.</description>
- <productPageURL>http://wso2.com/products/business-process-server/</productPageURL>
- </cloudService>
- <cloudService name="WSO2 Business Rule Server" default="true">
- <key>BRS</key>
- <label>Business Rule Server</label>
- <link>https://brs.cloud.wso2.com</link>
- <icon>
- https://localhost:9443/cloud-services-icons/brs.gif
- </icon>
- <description>Business Rules Server in the cloud.</description>
- <productPageURL>http://wso2.com/products/business-rules-server/</productPageURL>
- </cloudService>
- <cloudService name="WSO2 Mashup Server" default="true">
- <key>MB</key>
- <label>Mashup Server</label>
- <link>https://mashup.cloud.wso2.com</link>
- <icon>
- https://localhost:9443/cloud-services-icons/mashup.gif
- </icon>
- <description>Mashup Server in the cloud.</description>
- <productPageURL>http://wso2.com/products/mashup-server/</productPageURL>
- </cloudService>
- <cloudService name="WSO2 Gadget Server" default="true">
- <key>GS</key>
- <label>Gadget Server</label>
- <link>https://gadget.cloud.wso2.com</link>
- <icon>
- https://localhost:9443/cloud-services-icons/gadget.gif
- </icon>
- <description>Gadgets in the cloud.</description>
- <productPageURL>http://wso2.com/products/gadget-server/</productPageURL>
- </cloudService>
- <cloudService name="Cloud Gateway" default="true">
- <key>CG</key>
- <label>Cloud Gateway</label>
- <link>https://cg.stratoslive.wso2.com</link>
- <icon>
- https://localhost:9443/cloud-services-icons/csg.gif
- </icon>
- <description>Cloud Gateway in the cloud.</description>
- <productPageURL>http://wso2.com/products/cloud-services-gateway/</productPageURL> <!-- FIXME, put the correct project home -->
- </cloudService>
- <cloudService name="WSO2 Complex Event Processor" default="true">
- <key>CEP</key>
- <label>Complex Event Processor</label>
- <link>https://cep.cloud.wso2.com</link>
- <icon>
- https://localhost:9443/cloud-services-icons/cep.gif
- </icon>
- <productPageURL>http://wso2.com/products/complex-event-processing-server/</productPageURL> <!-- FIXME, put the correct project home -->
- <description>Complex Event Processor in the cloud.</description>
- </cloudService>
- <cloudService name="WSO2 Message Broker" default="true">
- <key>MB</key>
- <label>Message Broker</label>
- <link>https://mb.cloud.wso2.com</link>
- <icon>
- https://localhost:9443/cloud-services-icons/mb.gif
- </icon>
- <productPageURL>http://wso2.com/products/message-broker/</productPageURL>
- <description>Message Broker in the cloud.</description>
- </cloudService>
- <cloudService name="WSO2 Storage Server" default="true">
- <key>SS</key>
- <label>WSO2 Storage Server</label>
- <link>https://ss.stratoslive.wso2.com</link>
- <icon>
- https://localhost:9443/cloud-services-icons/ss.gif
- </icon>
- <description>WSO2 Storage Server.</description>
- <productPageURL>http://wso2.com/products/storage-server/</productPageURL>
- </cloudService>
-</cloudServices>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b47799ad/features/manager/tenant-mgt/org.wso2.carbon.tenant.mgt.core.feature/2.1.0/resources/p2.inf
----------------------------------------------------------------------
diff --git a/features/manager/tenant-mgt/org.wso2.carbon.tenant.mgt.core.feature/2.1.0/resources/p2.inf b/features/manager/tenant-mgt/org.wso2.carbon.tenant.mgt.core.feature/2.1.0/resources/p2.inf
deleted file mode 100644
index 644de8e..0000000
--- a/features/manager/tenant-mgt/org.wso2.carbon.tenant.mgt.core.feature/2.1.0/resources/p2.inf
+++ /dev/null
@@ -1,2 +0,0 @@
-instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.wso2.carbon.tenant.mgt.core_${feature.version}/conf/cloud-services-desc.xml,target:${installFolder}/../conf/cloud-services-desc.xml,overwrite:true);
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b47799ad/features/manager/tenant-mgt/org.wso2.carbon.tenant.mgt.server.feature/2.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/tenant-mgt/org.wso2.carbon.tenant.mgt.server.feature/2.1.0/pom.xml b/features/manager/tenant-mgt/org.wso2.carbon.tenant.mgt.server.feature/2.1.0/pom.xml
deleted file mode 100644
index 32ac1d3..0000000
--- a/features/manager/tenant-mgt/org.wso2.carbon.tenant.mgt.server.feature/2.1.0/pom.xml
+++ /dev/null
@@ -1,91 +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>tenant-mgt-feature</artifactId>
- <version>2.1.0</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>org.wso2.carbon.tenant.mgt.server.feature</artifactId>
- <version>2.1.0</version>
- <packaging>pom</packaging>
- <name>WSO2 Stratos - Multitenancy Tenant Management Server Feature</name>
- <url>http://wso2.org</url>
- <description>This feature contains the core bundles required for Back-end Multitenancy Tenant Management Core functionality</description>
-
- <dependencies>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.tenant.mgt.core</artifactId>
- <version>2.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.tenant.mgt</artifactId>
- <version>2.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.email.verification</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.tenant.mgt.server</id>
- <propertiesFile>../../../../etc/feature.properties</propertiesFile>
- <adviceFile>
- <properties>
- <propertyDef>org.wso2.carbon.p2.category.type:server</propertyDef>
- </properties>
- </adviceFile>
- <bundles>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.tenant.mgt.core</bundleDef>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.tenant.mgt</bundleDef>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.email.verification</bundleDef>
- </bundles>
- <importFeatures>
- <importFeatureDef>org.wso2.carbon.core.server</importFeatureDef>
- <!-- <importFeatureDef>org.wso2.carbon.registry.core.server.feature</importFeatureDef>-->
- </importFeatures>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b47799ad/features/manager/tenant-mgt/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/tenant-mgt/pom.xml b/features/manager/tenant-mgt/pom.xml
index 691b2f0..d623c4c 100644
--- a/features/manager/tenant-mgt/pom.xml
+++ b/features/manager/tenant-mgt/pom.xml
@@ -1,62 +1,64 @@
<?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.
--->
-
+<!--
+ # Licensed to the Apache Software Foundation (ASF) under one
+ # or more contributor license agreements. See the NOTICE file
+ # distributed with this work for additional information
+ # regarding copyright ownership. The ASF licenses this file
+ # to you 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>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>stratos-manager-features</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>tenant-mgt-feature</artifactId>
<packaging>pom</packaging>
- <name>WSO2 Stratos - Tenant Management Aggregator Module</name>
- <url>http://wso2.org</url>
+ <name>Apache Stratos - Tenant Management Aggregator Module</name>
+ <url>http://apache.org</url>
<modules>
- <module>org.wso2.carbon.tenant.mgt.server.feature/2.1.0</module>
- <module>org.wso2.carbon.tenant.mgt.core.feature/2.1.0</module>
+ <module>org.apache.stratos.tenant.mgt.server.feature</module>
+ <module>org.apache.stratos.tenant.mgt.core.feature</module>
</modules>
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.tenant.mgt</artifactId>
- <version>${stratos.version}</version>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.tenant.mgt</artifactId>
+ <version>${apache.stratos.version}</version>
</dependency>
<dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.tenant.mgt.core</artifactId>
- <version>${stratos.version}</version>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.tenant.mgt.core</artifactId>
+ <version>${apache.stratos.version}</version>
</dependency>
<dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.keystore.mgt</artifactId>
- <version>${stratos.version}</version>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.keystore.mgt</artifactId>
+ <version>${apache.stratos.version}</version>
</dependency>
<dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.theme.mgt</artifactId>
- <version>${stratos.version}</version>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.theme.mgt</artifactId>
+ <version>${apache.stratos.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>