Author: buildbot
Date: Thu Mar 20 13:54:37 2014
New Revision: 902523
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 13:54:37 2014
@@ -1 +1 @@
-1579541
+1579628
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 13:54:37 2014
@@ -145,14 +145,14 @@
* 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
+ * "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
+ * "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.
@@ -180,9 +180,9 @@
* double 64-bit floating point value
* string String
* binary Blob (byte array)
- * map<t1,t2> Map from one type to another
- * list<t1> Ordered list of one type
- * set<t1> Set of unique elements of one type
+ * map<t1,t2> Map from one type to another
+ * list<t1> Ordered list of one type
+ * set<t1> Set of unique elements of one type
*
* Did you also notice that Thrift supports C style comments?
*/
@@ -197,7 +197,7 @@
* Included objects are accessed using the name of the .thrift file as a
* prefix. i.e. shared.SharedObject
*/
-include &quot;shared.thrift&quot;
+include "shared.thrift"
/**
* Thrift files can namespace, package, or prefix their output in various
@@ -220,7 +220,7 @@ typedef i32 MyInteger
* types and structs are specified using JSON notation.
*/
const i32 INT32CONSTANT = 9853
-const map&lt;string,string&gt; MAPCONSTANT =
{&#39;hello&#39;:&#39;world&#39;,
&#39;goodnight&#39;:&#39;moon&#39;}
+const map<string,string> MAPCONSTANT = {'hello':'world',
'goodnight':'moon'}
/**
* You can define enums, which are just 32 bit integers. Values are optional
@@ -238,8 +238,8 @@ enum Operation {
* which each have an integer identifier, a type, a symbolic name, and an
* optional default value.
*
- * Fields can be declared &quot;optional&quot;, which ensures they
will not be included
- * in the serialized output if they aren&#39;t set. Note that this
requires some
+ * Fields can be declared "optional", which ensures they will not be
included
+ * in the serialized output if they aren't set. Note that this requires
some
* manual management in some languages.
*/
struct Work {
@@ -288,7 +288,7 @@ service Calculator extends shared.Shared
/**
* That just about covers the basics. Take a look in the test/ folder for more
* detailed examples. After you run this file, your generated code shows up
- * in folders with names gen-&lt;language&gt;. The generated code
isn&#39;t too scary
+ * in folders with names gen-<language>. The generated code isn't
too scary
* to look at. It even has pretty indentation.
*/
</pre></div>
@@ -302,22 +302,22 @@ service Calculator extends shared.Shared
<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"># "License"); 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"># "AS IS" 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="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="s">'gen-py'</span><span
class="p">)</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="s">'../../lib/py/build/lib.*'</span><span
class="p">)[</span><span class="mi">0</span><span class="p">])</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>
@@ -330,7 +330,7 @@ service Calculator extends shared.Shared
<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="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>
@@ -345,10 +345,10 @@ service Calculator extends shared.Shared
<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="k">print</span> <span class="s">'ping()'</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="k">print</span> <span class="s">'1+1=</span><span
class="si">%d</span><span class="s">'</span> <span class="o">%</span> <span
class="p">(</span><span class="nb">sum</span><span class="p">)</span>
<span class="n">work</span> <span class="o">=</span> <span
class="n">Work</span><span class="p">()</span>
@@ -358,25 +358,25 @@ service Calculator extends shared.Shared
<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">print</span> <span class="s">'Whoa? You know how to
divide by zero?'</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="k">print</span> <span class="s">'InvalidOperation:
</span><span class="si">%r</span><span class="s">'</span> <span
class="o">%</span> <span class="n">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>
+ <span class="k">print</span> <span class="s">'15-10=</span><span
class="si">%d</span><span class="s">'</span> <span class="o">%</span> <span
class="p">(</span><span class="n">diff</span><span class="p">)</span>
<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>
+ <span class="k">print</span> <span class="s">'Check log: </span><span
class="si">%s</span><span class="s">'</span> <span class="o">%</span> <span
class="p">(</span><span class="n">log</span><span class="o">.</span><span
class="n">value</span><span class="p">)</span>
<span class="c"># Close!</span>
<span class="n">transport</span><span class="o">.</span><span
class="n">close</span><span class="p">()</span>
<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>
+ <span class="k">print</span> <span class="s">'</span><span
class="si">%s</span><span class="s">'</span> <span class="o">%</span> <span
class="p">(</span><span class="n">tx</span>
</pre></div>
</div>
<div class="tab-pane" id="3">
@@ -386,14 +386,14 @@ service Calculator extends shared.Shared
<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"> * "License"); 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"> * "AS IS" 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>
@@ -451,7 +451,7 @@ service Calculator extends shared.Shared
<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">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><span class="o">.</span><span
class="na">printStackTrace</span><span class="o">();</span>
@@ -467,7 +467,7 @@ service Calculator extends shared.Shared
<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="n">params</span><span class="o">.</span><span
class="na">setKeyStore</span><span class="o">(</span><span
class="s">"../../lib/java/test/.keystore"</span><span
class="o">,</span> <span class="s">"thrift"</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>
@@ -483,7 +483,7 @@ service Calculator extends shared.Shared
<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">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 secure 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>
