Skip to content

Commit

Permalink
#proxy_acceptor added
Browse files Browse the repository at this point in the history
  • Loading branch information
hdknr committed Apr 19, 2010
1 parent 60495dd commit e95bd6c
Show file tree
Hide file tree
Showing 12 changed files with 68 additions and 17 deletions.
1 change: 1 addition & 0 deletions cx-doc/build/html/_cx_xsd_description.html
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ <h3>Navigation</h3>
<ul class="simple">
<li><a class="reference external" href="http://openid.net/srv/cx/1.0/#proposer">http://openid.net/srv/cx/1.0/#proposer</a></li>
<li><a class="reference external" href="http://openid.net/srv/cx/1.0/#acceptor">http://openid.net/srv/cx/1.0/#acceptor</a></li>
<li><a class="reference external" href="http://openid.net/srv/cx/1.0/#proxy_acceptor">http://openid.net/srv/cx/1.0/#proxy_acceptor</a></li>
</ul>
<p><tt class="docutils literal"><span class="pre">/Contract/Party/xmldsig:Signature</span></tt> [One]</p>
<blockquote>
Expand Down
1 change: 1 addition & 0 deletions cx-doc/build/html/_sources/_cx_xsd_description.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

- http://openid.net/srv/cx/1.0/#proposer
- http://openid.net/srv/cx/1.0/#acceptor
- http://openid.net/srv/cx/1.0/#proxy_acceptor


