rajitha
/
product-iots
forked from community/product-iots
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added multi-tenancy features

Browse Source
application-manager-new
ayyoob 9 years ago
parent 1796db2807
commit f26423bec3
2 changed files with 138 additions and 40 deletions
Show Stats Download Patch File Download Diff File

43
modules/p2-profile-gen/pom.xml
Unescape View File

@ -188,10 +188,26 @@
<!-- Carbon Multi-tenancy Features --> <!-- Carbon Multi-tenancy Features -->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.multitenancy:org.wso2.carbon.tenant.common.server.feature:${carbon.multitenancy.version} org.wso2.carbon.multitenancy:org.wso2.carbon.tenant.common.feature:${carbon.multitenancy.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.multitenancy:org.wso2.carbon.tenant.mgt.core.feature:${carbon.multitenancy.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.multitenancy:org.wso2.carbon.tenant.mgt.server.feature:${carbon.multitenancy.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.multitenancy:org.wso2.carbon.tenant.usage.agent.feature:${carbon.multitenancy.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.multitenancy:org.wso2.carbon.tenant.throttling.agent.feature:${carbon.multitenancy.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.multitenancy:org.wso2.carbon.tenant.deployment.feature:${carbon.multitenancy.version}
</featureArtifactDef> </featureArtifactDef>
<!-- End of Carbon Multi-tenancy Features --> <!-- End of Carbon Multi-tenancy Features -->
<!-- Identity Features --> <!-- Identity Features -->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.identity:org.wso2.carbon.security.mgt.feature:${carbon.identity.version} org.wso2.carbon.identity:org.wso2.carbon.security.mgt.feature:${carbon.identity.version}
@ -438,7 +454,27 @@
<!-- Carbon Multi-tenancy Features --> <!-- Carbon Multi-tenancy Features -->
<feature> <feature>
<id>org.wso2.carbon.tenant.common.server.feature.group</id> <id>org.wso2.carbon.tenant.common.feature.group</id>
<version>${carbon.multitenancy.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.tenant.mgt.core.feature.group</id>
<version>${carbon.multitenancy.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.tenant.mgt.server.feature.group</id>
<version>${carbon.multitenancy.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.tenant.usage.agent.feature.group</id>
<version>${carbon.multitenancy.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.tenant.throttling.agent.feature.group</id>
<version>${carbon.multitenancy.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.tenant.deployment.feature.group</id>
<version>${carbon.multitenancy.version}</version> <version>${carbon.multitenancy.version}</version>
</feature> </feature>
<!-- End of Carbon Multi-tenancy Features --> <!-- End of Carbon Multi-tenancy Features -->
@ -592,6 +628,9 @@
<version>${carbon.governance.version}</version> <version>${carbon.governance.version}</version>
</feature> </feature>
<!-- End of Governance Features --> <!-- End of Governance Features -->
<!-- Notification Support: Mail --> <!-- Notification Support: Mail -->
<feature> <feature>
<id>org.apache.axis2.transport.mail.feature.group</id> <id>org.apache.axis2.transport.mail.feature.group</id>

135
pom.xml
Unescape View File

@ -60,6 +60,68 @@
<groupId>org.wso2.carbon.automation</groupId> <groupId>org.wso2.carbon.automation</groupId>
<artifactId>org.wso2.carbon.automation.extensions</artifactId> <artifactId>org.wso2.carbon.automation.extensions</artifactId>
<version>${test.framework.version}</version> <version>${test.framework.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.ftpserver</groupId>
<artifactId>ftpserver-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-all</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-logging-juli</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework.ws.wso2</groupId>
<artifactId>spring.framework</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
</exclusion>
<exclusion>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-java</artifactId>
</exclusion>
<exclusion>
<groupId>com.opera</groupId>
<artifactId>operadriver</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.jmeter</groupId>
<artifactId>ApacheJMeter_core</artifactId>
</exclusion>
<exclusion>
<groupId>com.saucelabs.selenium</groupId>
<artifactId>sauce-ondemand-driver</artifactId>
</exclusion>
<exclusion>
<groupId>com.saucelabs.selenium</groupId>
<artifactId>selenium-client-factory</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.axis2.wso2</groupId>
<artifactId>axis2</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.ws.commons.axiom.wso2</groupId>
<artifactId>axiom</artifactId>
</exclusion>
<exclusion>
<groupId>net.lingala.zip4j</groupId>
<artifactId>zip4j</artifactId>
</exclusion>
</exclusions>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -159,7 +221,6 @@
</exclusions> </exclusions>
</dependency> </dependency>
<!--Carbon Kernel Dependencies--> <!--Carbon Kernel Dependencies-->
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
@ -245,10 +306,10 @@
<groupId>org.apache.ant.wso2</groupId> <groupId>org.apache.ant.wso2</groupId>
<artifactId>ant</artifactId> <artifactId>ant</artifactId>
</exclusion> </exclusion>
<!--<exclusion>--> <exclusion>
<!--<groupId>commons-httpclient.wso2</groupId>--> <groupId>commons-httpclient.wso2</groupId>
<!--<artifactId>commons-httpclient</artifactId>--> <artifactId>commons-httpclient</artifactId>
<!--</exclusion>--> </exclusion>
<exclusion> <exclusion>
<groupId>org.eclipse.equinox</groupId> <groupId>org.eclipse.equinox</groupId>
<artifactId>javax.servlet</artifactId> <artifactId>javax.servlet</artifactId>
@ -470,10 +531,10 @@
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.rest.api.stub</artifactId> <artifactId>org.wso2.carbon.rest.api.stub</artifactId>
</exclusion> </exclusion>
<!--<exclusion>--> <exclusion>
<!--<groupId>org.json.wso2</groupId>--> <groupId>org.json.wso2</groupId>
<!--<artifactId>json</artifactId>--> <artifactId>json</artifactId>
<!--</exclusion>--> </exclusion>
<exclusion> <exclusion>
<groupId>com.h2database.wso2</groupId> <groupId>com.h2database.wso2</groupId>
<artifactId>h2-database-engine</artifactId> <artifactId>h2-database-engine</artifactId>
@ -537,7 +598,7 @@
</exclusions> </exclusions>
</dependency> </dependency>
<!--CXF dependencies (needed for mobile Jax_RS web apps)--> <!--CXF dependencies (needed for web apps)-->
<dependency> <dependency>
<groupId>org.apache.cxf</groupId> <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId> <artifactId>cxf-rt-frontend-jaxws</artifactId>
@ -553,16 +614,16 @@
<artifactId>cxf-rt-transports-http</artifactId> <artifactId>cxf-rt-transports-http</artifactId>
<version>${cxf.version}</version> <version>${cxf.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-jaxrs</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency> <dependency>
<groupId>javax.ws.rs</groupId> <groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId> <artifactId>jsr311-api</artifactId>
<version>${javax.ws.rs.version}</version> <version>${javax.ws.rs.version}</version>
<!--<scope>provided</scope>--> </dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-jaxrs</artifactId>
<version>${jackson.version}</version>
</dependency> </dependency>
<!--Windows Jax-RS dependencies--> <!--Windows Jax-RS dependencies-->
@ -724,6 +785,11 @@
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
<version>${commons-io.version}</version> <version>${commons-io.version}</version>
</dependency> </dependency>
<dependency>
<groupId>commons-httpclient.wso2</groupId>
<artifactId>commons-httpclient</artifactId>
<version>${orbit.version.commons-httpclient}</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
@ -744,10 +810,11 @@
<jaggery.extensions.sso.version>1.3.0</jaggery.extensions.sso.version> <jaggery.extensions.sso.version>1.3.0</jaggery.extensions.sso.version>
<jaggery.extensions.carbon.version>1.3.0</jaggery.extensions.carbon.version> <jaggery.extensions.carbon.version>1.3.0</jaggery.extensions.carbon.version>
<jaggery.extensions.test.version>1.3.0</jaggery.extensions.test.version> <jaggery.extensions.test.version>1.3.0</jaggery.extensions.test.version>
<!--Testing --> <!--Testing -->
<test.framework.version>4.3.1</test.framework.version> <test.framework.version>4.4.1</test.framework.version>
<testng.version>6.8</testng.version> <testng.version>6.8</testng.version>
<automation.utils.version>4.3.0</automation.utils.version> <automation.utils.version>4.4.1</automation.utils.version>
<test.automation.emm.ui.version>1.1.0</test.automation.emm.ui.version> <test.automation.emm.ui.version>1.1.0</test.automation.emm.ui.version>
<!--Eclipse Osgi--> <!--Eclipse Osgi-->
@ -757,15 +824,10 @@
<!--Orbit versions--> <!--Orbit versions-->
<orbit.h2.engine.version>1.2.140.wso2v3</orbit.h2.engine.version> <orbit.h2.engine.version>1.2.140.wso2v3</orbit.h2.engine.version>
<orbit.tomcat.version>7.0.59.wso2v1</orbit.tomcat.version>
<orbit.tomcat.jdbc.pooling.version>7.0.34.wso2v2</orbit.tomcat.jdbc.pooling.version>
<!--CXF properties--> <!--CXF properties-->
<cxf.version>2.6.1</cxf.version> <cxf.version>2.6.1</cxf.version>
<cxf.bindings.version>2.5.11</cxf.bindings.version> <cxf.bindings.version>2.5.11</cxf.bindings.version>
<jackson.version>1.9.0</jackson.version>
<javax.ws.rs.version>1.1.1</javax.ws.rs.version> <javax.ws.rs.version>1.1.1</javax.ws.rs.version>
<!-- Carbon Commons --> <!-- Carbon Commons -->
@ -774,34 +836,32 @@
<!-- Carbon Deployment --> <!-- Carbon Deployment -->
<carbon.deployment.version>4.4.0</carbon.deployment.version> <carbon.deployment.version>4.4.0</carbon.deployment.version>
<!-- Identity --> <!-- Carbon Identity -->
<carbon.identity.version>4.4.0</carbon.identity.version> <carbon.identity.version>4.4.0</carbon.identity.version>
<!-- Multi-tenancy --> <!-- Carbon Multi-tenancy -->
<carbon.multitenancy.version>4.4.0</carbon.multitenancy.version> <carbon.multitenancy.version>4.4.0</carbon.multitenancy.version>
<!-- Registry --> <!-- Carbon Registry -->
<carbon.registry.version>4.4.1</carbon.registry.version> <carbon.registry.version>4.4.1</carbon.registry.version>
<!-- Governance --> <!-- Carbon Governance -->
<carbon.governance.version>4.4.1</carbon.governance.version> <carbon.governance.version>4.4.1</carbon.governance.version>
<!-- Device Management --> <!-- Carbon Device Management -->
<carbon.device.mgt.version>0.9.2-SNAPSHOT</carbon.device.mgt.version> <carbon.device.mgt.version>0.9.2-SNAPSHOT</carbon.device.mgt.version>
<carbon.device.mgt.version.range>[0.8.0, 2.0.0)</carbon.device.mgt.version.range> <carbon.device.mgt.version.range>[0.8.0, 2.0.0)</carbon.device.mgt.version.range>
<!-- IOT Device Management --> <!-- IOT Device Management -->
<carbon.iot.device.mgt.version>1.0.0-SNAPSHOT</carbon.iot.device.mgt.version> <carbon.iot.device.mgt.version>1.0.0-SNAPSHOT</carbon.iot.device.mgt.version>
<commons-json.version>3.0.0.wso2v1</commons-json.version>
<!-- API Management --> <!-- API Management -->
<carbon.api.mgt.version>1.4.0</carbon.api.mgt.version> <carbon.api.mgt.version>1.4.0</carbon.api.mgt.version>
<!-- Tomcat --> <!-- Tomcat -->
<orbit.version.tomcat>7.0.52.wso2v5</orbit.version.tomcat> <orbit.tomcat.version>7.0.59.wso2v1</orbit.tomcat.version>
<orbit.version.tomcat-servlet-api>7.0.52.wso2v1</orbit.version.tomcat-servlet-api> <orbit.tomcat.jdbc.pooling.version>7.0.34.wso2v2</orbit.tomcat.jdbc.pooling.version>
<orbit.version.tomcat-servlet-api>7.0.59.wso2v1</orbit.version.tomcat-servlet-api>
<!-- Third Party Dependencies--> <!-- Third Party Dependencies-->
<spongycastle.version>1.51.0.0</spongycastle.version> <spongycastle.version>1.51.0.0</spongycastle.version>
@ -810,8 +870,7 @@
<codehaus.plexus.version>3.0.21</codehaus.plexus.version> <codehaus.plexus.version>3.0.21</codehaus.plexus.version>
<axis2-transports.wso2.version>1.1.0-wso2v13</axis2-transports.wso2.version> <axis2-transports.wso2.version>1.1.0-wso2v13</axis2-transports.wso2.version>
<orbit.version.commons-httpclient>3.1.0.wso2v2</orbit.version.commons-httpclient>
<wss4j.security.version>1.6.17</wss4j.security.version> <wss4j.security.version>1.6.17</wss4j.security.version>
<wss4j.security.common.version>2.0.0</wss4j.security.common.version> <wss4j.security.common.version>2.0.0</wss4j.security.common.version>
<axiom-api.version>1.2.14</axiom-api.version> <axiom-api.version>1.2.14</axiom-api.version>
@ -829,9 +888,9 @@
</properties> </properties>
<scm> <scm>
<url>https://github.com/wso2/product-mdm.git</url> <url>https://github.com/wso2-dev/product-device-cloud.git</url>
<developerConnection>scm:git:https://github.com/wso2/product-mdm.git</developerConnection> <developerConnection>scm:git:https://github.com/wso2-dev/product-device-cloud.git</developerConnection>
<connection>scm:git:https://github.com/wso2/product-mdm.git</connection> <connection>scm:git:https://github.com/wso2-dev/product-device-cloud.git</connection>
<tag>HEAD</tag> <tag>HEAD</tag>
</scm> </scm>

Write Preview
Loading…
Cancel
Save