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:15 UTC
[10/12] git commit: Review Comments PR#74
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/c5cbd246
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/c5cbd246
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/c5cbd246
Branch: refs/heads/master
Commit: c5cbd246831883d8b3ea54ec7d4b5dd8eb639f6d
Parents: 1ceeb7d
Author: bhairavi sankar <bh...@gmail.com>
Authored: Fri Jul 18 15:29:50 2014 -0400
Committer: bhairavi sankar <bh...@gmail.com>
Committed: Tue Jul 22 23:20:26 2014 -0400
----------------------------------------------------------------------
.../src/main/webapp/assets/css/brooklyn.css | 9 +-
usage/jsgui/src/main/webapp/assets/js/router.js | 20 +++-
usage/jsgui/src/main/webapp/index.html | 2 +-
.../brooklyn/rest/resources/ServerResource.java | 112 ++++++++++---------
4 files changed, 85 insertions(+), 58 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c5cbd246/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 615f2b2..801cfac 100644
--- a/usage/jsgui/src/main/webapp/assets/css/brooklyn.css
+++ b/usage/jsgui/src/main/webapp/assets/css/brooklyn.css
@@ -48,15 +48,14 @@ textarea {
padding-right: 0px !important
}
-.userName-top{
+.userName-top {
display: inline-block;
vertical-align: bottom;
float: right;
text-align: bottom;
- padding-top: 75px;
- padding-left: 0px;
- padding-right: 10px;
- padding-bottom: 0px;
+ font-weight:bold;
+ font-size:15px;
+ padding: 75px 10px 0 0;
}
.navbar .nav {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c5cbd246/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 11e7ae6..ff68300 100644
--- a/usage/jsgui/src/main/webapp/assets/js/router.js
+++ b/usage/jsgui/src/main/webapp/assets/js/router.js
@@ -88,6 +88,24 @@ define([
return view
}
};
+
+ 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:{
@@ -216,6 +234,6 @@ define([
}
});
new HaStandbyOverlay({ el: $("#ha-standby-overlay") }).render();
-
+ getUser();
return Router
})
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c5cbd246/usage/jsgui/src/main/webapp/index.html
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/webapp/index.html b/usage/jsgui/src/main/webapp/index.html
index cf8803e..65beb11 100644
--- a/usage/jsgui/src/main/webapp/index.html
+++ b/usage/jsgui/src/main/webapp/index.html
@@ -45,7 +45,7 @@ under the License.
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
- <div class="userName-top" id="user" style="font-weight:bold;font-size:15px"></div>
+ <div class="userName-top" id="user"></div>
<div class="container">
<a class="logo" href="#" title="Brooklyn, Version 0.7.0-SNAPSHOT"><!-- Logo added via CSS --></a> <!-- BROOKLYN_VERSION -->
<div class="menubar-top">
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c5cbd246/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 032bd05..6cba018 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,69 +40,79 @@ 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 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 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();
+ 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));
+ }
+ }
+ }
- 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));
- }
- }
- }
+ ((ManagementContextInternal) mgmt()).terminate();
+ timer.waitForExpiryUnchecked();
- ((ManagementContextInternal)mgmt()).terminate();
- timer.waitForExpiryUnchecked();
-
- System.exit(0);
- }
- }.start();
- }
+ 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){
+ 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
+ } else {
+ return null; // User can be null if no authentication was requested
}
}
}