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/11/06 14:13:04 UTC
[1/2] stratos git commit: Remove duplicate rest method for notify
repo update
Repository: stratos
Updated Branches:
refs/heads/stratos-4.1.x adc8576ad -> ff1e1bd1a
Remove duplicate rest method for notify repo update
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d1f5f086
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d1f5f086
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d1f5f086
Branch: refs/heads/stratos-4.1.x
Commit: d1f5f0862540bb7c395430780d461a9f00c0e67c
Parents: adc8576
Author: gayangunarathne <ga...@wso2.com>
Authored: Fri Nov 6 17:50:22 2015 +0530
Committer: gayangunarathne <ga...@wso2.com>
Committed: Fri Nov 6 17:54:10 2015 +0530
----------------------------------------------------------------------
.../apache/stratos/rest/endpoint/api/StratosApiV41.java | 10 ----------
1 file changed, 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/d1f5f086/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 300c231..c48bf09 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.
*
[2/2] stratos git commit: Fixes for STRATOS-1606
Posted by ga...@apache.org.
Fixes for STRATOS-1606
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/ff1e1bd1
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/ff1e1bd1
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/ff1e1bd1
Branch: refs/heads/stratos-4.1.x
Commit: ff1e1bd1abbbdb7e755d5816fa2c1fb9afe834a3
Parents: d1f5f08
Author: gayangunarathne <ga...@wso2.com>
Authored: Fri Nov 6 17:57:11 2015 +0530
Committer: gayangunarathne <ga...@wso2.com>
Committed: Fri Nov 6 17:57:11 2015 +0530
----------------------------------------------------------------------
.../ArtifactDistributionCoordinator.java | 79 +++++++++++---------
1 file changed, 45 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/ff1e1bd1/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/components/ArtifactDistributionCoordinator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/components/ArtifactDistributionCoordinator.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/components/ArtifactDistributionCoordinator.java
index 8a71a1c..e03bbcb 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/components/ArtifactDistributionCoordinator.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/components/ArtifactDistributionCoordinator.java
@@ -120,40 +120,51 @@ public class ArtifactDistributionCoordinator {
try {
List<ApplicationSignUp> applicationSignUps = applicationSignUpManager.getApplicationSignUpsForRepository(repoUrl);
if ((applicationSignUps == null) || (applicationSignUps.size() == 0)) {
- if (log.isWarnEnabled()) {
- log.warn(String.format("Artifact updated event not sent, " +
- "application signups not found for repository: [repo-url] %s", repoUrl));
- return;
- }
-
- for (ApplicationSignUp applicationSignUp : applicationSignUps) {
- if (applicationSignUp.getArtifactRepositories() != null) {
- for (ArtifactRepository artifactRepository : applicationSignUp.getArtifactRepositories()) {
- if ((artifactRepository != null) && (artifactRepository.getRepoUrl().equals(repoUrl))) {
-
- String applicationId = applicationSignUp.getApplicationId();
- int tenantId = applicationSignUp.getTenantId();
- String clusterId = findClusterId(applicationId, artifactRepository.getAlias());
-
- publisher.publishArtifactUpdatedEvent(clusterId,
- String.valueOf(applicationSignUp.getTenantId()),
- artifactRepository.getRepoUrl(),
- artifactRepository.getRepoUsername(),
- artifactRepository.getRepoPassword(), false);
-
- if (log.isInfoEnabled()) {
- log.info(String.format("Artifact updated event published: [application-id] %s " +
- "[tenant-id] %d [cartridge-type] %s [alias] %s [repo-url] %s",
- applicationId,
- tenantId,
- artifactRepository.getCartridgeType(),
- artifactRepository.getAlias(),
- artifactRepository.getRepoUrl()));
- }
- }
- }
- }
- }
+ if (log.isWarnEnabled()) {
+ log.warn(String.format("Artifact updated event not sent, " +
+ "application signups not found for repository: [repo-url] %s", repoUrl));
+ return;
+ } else {
+ for (ApplicationSignUp applicationSignUp : applicationSignUps) {
+ if (applicationSignUp.getArtifactRepositories() != null) {
+ for (ArtifactRepository artifactRepository : applicationSignUp.getArtifactRepositories()) {
+ if ((artifactRepository != null) && (artifactRepository.getRepoUrl().equals(repoUrl))) {
+
+
+ String applicationId = applicationSignUp.getApplicationId();
+ int tenantId = applicationSignUp.getTenantId();
+ String clusterId = findClusterId(applicationId, artifactRepository.getAlias());
+
+ publisher.publishArtifactUpdatedEvent(clusterId,
+ String.valueOf(
+ applicationSignUp.getTenantId()),
+ artifactRepository.getRepoUrl(),
+ artifactRepository.getRepoUsername(),
+ artifactRepository.getRepoPassword(), false);
+
+ if (log.isInfoEnabled()) {
+ log.info(
+ String.format("Artifact updated event published: [application-id] %s" +
+ " " +
+ "[tenant-id] %d [cartridge-type] %s [alias] %s [repo-url" +
+ "] %s",
+ applicationId,
+ tenantId,
+ artifactRepository.getCartridgeType(),
+ artifactRepository.getAlias(),
+ artifactRepository.getRepoUrl()));
+ }
+ }
+ }
+ } else {
+ if (log.isWarnEnabled()) {
+ log.warn(String.format("Application signUp artifact repositories are empty for %s",
+ repoUrl));
+ return;
+ }
+ }
+ }
+ }
}
} catch (Exception e) {
String message = "Could not notify artifact updated event";