Changeset 6071


Ignore:
Timestamp:
01/12/09 12:01:48 (10 years ago)
Author:
spascoe
Message:

Changed references to wms_ddc_vis to cowsserver. NOTE: filename changes are TODO therefore this will not run.

Location:
cowsserver/trunk
Files:
29 edited

Legend:

Unmodified
Added
Removed
  • cowsserver/trunk/MANIFEST.in

    r5403 r6071  
    1 recursive-include lib/wms_ddc_vis/public * 
    2 recursive-include lib/wms_ddc_vis/templates * 
     1recursive-include lib/cowsserver/public * 
     2recursive-include lib/cowsserver/templates * 
  • cowsserver/trunk/buildout/buildout.cfg

    r6041 r6071  
    33download-cache = /home/users/pnorton/python_eggs  
    44 
    5 parts = wms_ddc_vis 
     5parts = cowsserver 
    66develop =  
    77  ../ 
     
    1010  ../../../cows_trunk 
    1111 
    12 [wms_ddc_vis] 
     12[cowsserver] 
    1313recipe = zc.recipe.egg 
    1414interpreter = py 
     
    3030  mock 
    3131  setuptools 
    32   wms_ddc_vis 
     32  cowsserver 
    3333  simplejson 
    3434  Shapely 
  • cowsserver/trunk/development.ini

    r5773 r6071  
    2121 
    2222[app:main] 
    23 use = egg:wms_ddc_vis 
     23use = egg:cowsserver 
    2424full_stack = true 
    2525cache_dir = %(here)s/data 
  • cowsserver/trunk/lib/wms_ddc_vis/config/environment.py

    r5403 r6071  
    44from pylons import config 
    55 
    6 import wms_ddc_vis.lib.app_globals as app_globals 
    7 import wms_ddc_vis.lib.helpers 
    8 from wms_ddc_vis.config.routing import make_map 
     6import cowsserver.lib.app_globals as app_globals 
     7import cowsserver.lib.helpers 
     8from cowsserver.config.routing import make_map 
    99 
    1010from cows.pylons.config import configCSML 
     
    2222 
    2323    # Initialize config with the basic options 
    24     config.init_app(global_conf, app_conf, package='wms_ddc_vis', 
     24    config.init_app(global_conf, app_conf, package='cowsserver', 
    2525                    template_engine='genshi', paths=paths) 
    2626 
    2727    config['routes.map'] = make_map() 
    2828    config['pylons.g'] = app_globals.Globals() 
    29     config['pylons.h'] = wms_ddc_vis.lib.helpers 
     29    config['pylons.h'] = cowsserver.lib.helpers 
    3030 
    3131    # Customize templating options via this variable 
  • cowsserver/trunk/lib/wms_ddc_vis/config/middleware.py

    r5403 r6071  
    1717 
    1818 
    19 from wms_ddc_vis.config.environment import load_environment 
     19from cowsserver.config.environment import load_environment 
    2020 
    2121 
  • cowsserver/trunk/lib/wms_ddc_vis/controllers/catalogue.py

    r6041 r6071  
    11import logging 
    22 
    3 import wms_ddc_vis.lib.base as base 
     3import cowsserver.lib.base as base 
    44 
    55log = logging.getLogger(__name__) 
  • cowsserver/trunk/lib/wms_ddc_vis/controllers/coastwms.py

    r6041 r6071  
    1515from routes import url_for 
    1616from cows.model.wms import WmsDatasetSummary 
    17 from wms_ddc_vis.lib.wms_request_log_utils import buildLogString, wms_request_logger 
     17from cowsserver.lib.wms_request_log_utils import buildLogString, wms_request_logger 
    1818 
    1919import time 
     
    2626import matplotlib.colors 
    2727 
    28 from wms_ddc_vis.lib.image_import import Image 
    29 from wms_ddc_vis.lib.base import request, response, c 
     28from cowsserver.lib.image_import import Image 
     29from cowsserver.lib.base import request, response, c 
    3030 
    3131from cows.model.wms import MetadataURL 
    3232from cows.xml.iso19115_subset import OnlineResource 
    3333 
    34 from wms_ddc_vis.lib.modified_beaker_cache_decorator import beaker_cache 
     34from cowsserver.lib.modified_beaker_cache_decorator import beaker_cache 
    3535 
    3636log = logging.getLogger(__name__) 
  • cowsserver/trunk/lib/wms_ddc_vis/controllers/csmlwcs.py

    r5742 r6071  
    66from pylons import request 
    77 
    8 from wms_ddc_vis.lib.wms_request_log_utils import buildLogString, wms_request_logger 
     8from cowsserver.lib.wms_request_log_utils import buildLogString, wms_request_logger 
    99 
    1010log = logging.getLogger(__name__) 
  • cowsserver/trunk/lib/wms_ddc_vis/controllers/csmlwfs.py

    r5742 r6071  
    88from cows.pylons.wfs_controller import WFSController 
    99 
    10 from wms_ddc_vis.lib.wms_request_log_utils import buildLogString, wms_request_logger 
     10from cowsserver.lib.wms_request_log_utils import buildLogString, wms_request_logger 
    1111 
    1212class CsmlwfsController(WFSController): 
  • cowsserver/trunk/lib/wms_ddc_vis/controllers/csmlwms.py

    r5978 r6071  
    1515DRGeoplotWmsLayer.EnableXMLAxisConfig = True 
    1616 
    17 from wms_ddc_vis.lib.base import request, response 
    18 from wms_ddc_vis.lib.wms_request_log_utils import buildLogString, wms_request_logger 
    19  
    20 from wms_ddc_vis.lib.modified_beaker_cache_decorator import beaker_cache 
     17from cowsserver.lib.base import request, response 
     18from cowsserver.lib.wms_request_log_utils import buildLogString, wms_request_logger 
     19 
     20from cowsserver.lib.modified_beaker_cache_decorator import beaker_cache 
    2121 
    2222log = logging.getLogger(__name__) 
  • cowsserver/trunk/lib/wms_ddc_vis/controllers/csmlwms_csml.py

    r5879 r6071  
    55from cows.service.imps.csmlbackend.wms_csmllayer import CSMLwmsLayerMapper 
    66 
    7 from wms_ddc_vis.lib.wms_request_log_utils import buildLogString, wms_request_logger 
    8 from wms_ddc_vis.lib.base import request 
     7from cowsserver.lib.wms_request_log_utils import buildLogString, wms_request_logger 
     8from cowsserver.lib.base import request 
    99log = logging.getLogger(__name__) 
    1010 
  • cowsserver/trunk/lib/wms_ddc_vis/controllers/csmlwms_csml_geoplot.py

    r5849 r6071  
    1212CSMLGeoplotWmsLayer.EnableDisplayOptions = True 
    1313 
    14 from wms_ddc_vis.lib.base import request, response 
    15 from wms_ddc_vis.lib.wms_request_log_utils import buildLogString, wms_request_logger 
     14from cowsserver.lib.base import request, response 
     15from cowsserver.lib.wms_request_log_utils import buildLogString, wms_request_logger 
    1616 
    1717log = logging.getLogger(__name__) 
  • cowsserver/trunk/lib/wms_ddc_vis/controllers/ddc.py

    r5479 r6071  
    11import logging 
    22 
    3 from wms_ddc_vis.lib.base import BaseController, request, response 
     3from cowsserver.lib.base import BaseController, request, response 
    44 
    55log = logging.getLogger(__name__) 
  • cowsserver/trunk/lib/wms_ddc_vis/controllers/demo.py

    r5403 r6071  
    11import logging 
    22 
    3 from wms_ddc_vis.lib.base import * 
     3from cowsserver.lib.base import * 
    44 
    55log = logging.getLogger(__name__) 
  • cowsserver/trunk/lib/wms_ddc_vis/controllers/error.py

    r5403 r6071  
    44from pylons.middleware import error_document_template, media_path 
    55 
    6 from wms_ddc_vis.lib.base import * 
     6from cowsserver.lib.base import * 
    77 
    88class ErrorController(BaseController): 
  • cowsserver/trunk/lib/wms_ddc_vis/controllers/template.py

    r5403 r6071  
    1 from wms_ddc_vis.lib.base import * 
     1from cowsserver.lib.base import * 
    22 
    33class TemplateController(BaseController): 
  • cowsserver/trunk/lib/wms_ddc_vis/lib/base.py

    r6041 r6071  
    1111from pylons.templating import render 
    1212 
    13 import wms_ddc_vis.lib.helpers as h 
    14 import wms_ddc_vis.model as model 
     13import cowsserver.lib.helpers as h 
     14import cowsserver.model as model 
    1515from cows.service.imps.csmlbackend.csmlcommon import globalCSMLConnector 
    1616from cows.pylons.ows_controller import templateLoader 
     
    2020 
    2121ddcVisTemplateLoader = TemplateLoader( 
    22     resource_filename('wms_ddc_vis', 'templates'), 
     22    resource_filename('cowsserver', 'templates'), 
    2323    auto_reload=True, 
    2424    ) 
  • cowsserver/trunk/lib/wms_ddc_vis/tests/functional/test_catalogue.py

    r5849 r6071  
    22__test__ = False 
    33 
    4 from wms_ddc_vis.tests import * 
     4from cowsserver.tests import * 
    55 
    66class TestCatalogueController(TestController): 
  • cowsserver/trunk/lib/wms_ddc_vis/tests/functional/test_coastwms.py

    r5849 r6071  
    1 from wms_ddc_vis.tests import * 
     1from cowsserver.tests import * 
    22 
    33class TestCoastwmsController(TestController): 
  • cowsserver/trunk/lib/wms_ddc_vis/tests/functional/test_csmlwcs.py

    r5849 r6071  
    11__test__ = False 
    2 from wms_ddc_vis.tests import * 
     2from cowsserver.tests import * 
    33 
    44class TestCoastwmsController(TestController): 
  • cowsserver/trunk/lib/wms_ddc_vis/tests/functional/test_csmlwfs.py

    r5849 r6071  
    11__test__ = False 
    2 from wms_ddc_vis.tests import * 
     2from cowsserver.tests import * 
    33 
    44class TestCsmlwfsController(TestController): 
  • cowsserver/trunk/lib/wms_ddc_vis/tests/functional/test_csmlwms.py

    r5403 r6071  
    1 from wms_ddc_vis.tests import * 
     1from cowsserver.tests import * 
    22 
    33class TestCsmlwmsController(TestController): 
  • cowsserver/trunk/lib/wms_ddc_vis/tests/functional/test_demon.py

    r5849 r6071  
    11__test__ = False 
    2 from wms_ddc_vis.tests import * 
     2from cowsserver.tests import * 
    33 
    44class TestDemoController(TestController): 
  • cowsserver/trunk/lib/wms_ddc_vis/tests/owslib_tests/__init__.py

    r6025 r6071  
    99 
    1010def getOwsLibTestOutputDir(): 
    11     outputDir = os.path.abspath(pkg_resources.resource_filename('wms_ddc_vis', '../../output')) 
     11    outputDir = os.path.abspath(pkg_resources.resource_filename('cowsserver', '../../output')) 
    1212         
    1313    owslibTestsOutputFolder = os.path.join(outputDir, 'owslib_tests')  
  • cowsserver/trunk/lib/wms_ddc_vis/tests/owslib_tests/wms_test_image_download.py

    r6025 r6071  
    55''' 
    66from owslib.wms import WebMapService, ServiceException 
    7 from wms_ddc_vis.tests.owslib_tests.owslib_test_utils import parseCowsCatalog 
    8 from wms_ddc_vis.tests.owslib_tests import getOwsLibTestOutputDir 
     7from cowsserver.tests.owslib_tests.owslib_test_utils import parseCowsCatalog 
     8from cowsserver.tests.owslib_tests import getOwsLibTestOutputDir 
    99import  xml.etree as etree 
    1010from urllib import urlencode 
     
    1515import random 
    1616 
    17 import wms_ddc_vis.tests.owslib_tests.owslib_test_utils as utils 
     17import cowsserver.tests.owslib_tests.owslib_test_utils as utils 
    1818 
    1919seed = hash(time.time()) 
     
    225225    st = time.time() 
    226226     
    227     from wms_ddc_vis.tests.owslib_tests import SHORT_LOG_FORMAT_STRING 
     227    from cowsserver.tests.owslib_tests import SHORT_LOG_FORMAT_STRING 
    228228    logging.basicConfig(level=logging.DEBUG, format=SHORT_LOG_FORMAT_STRING) 
    229229     
  • cowsserver/trunk/lib/wms_ddc_vis/tests/unit/test_ddc_render_options_parser.py

    r5479 r6071  
    1010import numpy 
    1111 
    12 from wms_ddc_vis.model.ddc_render_options_parser import DDCRenderOptionsParser 
    13 import wms_ddc_vis.model.ddc_render_options_parser as ddc_render_options_parser 
     12from cowsserver.model.ddc_render_options_parser import DDCRenderOptionsParser 
     13import cowsserver.model.ddc_render_options_parser as ddc_render_options_parser 
    1414 
    1515class TestDDCRenderOptionsParser(unittest.TestCase): 
  • cowsserver/trunk/lib/wms_ddc_vis/websetup.py

    r5403 r6071  
    1 """Setup the wms_ddc_vis application""" 
     1"""Setup the cowsserver application""" 
    22import logging 
    33 
     
    55from pylons import config 
    66 
    7 from wms_ddc_vis.config.environment import load_environment 
     7from cowsserver.config.environment import load_environment 
    88 
    99log = logging.getLogger(__name__) 
  • cowsserver/trunk/setup.py

    r5403 r6071  
    77 
    88setup( 
    9     name='wms_ddc_vis', 
     9    name='cowsserver', 
    1010    version='0.0.1', 
    1111    #description='', 
     
    2121    include_package_data=True, 
    2222    test_suite='nose.collector', 
    23     package_data={'wms_ddc_vis': ['i18n/*/LC_MESSAGES/*.mo']}, 
    24     #message_extractors = {'wms_ddc_vis': [ 
     23    package_data={'cowsserver': ['i18n/*/LC_MESSAGES/*.mo']}, 
     24    #message_extractors = {'cowsserver': [ 
    2525    #        ('**.py', 'python', None), 
    2626    #        ('templates/**.mako', 'mako', None), 
     
    2828    entry_points=""" 
    2929    [paste.app_factory] 
    30     main = wms_ddc_vis.config.middleware:make_app 
     30    main = cowsserver.config.middleware:make_app 
    3131 
    3232    [paste.app_install] 
  • cowsserver/trunk/test.ini

    r5403 r6071  
    11# 
    2 # wms_ddc_vis - Pylons testing environment configuration 
     2# cowsserver - Pylons testing environment configuration 
    33# 
    44# The %(here)s variable will be replaced with the parent directory of this file 
Note: See TracChangeset for help on using the changeset viewer.