You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2014/03/28 14:16:05 UTC
[1/2] git commit: STRATOS-561 Integrated UI Change
Repository: incubator-stratos
Updated Branches:
refs/heads/master b1caebf69 -> d6d5b5fde
STRATOS-561 Integrated UI Change
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/7069c46d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/7069c46d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/7069c46d
Branch: refs/heads/master
Commit: 7069c46d0f7e7043e89b0f09ed150ab43adf1ab8
Parents: b1caebf
Author: M. Isuru Tharanga Chrishantha Perera <is...@apache.org>
Authored: Fri Mar 28 18:44:02 2014 +0530
Committer: M. Isuru Tharanga Chrishantha Perera <is...@apache.org>
Committed: Fri Mar 28 18:44:02 2014 +0530
----------------------------------------------------------------------
.../console/util/utility.jag | 4 +---
.../apache/stratos/rest/endpoint/services/ServiceUtils.java | 6 +++++-
.../apache/stratos/rest/endpoint/services/StratosAdmin.java | 4 ++--
3 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7069c46d/components/org.apache.stratos.manager.console/console/util/utility.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/util/utility.jag b/components/org.apache.stratos.manager.console/console/util/utility.jag
index ab6a5e1..3502bb5 100755
--- a/components/org.apache.stratos.manager.console/console/util/utility.jag
+++ b/components/org.apache.stratos.manager.console/console/util/utility.jag
@@ -147,9 +147,7 @@ consoleAppUtil = new function(){
};
this.syncRepo= function(alias){
- return {msg:"synced"};
- //Uncomment the line bellow and do u'r service call
- //return this.sendReceive("POST","/syncurl",alias).data;
+ return this.sendReceive("POST","/sync",alias).data;
};
this.getAutoScalePolicies = function(){
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7069c46d/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 38fbc8c..29f676b 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
@@ -1170,7 +1170,7 @@ public class ServiceUtils {
}
}
- static void sendRepositoryNotification(CartridgeSubscription cartridgeSubscription) throws RestAPIException {
+ static StratosAdminResponse synchronizeRepository(CartridgeSubscription cartridgeSubscription) throws RestAPIException {
try {
RepositoryNotification repoNotification = new RepositoryNotification();
repoNotification.updateRepository(cartridgeSubscription);
@@ -1179,6 +1179,10 @@ public class ServiceUtils {
log.error(msg, e);
throw new RestAPIException(msg, e);
}
+
+ StratosAdminResponse stratosAdminResponse = new StratosAdminResponse();
+ stratosAdminResponse.setMessage("Successfully sent the repository synchronization request for " + cartridgeSubscription.getAlias());
+ return stratosAdminResponse;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7069c46d/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 5f411dc..b346c36 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
@@ -968,9 +968,9 @@ public class StratosAdmin extends AbstractAdmin {
@Path("/sync")
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
- public void synchronizeRepository(String alias) throws RestAPIException {
+ public StratosAdminResponse synchronizeRepository(String alias) throws RestAPIException {
CartridgeSubscription cartridgeSubscription = ServiceUtils.getCartridgeSubscription(alias, getConfigContext());
- ServiceUtils.sendRepositoryNotification(cartridgeSubscription);
+ return ServiceUtils.synchronizeRepository(cartridgeSubscription);
}
private List<TenantInfoBean> getAllTenants() throws RestAPIException {
[2/2] git commit: Improvements for Subscribed Cartridges Information
Posted by is...@apache.org.
Improvements for Subscribed Cartridges Information
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/d6d5b5fd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/d6d5b5fd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/d6d5b5fd
Branch: refs/heads/master
Commit: d6d5b5fde52ff4fc1deccb61da970ee96770d87e
Parents: 7069c46
Author: M. Isuru Tharanga Chrishantha Perera <is...@apache.org>
Authored: Fri Mar 28 18:45:39 2014 +0530
Committer: M. Isuru Tharanga Chrishantha Perera <is...@apache.org>
Committed: Fri Mar 28 18:45:39 2014 +0530
----------------------------------------------------------------------
.../org/apache/stratos/cli/RestCommandLineService.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d6d5b5fd/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 b49f1c9..a9379d5 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
@@ -481,7 +481,7 @@ public class RestCommandLineService {
cartridges[0] = cartridge;
- System.out.println("\nSubscribed Cartridges Info :");
+ System.out.println("\nSubscribed Cartridges Info\n");
System.out.println("\tType : " + cartridge.getCartridgeType());
System.out.println("\tName : " + cartridge.getDisplayName());
System.out.println("\tVersion : " + cartridge.getVersion());
@@ -495,16 +495,16 @@ public class RestCommandLineService {
if (cartridge.getRepoURL() != null) {
System.out.println("\tRepo URL : " + cartridge.getRepoURL());
}
- System.out.println("\tLB Private ip : " + lbPrivateIpSet.toString());
+ System.out.println("\tLB Private IP : " + lbPrivateIpSet.toString());
if (lbFloatingIpSet != null) {
- System.out.println("\tLB Floating Ip : " + lbFloatingIpSet.toString());
+ System.out.println("\tLB Floating IP : " + lbFloatingIpSet.toString());
}
if (cartridge.getProvider().equals("data")) {
System.out.println("\tDB-username : " +cartridge.getDbUserName());
System.out.println("\tDB-password : " +cartridge.getPassword());
- System.out.println("\tDB-HostIP (private) : " +cartridge.getIp());
+ System.out.println("\tDB-Host IP (private) : " +cartridge.getIp());
if (cartridge.getPublicIp() != null) {
- System.out.println("\tDB-HostIP (floating) : "
+ System.out.println("\tDB-Host IP (floating) : "
+ cartridge.getPublicIp());
}
}
@@ -1785,7 +1785,7 @@ public class RestCommandLineService {
for (PortMapping portMapping : portMappings) {
String url = portMapping.getProtocol()+"://"+ cartridge.getHostName() + ":" + portMapping.getProxyPort() + "/";
- urlBuilder.append(url).append(",");
+ urlBuilder.append(url).append(", ");
}
return urlBuilder.toString();