Author: buildbot Date: Thu Mar 20 04:10:12 2014 New Revision: 902471 Log: Staging update by buildbot for thrift
Modified: websites/staging/thrift/trunk/content/ (props changed) websites/staging/thrift/trunk/content/index.html Propchange: websites/staging/thrift/trunk/content/ ------------------------------------------------------------------------------ --- cms:source-revision (original) +++ cms:source-revision Thu Mar 20 04:10:12 2014 @@ -1 +1 @@ -1579532 +1579533 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 04:10:12 2014 @@ -294,200 +294,200 @@ service Calculator extends shared.Shared </pre></div> </div> <div class="tab-pane" id="2"> - :::python - #!/usr/bin/env python +<div class="codehilite"><pre><span class="c">#!/usr/bin/env python</span> - # - # Licensed to the Apache Software Foundation (ASF) under one - # or more contributor license agreements. See the NOTICE file - # distributed with this work for additional information - # regarding copyright ownership. The ASF licenses this file - # to you under the Apache License, Version 2.0 (the - # "License"); you may not use this file except in compliance - # with the License. You may obtain a copy of the License at - # - # http://www.apache.org/licenses/LICENSE-2.0 - # - # Unless required by applicable law or agreed to in writing, - # software distributed under the License is distributed on an - # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - # KIND, either express or implied. See the License for the - # specific language governing permissions and limitations - # under the License. - # - - import sys, glob - sys.path.append('gen-py') - sys.path.insert(0, glob.glob('../../lib/py/build/lib.*')[0]) - - from tutorial import Calculator - from tutorial.ttypes import * - - from thrift import Thrift - from thrift.transport import TSocket - from thrift.transport import TTransport - from thrift.protocol import TBinaryProtocol - - try: - - # Make socket - transport = TSocket.TSocket('localhost', 9090) - - # Buffering is critical. Raw sockets are very slow - transport = TTransport.TBufferedTransport(transport) - - # Wrap in a protocol - protocol = TBinaryProtocol.TBinaryProtocol(transport) - - # Create a client to use the protocol encoder - client = Calculator.Client(protocol) - - # Connect! - transport.open() - - client.ping() - print 'ping()' - - sum = client.add(1,1) - print '1+1=%d' % (sum) - - work = Work() - - work.op = Operation.DIVIDE - work.num1 = 1 - work.num2 = 0 - - try: - quotient = client.calculate(1, work) - print 'Whoa? You know how to divide by zero?' - except InvalidOperation, io: - print 'InvalidOperation: %r' % io - - work.op = Operation.SUBTRACT - work.num1 = 15 - work.num2 = 10 - - diff = client.calculate(1, work) - print '15-10=%d' % (diff) +<span class="c">#</span> +<span class="c"># Licensed to the Apache Software Foundation (ASF) under one</span> +<span class="c"># or more contributor license agreements. See the NOTICE file</span> +<span class="c"># distributed with this work for additional information</span> +<span class="c"># regarding copyright ownership. The ASF licenses this file</span> +<span class="c"># to you under the Apache License, Version 2.0 (the</span> +<span class="c"># &quot;License&quot;); you may not use this file except in compliance</span> +<span class="c"># with the License. You may obtain a copy of the License at</span> +<span class="c">#</span> +<span class="c"># http://www.apache.org/licenses/LICENSE-2.0</span> +<span class="c">#</span> +<span class="c"># Unless required by applicable law or agreed to in writing,</span> +<span class="c"># software distributed under the License is distributed on an</span> +<span class="c"># &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY</span> +<span class="c"># KIND, either express or implied. See the License for the</span> +<span class="c"># specific language governing permissions and limitations</span> +<span class="c"># under the License.</span> +<span class="c">#</span> + +<span class="kn">import</span> <span class="nn">sys</span><span class="o">,</span> <span class="nn">glob</span> +<span class="n">sys</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="o">&</span><span class="c">#39;gen-py&#39;)</span> +<span class="n">sys</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">insert</span><span class="p">(</span><span class="mi">0</span><span class="p">,</span> <span class="n">glob</span><span class="o">.</span><span class="n">glob</span><span class="p">(</span><span class="o">&</span><span class="c">#39;../../lib/py/build/lib.*&#39;)[0])</span> + +<span class="kn">from</span> <span class="nn">tutorial</span> <span class="kn">import</span> <span class="n">Calculator</span> +<span class="kn">from</span> <span class="nn">tutorial.ttypes</span> <span class="kn">import</span> <span class="o">*</span> + +<span class="kn">from</span> <span class="nn">thrift</span> <span class="kn">import</span> <span class="n">Thrift</span> +<span class="kn">from</span> <span class="nn">thrift.transport</span> <span class="kn">import</span> <span class="n">TSocket</span> +<span class="kn">from</span> <span class="nn">thrift.transport</span> <span class="kn">import</span> <span class="n">TTransport</span> +<span class="kn">from</span> <span class="nn">thrift.protocol</span> <span class="kn">import</span> <span class="n">TBinaryProtocol</span> + +<span class="k">try</span><span class="p">:</span> + + <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="o">&</span><span class="c">#39;localhost&#39;, 9090)</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="o">&</span><span class="c">#39;ping()&#39;</span> + + <span class="nb">sum</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="n">add</span><span class="p">(</span><span class="mi">1</span><span class="p">,</span><span class="mi">1</span><span class="p">)</span> + <span class="k">print</span> <span class="o">&</span><span class="c">#39;1+1=%d&#39; % (sum)</span> + + <span class="n">work</span> <span class="o">=</span> <span class="n">Work</span><span class="p">()</span> + + <span class="n">work</span><span class="o">.</span><span class="n">op</span> <span class="o">=</span> <span class="n">Operation</span><span class="o">.</span><span class="n">DIVIDE</span> + <span class="n">work</span><span class="o">.</span><span class="n">num1</span> <span class="o">=</span> <span class="mi">1</span> + <span class="n">work</span><span class="o">.</span><span class="n">num2</span> <span class="o">=</span> <span class="mi">0</span> + + <span class="k">try</span><span class="p">:</span> + <span class="n">quotient</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="n">calculate</span><span class="p">(</span><span class="mi">1</span><span class="p">,</span> <span class="n">work</span><span class="p">)</span> + <span class="k">print</span> <span class="o">&</span><span class="c">#39;Whoa? You know how to divide by zero?&#39;</span> + <span class="k">except</span> <span class="n">InvalidOperation</span><span class="p">,</span> <span class="n">io</span><span class="p">:</span> + <span class="k">print</span> <span class="o">&</span><span class="c">#39;InvalidOperation: %r&#39; % io</span> + + <span class="n">work</span><span class="o">.</span><span class="n">op</span> <span class="o">=</span> <span class="n">Operation</span><span class="o">.</span><span class="n">SUBTRACT</span> + <span class="n">work</span><span class="o">.</span><span class="n">num1</span> <span class="o">=</span> <span class="mi">15</span> + <span class="n">work</span><span class="o">.</span><span class="n">num2</span> <span class="o">=</span> <span class="mi">10</span> + + <span class="n">diff</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="n">calculate</span><span class="p">(</span><span class="mi">1</span><span class="p">,</span> <span class="n">work</span><span class="p">)</span> + <span class="k">print</span> <span class="o">&</span><span class="c">#39;15-10=%d&#39; % (diff)</span> - log = client.getStruct(1) - print 'Check log: %s' % (log.value) + <span class="n">log</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="n">getStruct</span><span class="p">(</span><span class="mi">1</span><span class="p">)</span> + <span class="k">print</span> <span class="o">&</span><span class="c">#39;Check log: %s&#39; % (log.value)</span> - # Close! - transport.close() + <span class="c"># Close!</span> + <span class="n">transport</span><span class="o">.</span><span class="n">close</span><span class="p">()</span> - except Thrift.TException, tx: - print '%s' % (tx +<span class="k">except</span> <span class="n">Thrift</span><span class="o">.</span><span class="n">TException</span><span class="p">,</span> <span class="n">tx</span><span class="p">:</span> + <span class="k">print</span> <span class="o">&</span><span class="c">#39;%s&#39; % (tx</span> +</pre></div> </div> <div class="tab-pane" id="3"> - :::java - /* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - - import org.apache.thrift.server.TServer; - import org.apache.thrift.server.TServer.Args; - import org.apache.thrift.server.TSimpleServer; - import org.apache.thrift.server.TThreadPoolServer; - import org.apache.thrift.transport.TSSLTransportFactory; - import org.apache.thrift.transport.TServerSocket; - import org.apache.thrift.transport.TServerTransport; - import org.apache.thrift.transport.TSSLTransportFactory.TSSLTransportParameters; - - // Generated code - import tutorial.*; - import shared.*; - - import java.util.HashMap; - - public class JavaServer { - - public static CalculatorHandler handler; - - public static Calculator.Processor processor; - - public static void main(String [] args) { - try { - handler = new CalculatorHandler(); - processor = new Calculator.Processor(handler); - - Runnable simple = new Runnable() { - public void run() { - simple(processor); - } - }; - Runnable secure = new Runnable() { - public void run() { - secure(processor); - } - }; - - new Thread(simple).start(); - new Thread(secure).start(); - } catch (Exception x) { - x.printStackTrace(); - } - } - - public static void simple(Calculator.Processor processor) { - try { - TServerTransport serverTransport = new TServerSocket(9090); - TServer server = new TSimpleServer(new Args(serverTransport).processor(processor)); - - // Use this for a multithreaded server - // TServer server = new TThreadPoolServer(new TThreadPoolServer.Args(serverTransport).processor(processor)); - - System.out.println("Starting the simple server..."); - server.serve(); - } catch (Exception e) { - e.printStackTrace(); - } - } - - public static void secure(Calculator.Processor processor) { - try { - /* - * Use TSSLTransportParameters to setup the required SSL parameters. In this example - * we are setting the keystore and the keystore password. Other things like algorithms, - * cipher suites, client auth etc can be set. - */ - TSSLTransportParameters params = new TSSLTransportParameters(); - // The Keystore contains the private key - params.setKeyStore("../../lib/java/test/.keystore", "thrift", null, null); - - /* - * Use any of the TSSLTransportFactory to get a server transport with the appropriate - * SSL configuration. You can use the default settings if properties are set in the command line. - * Ex: -Djavax.net.ssl.keyStore=.keystore and -Djavax.net.ssl.keyStorePassword=thrift - * - * Note: You need not explicitly call open(). The underlying server socket is bound on return - * from the factory class. - */ - TServerTransport serverTransport = TSSLTransportFactory.getServerSocket(9091, 0, null, params); - TServer server = new TSimpleServer(new Args(serverTransport).processor(processor)); - - // Use this for a multi threaded server - // TServer server = new TThreadPoolServer(new TThreadPoolServer.Args(serverTransport).processor(processor)); - - System.out.println("Starting the secure server..."); - server.serve(); - } catch (Exception e) { - e +<div class="codehilite"><pre><span class="cm">/*</span> +<span class="cm"> * Licensed to the Apache Software Foundation (ASF) under one</span> +<span class="cm"> * or more contributor license agreements. See the NOTICE file</span> +<span class="cm"> * distributed with this work for additional information</span> +<span class="cm"> * regarding copyright ownership. The ASF licenses this file</span> +<span class="cm"> * to you under the Apache License, Version 2.0 (the</span> +<span class="cm"> * &quot;License&quot;); you may not use this file except in compliance</span> +<span class="cm"> * with the License. You may obtain a copy of the License at</span> +<span class="cm"> *</span> +<span class="cm"> * http://www.apache.org/licenses/LICENSE-2.0</span> +<span class="cm"> *</span> +<span class="cm"> * Unless required by applicable law or agreed to in writing,</span> +<span class="cm"> * software distributed under the License is distributed on an</span> +<span class="cm"> * &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY</span> +<span class="cm"> * KIND, either express or implied. See the License for the</span> +<span class="cm"> * specific language governing permissions and limitations</span> +<span class="cm"> * under the License.</span> +<span class="cm"> */</span> + +<span class="kn">import</span> <span class="nn">org.apache.thrift.server.TServer</span><span class="o">;</span> +<span class="kn">import</span> <span class="nn">org.apache.thrift.server.TServer.Args</span><span class="o">;</span> +<span class="kn">import</span> <span class="nn">org.apache.thrift.server.TSimpleServer</span><span class="o">;</span> +<span class="kn">import</span> <span class="nn">org.apache.thrift.server.TThreadPoolServer</span><span class="o">;</span> +<span class="kn">import</span> <span class="nn">org.apache.thrift.transport.TSSLTransportFactory</span><span class="o">;</span> +<span class="kn">import</span> <span class="nn">org.apache.thrift.transport.TServerSocket</span><span class="o">;</span> +<span class="kn">import</span> <span class="nn">org.apache.thrift.transport.TServerTransport</span><span class="o">;</span> +<span class="kn">import</span> <span class="nn">org.apache.thrift.transport.TSSLTransportFactory.TSSLTransportParameters</span><span class="o">;</span> + +<span class="c1">// Generated code</span> +<span class="kn">import</span> <span class="nn">tutorial.*</span><span class="o">;</span> +<span class="kn">import</span> <span class="nn">shared.*</span><span class="o">;</span> + +<span class="kn">import</span> <span class="nn">java.util.HashMap</span><span class="o">;</span> + +<span class="kd">public</span> <span class="kd">class</span> <span class="nc">JavaServer</span> <span class="o">{</span> + + <span class="kd">public</span> <span class="kd">static</span> <span class="n">CalculatorHandler</span> <span class="n">handler</span><span class="o">;</span> + + <span class="kd">public</span> <span class="kd">static</span> <span class="n">Calculator</span><span class="o">.</span><span class="na">Processor</span> <span class="n">processor</span><span class="o">;</span> + + <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="n">String</span> <span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span> + <span class="k">try</span> <span class="o">{</span> + <span class="n">handler</span> <span class="o">=</span> <span class="k">new</span> <span class="n">CalculatorHandler</span><span class="o">();</span> + <span class="n">processor</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Calculator</span><span class="o">.</span><span class="na">Processor</span><span class="o">(</span><span class="n">handler</span><span class="o">);</span> + + <span class="n">Runnable</span> <span class="n">simple</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Runnable</span><span class="o">()</span> <span class="o">{</span> + <span class="kd">public</span> <span class="kt">void</span> <span class="nf">run</span><span class="o">()</span> <span class="o">{</span> + <span class="n">simple</span><span class="o">(</span><span class="n">processor</span><span class="o">);</span> + <span class="o">}</span> + <span class="o">};</span> + <span class="n">Runnable</span> <span class="n">secure</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Runnable</span><span class="o">()</span> <span class="o">{</span> + <span class="kd">public</span> <span class="kt">void</span> <span class="nf">run</span><span class="o">()</span> <span class="o">{</span> + <span class="n">secure</span><span class="o">(</span><span class="n">processor</span><span class="o">);</span> + <span class="o">}</span> + <span class="o">};</span> + + <span class="k">new</span> <span class="nf">Thread</span><span class="o">(</span><span class="n">simple</span><span class="o">).</span><span class="na">start</span><span class="o">();</span> + <span class="k">new</span> <span class="nf">Thread</span><span class="o">(</span><span class="n">secure</span><span class="o">).</span><span class="na">start</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">x</span><span class="o">)</span> <span class="o">{</span> + <span class="n">x</span><span class="o">.</span><span class="na">printStackTrace</span><span class="o">();</span> + <span class="o">}</span> + <span class="o">}</span> + + <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">simple</span><span class="o">(</span><span class="n">Calculator</span><span class="o">.</span><span class="na">Processor</span> <span class="n">processor</span><span class="o">)</span> <span class="o">{</span> + <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="n">quot</span><span class="o">;</span><span class="n">Starting</span> <span class="n">the</span> <span class="n">simple</span> <span class="n">server</span><span class="o">...&</span><span class="n">quot</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><span class="o">.</span><span class="na">printStackTrace</span><span class="o">();</span> + <span class="o">}</span> + <span class="o">}</span> + + <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">secure</span><span class="o">(</span><span class="n">Calculator</span><span class="o">.</span><span class="na">Processor</span> <span class="n">processor</span><span class="o">)</span> <span class="o">{</span> + <span class="k">try</span> <span class="o">{</span> + <span class="cm">/*</span> +<span class="cm"> * Use TSSLTransportParameters to setup the required SSL parameters. In this example</span> +<span class="cm"> * we are setting the keystore and the keystore password. Other things like algorithms,</span> +<span class="cm"> * cipher suites, client auth etc can be set. </span> +<span class="cm"> */</span> + <span class="n">TSSLTransportParameters</span> <span class="n">params</span> <span class="o">=</span> <span class="k">new</span> <span class="n">TSSLTransportParameters</span><span class="o">();</span> + <span class="c1">// The Keystore contains the private key</span> + <span class="n">params</span><span class="o">.</span><span class="na">setKeyStore</span><span class="o">(&</span><span class="n">quot</span><span class="o">;../../</span><span class="n">lib</span><span class="o">/</span><span class="n">java</span><span class="o">/</span><span class="n">test</span><span class="o">/.</span><span class="na">keystore</span><span class="o">&</span><span class="n">quot</span><span class="o">;,</span> <span class="o">&</span><span class="n">quot</span><span class="o">;</span><span class="n">thrift</span><span class="o">&</span><span class="n">quot</span><span class="o">;,</span> <span class="kc">null</span><span class="o">,</span> <span class="kc">null</span><span class="o">);</span> + + <span class="cm">/*</span> +<span class="cm"> * Use any of the TSSLTransportFactory to get a server transport with the appropriate</span> +<span class="cm"> * SSL configuration. You can use the default settings if properties are set in the command line.</span> +<span class="cm"> * Ex: -Djavax.net.ssl.keyStore=.keystore and -Djavax.net.ssl.keyStorePassword=thrift</span> +<span class="cm"> * </span> +<span class="cm"> * Note: You need not explicitly call open(). The underlying server socket is bound on return</span> +<span class="cm"> * from the factory class. </span> +<span class="cm"> */</span> + <span class="n">TServerTransport</span> <span class="n">serverTransport</span> <span class="o">=</span> <span class="n">TSSLTransportFactory</span><span class="o">.</span><span class="na">getServerSocket</span><span class="o">(</span><span class="mi">9091</span><span class="o">,</span> <span class="mi">0</span><span class="o">,</span> <span class="kc">null</span><span class="o">,</span> <span class="n">params</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 multi threaded 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="n">quot</span><span class="o">;</span><span class="n">Starting</span> <span class="n">the</span> <span class="n">secure</span> <span class="n">server</span><span class="o">...&</span><span class="n">quot</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> </div> </div> </div>