Author: buildbot Date: Thu Mar 20 14:49:43 2014 New Revision: 902535 Log: Staging update by buildbot for thrift
Modified: websites/staging/thrift/trunk/content/ (props changed) websites/staging/thrift/trunk/content/index.html websites/staging/thrift/trunk/content/tutorial/as3.html websites/staging/thrift/trunk/content/tutorial/cpp.html websites/staging/thrift/trunk/content/tutorial/csharp.html websites/staging/thrift/trunk/content/tutorial/d.html websites/staging/thrift/trunk/content/tutorial/delphi.html websites/staging/thrift/trunk/content/tutorial/go.html websites/staging/thrift/trunk/content/tutorial/hs.html websites/staging/thrift/trunk/content/tutorial/java.html websites/staging/thrift/trunk/content/tutorial/nodejs.html websites/staging/thrift/trunk/content/tutorial/ocaml.html websites/staging/thrift/trunk/content/tutorial/perl.html websites/staging/thrift/trunk/content/tutorial/php.html websites/staging/thrift/trunk/content/tutorial/py.html websites/staging/thrift/trunk/content/tutorial/rb.html Propchange: websites/staging/thrift/trunk/content/ ------------------------------------------------------------------------------ --- cms:source-revision (original) +++ cms:source-revision Thu Mar 20 14:49:43 2014 @@ -1 +1 @@ -1579641 +1579643 Modified: websites/staging/thrift/trunk/content/index.html ============================================================================== --- websites/staging/thrift/trunk/content/index.html (original) +++ websites/staging/thrift/trunk/content/index.html Thu Mar 20 14:49:43 2014 @@ -139,66 +139,13 @@ </ul> <div class="tab-content"> <div class="tab-pane active" id="1"> -<div class="codehilite"><pre>service Calculator extends shared.SharedService { - - /** - * A method definition looks like C code. It has a return type, arguments, - * and optionally a list of exceptions that it may throw. Note that argument - * lists and exception lists are specified using the exact same syntax as - * field lists in struct or exception definitions. - */ - - void ping(), - - i32 add(1:i32 num1, 2:i32 num2), - - i32 calculate(1:i32 logid, 2:Work w) throws (1:InvalidOperation ouch), - - /** - * This method has a oneway modifier. That means the client only makes - * a request and does not listen for any response at all. Oneway methods - * must be void. - */ - oneway void zip() - -} -</pre></div> +[snippet:path=tutorial/tutorial.thrift:lang=text:lines=123,145] </div> <div class="tab-pane" id="2"> -<div class="codehilite"><pre> <span class="c"># Make socket</span> - <span class="n">transport</span> <span class="o">=</span> <span class="n">TSocket</span><span class="o">.</span><span class="n">TSocket</span><span class="p">(</span><span class="s">'localhost'</span><span class="p">,</span> <span class="mi">9090</span><span class="p">)</span> - - <span class="c"># Buffering is critical. Raw sockets are very slow</span> - <span class="n">transport</span> <span class="o">=</span> <span class="n">TTransport</span><span class="o">.</span><span class="n">TBufferedTransport</span><span class="p">(</span><span class="n">transport</span><span class="p">)</span> - - <span class="c"># Wrap in a protocol</span> - <span class="n">protocol</span> <span class="o">=</span> <span class="n">TBinaryProtocol</span><span class="o">.</span><span class="n">TBinaryProtocol</span><span class="p">(</span><span class="n">transport</span><span class="p">)</span> - - <span class="c"># Create a client to use the protocol encoder</span> - <span class="n">client</span> <span class="o">=</span> <span class="n">Calculator</span><span class="o">.</span><span class="n">Client</span><span class="p">(</span><span class="n">protocol</span><span class="p">)</span> - - <span class="c"># Connect!</span> - <span class="n">transport</span><span class="o">.</span><span class="n">open</span><span class="p">()</span> - - <span class="n">client</span><span class="o">.</span><span class="n">ping</span><span class="p">()</span> - <span class="k">print</span> <span class="s">'ping()'</span> - - <span class="nb">sum</span> <span class="o">=</span> <span class="n">client</span> -</pre></div> +[snippet:path=tutorial/py/PythonClient.py:lang=python:lines=36,55] </div> <div class="tab-pane" id="3"> -<div class="codehilite"><pre> <span class="k">try</span> <span class="o">{</span> - <span class="n">TServerTransport</span> <span class="n">serverTransport</span> <span class="o">=</span> <span class="k">new</span> <span class="n">TServerSocket</span><span class="o">(</span><span class="mi">9090</span><span class="o">);</span> - <span class="n">TServer</span> <span class="n">server</span> <span class="o">=</span> <span class="k">new</span> <span class="n">TSimpleServer</span><span class="o">(</span><span class="k">new</span> <span class="n">Args</span><span class="o">(</span><span class="n">serverTransport</span><span class="o">).</span><span class="na">processor</span><span class="o">(</span><span class="n">processor</span><span class="o">));</span> - - <span class="c1">// Use this for a multithreaded server</span> - <span class="c1">// TServer server = new TThreadPoolServer(new TThreadPoolServer.Args(serverTransport).processor(processor));</span> - - <span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="s">"Starting the simple server..."</span><span class="o">);</span> - <span class="n">server</span><span class="o">.</span><span class="na">serve</span><span class="o">();</span> - <span class="o">}</span> <span class="k">catch</span> <span class="o">(</span><span class="n">Exception</span> <span class="n">e</span><span class="o">)</span> <span class="o">{</span> - <span class="n">e</span> -</pre></div> +[snippet:path=tutorial/java/src/JavaServer.java:lang=java:lines:65,76] </div> </div> </div> Modified: websites/staging/thrift/trunk/content/tutorial/as3.html ============================================================================== --- websites/staging/thrift/trunk/content/tutorial/as3.html (original) +++ websites/staging/thrift/trunk/content/tutorial/as3.html Thu Mar 20 14:49:43 2014 @@ -73,7 +73,7 @@ <h3 id="prerequisites">Prerequisites</h3> <h3 id="client">Client</h3> <p>To initialize client you can use code similar to:</p> -<p>[snippet:tutorial/as3/src/CalculatorUI.as:lang=java:lines=42,48]</p> +<p>[snippet:path=tutorial/as3/src/CalculatorUI.as:lang=java:lines=42,48]</p> <h3 id="server">Server</h3> <p>The example client above can be tested against a java tutorial server.</p> <h3 id="additional-information">Additional Information</h3> @@ -88,7 +88,7 @@ which some flash movies can connect to t Also, you can find a simple python/perl server script to serve this file there. For same host, you can serve crossdomain.xml from any port. So, you can start your RPC servers on ports 9090 and 9091, and serve polisy file from port 9092. To tell flash about this, you can use code from tutorial file:</p> -<p>[snippet:tutorial/as3/src/CalculatorUI.as:lang=java:lines=35,37]</p> +<p>[snippet:path=tutorial/as3/src/CalculatorUI.as:lang=java:lines=35,37]</p> <p>Example of crossdomain file, to allow connect to ports 9090 and 9091 from any server:</p> <pre><code> <?xml version="1.0"?> Modified: websites/staging/thrift/trunk/content/tutorial/cpp.html ============================================================================== --- websites/staging/thrift/trunk/content/tutorial/cpp.html (original) +++ websites/staging/thrift/trunk/content/tutorial/cpp.html Thu Mar 20 14:49:43 2014 @@ -72,12 +72,12 @@ <h3 id="prerequisites">Prerequisites</h3> <h3 id="client">Client</h3> -<p>[snippet:tutorial/cpp/CppClient.cpp:lang=cpp:lines=20,82]</p> +<p>[snippet:path=tutorial/cpp/CppClient.cpp:lang=cpp:lines=20,82]</p> <h3 id="server">Server</h3> -<p>[snippet:tutorial/cpp/CppServer.cpp:lang=cpp:lines=20,152]</p> +<p>[snippet:path=tutorial/cpp/CppServer.cpp:lang=cpp:lines=20,152]</p> <h2 id="additional-information">Additional Information</h2> <h3 id="example-threadpool-server">Example ThreadPool Server</h3> -<p>[snippet:tutorial/cpp/CppServer.cpp:lang=cpp:lines=129,145]</p> +<p>[snippet:path=tutorial/cpp/CppServer.cpp:lang=cpp:lines=129,145]</p> </div> <div class="container"> Modified: websites/staging/thrift/trunk/content/tutorial/csharp.html ============================================================================== --- websites/staging/thrift/trunk/content/tutorial/csharp.html (original) +++ websites/staging/thrift/trunk/content/tutorial/csharp.html Thu Mar 20 14:49:43 2014 @@ -72,9 +72,9 @@ <h3 id="prerequisites">Prerequisites</h3> <h3 id="client">Client</h3> -<p>[snippet:tutorial/csharp/CsharpClient/CsharpClient.cs:lang=cpp:lines=20,92]</p> +<p>[snippet:path=tutorial/csharp/CsharpClient/CsharpClient.cs:lang=cpp:lines=20,92]</p> <h3 id="server">Server</h3> -<p>[snippet:tutorial/csharp/CsharpServer/CsharpServer.cs:lang=cpp:lines=20,129]</p> +<p>[snippet:path=tutorial/csharp/CsharpServer/CsharpServer.cs:lang=cpp:lines=20,129]</p> <h2 id="additional-information">Additional Information</h2> </div> Modified: websites/staging/thrift/trunk/content/tutorial/d.html ============================================================================== --- websites/staging/thrift/trunk/content/tutorial/d.html (original) +++ websites/staging/thrift/trunk/content/tutorial/d.html Thu Mar 20 14:49:43 2014 @@ -72,9 +72,9 @@ <h3 id="prerequisites">Prerequisites</h3> <h3 id="client">Client</h3> -<p>[snippet:tutorial/d/server.d:lang=cpp:lines=19,111]</p> +<p>[snippet:path=tutorial/d/server.d:lang=cpp:lines=19,111]</p> <h3 id="server">Server</h3> -<p>[snippet:tutorial/d/client.d:lang=cpp:lines=19,64]</p> +<p>[snippet:path=tutorial/d/client.d:lang=cpp:lines=19,64]</p> <h2 id="additional-information">Additional Information</h2> </div> Modified: websites/staging/thrift/trunk/content/tutorial/delphi.html ============================================================================== --- websites/staging/thrift/trunk/content/tutorial/delphi.html (original) +++ websites/staging/thrift/trunk/content/tutorial/delphi.html Thu Mar 20 14:49:43 2014 @@ -75,9 +75,9 @@ <li>Thrift requires at least Delphi 2010. Earlier versions and FPC will not work due to the lack of Generics.</li> </ul> <h3 id="client">Client</h3> -<p>[snippet:tutorial/delphi/DelphiClient/DelphiClient.dpr:lang=cpp:lines=19,114]</p> +<p>[snippet:path=tutorial/delphi/DelphiClient/DelphiClient.dpr:lang=cpp:lines=19,114]</p> <h3 id="server">Server</h3> -<p>[snippet:tutorial/delphi/DelphiServer/DelphiServer.dpr:lang=cpp:lines=19,173]</p> +<p>[snippet:path=tutorial/delphi/DelphiServer/DelphiServer.dpr:lang=cpp:lines=19,173]</p> <h2 id="additional-information">Additional Information</h2> </div> Modified: websites/staging/thrift/trunk/content/tutorial/go.html ============================================================================== --- websites/staging/thrift/trunk/content/tutorial/go.html (original) +++ websites/staging/thrift/trunk/content/tutorial/go.html Thu Mar 20 14:49:43 2014 @@ -76,9 +76,9 @@ <li>The GOPATH may need to be adjusted, alternatively manually put the Go Thrift library files into a suitable location.</li> </ul> <h3 id="client">Client</h3> -<p>[snippet:tutorial/go/src/client.go:lang=cpp:lines=22,99]</p> +<p>[snippet:path=tutorial/go/src/client.go:lang=cpp:lines=22,99]</p> <h3 id="server">Server</h3> -<p>[snippet:tutorial/go/src/server.go:lang=cpp:lines=22,54]</p> +<p>[snippet:path=tutorial/go/src/server.go:lang=cpp:lines=22,54]</p> <h2 id="additional-information">Additional Information</h2> <ul> <li>Try using one of the other available protocols, default is binary.</li> Modified: websites/staging/thrift/trunk/content/tutorial/hs.html ============================================================================== --- websites/staging/thrift/trunk/content/tutorial/hs.html (original) +++ websites/staging/thrift/trunk/content/tutorial/hs.html Thu Mar 20 14:49:43 2014 @@ -72,9 +72,9 @@ <h3 id="prerequisites">Prerequisites</h3> <h3 id="client">Client</h3> -<p>[snippet:tutorial/hs/HaskellClient.hs:lang=cpp:lines=20,73]</p> +<p>[snippet:path=tutorial/hs/HaskellClient.hs:lang=cpp:lines=20,73]</p> <h3 id="server">Server</h3> -<p>[snippet:tutorial/hs/HaskellServer.hs:lang=cpp:lines=20,102]</p> +<p>[snippet:path=tutorial/hs/HaskellServer.hs:lang=cpp:lines=20,102]</p> <h2 id="additional-information">Additional Information</h2> </div> Modified: websites/staging/thrift/trunk/content/tutorial/java.html ============================================================================== --- websites/staging/thrift/trunk/content/tutorial/java.html (original) +++ websites/staging/thrift/trunk/content/tutorial/java.html Thu Mar 20 14:49:43 2014 @@ -72,9 +72,9 @@ <h3 id="prerequisites">Prerequisites</h3> <h3 id="client">Client</h3> -<p>[snippet:tutorial/java/src/JavaClient.java:lang=java:lines=21,106]</p> +<p>[snippet:path=tutorial/java/src/JavaClient.java:lang=java:lines=21,106]</p> <h3 id="server">Server</h3> -<p>[snippet:tutorial/java/src/JavaServer.java:lang=java:lines=20,110]</p> +<p>[snippet:path=tutorial/java/src/JavaServer.java:lang=java:lines=20,110]</p> <h2 id="additional-information">Additional Information</h2> </div> Modified: websites/staging/thrift/trunk/content/tutorial/nodejs.html ============================================================================== --- websites/staging/thrift/trunk/content/tutorial/nodejs.html (original) +++ websites/staging/thrift/trunk/content/tutorial/nodejs.html Thu Mar 20 14:49:43 2014 @@ -72,9 +72,9 @@ <h3 id="prerequisites">Prerequisites</h3> <h3 id="client">Client</h3> -<p>[snippet:tutorial/nodejs/NodeClient.js:lang=javascript:lines=20,74]</p> +<p>[snippet:path=tutorial/nodejs/NodeClient.js:lang=javascript:lines=20,74]</p> <h3 id="server">Server</h3> -<p>[snippet:tutorial/nodejs/NodeServer.js:lang=javascript:lines=20,89]</p> +<p>[snippet:path=tutorial/nodejs/NodeServer.js:lang=javascript:lines=20,89]</p> <h2 id="additional-information">Additional Information</h2> </div> Modified: websites/staging/thrift/trunk/content/tutorial/ocaml.html ============================================================================== --- websites/staging/thrift/trunk/content/tutorial/ocaml.html (original) +++ websites/staging/thrift/trunk/content/tutorial/ocaml.html Thu Mar 20 14:49:43 2014 @@ -72,9 +72,9 @@ <h3 id="prerequisites">Prerequisites</h3> <h3 id="client">Client</h3> -<p>[snippet:tutorial/ocaml/CalcClient.ml:lang=cpp:lines=20,74]</p> +<p>[snippet:path=tutorial/ocaml/CalcClient.ml:lang=cpp:lines=20,74]</p> <h3 id="server">Server</h3> -<p>[snippet:tutorial/ocaml/CalcServer.ml:lang=cpp:lines=20,89]</p> +<p>[snippet:path=tutorial/ocaml/CalcServer.ml:lang=cpp:lines=20,89]</p> <h2 id="additional-information">Additional Information</h2> </div> Modified: websites/staging/thrift/trunk/content/tutorial/perl.html ============================================================================== --- websites/staging/thrift/trunk/content/tutorial/perl.html (original) +++ websites/staging/thrift/trunk/content/tutorial/perl.html Thu Mar 20 14:49:43 2014 @@ -72,9 +72,9 @@ <h3 id="prerequisites">Prerequisites</h3> <h3 id="client">Client</h3> -<p>[snippet:tutorial/perl/PerlClient.pl:lang=ruby:lines=20,79]</p> +<p>[snippet:path=tutorial/perl/PerlClient.pl:lang=ruby:lines=20,79]</p> <h3 id="server">Server</h3> -<p>[snippet:tutorial/perl/PerlServer.pl:lang=ruby:lines=20,85]</p> +<p>[snippet:path=tutorial/perl/PerlServer.pl:lang=ruby:lines=20,85]</p> <h2 id="additional-information">Additional Information</h2> </div> Modified: websites/staging/thrift/trunk/content/tutorial/php.html ============================================================================== --- websites/staging/thrift/trunk/content/tutorial/php.html (original) +++ websites/staging/thrift/trunk/content/tutorial/php.html Thu Mar 20 14:49:43 2014 @@ -72,9 +72,9 @@ <h3 id="prerequisites">Prerequisites</h3> <h3 id="client">Client</h3> -<p>[snippet:tutorial/php/PhpClient.php:lang=php:lines=2,91]</p> +<p>[snippet:path=tutorial/php/PhpClient.php:lang=php:lines=2,91]</p> <h3 id="server">Server</h3> -<p>[snippet:tutorial/php/PhpServer.php:lang=php:lines=2,130]</p> +<p>[snippet:path=tutorial/php/PhpServer.php:lang=php:lines=2,130]</p> <h2 id="additional-information">Additional Information</h2> </div> Modified: websites/staging/thrift/trunk/content/tutorial/py.html ============================================================================== --- websites/staging/thrift/trunk/content/tutorial/py.html (original) +++ websites/staging/thrift/trunk/content/tutorial/py.html Thu Mar 20 14:49:43 2014 @@ -72,9 +72,9 @@ <h3 id="prerequisites">Prerequisites</h3> <h3 id="client">Client</h3> -<p>[snippet:tutorial/py/PythonClient.py:lang=python:lines=22,83]</p> +<p>[snippet:path=tutorial/py/PythonClient.py:lang=python:lines=22,83]</p> <h3 id="server">Server</h3> -<p>[snippet:tutorial/py/PythonServer.py:lang=python:lines=22,97]</p> +<p>[snippet:path=tutorial/py/PythonServer.py:lang=python:lines=22,97]</p> <h2 id="additional-information">Additional Information</h2> </div> Modified: websites/staging/thrift/trunk/content/tutorial/rb.html ============================================================================== --- websites/staging/thrift/trunk/content/tutorial/rb.html (original) +++ websites/staging/thrift/trunk/content/tutorial/rb.html Thu Mar 20 14:49:43 2014 @@ -72,9 +72,9 @@ <h3 id="prerequisites">Prerequisites</h3> <h3 id="client">Client</h3> -<p>[snippet:tutorial/rb/RubyClient.rb:lang=ruby:lines=22,75]</p> +<p>[snippet:path=tutorial/rb/RubyClient.rb:lang=ruby:lines=22,75]</p> <h3 id="server">Server</h3> -<p>[snippet:tutorial/rb/RubyServer.rb:lang=ruby:lines=22,95]</p> +<p>[snippet:path=tutorial/rb/RubyServer.rb:lang=ruby:lines=22,95]</p> <h2 id="additional-information">Additional Information</h2> </div>