small fix

remove old calendar code

update goa file

cleanup, update import

missing import

fix box selectors

JsonController: only return an ajaxHtmlHead div if extra resources are needed

fix unittest_widgets.py: remove stupid (copy/paste) now().strftime call

fix unittest_widgets.py: the cubicweb-page-template format is only available when simpleTAL is found

set a default selector on base app objects class

assert __select__ is callable

update import

use extra_kwargs attribute namte

test update

update import

fix page_size handling, use abstract_has_related_entities

fix State's RichString definition: 'default' was used instead of 'default_format'

remove buggy unittest_owl

require explicit registration control

restore appropriate in State's incontext view, moved it into wfentities

merge

fix tests

fix selector

hide foaf_usable until cleaning

fix specfied_etype_implements's __call__ prototype

oops

protect against None rset

update imports

fix used selectors

more iface based cleanup fixes

merge

fix test in-progress

introduce abstract selectors to get rid of the my_selector() contagion

fix import, use non_final_entity instead of implements('Any')

fix selector search and refactor auto-instantiation

implements some str, fix implements selector, test and fixes

function moved to cwvreg

test and fix interface based objects cleaning

no more used

fix selectors argus

tell on which class the assertion's failed

add rtype compat

skip_relations is defined on FormMixIn

fix selector of EntityRelatedTab, next step is to find a way to avoid this kind of selector

each subclass of EntitySelector should call its __init__ method

fix score computation in implements()

fix compatibility class EntityAction: test for accepts() before has_condition()

cleanup

fix match_user_groups, appobject_selectable, searchstate_accept* compat selectors

kill Form, EntityForm and AnyRsetForm

some test fixes

use pytest now

update some imports

oops

merge

chainall / chainfirst ensures selectors are instantiated

instantiate selectors wherever needed

remove explicit access to .im_func when overriding `registered`

update import

fix test

kill vobject_helpver

some minor __select__ composition fixes

fix lltrace to consider __call__ and pure functions decoration

update import

update test for new test schema

no more extra schema necessary for tests here

unittest_entity ok

merge

remove dead code

oops

test upgrade

update imports

replaced most of __selectors__ assignments with __select__

fix selectors compat

updat etest

assert oid

better name for NormalizedTextView, drop ContentAddedMixIn

fix traced_selection

need safety belt for class registered twice (during test for instance)

__select__ is not a classmethod anymore, it's a pure function (or a Selector instance), we have to pass the class explicitly

get kwargs as well

ooooops

__selectors__ must return a tuple

some more s/__selectors__/__select__ but still more to come

__select__ migration

unnecessary registerrer

first pass to use __select__ instead of __selectors__

fix _instantiate_selector() mini bug (make sure obj is a class before calling issubclass)

improve __selectors__() so that it always return a tuple

safety belt inside _accept_interfaces() as it might be called on a class that doesn't provide (yet) __select__

should no more be used, drop documentation

__select__ migration

update some imports

oops

backport tests

default to yes_registerer

doc update, move yes_registerer here

kill id_registerer

simple optimization and readability fix

do it the other way

merge

update imports of "cubicweb.common.entity" and use the new module path "cubicweb.entity"

remove autoselectors metaclass, __select__ is built during registration

Selector objects need to provide a `func_name` attribute for minimum (backward) compatibilit with selectors defined as functions

overridden `registered()` methods must call the base implementation

avoid dependency to common

move utils from cw.common to cw

__selectors__ -> __select__

no more used for a while now

turn simpletal optional

new ext package for modules depending on an option third party package

bw compat modules

move view and appobject from cw.common to cw

bw compat modules

move view and appobject from cw.common to cw

__selectors__ compat

introduce MultiSelector base class

provide objectify_selector decorator for very simple selectors

merge

try a register_all method

kill kick_registerer (actually moved to asteretud), fix _accepts_interface w/ new implements selector

reimplements chainall/chainfirst using [And/Or], implemenent search_selector function on Selector base class

replace deprecated cubicweb.common.selectors by its new module path (cubicweb.selectors)

move EProperty management views into eproperties.py

should add relation_possible selector only if require_permission is in the schema

missing super call

remove all accepts = ('Foo',) declaration and use __selectors__ = implements('Foo') instead

removing explicit access to im_func, this is not necessary anymore

