update default config files with new app namespace

IPython/config/profile/default/ipcluster_config.py

@@ -23,8 +23,8 b' c = get_config()'
 # - PBSControllerLauncher
 # - SGEControllerLauncher
 # - WindowsHPCControllerLauncher
-# c.Global.controller_launcher = 'IPython.parallel.apps.launcher.LocalControllerLauncher'
-# c.Global.controller_launcher = 'IPython.parallel.apps.launcher.PBSControllerLauncher'
+# c.IPClusterStartApp.controller_launcher = 'IPython.parallel.apps.launcher.LocalControllerLauncher'
+# c.IPClusterStartApp.controller_launcher = 'IPython.parallel.apps.launcher.PBSControllerLauncher'
 
 # Options are:
 # - LocalEngineSetLauncher
@@ -32,25 +32,25 b' c = get_config()'
 # - PBSEngineSetLauncher
 # - SGEEngineSetLauncher
 # - WindowsHPCEngineSetLauncher
-# c.Global.engine_launcher = 'IPython.parallel.apps.launcher.LocalEngineSetLauncher'
+# c.IPClusterEnginesApp.engine_launcher = 'IPython.parallel.apps.launcher.LocalEngineSetLauncher'
 
 #-----------------------------------------------------------------------------
-# Global configuration
+# Application configuration
 #-----------------------------------------------------------------------------
 
 # The default number of engines that will be started. This is overridden by
 # the -n command line option: "ipcluster start -n 4"
-# c.Global.n = 2
+# c.IPClusterEnginesApp.n = 2
 
 # Log to a file in cluster_dir/log, otherwise just log to sys.stdout.
-# c.Global.log_to_file = False
+# c.BaseParallelApp.log_to_file = False
 
 # Remove old logs from cluster_dir/log before starting.
-# c.Global.clean_logs = True
+# c.BaseParallelApp.clean_logs = True
 
 # The working directory for the process. The application will use os.chdir
 # to change to this directory before starting.
-# c.Global.work_dir = os.getcwd()
+# c.BaseParallelApp.work_dir = os.getcwd()
 
 
 #-----------------------------------------------------------------------------

IPython/config/profile/default/ipcontroller_config.py

@@ -3,54 +3,55 b' from IPython.config.loader import Config'
 c = get_config()
 
 #-----------------------------------------------------------------------------
-# Global configuration
+# Application configuration
 #-----------------------------------------------------------------------------
+app = c.IPControllerApp
 
-# Basic Global config attributes
+# Basic Application config attributes
 
 # Start up messages are logged to stdout using the logging module.
 # These all happen before the twisted reactor is started and are
 # useful for debugging purposes. Can be (10=DEBUG,20=INFO,30=WARN,40=CRITICAL) 
 # and smaller is more verbose.
-# c.Global.log_level = 20
+# app.log_level = 20
 
 # Log to a file in cluster_dir/log, otherwise just log to sys.stdout.
-# c.Global.log_to_file = False
+# app.log_to_file = False
 
 # Remove old logs from cluster_dir/log before starting.
-# c.Global.clean_logs = True
+# app.clean_logs = True
 
 # A list of Python statements that will be run before starting the 
 # controller. This is provided because occasionally certain things need to 
 # be imported in the controller for pickling to work.
-# c.Global.import_statements = ['import math']
+# app.import_statements = ['import math']
 
 # Reuse the controller's JSON files. If False, JSON files are regenerated
 # each time the controller is run. If True, they will be reused, *but*, you
 # also must set the network ports by hand. If set, this will override the
 # values set for the client and engine connections below.
-# c.Global.reuse_files = True
+# app.reuse_files = True
 
 # Enable exec_key authentication on all messages. Default is True
-# c.Global.secure = True
+# app.secure = True
 
 # The working directory for the process. The application will use os.chdir
 # to change to this directory before starting.
-# c.Global.work_dir = os.getcwd()
+# app.work_dir = os.getcwd()
 
 # The log url for logging to an `iploggerz` application.  This will override
 # log-to-file.
-# c.Global.log_url = 'tcp://127.0.0.1:20202'
+# app.log_url = 'tcp://127.0.0.1:20202'
 
 # The specific external IP that is used to disambiguate multi-interface URLs.
 # The default behavior is to guess from external IPs gleaned from `socket`.
-# c.Global.location = '192.168.1.123'
+# app.location = '192.168.1.123'
 
 # The ssh server remote clients should use to connect to this controller.
 # It must be a machine that can see the interface specified in client_ip.
 # The default for client_ip is localhost, in which case the sshserver must
 # be an external IP of the controller machine.
-# c.Global.sshserver = 'controller.example.com'
+# app.sshserver = 'controller.example.com'
 
 # the url to use for registration.  If set, this overrides engine-ip,
 # engine-transport client-ip,client-transport, and regport.

IPython/config/profile/default/ipengine_config.py

@@ -1,24 +1,25 b''
 c = get_config()
 
 #-----------------------------------------------------------------------------
-# Global configuration
+# Application configuration
 #-----------------------------------------------------------------------------
+app = c.IPEngineApp
 
 # Start up messages are logged to stdout using the logging module.
 # These all happen before the twisted reactor is started and are
 # useful for debugging purposes. Can be (10=DEBUG,20=INFO,30=WARN,40=CRITICAL) 
 # and smaller is more verbose.
-# c.Global.log_level = 20
+# app.log_level = 20
 
 # Log to a file in cluster_dir/log, otherwise just log to sys.stdout.
-# c.Global.log_to_file = False
+# app.log_to_file = False
 
 # Remove old logs from cluster_dir/log before starting.
-# c.Global.clean_logs = True
+# app.clean_logs = True
 
 # A list of strings that will be executed in the users namespace on the engine
 # before it connects to the controller.
-# c.Global.exec_lines = ['import numpy']
+# app.exec_lines = ['import numpy']
 
 # The engine will try to connect to the controller multiple times, to allow
 # the controller time to startup and write its FURL file. These parameters 
@@ -26,17 +27,17 b' c = get_config()'
 # (connect_delay) between attemps. The actual delay between attempts gets
 # longer each time by a factor of 1.5 (delay[i] = 1.5*delay[i-1])
 # those attemps.
-# c.Global.connect_delay = 0.1
-# c.Global.connect_max_tries = 15
+# app.connect_delay = 0.1
+# app.connect_max_tries = 15
 
 # By default, the engine will look for the controller's JSON file in its own
 # cluster directory. Sometimes, the JSON file will be elsewhere and this 
 # attribute can be set to the full path of the JSON file.
-# c.Global.url_file = u'/path/to/my/ipcontroller-engine.json'
+# app.url_file = u'/path/to/my/ipcontroller-engine.json'
 
 # The working directory for the process. The application will use os.chdir
 # to change to this directory before starting.
-# c.Global.work_dir = os.getcwd()
+# app.work_dir = os.getcwd()
 
 #-----------------------------------------------------------------------------
 # MPI configuration
@@ -78,7 +79,7 b' c = get_config()'
 
 # You should not have to change these attributes.
 
-# c.Global.url_file_name = u'ipcontroller-engine.furl'
+# app.url_file_name = u'ipcontroller-engine.furl'