Merge lp:~zorba-coders/zorba/update-dfmodule into lp:zorba

Proposed by Cezar Andrei
Status: Merged
Approved by: Cezar Andrei
Approved revision: 10786
Merged at revision: 10787
Proposed branch: lp:~zorba-coders/zorba/update-dfmodule
Merge into: lp:zorba
Diff against target: 12 lines (+1/-1)
1 file modified
modules/ExternalModules.conf (+1/-1)
To merge this branch: bzr merge lp:~zorba-coders/zorba/update-dfmodule
Reviewer Review Type Date Requested Status
Chris Hillery Approve
Cezar Andrei Approve
Review via email: mp+102884@code.launchpad.net

Commit message

Update trunk to use data-formating-module branch at at latest tag: zorba-2.2-jvm.

Description of the change

Update trunk to use data-formating-module branch at at latest tag: zorba-2.2-jvm.

To post a comment you must log in.
Revision history for this message
Cezar Andrei (cezar-andrei) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job update-dfmodule-2012-04-20T15-45-58.207Z is finished. The final status was:

All tests succeeded!

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Approve, 1 Pending.

Revision history for this message
Cezar Andrei (cezar-andrei) wrote :

The import to XMLSchema is not required, since Zorba knows about xs:string and the rest of built-in types used in this query.
If I remove the import of XMLSchema.xsd still fails, but it looks like it's an error in the script logic, it's doing doc($file) for a file that doesn't exist:

 TR [0]: xs:anyURI(file:///home/cezar/dev/xqSample/conformance-dimensions/conf/hypercubeDimensionValid-definition.xml)
</home/cezar/dev/xqSample/conformance-dimensions/conf/xf-2006.xq>:1147,19: dynamic error [err:FODC0002]: "file:///home/cezar/dev/xqSample/conformance-dimensions/conf/hypercubeDimensionValid-definition.xml": error retrieving resource; raised at /media/sdd/dev/repo/bug867156-importsegfaults/src/runtime/sequences/sequences_impl.cpp:1849

Revision history for this message
Cezar Andrei (cezar-andrei) wrote :

Please ignore the previous comment, was intended on another bug.

Revision history for this message
Chris Hillery (ceejatec) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

The attempt to merge lp:~zorba-coders/zorba/update-dfmodule into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job update-dfmodule-2012-04-20T20-48-53.035Z is finished.
  The final status was:

  No tests were run - build or configure step must have failed.

  Not commiting changes.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job update-dfmodule-2012-04-20T21-15-01.161Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'modules/ExternalModules.conf'
2--- modules/ExternalModules.conf 2012-04-19 21:40:27 +0000
3+++ modules/ExternalModules.conf 2012-04-20 15:44:25 +0000
4@@ -28,7 +28,7 @@
5
6 data-cleaning bzr lp:zorba/data-cleaning-module zorba-2.2
7 data-converters bzr lp:zorba/data-converters-module zorba-2.2
8-data-formatting bzr lp:zorba/data-formatting-module zorba-2.2
9+data-formatting bzr lp:zorba/data-formatting-module zorba-2.2-jvm
10 excel bzr lp:zorba/excel-module zorba-2.2
11 geo bzr lp:zorba/geo-module zorba-2.2
12 http-client bzr lp:zorba/http-client-module zorba-2.2

Subscribers

People subscribed via source and target branches