zorba-coders team mailing list archive

[Matthias Brantner <matthias.brantner@xxxxxxxxxx>]

Matthias Brantner has proposed merging lp:~zorba-coders/zorba/bug-978722_oauth into lp:zorba/oauth-module.

Requested reviews:
  Matthias Brantner (matthias-brantner)
  William Candillon (wcandillon)
Related bugs:
  Bug #978722 in Zorba: "change annotation prefix from "ann" to "an""
  https://bugs.launchpad.net/zorba/+bug/978722

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-978722_oauth/+merge/101530

fix for bug #978722 (change annotation prefix from "ann" to "an")
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-978722_oauth/+merge/101530
Your team Zorba Coders is subscribed to branch lp:zorba/oauth-module.

=== modified file 'src/com/zorba-xquery/www/modules/oauth/client.xq'
--- src/com/zorba-xquery/www/modules/oauth/client.xq	2011-08-18 05:29:58 +0000
+++ src/com/zorba-xquery/www/modules/oauth/client.xq	2012-04-11 10:12:23 +0000
@@ -41,7 +41,7 @@
  :)
 import module namespace oerr="http://www.zorba-xquery.com/modules/oauth/error";;
 
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
+declare namespace an = "http://www.zorba-xquery.com/annotations";;
 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
 declare namespace op = "http://www.zorba-xquery.com/options/features";;
 declare namespace f = "http://www.zorba-xquery.com/features";;
@@ -55,7 +55,7 @@
  : @see http://tools.ietf.org/html/rfc5849#section-3.3
  : @return integer time in seconds since Unix epoch
  :)
-declare %ann:nondeterministic function oauth:timestamp() as xs:decimal
+declare %an:nondeterministic function oauth:timestamp() as xs:decimal
 {
   let $current-dateTime := fn:adjust-dateTime-to-timezone(date:current-dateTime(), xs:dayTimeDuration('PT0H'))
   let $duration := $current-dateTime - xs:dateTime("1970-01-01T00:00:00Z")
@@ -84,7 +84,7 @@
  : @see http://tools.ietf.org/html/rfc5849#section-3.3
  : @return random string
  :)
-declare %ann:nondeterministic function oauth:nonce() as xs:string
+declare %an:nondeterministic function oauth:nonce() as xs:string
 {
   ra:uuid()
 };
@@ -221,7 +221,7 @@
  : @param $url Target URL
  : @return -
  :)
-declare %ann:sequential function oauth:http-request(
+declare %an:sequential function oauth:http-request(
     $consumer-secret as xs:string,
     $method as xs:string,
     $oauth-token-secret as xs:string?,
@@ -260,7 +260,7 @@
  : @error XQP0021(oerr:OC003) if we receive http 401 error from the server.
  : @error XQP0021(oerr:OC004) if we receive http 500 error from the server.
  :)
-declare %private %ann:sequential %ann:nondeterministic function oauth:format-request(
+declare %private %an:sequential %an:nondeterministic function oauth:format-request(
     $consumer-key as xs:string,
     $consumer-secret as xs:string,
     $method as xs:string,
@@ -293,7 +293,7 @@
     else $response[2]
 };
 
-declare %private %ann:sequential %ann:nondeterministic function oauth:format-request(
+declare %private %an:sequential %an:nondeterministic function oauth:format-request(
     $consumer-key as xs:string,
     $consumer-secret as xs:string,
     $method as xs:string,
@@ -344,7 +344,7 @@
  : @param $request request element containing the client's request
  : @return temporary credentials correctly parsed as parameter elements, or an error if http response status is not 200 OK
  :)
-declare %ann:sequential %ann:nondeterministic function oauth:request-token($request as element(request)+) as element()+
+declare %an:sequential %an:nondeterministic function oauth:request-token($request as element(request)+) as element()+
 {
   let $consumer-key := oauth:parameters($request,"oauth_consumer_key")
   let $consumer-secret := oauth:parameters($request,"oauth_consumer_secret")
@@ -378,7 +378,7 @@
  : @param $request request element containing the client's request
  : @return token credentials correctly parsed as parameter elements, or an error if http response status is not 200 OK
  :)
-declare %ann:sequential %ann:nondeterministic function oauth:access-token($request as element(request)+) as element()+
+declare %an:sequential %an:nondeterministic function oauth:access-token($request as element(request)+) as element()+
 {
   let $consumer-key := oauth:parameters($request,"oauth_consumer_key")
   let $consumer-secret := oauth:parameters($request,"oauth_consumer_secret")
@@ -419,7 +419,7 @@
  : @param $request request element containing the client's request
  : @return protected resources parsed as parameter elements, or an error if http response status is not 200 OK
  :)
-declare %ann:sequential %ann:nondeterministic function oauth:protected-resource($protected-resource as element(http:request),$request as element(request)+) as element()+
+declare %an:sequential %an:nondeterministic function oauth:protected-resource($protected-resource as element(http:request),$request as element(request)+) as element()+
 {
   let $consumer-key := oauth:parameters($request,"oauth_consumer_key")
   let $consumer-secret := oauth:parameters($request,"oauth_consumer_secret")
@@ -461,7 +461,7 @@
  : @param $additional-parameters Parameters specific to a certain step (request-token) of the OAuth authorization
  : @return temporary credentials correctly parsed as parameter elements, or an error if http response status is not 200 OK
  :)
-declare %ann:sequential %ann:nondeterministic function oauth:request-token(
+declare %an:sequential %an:nondeterministic function oauth:request-token(
     $consumer-key as xs:string,
     $consumer-secret as xs:string,
     $signature-method as xs:string,
@@ -491,7 +491,7 @@
  : @param $additional-parameters Parameters specific to a certain step (access-token) of the OAuth authorization
  : @return token credentials correctly parsed as parameter elements, or an error if http response status is not 200 OK
  :)
-declare %ann:sequential %ann:nondeterministic function oauth:access-token(
+declare %an:sequential %an:nondeterministic function oauth:access-token(
     $consumer-key as xs:string,
     $consumer-secret as xs:string,
     $signature-method as xs:string,
@@ -522,7 +522,7 @@
  : @param $additional-parameters Parameters specific to a certain step (protected-resource) of the OAuth authorization
  : @return protected resources parsed as parameter elements, or an error if http response status is not 200 OK
  :)
-declare %ann:sequential %ann:nondeterministic function oauth:protected-resource(
+declare %an:sequential %an:nondeterministic function oauth:protected-resource(
     $consumer-key as xs:string,
     $consumer-secret as xs:string,
     $signature-method as xs:string,