From f26423bec363a538ef496962ba4105d17621f697 Mon Sep 17 00:00:00 2001 From: ayyoob Date: Sat, 22 Aug 2015 22:19:54 +0530 Subject: [PATCH] added multi-tenancy features --- modules/p2-profile-gen/pom.xml | 43 ++++++++++- pom.xml | 135 +++++++++++++++++++++++---------- 2 files changed, 138 insertions(+), 40 deletions(-) diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml index c99c7bc9..806e38d3 100644 --- a/modules/p2-profile-gen/pom.xml +++ b/modules/p2-profile-gen/pom.xml @@ -188,10 +188,26 @@ - 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} + + + org.wso2.carbon.multitenancy:org.wso2.carbon.tenant.mgt.core.feature:${carbon.multitenancy.version} + + + org.wso2.carbon.multitenancy:org.wso2.carbon.tenant.mgt.server.feature:${carbon.multitenancy.version} + + + org.wso2.carbon.multitenancy:org.wso2.carbon.tenant.usage.agent.feature:${carbon.multitenancy.version} + + + org.wso2.carbon.multitenancy:org.wso2.carbon.tenant.throttling.agent.feature:${carbon.multitenancy.version} + + + org.wso2.carbon.multitenancy:org.wso2.carbon.tenant.deployment.feature:${carbon.multitenancy.version} + org.wso2.carbon.identity:org.wso2.carbon.security.mgt.feature:${carbon.identity.version} @@ -438,7 +454,27 @@ - org.wso2.carbon.tenant.common.server.feature.group + org.wso2.carbon.tenant.common.feature.group + ${carbon.multitenancy.version} + + + org.wso2.carbon.tenant.mgt.core.feature.group + ${carbon.multitenancy.version} + + + org.wso2.carbon.tenant.mgt.server.feature.group + ${carbon.multitenancy.version} + + + org.wso2.carbon.tenant.usage.agent.feature.group + ${carbon.multitenancy.version} + + + org.wso2.carbon.tenant.throttling.agent.feature.group + ${carbon.multitenancy.version} + + + org.wso2.carbon.tenant.deployment.feature.group ${carbon.multitenancy.version} @@ -592,6 +628,9 @@ ${carbon.governance.version} + + + org.apache.axis2.transport.mail.feature.group diff --git a/pom.xml b/pom.xml index e38c4e03..8afbd910 100644 --- a/pom.xml +++ b/pom.xml @@ -60,6 +60,68 @@ org.wso2.carbon.automation org.wso2.carbon.automation.extensions ${test.framework.version} + + + org.slf4j + slf4j-api + + + org.apache.ftpserver + ftpserver-core + + + org.apache.activemq + activemq-all + + + org.apache.tomcat.embed + tomcat-embed-core + + + org.apache.tomcat.embed + tomcat-embed-logging-juli + + + org.springframework.ws.wso2 + spring.framework + + + org.apache.cxf + cxf-rt-frontend-jaxrs + + + org.seleniumhq.selenium + selenium-java + + + com.opera + operadriver + + + org.apache.jmeter + ApacheJMeter_core + + + com.saucelabs.selenium + sauce-ondemand-driver + + + com.saucelabs.selenium + selenium-client-factory + + + org.apache.axis2.wso2 + axis2 + + + org.apache.ws.commons.axiom.wso2 + axiom + + + net.lingala.zip4j + zip4j + + test @@ -159,7 +221,6 @@ - org.wso2.carbon @@ -245,10 +306,10 @@ org.apache.ant.wso2 ant - - - - + + commons-httpclient.wso2 + commons-httpclient + org.eclipse.equinox javax.servlet @@ -470,10 +531,10 @@ org.wso2.carbon org.wso2.carbon.rest.api.stub - - - - + + org.json.wso2 + json + com.h2database.wso2 h2-database-engine @@ -537,7 +598,7 @@ - + org.apache.cxf cxf-rt-frontend-jaxws @@ -553,16 +614,16 @@ cxf-rt-transports-http ${cxf.version} - - org.codehaus.jackson - jackson-jaxrs - ${jackson.version} - javax.ws.rs jsr311-api ${javax.ws.rs.version} - + + + + org.codehaus.jackson + jackson-jaxrs + ${jackson.version} @@ -724,6 +785,11 @@ commons-io ${commons-io.version} + + commons-httpclient.wso2 + commons-httpclient + ${orbit.version.commons-httpclient} + @@ -744,10 +810,11 @@ 1.3.0 1.3.0 1.3.0 + - 4.3.1 + 4.4.1 6.8 - 4.3.0 + 4.4.1 1.1.0 @@ -757,15 +824,10 @@ 1.2.140.wso2v3 - 7.0.59.wso2v1 - 7.0.34.wso2v2 - - 2.6.1 2.5.11 - 1.9.0 1.1.1 @@ -774,34 +836,32 @@ 4.4.0 - + 4.4.0 - + 4.4.0 - + 4.4.1 - + 4.4.1 - + 0.9.2-SNAPSHOT [0.8.0, 2.0.0) 1.0.0-SNAPSHOT - - 3.0.0.wso2v1 - 1.4.0 - 7.0.52.wso2v5 - 7.0.52.wso2v1 + 7.0.59.wso2v1 + 7.0.34.wso2v2 + 7.0.59.wso2v1 1.51.0.0 @@ -810,8 +870,7 @@ 3.0.21 1.1.0-wso2v13 - - + 3.1.0.wso2v2 1.6.17 2.0.0 1.2.14 @@ -829,9 +888,9 @@ - https://github.com/wso2/product-mdm.git - scm:git:https://github.com/wso2/product-mdm.git - scm:git:https://github.com/wso2/product-mdm.git + https://github.com/wso2-dev/product-device-cloud.git + scm:git:https://github.com/wso2-dev/product-device-cloud.git + scm:git:https://github.com/wso2-dev/product-device-cloud.git HEAD