``/Contract/Party/xmldsig:Signature`` [One]
Expand Down
10 changes: 9 additions & 1 deletion cx-doc/build/html/cx_contract.html
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,10 @@ <h3>Proposal Sample<a class="headerlink" href="#proposal-sample" title="Permalin
<span class="nt">&lt;Rel&gt;</span>http://openid.net/srv/cx/1.0/#proposer<span class="nt">&lt;/Rel&gt;</span>
<span class="nt">&lt;obligations/&gt;</span>
<span class="nt">&lt;/Party&gt;</span>
<span class="nt">&lt;Party</span> <span class="na">id=</span><span class="s">&quot;http://payment.hdknr.com/&quot;</span> <span class="nt">&gt;</span>
<span class="nt">&lt;Rel&gt;</span>http://openid.net/srv/cx/1.0/#proxy_acceptor<span class="nt">&lt;/Rel&gt;</span>
<span class="nt">&lt;obligations/&gt;</span>
<span class="nt">&lt;/Party&gt;</span>
<span class="nt">&lt;Service&gt;</span>
<span class="nt">&lt;Type&gt;</span>http://cxop.net/cx/payment#sha256:40ea725769e6221908f08675014cff1b13e8399a5eb5555c21687d487da0b66c<span class="nt">&lt;/Type&gt;</span>
<span class="nt">&lt;URL&gt;</span>http://cxop.net/openid/<span class="nt">&lt;/URL&gt;</span>
Expand Down Expand Up @@ -224,8 +228,11 @@ <h3>Contract Sample<a class="headerlink" href="#contract-sample" title="Permalin
<span class="nt">&lt;Contract</span> <span class="na">id=</span><span class="s">&quot;e5279de6e97211de93e00800272c981e&quot;</span><span class="nt">&gt;</span>
<span class="nt">&lt;Type&gt;</span>http://openid.net/srv/cx/1.0/#contract<span class="nt">&lt;/Type&gt;</span>
<span class="nt">&lt;Datetime&gt;</span>2009-12-15T21:10:54+9:00<span class="nt">&lt;/Datetime&gt;</span>
<span class="nt">&lt;Party</span> <span class="na">id=</span><span class="s">&quot;http://cxop.net&quot;</span> <span class="nt">&gt;</span>
<span class="nt">&lt;Party</span> <span class="na">id=</span><span class="s">&quot;=hdknr&quot;</span> <span class="nt">&gt;</span>
<span class="nt">&lt;Rel&gt;</span>http://openid.net/srv/cx/1.0/#acceptor<span class="nt">&lt;/Rel&gt;</span>
<span class="nt">&lt;/Party&gt;</span>
<span class="nt">&lt;Party</span> <span class="na">id=</span><span class="s">&quot;http://cxop.net&quot;</span> <span class="nt">&gt;</span>
<span class="nt">&lt;Rel&gt;</span>http://openid.net/srv/cx/1.0/#proxy_acceptor<span class="nt">&lt;/Rel&gt;</span>
<span class="nt">&lt;obligations&gt;</span>
<span class="nt">&lt;param</span> <span class="na">type=</span><span class="s">&quot;http://cxop.net/cx/payment/statuscode&quot;</span> <span class="na">id=</span><span class="s">&quot;statuscode&quot;</span><span class="nt">&gt;</span>200<span class="nt">&lt;/param&gt;</span>
<span class="nt">&lt;param</span> <span class="na">type=</span><span class="s">&quot;http://cxop.net/cx/payment/description&quot;</span> <span class="na">id=</span><span class="s">&quot;description&quot;</span><span class="nt">&gt;</span>OK<span class="nt">&lt;/param&gt;</span>
Expand Down Expand Up @@ -426,6 +433,7 @@ <h3>CX Contract XML Schema<a class="headerlink" href="#cx-contract-xml-schema" t
<ul class="simple">
<li><a class="reference external" href="http://openid.net/srv/cx/1.0/#proposer">http://openid.net/srv/cx/1.0/#proposer</a></li>
<li><a class="reference external" href="http://openid.net/srv/cx/1.0/#acceptor">http://openid.net/srv/cx/1.0/#acceptor</a></li>
<li><a class="reference external" href="http://openid.net/srv/cx/1.0/#proxy_acceptor">http://openid.net/srv/cx/1.0/#proxy_acceptor</a></li>
</ul>
<p><tt class="docutils literal"><span class="pre">/Contract/Party/xmldsig:Signature</span></tt> [One]</p>
<blockquote>
Expand Down
10 changes: 9 additions & 1 deletion cx-doc/build/html/openid_cx_spec.html
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,7 @@ <h4>1.3.3.2&nbsp;&nbsp;&nbsp;Contract XML Basic Structure<a class="headerlink" h
<ul class="simple">
<li><a class="reference external" href="http://openid.net/srv/cx/1.0/#proposer">http://openid.net/srv/cx/1.0/#proposer</a></li>
<li><a class="reference external" href="http://openid.net/srv/cx/1.0/#acceptor">http://openid.net/srv/cx/1.0/#acceptor</a></li>
<li><a class="reference external" href="http://openid.net/srv/cx/1.0/#proxy_acceptor">http://openid.net/srv/cx/1.0/#proxy_acceptor</a></li>
</ul>
<p><tt class="docutils literal"><span class="pre">/Contract/Party/xmldsig:Signature</span></tt> [One]</p>
<blockquote>
Expand Down Expand Up @@ -558,6 +559,10 @@ <h3>1.7.2&nbsp;&nbsp;&nbsp;Proposal Sample<a class="headerlink" href="#proposal-
<span class="nt">&lt;Rel&gt;</span>http://openid.net/srv/cx/1.0/#proposer<span class="nt">&lt;/Rel&gt;</span>
<span class="nt">&lt;obligations/&gt;</span>
<span class="nt">&lt;/Party&gt;</span>
<span class="nt">&lt;Party</span> <span class="na">id=</span><span class="s">&quot;http://payment.hdknr.com/&quot;</span> <span class="nt">&gt;</span>
<span class="nt">&lt;Rel&gt;</span>http://openid.net/srv/cx/1.0/#proxy_acceptor<span class="nt">&lt;/Rel&gt;</span>
<span class="nt">&lt;obligations/&gt;</span>
<span class="nt">&lt;/Party&gt;</span>
<span class="nt">&lt;Service&gt;</span>
<span class="nt">&lt;Type&gt;</span>http://cxop.net/cx/payment#sha256:40ea725769e6221908f08675014cff1b13e8399a5eb5555c21687d487da0b66c<span class="nt">&lt;/Type&gt;</span>
<span class="nt">&lt;URL&gt;</span>http://cxop.net/openid/<span class="nt">&lt;/URL&gt;</span>
Expand Down Expand Up @@ -596,8 +601,11 @@ <h3>1.7.3&nbsp;&nbsp;&nbsp;Contract Sample<a class="headerlink" href="#contract-
<span class="nt">&lt;Contract</span> <span class="na">id=</span><span class="s">&quot;e5279de6e97211de93e00800272c981e&quot;</span><span class="nt">&gt;</span>
<span class="nt">&lt;Type&gt;</span>http://openid.net/srv/cx/1.0/#contract<span class="nt">&lt;/Type&gt;</span>
<span class="nt">&lt;Datetime&gt;</span>2009-12-15T21:10:54+9:00<span class="nt">&lt;/Datetime&gt;</span>
<span class="nt">&lt;Party</span> <span class="na">id=</span><span class="s">&quot;http://cxop.net&quot;</span> <span class="nt">&gt;</span>
<span class="nt">&lt;Party</span> <span class="na">id=</span><span class="s">&quot;=hdknr&quot;</span> <span class="nt">&gt;</span>
<span class="nt">&lt;Rel&gt;</span>http://openid.net/srv/cx/1.0/#acceptor<span class="nt">&lt;/Rel&gt;</span>
<span class="nt">&lt;/Party&gt;</span>
<span class="nt">&lt;Party</span> <span class="na">id=</span><span class="s">&quot;http://cxop.net&quot;</span> <span class="nt">&gt;</span>
<span class="nt">&lt;Rel&gt;</span>http://openid.net/srv/cx/1.0/#proxy_acceptor<span class="nt">&lt;/Rel&gt;</span>
<span class="nt">&lt;obligations&gt;</span>
<span class="nt">&lt;param</span> <span class="na">type=</span><span class="s">&quot;http://cxop.net/cx/payment/statuscode&quot;</span> <span class="na">id=</span><span class="s">&quot;statuscode&quot;</span><span class="nt">&gt;</span>200<span class="nt">&lt;/param&gt;</span>
<span class="nt">&lt;param</span> <span class="na">type=</span><span class="s">&quot;http://cxop.net/cx/payment/description&quot;</span> <span class="na">id=</span><span class="s">&quot;description&quot;</span><span class="nt">&gt;</span>OK<span class="nt">&lt;/param&gt;</span>
Expand Down
2 changes: 1 addition & 1 deletion cx-doc/build/html/searchindex.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions cx-doc/source/_cx_xsd_description.rst
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

