[Zorba-coders] [Merge] lp:~zorba-coders/zorba/redirect into lp:zorba
Validation queue job redirect-2011-11-25T12-45-17.416Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/redirect/+merge/83227 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/redirect into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/redirect into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/redirect/+merge/83227 -- https://code.launchpad.net/~zorba-coders/zorba/redirect/+merge/83227 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/redirect into lp:zorba
I prefer a different fix, which brings us closer to the end goal of mixing PULs and XDM. I have committed this fix. Please review and make sure it works with xqxq. -- https://code.launchpad.net/~zorba-coders/zorba/redirect/+merge/83227 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/redirect into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/redirect into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/redirect/+merge/83227 -- https://code.launchpad.net/~zorba-coders/zorba/redirect/+merge/83227 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/redirect into lp:zorba
Validation queue job redirect-2011-11-24T10-23-15.44Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/redirect/+merge/83227 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/redirect into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/redirect into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/redirect/+merge/83227 -- https://code.launchpad.net/~zorba-coders/zorba/redirect/+merge/83227 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/redirect into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/redirect into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/redirect/+merge/83227 -- https://code.launchpad.net/~zorba-coders/zorba/redirect/+merge/83227 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/redirect into lp:zorba
Validation queue job redirect-2011-11-23T22-30-21.892Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/redirect/+merge/83227 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/redirect into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1. Got: 3 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/redirect/+merge/83227 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/redirect into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/redirect into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/redirect/+merge/83227 -- https://code.launchpad.net/~zorba-coders/zorba/redirect/+merge/83227 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/redirect into lp:zorba
Matthias Brantner has proposed merging lp:~zorba-coders/zorba/redirect into
lp:zorba.
Requested reviews:
Matthias Brantner (matthias-brantner)
Chris Hillery (ceejatec)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/redirect/+merge/82964
Following redirects when resolving URLs. Mostly used when importing modules or
schemas.
--
https://code.launchpad.net/~zorba-coders/zorba/redirect/+merge/82964
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2011-11-16 04:00:29 +
+++ ChangeLog 2011-11-22 02:55:26 +
@@ -29,6 +29,7 @@
corruption will occur)
* Fixed bug # (Should not destroy the parent of a node that is being detached
before the detach is done).
+ * Added const qualifier to StaticContext::getAuditEvent()
* Fixed bug #3408181 (available-collection() returns undeclared collections)
* Fixed bug #859465 (Fatal error if a PUL contains two deactivate IC primitives)
* Fixed bug #859467 (Fatal error if a PUL contains two activate Foreign Key primitives)
=== modified file 'include/zorba/static_context.h'
--- include/zorba/static_context.h 2011-11-15 08:23:20 +
+++ include/zorba/static_context.h 2011-11-22 02:55:26 +
@@ -586,7 +586,7 @@
* @return the audit event
*/
virtual audit::Event*
- getAuditEvent() = 0;
+ getAuditEvent() const = 0;
/** \brief Returns the QName of all external variables within the
=== modified file 'include/zorba/zorba.h'
--- include/zorba/zorba.h 2011-06-17 03:47:29 +
+++ include/zorba/zorba.h 2011-11-22 02:55:26 +
@@ -33,6 +33,7 @@
#include zorba/collection_manager.h
#include zorba/xquery.h
#include zorba/zorba_string.h
+#include zorba/iterator.h
namespace zorba {
=== modified file 'src/api/staticcontextimpl.cpp'
--- src/api/staticcontextimpl.cpp 2011-11-15 08:23:20 +
+++ src/api/staticcontextimpl.cpp 2011-11-22 02:55:26 +
@@ -1424,7 +1424,7 @@
audit::Event*
-StaticContextImpl::getAuditEvent()
+StaticContextImpl::getAuditEvent() const
{
return theCtx-get_audit_event();
}
=== modified file 'src/api/staticcontextimpl.h'
--- src/api/staticcontextimpl.h 2011-11-15 08:23:20 +
+++ src/api/staticcontextimpl.h 2011-11-22 02:55:26 +
@@ -246,7 +246,7 @@
setAuditEvent(audit::Event* anEvent);
virtual audit::Event*
- getAuditEvent();
+ getAuditEvent() const;
virtual void
getExternalVariables(Iterator_t aVarsIter) const;
=== modified file 'src/context/dynamic_loader.cpp'
--- src/context/dynamic_loader.cpp 2011-10-19 16:19:45 +
+++ src/context/dynamic_loader.cpp 2011-11-22 02:55:26 +
@@ -191,14 +191,6 @@
}
-DynamicLoader
-DynamicLoader::getInstance()
-{
- static DynamicLoader singleton;
- return singleton;
-}
-
-
DynamicLoader::~DynamicLoader()
{
for (LibrarySet_t::const_iterator lIter = theLibraries.begin();
@@ -265,7 +257,7 @@
if (modfile-good())
{
-ExternalModule* lModule = getInstance().loadModule(potentialModuleFile);
+ExternalModule* lModule = loadModule(potentialModuleFile);
if (lModule)
{
if (lModule-getURI().c_str() != aNsURI)
=== modified file 'src/context/dynamic_loader.h'
--- src/context/dynamic_loader.h 2011-08-08 13:51:27 +
+++ src/context/dynamic_loader.h 2011-11-22 02:55:26 +
@@ -29,18 +29,17 @@
class DynamicLoader
{
public:
- static ExternalModule* getExternalModule(
+ ExternalModule* getExternalModule(
zstring const aNsURI,
static_context aSctx);
private:
+ friend class GlobalEnvironment;
DynamicLoader();
~DynamicLoader();
- static DynamicLoader getInstance();
-
ExternalModule* loadModule(const zstring aFile) const;
#ifdef WIN32
=== modified file 'src/context/static_context.cpp'
--- src/context/static_context.cpp 2011-11-15 08:23:20 +
+++ src/context/static_context.cpp 2011-11-22 02:55:26 +
@@ -207,7 +207,7 @@
if (dyn_loaded_module)
{
ZORBA_ASSERT(sctx);
- module = DynamicLoader::getExternalModule(lURI, *sctx);
+ module = GENV_DYNAMIC_LOADER-getExternalModule(lURI, *sctx);
// no way to get the module
if (!module)
@@ -2634,7 +2634,7 @@
// dynamic loader
if (!found)
{
-lModule = DynamicLoader::getExternalModule(aURI, *this);
+lModule = GENV_DYNAMIC_LOADER-getExternalModule(aURI, *this);
// no way to get the module
if (!lModule)
@@ -3400,7 +3400,7 @@
/***//**
/
-audit::Event* static_context::get_audit_event()
+audit::Event* static_context::get_audit_event() const
{
const static_context* sctx = this;
audit::Event* res = sctx-theAuditEvent;
=== modified file 'src/context/static_context.h'
--- src/context/static_context.h 2011-11-15 08:23:20 +
+++ src/context/static_context.h 2011-11-22 02:55:26 +
@@ -917,7
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/redirect into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/redirect into lp:zorba has been updated. Commit Message changed to: Following redirects when resolving URLs. Mostly used when importing modules or schemas. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/redirect/+merge/82964 -- https://code.launchpad.net/~zorba-coders/zorba/redirect/+merge/82964 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/redirect into lp:zorba
Matthias Brantner has proposed merging lp:~zorba-coders/zorba/redirect into lp:zorba. Requested reviews: Matthias Brantner (matthias-brantner) Chris Hillery (ceejatec) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/redirect/+merge/82965 Following redirects when resolving URLs. Mostly used when importing modules or schemas. -- https://code.launchpad.net/~zorba-coders/zorba/redirect/+merge/82965 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'src/util/http_util.cpp' --- src/util/http_util.cpp 2011-08-20 01:30:48 + +++ src/util/http_util.cpp 2011-11-22 03:00:32 + @@ -56,7 +56,7 @@ lFactory-createAttributeNode(lRequestElement, lFactory-createQName(, method), Item(), lFactory-createString(GET)); lFactory-createAttributeNode(lRequestElement, lFactory-createQName(, href), Item(), lFactory-createString(theUri.c_str())); lFactory-createAttributeNode(lRequestElement, lFactory-createQName(, override-media-type), Item(), lFactory-createString(text/plain)); -lFactory-createAttributeNode(lRequestElement, lFactory-createQName(, follow-redirect), Item(), lFactory-createString(false)); +lFactory-createAttributeNode(lRequestElement, lFactory-createQName(, follow-redirect), Item(), lFactory-createString(true)); Zorba_CompilerHints_t lHints; lHints.opt_level = ZORBA_OPT_LEVEL_O1; theStaticContext-loadProlog(import module namespace httpc = \http://www.zorba-xquery.com/modules/http-client\;;, -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/redirect into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/redirect/+merge/82964 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/redirect into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/redirect into lp:zorba has been updated. Commit Message changed to: Following redirects when resolving URLs. Mostly used when importing modules or schemas. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/redirect/+merge/82965 -- https://code.launchpad.net/~zorba-coders/zorba/redirect/+merge/82965 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/redirect into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/redirect/+merge/82965 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/redirect into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/redirect/+merge/82965 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/redirect into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/redirect into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/redirect/+merge/82965 -- https://code.launchpad.net/~zorba-coders/zorba/redirect/+merge/82965 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/redirect into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/redirect into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/redirect/+merge/82965 -- https://code.launchpad.net/~zorba-coders/zorba/redirect/+merge/82965 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
