svn commit: r1448445 - in /incubator/ambari/trunk: CHANGES.txt ambari-web/app/config.js ambari-web/app/initialize.js

[yu...@apache.org]

Author: yusaku
Date: Wed Feb 20 22:29:09 2013
New Revision: 1448445

URL: http://svn.apache.org/r1448445
Log:
AMBARI-1453. Move Ambari Web application config from initialize.js to another config file. (yusaku)

Added:
    incubator/ambari/trunk/ambari-web/app/config.js
Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/ambari-web/app/initialize.js

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1448445&r1=1448444&r2=1448445&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Wed Feb 20 22:29:09 2013
@@ -42,6 +42,9 @@ Trunk (unreleased changes):
  accessible for demo/test purposes. (mahadev)
 
  IMPROVEMENTS
+ 
+ AMBARI-1453. Move Ambari Web application config from initialize.js to
+ another config file. (yusaku)
 
  AMBARI-1450. Remove hard-coded stack version. (yusaku)
 

Added: incubator/ambari/trunk/ambari-web/app/config.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/config.js?rev=1448445&view=auto
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/config.js (added)
+++ incubator/ambari/trunk/ambari-web/app/config.js Wed Feb 20 22:29:09 2013
@@ -0,0 +1,46 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+var App = require('app');
+
+App.testMode = false;
+App.skipBootstrap = false;
+App.alwaysGoToInstaller = false;
+App.apiPrefix = '/api/v1';
+App.defaultStackVersion = 'HDP-1.2.2';
+App.defaultLocalStackVersion = 'HDPLocal-1.2.2';
+App.defaultJavaHome = '/usr/jdk/jdk1.6.0_31';
+App.addServicesEnabled = false;
+// default AJAX timeout
+App.timeout = 180000;
+// max number of retries for certain AJAX calls
+App.maxRetries = 3;
+App.bgOperationsUpdateInterval = 6000;
+App.componentsUpdateInterval = 6000;
+App.contentUpdateInterval = 15000;
+App.maxRunsForAppBrowser = 500;
+
+// this is to make sure that IE does not cache data when making AJAX calls to the server
+$.ajaxSetup({
+  cache: false
+});
+
+/**
+ * Test Mode values
+ */
+App.test_hostname = 'hostname';
\ No newline at end of file

Modified: incubator/ambari/trunk/ambari-web/app/initialize.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/initialize.js?rev=1448445&r1=1448444&r2=1448445&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/initialize.js (original)
+++ incubator/ambari/trunk/ambari-web/app/initialize.js Wed Feb 20 22:29:09 2013
@@ -19,27 +19,7 @@
 
 window.App = require('app');
 
-App.testMode = false;
-App.skipBootstrap = false;
-App.alwaysGoToInstaller = false;
-App.apiPrefix = '/api/v1';
-App.defaultStackVersion = 'HDP-1.2.2';
-App.defaultLocalStackVersion = 'HDPLocal-1.2.2';
-App.defaultJavaHome = '/usr/jdk/jdk1.6.0_31';
-App.addServicesEnabled = false;
-// default AJAX timeout
-App.timeout = 180000;
-// max number of retries for certain AJAX calls
-App.maxRetries = 3;
-App.bgOperationsUpdateInterval = 6000;
-App.componentsUpdateInterval = 6000;
-App.contentUpdateInterval = 15000;
-App.maxRunsForAppBrowser = 500;
-
-// this is to make sure that IE does not cache data when making AJAX calls to the server
-$.ajaxSetup({
-  cache: false
-});
+require('config');
 
 require('messages');
 require('utils/base64');
@@ -66,11 +46,6 @@ require('utils/http_client');
 
 App.initialize();
 
-/**
- * Test Mode values
- */
-App.test_hostname = 'hostname';
-
 console.log('after initialize');
 console.log('TRACE: app.js-> localStorage:Ambari.authenticated=' + localStorage.getItem('Ambari' + 'authenticated'));
 console.log('TRACE: app.js-> localStorage:currentStep=' + localStorage.getItem(App.get('router').getLoginName() + 'Installer' + 'currentStep'));