allow selectors to be a single element instead of tuples (this is the first step towards removing the metaclass)

registerer cleanup

fix imports

fix initializers

oops

use class_renamed, not class_moved

update import

merge

merge branches in tls-sprint (bis)

merge heads in tls-sprint branch

provide a new add_cubes() migration function for cases where the new cubes are linked together by new relations In this case, we need to add all new cubes at once.

merge

small fix

factorized impl

simplify registerers

still more explicit registration

drop more registerers

start with explicit registration

rename registration callback, clear argument to register

update import

interface handling should be done here

reorganize a bit, some cleanup and fixes

drop unused support of .required, no more necessary .accepts check, and extresources_registerer

kill ExtResourcesBoxTemplate

move _MARKER from appobject to web.request

properly kill/depreciate component base class, only keep Component

work in progress, draft for manual registration

VComponent needs visible property

only kill Singleton[V]Component, keep [V]Component classes

work in progress - fix deprecation of EntityAction - fix various selectors bugs

oops

kill [Singleton]VComponent

has_relation selector compat, fix some deprecation msg

use & operator instead of chainall, deprecate EntityAction, fix relation_possible action argument

various SyntaxErrors / missing import fixes + reorganization of the `registered` classmethod

kill AddEntityAction

proper documentation, some bug fixes, upgrade some selectors

more doc, upgrade but_etype and appobject_selectable selectors

drop LinToEntityAction2, only used by the comment cube

some selectors update + drop EntityRelationView (only used by jpl)

merge

merge

merge

[jsoncontroller] reorganize _html_exec (used by replacePageChunk) to output required css and js scripts

[javascript] rewrote loadxhtml() plugin in order to be able to pass the XHR object to postAjaxLoad

split main template into main template + page-content template

drop EntityAction usage in cw, upgrade rql_condition and friends

i18n translations for register

add register link

change label for new registered users

handle register with email adress

require_group/match_user_group -> match_user_groups

move cubicweb.common.selectors to cubicweb.selectors

more selectors update

kill EmptyRsetVeiw

major selector refactoring (mostly to avoid looking for select parameters on the target class), start accept / interface unification)

simple test implementation for binary operators on selectors

provide a new WorkflowableEntityType base class (will be refactored later, maybe with schema interfaces)

extract workflow related schema definitions in its own file

use RichString wherever possible in the stdlib

adding ISIOC interface

[doc] fix path in makefile

provide a new RichString attribute type The follwing declaration: class Card(EntityType): content = RichString(fulltextindexed=True, default_format='text/rest') is equivalent to : class Card(EntityType): content_format = String(meta=True, internationalizable=True, default='text/rest', constraints=[format_constraint]) content = String(fulltextindexed=True)

chainfirst / chainall can be given a name argument to use as inner function's name

complete doc about rtags

merge

complete doc about rtags

adding foaf_usable views to supports reusing foaf fragment in other views (for instance sioc view)

test fix

update copyright

don't display too much rset rows

don't use chainall when it's not necessary

merge

more cleanup

cleanup

removing project_linked_data view

take care, cnx may be None in which case we can't get/set session data

must not be a class attribute\!

rset may be empty

[preferences] de-uglify a bit, remove useless parameter

[tabs] reuse the new set_cookie controller method

merge

[preferences] preferences sections will now remember their collapsed/open status

[controllers] a set_cookie method

[views] cleanup, be less heavy with self.w ...

ask if anonymous should be allowed, configure accordingly

hop

fix select principal so results are predictable during tests

merge

use UStringIO

merge

merge

return success or not on creation of user

page_size can be given in url attributes

have navigation on top and bottom of search results

get custom page_size as argument

test if anonymous

add page_size argument

permit override of display index on simple navigation

adding views to test

small fix

refactoring owl view (now corresponding to tbox) and owlabox view

i18n update

fix rtags to have correct msgids for bookmarked_by relation

don't use navigation in deleteconf form

update_search_state in the publisher since it should be done whatever the controller

update copyright

[forms] simplify this test

[forms] fix #4240 (edition form should not show relations section if no relation is editable)

merge

propostion for integrating the simple setup

add files for a simple setup

fix some typos

try to get raw text values in rset csv view

test and fix potential error with None optional relation

test update

fix test (this view is not used actually...)

no more htmlcheck argument

email is no crypted anymore in foaf view

