You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ud...@apache.org on 2014/10/28 12:02:38 UTC
[1/4] git commit: removing created headers from java files
Repository: stratos
Updated Branches:
refs/heads/4.0.0-grouping 2ae7e2b94 -> 7618c7b17
removing created headers from java files
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/4bca87ee
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/4bca87ee
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/4bca87ee
Branch: refs/heads/4.0.0-grouping
Commit: 4bca87eee4bb9b0b966aaf3813acaeaeeebc0557
Parents: 2ae7e2b
Author: Udara Liyanage <ud...@wso2.com>
Authored: Tue Oct 28 10:42:51 2014 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Tue Oct 28 13:22:26 2014 +0530
----------------------------------------------------------------------
.../autoscaler/grouping/dependency/context/GroupContext.java | 3 ---
.../apache/stratos/autoscaler/monitor/events/MonitorEvent.java | 3 ---
.../application/status/AppStatusGroupActivatedEventListener.java | 3 ---
.../application/status/AppStatusGroupInactivateEventListener.java | 3 ---
.../status/AppStatusGroupTerminatingEventListener.java | 3 ---
.../listener/topology/ClusterActivatedEventListener.java | 3 ---
.../listener/topology/ClusterInActivateEventListener.java | 3 ---
.../status/AppStatusApplicationActivatedMessageProcessor.java | 3 ---
8 files changed, 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/4bca87ee/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/grouping/dependency/context/GroupContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/grouping/dependency/context/GroupContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/grouping/dependency/context/GroupContext.java
index 0e65d2b..408272a 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/grouping/dependency/context/GroupContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/grouping/dependency/context/GroupContext.java
@@ -18,9 +18,6 @@
*/
package org.apache.stratos.autoscaler.grouping.dependency.context;
-/**
- * Created by reka on 10/1/14.
- */
public class GroupContext extends ApplicationContext {
public GroupContext(String id, boolean killDependent) {
super(id ,killDependent);
http://git-wip-us.apache.org/repos/asf/stratos/blob/4bca87ee/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/events/MonitorEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/events/MonitorEvent.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/events/MonitorEvent.java
index a733a0e..5231799 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/events/MonitorEvent.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/events/MonitorEvent.java
@@ -18,9 +18,6 @@
*/
package org.apache.stratos.autoscaler.monitor.events;
-/**
- * Created by reka on 10/20/14.
- */
public abstract class MonitorEvent {
protected String id;
http://git-wip-us.apache.org/repos/asf/stratos/blob/4bca87ee/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/listener/application/status/AppStatusGroupActivatedEventListener.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/listener/application/status/AppStatusGroupActivatedEventListener.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/listener/application/status/AppStatusGroupActivatedEventListener.java
index 75fe2c9..e6381e3 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/listener/application/status/AppStatusGroupActivatedEventListener.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/listener/application/status/AppStatusGroupActivatedEventListener.java
@@ -20,8 +20,5 @@ package org.apache.stratos.messaging.listener.application.status;
import org.apache.stratos.messaging.listener.EventListener;
-/**
- * Created by reka on 9/22/14.
- */
public abstract class AppStatusGroupActivatedEventListener extends EventListener {
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/4bca87ee/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/listener/application/status/AppStatusGroupInactivateEventListener.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/listener/application/status/AppStatusGroupInactivateEventListener.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/listener/application/status/AppStatusGroupInactivateEventListener.java
index 5c88fae..0873a70 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/listener/application/status/AppStatusGroupInactivateEventListener.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/listener/application/status/AppStatusGroupInactivateEventListener.java
@@ -20,8 +20,5 @@ package org.apache.stratos.messaging.listener.application.status;
import org.apache.stratos.messaging.listener.EventListener;
-/**
- * Created by reka on 9/22/14.
- */
public abstract class AppStatusGroupInactivateEventListener extends EventListener {
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/4bca87ee/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/listener/application/status/AppStatusGroupTerminatingEventListener.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/listener/application/status/AppStatusGroupTerminatingEventListener.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/listener/application/status/AppStatusGroupTerminatingEventListener.java
index fbd7fcc..8d56555 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/listener/application/status/AppStatusGroupTerminatingEventListener.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/listener/application/status/AppStatusGroupTerminatingEventListener.java
@@ -20,8 +20,5 @@ package org.apache.stratos.messaging.listener.application.status;
import org.apache.stratos.messaging.listener.EventListener;
-/**
- * Created by reka on 9/22/14.
- */
public abstract class AppStatusGroupTerminatingEventListener extends EventListener {
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/4bca87ee/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/listener/topology/ClusterActivatedEventListener.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/listener/topology/ClusterActivatedEventListener.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/listener/topology/ClusterActivatedEventListener.java
index 9514541..00efcfd 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/listener/topology/ClusterActivatedEventListener.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/listener/topology/ClusterActivatedEventListener.java
@@ -20,8 +20,5 @@ package org.apache.stratos.messaging.listener.topology;
import org.apache.stratos.messaging.listener.EventListener;
-/**
- * Created by reka on 9/17/14.
- */
public abstract class ClusterActivatedEventListener extends EventListener {
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/4bca87ee/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/listener/topology/ClusterInActivateEventListener.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/listener/topology/ClusterInActivateEventListener.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/listener/topology/ClusterInActivateEventListener.java
index 03a4768..551f1b8 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/listener/topology/ClusterInActivateEventListener.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/listener/topology/ClusterInActivateEventListener.java
@@ -20,8 +20,5 @@ package org.apache.stratos.messaging.listener.topology;
import org.apache.stratos.messaging.listener.EventListener;
-/**
- * Created by reka on 9/17/14.
- */
public abstract class ClusterInActivateEventListener extends EventListener {
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/4bca87ee/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/application/status/AppStatusApplicationActivatedMessageProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/application/status/AppStatusApplicationActivatedMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/application/status/AppStatusApplicationActivatedMessageProcessor.java
index a505624..8b88724 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/application/status/AppStatusApplicationActivatedMessageProcessor.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/application/status/AppStatusApplicationActivatedMessageProcessor.java
@@ -24,9 +24,6 @@ import org.apache.stratos.messaging.event.application.status.AppStatusApplicatio
import org.apache.stratos.messaging.message.processor.MessageProcessor;
import org.apache.stratos.messaging.util.Util;
-/**
- * Created by reka on 9/25/14.
- */
public class AppStatusApplicationActivatedMessageProcessor extends MessageProcessor {
private static final Log log =
LogFactory.getLog(AppStatusApplicationActivatedMessageProcessor.class);
[2/4] git commit: add delete application to metadata service
Posted by ud...@apache.org.
add delete application to metadata service
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/c9478208
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/c9478208
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/c9478208
Branch: refs/heads/4.0.0-grouping
Commit: c947820858960606a5d7b3c5e90c5086aadbdabb
Parents: 4bca87e
Author: Udara Liyanage <ud...@wso2.com>
Authored: Tue Oct 28 10:45:47 2014 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Tue Oct 28 13:22:27 2014 +0530
----------------------------------------------------------------------
.../defaults/DefaultMetaDataServiceClient.java | 11 +++++++++
.../client/defaults/MetaDataServiceClient.java | 2 ++
.../metadata/client/rest/DefaultRestClient.java | 2 ++
.../registry/CarbonRegistry.java | 25 +++++++++++++++++++-
.../metadataservice/registry/DataStore.java | 1 +
.../metadataservice/registry/GRegRegistry.java | 4 ++++
.../metadataservice/services/MetaDataAdmin.java | 22 +++++++++++++++++
7 files changed, 66 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/c9478208/components/org.apache.stratos.metadata.client/src/main/java/org/apache/stratos/metadata/client/defaults/DefaultMetaDataServiceClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadata.client/src/main/java/org/apache/stratos/metadata/client/defaults/DefaultMetaDataServiceClient.java b/components/org.apache.stratos.metadata.client/src/main/java/org/apache/stratos/metadata/client/defaults/DefaultMetaDataServiceClient.java
index fbebab9..ff7ac4a 100644
--- a/components/org.apache.stratos.metadata.client/src/main/java/org/apache/stratos/metadata/client/defaults/DefaultMetaDataServiceClient.java
+++ b/components/org.apache.stratos.metadata.client/src/main/java/org/apache/stratos/metadata/client/defaults/DefaultMetaDataServiceClient.java
@@ -96,6 +96,17 @@ public class DefaultMetaDataServiceClient implements MetaDataServiceClient {
return gson.fromJson(responseContent, PropertyBean.class);
}
+ public void deleteApplicationProperties(String appId) throws MetaDataServiceClientException{
+ StringBuilder applicationPath = new StringBuilder(baseUrl).append("application/").append(appId);
+ HttpResponse response;
+ try {
+ response = restClient.doDelete(String.valueOf(applicationPath));
+ } catch (RestClientException e) {
+ String msg= "Error occured while deleting application";
+ throw new MetaDataServiceClientException(msg, e);
+ }
+ }
+
private String readResponseContent(HttpResponse response) throws IOException {
BufferedReader reader = new BufferedReader(new InputStreamReader(response.getEntity().getContent(), "UTF-8"));
http://git-wip-us.apache.org/repos/asf/stratos/blob/c9478208/components/org.apache.stratos.metadata.client/src/main/java/org/apache/stratos/metadata/client/defaults/MetaDataServiceClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadata.client/src/main/java/org/apache/stratos/metadata/client/defaults/MetaDataServiceClient.java b/components/org.apache.stratos.metadata.client/src/main/java/org/apache/stratos/metadata/client/defaults/MetaDataServiceClient.java
index 8fdb9a7..4703e77 100644
--- a/components/org.apache.stratos.metadata.client/src/main/java/org/apache/stratos/metadata/client/defaults/MetaDataServiceClient.java
+++ b/components/org.apache.stratos.metadata.client/src/main/java/org/apache/stratos/metadata/client/defaults/MetaDataServiceClient.java
@@ -60,6 +60,8 @@ public interface MetaDataServiceClient {
*/
public org.apache.stratos.metadata.client.beans.PropertyBean getProperty(String appId, String clusterID, String propertyKey) throws MetaDataServiceClientException;
+ public void deleteApplicationProperties(String applicationId) throws MetaDataServiceClientException;
+
/**
* Shutdown the MetaDataServiceClient. Should be called once after using the client.
*/
http://git-wip-us.apache.org/repos/asf/stratos/blob/c9478208/components/org.apache.stratos.metadata.client/src/main/java/org/apache/stratos/metadata/client/rest/DefaultRestClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadata.client/src/main/java/org/apache/stratos/metadata/client/rest/DefaultRestClient.java b/components/org.apache.stratos.metadata.client/src/main/java/org/apache/stratos/metadata/client/rest/DefaultRestClient.java
index 160ca15..d3a3f7f 100644
--- a/components/org.apache.stratos.metadata.client/src/main/java/org/apache/stratos/metadata/client/rest/DefaultRestClient.java
+++ b/components/org.apache.stratos.metadata.client/src/main/java/org/apache/stratos/metadata/client/rest/DefaultRestClient.java
@@ -122,6 +122,7 @@ public class DefaultRestClient implements RestClient {
public HttpResponse doGet(String resourcePath) throws RestClientException {
HttpGet get = new HttpGet(resourcePath);
+ setAuthHeader(get);
try {
return httpClient.execute(get);
@@ -138,6 +139,7 @@ public class DefaultRestClient implements RestClient {
public HttpResponse doDelete(String resourcePath) throws RestClientException {
HttpDelete delete = new HttpDelete(resourcePath);
+ setAuthHeader(delete);
try {
return httpClient.execute(delete);
http://git-wip-us.apache.org/repos/asf/stratos/blob/c9478208/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/registry/CarbonRegistry.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/registry/CarbonRegistry.java b/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/registry/CarbonRegistry.java
index e9d590d..89250b3 100644
--- a/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/registry/CarbonRegistry.java
+++ b/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/registry/CarbonRegistry.java
@@ -18,6 +18,7 @@
*/
package org.apache.stratos.metadataservice.registry;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.metadataservice.definition.NewProperty;
@@ -102,7 +103,29 @@ public class CarbonRegistry extends AbstractAdmin implements DataStore {
}
/**
- * Add properties to clustor
+ * Delete the resource identified by the applicationId, if exist.
+ * @param applicationId ID of the application.
+ * @return True if resource exist and able to delete, else false.
+ * @throws RegistryException
+ */
+ public boolean deleteApplication(String applicationId) throws RegistryException {
+ if(StringUtils.isEmpty(applicationId)){
+ throw new IllegalArgumentException("Application ID can not be null");
+ }
+ Registry tempRegistry = getGovernanceUserRegistry();
+ String resourcePath = mainResource + applicationId;
+
+ if(tempRegistry.resourceExists(resourcePath)){
+ tempRegistry.delete(resourcePath);
+ log.info(String.format("Application removed from registry %s", applicationId));
+ return true;
+ }
+
+ return false;
+ }
+
+ /**
+ * Add properties to cluster
* @param applicationName
* @param clusterId
* @param properties
http://git-wip-us.apache.org/repos/asf/stratos/blob/c9478208/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/registry/DataStore.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/registry/DataStore.java b/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/registry/DataStore.java
index 0ad8459..33f3229 100644
--- a/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/registry/DataStore.java
+++ b/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/registry/DataStore.java
@@ -36,4 +36,5 @@ public interface DataStore {
public void addPropertyToCluster(String applicationId, String clusterId, NewProperty property) throws RegistryException;
+ public boolean deleteApplication(String applicationId) throws RegistryException;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/c9478208/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/registry/GRegRegistry.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/registry/GRegRegistry.java b/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/registry/GRegRegistry.java
index ffe38f1..c2ba22e 100644
--- a/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/registry/GRegRegistry.java
+++ b/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/registry/GRegRegistry.java
@@ -102,4 +102,8 @@ public class GRegRegistry implements DataStore {
}
+ public boolean deleteApplication(String applicationId) {
+ return false;
+ }
+
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/c9478208/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/services/MetaDataAdmin.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/services/MetaDataAdmin.java b/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/services/MetaDataAdmin.java
index 55887a3..e88bc2a 100644
--- a/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/services/MetaDataAdmin.java
+++ b/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/services/MetaDataAdmin.java
@@ -162,5 +162,27 @@ public class MetaDataAdmin {
return Response.created(url).build();
}
+ @DELETE
+ @Path("application/{application_id}")
+ @Produces("application/json")
+ @Consumes("application/json")
+ @AuthorizationAction("/permission/protected/manage/monitor/tenants")
+ public Response deleteApplicationProperties(@PathParam("application_id") String applicationId)
+ throws RestAPIException {
+
+ try {
+ boolean deleted = registry.deleteApplication(applicationId);
+ if(!deleted){
+ log.warn(String.format("Either no metadata is associated with given appId %s Or resources could not be deleted", applicationId));
+ }
+ } catch (RegistryException e) {
+ String msg= "Resource attached with appId could not be deleted";
+ log.error(msg, e);
+ throw new RestAPIException(" ", e);
+ }
+
+ return Response.ok().build();
+ }
+
}
[4/4] git commit: CNF when calling metadata client
Posted by ud...@apache.org.
CNF when calling metadata client
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/7618c7b1
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/7618c7b1
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/7618c7b1
Branch: refs/heads/4.0.0-grouping
Commit: 7618c7b172df604ebf8563b278e0ea0a6d31cd3e
Parents: 1953032
Author: Udara Liyanage <ud...@wso2.com>
Authored: Tue Oct 28 16:32:09 2014 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Tue Oct 28 16:32:09 2014 +0530
----------------------------------------------------------------------
components/org.apache.stratos.metadata.client/pom.xml | 4 ++--
.../org.apache.stratos.metadata.client.feature/pom.xml | 13 +++++++++++--
2 files changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/7618c7b1/components/org.apache.stratos.metadata.client/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadata.client/pom.xml b/components/org.apache.stratos.metadata.client/pom.xml
index 4f92ca7..11daa79 100644
--- a/components/org.apache.stratos.metadata.client/pom.xml
+++ b/components/org.apache.stratos.metadata.client/pom.xml
@@ -18,13 +18,12 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.3.5</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
<version>1.9</version>
- <scope>provided</scope>
+ <!-- <scope>provided</scope>-->
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
@@ -55,6 +54,7 @@
!org.apache.stratos.metadata.client,
org.apache.commons.logging; version=0.0.0,
org.apache.commons.configuration; version=0.0.0,
+ org.apache.http.conn.ssl;version=0.0.0,
*;resolution:=optional
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
http://git-wip-us.apache.org/repos/asf/stratos/blob/7618c7b1/features/common/org.apache.stratos.metadata.client.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/common/org.apache.stratos.metadata.client.feature/pom.xml b/features/common/org.apache.stratos.metadata.client.feature/pom.xml
index 6a8402f..09857d0 100644
--- a/features/common/org.apache.stratos.metadata.client.feature/pom.xml
+++ b/features/common/org.apache.stratos.metadata.client.feature/pom.xml
@@ -50,6 +50,17 @@
<artifactId>httpclient-osgi</artifactId>
<version>4.3.5</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.3.5</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>4.3.2</version>
+ </dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore-osgi</artifactId>
@@ -88,10 +99,8 @@
<bundleDef>org.apache.stratos:org.apache.stratos.metadata.client:${project.version}</bundleDef>
<bundleDef>com.google.code.gson:gson:${gson2.version}</bundleDef>
<bundleDef>org.apache.commons:commons-lang3:3.1</bundleDef>
-<!--
<bundleDef>org.apache.httpcomponents:httpclient-osgi:4.3.5</bundleDef>
<bundleDef>org.apache.httpcomponents:httpcore-osgi:4.3.2</bundleDef>
--->
</bundles>
</configuration>
</execution>
[3/4] git commit: delete application from metadata service when app
is undeployed
Posted by ud...@apache.org.
delete application from metadata service when app is undeployed
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/19530324
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/19530324
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/19530324
Branch: refs/heads/4.0.0-grouping
Commit: 195303244312d60cb83a1e0d7a0c44f221d05014
Parents: c947820
Author: Udara Liyanage <ud...@wso2.com>
Authored: Tue Oct 28 16:31:31 2014 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Tue Oct 28 16:31:31 2014 +0530
----------------------------------------------------------------------
.../controller/topology/TopologyBuilder.java | 23 +++++++++++++-------
.../topology/GroupTerminatingProcessor.java | 2 +-
2 files changed, 16 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/19530324/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java
index e715130..fac6671 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java
@@ -31,19 +31,13 @@ import org.apache.stratos.cloud.controller.runtime.FasterLookUpDataHolder;
import org.apache.stratos.cloud.controller.util.CloudControllerUtil;
import org.apache.stratos.messaging.domain.topology.*;
import org.apache.stratos.messaging.event.application.status.*;
-import org.apache.stratos.messaging.event.application.status.AppStatusApplicationActivatedEvent;
-import org.apache.stratos.messaging.event.application.status.AppStatusApplicationCreatedEvent;
-import org.apache.stratos.messaging.event.application.status.AppStatusApplicationInactivatedEvent;
-import org.apache.stratos.messaging.event.application.status.AppStatusApplicationTerminatedEvent;
-import org.apache.stratos.messaging.event.application.status.AppStatusApplicationTerminatingEvent;
-import org.apache.stratos.messaging.event.application.status.AppStatusClusterActivatedEvent;
-import org.apache.stratos.messaging.event.application.status.AppStatusGroupActivatedEvent;
-import org.apache.stratos.messaging.event.application.status.AppStatusGroupInactivateEvent;
import org.apache.stratos.messaging.event.instance.status.InstanceActivatedEvent;
import org.apache.stratos.messaging.event.instance.status.InstanceMaintenanceModeEvent;
import org.apache.stratos.messaging.event.instance.status.InstanceReadyToShutdownEvent;
import org.apache.stratos.messaging.event.instance.status.InstanceStartedEvent;
import org.apache.stratos.messaging.event.topology.*;
+import org.apache.stratos.metadata.client.defaults.DefaultMetaDataServiceClient;
+import org.apache.stratos.metadata.client.defaults.MetaDataServiceClient;
import org.wso2.carbon.registry.core.exceptions.RegistryException;
import java.util.*;
@@ -939,10 +933,14 @@ public class TopologyBuilder {
}
}
+
+
// remove application
topology.removeApplication(event.getAppId());
TopologyManager.updateTopology(topology);
+ deleteAppResourcesFromMetadataService(event);
+
log.info("Removed application [ " + event.getAppId() + " ] from Topology");
TopologyEventPublisher.sendApplicationTerminatedEvent(new ApplicationTerminatedEvent(event.getAppId(),
@@ -954,6 +952,15 @@ public class TopologyBuilder {
}
}
+ private static void deleteAppResourcesFromMetadataService(AppStatusApplicationTerminatedEvent event) {
+ try {
+ MetaDataServiceClient metadataClient = new DefaultMetaDataServiceClient();
+ metadataClient.deleteApplicationProperties(event.getAppId());
+ } catch (Exception e) {
+ log.error("Error occurred while deleting the application resources frm metadata service " , e);
+ }
+ }
+
public static void handleGroupInActiveEvent(AppStatusGroupInactivateEvent event) {
Topology topology = TopologyManager.getTopology();
Application application = topology.getApplication(event.getAppId());
http://git-wip-us.apache.org/repos/asf/stratos/blob/19530324/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/GroupTerminatingProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/GroupTerminatingProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/GroupTerminatingProcessor.java
index ecf6873..27b5cff 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/GroupTerminatingProcessor.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/GroupTerminatingProcessor.java
@@ -94,7 +94,7 @@ public class GroupTerminatingProcessor extends MessageProcessor {
} else {
// Apply changes to the topology
if (!group.isStateTransitionValid(GroupStatus.Terminating)) {
- log.error("Invalid State Transition from " + group.getStatus() + " to " + GroupStatus.Terminating);
+ log.error("Invalid State Transition from " + group.getStatus() + " to " + GroupStatus.Active);
}
group.setStatus(GroupStatus.Terminating);