You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by sa...@apache.org on 2014/01/06 13:52:48 UTC
[01/11] git commit: Upgrading carbon version dependency from 4.1.0 to
4.2.0 - initial step
Updated Branches:
refs/heads/master 7a61fc023 -> cf6c82320
Upgrading carbon version dependency from 4.1.0 to 4.2.0 - initial step
Signed-off-by: Sajith Kariyawasam <sa...@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/79c9e019
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/79c9e019
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/79c9e019
Branch: refs/heads/master
Commit: 79c9e019d5051026dfb1f22127689cbd83ca94eb
Parents: b2fccb2
Author: Melan Nimesh <me...@gmail.com>
Authored: Thu Jan 2 18:52:20 2014 +0530
Committer: Sajith Kariyawasam <sa...@wso2.com>
Committed: Fri Jan 3 00:36:21 2014 +0530
----------------------------------------------------------------------
.../org.apache.stratos.autoscaler/pom.xml | 2 +-
components/pom.xml | 8 +--
.../src/main/resources/p2.inf | 14 +++---
.../pom.xml | 4 +-
features/manager/pom.xml | 2 +-
features/pom.xml | 6 +--
pom.xml | 6 +--
.../distribution/src/main/assembly/bin.xml | 5 +-
.../distribution/src/main/license/LICENSE | 2 +-
products/autoscaler/modules/integration/pom.xml | 2 +-
products/autoscaler/modules/p2-profile/pom.xml | 20 +++++---
products/autoscaler/pom.xml | 10 ++--
.../distribution/src/main/assembly/bin.xml | 2 +-
.../distribution/src/main/assembly/bin.xml | 9 ++--
.../distribution/src/main/license/LICENSE | 2 +-
.../cloud-controller/modules/p2-profile/pom.xml | 16 +++---
products/cloud-controller/pom.xml | 12 ++---
.../load-balancer/modules/distribution/pom.xml | 16 +++---
.../distribution/src/main/assembly/bin.xml | 8 +--
.../distribution/src/main/license/LICENSE | 2 +-
.../load-balancer/modules/p2-profile/pom.xml | 52 ++++++++++----------
products/load-balancer/pom.xml | 12 ++---
.../distribution/src/main/license/LICENSE | 2 +-
.../modules/features/service/pom.xml | 2 +-
.../stratos-controller/modules/styles/pom.xml | 2 +-
25 files changed, 114 insertions(+), 104 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/79c9e019/components/org.apache.stratos.autoscaler/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/pom.xml b/components/org.apache.stratos.autoscaler/pom.xml
index ea396a9..c5faf9a 100644
--- a/components/org.apache.stratos.autoscaler/pom.xml
+++ b/components/org.apache.stratos.autoscaler/pom.xml
@@ -185,7 +185,7 @@
<Private-Package>org.apache.stratos.autoscaler.internal.*</Private-Package>
<Export-Package>!org.apache.stratos.autoscaler.internal.*,org.apache.stratos.autoscaler.*</Export-Package>
<Import-Package>
- org.osgi.framework.*,
+ org.osgi.framework.*;resolution:=optional,
*;resolution:=optional
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/79c9e019/components/pom.xml
----------------------------------------------------------------------
diff --git a/components/pom.xml b/components/pom.xml
index e2bfb60..fd7d1a8 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -73,9 +73,9 @@
<module>org.apache.stratos.validate.domain</module>
<module>org.apache.stratos.validate.domain.ui</module>
<!-- Throttling -->
- <module>org.apache.stratos.throttling.agent</module>
+ <!--module>org.apache.stratos.throttling.agent</module>
<module>org.apache.stratos.throttling.manager</module>
- <module>org.apache.stratos.throttling.ui</module>
+ <module>org.apache.stratos.throttling.ui</module-->
<!-- Redirector -->
<module>org.apache.stratos.sso.redirector.ui</module>
<module>org.apache.stratos.redirector.servlet</module>
@@ -254,11 +254,11 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <wso2carbon.version>4.1.0</wso2carbon.version>
+ <wso2carbon.version>4.2.0</wso2carbon.version>
<junit.version>4.11</junit.version>
<synapse.core.version>2.1.1-wso2v4</synapse.core.version>
<google.guava.wso2.version>12.0.0.wso2v1</google.guava.wso2.version>
- <carbon.platform.version>4.1.0</carbon.platform.version>
+ <carbon.platform.version>4.2.0</carbon.platform.version>
<version.equinox.osgi.services>3.3.100.v20120522-1822</version.equinox.osgi.services>
<version.equinox.osgi>3.8.1.v20120830-144521</version.equinox.osgi>
<axiom.osgi.version.range>[1.2.11.wso2v4, 1.3.0)</axiom.osgi.version.range>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/79c9e019/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/p2.inf
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/p2.inf b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/p2.inf
index f7e4315..d2aa499 100644
--- a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/p2.inf
+++ b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/p2.inf
@@ -16,10 +16,10 @@
# under the License.
instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.cloud.controller_${feature.version}/conf/cloud-controller.xml,target:${installFolder}/../conf/cloud-controller.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.cloud.controller_${feature.version}/conf/etc/cartridge.xsd,target:${installFolder}/../conf/etc/cartridge.xsd,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.cloud.controller_${feature.version}/conf/etc/cartridges.xsd,target:${installFolder}/../conf/etc/cartridges.xsd,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.cloud.controller_${feature.version}/conf/etc/service.xsd,target:${installFolder}/../conf/etc/service.xsd,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.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);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.cloud.controller_${feature.version}/conf/cloud-controller.xml,target:${installFolder}/../../conf/cloud-controller.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.cloud.controller_${feature.version}/conf/etc/cartridge.xsd,target:${installFolder}/../../conf/etc/cartridge.xsd,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.cloud.controller_${feature.version}/conf/etc/cartridges.xsd,target:${installFolder}/../../conf/etc/cartridges.xsd,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.cloud.controller_${feature.version}/conf/etc/service.xsd,target:${installFolder}/../../conf/etc/service.xsd,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.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/79c9e019/features/manager/common/org.apache.stratos.common.server.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/common/org.apache.stratos.common.server.feature/pom.xml b/features/manager/common/org.apache.stratos.common.server.feature/pom.xml
index 7c01e56..2464cf5 100644
--- a/features/manager/common/org.apache.stratos.common.server.feature/pom.xml
+++ b/features/manager/common/org.apache.stratos.common.server.feature/pom.xml
@@ -73,11 +73,11 @@
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.throttling.agent</artifactId>
</dependency>-->
- <dependency>
+ <!--dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.throttling.agent.stub</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency-->
<!--<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.usage.agent</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/79c9e019/features/manager/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/pom.xml b/features/manager/pom.xml
index 001b879..513dd5d 100644
--- a/features/manager/pom.xml
+++ b/features/manager/pom.xml
@@ -66,7 +66,7 @@
<properties>
<stratos.version>2.1.0</stratos.version>
<synapse.version>2.1.0-wso2v6</synapse.version>
- <carbon.version>4.1.0</carbon.version>
+ <carbon.version>4.2.0</carbon.version>
<quartz.wso2.version>2.1.1.wso2v1</quartz.wso2.version>
<carbon.p2.plugin.version>1.5</carbon.p2.plugin.version>
</properties>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/79c9e019/features/pom.xml
----------------------------------------------------------------------
diff --git a/features/pom.xml b/features/pom.xml
index 962559f..88d599d 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -59,9 +59,9 @@
</build>
<properties>
- <wso2carbon.version>4.1.0</wso2carbon.version>
- <carbon.patch.version.4.1.1>4.1.1</carbon.patch.version.4.1.1>
- <carbon.p2.plugin.version>1.5.2</carbon.p2.plugin.version>
+ <wso2carbon.version>4.2.0</wso2carbon.version>
+ <!--carbon.patch.version.4.1.1>4.1.1</carbon.patch.version.4.1.1-->
+ <carbon.p2.plugin.version>1.5.3</carbon.p2.plugin.version>
<synapse.wso2.version>2.1.1-wso2v4</synapse.wso2.version>
<google.guava.wso2.version>12.0.0.wso2v1</google.guava.wso2.version>
<google.guice.wso2.version>3.0.wso2v1</google.guice.wso2.version>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/79c9e019/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d1c6607..26b5f5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -428,9 +428,9 @@
<properties>
<!-- Carbon related versions -->
- <wso2carbon.version>4.1.0</wso2carbon.version>
- <carbon.platform.package.import.version.range>[4.1.0, 4.2.0)</carbon.platform.package.import.version.range>
- <carbon.platform.package.export.version>4.1.0</carbon.platform.package.export.version>
+ <wso2carbon.version>4.2.0</wso2carbon.version>
+ <carbon.platform.package.import.version.range>[4.2.0, 5.0.0)</carbon.platform.package.import.version.range>
+ <carbon.platform.package.export.version>4.2.0</carbon.platform.package.export.version>
<axis2.osgi.version>1.6.1.wso2v9</axis2.osgi.version>
<jclouds.version>1.6.2-incubating</jclouds.version>
</properties>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/79c9e019/products/autoscaler/modules/distribution/src/main/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/products/autoscaler/modules/distribution/src/main/assembly/bin.xml b/products/autoscaler/modules/distribution/src/main/assembly/bin.xml
index e9b430b..da5224c 100644
--- a/products/autoscaler/modules/distribution/src/main/assembly/bin.xml
+++ b/products/autoscaler/modules/distribution/src/main/assembly/bin.xml
@@ -163,13 +163,14 @@
</fileSet>
<!-- get axis2_1.6.1.wso2v9.jar from carbon kernel patch 0002 -->
- <fileSet>
+ <!-- N/A for carbon 4.2.0 -->
+ <!--fileSet>
<directory>../p2-profile/target/WSO2-CARBON-PATCH-4.1.0-0002/</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/components/patches</outputDirectory>
<includes>
<include>**/patch0002/axis2_1.6.1.wso2v9.jar</include>
</includes>
- </fileSet>
+ </fileSet-->
<fileSet>
<directory>src/main/autoscale-policies</directory>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/79c9e019/products/autoscaler/modules/distribution/src/main/license/LICENSE
----------------------------------------------------------------------
diff --git a/products/autoscaler/modules/distribution/src/main/license/LICENSE b/products/autoscaler/modules/distribution/src/main/license/LICENSE
index ec01dab..f8c0026 100644
--- a/products/autoscaler/modules/distribution/src/main/license/LICENSE
+++ b/products/autoscaler/modules/distribution/src/main/license/LICENSE
@@ -247,7 +247,7 @@ org.wso2.carbon.andes.mgt.stub_4.1.0.jar, org.wso2.carbon.andes.stub_4.1.0.jar,
org.wso2.carbon.apache.jasper.fragment_4.1.0.jar, org.wso2.carbon.application.deployer_4.1.0.jar,
org.wso2.carbon.application.upload_4.1.0.jar, org.wso2.carbon.authenticator.proxy_4.1.0.jar,
org.wso2.carbon.authenticator.stub_4.1.0.jar, org.wso2.carbon.base_4.1.0.jar, org.wso2.carbon.caching_4.1.0.jar,
-org.wso2.carbon.caching.core_4.1.0.stratos.jar, org.wso2.carbon.captcha.mgt_4.1.0.jar, org.wso2.carbon.cassandra.server_4.1.1.jar,
+org.wso2.carbon.caching.core_4.2.0.jar, org.wso2.carbon.captcha.mgt_4.1.0.jar, org.wso2.carbon.cassandra.server_4.1.1.jar,
org.wso2.carbon.cassandra.sharedkey_4.1.0.jar, org.wso2.carbon.cluster.mgt.core_4.1.0.jar, org.wso2.carbon.coordination.common_4.1.0.jar,
org.wso2.carbon.coordination.core_4.1.0.jar, org.wso2.carbon.coordination.server_4.1.0.jar, org.wso2.carbon.core_4.1.0.jar,
org.wso2.carbon.core.bootup.validator_4.1.0.jar, org.wso2.carbon.core.common_4.1.0.jar, org.wso2.carbon.core.commons.stub_4.1.0.jar,
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/79c9e019/products/autoscaler/modules/integration/pom.xml
----------------------------------------------------------------------
diff --git a/products/autoscaler/modules/integration/pom.xml b/products/autoscaler/modules/integration/pom.xml
index c98b056..bdef4a4 100644
--- a/products/autoscaler/modules/integration/pom.xml
+++ b/products/autoscaler/modules/integration/pom.xml
@@ -206,7 +206,7 @@
<properties>
<clarity.version>4.1.3</clarity.version>
- <carbon.kernel.version>4.1.0.stratos</carbon.kernel.version>
+ <carbon.kernel.version>4.2.0</carbon.kernel.version>
</properties>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/79c9e019/products/autoscaler/modules/p2-profile/pom.xml
----------------------------------------------------------------------
diff --git a/products/autoscaler/modules/p2-profile/pom.xml b/products/autoscaler/modules/p2-profile/pom.xml
index 7e86429..c27ed79 100644
--- a/products/autoscaler/modules/p2-profile/pom.xml
+++ b/products/autoscaler/modules/p2-profile/pom.xml
@@ -61,7 +61,7 @@
</artifactItems>
</configuration>
</execution>
- <execution>
+ <!--execution>
<id>2-unpack-kernel-patch</id>
<phase>test</phase>
<goals>
@@ -79,7 +79,7 @@
</artifactItem>
</artifactItems>
</configuration>
- </execution>
+ </execution-->
</executions>
</plugin>
<plugin>
@@ -108,8 +108,11 @@
</featureArtifactDef>
<featureArtifactDef>
org.apache.stratos:org.apache.stratos.messaging.feature:${project.version}
- </featureArtifactDef>
-
+ </featureArtifactDef>
+ <featureArtifactDef>
+ org.wso2.carbon:org.wso2.carbon.core.feature:${carbon.version}
+ </featureArtifactDef>
+
<!-- Registry -->
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.registry.core.feature:${carbon.version}
@@ -131,7 +134,7 @@
<goal>p2-profile-gen</goal>
</goals>
<configuration>
- <profile>WSO2CarbonProfile</profile>
+ <profile>default</profile>
<metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
<artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
<destination>
@@ -152,6 +155,11 @@
<id>org.apache.stratos.messaging.feature.group</id>
<version>${project.version}</version>
</feature>
+ <feature>
+ <id>org.wso2.carbon.core.feature.group</id>
+ <version>${carbon.version}</version>
+ </feature>
+
<!-- Registry feature -->
<feature>
<id>org.wso2.carbon.registry.core.feature.group</id>
@@ -183,7 +191,7 @@
<configuration>
<tasks>
<replace token="false" value="true"
- dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/configuration/org.eclipse.equinox.simpleconfigurator">
+ dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/default/configuration/org.eclipse.equinox.simpleconfigurator">
<include name="**/bundles.info"/>
</replace>
</tasks>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/79c9e019/products/autoscaler/pom.xml
----------------------------------------------------------------------
diff --git a/products/autoscaler/pom.xml b/products/autoscaler/pom.xml
index a8225a0..b93932e 100644
--- a/products/autoscaler/pom.xml
+++ b/products/autoscaler/pom.xml
@@ -90,11 +90,11 @@
</profiles>
<properties>
- <carbon.version>4.1.0</carbon.version>
- <carbon.patch.version>4.1.1</carbon.patch.version>
- <carbon.patch.version.4.1.3>4.1.3</carbon.patch.version.4.1.3>
- <carbon.kernel.version>4.1.0.stratos</carbon.kernel.version>
- <carbon.p2.plugin.version>1.5.2</carbon.p2.plugin.version>
+ <carbon.version>4.2.0</carbon.version>
+ <carbon.patch.version>4.2.0</carbon.patch.version>
+ <!--carbon.patch.version.4.1.3>4.1.3</carbon.patch.version.4.1.3-->
+ <carbon.kernel.version>4.2.0</carbon.kernel.version>
+ <carbon.p2.plugin.version>1.5.3</carbon.p2.plugin.version>
<stratos.component.version>2.1.0</stratos.component.version>
<stratos.component.patch.version.2.1.1>2.1.1</stratos.component.patch.version.2.1.1>
<stratos.component.patch.version.2.1.3>2.1.3</stratos.component.patch.version.2.1.3>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/79c9e019/products/cartridge-agent/modules/distribution/src/main/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/products/cartridge-agent/modules/distribution/src/main/assembly/bin.xml b/products/cartridge-agent/modules/distribution/src/main/assembly/bin.xml
index 8eeb5b1..9d56cf0 100644
--- a/products/cartridge-agent/modules/distribution/src/main/assembly/bin.xml
+++ b/products/cartridge-agent/modules/distribution/src/main/assembly/bin.xml
@@ -86,4 +86,4 @@
<scope>runtime</scope>
</dependencySet>
</dependencySets>
-</assembly>
\ No newline at end of file
+</assembly>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/79c9e019/products/cloud-controller/modules/distribution/src/main/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/products/cloud-controller/modules/distribution/src/main/assembly/bin.xml b/products/cloud-controller/modules/distribution/src/main/assembly/bin.xml
index 089f9bc..f374341 100644
--- a/products/cloud-controller/modules/distribution/src/main/assembly/bin.xml
+++ b/products/cloud-controller/modules/distribution/src/main/assembly/bin.xml
@@ -163,13 +163,14 @@
</fileSet>
<!-- get axis2_1.6.1.wso2v9.jar from carbon kernel patch 0002 -->
- <fileSet>
+ <!-- N/A for carbon 4.2.0 -->
+ <!--fileSet>
<directory>../p2-profile/target/WSO2-CARBON-PATCH-4.1.0-0002/</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/components/patches</outputDirectory>
<includes>
<include>**/patch0002/axis2_1.6.1.wso2v9.jar</include>
</includes>
- </fileSet>
+ </fileSet-->
</fileSets>
<dependencySets>
@@ -352,9 +353,9 @@
<source>../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/cartridges.xsd</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
</file>
- <file>
+ <!--file>
<source>../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/coordination-client-config.xml</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
- </file>
+ </file-->
</files>
</assembly>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/79c9e019/products/cloud-controller/modules/distribution/src/main/license/LICENSE
----------------------------------------------------------------------
diff --git a/products/cloud-controller/modules/distribution/src/main/license/LICENSE b/products/cloud-controller/modules/distribution/src/main/license/LICENSE
index ec01dab..f8c0026 100644
--- a/products/cloud-controller/modules/distribution/src/main/license/LICENSE
+++ b/products/cloud-controller/modules/distribution/src/main/license/LICENSE
@@ -247,7 +247,7 @@ org.wso2.carbon.andes.mgt.stub_4.1.0.jar, org.wso2.carbon.andes.stub_4.1.0.jar,
org.wso2.carbon.apache.jasper.fragment_4.1.0.jar, org.wso2.carbon.application.deployer_4.1.0.jar,
org.wso2.carbon.application.upload_4.1.0.jar, org.wso2.carbon.authenticator.proxy_4.1.0.jar,
org.wso2.carbon.authenticator.stub_4.1.0.jar, org.wso2.carbon.base_4.1.0.jar, org.wso2.carbon.caching_4.1.0.jar,
-org.wso2.carbon.caching.core_4.1.0.stratos.jar, org.wso2.carbon.captcha.mgt_4.1.0.jar, org.wso2.carbon.cassandra.server_4.1.1.jar,
+org.wso2.carbon.caching.core_4.2.0.jar, org.wso2.carbon.captcha.mgt_4.1.0.jar, org.wso2.carbon.cassandra.server_4.1.1.jar,
org.wso2.carbon.cassandra.sharedkey_4.1.0.jar, org.wso2.carbon.cluster.mgt.core_4.1.0.jar, org.wso2.carbon.coordination.common_4.1.0.jar,
org.wso2.carbon.coordination.core_4.1.0.jar, org.wso2.carbon.coordination.server_4.1.0.jar, org.wso2.carbon.core_4.1.0.jar,
org.wso2.carbon.core.bootup.validator_4.1.0.jar, org.wso2.carbon.core.common_4.1.0.jar, org.wso2.carbon.core.commons.stub_4.1.0.jar,
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/79c9e019/products/cloud-controller/modules/p2-profile/pom.xml
----------------------------------------------------------------------
diff --git a/products/cloud-controller/modules/p2-profile/pom.xml b/products/cloud-controller/modules/p2-profile/pom.xml
index 4e56a7f..08dbd74 100644
--- a/products/cloud-controller/modules/p2-profile/pom.xml
+++ b/products/cloud-controller/modules/p2-profile/pom.xml
@@ -61,7 +61,7 @@
</artifactItems>
</configuration>
</execution>
- <execution>
+ <!--execution>
<id>2-unpack-kernel-patch</id>
<phase>test</phase>
<goals>
@@ -79,7 +79,7 @@
</artifactItem>
</artifactItems>
</configuration>
- </execution>
+ </execution-->
</executions>
</plugin>
<plugin>
@@ -124,12 +124,12 @@
<featureArtifactDef>
org.apache.stratos:org.apache.stratos.cloud.controller.feature:${project.version}
</featureArtifactDef>
- <featureArtifactDef>
+ <!--featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.coordination.server.feature:${carbon.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.coordination.core.feature:${carbon.version}
- </featureArtifactDef>
+ </featureArtifactDef-->
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.tryit.feature:${carbon.version}
</featureArtifactDef>
@@ -214,7 +214,7 @@
<goal>p2-profile-gen</goal>
</goals>
<configuration>
- <profile>WSO2CarbonProfile</profile>
+ <profile>default</profile>
<metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
<artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
<destination>
@@ -231,14 +231,14 @@
<id>org.wso2.carbon.logging.mgt.feature.group</id>
<version>${carbon.version}</version>
</feature>
- <feature>
+ <!--feature>
<id>org.wso2.carbon.coordination.server.feature.group</id>
<version>${carbon.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.coordination.core.feature.group</id>
<version>${carbon.version}</version>
- </feature>
+ </feature-->
<feature>
<id>org.wso2.carbon.ntask.core.feature.group</id>
<version>${carbon.version}</version>
@@ -342,7 +342,7 @@
<configuration>
<tasks>
<replace token="false" value="true"
- dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/configuration/org.eclipse.equinox.simpleconfigurator">
+ dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/default/configuration/org.eclipse.equinox.simpleconfigurator">
<include name="**/bundles.info"/>
</replace>
</tasks>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/79c9e019/products/cloud-controller/pom.xml
----------------------------------------------------------------------
diff --git a/products/cloud-controller/pom.xml b/products/cloud-controller/pom.xml
index 2d0eac4..e36f3ef 100644
--- a/products/cloud-controller/pom.xml
+++ b/products/cloud-controller/pom.xml
@@ -90,15 +90,15 @@
</profiles>
<properties>
- <carbon.version>4.1.0</carbon.version>
- <carbon.patch.version>4.1.1</carbon.patch.version>
- <carbon.patch.version.4.1.3>4.1.3</carbon.patch.version.4.1.3>
- <carbon.kernel.version>4.1.0.stratos</carbon.kernel.version>
- <carbon.p2.plugin.version>1.5.2</carbon.p2.plugin.version>
+ <carbon.version>4.2.0</carbon.version>
+ <carbon.patch.version>4.2.0</carbon.patch.version>
+ <!--carbon.patch.version.4.1.3>4.1.3</carbon.patch.version.4.1.3-->
+ <carbon.kernel.version>4.2.0</carbon.kernel.version>
+ <carbon.p2.plugin.version>1.5.3</carbon.p2.plugin.version>
<stratos.component.version>2.1.0</stratos.component.version>
<stratos.component.patch.version.2.1.1>2.1.1</stratos.component.patch.version.2.1.1>
<stratos.component.patch.version.2.1.3>2.1.3</stratos.component.patch.version.2.1.3>
- <synapse.version>2.1.1-wso2v4</synapse.version>
+ <synapse.version>2.1.2-wso2v3</synapse.version>
<rampart.mar.version>1.6.1-wso2v8</rampart.mar.version>
<slf4j.wso2.version>1.5.10.wso2v1</slf4j.wso2.version>
</properties>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/79c9e019/products/load-balancer/modules/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/products/load-balancer/modules/distribution/pom.xml b/products/load-balancer/modules/distribution/pom.xml
index 6a5f178..501e4d4 100755
--- a/products/load-balancer/modules/distribution/pom.xml
+++ b/products/load-balancer/modules/distribution/pom.xml
@@ -50,12 +50,12 @@
<dependency>
<groupId>org.apache.synapse</groupId>
<artifactId>synapse-commons</artifactId>
- <version>2.1.1-wso2v4</version>
+ <version>2.1.2-wso2v3</version>
</dependency>
<dependency>
<groupId>org.apache.synapse</groupId>
<artifactId>synapse-nhttp-transport</artifactId>
- <version>2.1.1-wso2v4</version>
+ <version>2.1.2-wso2v3</version>
</dependency>
<dependency>
<groupId>org.apache.synapse</groupId>
@@ -65,24 +65,24 @@
<dependency>
<groupId>org.apache.synapse</groupId>
<artifactId>synapse-core</artifactId>
- <version>2.1.1-wso2v4</version>
+ <version>2.1.2-wso2v3</version>
</dependency>
<dependency>
<groupId>org.apache.synapse</groupId>
<artifactId>synapse-tasks</artifactId>
- <version>2.1.1-wso2v4</version>
+ <version>2.1.2-wso2v3</version>
</dependency>
<dependency>
<groupId>org.apache.synapse</groupId>
<artifactId>synapse-extensions</artifactId>
- <version>2.1.1-wso2v4</version>
+ <version>2.1.2-wso2v3</version>
</dependency>
<!-- Carbon mediation initializer -->
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.mediation.initializer</artifactId>
- <version>4.1.1</version>
+ <version>4.2.0</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
@@ -92,7 +92,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.mediation.dependency.mgt</artifactId>
- <version>4.1.1</version>
+ <version>4.2.0</version>
</dependency>
@@ -112,7 +112,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.transport.nhttp</artifactId>
- <version>4.1.1</version>
+ <version>4.2.0</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/79c9e019/products/load-balancer/modules/distribution/src/main/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/products/load-balancer/modules/distribution/src/main/assembly/bin.xml b/products/load-balancer/modules/distribution/src/main/assembly/bin.xml
index 5e93ce0..5b80b0c 100755
--- a/products/load-balancer/modules/distribution/src/main/assembly/bin.xml
+++ b/products/load-balancer/modules/distribution/src/main/assembly/bin.xml
@@ -78,13 +78,13 @@
</excludes>
</fileSet>
<!-- get axis2_1.6.1.wso2v9.jar from carbon kernel patch 0002 -->
- <fileSet>
+ <!--fileSet>
<directory>../p2-profile/target/WSO2-CARBON-PATCH-4.1.0-0002/</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/components/patches</outputDirectory>
<includes>
<include>**/patch0002/axis2_1.6.1.wso2v9.jar</include>
</includes>
- </fileSet>
+ </fileSet-->
<fileSet>
<directory>src/main/conf/synapse-configs</directory>
<outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/deployment/server/synapse-configs
@@ -185,14 +185,14 @@
</source>
<outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf</outputDirectory>
</file>
- <file>
+ <!--file>
<source>../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/zoo.cfg</source>
<outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf/etc</outputDirectory>
</file>
<file>
<source>../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/coordination-client-config.xml</source>
<outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf/etc</outputDirectory>
- </file>
+ </file-->
<file>
<source>src/main/conf/user-mgt.xml</source>
<outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf</outputDirectory>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/79c9e019/products/load-balancer/modules/distribution/src/main/license/LICENSE
----------------------------------------------------------------------
diff --git a/products/load-balancer/modules/distribution/src/main/license/LICENSE b/products/load-balancer/modules/distribution/src/main/license/LICENSE
index a7fb545..0240275 100644
--- a/products/load-balancer/modules/distribution/src/main/license/LICENSE
+++ b/products/load-balancer/modules/distribution/src/main/license/LICENSE
@@ -250,7 +250,7 @@ org.jboss.netty_3.3.0.Final.jar, org.wso2.carbon.addressing_4.1.0.jar
org.wso2.carbon.apache.jasper.fragment_4.1.0.jar, org.wso2.carbon.application.deployer_4.1.0.jar
org.wso2.carbon.authenticator.proxy_4.1.0.jar, org.wso2.carbon.authenticator.stub_4.1.0.jar
org.wso2.carbon.base_4.1.0.jar, org.wso2.carbon.caching_4.1.0.jar
-org.wso2.carbon.caching.core_4.1.0.stratos.jar, org.wso2.carbon.cluster.mgt.core_4.1.0.jar
+org.wso2.carbon.caching.core_4.2.0.jar, org.wso2.carbon.cluster.mgt.core_4.1.0.jar
org.wso2.carbon.coordination.common_4.1.0.jar, org.wso2.carbon.coordination.core_4.1.0.jar
org.wso2.carbon.coordination.server_4.1.0.jar, org.wso2.carbon.core_4.1.0.jar,
org.wso2.carbon.core.bootup.validator_4.1.0.jar, org.wso2.carbon.core.common_4.1.0.jar,
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/79c9e019/products/load-balancer/modules/p2-profile/pom.xml
----------------------------------------------------------------------
diff --git a/products/load-balancer/modules/p2-profile/pom.xml b/products/load-balancer/modules/p2-profile/pom.xml
index 0575c73..05f6d19 100755
--- a/products/load-balancer/modules/p2-profile/pom.xml
+++ b/products/load-balancer/modules/p2-profile/pom.xml
@@ -60,7 +60,7 @@
</artifactItems>
</configuration>
</execution>
- <execution>
+ <!--execution>
<id>unpack-kernel-patch</id>
<phase>test</phase>
<goals>
@@ -78,7 +78,7 @@
</artifactItem>
</artifactItems>
</configuration>
- </execution>
+ </execution-->
</executions>
</plugin>
<plugin>
@@ -111,11 +111,11 @@
</featureArtifactDef>
<featureArtifactDef>
- org.wso2.carbon:org.wso2.carbon.transport.nhttp.feature:${carbon.patch.version.4.1.1}
+ org.wso2.carbon:org.wso2.carbon.transport.nhttp.feature:${carbon.version}
</featureArtifactDef>
<featureArtifactDef>
- org.wso2.carbon:org.wso2.carbon.datasource.server.feature:${carbon.patch.version.4.1.1}
+ org.wso2.carbon:org.wso2.carbon.datasource.server.feature:${carbon.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon:org.apache.synapse.wso2.feature:${synapse.version}
@@ -125,11 +125,11 @@
</featureArtifactDef>
<featureArtifactDef>
- org.wso2.carbon:org.wso2.carbon.task.server.feature:${carbon.patch.version.4.1.1}
+ org.wso2.carbon:org.wso2.carbon.task.server.feature:${carbon.version}
</featureArtifactDef>
<featureArtifactDef>
- org.wso2.carbon:org.wso2.carbon.mediation.initializer.feature:${carbon.patch.version.4.1.1}
+ org.wso2.carbon:org.wso2.carbon.mediation.initializer.feature:${carbon.version}
</featureArtifactDef>
<!--featureArtifactDef>
@@ -137,7 +137,7 @@
</featureArtifactDef-->
<featureArtifactDef>
- org.wso2.carbon:org.wso2.carbon.endpoint.server.feature:${carbon.patch.version.4.1.1}
+ org.wso2.carbon:org.wso2.carbon.endpoint.server.feature:${carbon.version}
</featureArtifactDef>
<featureArtifactDef>
@@ -149,15 +149,15 @@
</featureArtifactDef>
<featureArtifactDef>
- org.wso2.carbon:org.wso2.carbon.sequences.server.feature:${carbon.patch.version.4.1.1}
+ org.wso2.carbon:org.wso2.carbon.sequences.server.feature:${carbon.version}
</featureArtifactDef>
<featureArtifactDef>
- org.wso2.carbon:org.wso2.carbon.mediators.server.feature:${carbon.patch.version.4.1.1}
+ org.wso2.carbon:org.wso2.carbon.mediators.server.feature:${carbon.version}
</featureArtifactDef>
<featureArtifactDef>
- org.wso2.carbon:org.wso2.carbon.relay.server.feature:${carbon.patch.version.4.1.1}
+ org.wso2.carbon:org.wso2.carbon.relay.server.feature:${carbon.version}
</featureArtifactDef>
<featureArtifactDef>
@@ -167,12 +167,12 @@
<featureArtifactDef>
org.apache.stratos:org.apache.stratos.messaging.feature:${project.version}
</featureArtifactDef>
- <featureArtifactDef>
+ <!--featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.coordination.server.feature:${carbon.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.coordination.core.feature:${carbon.version}
- </featureArtifactDef>
+ </featureArtifactDef-->
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.registry.core.feature:${carbon.version}
</featureArtifactDef>
@@ -192,7 +192,7 @@
org.wso2.carbon:org.wso2.carbon.rm.server.feature:${carbon.version}
</featureArtifactDef>
<featureArtifactDef>
- org.wso2.carbon:org.wso2.carbon.databridge.datapublisher.feature:${carbon.patch.version.4.1.1}
+ org.wso2.carbon:org.wso2.carbon.databridge.datapublisher.feature:${carbon.version}
</featureArtifactDef>
<!--***********************************************-->
<featureArtifactDef>
@@ -208,7 +208,7 @@
<goal>p2-profile-gen</goal>
</goals>
<configuration>
- <profile>WSO2CarbonProfile</profile>
+ <profile>default</profile>
<metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
<artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
<destination>
@@ -226,15 +226,15 @@
</feature>
<feature>
<id>org.wso2.carbon.task.server.feature.group</id>
- <version>${carbon.patch.version.4.1.1}</version>
+ <version>${carbon.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.datasource.server.feature.group</id>
- <version>${carbon.patch.version.4.1.1}</version>
+ <version>${carbon.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.mediation.initializer.feature.group</id>
- <version>${carbon.patch.version.4.1.1}</version>
+ <version>${carbon.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.service.mgt.server.feature.group</id>
@@ -246,36 +246,36 @@
</feature>
<feature>
<id>org.wso2.carbon.transport.nhttp.feature.group</id>
- <version>${carbon.patch.version.4.1.1}</version>
+ <version>${carbon.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.endpoint.server.feature.group</id>
- <version>${carbon.patch.version.4.1.1}</version>
+ <version>${carbon.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.sequences.server.feature.group</id>
- <version>${carbon.patch.version.4.1.1}</version>
+ <version>${carbon.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.mediators.server.feature.group</id>
- <version>${carbon.patch.version.4.1.1}</version>
+ <version>${carbon.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.relay.server.feature.group</id>
- <version>${carbon.patch.version.4.1.1}</version>
+ <version>${carbon.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.ntask.core.feature.group</id>
<version>${carbon.version}</version>
</feature>
- <feature>
+ <!--feature>
<id>org.wso2.carbon.coordination.server.feature.group</id>
<version>${carbon.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.coordination.core.feature.group</id>
<version>${carbon.version}</version>
- </feature>
+ </feature-->
<feature>
<id>org.wso2.carbon.registry.core.feature.group</id>
<version>${carbon.version}</version>
@@ -294,7 +294,7 @@
</feature>
<feature>
<id>org.wso2.carbon.databridge.datapublisher.feature.group</id>
- <version>${carbon.patch.version.4.1.1}</version>
+ <version>${carbon.version}</version>
</feature>
<!--***********************************************-->
<feature>
@@ -316,7 +316,7 @@
<configuration>
<tasks>
<replace token="false" value="true"
- dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/configuration/org.eclipse.equinox.simpleconfigurator">
+ dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/default/configuration/org.eclipse.equinox.simpleconfigurator">
<include name="**/bundles.info"/>
</replace>
</tasks>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/79c9e019/products/load-balancer/pom.xml
----------------------------------------------------------------------
diff --git a/products/load-balancer/pom.xml b/products/load-balancer/pom.xml
index bf752e3..2dcfec9 100755
--- a/products/load-balancer/pom.xml
+++ b/products/load-balancer/pom.xml
@@ -128,16 +128,16 @@
<commons.logging.version>1.1</commons.logging.version>
<opencsv.version>1.8</opencsv.version>
<poi.version>3.0-FINAL</poi.version>
- <carbon.version>4.1.0</carbon.version>
+ <carbon.version>4.2.0</carbon.version>
<emma.version>2.1.5320</emma.version>
- <carbon.kernel.version>4.1.0.stratos</carbon.kernel.version>
- <carbon.patch.version.4.1.1>4.1.1</carbon.patch.version.4.1.1>
- <carbon.patch.version.4.1.3>4.1.3</carbon.patch.version.4.1.3>
- <carbon.p2.plugin.version>1.5.2</carbon.p2.plugin.version>
+ <carbon.kernel.version>4.2.0</carbon.kernel.version>
+ <!--carbon.patch.version.4.1.1>4.1.1</carbon.patch.version.4.1.1>
+ <carbon.patch.version.4.1.3>4.1.3</carbon.patch.version.4.1.3-->
+ <carbon.p2.plugin.version>1.5.3</carbon.p2.plugin.version>
<stratos.component.version>2.1.0</stratos.component.version>
<stratos.component.patch.version.2.1.1>2.1.1</stratos.component.patch.version.2.1.1>
<stratos.component.patch.version.2.1.3>2.1.3</stratos.component.patch.version.2.1.3>
- <synapse.version>2.1.1-wso2v7</synapse.version>
+ <synapse.version>2.1.2-wso2v3</synapse.version>
<axis2.transport.version>1.1.0-wso2v6</axis2.transport.version>
<elb.version>2.0.5</elb.version>
<passthru.transport.version>1.0.2</passthru.transport.version>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/79c9e019/products/stratos-controller/modules/distribution/src/main/license/LICENSE
----------------------------------------------------------------------
diff --git a/products/stratos-controller/modules/distribution/src/main/license/LICENSE b/products/stratos-controller/modules/distribution/src/main/license/LICENSE
index 24d1a36..774a5a9 100644
--- a/products/stratos-controller/modules/distribution/src/main/license/LICENSE
+++ b/products/stratos-controller/modules/distribution/src/main/license/LICENSE
@@ -323,7 +323,7 @@ org.wso2.carbon.authenticator.proxy_4.1.0.jar,
org.wso2.carbon.authenticator.stub_4.1.0.jar,
org.wso2.carbon.base_4.1.0.jar,
org.wso2.carbon.business.messaging.paypal.integration.core_4.1.0.jar,
-org.wso2.carbon.caching.core_4.1.0.stratos.jar,
+org.wso2.carbon.caching.core_4.2.0.jar,
org.wso2.carbon.captcha.mgt_4.1.0.jar,
org.wso2.carbon.cluster.mgt.core_4.1.0.jar,
org.wso2.carbon.coordination.common_4.1.0.jar,
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/79c9e019/products/stratos-controller/modules/features/service/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos-controller/modules/features/service/pom.xml b/products/stratos-controller/modules/features/service/pom.xml
index 1e6398f..bebbb84 100755
--- a/products/stratos-controller/modules/features/service/pom.xml
+++ b/products/stratos-controller/modules/features/service/pom.xml
@@ -40,7 +40,7 @@
</modules>
<properties>
- <wso2carbon.version>4.1.0</wso2carbon.version>
+ <wso2carbon.version>4.2.0</wso2carbon.version>
<synapse.version>${version.synapse}</synapse.version>
<quartz.wso2.version>2.1.1.wso2v1</quartz.wso2.version>
<stratos.controller.version>1.0.0</stratos.controller.version>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/79c9e019/products/stratos-controller/modules/styles/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos-controller/modules/styles/pom.xml b/products/stratos-controller/modules/styles/pom.xml
index bf888fa..745e95c 100644
--- a/products/stratos-controller/modules/styles/pom.xml
+++ b/products/stratos-controller/modules/styles/pom.xml
@@ -125,6 +125,6 @@
</dependency>
</dependencies>
<properties>
- <wso2carbon.version>4.1.0</wso2carbon.version>
+ <wso2carbon.version>4.2.0</wso2carbon.version>
</properties>
</project>
[10/11] git commit: Merge branch 'carbon-4.2.0-upgrade'
Posted by sa...@apache.org.
Merge branch 'carbon-4.2.0-upgrade'
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/dd333f0e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/dd333f0e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/dd333f0e
Branch: refs/heads/master
Commit: dd333f0eeacbb3b3ce2bd79cc5e43da14200287c
Parents: 2cf2276 5b14b03
Author: Sajith Kariyawasam <sa...@wso2.com>
Authored: Mon Jan 6 18:20:29 2014 +0530
Committer: Sajith Kariyawasam <sa...@wso2.com>
Committed: Mon Jan 6 18:20:29 2014 +0530
----------------------------------------------------------------------
components/org.apache.stratos.autoscaler/pom.xml | 2 +-
components/org.apache.stratos.cartridge.agent/pom.xml | 4 ++--
components/org.apache.stratos.cartridge.mgt.ui/pom.xml | 2 +-
components/org.apache.stratos.cloud.controller/pom.xml | 6 +++---
components/org.apache.stratos.common/pom.xml | 4 ++--
components/org.apache.stratos.logging.view.ui/pom.xml | 4 ++--
components/org.apache.stratos.register.ui/pom.xml | 6 +++---
components/org.apache.stratos.rest.endpoint/pom.xml | 6 +++---
.../java/org/apache/stratos/rest/endpoint/ServiceHolder.java | 2 +-
.../apache/stratos/rest/endpoint/services/StratosAdmin.java | 4 ++--
components/org.apache.stratos.sso.redirector.ui/pom.xml | 4 ++--
components/org.apache.stratos.status.monitor.ui/pom.xml | 4 ++--
components/org.apache.stratos.tenant.activity/pom.xml | 2 +-
components/org.apache.stratos.tenant.mgt.email.sender/pom.xml | 2 +-
components/org.apache.stratos.theme.mgt/pom.xml | 2 +-
components/org.apache.stratos.throttling.manager/pom.xml | 2 +-
components/org.apache.stratos.usage.summary.helper/pom.xml | 2 +-
components/org.apache.stratos.usage/pom.xml | 2 +-
components/pom.xml | 1 -
.../org.apache.stratos.tenant.mgt.server.feature/pom.xml | 2 +-
products/autoscaler/modules/distribution/pom.xml | 4 ++--
products/cloud-controller/modules/distribution/pom.xml | 4 ++--
products/stratos-controller/modules/dashboard/pom.xml | 4 ++--
products/stratos-controller/modules/login/pom.xml | 2 +-
products/stratos-controller/modules/p2-profile-gen/pom.xml | 4 ++--
products/stratos-controller/modules/styles/pom.xml | 2 +-
26 files changed, 41 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
[04/11] git commit: Fixing for multitenant subscription to LB
cartridge
Posted by sa...@apache.org.
Fixing for multitenant subscription to LB cartridge
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/1ba43d81
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/1ba43d81
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/1ba43d81
Branch: refs/heads/master
Commit: 1ba43d813d7b3ae7549ceff0ace1f85d2d87bd0e
Parents: 37c56e7
Author: Sajith Kariyawasam <sa...@wso2.com>
Authored: Sat Jan 4 22:24:51 2014 +0530
Committer: Sajith Kariyawasam <sa...@wso2.com>
Committed: Sat Jan 4 22:24:51 2014 +0530
----------------------------------------------------------------------
.../service/ServiceDeploymentManager.java | 218 ++++++++++++++++++-
.../manager/CartridgeSubscriptionManager.java | 2 +
.../rest/endpoint/services/ServiceUtils.java | 4 +-
.../rest/endpoint/services/StratosAdmin.java | 2 +-
4 files changed, 221 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1ba43d81/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/deploy/service/ServiceDeploymentManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/deploy/service/ServiceDeploymentManager.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/deploy/service/ServiceDeploymentManager.java
index 8a03a14..4bc25d9 100644
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/deploy/service/ServiceDeploymentManager.java
+++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/deploy/service/ServiceDeploymentManager.java
@@ -19,26 +19,39 @@
package org.apache.stratos.adc.mgt.deploy.service;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.adc.mgt.client.AutoscalerServiceClient;
import org.apache.stratos.adc.mgt.client.CloudControllerServiceClient;
import org.apache.stratos.adc.mgt.deploy.service.multitenant.MultiTenantService;
import org.apache.stratos.adc.mgt.exception.ADCException;
import org.apache.stratos.adc.mgt.exception.UnregisteredCartridgeException;
+import org.apache.stratos.adc.mgt.manager.CartridgeSubscriptionManager;
import org.apache.stratos.adc.mgt.payload.BasicPayloadData;
import org.apache.stratos.adc.mgt.payload.PayloadData;
import org.apache.stratos.adc.mgt.payload.PayloadFactory;
+import org.apache.stratos.adc.mgt.subscription.CartridgeSubscription;
import org.apache.stratos.adc.mgt.subscription.utils.CartridgeSubscriptionUtils;
import org.apache.stratos.adc.mgt.utils.CartridgeConstants;
import org.apache.stratos.adc.mgt.utils.PersistenceManager;
+import org.apache.stratos.autoscaler.deployment.policy.DeploymentPolicy;
import org.apache.stratos.cloud.controller.pojo.CartridgeInfo;
+import org.apache.stratos.cloud.controller.pojo.LoadbalancerConfig;
+import org.apache.stratos.cloud.controller.pojo.Properties;
import org.apache.stratos.cloud.controller.pojo.Property;
+import org.apache.stratos.messaging.util.Constants;
public class ServiceDeploymentManager {
private static Log log = LogFactory.getLog(ServiceDeploymentManager.class);
-
- public Service deployService (String type, String autoscalingPolicyName, String deploymentPolicyName, int tenantId, String tenantRange)
+ private CartridgeSubscriptionManager cartridgeSubsciptionManager = new CartridgeSubscriptionManager();
+
+ public Service deployService (String type, String autoscalingPolicyName, String deploymentPolicyName, int tenantId, String tenantRange,
+ String tenantDomain, String userName)
throws ADCException, UnregisteredCartridgeException {
//get deployed Cartridge Definition information
@@ -63,6 +76,174 @@ public class ServiceDeploymentManager {
throw new ADCException(errorMsg);
}
+
+ // TODO - LB cartridge.... ??
+
+ List<Property> lbRefProp = new ArrayList<Property>();
+
+ // get lb config reference
+ LoadbalancerConfig lbConfig = cartridgeInfo.getLbConfig();
+
+ if (lbConfig == null || lbConfig.getProperties() == null) {
+ if (log.isDebugEnabled()) {
+ log.debug("This Service does not require a load balancer. " + "[Service Name] " +
+ type);
+ }
+ } else {
+
+ CartridgeInfo lbCartridgeInfo;
+ String lbCartridgeType = lbConfig.getType();
+ try {
+ // retrieve lb Cartridge info
+ lbCartridgeInfo = CloudControllerServiceClient.getServiceClient().getCartridgeInfo(lbCartridgeType);
+ } catch (Exception e) {
+ String msg = "Cannot get cartridge info: " + type;
+ log.error(msg, e);
+ throw new ADCException(msg, e);
+ }
+
+ Properties lbReferenceProperties = lbConfig.getProperties();
+
+ Property property = new Property();
+ property.setName(org.apache.stratos.messaging.util.Constants.LOAD_BALANCER_REF);
+
+ for (org.apache.stratos.cloud.controller.pojo.Property prop : lbReferenceProperties.getProperties()) {
+
+ String name = prop.getName();
+ String value = prop.getValue();
+
+ // TODO make following a chain of responsibility pattern
+ if (Constants.NO_LOAD_BALANCER.equals(name)) {
+ if ("true".equals(value)) {
+ if (log.isDebugEnabled()) {
+ log.debug("This cartridge does not require a load balancer. " +
+ "[Type] " + type);
+ }
+ property.setValue(name);
+ lbRefProp.add(property);
+ break;
+ }
+ } else if (Constants.EXISTING_LOAD_BALANCERS.equals(name)) {
+ String clusterIdsVal = value;
+ if (log.isDebugEnabled()) {
+ log.debug("This cartridge refers to existing load balancers. " + "[Type] " +
+ type + "[Referenced Cluster Ids] " + clusterIdsVal);
+ }
+
+ String[] clusterIds = clusterIdsVal.split(",");
+
+ for (String clusterId : clusterIds) {
+
+ try {
+ AutoscalerServiceClient.getServiceClient().checkLBExistenceAgainstPolicy(clusterId,
+ deploymentPolicyName);
+ } catch (Exception ex) {
+ // we don't need to throw the error here.
+ log.error(ex.getMessage(), ex);
+ }
+
+ }
+
+ property.setValue(name);
+ lbRefProp.add(property);
+ break;
+
+ } else if (Constants.DEFAULT_LOAD_BALANCER.equals(name)) {
+ if ("true".equals(value)) {
+ property.setValue(name);
+ if (log.isDebugEnabled()) {
+ log.debug("This cartridge uses default load balancer. " + "[Type] " +
+ type);
+ }
+
+ try {
+ // get the valid policies for lb cartridge
+ DeploymentPolicy[] lbCartridgeDepPolicies =
+ AutoscalerServiceClient.getServiceClient().getDeploymentPolicies(lbCartridgeType);
+ // traverse deployment policies of lb cartridge
+ for (DeploymentPolicy policy : lbCartridgeDepPolicies) {
+ // check existence of the subscribed policy
+ if (deploymentPolicyName.equals(policy.getId())) {
+
+ if (!AutoscalerServiceClient.getServiceClient().checkDefaultLBExistenceAgainstPolicy(deploymentPolicyName)) {
+
+ // if lb cluster doesn't exist
+ String lbAlias = "lb" + new Random().nextInt();
+ lbCartridgeInfo.addProperties(property);
+ subscribeToLb(lbCartridgeType,
+ lbAlias,
+ lbCartridgeInfo.getDefaultAutoscalingPolicy(),
+ deploymentPolicyName, tenantId,
+ userName,
+ tenantDomain,
+ lbCartridgeInfo.getProperties());
+ }
+ }
+ }
+
+ } catch (Exception ex) {
+ // we don't need to throw the error here.
+ log.error(ex.getMessage(), ex);
+ }
+
+
+ lbRefProp.add(property);
+ break;
+ } else if (Constants.SERVICE_AWARE_LOAD_BALANCER.equals(name)) {
+ if ("true".equals(value)) {
+ property.setValue(name);
+ if (log.isDebugEnabled()) {
+ log.debug("This cartridge uses a service aware load balancer. " +
+ "[Type] " + type);
+ }
+
+ try {
+
+ // get the valid policies for lb cartridge
+ DeploymentPolicy[] lbCartridgeDepPolicies =
+ AutoscalerServiceClient.getServiceClient().getDeploymentPolicies(lbCartridgeType);
+ // traverse deployment policies of lb cartridge
+ for (DeploymentPolicy policy : lbCartridgeDepPolicies) {
+ // check existence of the subscribed policy
+ if (deploymentPolicyName.equals(policy.getId())) {
+
+ if (!AutoscalerServiceClient.getServiceClient().checkServiceLBExistenceAgainstPolicy(type,
+ deploymentPolicyName)) {
+
+ // if lb cluster doesn't exist
+ String lbAlias =
+ "lb" + type +
+ new Random().nextInt();
+ lbCartridgeInfo.addProperties(property);
+ subscribeToLb(lbCartridgeType,
+ lbAlias,
+ lbCartridgeInfo.getDefaultAutoscalingPolicy(),
+ deploymentPolicyName,
+ tenantId,
+ userName,
+ tenantDomain,
+ lbCartridgeInfo.getProperties());
+ }
+ }
+ }
+
+ } catch (Exception ex) {
+ // we don't need to throw the error here.
+ log.error(ex.getMessage(), ex);
+ }
+
+
+ lbRefProp.add(property);
+ break;
+ }
+ }
+ }
+ }
+ }
+
+
+
+
Service service = new MultiTenantService(type, autoscalingPolicyName, deploymentPolicyName, tenantId, cartridgeInfo, tenantRange);
//generate the cluster ID (domain)for the service
@@ -113,4 +294,37 @@ public class ServiceDeploymentManager {
//TODO:
}
+
+ private void configureLBDeployment() {
+
+
+
+ }
+
+ private void subscribeToLb(String cartridgeType, String lbAlias,
+ String defaultAutoscalingPolicy, String deploymentPolicy,
+ int tenantId, String userName, String tenantDomain, Property[] props) throws ADCException {
+
+ try {
+ if(log.isDebugEnabled()) {
+ log.debug("Subscribing to a load balancer [cartridge] "+cartridgeType+" [alias] "+lbAlias);
+ }
+ CartridgeSubscription cartridgeSubscription =
+ cartridgeSubsciptionManager.subscribeToCartridgeWithProperties(cartridgeType, lbAlias.trim(), defaultAutoscalingPolicy,
+ deploymentPolicy,
+ tenantDomain,
+ tenantId,
+ userName, "git", null, false, null, null, props);
+
+ cartridgeSubsciptionManager.registerCartridgeSubscription(cartridgeSubscription);
+
+ if(log.isDebugEnabled()) {
+ log.debug("Successfully subscribed to a load balancer [cartridge] "+cartridgeType+" [alias] "+lbAlias);
+ }
+ } catch (Exception e) {
+ String msg = "Error while subscribing to load balancer cartridge [type] "+cartridgeType;
+ log.error(msg, e);
+ throw new ADCException(msg, e);
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1ba43d81/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/manager/CartridgeSubscriptionManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/manager/CartridgeSubscriptionManager.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/manager/CartridgeSubscriptionManager.java
index 92b5dd4..2a22c82 100644
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/manager/CartridgeSubscriptionManager.java
+++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/manager/CartridgeSubscriptionManager.java
@@ -222,6 +222,8 @@ public class CartridgeSubscriptionManager {
if(cartridgeInfo.getMultiTenant()) {
log.info(" Multitenant --> Publishing Artifact update event -- ");
+ log.info(" Values : cluster id - " + cartridgeSubscription.getClusterDomain() + " tenant - " +
+ cartridgeSubscription.getSubscriber().getTenantId());
ArtifactUpdatePublisher publisher = new ArtifactUpdatePublisher(cartridgeSubscription.getRepository(),
cartridgeSubscription.getClusterDomain(), // clusterId
String.valueOf(cartridgeSubscription.getSubscriber().getTenantId()));
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1ba43d81/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java
index acde631..816caad 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java
@@ -910,10 +910,10 @@ public class ServiceUtils {
*
*/
static void deployService (String cartridgeType, String alias, String autoscalingPolicy, String deploymentPolicy,
- String tenantDomain, int tenantId, String clusterDomain, String clusterSubdomain, String tenantRange) {
+ String tenantDomain, String tenantUsername, int tenantId, String clusterDomain, String clusterSubdomain, String tenantRange) {
log.info("Deploying service..");
try {
- serviceDeploymentManager.deployService(cartridgeType, autoscalingPolicy, deploymentPolicy, tenantId, tenantRange);
+ serviceDeploymentManager.deployService(cartridgeType, autoscalingPolicy, deploymentPolicy, tenantId, tenantRange, tenantDomain, tenantUsername);
} catch (Exception e) {
e.printStackTrace();
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1ba43d81/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java
index bdc7c00..0cc4ca8 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java
@@ -684,7 +684,7 @@ public class StratosAdmin extends AbstractAdmin {
// super tenant Deploying service (MT)
// here an alias is generated
ServiceUtils.deployService(serviceDefinitionBean.getCartridgeType(), UUID.randomUUID().toString(), serviceDefinitionBean.getAutoscalingPolicyName(),
- serviceDefinitionBean.getDeploymentPolicyName(), getTenantDomain(), getTenantId(),
+ serviceDefinitionBean.getDeploymentPolicyName(), getTenantDomain(), getUsername(), getTenantId(),
serviceDefinitionBean.getClusterDomain(), serviceDefinitionBean.getClusterSubDomain(),
serviceDefinitionBean.getTenantRange());
}
[06/11] git commit: Reverting mediation feature removal
Posted by sa...@apache.org.
Reverting mediation feature removal
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/b6952717
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/b6952717
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/b6952717
Branch: refs/heads/master
Commit: b69527178186dfb7c1545e3c1c2ed64ca443a6f4
Parents: cd87dbc
Author: Sajith Kariyawasam <sa...@wso2.com>
Authored: Sat Jan 4 23:11:29 2014 +0530
Committer: Sajith Kariyawasam <sa...@wso2.com>
Committed: Sat Jan 4 23:11:29 2014 +0530
----------------------------------------------------------------------
.../cloud-controller/modules/p2-profile/pom.xml | 25 ++++++++++----------
1 file changed, 12 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b6952717/products/cloud-controller/modules/p2-profile/pom.xml
----------------------------------------------------------------------
diff --git a/products/cloud-controller/modules/p2-profile/pom.xml b/products/cloud-controller/modules/p2-profile/pom.xml
index 64695b7..4e8082c 100644
--- a/products/cloud-controller/modules/p2-profile/pom.xml
+++ b/products/cloud-controller/modules/p2-profile/pom.xml
@@ -164,9 +164,9 @@
org.wso2.carbon:org.wso2.carbon.task.server.feature:${carbon.version}
</featureArtifactDef>
- <!-- <featureArtifactDef>
+ <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.mediation.initializer.feature:${carbon.version}
- </featureArtifactDef> -->
+ </featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.logging.mgt.feature:${carbon.version}
@@ -176,13 +176,12 @@
org.wso2.carbon:org.wso2.carbon.endpoint.server.feature:${carbon.version}
</featureArtifactDef>
- <!-- <featureArtifactDef>
+ <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.sequences.server.feature:${carbon.version}
- </featureArtifactDef> -->
-
-<!-- <featureArtifactDef>
+ </featureArtifactDef>
+ <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.mediators.server.feature:${carbon.version}
- </featureArtifactDef> -->
+ </featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.relay.server.feature:${carbon.version}
@@ -263,10 +262,10 @@
<id>org.wso2.carbon.datasource.server.feature.group</id>
<version>${carbon.version}</version>
</feature>
- <!-- <feature>
+ <feature>
<id>org.wso2.carbon.mediation.initializer.feature.group</id>
<version>${carbon.version}</version>
- </feature> -->
+ </feature>
<feature>
<id>org.wso2.carbon.service.mgt.server.feature.group</id>
<version>${carbon.version}</version>
@@ -283,14 +282,14 @@
<id>org.wso2.carbon.endpoint.server.feature.group</id>
<version>${carbon.version}</version>
</feature>
- <!-- <feature>
+ <feature>
<id>org.wso2.carbon.sequences.server.feature.group</id>
<version>${carbon.version}</version>
- </feature> -->
-<!-- <feature>
+ </feature>
+ <feature>
<id>org.wso2.carbon.mediators.server.feature.group</id>
<version>${carbon.version}</version>
- </feature> -->
+ </feature>
<feature>
<id>org.wso2.carbon.relay.server.feature.group</id>
<version>${carbon.version}</version>
[02/11] git commit: Upgrading carbon version of stratos controller
pom file to 4.2.0
Posted by sa...@apache.org.
Upgrading carbon version of stratos controller pom file to 4.2.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/a3ce7d16
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/a3ce7d16
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/a3ce7d16
Branch: refs/heads/master
Commit: a3ce7d16eb18e05cb65e44d9e34d4fc0ceecf49c
Parents: 79c9e01
Author: Sajith Kariyawasam <sa...@wso2.com>
Authored: Fri Jan 3 00:42:49 2014 +0530
Committer: Sajith Kariyawasam <sa...@wso2.com>
Committed: Fri Jan 3 00:42:49 2014 +0530
----------------------------------------------------------------------
products/stratos-controller/pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a3ce7d16/products/stratos-controller/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos-controller/pom.xml b/products/stratos-controller/pom.xml
index 5157f03..7aaac7d 100755
--- a/products/stratos-controller/pom.xml
+++ b/products/stratos-controller/pom.xml
@@ -308,8 +308,8 @@
<properties>
<rampart.mar.version>1.6.1-wso2v8</rampart.mar.version>
<features-dashboard.war.version>1.0.0</features-dashboard.war.version>
- <carbon.version>4.1.0</carbon.version>
- <synapse.version>2.1.1.wso2v4</synapse.version>
+ <carbon.version>4.2.0</carbon.version>
+ <synapse.version>2.1.2.wso2v3</synapse.version>
<stratos.controller.version>1.0.1</stratos.controller.version>
<stratos.component.version>2.1.0</stratos.component.version>
<project.version>4.0.0-SNAPSHOT</project.version>
@@ -318,10 +318,10 @@
<servlet-api.version>2.4</servlet-api.version>
<shoppingcart.version>2.1.0</shoppingcart.version>
<shoppingcart.global.version>2.1.0</shoppingcart.global.version>
- <carbon.kernel.version>4.1.0.stratos</carbon.kernel.version>
+ <carbon.kernel.version>4.2.0</carbon.kernel.version>
<version.synapse>2.1.1-wso2v3</version.synapse>
<carbon.p2.plugin.version>1.5.2</carbon.p2.plugin.version>
- <carbon.platform.version>4.1.0</carbon.platform.version>
+ <carbon.platform.version>4.2.0</carbon.platform.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<opencsv.version>1.8</opencsv.version>
<poi.version>3.0-FINAL</poi.version>
[05/11] git commit: Fixing to comply with carbon 4.2.0 version
Posted by sa...@apache.org.
Fixing to comply with carbon 4.2.0 version
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/cd87dbcc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/cd87dbcc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/cd87dbcc
Branch: refs/heads/master
Commit: cd87dbcc07e260a9a2155e25ec21ab37ab0a177b
Parents: 1ba43d8
Author: Sajith Kariyawasam <sa...@wso2.com>
Authored: Sat Jan 4 22:26:52 2014 +0530
Committer: Sajith Kariyawasam <sa...@wso2.com>
Committed: Sat Jan 4 22:26:52 2014 +0530
----------------------------------------------------------------------
components/org.apache.stratos.adc.mgt/pom.xml | 2 +-
.../common/util/StratosConfiguration.java | 1 -
.../org.apache.stratos.tenant.mgt.core/pom.xml | 5 +
.../tenant/mgt/core/DefaultTenantPersistor.java | 343 ------------------
.../tenant/mgt/core/TenantPersistor.java | 347 +++++++++++++++++++
.../internal/TenantMgtCoreServiceComponent.java | 5 -
.../mgt/internal/TenantMgtServiceComponent.java | 35 +-
.../services/GAppTenantRegistrationService.java | 4 +-
.../mgt/services/TenantMgtAdminService.java | 90 +++--
.../services/TenantSelfRegistrationService.java | 6 +-
.../stratos/tenant/mgt/util/TenantMgtUtil.java | 4 +
.../src/main/resources/META-INF/services.xml | 4 +
.../src/main/resources/p2.inf | 6 +-
.../src/main/resources/p2.inf | 16 +-
.../pom.xml | 2 +-
.../src/main/resources/p2.inf | 10 +-
.../cloud-controller/modules/p2-profile/pom.xml | 24 +-
.../distribution/src/main/assembly/bin.xml | 6 +-
.../ui/clients/CloudManagerServiceClient.java | 9 +-
.../modules/distribution/src/assembly/bin.xml | 4 +-
.../modules/p2-profile-gen/pom.xml | 50 +--
21 files changed, 507 insertions(+), 466 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cd87dbcc/components/org.apache.stratos.adc.mgt/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/pom.xml b/components/org.apache.stratos.adc.mgt/pom.xml
index 83fb1b9..c1de77a 100644
--- a/components/org.apache.stratos.adc.mgt/pom.xml
+++ b/components/org.apache.stratos.adc.mgt/pom.xml
@@ -137,7 +137,7 @@
org.apache.stratos.adc.mgt.*
</Export-Package>
<Import-Package>
- org.apache.axis2.*; version="1.6.1.wso2v6",
+ org.apache.axis2.*; version="1.6.1-wso2v10",
org.apache.axiom.*; version="${axiom.osgi.version.range}",
org.apache.neethi.*;
version="2.0.4.wso2v4",
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cd87dbcc/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/StratosConfiguration.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/StratosConfiguration.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/StratosConfiguration.java
index 2226593..370932c 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/StratosConfiguration.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/util/StratosConfiguration.java
@@ -18,7 +18,6 @@
*/
package org.apache.stratos.common.util;
-import java.lang.String;
import java.util.HashMap;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cd87dbcc/components/org.apache.stratos.tenant.mgt.core/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.mgt.core/pom.xml b/components/org.apache.stratos.tenant.mgt.core/pom.xml
index 5836c6d..53f60c5 100644
--- a/components/org.apache.stratos.tenant.mgt.core/pom.xml
+++ b/components/org.apache.stratos.tenant.mgt.core/pom.xml
@@ -71,6 +71,11 @@
<dependencies>
<dependency>
<groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.core</artifactId>
+ <version>${wso2carbon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.registry.core</artifactId>
<version>${wso2carbon.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cd87dbcc/components/org.apache.stratos.tenant.mgt.core/src/main/java/org/apache/stratos/tenant/mgt/core/DefaultTenantPersistor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.mgt.core/src/main/java/org/apache/stratos/tenant/mgt/core/DefaultTenantPersistor.java b/components/org.apache.stratos.tenant.mgt.core/src/main/java/org/apache/stratos/tenant/mgt/core/DefaultTenantPersistor.java
deleted file mode 100644
index 259d30f..0000000
--- a/components/org.apache.stratos.tenant.mgt.core/src/main/java/org/apache/stratos/tenant/mgt/core/DefaultTenantPersistor.java
+++ /dev/null
@@ -1,343 +0,0 @@
-/*
- * 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.
- */
-package org.apache.stratos.tenant.mgt.core;
-
-import org.apache.stratos.tenant.mgt.core.internal.TenantMgtCoreServiceComponent;
-import org.wso2.carbon.CarbonConstants;
-import org.wso2.carbon.core.multitenancy.persistence.TenantPersistor;
-import org.wso2.carbon.registry.core.RegistryConstants;
-import org.wso2.carbon.registry.core.Resource;
-import org.wso2.carbon.registry.core.exceptions.RegistryException;
-import org.wso2.carbon.registry.core.session.UserRegistry;
-import org.apache.stratos.common.config.CloudServiceConfigParser;
-import org.apache.stratos.common.config.CloudServicesDescConfig;
-import org.apache.stratos.common.constants.StratosConstants;
-import org.apache.stratos.common.util.CloudServicesUtil;
-import org.apache.stratos.common.util.CommonUtil;
-import org.apache.stratos.tenant.mgt.core.util.TenantCoreUtil;
-import org.wso2.carbon.user.api.RealmConfiguration;
-import org.wso2.carbon.user.api.TenantMgtConfiguration;
-import org.wso2.carbon.user.core.AuthorizationManager;
-import org.wso2.carbon.user.core.UserCoreConstants;
-import org.wso2.carbon.user.core.UserRealm;
-import org.wso2.carbon.user.core.UserStoreException;
-import org.wso2.carbon.user.core.UserStoreManager;
-import org.wso2.carbon.user.core.config.multitenancy.MultiTenantRealmConfigBuilder;
-import org.wso2.carbon.user.core.service.RealmService;
-import org.wso2.carbon.user.core.tenant.Tenant;
-import org.wso2.carbon.user.core.tenant.TenantManager;
-import org.wso2.carbon.user.mgt.UserMgtConstants;
-import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * TenantPersistenceManager - Methods related to persisting the tenant.
- */
-public class DefaultTenantPersistor implements TenantPersistor {
-
- private static final Log log = LogFactory.getLog(DefaultTenantPersistor.class);
- private static final String ILLEGAL_CHARACTERS_FOR_PATH = ".*[~!#$;%^*()+={}\\[\\]\\|\\\\<>].*";
-
- private static CloudServicesDescConfig cloudServicesDesc = null;
-
-
- /**
- * Persists the given tenant
- * @param tenant - tenant to be persisted
- * @param checkDomainValidation - true, if domain is validated.
- * @param successKey - successKey
- * @param originatedService - The Service that the tenant registration was originated.
- * @return tenant Id - the tenant id
- * @throws Exception, if persisting tenant failed.
- */
- public int persistTenant(Tenant tenant, boolean checkDomainValidation, String successKey,
- String originatedService) throws Exception {
- int tenantId;
- validateAdminUserName(tenant);
- String tenantDomain = tenant.getDomain();
-
- boolean isDomainAvailable = CommonUtil.isDomainNameAvailable(tenantDomain);
- if (!isDomainAvailable) {
- throw new Exception("Domain is not available to register");
- }
-
- RealmService realmService = TenantMgtCoreServiceComponent.getRealmService();
- RealmConfiguration realmConfig = realmService.getBootstrapRealmConfiguration();
- TenantMgtConfiguration tenantMgtConfiguration = realmService.getTenantMgtConfiguration();
- MultiTenantRealmConfigBuilder builder = TenantMgtCoreServiceComponent.
- getRealmService().getMultiTenantRealmConfigBuilder();
- RealmConfiguration realmConfigToPersist =
- builder.getRealmConfigForTenantToPersist(realmConfig, tenantMgtConfiguration,
- tenant, -1);
- tenant.setRealmConfig(realmConfigToPersist);
- tenantId = addTenant(tenant);
- tenant.setId(tenantId);
-
- if (checkDomainValidation) {
- if (successKey != null) {
- if (CommonUtil.validateDomainFromSuccessKey(TenantMgtCoreServiceComponent.
- getGovernanceSystemRegistry(MultitenantConstants.SUPER_TENANT_ID),
- tenant.getDomain(), successKey)) {
- storeDomainValidationFlagToRegistry(tenant);
- } else {
- String msg = "Failed to validate domain";
- throw new Exception(msg);
- }
- }
- } else {
- storeDomainValidationFlagToRegistry(tenant);
- }
-
- try {
- doPostTenantCreationActions(tenant, originatedService);
- } catch (Exception e) {
- String msg = "Error performing post tenant creation actions";
- throw new Exception(msg, e);
- }
-
- return tenantId;
- }
-
- private void doPostTenantCreationActions(Tenant tenant,
- String originatedService) throws Exception {
- RealmService realmService = TenantMgtCoreServiceComponent.getRealmService();
- UserRealm userRealm;
- try {
- userRealm = (UserRealm) realmService.getTenantUserRealm(tenant.getId());
- } catch (UserStoreException e) {
- String msg = "Error in creating Realm for tenant: " + tenant.getDomain();
- throw new Exception(msg, e);
- }
-
- updateTenantAdminPassword(userRealm, tenant);
- TenantMgtCoreServiceComponent.getRegistryLoader().loadTenantRegistry(tenant.getId());
- copyUIPermissions(tenant.getId());
-
- TenantCoreUtil.setOriginatedService(tenant.getId(), originatedService);
- setActivationFlags(tenant.getId(), originatedService);
-
- TenantCoreUtil.initializeRegistry(tenant.getId());
-
- }
-
- /**
- * Store the domain validation flag in the registry if the domain has been
- * validated.
- *
- * @param tenant - the tenant
- * @throws RegistryException, if storing the domain validation flag failed.
- */
- private void storeDomainValidationFlagToRegistry(Tenant tenant) throws RegistryException {
-
- try {
- String domainValidationPath = StratosConstants.TENANT_DOMAIN_VERIFICATION_FLAG_PATH +
- RegistryConstants.PATH_SEPARATOR + tenant.getId();
- UserRegistry superTenantRegistry = TenantMgtCoreServiceComponent.
- getGovernanceSystemRegistry(MultitenantConstants.SUPER_TENANT_ID);
- Resource validationFlagR = superTenantRegistry.newResource();
- validationFlagR.setProperty(tenant.getDomain(), "true");
- superTenantRegistry.put(domainValidationPath, validationFlagR);
-
- } catch (RegistryException e) {
- String msg = "Error in storing the domain validation flag to the registry";
- log.error(msg, e);
- throw new RegistryException(msg, e);
- }
- if (log.isDebugEnabled()) {
- log.debug("Domain Validation Flag is stored to the registry.");
- }
- }
-
- /**
- * Adds a tenant to the tenant manager
- *
- * @param tenant - the tenant
- * @return tenantId - the tenant id
- * @throws Exception - UserStoreException
- */
- private int addTenant(Tenant tenant) throws Exception {
- int tenantId;
- TenantManager tenantManager = TenantMgtCoreServiceComponent.getTenantManager();
- try {
- tenantId = tenantManager.addTenant(tenant);
- if (log.isDebugEnabled()) {
- log.debug("Tenant is successfully added: " + tenant.getDomain());
- }
- } catch (UserStoreException e) {
- String msg = "Error in adding tenant with domain: " + tenant.getDomain();
- log.error(msg, e);
- throw new Exception(msg, e);
- }
- return tenantId;
- }
-
- /**
- * Sets the password for the tenant
- *
- * @param tenant - the tenant
- * @param userRealm - user realm
- * @throws Exception - UserStoreException
- */
- private void updateTenantAdminPassword(UserRealm userRealm, Tenant tenant) throws Exception {
- try {
- UserStoreManager userStoreManager = userRealm.getUserStoreManager();
- if (!userStoreManager.isReadOnly()) {
- userStoreManager.updateCredentialByAdmin(tenant.getAdminName(),
- tenant.getAdminPassword());
- if (log.isDebugEnabled()) {
- log.debug("Successfully set the password for the tenant.");
- }
- }
- } catch (UserStoreException e) {
- String msg = "Error in changing the tenant admin password for tenant domain: " +
- tenant.getDomain() + ".";
- log.error(msg, e);
- throw new Exception(msg, e);
- }
- }
-
- /**
- * Authorize the role
- *
- * @param tenantId - tenant id
- * @throws Exception - UserStoreException
- */
- private void copyUIPermissions(int tenantId) throws Exception {
- try {
- UserRealm realm = (UserRealm) TenantMgtCoreServiceComponent.
- getRealmService().getTenantUserRealm(tenantId);
- String adminRole = realm.getRealmConfiguration().getAdminRoleName();
- AuthorizationManager authMan = realm.getAuthorizationManager();
- // Authorize the admin role, if not authorized yet.
- if (!authMan.isRoleAuthorized(adminRole,
- CarbonConstants.UI_ADMIN_PERMISSION_COLLECTION,
- UserMgtConstants.EXECUTE_ACTION)) {
- authMan.authorizeRole(adminRole, CarbonConstants.UI_ADMIN_PERMISSION_COLLECTION,
- UserMgtConstants.EXECUTE_ACTION);
- }
- } catch (UserStoreException e) {
- String msg = "Error in authorizing the admin role.";
- log.error(msg, e);
- throw new Exception(msg, e);
- }
- if (log.isDebugEnabled()) {
- log.debug("Role has successfully been authorized.");
- }
- }
-
- private void setActivationFlags(int tenantId, String originalService) throws Exception {
-
- boolean useDefaultConfig = true;
- try {
-
- if(cloudServicesDesc == null ) {
- cloudServicesDesc = CloudServiceConfigParser.loadCloudServicesConfiguration();
- }
-
- if (originalService != null &&
- !originalService.equals(StratosConstants.CLOUD_MANAGER_SERVICE) ) {
- CloudServicesUtil.activateOriginalAndCompulsoryServices(cloudServicesDesc,
- originalService, tenantId);
- useDefaultConfig = false;
- }
-
- if (useDefaultConfig) {
- CloudServicesUtil.activateAllServices(cloudServicesDesc, tenantId);
- }
- } catch (Exception e) {
- log.error("Error registering the originated service", e);
- throw e;
- }
-
- }
-
- /**
- * Validates that the chosen AdminUserName is valid.
- *
- * @param tenant
- * tenant information
- * @throws Exception
- * UserStoreException
- */
- private void validateAdminUserName(Tenant tenant) throws Exception {
- UserRealm superTenantUserRealm =
- TenantMgtCoreServiceComponent.getRealmService().
- getBootstrapRealm();
- RealmConfiguration realmConfig = TenantMgtCoreServiceComponent.
- getBootstrapRealmConfiguration();
- String uniqueAcrossTenants = realmConfig.getUserStoreProperty(
- UserCoreConstants.RealmConfig.PROPERTY_USERNAME_UNIQUE);
- if ("true".equals(uniqueAcrossTenants)) {
- try {
- if (superTenantUserRealm.getUserStoreManager().isExistingUser(
- tenant.getAdminName())) {
- throw new Exception("User name : " + tenant.getAdminName() +
- " exists in the system. " +
- "Please pick another user name for tenant Administrator.");
- }
- } catch (UserStoreException e) {
- String msg = "Error in checking whether the user already exists in the system";
- log.error(msg, e);
- throw new Exception(msg, e);
- }
- }
- if (tenant.getAdminName().matches(DefaultTenantPersistor.ILLEGAL_CHARACTERS_FOR_PATH)) {
- String msg = "The tenant admin ' " + tenant.getAdminName() +
- " ' contains one or more illegal characters" +
- " (~!@#$;%^*()+={}[]|\\<>)";
- log.error(msg);
- throw new Exception(msg);
- }
- if (log.isDebugEnabled()) {
- log.debug("Admin User Name has been validated.");
- }
- }
-
- /**
- * Persists the given tenant
- * @param tenant - tenant to be persisted
- * @return tenant Id
- * @throws Exception, if persisting tenant failed.
- */
- public int persistTenant(Tenant tenant) throws Exception {
- String tenantDomain = tenant.getDomain();
- int tenantId;
- validateAdminUserName(tenant);
- boolean isDomainAvailable = CommonUtil.isDomainNameAvailable(tenantDomain);
- if (!isDomainAvailable) {
- throw new Exception("Domain is not available to register");
- }
-
- tenantId = addTenant(tenant);
- tenant.setId(tenantId);
-
- try {
- doPostTenantCreationActions(tenant, null);
- } catch (Exception e) {
- String msg = "Error performing post tenant creation actions";
- if(log.isDebugEnabled()) {
- log.debug(msg, e);
- }
- throw new Exception(msg);
- }
- return tenantId;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cd87dbcc/components/org.apache.stratos.tenant.mgt.core/src/main/java/org/apache/stratos/tenant/mgt/core/TenantPersistor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.mgt.core/src/main/java/org/apache/stratos/tenant/mgt/core/TenantPersistor.java b/components/org.apache.stratos.tenant.mgt.core/src/main/java/org/apache/stratos/tenant/mgt/core/TenantPersistor.java
new file mode 100644
index 0000000..86d7e41
--- /dev/null
+++ b/components/org.apache.stratos.tenant.mgt.core/src/main/java/org/apache/stratos/tenant/mgt/core/TenantPersistor.java
@@ -0,0 +1,347 @@
+/*
+ * 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.
+ */
+package org.apache.stratos.tenant.mgt.core;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.CarbonConstants;
+import org.wso2.carbon.registry.core.RegistryConstants;
+import org.wso2.carbon.registry.core.Resource;
+import org.wso2.carbon.registry.core.exceptions.RegistryException;
+import org.wso2.carbon.registry.core.session.UserRegistry;
+import org.apache.stratos.common.config.CloudServiceConfigParser;
+import org.apache.stratos.common.config.CloudServicesDescConfig;
+import org.apache.stratos.common.constants.StratosConstants;
+import org.apache.stratos.common.util.CloudServicesUtil;
+import org.apache.stratos.common.util.CommonUtil;
+import org.apache.stratos.tenant.mgt.core.internal.TenantMgtCoreServiceComponent;
+import org.apache.stratos.tenant.mgt.core.util.TenantCoreUtil;
+import org.wso2.carbon.user.api.RealmConfiguration;
+import org.wso2.carbon.user.api.TenantMgtConfiguration;
+import org.wso2.carbon.user.core.*;
+import org.wso2.carbon.user.core.config.multitenancy.MultiTenantRealmConfigBuilder;
+import org.wso2.carbon.user.core.service.RealmService;
+import org.wso2.carbon.user.core.tenant.Tenant;
+import org.wso2.carbon.user.core.tenant.TenantManager;
+import org.wso2.carbon.user.mgt.UserMgtConstants;
+import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
+
+/**
+ * TenantPersistenceManager - Methods related to persisting the tenant.
+ */
+public class TenantPersistor {
+
+ private static final Log log = LogFactory.getLog(TenantPersistor.class);
+ private static final String ILLEGAL_CHARACTERS_FOR_PATH = ".*[~!#$;%^*()+={}\\[\\]\\|\\\\<>].*";
+
+ private static CloudServicesDescConfig cloudServicesDesc = null;
+
+
+ /**
+ * Persists the given tenant
+ * @param tenant - tenant to be persisted
+ * @param checkDomainValidation - true, if domain is validated.
+ * @param successKey - successKey
+ * @param originatedService - The Service that the tenant registration was originated.
+ * @return tenant Id - the tenant id
+ * @throws Exception, if persisting tenant failed.
+ */
+ public int persistTenant(Tenant tenant, boolean checkDomainValidation, String successKey,
+ String originatedService,boolean isSkeleton) throws Exception {
+ int tenantId = 0;
+ if(!isSkeleton){
+ tenantId=persistTenantInUserStore(tenant,checkDomainValidation,successKey);
+ }else {
+ tenantId=tenant.getId();
+ }
+
+ try {
+ doPostTenantCreationActions(tenant, originatedService);
+ } catch (Exception e) {
+ String msg = "Error performing post tenant creation actions";
+ throw new Exception(msg, e);
+ }
+
+ return tenantId;
+ }
+
+ private int persistTenantInUserStore(Tenant tenant, boolean checkDomainValidation, String successKey) throws Exception {
+ int tenantId;
+ validateAdminUserName(tenant);
+ String tenantDomain = tenant.getDomain();
+
+ boolean isDomainAvailable = CommonUtil.isDomainNameAvailable(tenantDomain);
+ if (!isDomainAvailable) {
+ throw new Exception("Domain is not available to register");
+ }
+
+ RealmService realmService = TenantMgtCoreServiceComponent.getRealmService();
+ RealmConfiguration realmConfig = realmService.getBootstrapRealmConfiguration();
+ TenantMgtConfiguration tenantMgtConfiguration = realmService.getTenantMgtConfiguration();
+ MultiTenantRealmConfigBuilder builder = TenantMgtCoreServiceComponent.
+ getRealmService().getMultiTenantRealmConfigBuilder();
+ RealmConfiguration realmConfigToPersist =
+ builder.getRealmConfigForTenantToPersist(realmConfig, tenantMgtConfiguration,
+ tenant, -1);
+ tenant.setRealmConfig(realmConfigToPersist);
+ tenantId = addTenant(tenant);
+ tenant.setId(tenantId);
+
+ if (checkDomainValidation) {
+ if (successKey != null) {
+ if (CommonUtil.validateDomainFromSuccessKey(TenantMgtCoreServiceComponent.
+ getGovernanceSystemRegistry(MultitenantConstants.SUPER_TENANT_ID),
+ tenant.getDomain(), successKey)) {
+ storeDomainValidationFlagToRegistry(tenant);
+ } else {
+ String msg = "Failed to validate domain";
+ throw new Exception(msg);
+ }
+ }
+ } else {
+ storeDomainValidationFlagToRegistry(tenant);
+ }
+
+ updateTenantAdminPassword(tenant);
+ return tenantId;
+ }
+
+ private void doPostTenantCreationActions(Tenant tenant,
+ String originatedService) throws Exception {
+
+ TenantMgtCoreServiceComponent.getRegistryLoader().loadTenantRegistry(tenant.getId());
+ copyUIPermissions(tenant.getId());
+
+ TenantCoreUtil.setOriginatedService(tenant.getId(), originatedService);
+ setActivationFlags(tenant.getId(), originatedService);
+
+ TenantCoreUtil.initializeRegistry(tenant.getId());
+
+ }
+
+ /**
+ * Store the domain validation flag in the registry if the domain has been
+ * validated.
+ *
+ * @param tenant - the tenant
+ * @throws RegistryException, if storing the domain validation flag failed.
+ */
+ protected void storeDomainValidationFlagToRegistry(Tenant tenant) throws RegistryException {
+
+ try {
+ String domainValidationPath = StratosConstants.TENANT_DOMAIN_VERIFICATION_FLAG_PATH +
+ RegistryConstants.PATH_SEPARATOR + tenant.getId();
+ UserRegistry superTenantRegistry = TenantMgtCoreServiceComponent.
+ getGovernanceSystemRegistry(MultitenantConstants.SUPER_TENANT_ID);
+ Resource validationFlagR = superTenantRegistry.newResource();
+ validationFlagR.setProperty(tenant.getDomain(), "true");
+ superTenantRegistry.put(domainValidationPath, validationFlagR);
+
+ } catch (RegistryException e) {
+ String msg = "Error in storing the domain validation flag to the registry";
+ log.error(msg, e);
+ throw new RegistryException(msg, e);
+ }
+ if (log.isDebugEnabled()) {
+ log.debug("Domain Validation Flag is stored to the registry.");
+ }
+ }
+
+ /**
+ * Adds a tenant to the tenant manager
+ *
+ * @param tenant - the tenant
+ * @return tenantId - the tenant id
+ * @throws Exception - UserStoreException
+ */
+ private int addTenant(Tenant tenant) throws Exception {
+ int tenantId;
+ TenantManager tenantManager = TenantMgtCoreServiceComponent.getTenantManager();
+ try {
+ tenantId = tenantManager.addTenant(tenant);
+ if (log.isDebugEnabled()) {
+ log.debug("Tenant is successfully added: " + tenant.getDomain());
+ }
+ } catch (UserStoreException e) {
+ String msg = "Error in adding tenant with domain: " + tenant.getDomain();
+ log.error(msg, e);
+ throw new Exception(msg, e);
+ }
+ return tenantId;
+ }
+
+ /**
+ * Sets the password for the tenant
+ *
+ * @param tenant - the tenant
+ * @throws Exception - UserStoreException
+ */
+ private void updateTenantAdminPassword(Tenant tenant) throws Exception {
+ RealmService realmService = TenantMgtCoreServiceComponent.getRealmService();
+ UserRealm userRealm;
+ try {
+ userRealm = (UserRealm) realmService.getTenantUserRealm(tenant.getId());
+ } catch (UserStoreException e) {
+ String msg = "Error in creating Realm for tenant: " + tenant.getDomain();
+ throw new Exception(msg, e);
+ }
+ try {
+ UserStoreManager userStoreManager = userRealm.getUserStoreManager();
+ if (!userStoreManager.isReadOnly()) {
+ userStoreManager.updateCredentialByAdmin(tenant.getAdminName(),
+ tenant.getAdminPassword());
+ if (log.isDebugEnabled()) {
+ log.debug("Successfully set the password for the tenant.");
+ }
+ }
+ } catch (UserStoreException e) {
+ String msg = "Error in changing the tenant admin password for tenant domain: " +
+ tenant.getDomain() + ".";
+ log.error(msg, e);
+ throw new Exception(msg, e);
+ }
+ }
+
+ /**
+ * Authorize the role
+ *
+ * @param tenantId - tenant id
+ * @throws Exception - UserStoreException
+ */
+ protected void copyUIPermissions(int tenantId) throws Exception {
+ try {
+ UserRealm realm = (UserRealm) TenantMgtCoreServiceComponent.
+ getRealmService().getTenantUserRealm(tenantId);
+ String adminRole = realm.getRealmConfiguration().getAdminRoleName();
+ AuthorizationManager authMan = realm.getAuthorizationManager();
+ // Authorize the admin role, if not authorized yet.
+ if (!authMan.isRoleAuthorized(adminRole,
+ CarbonConstants.UI_ADMIN_PERMISSION_COLLECTION,
+ UserMgtConstants.EXECUTE_ACTION)) {
+ authMan.authorizeRole(adminRole, CarbonConstants.UI_ADMIN_PERMISSION_COLLECTION,
+ UserMgtConstants.EXECUTE_ACTION);
+ }
+ } catch (UserStoreException e) {
+ String msg = "Error in authorizing the admin role.";
+ log.error(msg, e);
+ throw new Exception(msg, e);
+ }
+ if (log.isDebugEnabled()) {
+ log.debug("Role has successfully been authorized.");
+ }
+ }
+
+ protected void setActivationFlags(int tenantId, String originalService) throws Exception {
+
+ boolean useDefaultConfig = true;
+ try {
+
+ if(cloudServicesDesc == null ) {
+ cloudServicesDesc = CloudServiceConfigParser.loadCloudServicesConfiguration();
+ }
+
+ if (originalService != null &&
+ !originalService.equals(StratosConstants.CLOUD_MANAGER_SERVICE) ) {
+ CloudServicesUtil.activateOriginalAndCompulsoryServices(cloudServicesDesc,
+ originalService, tenantId);
+ useDefaultConfig = false;
+ }
+
+ if (useDefaultConfig) {
+ CloudServicesUtil.activateAllServices(cloudServicesDesc, tenantId);
+ }
+ } catch (Exception e) {
+ log.error("Error registering the originated service", e);
+ throw e;
+ }
+
+ }
+
+ /**
+ * Validates that the chosen AdminUserName is valid.
+ *
+ * @param tenant
+ * tenant information
+ * @throws Exception
+ * UserStoreException
+ */
+ private void validateAdminUserName(Tenant tenant) throws Exception {
+ UserRealm superTenantUserRealm =
+ TenantMgtCoreServiceComponent.getRealmService().
+ getBootstrapRealm();
+ RealmConfiguration realmConfig = TenantMgtCoreServiceComponent.
+ getBootstrapRealmConfiguration();
+ String uniqueAcrossTenants = realmConfig.getUserStoreProperty(
+ UserCoreConstants.RealmConfig.PROPERTY_USERNAME_UNIQUE);
+ if ("true".equals(uniqueAcrossTenants)) {
+ try {
+ if (superTenantUserRealm.getUserStoreManager().isExistingUser(
+ tenant.getAdminName())) {
+ throw new Exception("User name : " + tenant.getAdminName() +
+ " exists in the system. " +
+ "Please pick another user name for tenant Administrator.");
+ }
+ } catch (UserStoreException e) {
+ String msg = "Error in checking whether the user already exists in the system";
+ log.error(msg, e);
+ throw new Exception(msg, e);
+ }
+ }
+ if (tenant.getAdminName().matches(TenantPersistor.ILLEGAL_CHARACTERS_FOR_PATH)) {
+ String msg = "The tenant admin ' " + tenant.getAdminName() +
+ " ' contains one or more illegal characters" +
+ " (~!@#$;%^*()+={}[]|\\<>)";
+ log.error(msg);
+ throw new Exception(msg);
+ }
+ if (log.isDebugEnabled()) {
+ log.debug("Admin User Name has been validated.");
+ }
+ }
+
+ /**
+ * Persists the given tenant
+ * @param tenant - tenant to be persisted
+ * @return tenant Id
+ * @throws Exception, if persisting tenant failed.
+ */
+ public int persistTenant(Tenant tenant) throws Exception {
+ String tenantDomain = tenant.getDomain();
+ int tenantId;
+ validateAdminUserName(tenant);
+ boolean isDomainAvailable = CommonUtil.isDomainNameAvailable(tenantDomain);
+ if (!isDomainAvailable) {
+ throw new Exception("Domain is not available to register");
+ }
+
+ tenantId = addTenant(tenant);
+ tenant.setId(tenantId);
+
+ try {
+ doPostTenantCreationActions(tenant, null);
+ } catch (Exception e) {
+ String msg = "Error performing post tenant creation actions";
+ if(log.isDebugEnabled()) {
+ log.debug(msg, e);
+ }
+ throw new Exception(msg);
+ }
+ return tenantId;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cd87dbcc/components/org.apache.stratos.tenant.mgt.core/src/main/java/org/apache/stratos/tenant/mgt/core/internal/TenantMgtCoreServiceComponent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.mgt.core/src/main/java/org/apache/stratos/tenant/mgt/core/internal/TenantMgtCoreServiceComponent.java b/components/org.apache.stratos.tenant.mgt.core/src/main/java/org/apache/stratos/tenant/mgt/core/internal/TenantMgtCoreServiceComponent.java
index 22a8a50..8ab917d 100644
--- a/components/org.apache.stratos.tenant.mgt.core/src/main/java/org/apache/stratos/tenant/mgt/core/internal/TenantMgtCoreServiceComponent.java
+++ b/components/org.apache.stratos.tenant.mgt.core/src/main/java/org/apache/stratos/tenant/mgt/core/internal/TenantMgtCoreServiceComponent.java
@@ -22,7 +22,6 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.osgi.framework.BundleContext;
import org.osgi.service.component.ComponentContext;
-import org.wso2.carbon.core.multitenancy.persistence.TenantPersistor;
import org.wso2.carbon.registry.core.exceptions.RegistryException;
import org.wso2.carbon.registry.core.service.RegistryService;
import org.wso2.carbon.registry.core.service.TenantRegistryLoader;
@@ -30,7 +29,6 @@ import org.wso2.carbon.registry.core.session.UserRegistry;
import org.wso2.carbon.user.api.RealmConfiguration;
import org.wso2.carbon.user.core.service.RealmService;
import org.wso2.carbon.user.core.tenant.TenantManager;
-import org.apache.stratos.tenant.mgt.core.DefaultTenantPersistor;
/**
* @scr.component name="org.apache.stratos.tenant.mgt.core" immediate="true"
@@ -53,14 +51,11 @@ public class TenantMgtCoreServiceComponent {
private static BundleContext bundleContext;
private static RealmService realmService;
private static RegistryService registryService;
- private static TenantPersistor tenantPersistor;
private static TenantRegistryLoader registryLoader;
protected void activate(ComponentContext context) {
try {
- tenantPersistor = new DefaultTenantPersistor();
bundleContext = context.getBundleContext();
- bundleContext.registerService(TenantPersistor.class.getName(), tenantPersistor, null);
log.debug("******* Tenant Core bundle is activated ******* ");
} catch (Exception e) {
log.error("Error occurred while activating tenant.mgt.core bundle. " + e);
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cd87dbcc/components/org.apache.stratos.tenant.mgt/src/main/java/org/apache/stratos/tenant/mgt/internal/TenantMgtServiceComponent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.mgt/src/main/java/org/apache/stratos/tenant/mgt/internal/TenantMgtServiceComponent.java b/components/org.apache.stratos.tenant.mgt/src/main/java/org/apache/stratos/tenant/mgt/internal/TenantMgtServiceComponent.java
index ec85f5f..d9822cb 100644
--- a/components/org.apache.stratos.tenant.mgt/src/main/java/org/apache/stratos/tenant/mgt/internal/TenantMgtServiceComponent.java
+++ b/components/org.apache.stratos.tenant.mgt/src/main/java/org/apache/stratos/tenant/mgt/internal/TenantMgtServiceComponent.java
@@ -18,7 +18,13 @@
*/
package org.apache.stratos.tenant.mgt.internal;
-import org.wso2.carbon.core.multitenancy.persistence.TenantPersistor;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.engine.AxisConfiguration;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.neethi.Policy;
+import org.osgi.service.component.ComponentContext;
import org.wso2.carbon.registry.core.exceptions.RegistryException;
import org.wso2.carbon.registry.core.service.RegistryService;
import org.wso2.carbon.registry.core.session.UserRegistry;
@@ -32,20 +38,11 @@ import org.wso2.carbon.user.core.service.RealmService;
import org.wso2.carbon.user.core.tenant.TenantManager;
import org.wso2.carbon.utils.ConfigurationContextService;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.neethi.Policy;
-
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
-import org.osgi.service.component.ComponentContext;
-
/**
* @scr.component name="org.apache.stratos.tenant.mgt" immediate="true"
* @scr.reference name="registry.service"
@@ -71,11 +68,6 @@ import org.osgi.service.component.ComponentContext;
* cardinality="0..1" policy="dynamic"
* bind="setTenantBillingService"
* unbind="unsetTenantBillingService"
- * @scr.reference name="default.tenant.persistor"
- * interface="org.wso2.carbon.core.multitenancy.persistence.TenantPersistor"
- * cardinality="1..1" policy="dynamic"
- * bind="setTenantPersistor"
- * unbind="unsetTenantPersistor"
*/
public class TenantMgtServiceComponent {
private static Log log = LogFactory.getLog(TenantMgtServiceComponent.class);
@@ -88,7 +80,6 @@ public class TenantMgtServiceComponent {
private static ConfigurationContextService configurationContextService;
private static List<TenantMgtListener> tenantMgtListeners = new ArrayList<TenantMgtListener>();
- private static TenantPersistor tenantPersistor = null;
private static TenantBillingService billingService = null;
protected void activate(ComponentContext context) {
@@ -212,18 +203,6 @@ public class TenantMgtServiceComponent {
return registryService.getConfigSystemRegistry(tenantId);
}
- public static TenantPersistor getTenantPersistor() {
- return tenantPersistor;
- }
-
- protected void setTenantPersistor(TenantPersistor defaultTenantPersistor) {
- tenantPersistor = defaultTenantPersistor;
- }
-
- public void unsetTenantPersistor(TenantPersistor defaultTenantPersistor) {
- tenantPersistor = null;
- }
-
/** Updates RelyingPartyService with Crypto information
*
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cd87dbcc/components/org.apache.stratos.tenant.mgt/src/main/java/org/apache/stratos/tenant/mgt/services/GAppTenantRegistrationService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.mgt/src/main/java/org/apache/stratos/tenant/mgt/services/GAppTenantRegistrationService.java b/components/org.apache.stratos.tenant.mgt/src/main/java/org/apache/stratos/tenant/mgt/services/GAppTenantRegistrationService.java
index cfd284d..7fd5f81 100644
--- a/components/org.apache.stratos.tenant.mgt/src/main/java/org/apache/stratos/tenant/mgt/services/GAppTenantRegistrationService.java
+++ b/components/org.apache.stratos.tenant.mgt/src/main/java/org/apache/stratos/tenant/mgt/services/GAppTenantRegistrationService.java
@@ -24,7 +24,6 @@ package org.apache.stratos.tenant.mgt.services;
import org.apache.stratos.tenant.mgt.exception.TenantManagementException;
import org.apache.stratos.tenant.mgt.internal.TenantMgtServiceComponent;
import org.apache.stratos.tenant.mgt.util.TenantMgtUtil;
-import org.wso2.carbon.core.multitenancy.persistence.TenantPersistor;
import org.apache.stratos.common.beans.TenantInfoBean;
import org.apache.stratos.common.exception.StratosException;
import org.wso2.carbon.user.api.RealmConfiguration;
@@ -34,6 +33,7 @@ import org.wso2.carbon.user.core.UserCoreConstants;
import org.wso2.carbon.user.core.config.multitenancy.MultiTenantRealmConfigBuilder;
import org.wso2.carbon.user.core.tenant.Tenant;
import org.wso2.carbon.user.core.tenant.TenantManager;
+import org.apache.stratos.tenant.mgt.core.TenantPersistor;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -84,7 +84,7 @@ public class GAppTenantRegistrationService {
try {
int tenantId = -1;
Tenant tenant = TenantMgtUtil.initializeTenant(tenantInfoBean);
- TenantPersistor tenantPersistor = TenantMgtServiceComponent.getTenantPersistor();
+ TenantPersistor tenantPersistor = new TenantPersistor();
MultiTenantRealmConfigBuilder builder =
TenantMgtServiceComponent.getRealmService().getMultiTenantRealmConfigBuilder();
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cd87dbcc/components/org.apache.stratos.tenant.mgt/src/main/java/org/apache/stratos/tenant/mgt/services/TenantMgtAdminService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.mgt/src/main/java/org/apache/stratos/tenant/mgt/services/TenantMgtAdminService.java b/components/org.apache.stratos.tenant.mgt/src/main/java/org/apache/stratos/tenant/mgt/services/TenantMgtAdminService.java
index 4f159f5..730796c 100644
--- a/components/org.apache.stratos.tenant.mgt/src/main/java/org/apache/stratos/tenant/mgt/services/TenantMgtAdminService.java
+++ b/components/org.apache.stratos.tenant.mgt/src/main/java/org/apache/stratos/tenant/mgt/services/TenantMgtAdminService.java
@@ -19,7 +19,6 @@
package org.apache.stratos.tenant.mgt.services;
import org.wso2.carbon.core.AbstractAdmin;
-import org.wso2.carbon.core.multitenancy.persistence.TenantPersistor;
import org.wso2.carbon.registry.core.session.UserRegistry;
import org.apache.stratos.common.beans.TenantInfoBean;
import org.apache.stratos.common.exception.StratosException;
@@ -36,6 +35,7 @@ import org.wso2.carbon.user.core.tenant.Tenant;
import org.wso2.carbon.user.core.tenant.TenantManager;
import org.wso2.carbon.utils.DataPaginator;
import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
+import org.apache.stratos.tenant.mgt.core.TenantPersistor;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -68,34 +68,17 @@ public class TenantMgtAdminService extends AbstractAdmin {
}
String tenantDomain = tenantInfoBean.getTenantDomain();
TenantMgtUtil.validateDomain(tenantDomain);
- UserRegistry userRegistry = (UserRegistry) getGovernanceRegistry();
- if (userRegistry == null) {
- log.error("Security Alert! User registry is null. A user is trying create a tenant "
- + " without an authenticated session.");
- throw new Exception("Invalid data."); // obscure error message.
- }
-
- if (userRegistry.getTenantId() != MultitenantConstants.SUPER_TENANT_ID) {
- log.error("Security Alert! Non super tenant trying to create a tenant.");
- throw new Exception("Invalid data."); // obscure error message.
- }
+ checkIsSuperTenantInvoking();
Tenant tenant = TenantMgtUtil.initializeTenant(tenantInfoBean);
- TenantPersistor persistor = TenantMgtServiceComponent.getTenantPersistor();
+ TenantPersistor persistor = new TenantPersistor();
// not validating the domain ownership, since created by super tenant
int tenantId = persistor.persistTenant(tenant, false, tenantInfoBean.getSuccessKey(),
- tenantInfoBean.getOriginatedService());
+ tenantInfoBean.getOriginatedService(),false);
tenantInfoBean.setTenantId(tenantId);
TenantMgtUtil.addClaimsToUserStoreManager(tenant);
- //Notify tenant addition
- try {
- TenantMgtUtil.triggerAddTenant(tenantInfoBean);
- } catch (StratosException e) {
- String msg = "Error in notifying tenant addition.";
- log.error(msg, e);
- throw new Exception(msg, e);
- }
+ notifyTenantAddition(tenantInfoBean);
//adding the subscription entry
/*try {
if (TenantMgtServiceComponent.getBillingService() != null) {
@@ -117,6 +100,69 @@ public class TenantMgtAdminService extends AbstractAdmin {
return TenantMgtUtil.prepareStringToShowThemeMgtPage(tenant.getId());
}
+
+
+ private void notifyTenantAddition(TenantInfoBean tenantInfoBean) throws Exception {
+ //Notify tenant addition
+ try {
+ TenantMgtUtil.triggerAddTenant(tenantInfoBean);
+ } catch (StratosException e) {
+ String msg = "Error in notifying tenant addition.";
+ log.error(msg, e);
+ throw new Exception(msg, e);
+ }
+ }
+
+ private void checkIsSuperTenantInvoking() throws Exception {
+ UserRegistry userRegistry = (UserRegistry) getGovernanceRegistry();
+ if (userRegistry == null) {
+ log.error("Security Alert! User registry is null. A user is trying create a tenant "
+ + " without an authenticated session.");
+ throw new Exception("Invalid data."); // obscure error message.
+ }
+
+ if (userRegistry.getTenantId() != MultitenantConstants.SUPER_TENANT_ID) {
+ log.error("Security Alert! Non super tenant trying to create a tenant.");
+ throw new Exception("Invalid data."); // obscure error message.
+ }
+ }
+
+ /**
+ * Super admin add tenant.This method will be used whenever the user store is shared between two deployment.
+ * This method will persist tenant not in user store level but will do other post tenant creation actions.
+ *
+ * @param tenantInfoBean
+ * @return
+ * @throws Exception
+ */
+ public String addSkeletonTenant(TenantInfoBean tenantInfoBean) throws Exception {
+ int tenantId;
+ checkIsSuperTenantInvoking();
+ try {
+ tenantId=TenantMgtServiceComponent.getTenantManager().getTenantId(tenantInfoBean.getTenantDomain());
+ } catch (org.wso2.carbon.user.api.UserStoreException e) {
+ String msg = "Error in getting tenant id";
+ log.error(msg, e);
+ throw new Exception(msg, e);
+ }
+ if(tenantId<0){
+ String msg = "Tenant is not added in user store "+tenantInfoBean.getTenantDomain();
+ log.error(msg);
+ throw new Exception(msg);
+ }
+ Tenant tenant = TenantMgtUtil.initializeTenant(tenantInfoBean);
+ tenant.setId(tenantId);
+ TenantPersistor persistor = new TenantPersistor();
+ // not validating the domain ownership, since created by super tenant
+ persistor.persistTenant(tenant, false, tenantInfoBean.getSuccessKey(),
+ tenantInfoBean.getOriginatedService(), true);
+ tenantInfoBean.setTenantId(tenantId);
+ notifyTenantAddition(tenantInfoBean);
+ return TenantMgtUtil.prepareStringToShowThemeMgtPage(tenantId);
+ }
+
+
+
/**
* Get the list of the tenants
*
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cd87dbcc/components/org.apache.stratos.tenant.mgt/src/main/java/org/apache/stratos/tenant/mgt/services/TenantSelfRegistrationService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.mgt/src/main/java/org/apache/stratos/tenant/mgt/services/TenantSelfRegistrationService.java b/components/org.apache.stratos.tenant.mgt/src/main/java/org/apache/stratos/tenant/mgt/services/TenantSelfRegistrationService.java
index abdd203..5b791db 100644
--- a/components/org.apache.stratos.tenant.mgt/src/main/java/org/apache/stratos/tenant/mgt/services/TenantSelfRegistrationService.java
+++ b/components/org.apache.stratos.tenant.mgt/src/main/java/org/apache/stratos/tenant/mgt/services/TenantSelfRegistrationService.java
@@ -21,7 +21,6 @@ package org.apache.stratos.tenant.mgt.services;
import org.wso2.carbon.captcha.mgt.beans.CaptchaInfoBean;
import org.wso2.carbon.captcha.mgt.constants.CaptchaMgtConstants;
import org.wso2.carbon.captcha.mgt.util.CaptchaUtil;
-import org.wso2.carbon.core.multitenancy.persistence.TenantPersistor;
import org.apache.stratos.common.beans.TenantInfoBean;
import org.apache.stratos.common.exception.StratosException;
import org.apache.stratos.common.util.CommonUtil;
@@ -30,6 +29,7 @@ import org.apache.stratos.tenant.mgt.util.TenantMgtUtil;
import org.wso2.carbon.user.core.tenant.Tenant;
import org.wso2.carbon.user.core.tenant.TenantManager;
import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
+import org.apache.stratos.tenant.mgt.core.TenantPersistor;
import org.apache.axis2.AxisFault;
import org.apache.commons.logging.Log;
@@ -101,9 +101,9 @@ public class TenantSelfRegistrationService {
}
// persists the tenant.
Tenant tenant = TenantMgtUtil.initializeTenant(tenantInfoBean);
- TenantPersistor persistor = TenantMgtServiceComponent.getTenantPersistor();
+ TenantPersistor persistor = new TenantPersistor();
int tenantId = persistor.persistTenant(tenant, true, tenantInfoBean.getSuccessKey(),
- tenantInfoBean.getOriginatedService());
+ tenantInfoBean.getOriginatedService(),false);
tenantInfoBean.setTenantId(tenantId);
TenantMgtUtil.addClaimsToUserStoreManager(tenant);
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cd87dbcc/components/org.apache.stratos.tenant.mgt/src/main/java/org/apache/stratos/tenant/mgt/util/TenantMgtUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.mgt/src/main/java/org/apache/stratos/tenant/mgt/util/TenantMgtUtil.java b/components/org.apache.stratos.tenant.mgt/src/main/java/org/apache/stratos/tenant/mgt/util/TenantMgtUtil.java
index ec3edd0..ddca5a1 100644
--- a/components/org.apache.stratos.tenant.mgt/src/main/java/org/apache/stratos/tenant/mgt/util/TenantMgtUtil.java
+++ b/components/org.apache.stratos.tenant.mgt/src/main/java/org/apache/stratos/tenant/mgt/util/TenantMgtUtil.java
@@ -237,6 +237,10 @@ public class TenantMgtUtil {
tenant.setEmail(tenantInfoBean.getEmail());
tenant.setAdminName(tenantInfoBean.getAdmin());
+ // set tenantId given in tenantInfoBean, if it is set,
+ // underline tenant manager will try to create the tenant with given tenant Id.
+ tenant.setId(tenantInfoBean.getTenantId());
+
// we are duplicating the params stored in the claims here as well; they
// are in Tenant class
// to make it work with LDAP; but they do not make it to the databases.
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cd87dbcc/components/org.apache.stratos.tenant.mgt/src/main/resources/META-INF/services.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.mgt/src/main/resources/META-INF/services.xml b/components/org.apache.stratos.tenant.mgt/src/main/resources/META-INF/services.xml
index 9e7ded2..512f002 100644
--- a/components/org.apache.stratos.tenant.mgt/src/main/resources/META-INF/services.xml
+++ b/components/org.apache.stratos.tenant.mgt/src/main/resources/META-INF/services.xml
@@ -47,6 +47,10 @@
<parameter name="superTenantService" locked="true">true</parameter>
<parameter name="AuthorizationAction" locked="true">/permission/protected/manage/monitor/tenants</parameter>
</operation>
+ <operation name="addSkeletonTenant">
+ <parameter name="superTenantService" locked="true">true</parameter>
+ <parameter name="AuthorizationAction" locked="true">/permission/protected/manage/monitor/tenants</parameter>
+ </operation>
<operation name="retrieveTenants">
<parameter name="superTenantService" locked="true">true</parameter>
<parameter name="AuthorizationAction" locked="true">/permission/protected/manage/monitor/tenants</parameter>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cd87dbcc/features/adc/org.apache.stratos.adc.mgt.server.feature/src/main/resources/p2.inf
----------------------------------------------------------------------
diff --git a/features/adc/org.apache.stratos.adc.mgt.server.feature/src/main/resources/p2.inf b/features/adc/org.apache.stratos.adc.mgt.server.feature/src/main/resources/p2.inf
index 0660c79..d654766 100644
--- a/features/adc/org.apache.stratos.adc.mgt.server.feature/src/main/resources/p2.inf
+++ b/features/adc/org.apache.stratos.adc.mgt.server.feature/src/main/resources/p2.inf
@@ -16,7 +16,7 @@
# under the License.
instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.adc.mgt.server_${feature.version}/conf/cartridge-config.properties,target:${installFolder}/../conf/cartridge-config.properties,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.adc.mgt.server_${feature.version}/conf/policies.xml,target:${installFolder}/../conf/policies.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.adc.mgt.server_${feature.version}/conf/etc/policies.xsd,target:${installFolder}/../conf/etc/policies.xsd,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.adc.mgt.server_${feature.version}/conf/cartridge-config.properties,target:${installFolder}/../../conf/cartridge-config.properties,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.adc.mgt.server_${feature.version}/conf/policies.xml,target:${installFolder}/../../conf/policies.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.adc.mgt.server_${feature.version}/conf/etc/policies.xsd,target:${installFolder}/../../conf/etc/policies.xsd,overwrite:true);\
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cd87dbcc/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/p2.inf
----------------------------------------------------------------------
diff --git a/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/p2.inf b/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/p2.inf
index 3f6f4f6..c5f8223 100644
--- a/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/p2.inf
+++ b/features/manager/common/org.apache.stratos.common.server.feature/src/main/resources/p2.inf
@@ -16,12 +16,12 @@
# under the License.
instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.common.server_${feature.version}/conf/cloud-services-desc.xml,target:${installFolder}/../conf/multitenancy/cloud-services-desc.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.common.server_${feature.version}/conf/stratos.xml,target:${installFolder}/../conf/multitenancy/stratos.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.common.server_${feature.version}/conf/identity.xml,target:${installFolder}/../conf/identity.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.common.server_${feature.version}/conf/tenant-mgt.xml,target:${installFolder}/../conf/multitenancy/tenant-mgt.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.common.server_${feature.version}/conf/multitenancy-packages.xml,target:${installFolder}/../conf/multitenancy/multitenancy-packages.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.common.server_${feature.version}/conf/usage-throttling-agent-config.xml,target:${installFolder}/../conf/multitenancy/usage-throttling-agent-config.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.common.server_${feature.version}/conf/eula.xml,target:${installFolder}/../conf/multitenancy/eula.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/features/org.apache.stratos.common.server_${feature.version}/conf);
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.common.server_${feature.version}/conf/cloud-services-desc.xml,target:${installFolder}/../../conf/multitenancy/cloud-services-desc.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.common.server_${feature.version}/conf/stratos.xml,target:${installFolder}/../../conf/multitenancy/stratos.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.common.server_${feature.version}/conf/identity.xml,target:${installFolder}/../../conf/identity.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.common.server_${feature.version}/conf/tenant-mgt.xml,target:${installFolder}/../../conf/multitenancy/tenant-mgt.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.common.server_${feature.version}/conf/multitenancy-packages.xml,target:${installFolder}/../../conf/multitenancy/multitenancy-packages.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.common.server_${feature.version}/conf/usage-throttling-agent-config.xml,target:${installFolder}/../../conf/multitenancy/usage-throttling-agent-config.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.common.server_${feature.version}/conf/eula.xml,target:${installFolder}/../../conf/multitenancy/eula.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../features/org.apache.stratos.common.server_${feature.version}/conf);
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cd87dbcc/features/manager/logging-mgt/org.apache.stratos.logging.mgt.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/logging-mgt/org.apache.stratos.logging.mgt.feature/pom.xml b/features/manager/logging-mgt/org.apache.stratos.logging.mgt.feature/pom.xml
index 1dd3b52..45fd8f1 100644
--- a/features/manager/logging-mgt/org.apache.stratos.logging.mgt.feature/pom.xml
+++ b/features/manager/logging-mgt/org.apache.stratos.logging.mgt.feature/pom.xml
@@ -96,7 +96,7 @@
<importFeatureDef>org.wso2.carbon.core.ui:${wso2carbon.version}</importFeatureDef>
</importFeatures>
<includedFeatures>
- <includedFeatureDef>org.wso2.carbon:org.wso2.carbon.logging.mgt.server.feature:${carbon.platform.patch.version.4.1.1}</includedFeatureDef>
+ <includedFeatureDef>org.wso2.carbon:org.wso2.carbon.logging.mgt.server.feature:4.2.1</includedFeatureDef>
</includedFeatures>
</configuration>
</execution>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cd87dbcc/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/src/main/resources/p2.inf
----------------------------------------------------------------------
diff --git a/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/src/main/resources/p2.inf b/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/src/main/resources/p2.inf
index 9bbe4d9..fc828ae 100644
--- a/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/src/main/resources/p2.inf
+++ b/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/src/main/resources/p2.inf
@@ -1,6 +1,6 @@
instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.rest.endpoint_${feature.version}/cxf,target:${installFolder}/../../lib/runtimes/cxf,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.rest.endpoint_${feature.version}/web-app/stratos.war,target:${installFolder}/../deployment/server/webapps/stratos.war,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.rest.endpoint_${feature.version}/tomcat/webapp-classloading.xml,target:${installFolder}/../conf/tomcat/webapp-classloading.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.rest.endpoint_${feature.version}/tomcat/webapp-classloading-environments.xml,target:${installFolder}/../conf/tomcat/webapp-classloading-environments.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/features/org.apache.stratos.rest.endpoint_${feature.version}/tomcat/context.xml,target:${installFolder}/../conf/tomcat/context.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.rest.endpoint_${feature.version}/cxf,target:${installFolder}/../../../lib/runtimes/cxf,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.rest.endpoint_${feature.version}/web-app/stratos.war,target:${installFolder}/../../deployment/server/webapps/stratos.war,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.rest.endpoint_${feature.version}/tomcat/webapp-classloading.xml,target:${installFolder}/../../conf/tomcat/webapp-classloading.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.rest.endpoint_${feature.version}/tomcat/webapp-classloading-environments.xml,target:${installFolder}/../../conf/tomcat/webapp-classloading-environments.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.apache.stratos.rest.endpoint_${feature.version}/tomcat/context.xml,target:${installFolder}/../../conf/tomcat/context.xml,overwrite:true);\
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cd87dbcc/products/cloud-controller/modules/p2-profile/pom.xml
----------------------------------------------------------------------
diff --git a/products/cloud-controller/modules/p2-profile/pom.xml b/products/cloud-controller/modules/p2-profile/pom.xml
index 08dbd74..64695b7 100644
--- a/products/cloud-controller/modules/p2-profile/pom.xml
+++ b/products/cloud-controller/modules/p2-profile/pom.xml
@@ -164,9 +164,9 @@
org.wso2.carbon:org.wso2.carbon.task.server.feature:${carbon.version}
</featureArtifactDef>
- <featureArtifactDef>
+ <!-- <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.mediation.initializer.feature:${carbon.version}
- </featureArtifactDef>
+ </featureArtifactDef> -->
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.logging.mgt.feature:${carbon.version}
@@ -176,13 +176,13 @@
org.wso2.carbon:org.wso2.carbon.endpoint.server.feature:${carbon.version}
</featureArtifactDef>
- <featureArtifactDef>
+ <!-- <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.sequences.server.feature:${carbon.version}
- </featureArtifactDef>
+ </featureArtifactDef> -->
- <featureArtifactDef>
+<!-- <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.mediators.server.feature:${carbon.version}
- </featureArtifactDef>
+ </featureArtifactDef> -->
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.relay.server.feature:${carbon.version}
@@ -263,10 +263,10 @@
<id>org.wso2.carbon.datasource.server.feature.group</id>
<version>${carbon.version}</version>
</feature>
- <feature>
+ <!-- <feature>
<id>org.wso2.carbon.mediation.initializer.feature.group</id>
<version>${carbon.version}</version>
- </feature>
+ </feature> -->
<feature>
<id>org.wso2.carbon.service.mgt.server.feature.group</id>
<version>${carbon.version}</version>
@@ -283,14 +283,14 @@
<id>org.wso2.carbon.endpoint.server.feature.group</id>
<version>${carbon.version}</version>
</feature>
- <feature>
+ <!-- <feature>
<id>org.wso2.carbon.sequences.server.feature.group</id>
<version>${carbon.version}</version>
- </feature>
- <feature>
+ </feature> -->
+<!-- <feature>
<id>org.wso2.carbon.mediators.server.feature.group</id>
<version>${carbon.version}</version>
- </feature>
+ </feature> -->
<feature>
<id>org.wso2.carbon.relay.server.feature.group</id>
<version>${carbon.version}</version>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cd87dbcc/products/load-balancer/modules/distribution/src/main/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/products/load-balancer/modules/distribution/src/main/assembly/bin.xml b/products/load-balancer/modules/distribution/src/main/assembly/bin.xml
index 5b80b0c..0940d0d 100755
--- a/products/load-balancer/modules/distribution/src/main/assembly/bin.xml
+++ b/products/load-balancer/modules/distribution/src/main/assembly/bin.xml
@@ -58,7 +58,7 @@
<exclude>**/axis2/tenant-axis2.xml</exclude>
<exclude>**/authenticators.xml</exclude>
<exclude>**/embedded-ldap.xml</exclude>
- <exclude>**/user-mgt.xml</exclude>
+ <!--<exclude>**/user-mgt.xml</exclude> -->
<exclude>**/*.aar</exclude>
<exclude>**/webapp-mode/**</exclude>
<exclude>**/repository/components/**</exclude>
@@ -193,11 +193,11 @@
<source>../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/coordination-client-config.xml</source>
<outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf/etc</outputDirectory>
</file-->
- <file>
+ <!--<file>
<source>src/main/conf/user-mgt.xml</source>
<outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf</outputDirectory>
<destName>user-mgt.xml</destName>
- </file>
+ </file> -->
<file>
<source>src/main/conf/embedded-ldap.xml</source>
<outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf</outputDirectory>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cd87dbcc/products/stratos-controller/modules/dashboard/src/main/java/org/apache/stratos/manager/dashboard/ui/clients/CloudManagerServiceClient.java
----------------------------------------------------------------------
diff --git a/products/stratos-controller/modules/dashboard/src/main/java/org/apache/stratos/manager/dashboard/ui/clients/CloudManagerServiceClient.java b/products/stratos-controller/modules/dashboard/src/main/java/org/apache/stratos/manager/dashboard/ui/clients/CloudManagerServiceClient.java
index 5359afa..cdd9b16 100644
--- a/products/stratos-controller/modules/dashboard/src/main/java/org/apache/stratos/manager/dashboard/ui/clients/CloudManagerServiceClient.java
+++ b/products/stratos-controller/modules/dashboard/src/main/java/org/apache/stratos/manager/dashboard/ui/clients/CloudManagerServiceClient.java
@@ -89,7 +89,7 @@ public class CloudManagerServiceClient {
}
public CloudService[] retrieveCloudServiceInfo() throws Exception {
- try {
+ /*try {
if (CarbonContext.getCurrentContext().getCache(null).containsKey(CLOUD_SERVICE)) {
return (CloudService[]) CarbonContext.getCurrentContext()
.getCache(null).get(CLOUD_SERVICE);
@@ -100,12 +100,13 @@ public class CloudManagerServiceClient {
}
CloudService[] cloudServices = stub.retrieveCloudServiceInfo();
CarbonContext.getCurrentContext().getCache(null).put(CLOUD_SERVICE, cloudServices);
- return cloudServices;
+ return cloudServices;*/
+ return null;
}
public void saveCloudServicesActivity(String[] activeServiceNames) throws Exception {
- CloudService[] cloudServices =
+ /* CloudService[] cloudServices =
(CloudService[]) CarbonContext.getCurrentContext().getCache(null).get(CLOUD_SERVICE);
for (CloudService cloudService : cloudServices) {
@@ -119,6 +120,6 @@ public class CloudManagerServiceClient {
}
}
- stub.saveCloudServicesActivity(activeServiceNames);
+ stub.saveCloudServicesActivity(activeServiceNames);*/
}
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cd87dbcc/products/stratos-controller/modules/distribution/src/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/products/stratos-controller/modules/distribution/src/assembly/bin.xml b/products/stratos-controller/modules/distribution/src/assembly/bin.xml
index 6e590b9..60aff65 100755
--- a/products/stratos-controller/modules/distribution/src/assembly/bin.xml
+++ b/products/stratos-controller/modules/distribution/src/assembly/bin.xml
@@ -610,10 +610,10 @@
</file-->
<!-- Including coordination-client-config.xml file -->
- <file>
+ <!--<file>
<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/coordination-client-config.xml</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
- </file>
+ </file> -->
<!-- Ntask config file -->
<file>
<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/tasks-config.xml</source>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/cd87dbcc/products/stratos-controller/modules/p2-profile-gen/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos-controller/modules/p2-profile-gen/pom.xml b/products/stratos-controller/modules/p2-profile-gen/pom.xml
index 915e130..14ddce2 100644
--- a/products/stratos-controller/modules/p2-profile-gen/pom.xml
+++ b/products/stratos-controller/modules/p2-profile-gen/pom.xml
@@ -84,7 +84,7 @@
<plugin>
<groupId>org.wso2.maven</groupId>
<artifactId>carbon-p2-plugin</artifactId>
- <version>${carbon.p2.plugin.version}</version>
+ <version>1.5.3</version>
<executions>
<execution>
<id>2-p2-repo-generation</id>
@@ -102,7 +102,7 @@
<!--**************************************************Manager features start*********************************************-->
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.databridge.datapublisher.feature:${carbon.version}</featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.ntask.feature:${carbon.version}</featureArtifactDef>
- <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.coordination.core.feature:${carbon.version}</featureArtifactDef>
+ <!-- <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.coordination.core.feature:${carbon.version}</featureArtifactDef> -->
<!-- registry related features-->
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.registry.core.feature:${carbon.version}</featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.registry.resource.properties.feature:${carbon.version}</featureArtifactDef>
@@ -125,9 +125,12 @@
<!--featureArtifactDef>
org.apache.stratos:org.apache.stratos.throttling.manager.feature:${project.version}
</featureArtifactDef-->
- <featureArtifactDef>
+<!-- <featureArtifactDef>
org.apache.stratos:org.apache.stratos.throttling.agent.feature:${project.version}
- </featureArtifactDef>
+ </featureArtifactDef> -->
+ <featureArtifactDef>
+ org.wso2.carbon:org.wso2.carbon.throttle.server.feature:${carbon.version}
+ </featureArtifactDef>
<!--featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.billing.server.feature:2.1.3
</featureArtifactDef-->
@@ -147,15 +150,15 @@
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.webapp.mgt.server.feature:${carbon.version}
</featureArtifactDef>
- <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.admin.mgt.server.feature:${carbon.version}</featureArtifactDef>
- <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.admin.mgt.ui.feature:${carbon.version}</featureArtifactDef>
+ <!-- <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.admin.mgt.server.feature:${carbon.version}</featureArtifactDef> -->
+ <!-- <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.admin.mgt.ui.feature:${carbon.version}</featureArtifactDef> -->
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.captcha.mgt.server.feature:${carbon.version}</featureArtifactDef>
<!-- start BAM feature -->
<featureArtifactDef>org.wso2.carbon:org.apache.synapse.wso2.feature:2.1.1-wso2v4</featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.task.server.feature:${carbon.version}</featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.datasource.server.feature:${carbon.version}</featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.transaction.manager.feature:${carbon.version}</featureArtifactDef>
- <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.service.mgt.server.feature:${carbon.version}</featureArtifactDef>
+ <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.service.mgt.server.feature:4.2.1</featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.transport.mgt.server.feature:${carbon.version}</featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.event.common.feature:${carbon.version}</featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.event.server.feature:${carbon.version}</featureArtifactDef>
@@ -177,16 +180,16 @@
org.wso2.carbon:org.wso2.carbon.identity.sso.saml.feature:${carbon.version}
</featureArtifactDef>
<featureArtifactDef>
- org.wso2.carbon:org.wso2.stratos.identity.saml2.sso.mgt.feature:${stratos.component.version}
+ org.wso2.carbon:org.wso2.stratos.identity.saml2.sso.mgt.feature:2.2.0
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.registry.ui.menu.feature:${carbon.version}
</featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.module.mgt.server.feature:${carbon.version}</featureArtifactDef>
- <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.throttle.feature:${carbon.version}</featureArtifactDef>
+ <!-- <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.throttle.feature:${carbon.version}</featureArtifactDef> -->
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.caching.feature:${carbon.version}</featureArtifactDef>
- <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.rm.server.feature:4.0.0</featureArtifactDef>
+ <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.rm.server.feature:4.2.0</featureArtifactDef>
<featureArtifactDef>org.apache.stratos:org.apache.stratos.adc.mgt.feature:${project.version}</featureArtifactDef>
<featureArtifactDef>
org.apache.stratos:org.apache.stratos.cartridge.mgt.ui.feature:${project.version}
@@ -200,6 +203,7 @@
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.identity.authenticator.saml2.sso.ui.feature:${wso2carbon.version}
</featureArtifactDef>
+ <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.application.authentication.framework.server.feature:4.2.1</featureArtifactDef>
<!--**************************************************Manager features end*********************************************-->
@@ -216,7 +220,7 @@
<goal>p2-profile-gen</goal>
</goals>
<configuration>
- <profile>WSO2CarbonProfile</profile>
+ <profile>default</profile>
<p2AgentLocation>${basedir}/target/p2-agent</p2AgentLocation>
<metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
<artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
@@ -234,7 +238,7 @@
</feature>
<feature>
<id>org.wso2.stratos.identity.saml2.sso.mgt.feature.group</id>
- <version>${stratos.component.version}</version>
+ <version>2.2.0</version>
</feature>
<feature>
<id>org.apache.stratos.logging.mgt.feature.group</id>
@@ -264,10 +268,10 @@
<id>org.wso2.carbon.ntask.feature.group</id>
<version>${carbon.version}</version>
</feature>
- <feature>
+ <!-- <feature>
<id>org.wso2.carbon.coordination.core.feature.group</id>
<version>${carbon.version}</version>
- </feature>
+ </feature>-->
<feature>
<id>org.apache.stratos.feature.group</id>
@@ -282,10 +286,10 @@
<id>org.apache.synapse.wso2.feature.group</id>
<version>2.1.1-wso2v4</version>
</feature>
- <feature>
+ <!-- <feature>
<id>org.wso2.carbon.task.server.feature.group</id>
<version>${carbon.version}</version>
- </feature>
+ </feature> -->
<feature>
<id>org.wso2.carbon.transaction.manager.feature.group</id>
<version>${carbon.version}</version>
@@ -302,14 +306,14 @@
<id>org.wso2.carbon.event.common.feature.group</id>
<version>${carbon.version}</version>
</feature>
- <feature>
+ <!-- <feature>
<id>org.wso2.carbon.admin.mgt.server.feature.group</id>
<version>${carbon.version}</version>
- </feature>
- <feature>
+ </feature> -->
+ <!-- <feature>
<id>org.wso2.carbon.admin.mgt.ui.feature.group</id>
<version>${carbon.version}</version>
- </feature>
+ </feature> -->
<feature>
<id>org.wso2.carbon.captcha.mgt.server.feature.group</id>
<version>${carbon.version}</version>
@@ -344,10 +348,10 @@
<id>org.apache.stratos.throttling.manager.feature.group</id>
<version>${project.version}</version>
</feature-->
- <feature>
+<!-- <feature>
<id>org.apache.stratos.throttling.agent.feature.group</id>
- <version>${project.version}</version>
- </feature>
+ <version>${project.version}</version>
+ </feature>-->
<!--feature>
<id>org.wso2.carbon.billing.server.feature.group</id>
<version>2.1.3</version>
[07/11] git commit: Fixing CC starting up issues
Posted by sa...@apache.org.
Fixing CC starting up issues
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/500eaf52
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/500eaf52
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/500eaf52
Branch: refs/heads/master
Commit: 500eaf523184b3a0f37376032aadf2333c5c4cf2
Parents: b695271
Author: Sajith Kariyawasam <sa...@wso2.com>
Authored: Mon Jan 6 16:00:54 2014 +0530
Committer: Sajith Kariyawasam <sa...@wso2.com>
Committed: Mon Jan 6 16:00:54 2014 +0530
----------------------------------------------------------------------
.../internal/CloudControllerDSComponent.java | 21 +-
.../TopologySynchronizerTaskScheduler.java | 7 +-
.../controller/registry/RegistryManager.java | 20 +-
.../topology/TopologySynchronizerTask.java | 6 +-
.../controller/util/CloudControllerUtil.java | 3 +-
.../internal/CloudCommonServiceComponent.java | 4 +-
.../distribution/src/main/assembly/bin.xml | 2 +-
.../distribution/src/main/conf/axis2.xml | 1227 ++++++++++--------
.../distribution/src/main/resources/launch.ini | 25 +-
9 files changed, 763 insertions(+), 552 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/500eaf52/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerDSComponent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerDSComponent.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerDSComponent.java
index b750da4..9cb2869 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerDSComponent.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerDSComponent.java
@@ -36,10 +36,13 @@ import org.apache.stratos.messaging.broker.publish.EventPublisher;
import org.apache.stratos.messaging.broker.subscribe.TopicSubscriber;
import org.osgi.framework.BundleContext;
import org.osgi.service.component.ComponentContext;
+import org.wso2.carbon.context.PrivilegedCarbonContext;
import org.wso2.carbon.ntask.core.service.TaskService;
import org.wso2.carbon.registry.core.exceptions.RegistryException;
import org.wso2.carbon.registry.core.service.RegistryService;
+import org.wso2.carbon.registry.core.session.UserRegistry;
import org.wso2.carbon.utils.ConfigurationContextService;
+import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
import java.util.List;
@@ -72,6 +75,7 @@ public class CloudControllerDSComponent {
protected void activate(ComponentContext context) {
try {
+
// Start instance status event message listener
TopicSubscriber subscriber = new TopicSubscriber(CloudControllerConstants.INSTANCE_TOPIC);
subscriber.setMessageListener(new InstanceStatusEventMessageListener());
@@ -90,10 +94,11 @@ public class CloudControllerDSComponent {
if(log.isInfoEnabled()) {
log.info("Scheduling tasks");
}
-
- TopologySynchronizerTaskScheduler.schedule(ServiceReferenceHolder.getInstance().getTaskService());
-
- log.debug("******* Cloud Controller Service bundle is activated ******* ");
+
+ TopologySynchronizerTaskScheduler
+ .schedule(ServiceReferenceHolder.getInstance()
+ .getTaskService());
+
} catch (Throwable e) {
log.error("******* Cloud Controller Service bundle is failed to activate ****", e);
}
@@ -117,14 +122,16 @@ public class CloudControllerDSComponent {
if (log.isDebugEnabled()) {
log.debug("Setting the Registry Service");
}
- try {
+
+ try {
+ UserRegistry registry = registryService.getGovernanceSystemRegistry();
ServiceReferenceHolder.getInstance()
- .setRegistry(registryService.getGovernanceSystemRegistry());
+ .setRegistry(registry);
} catch (RegistryException e) {
String msg = "Failed when retrieving Governance System Registry.";
log.error(msg, e);
throw new CloudControllerException(msg, e);
- }
+ }
}
protected void unsetRegistryService(RegistryService registryService) {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/500eaf52/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/publisher/TopologySynchronizerTaskScheduler.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/publisher/TopologySynchronizerTaskScheduler.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/publisher/TopologySynchronizerTaskScheduler.java
index 49cae09..7141279 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/publisher/TopologySynchronizerTaskScheduler.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/publisher/TopologySynchronizerTaskScheduler.java
@@ -22,13 +22,8 @@ package org.apache.stratos.cloud.controller.publisher;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.cloud.controller.topology.TopologySynchronizerTask;
-import org.wso2.carbon.ntask.common.TaskException;
-import org.wso2.carbon.ntask.core.TaskInfo;
-import org.wso2.carbon.ntask.core.TaskManager;
import org.wso2.carbon.ntask.core.service.TaskService;
-import java.util.HashMap;
-
/**
* Topology synchronizer task scheduler for scheduling the topology synchronizer task
* using carbon task service.
@@ -49,7 +44,7 @@ public class TopologySynchronizerTaskScheduler {
private static class TaskRunnable implements Runnable {
@Override
- public void run() {
+ public void run() {
while (true) {
try {
log.debug("Running topology synchronizer task");
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/500eaf52/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/registry/RegistryManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/registry/RegistryManager.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/registry/RegistryManager.java
index 58862e4..aa91dc2 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/registry/RegistryManager.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/registry/RegistryManager.java
@@ -29,10 +29,12 @@ import org.apache.stratos.cloud.controller.runtime.FasterLookUpDataHolder;
import org.apache.stratos.cloud.controller.util.CloudControllerConstants;
import org.apache.stratos.cloud.controller.util.ServiceReferenceHolder;
import org.apache.stratos.messaging.domain.topology.Topology;
+import org.wso2.carbon.context.PrivilegedCarbonContext;
import org.wso2.carbon.registry.core.Registry;
import org.wso2.carbon.registry.core.Resource;
import org.wso2.carbon.registry.core.exceptions.RegistryException;
import org.wso2.carbon.registry.core.exceptions.ResourceNotFoundException;
+import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
/**
*
@@ -122,7 +124,11 @@ public class RegistryManager {
public Object retrieve() {
try {
- Resource resource = registryService.get(CloudControllerConstants.CLOUD_CONTROLLER_RESOURCE + CloudControllerConstants.DATA_RESOURCE);
+ PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
+ ctx.setTenantId(MultitenantConstants.SUPER_TENANT_ID);
+ ctx.setTenantDomain(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME);
+ Resource resource = registryService.get(
+ CloudControllerConstants.CLOUD_CONTROLLER_RESOURCE + CloudControllerConstants.DATA_RESOURCE);
return resource.getContent();
@@ -140,8 +146,14 @@ public class RegistryManager {
public Object retrieveTopology() {
try {
- Resource resource = registryService.get(CloudControllerConstants.CLOUD_CONTROLLER_RESOURCE +
- CloudControllerConstants.TOPOLOGY_RESOURCE);
+ PrivilegedCarbonContext ctx = PrivilegedCarbonContext
+ .getThreadLocalCarbonContext();
+ ctx.setTenantId(MultitenantConstants.SUPER_TENANT_ID);
+ ctx.setTenantDomain(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME);
+
+ Resource resource = registryService
+ .get(CloudControllerConstants.CLOUD_CONTROLLER_RESOURCE
+ + CloudControllerConstants.TOPOLOGY_RESOURCE);
return resource.getContent();
@@ -152,7 +164,7 @@ public class RegistryManager {
String msg = "Failed to retrieve cloud controller data from registry.";
log.error(msg, e);
throw new CloudControllerException(msg, e);
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/500eaf52/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologySynchronizerTask.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologySynchronizerTask.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologySynchronizerTask.java
index 521c415..be3051e 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologySynchronizerTask.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologySynchronizerTask.java
@@ -18,13 +18,13 @@
*/
package org.apache.stratos.cloud.controller.topology;
+import java.util.Map;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.cloud.controller.runtime.FasterLookUpDataHolder;
import org.wso2.carbon.ntask.core.Task;
-import java.util.Map;
-
public class TopologySynchronizerTask implements Task{
private static final Log log = LogFactory.getLog(TopologySynchronizerTask.class);
@@ -33,7 +33,7 @@ public class TopologySynchronizerTask implements Task{
if (log.isDebugEnabled()) {
log.debug("Executing topology synchronization task");
}
-
+
if(FasterLookUpDataHolder.getInstance().isTopologySyncRunning() ||
// this is a temporary fix to avoid task execution - limitation with ntask
(!FasterLookUpDataHolder.getInstance().getEnableTopologySync())){
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/500eaf52/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
index 80b07f6..53a28ae 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
@@ -238,8 +238,7 @@ public class CloudControllerUtil {
}
}
- public static Topology retrieveTopology() {
-
+ public static Topology retrieveTopology() {
Object obj = RegistryManager.getInstance().retrieveTopology();
if (obj != null) {
try {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/500eaf52/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/internal/CloudCommonServiceComponent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/internal/CloudCommonServiceComponent.java b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/internal/CloudCommonServiceComponent.java
index e895106..2400631 100644
--- a/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/internal/CloudCommonServiceComponent.java
+++ b/components/org.apache.stratos.common/src/main/java/org/apache/stratos/common/internal/CloudCommonServiceComponent.java
@@ -71,8 +71,8 @@ public class CloudCommonServiceComponent {
//Register manager configuration OSGI service
try {
- //StratosConfiguration stratosConfiguration = CommonUtil.loadStratosConfiguration();
- //bundleContext.registerService(StratosConfiguration.class.getName(), stratosConfiguration, null);
+ StratosConfiguration stratosConfiguration = CommonUtil.loadStratosConfiguration();
+ bundleContext.registerService(StratosConfiguration.class.getName(), stratosConfiguration, null);
if (log.isDebugEnabled()) {
log.debug("******* Cloud Common Service bundle is activated ******* ");
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/500eaf52/products/cloud-controller/modules/distribution/src/main/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/products/cloud-controller/modules/distribution/src/main/assembly/bin.xml b/products/cloud-controller/modules/distribution/src/main/assembly/bin.xml
index f374341..e1589e0 100644
--- a/products/cloud-controller/modules/distribution/src/main/assembly/bin.xml
+++ b/products/cloud-controller/modules/distribution/src/main/assembly/bin.xml
@@ -196,7 +196,7 @@
<files>
<file>
- <source>target/wso2carbon-core-${carbon.kernel.version}/repository/conf/axis2/axis2.xml</source>
+ <source>src/main/conf/axis2.xml</source>
<outputDirectory>apache-stratos-cc-${pom.version}/repository/conf/axis2</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/500eaf52/products/cloud-controller/modules/distribution/src/main/conf/axis2.xml
----------------------------------------------------------------------
diff --git a/products/cloud-controller/modules/distribution/src/main/conf/axis2.xml b/products/cloud-controller/modules/distribution/src/main/conf/axis2.xml
old mode 100755
new mode 100644
index 77dcf02..8195d8f
--- a/products/cloud-controller/modules/distribution/src/main/conf/axis2.xml
+++ b/products/cloud-controller/modules/distribution/src/main/conf/axis2.xml
@@ -1,524 +1,703 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- ~ 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.
- -->
-
-<axisconfig name="AxisJava2.0">
-
- <!-- ================================================= -->
- <!-- Parameters -->
- <!-- ================================================= -->
-
- <!-- This will give out the timout of the configuration contexts, in milliseconds -->
- <parameter name="ConfigContextTimeoutInterval" locked="false">30000</parameter>
-
- <!-- Synapse Configuration file location relative to CARBON_HOME -->
- <parameter name="SynapseConfig.ConfigurationFile" locked="false">repository/deployment/server/synapse-configs</parameter>
- <!-- Synapse Home parameter -->
- <parameter name="SynapseConfig.HomeDirectory" locked="false">.</parameter>
- <!-- Resolve root used to resolve synapse references like schemas inside a WSDL -->
- <parameter name="SynapseConfig.ResolveRoot" locked="false">.</parameter>
- <!-- Synapse Server name parameter -->
- <parameter name="SynapseConfig.ServerName" locked="false">localhost</parameter>
-
-
- <!-- ================================================= -->
- <!-- Message Formatters -->
- <!-- ================================================= -->
-
- <!-- Following content type to message formatter mapping can be used to implement support -->
- <!-- for different message format serializations in Axis2. These message formats are -->
- <!-- expected to be resolved based on the content type. -->
- <messageFormatters>
- <!--messageFormatter contentType="application/xml"
- class="org.apache.axis2.transport.http.ApplicationXMLFormatter"/>-->
- <!--messageFormatter contentType="text/xml"
- class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>-->
- <!--messageFormatter contentType="application/soap+xml"
- class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>-->
- <!--messageFormatter contentType="application/x-www-form-urlencoded"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/-->
- <messageFormatter contentType="multipart/related"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
- <messageFormatter contentType="application/xml"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
- <messageFormatter contentType="application/txt"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
- <messageFormatter contentType="text/html"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
- <messageFormatter contentType="application/soap+xml"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
- <messageFormatter contentType="text/xml"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
- <!--messageFormatter contentType="x-application/hessian"
- class="org.apache.synapse.format.hessian.HessianMessageFormatter"/-->
- <!--messageFormatter contentType=""
- class="org.apache.synapse.format.hessian.HessianMessageFormatter"/-->
-
- <messageFormatter contentType="text/css"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
- <messageFormatter contentType="text/javascript"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
-
- <messageFormatter contentType="image/gif"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
- <messageFormatter contentType="img/gif"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
- <messageFormatter contentType="image/jpeg"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
- <messageFormatter contentType="image/png"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
- <messageFormatter contentType="image/ico"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
- <messageFormatter contentType="image/x-icon"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
-
- <messageFormatter contentType="application/x-javascript"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
- <messageFormatter contentType="application/x-shockwave-flash"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
- <messageFormatter contentType="application/atom+xml"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
- <messageFormatter contentType="application/x-www-form-urlencoded"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
- <messageFormatter contentType="application/xhtml+xml"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
- <messageFormatter contentType="application/octet-stream"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
- <messageFormatter contentType="application/javascript"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
-
- <messageFormatter contentType="multipart/form-data"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
- <messageFormatter contentType="application/soap+xml"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
-
- <!--JSON Message Formatters-->
- <messageFormatter contentType="application/json"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
- <messageFormatter contentType="application/json/badgerfish"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
- <messageFormatter contentType="text/javascript"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
-
-
- <messageFormatter contentType=".*"
- class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
-
- </messageFormatters>
-
- <!-- ================================================= -->
- <!-- Message Builders -->
- <!-- ================================================= -->
-
- <!-- Following content type to builder mapping can be used to implement support for -->
- <!-- different message formats in Axis2. These message formats are expected to be -->
- <!-- resolved based on the content type. -->
- <messageBuilders>
- <messageBuilder contentType="application/xml"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
- <messageBuilder contentType="application/txt"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
- <!--messageBuilder contentType="application/xml"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/-->
- <!--messageBuilder contentType="application/x-www-form-urlencoded"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/-->
- <!--messageBuilder contentType="multipart/form-data"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/-->
- <messageBuilder contentType="multipart/related"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
- <messageBuilder contentType="application/soap+xml"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
- <messageBuilder contentType="text/plain"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
- <messageBuilder contentType="text/xml"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
- <!--messageBuilder contentType="x-application/hessian"
- class="org.apache.synapse.format.hessian.HessianMessageBuilder"/-->
- <!--messageBuilder contentType=""
- class="org.apache.synapse.format.hessian.HessianMessageBuilder"/-->
-
- <!--JSON Message Builders-->
- <messageBuilder contentType="application/json"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
- <messageBuilder contentType="application/json/badgerfish"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
- <messageBuilder contentType="text/javascript"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
-
-
- <messageBuilder contentType="text/html"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
- <messageBuilder contentType="text/css"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
- <messageBuilder contentType="text/javascript"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
-
- <messageBuilder contentType="image/gif"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
- <messageBuilder contentType="img/gif"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
- <messageBuilder contentType="image/jpeg"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
- <messageBuilder contentType="image/png"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
- <messageBuilder contentType="image/ico"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
- <messageBuilder contentType="image/x-icon"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
-
-
- <messageBuilder contentType="application/x-javascript"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
- <messageBuilder contentType="application/x-shockwave-flash"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
- <messageBuilder contentType="application/atom+xml"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
- <messageBuilder contentType="application/x-www-form-urlencoded"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
- <messageBuilder contentType="application/xhtml+xml"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
- <messageBuilder contentType="application/octet-stream"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
- <messageBuilder contentType="application/javascript"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
-
- <messageBuilder contentType="multipart/form-data"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
- <messageBuilder contentType="application/soap+xml"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
-
-
- <messageBuilder contentType=".*"
- class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
-
- </messageBuilders>
-
- <!-- ================================================= -->
- <!-- Transport Ins (Listeners) -->
- <!-- ================================================= -->
- <!--Default trasnport will be passthrough if you need to change please add it here -->
- <transportReceiver name="http" class="org.wso2.carbon.transport.passthru.PassThroughHttpListener">
- <parameter name="port">8280</parameter>
- <parameter name="non-blocking"> true</parameter>
- </transportReceiver>
- <transportReceiver name="https" class="org.wso2.carbon.transport.passthru.PassThroughHttpSSLListener">
- <parameter name="port" locked="false">8243</parameter>
- <parameter name="non-blocking" locked="false">true</parameter>
- <!--parameter name="bind-address" locked="false">hostname or IP address</parameter-->
- <!--parameter name="WSDLEPRPrefix" locked="false">https://apachehost:port/somepath</parameter-->
- <parameter name="keystore" locked="false">
- <KeyStore>
- <Location>repository/resources/security/wso2carbon.jks</Location>
- <Type>JKS</Type>
- <Password>wso2carbon</Password>
- <KeyPassword>wso2carbon</KeyPassword>
- </KeyStore>
- </parameter>
- <parameter name="truststore" locked="false">
- <TrustStore>
- <Location>repository/resources/security/client-truststore.jks</Location>
- <Type>JKS</Type>
- <Password>wso2carbon</Password>
- </TrustStore>
- </parameter>
- <!--<parameter name="SSLVerifyClient">require</parameter>
- supports optional|require or defaults to none -->
- </transportReceiver>
-
- <!-- uncomment for non blocking http transport based on HttpCore + NIO extensions -->
- <!--transportReceiver name="http" class="org.apache.synapse.transport.nhttp.HttpCoreNIOListener">
- <parameter name="port" locked="false">8280</parameter>
- <parameter name="non-blocking" locked="false">true</parameter-->
- <!--parameter name="bind-address" locked="false">hostname or IP address</parameter-->
- <!--parameter name="WSDLEPRPrefix" locked="false">https://apachehost:port/somepath</parameter-->
- <!--parameter name="httpGetProcessor" locked="false">org.wso2.carbon.transport.nhttp.api.NHttpGetProcessor</parameter-->
- <!--/transportReceiver-->
-
- <!-- the non blocking https transport based on HttpCore + SSL-NIO extensions -->
- <!--transportReceiver name="https" class="org.apache.synapse.transport.nhttp.HttpCoreNIOSSLListener">
- <parameter name="port" locked="false">8243</parameter>
- <parameter name="non-blocking" locked="false">true</parameter-->
- <!--parameter name="bind-address" locked="false">hostname or IP address</parameter-->
- <!--parameter name="WSDLEPRPrefix" locked="false">https://apachehost:port/somepath</parameter-->
- <!--parameter name="httpGetProcessor" locked="false">org.wso2.carbon.transport.nhttp.api.NHttpGetProcessor</parameter-->
- <!--parameter name="keystore" locked="false">
- <KeyStore>
- <Location>repository/resources/security/wso2carbon.jks</Location>
- <Type>JKS</Type>
- <Password>wso2carbon</Password>
- <KeyPassword>wso2carbon</KeyPassword>
- </KeyStore>
- </parameter>
- <parameter name="truststore" locked="false">
- <TrustStore>
- <Location>repository/resources/security/client-truststore.jks</Location>
- <Type>JKS</Type>
- <Password>wso2carbon</Password>
- </TrustStore>
- </parameter-->
- <!--<parameter name="SSLVerifyClient">require</parameter>
- supports optional|require or defaults to none -->
- <!--/transportReceiver-->
-
- <!-- ================================================= -->
- <!-- Transport Outs (Senders) -->
- <!-- ================================================= -->
- <!--Default trasnport will be passthrough if you need to change please add it here -->
- <transportSender name="http" class="org.wso2.carbon.transport.passthru.PassThroughHttpSender">
- <parameter name="non-blocking" locked="false">true</parameter>
- <parameter name="warnOnHTTP500" locked="false">*</parameter>
- <!--parameter name="http.proxyHost" locked="false">localhost</parameter>
- <parameter name="http.proxyPort" locked="false">3128</parameter>
- <parameter name="http.nonProxyHosts" locked="false">localhost|moon|sun</parameter-->
- </transportSender>
- <transportSender name="https" class="org.wso2.carbon.transport.passthru.PassThroughHttpSSLSender">
- <parameter name="non-blocking" locked="false">true</parameter>
- <parameter name="keystore" locked="false">
- <KeyStore>
- <Location>repository/resources/security/wso2carbon.jks</Location>
- <Type>JKS</Type>
- <Password>wso2carbon</Password>
- <KeyPassword>wso2carbon</KeyPassword>
- </KeyStore>
- </parameter>
- <parameter name="truststore" locked="false">
- <TrustStore>
- <Location>repository/resources/security/client-truststore.jks</Location>
- <Type>JKS</Type>
- <Password>wso2carbon</Password>
- </TrustStore>
- </parameter>
- <parameter name="HostnameVerifier">AllowAll</parameter>
- <!--supports Strict|AllowAll|DefaultAndLocalhost or the default if none specified -->
- </transportSender>
- <!-- Uncomment for non-blocking http transport based on HttpCore + NIO extensions -->
- <!--transportSender name="http" class="org.apache.synapse.transport.nhttp.HttpCoreNIOSender">
- <parameter name="non-blocking" locked="false">true</parameter>
- </transportSender>
- <transportSender name="https" class="org.apache.synapse.transport.nhttp.HttpCoreNIOSSLSender">
- <parameter name="non-blocking" locked="false">true</parameter>
- <parameter name="keystore" locked="false">
- <KeyStore>
- <Location>repository/resources/security/wso2carbon.jks</Location>
- <Type>JKS</Type>
- <Password>wso2carbon</Password>
- <KeyPassword>wso2carbon</KeyPassword>
- </KeyStore>
- </parameter>
- <parameter name="truststore" locked="false">
- <TrustStore>
- <Location>repository/resources/security/client-truststore.jks</Location>
- <Type>JKS</Type>
- <Password>wso2carbon</Password>
- </TrustStore>
- </parameter>
- <parameter name="HostnameVerifier">AllowAll</parameter-->
- <!--supports Strict|AllowAll|DefaultAndLocalhost or the default if none specified -->
- <!--/transportSender-->
-
- <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
-
- <!-- ================================================= -->
- <!-- Clustering -->
- <!-- ================================================= -->
- <!--
- To enable clustering for this node, set the value of "enable" attribute of the "clustering"
- element to "true". The initialization of a node in the cluster is handled by the class
- corresponding to the "class" attribute of the "clustering" element. It is also responsible for
- getting this node to join the cluster.
- -->
- <clustering class="org.apache.axis2.clustering.tribes.TribesClusteringAgent" enable="true">
-
- <!--
- This parameter indicates whether the cluster has to be automatically initalized
- when the AxisConfiguration is built. If set to "true" the initialization will not be
- done at that stage, and some other party will have to explictly initialize the cluster.
- -->
- <parameter name="AvoidInitiation">true</parameter>
-
- <!--
- The membership scheme used in this setup. The only values supported at the moment are
- "multicast" and "wka"
-
- 1. multicast - membership is automatically discovered using multicasting
- 2. wka - Well-Known Address based multicasting. Membership is discovered with the help
- of one or more nodes running at a Well-Known Address. New members joining a
- cluster will first connect to a well-known node, register with the well-known node
- and get the membership list from it. When new members join, one of the well-known
- nodes will notify the others in the group. When a member leaves the cluster or
- is deemed to have left the cluster, it will be detected by the Group Membership
- Service (GMS) using a TCP ping mechanism.
- -->
- <parameter name="membershipScheme">wka</parameter>
-
- <!--
- The clustering domain/group. Nodes in the same group will belong to the same multicast
- domain. There will not be interference between nodes in different groups.
- -->
- <parameter name="domain">wso2.carbon.lb.domain</parameter>
-
- <!--
- When a Web service request is received, and processed, before the response is sent to the
- client, should we update the states of all members in the cluster? If the value of
- this parameter is set to "true", the response to the client will be sent only after
- all the members have been updated. Obviously, this can be time consuming. In some cases,
- such this overhead may not be acceptable, in which case the value of this parameter
- should be set to "false"
- -->
- <parameter name="synchronizeAll">false</parameter>
-
- <!--
- The maximum number of times we need to retry to send a message to a particular node
- before giving up and considering that node to be faulty
- -->
- <parameter name="maxRetries">10</parameter>
-
- <!-- The multicast address to be used -->
- <parameter name="mcastAddress">228.0.0.4</parameter>
-
- <!-- The multicast port to be used -->
- <parameter name="mcastPort">45564</parameter>
-
- <!-- The frequency of sending membership multicast messages (in ms) -->
- <parameter name="mcastFrequency">500</parameter>
-
- <!-- The time interval within which if a member does not respond, the member will be
- deemed to have left the group (in ms)
- -->
- <parameter name="memberDropTime">3000</parameter>
-
- <!--
- The IP address of the network interface to which the multicasting has to be bound to.
- Multicasting would be done using this interface.
- -->
- <parameter name="mcastBindAddress">127.0.0.1</parameter>
-
- <!-- The host name or IP address of this member -->
-
- <!--parameter name="localMemberHost">127.0.0.1</parameter-->
-
-
- <!--
- The TCP port used by this member. This is the port through which other nodes will
- contact this member
- -->
- <parameter name="localMemberPort">4000</parameter>
-
- <!--
- Preserve message ordering. This will be done according to sender order.
- -->
- <parameter name="preserveMessageOrder">false</parameter>
-
- <!--
- Maintain atmost-once message processing semantics
- -->
- <parameter name="atmostOnceMessageSemantics">false</parameter>
-
- <!--
- This interface is responsible for handling state replication. The property changes in
- the Axis2 context hierarchy in this node, are propagated to all other nodes in the cluster.
-
- The "excludes" patterns can be used to specify the prefixes (e.g. local_*) or
- suffixes (e.g. *_local) of the properties to be excluded from replication. The pattern
- "*" indicates that all properties in a particular context should not be replicated.
-
- The "enable" attribute indicates whether context replication has been enabled
- -->
- <stateManager class="org.apache.axis2.clustering.state.DefaultStateManager"
- enable="false">
- <replication>
- <defaults>
- <exclude name="local_*"/>
- <exclude name="LOCAL_*"/>
- </defaults>
- <context class="org.apache.axis2.context.ConfigurationContext">
- <exclude name="local_*"/>
- <exclude name="UseAsyncOperations"/>
- <exclude name="SequencePropertyBeanMap"/>
- </context>
- <context class="org.apache.axis2.context.ServiceGroupContext">
- <exclude name="local_*"/>
- <exclude name="my.sandesha.*"/>
- </context>
- <context class="org.apache.axis2.context.ServiceContext">
- <exclude name="local_*"/>
- <exclude name="my.sandesha.*"/>
- </context>
- </replication>
- </stateManager>
- </clustering>
-
- <!-- ================================================= -->
- <!-- Phases -->
- <!-- ================================================= -->
-
- <phaseOrder type="InFlow">
- <!-- System pre defined phases -->
- <phase name="Transport"/>
- <phase name="Addressing"/>
- <phase name="Security"/>
- <phase name="PreDispatch"/>
- <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase"/>
- <!-- System pre defined phases -->
- <phase name="RMPhase"/>
- <phase name="OpPhase"/>
- </phaseOrder>
-
- <phaseOrder type="OutFlow">
- <!-- Handlers related to unified-endpoint component are added to the UEPPhase -->
- <phase name="UEPPhase" />
- <!-- user can add his own phases to this area -->
- <phase name="RMPhase"/>
- <phase name="MUPhase"/>
- <phase name="OpPhase"/>
- <phase name="OperationOutPhase"/>
- <!--system predefined phase-->
- <!--these phase will run irrespective of the service-->
- <phase name="PolicyDetermination"/>
- <phase name="MessageOut"/>
- <phase name="Security"/>
- </phaseOrder>
-
- <phaseOrder type="InFaultFlow">
- <phase name="Transport"/>
- <phase name="Addressing"/>
- <phase name="Security"/>
- <phase name="PreDispatch"/>
- <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase"/>
- <!-- user can add his own phases to this area -->
- <phase name="RMPhase"/>
- <phase name="OpPhase"/>
- <phase name="MUPhase"/>
- <phase name="OperationInFaultPhase"/>
- </phaseOrder>
-
- <phaseOrder type="OutFaultFlow">
- <!-- Handlers related to unified-endpoint component are added to the UEPPhase -->
- <phase name="UEPPhase" />
- <!-- user can add his own phases to this area -->
- <phase name="RMPhase"/>
- <!-- Must Understand Header processing phase -->
- <phase name="MUPhase"/>
- <phase name="OperationOutFaultPhase"/>
- <phase name="PolicyDetermination"/>
- <phase name="MessageOut"/>
- <phase name="Security"/>
- </phaseOrder>
-
-</axisconfig>
+<?xml version='1.0'?>
+<!--
+ 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.
+-->
+
+<axisconfig name="AxisJava2.0">
+
+ <!-- ================================================= -->
+ <!-- Globally engaged modules -->
+ <!-- ================================================= -->
+ <module ref="addressing"/>
+
+ <!-- ================================================= -->
+ <!-- Parameters -->
+ <!-- ================================================= -->
+ <parameter name="hotdeployment">${hotdeployment}</parameter>
+ <parameter name="hotupdate">${hotupdate}</parameter>
+ <parameter name="enableMTOM" locked="false">optional</parameter>
+ <parameter name="cacheAttachments">true</parameter>
+ <parameter name="attachmentDIR">work/mtom</parameter>
+ <parameter name="sizeThreshold">4000</parameter>
+
+ <parameter name="EnableChildFirstClassLoading">${childfirstCL}</parameter>
+
+ <!--
+ The exposeServiceMetadata parameter decides whether the metadata (WSDL, schema, policy) of
+ the services deployed on Axis2 should be visible when ?wsdl, ?wsdl2, ?xsd, ?policy requests
+ are received.
+ This parameter can be defined in the axi2.xml file, in which case this will be applicable
+ globally, or in the services.xml files, in which case, it will be applicable to the
+ Service groups and/or services, depending on the level at which the parameter is declared.
+ This value of this parameter defaults to true.
+ -->
+ <parameter name="exposeServiceMetadata">true</parameter>
+
+ <!--
+ Defines how the persistence of WS-ReliableMessaging is handled
+
+ Possible value are: inmemory & persistent
+ -->
+ <!-- Following parameter will completely disable REST handling in both the servlets-->
+ <parameter name="disableREST" locked="false">false</parameter>
+
+ <parameter name="Sandesha2StorageManager">inmemory</parameter>
+
+ <!-- This deployment interceptor will be called whenever before a module is initialized or
+ service is deployed -->
+ <listener class="org.wso2.carbon.core.deployment.DeploymentInterceptor"/>
+
+ <!-- setting servicePath. contextRoot is defined in the carbon.xml file -->
+ <!-- modification of this variable should be accompanied by the change in 'ServerURL' in carbon.xml file -->
+ <parameter name="servicePath">services</parameter>
+
+ <!--the directory in which .aar services are deployed inside axis2 repository-->
+ <parameter name="ServicesDirectory">axis2services</parameter>
+
+ <!--the directory in which modules are deployed inside axis2 repository-->
+ <parameter name="ModulesDirectory">axis2modules</parameter>
+
+ <parameter name="userAgent" locked="true">
+ Apache Stratos Cloud Controller-4.0.0-SNAPSHOT
+ </parameter>
+ <parameter name="server" locked="true">
+ Apache Stratos Cloud Controller-4.0.0-SNAPSHOT
+ </parameter>
+
+ <!-- ========================================================================-->
+
+ <!--During a fault, stacktrace can be sent with the fault message. The following flag will control -->
+ <!--that behaviour.-->
+ <parameter name="sendStacktraceDetailsWithFaults">false</parameter>
+
+ <!--If there aren't any information available to find out the fault reason, we set the message of the expcetion-->
+ <!--as the faultreason/Reason. But when a fault is thrown from a service or some where, it will be -->
+ <!--wrapped by different levels. Due to this the initial exception message can be lost. If this flag-->
+ <!--is set then, Axis2 tries to get the first exception and set its message as the faultreason/Reason.-->
+ <parameter name="DrillDownToRootCauseForFaultReason">false</parameter>
+
+ <!--Set the flag to true if you want to enable transport level session mangment-->
+ <parameter name="manageTransportSession">true</parameter>
+
+ <!-- Synapse Configuration file -->
+ <parameter name="SynapseConfig.ConfigurationFile" locked="false">./repository/deployment/server/synapse-configs</parameter>
+
+ <!-- Synapse Home parameter -->
+ <parameter name="SynapseConfig.HomeDirectory" locked="false">.</parameter>
+
+ <!-- Resolve root used to resolve synapse references like schemas inside a WSDL -->
+ <parameter name="SynapseConfig.ResolveRoot" locked="false">.</parameter>
+
+ <!-- Synapse Server name parameter -->
+ <parameter name="SynapseConfig.ServerName" locked="false">WSO2 Carbon Server</parameter>
+
+ <!--By default, JAXWS services are created by reading annotations. WSDL and schema are generated-->
+ <!--using a separate WSDL generator only when ?wsdl is called. Therefore, even if you engage-->
+ <!--policies etc.. to AxisService, it doesn't appear in the WSDL. By setting the following property-->
+ <!--to true, you can create the AxisService using the generated WSDL and remove the need for a-->
+ <!--WSDL generator. When ?wsdl is called, WSDL is generated in the normal way.-->
+ <parameter name="useGeneratedWSDLinJAXWS">${jaxwsparam}</parameter>
+
+ <!-- Deployer for the dataservice. -->
+ <!--<deployer extension="dbs" directory="dataservices" class="org.wso2.dataservices.DBDeployer"/>-->
+
+ <!-- Axis1 deployer for Axis2-->
+ <!--<deployer extension="wsdd" class="org.wso2.carbon.axis1services.Axis1Deployer" directory="axis1services"/>-->
+
+ <!-- POJO service deployer for Jar -->
+ <!--<deployer extension="jar" class="org.apache.axis2.deployment.POJODeployer" directory="pojoservices"/>-->
+
+ <!-- POJO service deployer for Class -->
+ <!--<deployer extension="class" class="org.apache.axis2.deployment.POJODeployer" directory="pojoservices"/>-->
+
+ <!-- JAXWS service deployer -->
+ <!--<deployer extension=".jar" class="org.apache.axis2.jaxws.framework.JAXWSDeployer" directory="servicejars"/>-->
+ <!-- ================================================= -->
+ <!-- Message Receivers -->
+ <!-- ================================================= -->
+ <!--This is the Default Message Receiver for the system , if you want to have MessageReceivers for -->
+ <!--all the other MEP implement it and add the correct entry to here , so that you can refer from-->
+ <!--any operation -->
+ <!--Note : You can ovride this for particular service by adding the same element with your requirement-->
+
+ <messageReceivers>
+ <messageReceiver mep="http://www.w3.org/ns/wsdl/in-only"
+ class="org.apache.axis2.rpc.receivers.RPCInOnlyMessageReceiver"/>
+ <messageReceiver mep="http://www.w3.org/ns/wsdl/robust-in-only"
+ class="org.apache.axis2.rpc.receivers.RPCInOnlyMessageReceiver"/>
+ <messageReceiver mep="http://www.w3.org/ns/wsdl/in-out"
+ class="org.apache.axis2.rpc.receivers.RPCMessageReceiver"/>
+ </messageReceivers>
+
+ <messageFormatters>
+ <messageFormatter contentType="application/x-www-form-urlencoded"
+ class="org.apache.axis2.transport.http.XFormURLEncodedFormatter"/>
+ <messageFormatter contentType="multipart/form-data"
+ class="org.apache.axis2.transport.http.MultipartFormDataFormatter"/>
+ <messageFormatter contentType="application/xml"
+ class="org.apache.axis2.transport.http.ApplicationXMLFormatter"/>
+ <messageFormatter contentType="text/xml"
+ class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
+ <messageFormatter contentType="application/soap+xml"
+ class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
+
+ <!--JSON Message Formatters-->
+ <messageFormatter contentType="application/json"
+ class="org.apache.axis2.json.JSONMessageFormatter"/>
+ <messageFormatter contentType="application/json/badgerfish"
+ class="org.apache.axis2.json.JSONBadgerfishMessageFormatter"/>
+ <messageFormatter contentType="text/javascript"
+ class="org.apache.axis2.json.JSONMessageFormatter"/>
+
+ <!--messageFormatter contentType="application/x-www-form-urlencoded"
+ class="org.wso2.carbon.relay.ExpandingMessageFormatter"/-->
+ <!--messageFormatter contentType="multipart/form-data"
+ class="org.wso2.carbon.relay.ExpandingMessageFormatter"/-->
+ <!--messageFormatter contentType="application/xml"
+ class="org.wso2.carbon.relay.ExpandingMessageFormatter"/-->
+ <!--messageFormatter contentType="text/html"
+ class="org.wso2.carbon.relay.ExpandingMessageFormatter"/-->
+ <!--messageFormatter contentType="application/soap+xml"
+ class="org.wso2.carbon.relay.ExpandingMessageFormatter"/-->
+ <!--messageFormatter contentType="x-application/hessian"
+ class="org.apache.synapse.format.hessian.HessianMessageFormatter"/-->
+ <!--<messageFormatter contentType="">
+ class="org.apache.synapse.format.hessian.HessianMessageFormatter"/-->
+ </messageFormatters>
+
+ <messageBuilders>
+ <messageBuilder contentType="application/xml"
+ class="org.apache.axis2.builder.ApplicationXMLBuilder"/>
+ <messageBuilder contentType="application/x-www-form-urlencoded"
+ class="org.apache.axis2.builder.XFormURLEncodedBuilder"/>
+ <messageBuilder contentType="multipart/form-data"
+ class="org.apache.axis2.builder.MultipartFormDataBuilder"/>
+
+ <!--JSON Message Builders-->
+ <messageBuilder contentType="application/json"
+ class="org.apache.axis2.json.JSONOMBuilder"/>
+ <messageBuilder contentType="application/json/badgerfish"
+ class="org.apache.axis2.json.JSONBadgerfishOMBuilder"/>
+ <messageBuilder contentType="text/javascript"
+ class="org.apache.axis2.json.JSONOMBuilder"/>
+
+ <!--messageBuilder contentType="application/xml"
+ class="org.wso2.carbon.relay.BinaryRelayBuilder"/-->
+ <!--messageBuilder contentType="application/x-www-form-urlencoded"
+ class="org.wso2.carbon.relay.BinaryRelayBuilder"/-->
+ <!--messageBuilder contentType="multipart/form-data"
+ class="org.wso2.carbon.relay.BinaryRelayBuilder"/-->
+ <!--messageBuilder contentType="multipart/related"
+ class="org.wso2.carbon.relay.BinaryRelayBuilder"/-->
+ <!--messageBuilder contentType="application/soap+xml"
+ class="org.wso2.carbon.relay.BinaryRelayBuilder"/-->
+ <!--messageBuilder contentType="text/plain"
+ class="org.wso2.carbon.relay.BinaryRelayBuilder"/-->
+ <!--messageBuilder contentType="text/xml"
+ class="org.wso2.carbon.relay.BinaryRelayBuilder"/-->
+ <!--messageFormatter contentType="text/plain"
+ class="org.apache.axis2.format.PlainTextBuilder"/-->
+ <!--messageBuilder contentType="x-application/hessian"
+ class="org.apache.synapse.format.hessian.HessianMessageBuilder"/-->
+ </messageBuilders>
+
+
+ <!-- ================================================= -->
+ <!-- In Transports -->
+ <!-- ================================================= -->
+ <transportReceiver name="http"
+ class="org.wso2.carbon.core.transports.http.HttpTransportListener">
+ <!--
+ Uncomment the following if you are deploying this within an application server. You
+ need to specify the HTTP port of the application server
+ -->
+ <parameter name="port">9763</parameter>
+
+ <!--
+ Uncomment the following to enable any proxy like Apache2 mod_proxy or any load balancer. The port on the proxy server like Apache is 80
+ in this case.
+ -->
+ <!--<parameter name="proxyPort">80</parameter>-->
+ </transportReceiver>
+
+ <!--Please uncomment this in Multiple Instance Scenario if you want to use NIO Transport Recievers and
+ Remove the current transport REceivers in axis2.xml -->
+ <!--transportReceiver name="http" class="org.apache.synapse.transport.nhttp.HttpCoreNIOListener">
+ <parameter name="port" locked="false">8280</parameter>
+ <parameter name="non-blocking" locked="false">true</parameter>
+ </transportReceiver>
+
+ <transportReceiver name="https" class="org.apache.synapse.transport.nhttp.HttpCoreNIOSSLListener">
+ <parameter name="port" locked="false">8243</parameter>
+ <parameter name="non-blocking" locked="false">true</parameter>
+ <parameter name="keystore" locked="false">
+ <KeyStore>
+ <Location>repository/resources/security/wso2carbon.jks</Location>
+ <Type>JKS</Type>
+ <Password>wso2carbon</Password>
+ <KeyPassword>wso2carbon</KeyPassword>
+ </KeyStore>
+ </parameter>
+ <parameter name="truststore" locked="false">
+ <TrustStore>
+ <Location>repository/resources/security/client-truststore.jks</Location>
+ <Type>JKS</Type>
+ <Password>wso2carbon</Password>
+ </TrustStore>
+ </parameter>
+ </transportReceiver-->
+
+
+ <transportReceiver name="https"
+ class="org.wso2.carbon.core.transports.http.HttpsTransportListener">
+ <!--
+ Uncomment the following if you are deploying this within an application server. You
+ need to specify the HTTPS port of the application server
+ -->
+ <parameter name="port">9443</parameter>
+
+ <!--
+ Uncomment the following to enable any proxy like Apache2 mod_proxy or any load balancer. The port on a proxy server like Apache is 443
+ in this case.
+ -->
+ <!--<parameter name="proxyPort">443</parameter>-->
+ </transportReceiver>
+
+ <!--
+ Uncomment the following segment to enable TCP transport.
+ Note : Addressing module should be engaged for TCP transport to work
+ -->
+ <!--<transportReceiver name="tcp"
+ class="org.apache.axis2.transport.tcp.TCPServer">
+ <parameter name="port">6667</parameter>
+ </transportReceiver>-->
+
+ <!--
+ To Enable Mail Transport Listener, please uncomment the following.
+ -->
+ <!--<transportReceiver name="mailto" class="org.apache.axis2.transport.mail.MailTransportListener">
+
+ </transportReceiver>-->
+
+
+ <!--
+ Uncomment this and configure as appropriate for JMS transport support,
+ after setting up your JMS environment (e.g. ActiveMQ)
+ -->
+ <!--<transportReceiver name="jms" class="org.apache.axis2.transport.jms.JMSListener">
+ <parameter name="myTopicConnectionFactory">
+ <parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+ <parameter name="java.naming.provider.url">tcp://localhost:61616</parameter>
+ <parameter name="transport.jms.ConnectionFactoryJNDIName">TopicConnectionFactory</parameter>
+ </parameter>
+
+ <parameter name="myQueueConnectionFactory">
+ <parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+ <parameter name="java.naming.provider.url">tcp://localhost:61616</parameter>
+ <parameter name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter>
+ </parameter>
+
+ <parameter name="default">
+ <parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+ <parameter name="java.naming.provider.url">tcp://localhost:61616</parameter>
+ <parameter name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter>
+ </parameter>
+ </transportReceiver>-->
+
+ <!--Uncomment this and configure as appropriate for JMS transport support with Apache Qpid -->
+ <!--transportReceiver name="jms" class="org.apache.axis2.transport.jms.JMSListener">
+ <parameter name="myTopicConnectionFactory" locked="false">
+ <parameter name="java.naming.factory.initial" locked="false">org.apache.qpid.jndi.PropertiesFileInitialContextFactory</parameter>
+ <parameter name="java.naming.provider.url" locked="false">repository/conf/jndi.properties</parameter>
+ <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">TopicConnectionFactory</parameter>
+ <parameter name="transport.jms.ConnectionFactoryType" locked="false">topic</parameter>
+ </parameter>
+
+ <parameter name="myQueueConnectionFactory" locked="false">
+ <parameter name="java.naming.factory.initial" locked="false">org.apache.qpid.jndi.PropertiesFileInitialContextFactory</parameter>
+ <parameter name="java.naming.provider.url" locked="false">repository/conf/jndi.properties</parameter>
+ <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">QueueConnectionFactory</parameter>
+ <parameter name="transport.jms.ConnectionFactoryType" locked="false">queue</parameter>
+ </parameter>
+
+ <parameter name="default" locked="false">
+ <parameter name="java.naming.factory.initial" locked="false">org.apache.qpid.jndi.PropertiesFileInitialContextFactory</parameter>
+ <parameter name="java.naming.provider.url" locked="false">repository/conf/jndi.properties</parameter>
+ <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">QueueConnectionFactory</parameter>
+ <parameter name="transport.jms.ConnectionFactoryType" locked="false">queue</parameter>
+ </parameter>
+ </transportReceiver-->
+
+ <!--Uncomment this and configure as appropriate for JMS transport support with WSO2 MB 2.x.x -->
+ <!--transportReceiver name="jms" class="org.apache.axis2.transport.jms.JMSListener">
+ <parameter name="myTopicConnectionFactory" locked="false">
+ <parameter name="java.naming.factory.initial" locked="false">org.wso2.andes.jndi.PropertiesFileInitialContextFactory</parameter>
+ <parameter name="java.naming.provider.url" locked="false">repository/conf/jndi.properties</parameter>
+ <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">TopicConnectionFactory</parameter>
+ <parameter name="transport.jms.ConnectionFactoryType" locked="false">topic</parameter>
+ </parameter>
+
+ <parameter name="myQueueConnectionFactory" locked="false">
+ <parameter name="java.naming.factory.initial" locked="false">org.wso2.andes.jndi.PropertiesFileInitialContextFactory</parameter>
+ <parameter name="java.naming.provider.url" locked="false">repository/conf/jndi.properties</parameter>
+ <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">QueueConnectionFactory</parameter>
+ <parameter name="transport.jms.ConnectionFactoryType" locked="false">queue</parameter>
+ </parameter>
+
+ <parameter name="default" locked="false">
+ <parameter name="java.naming.factory.initial" locked="false">org.wso2.andes.jndi.PropertiesFileInitialContextFactory</parameter>
+ <parameter name="java.naming.provider.url" locked="false">repository/conf/jndi.properties</parameter>
+ <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">QueueConnectionFactory</parameter>
+ <parameter name="transport.jms.ConnectionFactoryType" locked="false">queue</parameter>
+ </parameter>
+ </transportReceiver-->
+
+
+ <!-- ================================================= -->
+ <!-- Out Transports -->
+ <!-- ================================================= -->
+
+ <transportSender name="tcp"
+ class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
+ <transportReceiver name="local"
+ class="org.wso2.carbon.core.transports.local.CarbonLocalTransportReceiver"/>
+ <transportSender name="local"
+ class="org.wso2.carbon.core.transports.local.CarbonLocalTransportSender"/>
+ <!--<transportSender name="jms"
+ class="org.apache.axis2.transport.jms.JMSSender"/>-->
+ <transportSender name="http"
+ class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+ <parameter name="PROTOCOL">HTTP/1.1</parameter>
+ <parameter name="Transfer-Encoding">chunked</parameter>
+ <!-- This parameter has been added to overcome problems encounted in SOAP action parameter -->
+ <parameter name="OmitSOAP12Action">true</parameter>
+ </transportSender>
+ <transportSender name="https"
+ class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+ <parameter name="PROTOCOL">HTTP/1.1</parameter>
+ <parameter name="Transfer-Encoding">chunked</parameter>
+ <!-- This parameter has been added to overcome problems encounted in SOAP action parameter -->
+ <parameter name="OmitSOAP12Action">true</parameter>
+ </transportSender>
+
+ <!-- To enable mail transport sender, ncomment the following and change the parameters
+ accordingly-->
+ <!--<transportSender name="mailto"
+ class="org.apache.axis2.transport.mail.MailTransportSender">
+ <parameter name="mail.smtp.from">wso2demomail@gmail.com</parameter>
+ <parameter name="mail.smtp.user">wso2demomail</parameter>
+ <parameter name="mail.smtp.password">mailpassword</parameter>
+ <parameter name="mail.smtp.host">smtp.gmail.com</parameter>
+
+ <parameter name="mail.smtp.port">587</parameter>
+ <parameter name="mail.smtp.starttls.enable">true</parameter>
+ <parameter name="mail.smtp.auth">true</parameter>
+ </transportSender>-->
+
+ <!--Please uncomment this in Multiple Instance Scenario if you want to use NIO sender -->
+ <!--
+ <transportSender name="http" class="org.apache.synapse.transport.nhttp.HttpCoreNIOSender">
+ <parameter name="non-blocking" locked="false">true</parameter>
+ </transportSender>
+ <transportSender name="https" class="org.apache.synapse.transport.nhttp.HttpCoreNIOSSLSender">
+ <parameter name="non-blocking" locked="false">true</parameter>
+ <parameter name="keystore" locked="false">
+ <KeyStore>
+ <Location>repository/resources/security/wso2carbon.jks</Location>
+ <Type>JKS</Type>
+ <Password>wso2carbon</Password>
+ <KeyPassword>wso2carbon</KeyPassword>
+ </KeyStore>
+ </parameter>
+ <parameter name="truststore" locked="false">
+ <TrustStore>
+ <Location>repository/resources/security/client-truststore.jks</Location>
+ <Type>JKS</Type>
+ <Password>wso2carbon</Password>
+ </TrustStore>
+ </parameter>
+ </transportSender>
+ -->
+
+
+ <!-- ================================================= -->
+ <!-- Phases -->
+ <!-- ================================================= -->
+ <phaseOrder type="InFlow">
+ <!-- System pre defined phases -->
+ <!--
+ The MsgInObservation phase is used to observe messages as soon as they are
+ received. In this phase, we could do some things such as SOAP message tracing & keeping
+ track of the time at which a particular message was received
+
+ NOTE: This should be the very first phase in this flow
+ -->
+ <phase name="MsgInObservation"/>
+
+ <phase name="Validation"/>
+ <phase name="Transport">
+ <handler name="RequestURIBasedDispatcher"
+ class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
+ <order phase="Transport"/>
+ </handler>
+ <handler name="SOAPActionBasedDispatcher"
+ class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
+ <order phase="Transport"/>
+ </handler>
+ </phase>
+ <phase name="Addressing">
+ <handler name="AddressingBasedDispatcher"
+ class="org.wso2.carbon.core.multitenancy.MultitenantAddressingBasedDispatcher">
+ <order phase="Addressing"/>
+ </handler>
+ </phase>
+ <phase name="Ghost">
+ <handler name="GhostDispatcher"
+ class="org.wso2.carbon.core.dispatchers.GhostDispatcher"/>
+ </phase>
+ <phase name="Security"/>
+ <phase name="PreDispatch"/>
+ <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+ <handler name="RequestURIBasedDispatcher"
+ class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
+ <handler name="SOAPActionBasedDispatcher"
+ class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
+ <handler name="RequestURIOperationDispatcher"
+ class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
+ <handler name="SOAPMessageBodyBasedDispatcher"
+ class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
+
+ <handler name="HTTPLocationBasedDispatcher"
+ class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
+ </phase>
+ <!-- System pre defined phases -->
+ <phase name="RMPhase"/>
+ <phase name="OpPhase"/>
+ <!-- After Postdispatch phase module author or or service author can add any phase he want -->
+ <phase name="OperationInPhase"/>
+ </phaseOrder>
+ <phaseOrder type="OutFlow">
+ <!-- Handlers related to unified-endpoint component are added to the UEPPhase -->
+ <phase name="UEPPhase"/>
+ <phase name="RMPhase"/>
+ <phase name="OpPhase"/>
+ <!-- user can add his own phases to this area -->
+ <phase name="OperationOutPhase"/>
+ <!--system predefined phase-->
+ <!--these phase will run irrespective of the service-->
+ <phase name="PolicyDetermination"/>
+ <phase name="MessageOut"/>
+ <phase name="Security"/>
+
+ <!--
+ The MsgOutObservation phase is used to observe messages just before the
+ responses are sent out. In this phase, we could do some things such as SOAP message
+ tracing & keeping track of the time at which a particular response was sent.
+
+ NOTE: This should be the very last phase in this flow
+ -->
+ <phase name="MsgOutObservation"/>
+ <!--Following phase is added to publish stats -->
+ <phase name="StatReporting"/>
+ </phaseOrder>
+ <phaseOrder type="InFaultFlow">
+ <!-- System pre defined phases -->
+ <!--
+ The MsgInObservation phase is used to observe messages as soon as they are
+ received. In this phase, we could do some things such as SOAP message tracing & keeping
+ track of the time at which a particular message was received
+
+ NOTE: This should be the very first phase in this flow
+ -->
+ <phase name="MsgInObservation"/>
+
+ <phase name="Validation"/>
+ <phase name="Transport">
+ <handler name="RequestURIBasedDispatcher"
+ class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
+ <order phase="Transport"/>
+ </handler>
+ <handler name="SOAPActionBasedDispatcher"
+ class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
+ <order phase="Transport"/>
+ </handler>
+ </phase>
+
+ <phase name="Addressing">
+ <handler name="AddressingBasedDispatcher"
+ class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
+ <order phase="Addressing"/>
+ </handler>
+ </phase>
+ <phase name="Ghost">
+ <handler name="GhostDispatcher"
+ class="org.wso2.carbon.core.dispatchers.GhostDispatcher"/>
+ </phase>
+ <phase name="Security"/>
+ <phase name="PreDispatch"/>
+ <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+ <handler name="RequestURIBasedDispatcher"
+ class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
+ <handler name="SOAPActionBasedDispatcher"
+ class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
+ <handler name="RequestURIOperationDispatcher"
+ class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
+ <handler name="SOAPMessageBodyBasedDispatcher"
+ class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
+
+ <handler name="HTTPLocationBasedDispatcher"
+ class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
+ </phase>
+ <phase name="RMPhase"/>
+ <phase name="OpPhase"/>
+ <!-- user can add his own phases to this area -->
+ <phase name="OperationInFaultPhase"/>
+ </phaseOrder>
+ <phaseOrder type="OutFaultFlow">
+ <!-- Handlers related to unified-endpoint component are added to the UEPPhase -->
+ <phase name="UEPPhase"/>
+ <phase name="RMPhase"/>
+ <!-- user can add his own phases to this area -->
+ <phase name="OperationOutFaultPhase"/>
+ <phase name="PolicyDetermination"/>
+ <phase name="MessageOut"/>
+ <phase name="Security"/>
+ <!--
+ The MsgOutObservation phase is used to observe messages just before the
+ responses are sent out. In this phase, we could do some things such as SOAP message
+ tracing & keeping track of the time at which a particular response was sent.
+
+ NOTE: This should be the very last phase in this flow
+ -->
+ <phase name="MsgOutObservation"/>
+ <!--Following phase is added to publish stats -->
+ <phase name="StatReporting"/>
+ </phaseOrder>
+
+ <clustering class="org.wso2.carbon.core.clustering.hazelcast.HazelcastClusteringAgent"
+ enable="false">
+
+ <!--
+ This parameter indicates whether the cluster has to be automatically initalized
+ when the AxisConfiguration is built. If set to "true" the initialization will not be
+ done at that stage, and some other party will have to explictly initialize the cluster.
+ -->
+ <parameter name="AvoidInitiation">true</parameter>
+
+ <!--
+ The membership scheme used in this setup. The only values supported at the moment are
+ "multicast" and "wka"
+
+ 1. multicast - membership is automatically discovered using multicasting
+ 2. wka - Well-Known Address based multicasting. Membership is discovered with the help
+ of one or more nodes running at a Well-Known Address. New members joining a
+ cluster will first connect to a well-known node, register with the well-known node
+ and get the membership list from it. When new members join, one of the well-known
+ nodes will notify the others in the group. When a member leaves the cluster or
+ is deemed to have left the cluster, it will be detected by the Group Membership
+ Service (GMS) using a TCP ping mechanism.
+ -->
+ <parameter name="membershipScheme">multicast</parameter>
+ <!--<parameter name="licenseKey">xxx</parameter>-->
+ <!--<parameter name="mgtCenterURL">http://localhost:8081/mancenter/</parameter>-->
+
+ <!--
+ The clustering domain/group. Nodes in the same group will belong to the same multicast
+ domain. There will not be interference between nodes in different groups.
+ -->
+ <parameter name="domain">wso2.carbon.domain</parameter>
+
+ <!-- The multicast address to be used -->
+ <!--<parameter name="mcastAddress">228.0.0.4</parameter>-->
+
+ <!-- The multicast port to be used -->
+ <parameter name="mcastPort">45564</parameter>
+
+ <parameter name="mcastTTL">100</parameter>
+
+ <parameter name="mcastTimeout">60</parameter>
+
+ <!--
+ The IP address of the network interface to which the multicasting has to be bound to.
+ Multicasting would be done using this interface.
+ -->
+ <!--
+ <parameter name="mcastBindAddress">127.0.0.1</parameter>
+ -->
+ <!-- The host name or IP address of this member -->
+
+ <parameter name="localMemberHost">127.0.0.1</parameter>
+
+ <!--
+ The bind adress of this member. The difference between localMemberHost & localMemberBindAddress
+ is that localMemberHost is the one that is advertised by this member, while localMemberBindAddress
+ is the address to which this member is bound to.
+ -->
+ <!--
+ <parameter name="localMemberBindAddress">127.0.0.1</parameter>
+ -->
+
+ <!--
+ The TCP port used by this member. This is the port through which other nodes will
+ contact this member
+ -->
+ <parameter name="localMemberPort">4000</parameter>
+
+ <!--
+ The bind port of this member. The difference between localMemberPort & localMemberBindPort
+ is that localMemberPort is the one that is advertised by this member, while localMemberBindPort
+ is the port to which this member is bound to.
+ -->
+ <!--
+ <parameter name="localMemberBindPort">4001</parameter>
+ -->
+
+ <!--
+ Properties specific to this member
+ -->
+ <parameter name="properties">
+ <property name="backendServerURL" value="https://${hostName}:${httpsPort}/services/"/>
+ <property name="mgtConsoleURL" value="https://${hostName}:${httpsPort}/"/>
+ <property name="subDomain" value="worker"/>
+ </parameter>
+
+ <!--
+ The list of static or well-known members. These entries will only be valid if the
+ "membershipScheme" above is set to "wka"
+ -->
+ <members>
+ <member>
+ <hostName>127.0.0.1</hostName>
+ <port>4000</port>
+ </member>
+ </members>
+
+ <!--
+ Enable the groupManagement entry if you need to run this node as a cluster manager.
+ Multiple application domains with different GroupManagementAgent implementations
+ can be defined in this section.
+ -->
+ <groupManagement enable="false">
+ <applicationDomain name="wso2.as.domain"
+ description="AS group"
+ agent="org.wso2.carbon.core.clustering.hazelcast.HazelcastGroupManagementAgent"
+ subDomain="worker"
+ port="2222"/>
+ </groupManagement>
+ </clustering>
+</axisconfig>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/500eaf52/products/cloud-controller/modules/distribution/src/main/resources/launch.ini
----------------------------------------------------------------------
diff --git a/products/cloud-controller/modules/distribution/src/main/resources/launch.ini b/products/cloud-controller/modules/distribution/src/main/resources/launch.ini
index 8cf9c14..6102bd7 100644
--- a/products/cloud-controller/modules/distribution/src/main/resources/launch.ini
+++ b/products/cloud-controller/modules/distribution/src/main/resources/launch.ini
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
# Eclipse Runtime Configuration Overrides
# These properties are loaded prior to starting the framework and can also be used to override System Properties
# @null is a special value used to override and clear the framework's copy of a System Property prior to starting the framework
@@ -7,8 +26,8 @@ osgi.*=@null
org.osgi.*=@null
eclipse.*=@null
-osgi.parentClassloader=ext
-osgi.contextClassLoaderParent=ext
+osgi.parentClassloader=app
+osgi.contextClassLoaderParent=app
# When osgi.clean is set to "true", any cached data used by the OSGi framework
# will be wiped clean. This will clean the caches used to store bundle
@@ -246,4 +265,4 @@ javax.xml.soap,\
com.sun.xml.internal.messaging.saaj.soap.ver1_1,\
com.sun.xml.internal.messaging.saaj.soap,\
com.sun.tools.internal.ws.spi,\
-org.github.jamm
+org.wso2.carbon.bootstrap
[03/11] git commit: Fixing wrong import packages
Posted by sa...@apache.org.
Fixing wrong import packages
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/37c56e72
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/37c56e72
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/37c56e72
Branch: refs/heads/master
Commit: 37c56e722f0b466cfc716770656a18f439b8366b
Parents: a3ce7d1
Author: Sajith Kariyawasam <sa...@wso2.com>
Authored: Sat Jan 4 22:21:09 2014 +0530
Committer: Sajith Kariyawasam <sa...@wso2.com>
Committed: Sat Jan 4 22:21:09 2014 +0530
----------------------------------------------------------------------
.../apache/stratos/adc/mgt/retriever/DataRetrievalManager.java | 4 ++--
.../stratos/cloud/controller/util/CloudControllerUtil.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/37c56e72/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/retriever/DataRetrievalManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/retriever/DataRetrievalManager.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/retriever/DataRetrievalManager.java
index 27022c5..7faab1f 100644
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/retriever/DataRetrievalManager.java
+++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/retriever/DataRetrievalManager.java
@@ -26,8 +26,8 @@ import org.apache.stratos.adc.mgt.lookup.LookupDataHolder;
import org.apache.stratos.adc.mgt.lookup.SubscriptionAliasToCartridgeSubscriptionMap;
import org.apache.stratos.adc.mgt.persistence.PersistenceManager;
import org.apache.stratos.adc.mgt.subscription.CartridgeSubscription;
-import org.jgroups.logging.Log;
-import org.jgroups.logging.LogFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import java.util.ArrayList;
import java.util.Collection;
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/37c56e72/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
index dc708da..80b07f6 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
@@ -35,7 +35,7 @@ import org.apache.stratos.cloud.controller.runtime.FasterLookUpDataHolder;
import org.apache.stratos.messaging.domain.topology.Topology;
import org.wso2.carbon.registry.core.exceptions.RegistryException;
-import edu.emory.mathcs.backport.java.util.Arrays;
+import java.util.Arrays;
import java.util.ArrayList;
import java.util.Iterator;
[09/11] git commit: Upgrading 4.1.0 to 4.2.0
Posted by sa...@apache.org.
Upgrading 4.1.0 to 4.2.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/5b14b030
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/5b14b030
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/5b14b030
Branch: refs/heads/master
Commit: 5b14b0307dce697912587be2f38ea32ba5c3a861
Parents: 500eaf5
Author: Sajith Kariyawasam <sa...@wso2.com>
Authored: Mon Jan 6 18:15:23 2014 +0530
Committer: Sajith Kariyawasam <sa...@wso2.com>
Committed: Mon Jan 6 18:15:23 2014 +0530
----------------------------------------------------------------------
components/org.apache.stratos.autoscaler/pom.xml | 2 +-
components/org.apache.stratos.cartridge.agent/pom.xml | 4 ++--
components/org.apache.stratos.cartridge.mgt.ui/pom.xml | 2 +-
components/org.apache.stratos.cloud.controller/pom.xml | 6 +++---
components/org.apache.stratos.common/pom.xml | 4 ++--
components/org.apache.stratos.logging.view.ui/pom.xml | 4 ++--
components/org.apache.stratos.register.ui/pom.xml | 6 +++---
components/org.apache.stratos.rest.endpoint/pom.xml | 6 +++---
.../java/org/apache/stratos/rest/endpoint/ServiceHolder.java | 2 +-
.../apache/stratos/rest/endpoint/services/StratosAdmin.java | 4 ++--
components/org.apache.stratos.sso.redirector.ui/pom.xml | 4 ++--
components/org.apache.stratos.status.monitor.ui/pom.xml | 4 ++--
components/org.apache.stratos.tenant.activity/pom.xml | 2 +-
components/org.apache.stratos.tenant.mgt.email.sender/pom.xml | 2 +-
components/org.apache.stratos.theme.mgt/pom.xml | 2 +-
components/org.apache.stratos.throttling.manager/pom.xml | 2 +-
components/org.apache.stratos.usage.summary.helper/pom.xml | 2 +-
components/org.apache.stratos.usage/pom.xml | 2 +-
components/pom.xml | 1 -
.../org.apache.stratos.tenant.mgt.server.feature/pom.xml | 2 +-
products/autoscaler/modules/distribution/pom.xml | 4 ++--
products/cloud-controller/modules/distribution/pom.xml | 4 ++--
products/stratos-controller/modules/dashboard/pom.xml | 4 ++--
products/stratos-controller/modules/login/pom.xml | 2 +-
products/stratos-controller/modules/p2-profile-gen/pom.xml | 4 ++--
products/stratos-controller/modules/styles/pom.xml | 2 +-
26 files changed, 41 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5b14b030/components/org.apache.stratos.autoscaler/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/pom.xml b/components/org.apache.stratos.autoscaler/pom.xml
index c5faf9a..92798b0 100644
--- a/components/org.apache.stratos.autoscaler/pom.xml
+++ b/components/org.apache.stratos.autoscaler/pom.xml
@@ -156,7 +156,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.utils</artifactId>
- <version>4.1.0</version>
+ <version>4.2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5b14b030/components/org.apache.stratos.cartridge.agent/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/pom.xml b/components/org.apache.stratos.cartridge.agent/pom.xml
index ecd46a8..064fc94 100644
--- a/components/org.apache.stratos.cartridge.agent/pom.xml
+++ b/components/org.apache.stratos.cartridge.agent/pom.xml
@@ -87,12 +87,12 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.utils</artifactId>
- <version>4.1.0</version>
+ <version>4.2.0</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.databridge.agent.thrift</artifactId>
- <version>4.1.0</version>
+ <version>4.2.0</version>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5b14b030/components/org.apache.stratos.cartridge.mgt.ui/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.mgt.ui/pom.xml b/components/org.apache.stratos.cartridge.mgt.ui/pom.xml
index 60a6fa4..c2e83e5 100644
--- a/components/org.apache.stratos.cartridge.mgt.ui/pom.xml
+++ b/components/org.apache.stratos.cartridge.mgt.ui/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.ui</artifactId>
- <version>4.1.0</version>
+ <version>4.2.0</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5b14b030/components/org.apache.stratos.cloud.controller/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/pom.xml b/components/org.apache.stratos.cloud.controller/pom.xml
index 92bf1ca..a658d18 100644
--- a/components/org.apache.stratos.cloud.controller/pom.xml
+++ b/components/org.apache.stratos.cloud.controller/pom.xml
@@ -146,7 +146,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.analytics.hive.stub</artifactId>
- <version>4.1.0</version>
+ <version>4.2.0</version>
</dependency>
<!-- jclouds dependencies -->
@@ -260,12 +260,12 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.databridge.agent.thrift</artifactId>
- <version>4.1.0</version>
+ <version>4.2.0</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.ntask.core</artifactId>
- <version>4.1.0</version>
+ <version>4.2.0</version>
</dependency>
</dependencies>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5b14b030/components/org.apache.stratos.common/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/pom.xml b/components/org.apache.stratos.common/pom.xml
index 067489f..ba98340 100644
--- a/components/org.apache.stratos.common/pom.xml
+++ b/components/org.apache.stratos.common/pom.xml
@@ -85,7 +85,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.databridge.commons</artifactId>
- <version>4.1.0</version>
+ <version>4.2.0</version>
</dependency>
<dependency>
<groupId>commons-lang.wso2</groupId>
@@ -100,7 +100,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.databridge.agent.thrift</artifactId>
- <version>4.1.0</version>
+ <version>4.2.0</version>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5b14b030/components/org.apache.stratos.logging.view.ui/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.logging.view.ui/pom.xml b/components/org.apache.stratos.logging.view.ui/pom.xml
index 47b78d4..3834b63 100644
--- a/components/org.apache.stratos.logging.view.ui/pom.xml
+++ b/components/org.apache.stratos.logging.view.ui/pom.xml
@@ -63,12 +63,12 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.ui</artifactId>
- <version>4.1.0</version>
+ <version>4.2.0</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.logging.view.stub</artifactId>
- <version>4.1.0</version>
+ <version>4.2.0</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5b14b030/components/org.apache.stratos.register.ui/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.register.ui/pom.xml b/components/org.apache.stratos.register.ui/pom.xml
index 66d13cb..8ebdcd7 100644
--- a/components/org.apache.stratos.register.ui/pom.xml
+++ b/components/org.apache.stratos.register.ui/pom.xml
@@ -68,12 +68,12 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.registry.common.ui</artifactId>
- <version>4.1.0</version>
+ <version>4.2.0</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.registry.core</artifactId>
- <version>4.1.0</version>
+ <version>4.2.0</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
@@ -98,7 +98,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.ui</artifactId>
- <version>4.1.0</version>
+ <version>4.2.0</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5b14b030/components/org.apache.stratos.rest.endpoint/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/pom.xml b/components/org.apache.stratos.rest.endpoint/pom.xml
index 0effd27..7e0141f 100644
--- a/components/org.apache.stratos.rest.endpoint/pom.xml
+++ b/components/org.apache.stratos.rest.endpoint/pom.xml
@@ -67,19 +67,19 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.core</artifactId>
- <version>4.1.0</version>
+ <version>4.2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.utils</artifactId>
- <version>4.1.0</version>
+ <version>4.2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.identity.oauth.stub</artifactId>
- <version>4.1.0</version>
+ <version>4.2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5b14b030/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/ServiceHolder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/ServiceHolder.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/ServiceHolder.java
index 69e3aaa..ae88ee2 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/ServiceHolder.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/ServiceHolder.java
@@ -22,11 +22,11 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.common.TenantBillingService;
import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.core.multitenancy.persistence.TenantPersistor;
import org.wso2.carbon.registry.core.service.RegistryService;
import org.wso2.carbon.user.core.service.RealmService;
import org.wso2.carbon.user.core.tenant.TenantManager;
import org.wso2.carbon.utils.ConfigurationContextService;
+import org.apache.stratos.tenant.mgt.core.TenantPersistor;
/**
* Some of the admin services needs objects with states inside the runtime. There are
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5b14b030/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java
index 0cc4ca8..5fa0a10 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java
@@ -42,7 +42,6 @@ import org.apache.stratos.rest.endpoint.exception.RestAPIException;
import org.apache.stratos.tenant.mgt.util.TenantMgtUtil;
import org.wso2.carbon.context.PrivilegedCarbonContext;
import org.wso2.carbon.context.RegistryType;
-import org.wso2.carbon.core.multitenancy.persistence.TenantPersistor;
import org.wso2.carbon.registry.core.session.UserRegistry;
import org.wso2.carbon.user.api.UserRealm;
import org.wso2.carbon.user.api.UserStoreManager;
@@ -50,6 +49,7 @@ import org.wso2.carbon.user.core.UserStoreException;
import org.wso2.carbon.user.core.tenant.Tenant;
import org.wso2.carbon.user.core.tenant.TenantManager;
import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
+import org.apache.stratos.tenant.mgt.core.TenantPersistor;
import javax.ws.rs.*;
import java.util.ArrayList;
@@ -369,7 +369,7 @@ public class StratosAdmin extends AbstractAdmin {
TenantPersistor persistor = ServiceHolder.getTenantPersistor();
// not validating the domain ownership, since created by super tenant
int tenantId = persistor.persistTenant(tenant, false, tenantInfoBean.getSuccessKey(),
- tenantInfoBean.getOriginatedService());
+ tenantInfoBean.getOriginatedService(),false); //TODO verify whether this is the correct approach (isSkeleton)
tenantInfoBean.setTenantId(tenantId);
TenantMgtUtil.addClaimsToUserStoreManager(tenant);
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5b14b030/components/org.apache.stratos.sso.redirector.ui/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.sso.redirector.ui/pom.xml b/components/org.apache.stratos.sso.redirector.ui/pom.xml
index 425385b..2607c6b 100644
--- a/components/org.apache.stratos.sso.redirector.ui/pom.xml
+++ b/components/org.apache.stratos.sso.redirector.ui/pom.xml
@@ -66,12 +66,12 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.ui</artifactId>
- <version>4.1.0</version>
+ <version>4.2.0</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.identity.authenticator.saml2.sso.common</artifactId>
- <version>4.1.0</version>
+ <version>4.2.0</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5b14b030/components/org.apache.stratos.status.monitor.ui/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.status.monitor.ui/pom.xml b/components/org.apache.stratos.status.monitor.ui/pom.xml
index 496c0a0..fccaa8f 100644
--- a/components/org.apache.stratos.status.monitor.ui/pom.xml
+++ b/components/org.apache.stratos.status.monitor.ui/pom.xml
@@ -65,12 +65,12 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.ui</artifactId>
- <version>4.1.0</version>
+ <version>4.2.0</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.status.monitor.stub</artifactId>
- <version>4.1.0</version>
+ <version>4.2.0</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5b14b030/components/org.apache.stratos.tenant.activity/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.activity/pom.xml b/components/org.apache.stratos.tenant.activity/pom.xml
index 6ef26b0..8401460 100644
--- a/components/org.apache.stratos.tenant.activity/pom.xml
+++ b/components/org.apache.stratos.tenant.activity/pom.xml
@@ -133,7 +133,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.cluster.mgt.core</artifactId>
- <version>4.1.0</version>
+ <version>4.2.0</version>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5b14b030/components/org.apache.stratos.tenant.mgt.email.sender/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.tenant.mgt.email.sender/pom.xml b/components/org.apache.stratos.tenant.mgt.email.sender/pom.xml
index 63b9ba8..967a022 100644
--- a/components/org.apache.stratos.tenant.mgt.email.sender/pom.xml
+++ b/components/org.apache.stratos.tenant.mgt.email.sender/pom.xml
@@ -83,7 +83,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.email.verification</artifactId>
- <version>4.1.0</version>
+ <version>4.2.0</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5b14b030/components/org.apache.stratos.theme.mgt/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.theme.mgt/pom.xml b/components/org.apache.stratos.theme.mgt/pom.xml
index 4015172..ee3fd70 100644
--- a/components/org.apache.stratos.theme.mgt/pom.xml
+++ b/components/org.apache.stratos.theme.mgt/pom.xml
@@ -97,7 +97,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.registry.resource</artifactId>
- <version>4.1.0</version>
+ <version>4.2.0</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5b14b030/components/org.apache.stratos.throttling.manager/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.throttling.manager/pom.xml b/components/org.apache.stratos.throttling.manager/pom.xml
index f861f99..c83df9c 100644
--- a/components/org.apache.stratos.throttling.manager/pom.xml
+++ b/components/org.apache.stratos.throttling.manager/pom.xml
@@ -106,7 +106,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.utils</artifactId>
- <version>4.1.0</version>
+ <version>4.2.0</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5b14b030/components/org.apache.stratos.usage.summary.helper/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.usage.summary.helper/pom.xml b/components/org.apache.stratos.usage.summary.helper/pom.xml
index 7a04afd..e634728 100644
--- a/components/org.apache.stratos.usage.summary.helper/pom.xml
+++ b/components/org.apache.stratos.usage.summary.helper/pom.xml
@@ -116,7 +116,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.analytics.hive</artifactId>
- <version>4.1.0</version>
+ <version>4.2.0</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5b14b030/components/org.apache.stratos.usage/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.usage/pom.xml b/components/org.apache.stratos.usage/pom.xml
index 558f3c4..db5715e 100644
--- a/components/org.apache.stratos.usage/pom.xml
+++ b/components/org.apache.stratos.usage/pom.xml
@@ -140,7 +140,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.ndatasource.core</artifactId>
- <version>4.1.0</version>
+ <version>4.2.0</version>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5b14b030/components/pom.xml
----------------------------------------------------------------------
diff --git a/components/pom.xml b/components/pom.xml
index fd7d1a8..0868753 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -340,7 +340,6 @@
<opensaml2.wso2.version>2.4.1.wso2v1</opensaml2.wso2.version>
<openid4java.wso2.version>0.9.6.wso2v1</openid4java.wso2.version>
<httpcomponents-httpclient.wso2.version>4.1.1-wso2v1</httpcomponents-httpclient.wso2.version>
- <httpcomponents-httpcore.wso2.version>4.1.0-wso2v1</httpcomponents-httpcore.wso2.version>
<scxml.version>0.9.0.wso2v1</scxml.version>
<google.step2.wso2.version>1.0.wso2v1</google.step2.wso2.version>
<google.guice.wso2.version>3.0.wso2v1</google.guice.wso2.version>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5b14b030/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
index a3dade9..903e645 100644
--- 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
@@ -48,7 +48,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.email.verification</artifactId>
- <version>4.1.0</version>
+ <version>4.2.0</version>
</dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5b14b030/products/autoscaler/modules/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/products/autoscaler/modules/distribution/pom.xml b/products/autoscaler/modules/distribution/pom.xml
index af61a50..ffc59e7 100644
--- a/products/autoscaler/modules/distribution/pom.xml
+++ b/products/autoscaler/modules/distribution/pom.xml
@@ -66,12 +66,12 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.event.client</artifactId>
- <version>4.1.0</version>
+ <version>4.2.0</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.event.client.stub</artifactId>
- <version>4.1.0</version>
+ <version>4.2.0</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5b14b030/products/cloud-controller/modules/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/products/cloud-controller/modules/distribution/pom.xml b/products/cloud-controller/modules/distribution/pom.xml
index fdc88e0..7f12782 100644
--- a/products/cloud-controller/modules/distribution/pom.xml
+++ b/products/cloud-controller/modules/distribution/pom.xml
@@ -66,12 +66,12 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.event.client</artifactId>
- <version>4.1.0</version>
+ <version>4.2.0</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.event.client.stub</artifactId>
- <version>4.1.0</version>
+ <version>4.2.0</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5b14b030/products/stratos-controller/modules/dashboard/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos-controller/modules/dashboard/pom.xml b/products/stratos-controller/modules/dashboard/pom.xml
index 443295f..53f286f 100644
--- a/products/stratos-controller/modules/dashboard/pom.xml
+++ b/products/stratos-controller/modules/dashboard/pom.xml
@@ -136,8 +136,8 @@
<properties>
<eclipse.version>3.2.0</eclipse.version>
<!-- Component versions == Carbon version, if not, please change the properties below. -->
- <registry-component.version>4.1.0</registry-component.version>
- <governance-component.version>4.1.0</governance-component.version>
+ <registry-component.version>4.2.0</registry-component.version>
+ <governance-component.version>4.2.0</governance-component.version>
</properties>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5b14b030/products/stratos-controller/modules/login/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos-controller/modules/login/pom.xml b/products/stratos-controller/modules/login/pom.xml
index cc2c451..6ab3f62 100644
--- a/products/stratos-controller/modules/login/pom.xml
+++ b/products/stratos-controller/modules/login/pom.xml
@@ -126,6 +126,6 @@
<properties>
<eclipse.version>3.2.0</eclipse.version>
<!-- Component versions == Carbon version, if not, please change the properties below. -->
- <registry-component.version>4.1.0</registry-component.version>
+ <registry-component.version>4.2.0</registry-component.version>
</properties>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5b14b030/products/stratos-controller/modules/p2-profile-gen/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos-controller/modules/p2-profile-gen/pom.xml b/products/stratos-controller/modules/p2-profile-gen/pom.xml
index 14ddce2..1610333 100644
--- a/products/stratos-controller/modules/p2-profile-gen/pom.xml
+++ b/products/stratos-controller/modules/p2-profile-gen/pom.xml
@@ -60,7 +60,7 @@
</artifactItems>
</configuration>
</execution>
- <execution>
+ <!-- <execution>
<id>2-unpack-kernel-patch</id>
<phase>test</phase>
<goals>
@@ -78,7 +78,7 @@
</artifactItem>
</artifactItems>
</configuration>
- </execution>
+ </execution> -->
</executions>
</plugin>
<plugin>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5b14b030/products/stratos-controller/modules/styles/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos-controller/modules/styles/pom.xml b/products/stratos-controller/modules/styles/pom.xml
index 745e95c..366573b 100644
--- a/products/stratos-controller/modules/styles/pom.xml
+++ b/products/stratos-controller/modules/styles/pom.xml
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.ui</artifactId>
- <version>4.1.0</version>
+ <version>4.2.0</version>
</dependency>
<dependency>
[11/11] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by sa...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/cf6c8232
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/cf6c8232
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/cf6c8232
Branch: refs/heads/master
Commit: cf6c82320537b68fc6962165465a88d8bb4a57be
Parents: dd333f0 7a61fc0
Author: Sajith Kariyawasam <sa...@wso2.com>
Authored: Mon Jan 6 18:21:33 2014 +0530
Committer: Sajith Kariyawasam <sa...@wso2.com>
Committed: Mon Jan 6 18:21:33 2014 +0530
----------------------------------------------------------------------
.../adc/mgt/persistence/PersistenceManager.java | 7 +
.../RegistryBasedPersistenceManager.java | 137 +++++++++++++++++++
.../DataInsertionAndRetrievalManager.java | 16 +++
.../stratos/adc/mgt/utils/Serializer.java | 21 +++
.../configure_stratos.jag | 7 +
.../themes/theme1/pages/index.hbs | 1 +
.../themes/theme1/partials/cartridges.hbs | 4 +-
.../theme1/partials/configure_stratos.hbs | 101 ++++++++++++++
.../themes/theme1/partials/header.hbs | 27 +++-
.../themes/theme1/partials/mycartridges.hbs | 34 -----
.../themes/theme1/renderers/cartridges.js | 47 ++++++-
.../theme1/renderers/configure_stratos.js | 40 ++++++
.../themes/theme1/renderers/index.js | 59 ++++++--
.../theme1/renderers/subscribe_cartridge.js | 27 ++--
.../themes/theme1/ui/css/main.css | 43 +++++-
.../themes/theme1/ui/custom-fonts/style.css | 24 ++--
16 files changed, 507 insertions(+), 88 deletions(-)
----------------------------------------------------------------------
[08/11] git commit: Merging 4.2.0 changes from branch to master
Posted by sa...@apache.org.
Merging 4.2.0 changes from branch to master
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/2cf22762
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/2cf22762
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/2cf22762
Branch: refs/heads/master
Commit: 2cf22762e88fa9c0b6eb86d317298b3c78dc4331
Parents: df8e5cc 500eaf5
Author: Sajith Kariyawasam <sa...@wso2.com>
Authored: Mon Jan 6 16:27:48 2014 +0530
Committer: Sajith Kariyawasam <sa...@wso2.com>
Committed: Mon Jan 6 16:27:48 2014 +0530
----------------------------------------------------------------------
components/org.apache.stratos.adc.mgt/pom.xml | 2 +-
.../service/ServiceDeploymentManager.java | 218 +++-
.../manager/CartridgeSubscriptionManager.java | 2 +
.../org.apache.stratos.autoscaler/pom.xml | 2 +-
.../internal/CloudControllerDSComponent.java | 21 +-
.../TopologySynchronizerTaskScheduler.java | 7 +-
.../controller/registry/RegistryManager.java | 20 +-
.../topology/TopologySynchronizerTask.java | 6 +-
.../controller/util/CloudControllerUtil.java | 5 +-
.../common/util/StratosConfiguration.java | 1 -
.../rest/endpoint/services/ServiceUtils.java | 4 +-
.../rest/endpoint/services/StratosAdmin.java | 2 +-
.../org.apache.stratos.tenant.mgt.core/pom.xml | 5 +
.../tenant/mgt/core/DefaultTenantPersistor.java | 343 -----
.../tenant/mgt/core/TenantPersistor.java | 347 +++++
.../internal/TenantMgtCoreServiceComponent.java | 5 -
.../mgt/internal/TenantMgtServiceComponent.java | 35 +-
.../services/GAppTenantRegistrationService.java | 4 +-
.../mgt/services/TenantMgtAdminService.java | 90 +-
.../services/TenantSelfRegistrationService.java | 6 +-
.../stratos/tenant/mgt/util/TenantMgtUtil.java | 4 +
.../src/main/resources/META-INF/services.xml | 4 +
components/pom.xml | 8 +-
.../src/main/resources/p2.inf | 6 +-
.../src/main/resources/p2.inf | 14 +-
.../pom.xml | 4 +-
.../src/main/resources/p2.inf | 16 +-
.../pom.xml | 2 +-
features/manager/pom.xml | 2 +-
.../src/main/resources/p2.inf | 10 +-
features/pom.xml | 6 +-
pom.xml | 6 +-
.../distribution/src/main/assembly/bin.xml | 5 +-
.../distribution/src/main/license/LICENSE | 2 +-
products/autoscaler/modules/integration/pom.xml | 2 +-
products/autoscaler/modules/p2-profile/pom.xml | 20 +-
products/autoscaler/pom.xml | 10 +-
.../distribution/src/main/assembly/bin.xml | 2 +-
.../distribution/src/main/assembly/bin.xml | 11 +-
.../distribution/src/main/conf/axis2.xml | 1227 ++++++++++--------
.../distribution/src/main/license/LICENSE | 2 +-
.../distribution/src/main/resources/launch.ini | 25 +-
.../cloud-controller/modules/p2-profile/pom.xml | 17 +-
products/cloud-controller/pom.xml | 12 +-
.../load-balancer/modules/distribution/pom.xml | 16 +-
.../distribution/src/main/assembly/bin.xml | 14 +-
.../distribution/src/main/license/LICENSE | 2 +-
.../load-balancer/modules/p2-profile/pom.xml | 52 +-
products/load-balancer/pom.xml | 12 +-
.../ui/clients/CloudManagerServiceClient.java | 9 +-
.../modules/distribution/src/assembly/bin.xml | 4 +-
.../distribution/src/main/license/LICENSE | 2 +-
.../modules/features/service/pom.xml | 2 +-
.../modules/p2-profile-gen/pom.xml | 50 +-
.../stratos-controller/modules/styles/pom.xml | 2 +-
products/stratos-controller/pom.xml | 8 +-
56 files changed, 1596 insertions(+), 1119 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/2cf22762/components/org.apache.stratos.adc.mgt/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/2cf22762/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/manager/CartridgeSubscriptionManager.java
----------------------------------------------------------------------
diff --cc components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/manager/CartridgeSubscriptionManager.java
index b8c622a,2a22c82..0d3be61
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/manager/CartridgeSubscriptionManager.java
+++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/manager/CartridgeSubscriptionManager.java
@@@ -215,8 -217,13 +215,10 @@@ public class CartridgeSubscriptionManag
CartridgeSubscriptionUtils.publishTenantSubscribedEvent(cartridgeSubscription.getSubscriber().getTenantId(),
cartridgeSubscription.getCartridgeInfo().getType());
- // publish artifact-deployment event for multi-tenant subscription
- //CartridgeSubscriptionInfo subscription = PersistenceManager.getSubscriptionFromClusterId(clusterId);
-
if(cartridgeInfo.getMultiTenant()) {
log.info(" Multitenant --> Publishing Artifact update event -- ");
+ log.info(" Values : cluster id - " + cartridgeSubscription.getClusterDomain() + " tenant - " +
+ cartridgeSubscription.getSubscriber().getTenantId());
ArtifactUpdatePublisher publisher = new ArtifactUpdatePublisher(cartridgeSubscription.getRepository(),
cartridgeSubscription.getClusterDomain(), // clusterId
String.valueOf(cartridgeSubscription.getSubscriber().getTenantId()));
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/2cf22762/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java
----------------------------------------------------------------------