Changeset 4467 for MILK


Ignore:
Timestamp:
20/11/08 15:35:54 (11 years ago)
Author:
cbyrom
Message:

Strip out code not relevant to MILK - mainly WCS and WMS stuff - also including the CSML server code + trackback code
Also tidy up structure of 'public' dir - setting up new 'style' dir and
centralising icons in icons dir + remove all unused icons, javascript and stylesheets.
Also strip out testcase code and populate new test directory structure.

Location:
MILK/trunk/milk_server/milk_server
Files:
5 edited
1 copied

Legend:

Unmodified
Added
Removed
  • MILK/trunk/milk_server/milk_server/__init__.py

    r2476 r4467  
    11""" 
    2 ows_server 
     2milk_server 
    33 
    4 This file loads the finished app from ows_server.config.middleware. 
     4This file loads the finished app from milk_server.config.middleware. 
    55 
    66""" 
    77 
    8 from ows_server.config.middleware import make_app 
     8from milk_server.config.middleware import make_app 
  • MILK/trunk/milk_server/milk_server/config/environment.py

    r4198 r4467  
    55from pylons import config 
    66 
    7 import ows_server.lib.app_globals as app_globals 
    8 import ows_server.lib.helpers 
    9 from ows_server.config.routing import make_map 
     7import milk_server.lib.app_globals as app_globals 
     8import milk_server.lib.helpers 
     9from milk_server.config.routing import make_map 
    1010 
    1111# Set-up tools package import for locating NDG Security SSO Service 
     
    2828     
    2929    # Initialize config with the basic options 
    30     config.init_app(global_conf, app_conf, package='ows_server', 
     30    config.init_app(global_conf, app_conf, package='milk_server', 
    3131                    template_engine='kid', paths=paths) 
    32     config.add_template_engine("genshi", "ows_server.templates", {}) 
     32    config.add_template_engine("genshi", "milk_server.templates", {}) 
    3333     
    3434    config['pylons.g'] = app_globals.Globals() 
    35     config['pylons.h'] = ows_server.lib.helpers 
     35    config['pylons.h'] = milk_server.lib.helpers 
    3636    config['routes.map'] = make_map() 
    3737     
  • MILK/trunk/milk_server/milk_server/config/middleware.py

    r3919 r4467  
    1111from pylons.wsgiapp import PylonsApp 
    1212 
    13 from ows_server.config.environment import load_environment 
     13from milk_server.config.environment import load_environment 
    1414 
    15 from ows_server.config.ndgMiddleware import ndgMiddleware 
     15from milk_server.config.ndgMiddleware import ndgMiddleware 
    1616 
    1717# Logging doesn't need configuring if you have paste.translogger in your config file. 
     
    4343    # Put your own middleware here, so that any problems are caught by the error 
    4444    # handling middleware underneath 
    45  
    4645    app = ndgMiddleware(app, g, app_conf) 
    4746    g=app.globals    
    4847     
    49     # Configure logging 
     48    # Configure logging - NB logging config set in the development.ini file 
    5049    #logging.basicConfig(format='%(thread)s %(name)s %(levelname)s %(message)s') 
    5150     
  • MILK/trunk/milk_server/milk_server/config/ndgMiddleware.py

    r4420 r4467  
    11# ndg middleware 
    22from paste.deploy import CONFIG 
    3 from ows_server.models.Utilities import myConfig 
     3from milk_server.lib.Utilities import myConfig 
    44 
    55 
     
    1515         
    1616        #set up the ndg configuration file 
    17          
    18         #Changed by Dom: CONFIG.get wasn't respecting the %(home)s variable, so moved to app_conf section in ini file. 
    19         #cf=CONFIG.get('configfile') 
    2017        cf= CONFIG['app_conf']['configfile'] 
    2118        cf=myConfig(cf) 
     
    2421        self.globals.htdocs=cf.get('DEFAULT','htdocs',None) 
    2522        self.globals.localLink=cf.get('layout','localLink',None) 
    26         self.globals.localImage=cf.get('layout','localImage',None) 
    2723        self.globals.localAlt=cf.get('layout','localAlt','Visit Local Site') 
    2824        self.globals.ndgLink=cf.get('layout','ndgLink','http://ndg.nerc.ac.uk') 
  • MILK/trunk/milk_server/milk_server/config/routing.py

    r4420 r4467  
    1818    # so they may take precedent over the more generic routes. For more information, refer 
    1919    # to the routes manual @ http://routes.groovie.org/docs/ 
    20     #map.connect(':controller/:action/:id') 
    21     #map.connect('*url', controller='template', action='view') 
    2220     
    23     #WMS 
    24     map.connect(':file/wms', controller='csml_wms')  #should become obsolete 
    25     map.connect('wms/:uri', controller='csml_wms') 
    26      
    27     #WCS 
    28     #map.connect(':file/status/:jobID', controller='status', action='getStatus')  #not used currently 
    29     #wcs controller for all versions: (called wcsx) 
    30     map.connect('wcs/:uri', controller='csml_wcsx') 
    31  
    32     #filestore - used for 'store' in wcs 
    33     map.connect('filestore/:file', controller='fetch', action='fetchFile') 
    34      
    35     # following is the shell for the rest of the ndg  
    36     map.connect('upload/:uri', controller = 'editatom', action='upload', uri = None) 
    37     map.connect('editAtom/:uri', controller = 'editatom', action='edit') 
    38     map.connect('saveAtom/:uri/:saveLevel', controller = 'editatom', \ 
     21    # atom editor specific routing 
     22    map.connect('upload/:uri', controller = 'atom_editor/editatom', action='upload', uri = None) 
     23    map.connect('editAtom/:uri', controller = 'atom_editor/editatom', action='edit') 
     24    map.connect('saveAtom/:uri/:saveLevel', controller = 'atom_editor/editatom', \ 
    3925                action='saveAtom', saveLevel='0') 
    40     map.connect('createAtom/:saveData', controller = 'editatom', action='create', \ 
     26    map.connect('createAtom/:saveData', controller = 'atom_editor/editatom', action='create', \ 
    4127                saveData = None) 
    42     map.connect('createGranule', controller = 'editatom', action='createGranule') 
    43     map.connect('atomHome', controller = 'listatom', action='atomHome') 
     28    map.connect('createGranule', controller = 'atom_editor/editatom', action='createGranule') 
     29    map.connect('atomHome', controller = 'atom_editor/listatom', action='atomHome') 
    4430    map.connect('listAtom/:searchData/:associatedAtomID/:associatedAtomType/:associationType', \ 
    45                 controller = 'listatom', action='list', searchData='', \ 
     31                controller = 'atom_editor/listatom', action='list', searchData='', \ 
    4632                associatedAtomID='', associatedAtomType='', associationType='') 
    4733    map.connect('viewDeployments/:uri', controller = 'retrieve', action='viewDeployments') 
    4834 
    49      
     35    # routing for the browse/discovery server 
    5036    map.connect('login', controller='login') 
    5137    map.connect('getCredentials', controller='login', action='getCredentials') 
     
    6450    map.connect('unSelectItem/:entryid/:divid', controller='selectedItems',action='unSelectItem') 
    6551    map.connect('removeSelectedItem/:entryid',controller='selectedItems',action='removeSelectedItem') 
    66     map.connect('visualise', controller='visualise', action='index') 
    6752 
    68     # This route doesn't match the controller's parameters. 
    69     #map.connect('csml/:uri', controller='csml_api') 
    70     # Below is the way it worked before with added 
    71     #"csml" path component 
    72     #map.connect('csml/:file.:format', controller='csml_api', action='index', 
    73               #format='html') 
    74     #map.connect('csml/:file/:(feature).:format', action='getFeature', 
    75               #controller='csml_api', format='html') 
    76     #map.connect('csml/:file/:feature/:action', controller='csml_api') 
    77  
    78     map.connect('trackback/:uri', controller='trackback') 
    7953    map.connect('discovery',controller='discovery') 
    80     map.connect('visualise/:dataset/:view',controller='visualise',action='tabChange') 
    81     map.connect('visualise/:view',controller='visualise',action='featureChange') 
    8254    #do this last or else you'll get bizarre behaviour 
    8355    map.connect('',controller='discovery',action='index') 
  • MILK/trunk/milk_server/milk_server/websetup.py

    r2476 r4467  
    33def setup_config(command, filename, section, vars): 
    44    """ 
    5     Place any commands to setup ows_server here. 
     5    Place any commands to setup milk_server here. 
    66    """ 
    77    conf = paste.deploy.appconfig('config:' + filename) 
Note: See TracChangeset for help on using the changeset viewer.