[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix_xqdoc_schema_import_prefix into lp:zorba

2012-03-15 Thread noreply
The proposal to merge lp:~zorba-coders/zorba/fix_xqdoc_schema_import_prefix 
into lp:zorba has been updated.

Status: Approved => Merged

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/fix_xqdoc_schema_import_prefix/+merge/97708
-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_xqdoc_schema_import_prefix/+merge/97708
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/fix_xqdoc_schema_import_prefix into lp:zorba

2012-03-15 Thread Zorba Build Bot
Validation queue job fix_xqdoc_schema_import_prefix-2012-03-16T02-46-08.694Z is 
finished. The final status was:

All tests succeeded!
-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_xqdoc_schema_import_prefix/+merge/97708
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/fix_xqdoc_schema_import_prefix into lp:zorba

2012-03-15 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/fix_xqdoc_schema_import_prefix-2012-03-16T02-46-08.694Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_xqdoc_schema_import_prefix/+merge/97708
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/fix_xqdoc_schema_import_prefix into lp:zorba

2012-03-15 Thread Matthias Brantner
The proposal to merge lp:~zorba-coders/zorba/fix_xqdoc_schema_import_prefix 
into lp:zorba has been updated.

Status: Needs review => Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/fix_xqdoc_schema_import_prefix/+merge/97708
-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_xqdoc_schema_import_prefix/+merge/97708
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/fix_xqdoc_schema_import_prefix into lp:zorba

2012-03-15 Thread Dana Florescu
>>> 
>> Yes, that's what I mean. It looks like the xqdoc visitor could crash with 
>> this
>> change. That's why I think the branch shouldn't be merged before it's tested.
> Nope, I disagree: this merge does not introduce the problem you mentioned 
> because it was already there :)

I agree with Sorin. The problem was there already.

I think Sorin should go ahead and commit the change (at least the documentation 
will be usable..)
and then file a bug for the existing problem, and fix that after the release.

Thanks
Dana

-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_xqdoc_schema_import_prefix/+merge/97708
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/fix_xqdoc_schema_import_prefix into lp:zorba

2012-03-15 Thread Sorin Marian Nasoi
> > > Does this also work for schema imports without a prefix?
> > Are you referring to:
> > import schema default element namespace "SOMETHING"; ?
> >
> > The answer would be no, the current changes are not tested for this because
> we
> > have no modules at this point using this kind of schema imports.
> >
> > The xqdoc printer would have to be updated and also the xqdoc2html converter
> > in order to support this.
> >
> > IMHO this should not be a show stopper for these changes: If you agree
> please
> > create a lp bug for me for this feature and approve this merge.
> Yes, that's what I mean. It looks like the xqdoc visitor could crash with this
> change. That's why I think the branch shouldn't be merged before it's tested.
Nope, I disagree: this merge does not introduce the problem you mentioned 
because it was already there :)

All this change did was to make you and then me aware that we have a problem if 
one uses a schema import without a prefix.

So my suggestion is: please open a bug for this issue and approve this merge.
-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_xqdoc_schema_import_prefix/+merge/97708
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/fix_xqdoc_schema_import_prefix into lp:zorba

2012-03-15 Thread Matthias Brantner
> > Does this also work for schema imports without a prefix?
> Are you referring to:
> import schema default element namespace "SOMETHING"; ?
> 
> The answer would be no, the current changes are not tested for this because we
> have no modules at this point using this kind of schema imports.
> 
> The xqdoc printer would have to be updated and also the xqdoc2html converter
> in order to support this.
> 
> IMHO this should not be a show stopper for these changes: If you agree please
> create a lp bug for me for this feature and approve this merge.
Yes, that's what I mean. It looks like the xqdoc visitor could crash with this 
change. That's why I think the branch shouldn't be merged before it's tested.
-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_xqdoc_schema_import_prefix/+merge/97708
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/fix_xqdoc_schema_import_prefix into lp:zorba

2012-03-15 Thread Sorin Marian Nasoi
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_xqdoc_schema_import_prefix/+merge/97708
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/fix_xqdoc_schema_import_prefix into lp:zorba

2012-03-15 Thread Sorin Marian Nasoi
> Does this also work for schema imports without a prefix?
Are you referring to:
import schema default element namespace "SOMETHING"; ?

The answer would be no, the current changes are not tested for this because we 
have no modules at this point using this kind of schema imports.

The xqdoc printer would have to be updated and also the xqdoc2html converter in 
order to support this.

IMHO this should not be a show stopper for these changes: If you agree please 
create a lp bug for me for this feature and approve this merge.
-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_xqdoc_schema_import_prefix/+merge/97708
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/fix_xqdoc_schema_import_prefix into lp:zorba

2012-03-15 Thread Zorba Build Bot
The proposal to merge lp:~zorba-coders/zorba/fix_xqdoc_schema_import_prefix 
into lp:zorba has been updated.

Status: Approved => Needs review

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/fix_xqdoc_schema_import_prefix/+merge/97708
-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_xqdoc_schema_import_prefix/+merge/97708
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/fix_xqdoc_schema_import_prefix into lp:zorba

2012-03-15 Thread Zorba Build Bot
The attempt to merge lp:~zorba-coders/zorba/fix_xqdoc_schema_import_prefix 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
  fix_xqdoc_schema_import_prefix-2012-03-15T21-48-35.202Z is finished.  The
  final status was:

  

  7 tests did not succeed - changes not commited.


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