Added tag cubicweb-debian-version-3_0_9-1 for changeset a8e9e53b245d

Added tag cubicweb-version-3_0_9 for changeset 7ad527099393

published

some doc typos

[testlib] fix pb. related to class scoped variables

old .validators attribute is now .vid_validators

add a linked data view for project. this linked data view will be extended to pertinent entities in the future. We remark that we use doap format if it exists (doap:created, doap:description ...), we use our own vocabulary (available in tbox view) if doap does not supports it.

[selectors] fix inline doc

[tabs] prepare for reloadability

error correction

small fix

oups

new foaf version

[actions] import * : just say no

[gmap] zoom level is now a url parameter

pertinent title layout for OWL view

comments fix

refactoring OWLView (TBOX+ABOX) and OWLABOXView (pseudo-ABOX for a given entity). By now OWLView is using (for cost advantage) OWLABOXLightView.

[testlib] quickfix (needs review) : missing validators attribute

missing quotes #102063

[tabs] dead code

merge

[tabs] fix the no-eid case, remove unused code

fix js syntax in tabs.forceview()

simplification of lazy tabs mechanism

use lgc.decorators.monkeypatch in tabs.py

fix default value of pyro ns host

[javascript] extract ajax postprocessing in a separate function

(merge)

add required attribute modname in __pkginfo__.py skeleton

small corrections

xhtml fixes

set self.rset else we're missing some stuff since TheMainTemplate instance as None as rset

refactor validator selection using a content type based dictionnary (which may be overriden by view id) + functions to instrumentize the registry to check what's tested and what's not

implements cell_call

specify content type for text views

use self.rset / self.row

fix xml views: ensure we're generating valide tag names (rsetxml), protect against control characters in xml view (should probably be generalized...)

EntityVComponent should now implements cell_call

give row when selecting/dispatching content navigation component

typo

typo

function to make generation of a simple sgml tag

hcal is a microformat and can be inserted in html

foaf euser view

cubicweb__loadurl -> cubicweb:lazyloadurl

fix table filter form: get_widget shouldn't be called once rqlst has been recovered

remove debug print

pyrorql source now ignore external eids which are themselves coming from another external source already in use by the repository (should have the same uri)

method has been renamed

oops

owl cleanup

search in reverted order else in case of installed cubes (eg in cubicweb/cubes) we do not remove all expected parts

sax only validator for owl views for now

while EntityView has been used here?? (changeset 501 by laure)

cleaning code

merge

[tabs] improve pylint note :)

OWLABOXView correction

OWLABOXView correction

merge

cleaning OWLView

missing import

[tabs] cookie name par cube instance will reduce cookie collisions

OWLView correction (namespace)

owl module has two views : OWLView (TBOX) and OWLABOXView (more or less ABOX. indeed, it layout ABOX information only for an specific entity and not all entities)

removing OWLView from this file (in order to put OWLView into owl module)

merge

merge

[tabs] * monkey patch the default json controller to work around #80969 * rename the wrapper

refactor table views to share more code and to avoid empty filter table in some case

set default to empty string, not None