- http://openid.net/srv/cx/1.0/#proposer
- http://openid.net/srv/cx/1.0/#acceptor
- http://openid.net/srv/cx/1.0/#proxy_acceptor


``/Contract/Party/xmldsig:Signature`` [One]
Expand Down
5 changes: 4 additions & 1 deletion cx-doc/xml/sample_contract.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@
<Contract id="e5279de6e97211de93e00800272c981e">
<Type>http://openid.net/srv/cx/1.0/#contract</Type>
<Datetime>2009-12-15T21:10:54+09:00</Datetime>
<Party id="http://cxop.net" >
<Party id="=hdknr" >
<Rel>http://openid.net/srv/cx/1.0/#acceptor</Rel>
</Party>
<Party id="http://cxop.net" >
<Rel>http://openid.net/srv/cx/1.0/#proxy_acceptor</Rel>
<obligations>
<param type="http://cxop.net/cx/payment/statuscode" id="statuscode">200</param>
<param type="http://cxop.net/cx/payment/description" id="description">OK</param>
Expand Down
5 changes: 4 additions & 1 deletion cx-doc/xml/sample_contract.xml.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@
<Contract id="e5279de6e97211de93e00800272c981e">
<Type>http://openid.net/srv/cx/1.0/#contract</Type>
<Datetime>2009-12-15T21:10:54+9:00</Datetime>
<Party id="http://cxop.net" >
<Party id="=hdknr" >
<Rel>http://openid.net/srv/cx/1.0/#acceptor</Rel>
</Party>
<Party id="http://cxop.net" >
<Rel>http://openid.net/srv/cx/1.0/#proxy_acceptor</Rel>
<obligations>
<param type="http://cxop.net/cx/payment/statuscode" id="statuscode">200</param>
<param type="http://cxop.net/cx/payment/description" id="description">OK</param>
Expand Down
9 changes: 4 additions & 5 deletions cx-doc/xml/sample_proposal.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,13 @@ uFAx2HjGzA==</X509Certificate>
<param type="http://cxop.net/cx/payment/acceptor_name" id="acceptor_name">=hdknr</param>
</obligations>
</Party>
<Party>
<URL>http://payment.hdknr.com/</URL>
<Rel>http://openid.net/srv/cx/1.0/#signer</Rel>
<Party id="http://cxop.com/" >
<Rel>http://openid.net/srv/cx/1.0/#proxy_acceptor</Rel>
<obligations/>
</Party>
<Service>
<Type>http://payment.hdknr.com/cx/template_payment_usd#sha256:40ea725769e6221908f08675014cff1b13e8399a5eb5555c21687d487da0b66c</Type>
<URL>http://payment.hdknr.com/openid/</URL>
<Type>http://cxop.com/cx/template_payment_usd#sha256:40ea725769e6221908f08675014cff1b13e8399a5eb5555c21687d487da0b66c</Type>
<URL>http://cxop.com/openid/</URL>
<Template>PT09PT09PT09PT09PT09PT09PT09PT09PT09CklOVEVSTkVUIFBBWU1NRU5UIEFHUkVFTUVOVAo9
PT09PT09PT09PT09PT09PT09PT09PT09PT0KCldoZXJlYXMge3tlbmRfdXNlcn19IHBheXMgZm9y
IHRoZSBzZXJ2aWNlcyBwcm92aWRlZCBieSB7e3NlcnZpY2VfcHJvdmlkZXJ9fSBhdCB0aGUge3sg
Expand Down
4 changes: 4 additions & 0 deletions cx-doc/xml/sample_proposal.xml.rst
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@
<Rel>http://openid.net/srv/cx/1.0/#proposer</Rel>
<obligations/>
</Party>
<Party id="http://payment.hdknr.com/" >
<Rel>http://openid.net/srv/cx/1.0/#proxy_acceptor</Rel>
<obligations/>
</Party>
<Service>
<Type>http://cxop.net/cx/payment#sha256:40ea725769e6221908f08675014cff1b13e8399a5eb5555c21687d487da0b66c</Type>
<URL>http://cxop.net/openid/</URL>
Expand Down
19 changes: 16 additions & 3 deletions spec/openid-contract-exchange-1_0.html
Original file line number Diff line number Diff line change
Expand Up @@ -532,10 +532,16 @@ <h3>Table of Contents</h3>
<blockquote class="text">
<p>Indicates the type of the party. One of followings:
</p>
<p></p>
<blockquote class="text">
<p>http://openid.net/srv/cx/1.0/#proposer
</p>
<p>http://openid.net/srv/cx/1.0/#acceptor
</p>
<p>http://openid.net/srv/cx/1.0/#proxy_acceptor
</p>
</blockquote>

