Changeset 3580 for framework

Show
Ignore:
Timestamp:
06/24/10 09:00:30 (2 years ago)
Author:
elemoine
Message:

base Map Fish? on Pylons 1.0, r=bbinet (bbinet's review comments taken into account) (closes #575)

Location:
framework/server/trunk
Files:
1 added
2 removed
5 modified

Legend:

Unmodified
Added
Removed

  • framework/server/trunk/docs/framework/index.txt

    r3569 r3580  
    4141   customizing-webservices 
    4242   spatial-databases 
     43   upgrading 
    4344 
    4445 

  • framework/server/trunk/mapfish/templates/controller.py_tmpl

    r2309 r3580  
    11from pylons import request, response, session, tmpl_context as c 
    2 from pylons.controllers.util import abort, redirect_to 
     2from pylons.controllers.util import abort, redirect 
    33 
    44from {{basePkg}}.lib.base import BaseController 

  • framework/server/trunk/mapfish/templates/model.py_tmpl

    r3569 r3580  
    44 
    55from mapfish.sqlalchemygeom import GeometryTableMixIn 
    6 from {{basePkg}}.model.meta import engine, Base 
     6from {{basePkg}}.model.meta import Session, Base 
    77 
    88class {{modelClass}}(Base, GeometryTableMixIn): 
    … …  
    1313    {{endif}} 
    1414        "autoload": True, 
    15         "autoload_with": engine 
     15        "autoload_with": Session.bind 
    1616    } 
    17     {{geomColName}} = GeometryColumn({{geomType}}(dimension=2, srid={{epsg}})) 
     17    {{geomColName}} = GeometryColumn({{geomType}}(srid={{epsg}})) 

  • framework/server/trunk/mapfish/templates/test_controller.py_tmpl

    r1589 r3580  
    33class Test{{contrClass}}Controller(TestController): 
    44    def test_index(self): 
    5         response = self.app.get(url_for(controller='{{fullModName}}')) 
     5        response = self.app.get(url(controller='{{fullModName}}')) 
    66        # Test response... 

  • framework/server/trunk/setup.py

    r3569 r3580  
    2828 
    2929requirements = ['SQLAlchemy>=0.6.1,<=0.6.99', 
    30                 'Pylons>=0.9.7,<=0.9.7.99', 
     30                'Pylons>=1.0,<=1.0.99', 
    3131                'geojson>=1.0,<=1.0.99', 
    3232                'GeoAlchemy>=0.3,<=0.3.99']