[#80966] Opera supports xhtml and handles namespaces properly but it breaks jQuery.attr(), so xhtml_browser return False if the webbrowser is opera

python 2.4 compat

backport stable branch changesets

[javascript] minor lints

clenaup

[tabs] prune tab set _before_ computing & setting 'active' tab

[tabs] * provide the required json controller there * stuff back in the lazy tab construction mechanism, with some documentation bits

fix a pb. with something -- but WHAT was that ? :-/

[tabs] avoid nasty surprises when tab name change & the cookie remembers the past

merge

[tabs] provide a working tabs implementation, that lazy-loads tab content & should remember the current position

Added tag cubicweb-debian-version-3_0_4-1 for changeset fc222bc99929

Added tag cubicweb-version-3_0_4 for changeset 2e400b8dfc25

3.0.4

backport stable branch changesets

insert missing is_instance_of relations during db-init

update some copyrights

merge

allow divid as method argument (backport from default)

yield self if no ft container found

should clear local perm cache if first attempt failed

don't check owl

fix test

xhtml compliance

remove debug print

oops

allow divid as argument

unnecessary

[facets] AttributeFacet can now declare which kind of comparator they want to use, default is '=' (+ tidy trailing white spaces)

updated list of cubes in the doc

(merge)

[treeview] replace span elements by div for xhtml conformance

add Homepage field in debian/control

use 99 as default sequence number in runlevel

merge

owl schema error correction

backport stable branch changesets

fix syntax in skeleton's __pkginfo__.py

merge

this test validate that the generated owl (from a cubicweb instance) respect owl xml schema (and rdf xml schema).

backport stable branch changesets

fix EditRelationBoxTemplate: the box might be passed an additional 'view' paraemter

ontology comment

OwlView generated a owl layout from schema application. It can be registered with an owl extension.

update dependencies in js unit tests

a note for later

typo

pylint fixes

pylint fixes

use empty string instead of None as possible context value to avoid getting an <optgroup> tag in associated widget

selector update

test fixes

cleanup

fix need intersect detection

error resilient state method

fix unittest_repository

test fixes

need_intersect test and fixes

merge stable branch

apycot fix

merge

[javascript][facets] facetargs wasn't evaluated in all cases

cross relations handling fix

missing html_escape

massive selector update

any_rset is a better name than rset

some changes to make update to new selector names easier

consider vocabulary of Int fields

move selection of entity types to test in a method to ease overriding

oops, var shouldn't be poped there

sort email addresses and remove doubled ones before sending the email

creating 3.0 maintenance branch

add missing data file + jslint

merge

Added tag cubicweb-debian-version-3_0_3-1 for changeset a736bae56d4a

Added tag cubicweb-version-3_0_3 for changeset 0cb027c056f9

my mistake

bump

oops, get back cross_relation from mapping to rql source

merge

Added tag cubicweb-debian-version-3_0_3-1 for changeset 463ba5606b15

Added tag cubicweb-version-3_0_3 for changeset a7366dd3c33c

fix bug in entity.related_rql(): fetch_attr list / fetchorder weren't computed correctly

merge

Added tag cubicweb-debian-version-3_0_2-1 for changeset 18d3e56c1de4

Added tag cubicweb-version-3_0_2 for changeset 221886d8e3c8

add a max-width

reactivate tests and fix bug triggering removal of undesired relation (eg type restriction) in some cases

selector update

merge

[documentation] add some more rql documentation

[documentation] update cube names and add links to their page on the forge

update documentation of cube structure

3.0.2

cleanup, backport manage perm action from jpl

'as' becomes a keyword when with statement activated

don't use global _

merge

don't introduce a spurious 'x' key in the entity-as dict

refactor

catch Exception in case there is some unexepected selector bug

fix w/ local roles

cross_relations support

OR EXISTS fix, typos

skip neged relation here as well

avoid potentialy mis-interpreted attribute error

this should have been in 3.0.1

selector update

password can now be given as optional argument

don't try to remove relation if source has no entities

typo

merge

[FAQ] debugging selectors : a new faq entry

fix entities cleanup: source entities may be used in some relations

oops

db-check fixes

[javascript] add safety belt in cubicwebSortValueExtraction for cases where cubicweb:sortvalue is not available

revert local debug checkin

fix dependencies

3.0.1

i18n update

turn exlog into a cw-ctl command

fix i18n catalog generation

check apphome is not None

get extra space available in primary view when no right boxes

fix rset xml view

new rsetxml view, reusing most code from csvexport view

facet widgets css cleanup

cleanup

unncessary call

make author information configurable

missing test resources

merge

use mtconverter's html_unescape rather than saxutils' escape to deal with any html entity

update some selectors

backport unittest_ldapuser

merge

[doc] Added a cook book as advised and moved ldap import scripts in the cook book. Started a howto about configuring LDAP but it will have to be reviewed by experts.

merge

[doc] typo

oops, these were committed unintentionnally

missing tab.png for tabs decoration

remove spurious print

typo

update selector section

cleanup/fix cut variants

cleaning code

deprecated code

merge

add try except to avoid error w/ unsupported stuff, log it and return incomplete filter form

more translation and complements

tweak the faq a bit

adding test for special html caractere

backport unittest_multisources from cubicweb-multisources

fixes for some cases of neged inlined relations, may have to use (new) IntersectStep. XXX: write IntersectFetchStep

consider intersect *and* distinct

in some cases (eg ambiguous neged relations), INTERSECT should be used instead of DISTINCT

merge

[doc] FAQ improvements based on posts in forums.

merge

[doc] Integration of card http://intranet.logilab.fr/intra/card/eid/3355 to the book.

merge

simplify selectors debugging

backport msplanner test from cubicweb-multisources

exlog script to examine rql logs

selectors update

don't show folder section on index page when there is now folder yet

don't show add new action for composed objects

merge

add contextprop_selector to the DownloadBox so that it behaves like all other boxes

[skeleton] simplify MANFIEST.in to reflect the default skeleton layout

fix author tag

cleanup

make req argument optional

fix security bug w/ query using 'NOT X eid 123'

py2.4 bug

fix skeleton __pkginfo__ template

[doc] Add a little to views chapter.

we've been using jquery for a while now

[doc] Add sub-section about selectors and a little about registerer in views chapter.

Added tag cubicweb-version_3_0_0 for changeset a93da6d88d4e

[doc] announce 3.0 release

merge

merge

[doc] no underline for links

[doc] add links to google-appengine forum

[doc] minor text improvements

[doc] Improvement to the Views chapter. Moved content about the main template in the Templates chapter.

merge

[doc] Removes references to LAX.

[doc] Removes chapter in french from english book which is duplicated content already translated.

[doc] links are back to orangered

[doc] Change styling of <a> and removes section "This Page" from left column template.

[doc] small text improvement

[doc] Fix typo: s/necessarry/necessary/g. Polished a little bit foundations.

[doc] Switch graphic to english.

[doc] Adds scripts to auto-generate modules list to index and add to the documentation.

[doc] Fix docstring indentation.

[doc] Better title? Brief introduction of the chapter.

[doc] Moves cube description from tutoriel to foundations.

[doc] Fix indentation issues.

[doc] Sphinx CSS small improvment.

[doc] Move out from tutoriel RSS and CSS to make it independant chapters. Adds a conclusion to the tutorial.

[doc] Renaming of part II sub-sections accordingly.

[doc] Renaming for advanced thematic.

[doc] Renaming for tests thematic.

[doc] Renaming for repository customization thematic.

[doc] Renaming for web interface thematic.

[doc] Renaming for data model thematic fix bad naming convention.

[doc] Renaming for data model thematic.

[doc] Add thematics within Part II - Development.

[doc] Add thematics within Part II - Development.

[doc] Removal of duplicated chapter.

[doc] Add internal links.

merge

[doc] Improved tutoriel. Moved appropriate content to cubicweb foundations chapter. Adds section to fill about cubicweb-ctl shell.

[i18n] missing translation

i18n roundup

fix lxml is available, we can have a nicer version of soup2xhtml even if its lxml < 2.0

merge

packaging fixes

[doc] fix rql intro

[doc] Change logo has been moved to FAQ.

[doc] Does not keep mercurial forest as the only reference for path description.

[doc] Add link to cubicweb's forge for cubes available. Removes deprecated env configuration.

merge

[doc] Add cubicweb-dev package to install.

[doc] trying to improve the tutorial

[doc] simpler install and mercurial instructions

oops

fix include_dirs

packaging fix: distribute skeleton

merge

[doc] Left components in index page.

[doc] Rename component with cube.

huuummm

2.99.99

2.99.99

restore multi-sources capabilities

merge

[doc] add internal links from book abstract

more selector renaming

check we have a description *yams attribute*

search external_resources in application home

duh?

new RelatedEntityBoxTemplate base class

define an actual download box, keeping download_box function for bw compat

RAAAAAAAAAAAAAAAAAAAAAAAAAAAA

don't fail if row is None (at least necessary when searching for possible views)

merge

merge

Added tag cubicweb-debian-version-2_99_6-1 for changeset c718f6495ace

Added tag cubicweb-version-2_99_6 for changeset 5b58fd1aba50

2.99.7

fix debian package

don't give a bool instead of a result set to select a view

missing file

2.99.6

begin selector renaming (work in progress)

begin renaming for selectors, keeping bw compat

rename to tabs.py

unnecessary

should skip shared directory

cleanup skel packaging

some mini function to ease role (subject/object) manipulation

new has_related_entities selector

[doc] Replace all : s/by example/for example/

[lxml] lxml version < 2 does not provide an iter method on some elements hence we fall back on another implementation of safe_cut

[javascript] remove redundant call (changing mouse shape)

[javascript] localise variable

[javascript] reloadBox: return deferred for further callback chaining

merge

small rearrangement for facets

merge

[doc] Add internal link. Suppress content display which creates duplicated toc.

note

Added tag cubicweb-debian-version-2_99_5-1 for changeset 91793edd3b2f

Added tag cubicweb-version-2_99_5 for changeset 68b7a9246885

2.99.5

layout image

cleaning code

tabview is used to call each view for each tab

adding files (formely appearing in jpl) specific to cubicweb

Added tag cubicweb-debian-version-2_99_4-1 for changeset eaf1089ae49d

Added tag cubicweb-version-2_99_4 for changeset 76c1707200cf

version 2.99.4

[doc] Now uses specs from rql/doc

[doc] Translation to english.

[doc] Translation to english.

div.facetBody's height is changed dynamically

make round corners optional on facet boxes

include cubicbeb.facet.css when displaying filterbox

FacetItem now takes req as first parameter of __init__, THIS IS BACKWARD INCOMPATIBLE

update debian dependencies for next cubicweb package

backport most of CMHN css for facets

merge

[doc] Inserted content from LAX book about templates.

[doc] Translation to english.

[doc] Translation to english.

Added tag cubicweb-debian-version-2_99_3-1 for changeset aa7d98f8f07f

Added tag cubicweb-version-2_99_3 for changeset 8280fa6906f3

2.99.3 version

merge

[doc] Fix bad reference.

[doc] Translation to english.

[doc] Completed translation to english of entities definition section.

merge

[doc] Started translation to english of entities definition section.

quick hack to fix treeview double toggling bug

ChangeStateForm: extract method redirectpath() for easier subclassing

EditBox: extract workflow actions construction in a separate method

fix interface_selector bug If a view using this selector defines an `accepts` attribute, the view should be selectable only if the entity is of one of the accepted types (+need to consider schema inheritance)

if EntityBoxTemplate now uses _rqlcondition_selector, it must also define a default condition attribute

upload icon (actually just the download icon rotated)

merge

code moved to logilab.common.logging_ext

cleanup

only hide strict suboject in default view

check we don't get selection ambiguity: if yes, log error in production env, raise in other modes

don't ask confirm

add _rql_condition selector to default EntityBox selectors

get actual exception class instead of 'unicode' in the error view

TreeMixin : provide an iterator on the parents

merge

updates done to documentation after following instructions for a new cube

use repr (instead of str) to print rql in __repr__ method of a result set

don't systematically init_log, it may breaks client log configuration

fix default values

don't change Pyro.config here

missing import

cleaning code

cleaning code

repairing error from preceding commit

repairing error from preceding commit

repairing error from preceding commit

adding tests for safe_cut (and text_cut_letters)

safe_cut fonction return a resum from html text. safe_cut uses fonction text_cut_letters which cut text given a number of letters.

cleaning code

cleaning code

some jslint

spanish is now a supported language

fix es.po syntax

spanish translations, thanks to Juan Celso Flores

[doc] rewrite paragraph about installing debian and ubuntu packages

static files support

provide a specific version of treeview to display files and directories

cleaning code

missing import

docstring

unused import

erge

cleaning code

adding two different rss feed component

add selector to test if result set is an object (for rss feed component)

absolute minimum CSS for table filters

more error resilient

skel cleanup

trigger 3.0 migration for beta versions

don't display additional owners in metadata, this is confusing

ask less questions on instance creation

add css rule for active inputs

new debian/changelog entry for 2.99.2 version

provide a --verbose option to the newcube command and only ask for a short description by default

rename NewTemplateCommand class into NewCubeCommand

provide a lightier skeleton - no sobjects.py file - no site_cubicweb.py file - do not import cubicweb.css in the cube's css

[doc] Translation to english.

[doc] Merged translation of paragraph.

[doc] Translation of security model section.

[doc] divided book in parts

merge

views with rss feed

[doc] add book map

move registry details into their own chapter, add missing classmethod() for __select__ definition

merged into the security definition section

nothing to do here

oops

[doc] missing file

[doc] add another level to Foundation part of the book

[doc] missing file

[doc] more merging and reorg

[doc] merge old lax book with the rest

[doc] more chapters

[doc] add a level for better structure

merge

[doc] Merged GAE and foundations.