You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sj...@apache.org on 2014/07/25 12:54:09 UTC

[04/12] git commit: Incorporated review comments PR#74

Incorporated review comments PR#74


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/7107304c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/7107304c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/7107304c

Branch: refs/heads/master
Commit: 7107304c7ef30996568b66e7277aa373614ed2d9
Parents: a8cf861
Author: bhairavi sankar <bh...@gmail.com>
Authored: Fri Jul 18 17:14:00 2014 -0400
Committer: bhairavi sankar <bh...@gmail.com>
Committed: Tue Jul 22 23:20:26 2014 -0400

----------------------------------------------------------------------
 .../src/main/webapp/assets/css/brooklyn.css     |   2 +-
 usage/jsgui/src/main/webapp/assets/js/router.js |  34 +++---
 .../brooklyn/rest/resources/ServerResource.java | 112 +++++++++----------
 3 files changed, 69 insertions(+), 79 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7107304c/usage/jsgui/src/main/webapp/assets/css/brooklyn.css
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/webapp/assets/css/brooklyn.css b/usage/jsgui/src/main/webapp/assets/css/brooklyn.css
index 801cfac..21cb5ba 100644
--- a/usage/jsgui/src/main/webapp/assets/css/brooklyn.css
+++ b/usage/jsgui/src/main/webapp/assets/css/brooklyn.css
@@ -49,7 +49,7 @@ textarea {
 }
 
 .userName-top {
-	display: inline-block;
+    display: inline-block;
     vertical-align: bottom;
     float: right;
     text-align: bottom;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7107304c/usage/jsgui/src/main/webapp/assets/js/router.js
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/webapp/assets/js/router.js b/usage/jsgui/src/main/webapp/assets/js/router.js
index ff68300..09c96b2 100644
--- a/usage/jsgui/src/main/webapp/assets/js/router.js
+++ b/usage/jsgui/src/main/webapp/assets/js/router.js
@@ -89,23 +89,23 @@ define([
         }
     };
     
-	getUser = function() {
-		$.ajax({
-			type : "GET",
-			url : "/v1/server/user",
-			dataType : "text",
-			success : function(data) {
-				console.log("Successfully fetched user details");
-				if (data != null) {
-					$("#user").html(data);
-				}
-			},
-			error : function(data) {
-				console.error("ERROR fetching user details");
-				console.debug(data);
-			}
-		});
-	}
+    getUser = function() {
+        $.ajax({
+            type : "GET",
+            url : "/v1/server/user",
+     	   dataType : "text",
+     	   success : function(data) {
+     	       console.log("Successfully fetched user details");
+     	       if (data != null) {
+     			$("#user").html(data);
+     		   }
+     		},
+     		error: function(data) {
+     			console.error("ERROR fetching user details");
+     			console.debug(data);
+     		}
+       });
+     };
 
     var Router = Backbone.Router.extend({
         routes:{

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7107304c/usage/rest-server/src/main/java/brooklyn/rest/resources/ServerResource.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/main/java/brooklyn/rest/resources/ServerResource.java b/usage/rest-server/src/main/java/brooklyn/rest/resources/ServerResource.java
index 6cba018..6b23242 100644
--- a/usage/rest-server/src/main/java/brooklyn/rest/resources/ServerResource.java
+++ b/usage/rest-server/src/main/java/brooklyn/rest/resources/ServerResource.java
@@ -40,79 +40,69 @@ import brooklyn.rest.transform.HighAvailabilityTransformer;
 import brooklyn.util.time.CountdownTimer;
 import brooklyn.util.time.Duration;
 
-public class ServerResource extends AbstractBrooklynRestResource implements
-		ServerApi {
+public class ServerResource extends AbstractBrooklynRestResource implements ServerApi {
 
-	private static final Logger log = LoggerFactory
-			.getLogger(ServerResource.class);
+    private static final Logger log = LoggerFactory.getLogger(ServerResource.class);
 
-	@Override
-	public void reloadBrooklynProperties() {
-		brooklyn().reloadBrooklynProperties();
-	}
-
-	@Override
-	public void shutdown(final boolean stopAppsFirst, final long delayMillis) {
-		log.info("REST call to shutdown server, stopAppsFirst=" + stopAppsFirst
-				+ ", delayMillis=" + delayMillis);
-
-		new Thread() {
-			public void run() {
-				Duration delayBeforeSystemExit = Duration.millis(delayMillis);
-				CountdownTimer timer = delayBeforeSystemExit.countdownTimer();
+    @Override
+    public void reloadBrooklynProperties() {
+        brooklyn().reloadBrooklynProperties();
+    }
 
-				if (stopAppsFirst) {
-					List<Task<?>> stoppers = new ArrayList<Task<?>>();
-					for (Application app : mgmt().getApplications()) {
-						if (app instanceof StartableApplication)
-							stoppers.add(Entities.invokeEffector(
-									(EntityLocal) app, app,
-									StartableApplication.STOP));
-					}
-					for (Task<?> t : stoppers) {
-						t.blockUntilEnded();
-						if (t.isError()) {
-							log.warn("Error stopping application " + t
-									+ " during shutdown (ignoring)\n"
-									+ t.getStatusDetail(true));
-						}
-					}
-				}
+    @Override
+    public void shutdown(final boolean stopAppsFirst, final long delayMillis) {
+        log.info("REST call to shutdown server, stopAppsFirst="+stopAppsFirst+", delayMillis="+delayMillis);
+        
+        new Thread() {
+            public void run() {
+                Duration delayBeforeSystemExit = Duration.millis(delayMillis);
+                CountdownTimer timer = delayBeforeSystemExit.countdownTimer();
 
-				((ManagementContextInternal) mgmt()).terminate();
-				timer.waitForExpiryUnchecked();
+                if (stopAppsFirst) {
+                    List<Task<?>> stoppers = new ArrayList<Task<?>>();
+                    for (Application app: mgmt().getApplications()) {
+                        if (app instanceof StartableApplication)
+                            stoppers.add(Entities.invokeEffector((EntityLocal)app, app, StartableApplication.STOP));
+                    }
+                    for (Task<?> t: stoppers) {
+                        t.blockUntilEnded();
+                        if (t.isError()) {
+                            log.warn("Error stopping application "+t+" during shutdown (ignoring)\n"+t.getStatusDetail(true));
+                        }
+                    }
+                }
 
-				System.exit(0);
-			}
-		}.start();
-	}
+                ((ManagementContextInternal)mgmt()).terminate(); 
+                timer.waitForExpiryUnchecked();
+                
+                System.exit(0);
+            }
+        }.start();
+    }
 
-	@Override
-	public String getVersion() {
-		return BrooklynVersion.get();
-	}
+    @Override
+    public String getVersion() {
+        return BrooklynVersion.get();
+    }
 
-	@Override
-	public String getStatus() {
-		return mgmt().getHighAvailabilityManager().getNodeState().toString();
-	}
+    @Override
+    public String getStatus() {
+        return mgmt().getHighAvailabilityManager().getNodeState().toString();
+    }
 
-	@Override
-	public HighAvailabilitySummary getHighAvailability() {
-		ManagementPlaneSyncRecord memento = mgmt().getHighAvailabilityManager()
-				.getManagementPlaneSyncState();
-		return HighAvailabilityTransformer.highAvailabilitySummary(mgmt()
-				.getManagementNodeId(), memento);
-	}
+    @Override
+    public HighAvailabilitySummary getHighAvailability() {
+        ManagementPlaneSyncRecord memento = mgmt().getHighAvailabilityManager().getManagementPlaneSyncState();
+        return HighAvailabilityTransformer.highAvailabilitySummary(mgmt().getManagementNodeId(), memento);
+    }
 
 	@Override
-	public String getUser() {
-		EntitlementContext entitlementContext = Entitlements
-				.getEntitlementContext();
-		if (entitlementContext != null && entitlementContext.user() != null) {
+    public String getUser() {
+		EntitlementContext entitlementContext = Entitlements.getEntitlementContext();
+		if (entitlementContext!=null && entitlementContext.user()!=null){
 			return entitlementContext.user();
 		} else {
-			return null; // User can be null if no authentication was requested
+			return null; //User can be null if no authentication was requested
 		}
 	}
 }