-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_xqdoc_schema_import_prefix/+merge/97708
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/fix_xqdoc_schema_import_prefix into lp:zorba

2012-03-15 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/fix_xqdoc_schema_import_prefix-2012-03-15T21-48-35.202Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_xqdoc_schema_import_prefix/+merge/97708
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/fix_xqdoc_schema_import_prefix into lp:zorba

2012-03-15 Thread Matthias Brantner
Review: Needs Information

Does this also work for schema imports without a prefix?
-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_xqdoc_schema_import_prefix/+merge/97708
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/fix_xqdoc_schema_import_prefix into lp:zorba

2012-03-15 Thread Chris Hillery
Sounds reasonable.
-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_xqdoc_schema_import_prefix/+merge/97708
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/fix_xqdoc_schema_import_prefix into lp:zorba

2012-03-15 Thread Chris Hillery
The proposal to merge lp:~zorba-coders/zorba/fix_xqdoc_schema_import_prefix 
into lp:zorba has been updated.

Status: Needs review => Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/fix_xqdoc_schema_import_prefix/+merge/97708
-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_xqdoc_schema_import_prefix/+merge/97708
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/fix_xqdoc_schema_import_prefix into lp:zorba

2012-03-15 Thread Sorin Marian Nasoi
> The change looks good. One question: is using the same prefix that the
> original module used likely to cause any conflicts? Are those prefixes
> generally unique as well as the module prefixes?
I think that that is what Dana meant by suggesting uniformity: as a result I 
have added bug lp:956318.

If you are OK with this answer please set the status of this merge to 'Approve' 
such that the Validation Queue is able to pick it up.
Thanks.
-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_xqdoc_schema_import_prefix/+merge/97708
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/fix_xqdoc_schema_import_prefix into lp:zorba

2012-03-15 Thread Chris Hillery
Review: Approve

The change looks good. One question: is using the same prefix that the original 
module used likely to cause any conflicts? Are those prefixes generally unique 
as well as the module prefixes?
-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_xqdoc_schema_import_prefix/+merge/97708
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/fix_xqdoc_schema_import_prefix into lp:zorba

2012-03-15 Thread Sorin Marian Nasoi
You have been requested to review the proposed merge of 
lp:~zorba-coders/zorba/fix_xqdoc_schema_import_prefix into lp:zorba.

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/fix_xqdoc_schema_import_prefix/+merge/97708

Fixed a namespace clash by adding a "-schema" to the import schema prefix.

-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_xqdoc_schema_import_prefix/+merge/97708
Your team Zorba Coders is requested to review the proposed merge of 
lp:~zorba-coders/zorba/fix_xqdoc_schema_import_prefix into lp:zorba.
=== modified file 'modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq'
--- modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq	2012-03-09 06:57:41 +
+++ modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq	2012-03-15 17:38:21 +
@@ -1263,7 +1263,8 @@
 for $import in $xqdoc/xqdoc:imports//xqdoc:import[@type = "schema"]
   return
concat('import schema namespace ',
-  $namespaces//xqdoc:namespace[@uri = $import/xqdoc:uri/text()][1]/@prefix,
+  concat($namespaces//xqdoc:namespace[@uri = $import/xqdoc:uri/text()][1]/@prefix,
+ "-schema"),
   ' =  "',
   string($import/xqdoc:uri/text()),'";'),"
 ")

-- 
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/fix_xqdoc_schema_import_prefix into lp:zorba

2012-03-15 Thread Sorin Marian Nasoi
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_xqdoc_schema_import_prefix/+merge/97708
Your team Zorba Coders is requested to review the proposed merge of 
lp:~zorba-coders/zorba/fix_xqdoc_schema_import_prefix into 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/fix_xqdoc_schema_import_prefix into lp:zorba

2012-03-15 Thread Sorin Marian Nasoi
Sorin Marian Nasoi has proposed merging 
lp:~zorba-coders/zorba/fix_xqdoc_schema_import_prefix into lp:zorba.

Requested reviews:
  Zorba Coders (zorba-coders)
  Sorin Marian Nasoi (sorin.marian.nasoi)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/fix_xqdoc_schema_import_prefix/+merge/97708

Fixed a namespace clash by adding a "-schema" to the import schema prefix.
-- 
https://code.launchpad.net/~zorba-coders/zorba/fix_xqdoc_schema_import_prefix/+merge/97708
Your team Zorba Coders is requested to review the proposed merge of 
lp:~zorba-coders/zorba/fix_xqdoc_schema_import_prefix into lp:zorba.
=== modified file 'modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq'
--- modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq	2012-03-09 06:57:41 +
+++ modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq	2012-03-15 17:38:21 +
@@ -1263,7 +1263,8 @@
 for $import in $xqdoc/xqdoc:imports//xqdoc:import[@type = "schema"]
   return
concat('import schema namespace ',
-  $namespaces//xqdoc:namespace[@uri = $import/xqdoc:uri/text()][1]/@prefix,
+  concat($namespaces//xqdoc:namespace[@uri = $import/xqdoc:uri/text()][1]/@prefix,
+ "-schema"),
   ' =  "',
   string($import/xqdoc:uri/text()),'";'),"
 ")

-- 
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