You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ga...@apache.org on 2015/12/08 16:18:33 UTC
[50/50] [abbrv] stratos git commit: Rebase the stratos 4.1.x branch
Rebase the stratos 4.1.x branch
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/9d778a5e
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/9d778a5e
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/9d778a5e
Branch: refs/heads/master
Commit: 9d778a5edd3855162eff971ce684659ef72673e0
Parents: 1ae9bb3
Author: gayangunarathne <ga...@wso2.com>
Authored: Tue Dec 8 20:47:15 2015 +0530
Committer: gayangunarathne <ga...@wso2.com>
Committed: Tue Dec 8 20:47:15 2015 +0530
----------------------------------------------------------------------
.../services/impl/AutoscalerServiceImpl.java | 14 +-
.../stratos/cli/RestCommandLineService.java | 3 +-
.../status/ClusterStatusTopicReceiver.java | 9 +
.../status/InstanceStatusTopicReceiver.java | 6 +-
.../rest/endpoint/api/StratosApiV41.java | 10 -
.../src/test/resources/test-suite-all.xml | 1 +
.../src/main/resources/AutoscalerService.wsdl | 628 +++++-----
.../main/resources/CloudControllerService.wsdl | 1098 +++++++++---------
.../main/resources/StratosManagerService.wsdl | 238 ++--
9 files changed, 1006 insertions(+), 1001 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/9d778a5e/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java
index fbf6afc..0943de0 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java
@@ -304,7 +304,7 @@ public class AutoscalerServiceImpl implements AutoscalerService {
* @param clusterIds
*/
private void addApplicationSignUp(ApplicationContext applicationContext, String applicationKey,
- List<String> clusterIds) {
+ List<String> clusterIds) {
try {
if (log.isInfoEnabled()) {
@@ -430,7 +430,7 @@ public class AutoscalerServiceImpl implements AutoscalerService {
}
private void updateArtifactRepositoryList(List<ArtifactRepository> artifactRepositoryList,
- CartridgeContext[] cartridgeContexts) {
+ CartridgeContext[] cartridgeContexts) {
if (cartridgeContexts == null) {
return;
@@ -457,7 +457,7 @@ public class AutoscalerServiceImpl implements AutoscalerService {
public boolean undeployApplication(String applicationId, boolean force)
throws RemoteException, StratosManagerServiceApplicationSignUpExceptionException,
- UnremovableApplicationException {
+ UnremovableApplicationException {
AutoscalerContext asCtx = AutoscalerContext.getInstance();
ApplicationMonitor appMonitor = asCtx.getAppMonitor(applicationId);
@@ -1158,7 +1158,7 @@ public class AutoscalerServiceImpl implements AutoscalerService {
@Override
public boolean updateDeploymentPolicy(DeploymentPolicy deploymentPolicy)
throws RemoteException, InvalidDeploymentPolicyException, DeploymentPolicyNotExistsException,
- InvalidPolicyException, CloudControllerConnectionException {
+ InvalidPolicyException, CloudControllerConnectionException {
validateDeploymentPolicy(deploymentPolicy);
@@ -1230,7 +1230,7 @@ public class AutoscalerServiceImpl implements AutoscalerService {
}
private void removeOldPartitionsFromClusterMonitor(NetworkPartitionContext clusterLevelNetworkPartitionContext,
- NetworkPartitionRef networkPartition) {
+ NetworkPartitionRef networkPartition) {
for (InstanceContext instanceContext : clusterLevelNetworkPartitionContext.getInstanceIdToInstanceContextMap()
.values()) {
@@ -1265,9 +1265,9 @@ public class AutoscalerServiceImpl implements AutoscalerService {
}
private void addNewPartitionsToClusterMonitor(NetworkPartitionContext clusterLevelNetworkPartitionContext,
- NetworkPartitionRef networkPartitionRef, String deploymentPolicyID, String cartridgeType)
+ NetworkPartitionRef networkPartitionRef, String deploymentPolicyID, String cartridgeType)
throws RemoteException, CloudControllerServiceInvalidPartitionExceptionException,
- CloudControllerServiceInvalidCartridgeTypeExceptionException {
+ CloudControllerServiceInvalidCartridgeTypeExceptionException {
boolean validationOfNetworkPartitionRequired = false;
for (PartitionRef partition : networkPartitionRef.getPartitionRefs()) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/9d778a5e/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
index a06cb3b..1b26592 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
@@ -50,6 +50,7 @@ import org.apache.stratos.common.beans.partition.NetworkPartitionBean;
import org.apache.stratos.common.beans.policy.autoscale.AutoscalePolicyBean;
import org.apache.stratos.common.beans.policy.deployment.ApplicationPolicyBean;
import org.apache.stratos.common.beans.policy.deployment.DeploymentPolicyBean;
+import org.apache.stratos.common.beans.topology.ApplicationInfoBean;
import org.apache.stratos.common.beans.topology.ClusterBean;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -1601,7 +1602,7 @@ public class RestCommandLineService {
*/
public void describeApplicationRuntime(String applicationId) throws CommandException {
try {
- ApplicationBean application = (ApplicationBean) restClient
+ ApplicationInfoBean application = (ApplicationInfoBean) restClient
.getEntity(ENDPOINT_GET_APPLICATION_RUNTIME, ApplicationBean.class, "{applicationId}", applicationId,
"application");
http://git-wip-us.apache.org/repos/asf/stratos/blob/9d778a5e/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/receiver/cluster/status/ClusterStatusTopicReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/receiver/cluster/status/ClusterStatusTopicReceiver.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/receiver/cluster/status/ClusterStatusTopicReceiver.java
index d1d269a..daa6bf5 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/receiver/cluster/status/ClusterStatusTopicReceiver.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/receiver/cluster/status/ClusterStatusTopicReceiver.java
@@ -33,6 +33,7 @@ public class ClusterStatusTopicReceiver {
private static final Log log = LogFactory.getLog(ClusterStatusTopicReceiver.class);
private ClusterStatusEventReceiver statusEventReceiver;
+ private boolean terminated;
private ExecutorService executorService;
public ClusterStatusTopicReceiver() {
@@ -115,6 +116,14 @@ public class ClusterStatusTopicReceiver {
});
}
+ public void setTerminated(boolean terminated) {
+ this.terminated = terminated;
+ }
+
+ public ExecutorService getExecutorService() {
+ return executorService;
+ }
+
public void setExecutorService(ExecutorService executorService) {
this.executorService = executorService;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/9d778a5e/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/receiver/instance/status/InstanceStatusTopicReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/receiver/instance/status/InstanceStatusTopicReceiver.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/receiver/instance/status/InstanceStatusTopicReceiver.java
index 5934c81..1f012b3 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/receiver/instance/status/InstanceStatusTopicReceiver.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/receiver/instance/status/InstanceStatusTopicReceiver.java
@@ -31,7 +31,6 @@ import org.apache.stratos.messaging.listener.instance.status.InstanceMaintenance
import org.apache.stratos.messaging.listener.instance.status.InstanceReadyToShutdownEventListener;
import org.apache.stratos.messaging.listener.instance.status.InstanceStartedEventListener;
import org.apache.stratos.messaging.message.receiver.instance.status.InstanceStatusEventReceiver;
-import org.wso2.carbon.registry.core.exceptions.RegistryException;
import java.util.concurrent.ExecutorService;
@@ -42,6 +41,7 @@ public class InstanceStatusTopicReceiver {
private static final Log log = LogFactory.getLog(InstanceStatusTopicReceiver.class);
private InstanceStatusEventReceiver statusEventReceiver;
+ private boolean terminated;
private ExecutorService executorService;
public InstanceStatusTopicReceiver() {
@@ -131,6 +131,10 @@ public class InstanceStatusTopicReceiver {
}
+ public ExecutorService getExecutorService() {
+ return executorService;
+ }
+
public void setExecutorService(ExecutorService executorService) {
this.executorService = executorService;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/9d778a5e/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
index 5eb1dac..1dad693 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
@@ -1305,16 +1305,6 @@ public class StratosApiV41 extends AbstractApi {
}
}
- @POST
- @Path("/reponotification")
- @Produces("application/json")
- @Consumes("application/json")
- @AuthorizationAction("/permission/admin/stratos/applicationSignUps/manage")
- public void getRepoNotification(GitNotificationPayloadBean payload) throws RestAPIException {
-
- StratosApiV41Utils.notifyArtifactUpdatedEvent(payload);
-
- }
/**
* Delete an application.
*
http://git-wip-us.apache.org/repos/asf/stratos/blob/9d778a5e/products/stratos/modules/integration/test-integration/src/test/resources/test-suite-all.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/test-integration/src/test/resources/test-suite-all.xml b/products/stratos/modules/integration/test-integration/src/test/resources/test-suite-all.xml
index 5a73f7c..ae1e6bf 100644
--- a/products/stratos/modules/integration/test-integration/src/test/resources/test-suite-all.xml
+++ b/products/stratos/modules/integration/test-integration/src/test/resources/test-suite-all.xml
@@ -34,6 +34,7 @@
<run>
<exclude name="failed"/>
<exclude name="disabled"/>
+ <include name="policies"/>
</run>
</groups>