Merge lp:~zorba-coders/zorba/feature-EntityDataNS into lp:zorba
Proposed by
Matthias Brantner
Status: | Needs review |
---|---|
Proposed branch: | lp:~zorba-coders/zorba/feature-EntityDataNS |
Merge into: | lp:zorba |
Diff against target: |
304 lines (+95/-14) 10 files modified
ChangeLog (+1/-0) include/zorba/uri_resolvers.h (+2/-0) src/api/uri_resolver_wrappers.cpp (+17/-2) src/compiler/rewriter/rules/fold_rules.cpp (+1/-2) src/compiler/translator/translator.cpp (+8/-10) src/context/static_context.cpp (+25/-0) src/context/static_context.h (+20/-0) src/context/uri_resolver.cpp (+13/-0) src/context/uri_resolver.h (+5/-0) test/api/userdefined_uri_resolution.cpp (+3/-0) |
To merge this branch: | bzr merge lp:~zorba-coders/zorba/feature-EntityDataNS |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Chris Hillery | Needs Fixing | ||
Matthias Brantner | Approve | ||
Review via email: mp+148618@code.launchpad.net |
Commit message
Added getTargetNamespace to the URLResolver EntityData. This allows the URIMapper/
to distinguish between target namespaces and location hints.
To post a comment you must log in.
Unmerged revisions
- 11242. By Chris Hillery
-
Fix typo.
- 11241. By Matthias Brantner
-
added getTargetNamespace to the URLResolver EntityData. This allows the URIMapper/
URLResolver
to distinguish between target namespaces and location hints.
Validation queue starting for merge proposal. zorbatest. lambda. nu:8080/ remotequeue/ feature- EntityDataNS- 2013-02- 15T06-19- 46.112Z/ log.html
Log at: http://