</blockquote>
</li>
<li>/Contract/Party/xmldsig:Signature [One]
Expand Down Expand Up @@ -1074,10 +1080,13 @@ <h3>Table of Contents</h3>
&lt;/X509Data&gt;
&lt;/KeyInfo&gt;
&lt;/Signature&gt;&lt;/Party&gt;
&lt;Party id='&gt;=hdknr' &gt;
&lt;Rel&gt;http://openid.net/srv/cx/1.0/#proposer&lt;/Rel&gt;
&lt;Party id="=hdknr" &gt;
&lt;rel&gt;http://openid.net/srv/cx/1.0/#proposer&lt;/rel&gt;
&lt;obligations/&gt;
&lt;/Party&gt;
&lt;Party id="http://cxop.com" &gt;
&lt;rel&gt;http://openid.net/srv/cx/1.0/#proxy_proposer&lt;/rel&gt;
&lt;/Party&gt;
&lt;Service&gt;
&lt;Type&gt;http://cxop.net/cx/payment#sha256:40ea725769e6221908f08675014cff1b13e8399a5eb5555c21687d487da0b66c&lt;/Type&gt;
&lt;URL&gt;http://cxop.net/openid/&lt;/URL&gt;
Expand Down Expand Up @@ -1121,8 +1130,12 @@ <h3>Table of Contents</h3>
&lt;Contract id="e5279de6e97211de93e00800272c981e"&gt;
&lt;Type&gt;http://openid.net/srv/cx/1.0/#contract&lt;/Type&gt;
&lt;Datetime&gt;2009-12-15T21:10:54+9:00&lt;/Datetime&gt;
&lt;Party id="=hdknr" &gt;
&lt;rel&gt;http://openid.net/srv/cx/1.0/#proposer&lt;/rel&gt;
&lt;obligations/&gt;
&lt;/Party&gt;
&lt;Party id='http://cxop.net' &gt;
&lt;Rel&gt;http://openid.net/srv/cx/1.0/#acceptor&lt;/Rel&gt;
&lt;Rel&gt;http://openid.net/srv/cx/1.0/#proxy_acceptor&lt;/Rel&gt;
&lt;obligations&gt;
&lt;param type="http://cxop.net/cx/payment/statuscode" id="statuscode"&gt;200&lt;/param&gt;
&lt;param type="http://cxop.net/cx/payment/description" id="description"&gt;OK&lt;/param&gt;
Expand Down
18 changes: 14 additions & 4 deletions spec/openid-contract-exchange-1_0.xml
Original file line number Diff line number Diff line change
Expand Up @@ -351,9 +351,12 @@
<t>/Contract/Party/Rel [One]<list style="empty">
<t>Indicates the type of the party. One of followings:</t>

