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/11 08:33:15 UTC
[1/2] stratos git commit: Reading metering and monitoring dashboard
urls at webapp initialization
Repository: stratos
Updated Branches:
refs/heads/stratos-4.1.x b9ff2b10f -> 8bdb54a9b
Reading metering and monitoring dashboard urls at webapp initialization
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/a2641d8f
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/a2641d8f
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/a2641d8f
Branch: refs/heads/stratos-4.1.x
Commit: a2641d8f5da3b2105c4c2d9a07a2e71327aab3ed
Parents: df2abb3
Author: Thanuja <th...@wso2.com>
Authored: Tue Nov 10 17:22:01 2015 +0530
Committer: Thanuja <th...@wso2.com>
Committed: Tue Nov 10 17:25:40 2015 +0530
----------------------------------------------------------------------
.../org.apache.stratos.manager.console/console/app.js | 13 ++++++++++++-
.../console/controllers/login/login.jag | 6 ------
2 files changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/a2641d8f/components/org.apache.stratos.manager.console/console/app.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/app.js b/components/org.apache.stratos.manager.console/console/app.js
index 6eada1d..4eb8700 100644
--- a/components/org.apache.stratos.manager.console/console/app.js
+++ b/components/org.apache.stratos.manager.console/console/app.js
@@ -35,10 +35,21 @@ caramel.configs({
}
});
+//checking whether das stats publisher is enabled
for (var i = 0; i < dasConfig.node.length(); i++) {
dasStatsPublisherEnabled = dasConfig.node[i].statsPublisherEnabled.text();
if (dasStatsPublisherEnabled == true) {
break;
}
}
-application.put("dasStatsPublisherEnabled",dasStatsPublisherEnabled);
\ No newline at end of file
+application.put("dasStatsPublisherEnabled", dasStatsPublisherEnabled);
+
+//reading metering and monitoring dashboard urls from cartridge-config.properties file
+var cartridgeConfig = carbon.server.loadConfig("cartridge-config.properties");
+var prop = new java.util.Properties();
+var inputStream = new java.io.ByteArrayInputStream(new java.lang.String(cartridgeConfig).getBytes());
+prop.load(inputStream);
+application.put("meteringDashboardUrl", prop.getProperty("das.metering.dashboard.url"));
+application.put("monitoringDashboardUrl", prop.getProperty("das.monitoring.dashboard.url"));
+
+
http://git-wip-us.apache.org/repos/asf/stratos/blob/a2641d8f/components/org.apache.stratos.manager.console/console/controllers/login/login.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/login/login.jag b/components/org.apache.stratos.manager.console/console/controllers/login/login.jag
index f3d85f1..cec877b 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/login/login.jag
+++ b/components/org.apache.stratos.manager.console/console/controllers/login/login.jag
@@ -34,12 +34,6 @@ if (hostName === null || hostName === '') {
var httpPort = 9763 + parseInt(offset, 10),
httpsPort = 9443 + parseInt(offset, 10);
-var meteringDashboardUrl = process.getProperty("das.metering.dashboard.url");
-var monitoringDashboardUrl = process.getProperty("das.monitoring.dashboard.url");
-
-application.put("meteringDashboardUrl", meteringDashboardUrl);
-application.put("monitoringDashboardUrl", monitoringDashboardUrl);
-
process.setProperty('server.host', hostName);
process.setProperty('http.port', httpPort.toString());
process.setProperty('https.port', httpsPort.toString());
[2/2] stratos git commit: Merge branch 'dashboard-url' of
https://github.com/Thanu/stratos into stratos-4.1.x
Posted by ga...@apache.org.
Merge branch 'dashboard-url' of https://github.com/Thanu/stratos into stratos-4.1.x
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/8bdb54a9
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/8bdb54a9
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/8bdb54a9
Branch: refs/heads/stratos-4.1.x
Commit: 8bdb54a9b6042949a37748cd95fd28708c6dca8b
Parents: b9ff2b1 a2641d8
Author: gayangunarathne <ga...@wso2.com>
Authored: Wed Nov 11 13:02:30 2015 +0530
Committer: gayangunarathne <ga...@wso2.com>
Committed: Wed Nov 11 13:02:30 2015 +0530
----------------------------------------------------------------------
.../org.apache.stratos.manager.console/console/app.js | 13 ++++++++++++-
.../console/controllers/login/login.jag | 6 ------
2 files changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------