Removing metadata service features from as, cc p2 profiles and removing metadata client features from all p2 profiles since it is not being used
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/ade33aa7 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/ade33aa7 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/ade33aa7 Branch: refs/heads/stratos-4.1.x Commit: ade33aa7cf8ec5ab07ebbab70371d57749b7f3a2 Parents: cd18da5 Author: Akila Perera <[email protected]> Authored: Tue Oct 13 13:01:08 2015 +0530 Committer: Akila Perera <[email protected]> Committed: Wed Oct 14 16:43:04 2015 +0530 ---------------------------------------------------------------------- .../org.apache.stratos.autoscaler/pom.xml | 7 +---- .../org.apache.stratos.cloud.controller/pom.xml | 7 +---- .../apache/stratos/metadata/service/Utils.java | 18 +++++-------- products/stratos/modules/p2-profile-gen/pom.xml | 27 +------------------- 4 files changed, 9 insertions(+), 50 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/ade33aa7/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 150e380..026cc0e 100644 --- a/components/org.apache.stratos.autoscaler/pom.xml +++ b/components/org.apache.stratos.autoscaler/pom.xml @@ -164,11 +164,6 @@ <version>${carbon.kernel.version}</version> </dependency> <dependency> - <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.metadata.client</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.identity.oauth</artifactId> <version>4.2.3</version> @@ -250,4 +245,4 @@ </resource> </resources> </build> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/stratos/blob/ade33aa7/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 62165b5..e5ca7da 100644 --- a/components/org.apache.stratos.cloud.controller/pom.xml +++ b/components/org.apache.stratos.cloud.controller/pom.xml @@ -138,11 +138,6 @@ </dependency> <dependency> <groupId>org.apache.stratos</groupId> - <artifactId>org.apache.stratos.metadata.client</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.stratos</groupId> <artifactId>org.apache.stratos.mock.iaas.client</artifactId> <version>${project.version}</version> </dependency> @@ -229,4 +224,4 @@ <version>${jclouds.version}</version> </dependency> </dependencies> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/stratos/blob/ade33aa7/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/Utils.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/Utils.java b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/Utils.java index f7b5491..b56ea91 100644 --- a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/Utils.java +++ b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/Utils.java @@ -21,24 +21,18 @@ package org.apache.stratos.metadata.service; public class Utils { public static String buildMessage(int errorCode, String errorMessage) { - String jsonResponse = - "{\"Error\":{" + " \"errorCode\": \" " + errorCode + "\"," + - " \"errorMessage\": \" " + errorMessage + "\"" + "}" + "}"; - return jsonResponse; + return "{\"Error\":{" + " \"errorCode\": \" " + errorCode + "\"," + + " \"errorMessage\": \" " + errorMessage + "\"" + "}" + "}"; } public static String buildMessage(String errorMessage) { - String jsonResponse = - "{\"Error\":{" + " \"errorCode\": \" " + -1234 + "\"," + - " \"errorMessage\": \" " + errorMessage + "\"" + "}" + "}"; - return jsonResponse; + return "{\"Error\":{" + " \"errorCode\": \" " + -1234 + "\"," + + " \"errorMessage\": \" " + errorMessage + "\"" + "}" + "}"; } public static String buildAuthenticationSuccessMessage(String jSessionId) { - String jsonResponse = - "{\"Success\":{" + " \"sessionId\": \"" + jSessionId + "\"" + "}" + - "}"; - return jsonResponse; + return "{\"Success\":{" + " \"sessionId\": \"" + jSessionId + "\"" + "}" + + "}"; } } http://git-wip-us.apache.org/repos/asf/stratos/blob/ade33aa7/products/stratos/modules/p2-profile-gen/pom.xml ---------------------------------------------------------------------- diff --git a/products/stratos/modules/p2-profile-gen/pom.xml b/products/stratos/modules/p2-profile-gen/pom.xml index 51d9abb..1834fc7 100644 --- a/products/stratos/modules/p2-profile-gen/pom.xml +++ b/products/stratos/modules/p2-profile-gen/pom.xml @@ -815,14 +815,6 @@ <version>${carbon.platform.patch.version.4.2.1}</version> </feature> <feature> - <id>org.apache.stratos.metadata.service.feature.group</id> - <version>${project.version}</version> - </feature> - <feature> - <id>org.apache.stratos.metadata.client.feature.group</id> - <version>${project.version}</version> - </feature> - <feature> <id>org.apache.stratos.common.feature.group</id> <version>${project.version}</version> </feature> @@ -905,14 +897,6 @@ <id>org.wso2.carbon.event.server.feature.group</id> <version>${carbon.platform.patch.version.4.2.1}</version> </feature> - <feature> - <id>org.apache.stratos.metadata.service.feature.group</id> - <version>${project.version}</version> - </feature> - <feature> - <id>org.apache.stratos.metadata.client.feature.group</id> - <version>${project.version}</version> - </feature> </features> </configuration> </execution> @@ -1178,10 +1162,6 @@ <!-- Stratos features --> <feature> - <id>org.apache.stratos.metadata.client.feature.group</id> - <version>${project.version}</version> - </feature> - <feature> <id>org.apache.stratos.custom.handlers.feature.group</id> <version>${project.version}</version> </feature> @@ -1221,15 +1201,10 @@ <id>org.apache.stratos.common.feature.group</id> <version>${project.version}</version> </feature> - <!-- Mock IaaS features --> <feature> <id>org.apache.stratos.mock.iaas.api.feature.group</id> <version>${project.version}</version> </feature> - <feature> - <id>org.apache.stratos.metadata.service.feature.group</id> - <version>${project.version}</version> - </feature> </features> </configuration> </execution> @@ -1257,4 +1232,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project>