<t><list style="empty">
<t>http://openid.net/srv/cx/1.0/#proposer</t>

<t>http://openid.net/srv/cx/1.0/#acceptor</t>
<t>http://openid.net/srv/cx/1.0/#proxy_acceptor</t>
</list></t>

</list></t>

<t>/Contract/Party/xmldsig:Signature [One]<list style="empty">
Expand Down Expand Up @@ -769,10 +772,13 @@ uFAx2HjGzA==</X509Certificate>
</X509Data>
</KeyInfo>
</Signature></Party>
<Party id='>=hdknr' >
<Rel>http://openid.net/srv/cx/1.0/#proposer</Rel>
<Party id="=hdknr" >
<rel>http://openid.net/srv/cx/1.0/#proposer</rel>
<obligations/>
</Party>
<Party id="http://cxop.com" >
<rel>http://openid.net/srv/cx/1.0/#proxy_proposer</rel>
</Party>
<Service>
<Type>http://cxop.net/cx/payment#sha256:40ea725769e6221908f08675014cff1b13e8399a5eb5555c21687d487da0b66c</Type>
<URL>http://cxop.net/openid/</URL>
Expand Down Expand Up @@ -817,8 +823,12 @@ CiAKIFRpdGxlOiAgIHt7YWNjZXB0b3JfdGl0bGV9fQogIAogRGF0ZTogICAge3tub3d9fQoK
<Contract id="e5279de6e97211de93e00800272c981e">
<Type>http://openid.net/srv/cx/1.0/#contract</Type>
<Datetime>2009-12-15T21:10:54+9:00</Datetime>
<Party id="=hdknr" >
<rel>http://openid.net/srv/cx/1.0/#proposer</rel>
<obligations/>
</Party>
<Party id='http://cxop.net' >
<Rel>http://openid.net/srv/cx/1.0/#acceptor</Rel>
<Rel>http://openid.net/srv/cx/1.0/#proxy_acceptor</Rel>
<obligations>
<param type="http://cxop.net/cx/payment/statuscode" id="statuscode">200</param>
<param type="http://cxop.net/cx/payment/description" id="description">OK</param>
Expand Down

0 comments on commit e95bd6c

Please sign in to comment.