You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by je...@apache.org on 2013/09/21 15:31:07 UTC

svn commit: r1525233 - in /thrift/site: content/docs/ publish/ publish/about/ publish/docs/HowToContribute/ publish/docs/committers/HowToThriftWebsite/ publish/docs/committers/HowToVersion/ publish/docs/idl/ publish/download/ publish/sitemap/

Author: jensg
Date: Sat Sep 21 13:31:06 2013
New Revision: 1525233

URL: http://svn.apache.org/r1525233
Log:
Integrated unions into IDL description

Modified:
    thrift/site/content/docs/idl.md
    thrift/site/publish/about/index.html
    thrift/site/publish/docs/HowToContribute/index.html
    thrift/site/publish/docs/committers/HowToThriftWebsite/index.html
    thrift/site/publish/docs/committers/HowToVersion/index.html
    thrift/site/publish/docs/idl/index.html
    thrift/site/publish/download/index.html
    thrift/site/publish/index.html
    thrift/site/publish/sitemap/index.html

Modified: thrift/site/content/docs/idl.md
URL: http://svn.apache.org/viewvc/thrift/site/content/docs/idl.md?rev=1525233&r1=1525232&r2=1525233&view=diff
==============================================================================
--- thrift/site/content/docs/idl.md (original)
+++ thrift/site/content/docs/idl.md Sat Sep 21 13:31:06 2013
@@ -56,7 +56,7 @@ N.B.: The `xsd_namespace` directive has 
 
 ## Definition
 
-    [7]  Definition      ::=  Const | Typedef | Enum | Senum | Struct | Exception | Service
+    [7]  Definition      ::=  Const | Typedef | Enum | Senum | Struct | Union | Exception | Service
 
 ### Const
 
@@ -76,6 +76,8 @@ An enum creates an enumerated type, with
 
 ### Senum
 
+Senum (and Slist) are now deprecated and should both be replaced with String.
+
     [11] Senum           ::=  'senum' Identifier '{' (Literal ListSeparator?)* '}'
 
 ### Struct
@@ -86,97 +88,105 @@ Structs are the fundamental compositiona
 
 N.B.: The `xsd_all` keyword has some purpose internal to Facebook but serves no purpose in Thrift itself. Use of this feature is strongly discouraged
 
+### Union
+
+Unions are similar to structs, except that they provide a means to transport exactly one field of a possible set of fields, just like union {} in C++. Consequently, union members cannot be required fields.
+
+    [13] Union          ::=  'union' Identifier 'xsd_all'? '{' Field* '}'
+
+N.B.: The `xsd_all` keyword has some purpose internal to Facebook but serves no purpose in Thrift itself. Use of this feature is strongly discouraged
+
 ### Exception
 
 Exceptions are similar to structs except that they are intended to integrate with the native exception handling mechanisms in the target languages. The name of each field must be unique within the exception.
 
-    [13] Exception       ::=  'exception' Identifier '{' Field* '}'
+    [14] Exception       ::=  'exception' Identifier '{' Field* '}'
 
 ### Service
 
 A service provides the interface for a set of functionality provided by a Thrift server. The interface is simply a list of functions. A service can extend another service, which simply means that it provides the functions of the extended service in addition to its own.
 
-    [14] Service         ::=  'service' Identifier ( 'extends' Identifier )? '{' Function* '}'
+    [15] Service         ::=  'service' Identifier ( 'extends' Identifier )? '{' Function* '}'
 
 ## Field
 
-    [15] Field           ::=  FieldID? FieldReq? FieldType Identifier ('= ConstValue)? XsdFieldOptions ListSeparator?
+    [16] Field           ::=  FieldID? FieldReq? FieldType Identifier ('= ConstValue)? XsdFieldOptions ListSeparator?
 
 ### Field ID
 
-    [16] FieldID         ::=  IntConstant ':'
+    [17] FieldID         ::=  IntConstant ':'
 
 ### Field Requiredness
 
-    [17] FieldReq        ::=  'required' | 'optional'
+    [18] FieldReq        ::=  'required' | 'optional'
 
 ### XSD Options
 
 N.B.: These have  some internal purpose at Facebook but serve no current purpose in Thrift. Use of these options is strongly discouraged.
 
-    [18] XsdFieldOptions ::=  'xsd_optional'? 'xsd_nillable'? XsdAttrs?
+    [19] XsdFieldOptions ::=  'xsd_optional'? 'xsd_nillable'? XsdAttrs?
 
-    [19] XsdAttrs        ::=  'xsd_attrs' '{' Field* '}'
+    [20] XsdAttrs        ::=  'xsd_attrs' '{' Field* '}'
 
 ## Functions
 
-    [20] Function        ::=  'oneway'? FunctionType Identifier '(' Field* ')' Throws? ListSeparator?
+    [21] Function        ::=  'oneway'? FunctionType Identifier '(' Field* ')' Throws? ListSeparator?
 
-    [21] FunctionType    ::=  FieldType | 'void'
+    [22] FunctionType    ::=  FieldType | 'void'
 
-    [22] Throws          ::=  'throws' '(' Field* ')'
+    [23] Throws          ::=  'throws' '(' Field* ')'
 
 ## Types
 
-    [23] FieldType       ::=  Identifier | BaseType | ContainerType
+    [24] FieldType       ::=  Identifier | BaseType | ContainerType
 
-    [24] DefinitionType  ::=  BaseType | ContainerType
+    [25] DefinitionType  ::=  BaseType | ContainerType
 
-    [25] BaseType        ::=  'bool' | 'byte' | 'i16' | 'i32' | 'i64' | 'double' | 'string' | 'binary' | 'slist'
+    [26] BaseType        ::=  'bool' | 'byte' | 'i16' | 'i32' | 'i64' | 'double' | 'string' | 'binary' | 'slist'
 
-    [26] ContainerType   ::=  MapType | SetType | ListType
+    [27] ContainerType   ::=  MapType | SetType | ListType
 
-    [27] MapType         ::=  'map' CppType? '<' FieldType ',' FieldType '>'
+    [28] MapType         ::=  'map' CppType? '<' FieldType ',' FieldType '>'
 
-    [28] SetType         ::=  'set' CppType? '<' FieldType '>'
+    [29] SetType         ::=  'set' CppType? '<' FieldType '>'
 
-    [29] ListType        ::=  'list' '<' FieldType '>' CppType?
+    [30] ListType        ::=  'list' '<' FieldType '>' CppType?
 
-    [30] CppType         ::=  'cpp_type' Literal
+    [31] CppType         ::=  'cpp_type' Literal
 
 ## Constant Values
 
-    [31] ConstValue      ::=  IntConstant | DoubleConstant | Literal | Identifier | ConstList | ConstMap
+    [32] ConstValue      ::=  IntConstant | DoubleConstant | Literal | Identifier | ConstList | ConstMap
 
-    [32] IntConstant     ::=  ('+' | '-')? Digit+
+    [33] IntConstant     ::=  ('+' | '-')? Digit+
 
-    [33] DoubleConstant  ::=  ('+' | '-')? Digit* ('.' Digit+)? ( ('E' | 'e') IntConstant )?
+    [34] DoubleConstant  ::=  ('+' | '-')? Digit* ('.' Digit+)? ( ('E' | 'e') IntConstant )?
 
-    [34] ConstList       ::=  '[' (ConstValue ListSeparator?)* ']'
+    [35] ConstList       ::=  '[' (ConstValue ListSeparator?)* ']'
 
-    [35] ConstMap        ::=  '{' (ConstValue ':' ConstValue ListSeparator?)* '}'
+    [36] ConstMap        ::=  '{' (ConstValue ':' ConstValue ListSeparator?)* '}'
 
 ## Basic Definitions
 
 ### Literal
 
-    [36] Literal         ::=  ('"' [^"]* '"') | ("'" [^']* "'")
+    [37] Literal         ::=  ('"' [^"]* '"') | ("'" [^']* "'")
 
 ### Identifier
 
-    [37] Identifier      ::=  ( Letter | '_' ) ( Letter | Digit | '.' | '_' )*
+    [38] Identifier      ::=  ( Letter | '_' ) ( Letter | Digit | '.' | '_' )*
 
-    [38] STIdentifier    ::=  ( Letter | '_' ) ( Letter | Digit | '.' | '_' | '-' )*
+    [39] STIdentifier    ::=  ( Letter | '_' ) ( Letter | Digit | '.' | '_' | '-' )*
 
 ### List Separator
 
-    [39] ListSeparator   ::=  ',' | ';'
+    [40] ListSeparator   ::=  ',' | ';'
 
 ### Letters and Digits
 
-    [40] Letter          ::=  ['A'-'Z'] | ['a'-'z']
+    [41] Letter          ::=  ['A'-'Z'] | ['a'-'z']
 
-    [41] Digit           ::=  ['0'-'9']
+    [42] Digit           ::=  ['0'-'9']
 
 ## Examples
 

Modified: thrift/site/publish/about/index.html
URL: http://svn.apache.org/viewvc/thrift/site/publish/about/index.html?rev=1525233&r1=1525232&r2=1525233&view=diff
==============================================================================
--- thrift/site/publish/about/index.html (original)
+++ thrift/site/publish/about/index.html Sat Sep 21 13:31:06 2013
@@ -163,7 +163,7 @@ Strive for performance first, elegance s
         <tr class="">
             <td class="username">bryanduxbury</td>
             <td class="fullname">Bryan Duxbury</td>
-            <td>Compact Protocol, Java, Ruby</td>
+            <td>Release Manager, Compact Protocol, Java, Ruby</td>
             <td align="right">-8</td>
         </tr>
         
@@ -205,7 +205,7 @@ Strive for performance first, elegance s
         <tr class="">
             <td class="username">jfarrell</td>
             <td class="fullname">Jake Farrell</td>
-            <td>Release Manager, Build, Client Publishing, Java, PHP, Ruby</td>
+            <td>Build, Client Publishing, Java, PHP, Ruby</td>
             <td align="right">-5</td>
         </tr>
         
@@ -281,6 +281,11 @@ Strive for performance first, elegance s
         </tr>
         
         <tr class="">
+            <td class="company">ONEsite</td>
+            <td class="website"><a href="http://www.onesite.com">http://www.onesite.com</a></td>
+        </tr>
+        
+        <tr class="">
             <td class="company">OpenX</td>
             <td class="website"><a href="http://www.openx.org">http://www.openx.org</a></td>
         </tr>

Modified: thrift/site/publish/docs/HowToContribute/index.html
URL: http://svn.apache.org/viewvc/thrift/site/publish/docs/HowToContribute/index.html?rev=1525233&r1=1525232&r2=1525233&view=diff
==============================================================================
--- thrift/site/publish/docs/HowToContribute/index.html (original)
+++ thrift/site/publish/docs/HowToContribute/index.html Sat Sep 21 13:31:06 2013
@@ -104,7 +104,7 @@
 <ul>
 <li><a href="http://www.apache.org/dev/contributors">Contributors Tech Guide</a></li>
 <li><a href="http://www.apache.org/foundation/getinvolved.html">Get involved!</a></li>
-<li><a href="http://www.apache.org/licenses/LICENSE-2.0.html#contributions">Legal aspects on Submission of Contributions (Patches)</a></li>
+<li>[Legal aspects on Submission of Contributions (Patches)|http://www.apache.org/licenses/LICENSE-2.0.html#contributions]</li>
 </ul>
 
 	</div>

Modified: thrift/site/publish/docs/committers/HowToThriftWebsite/index.html
URL: http://svn.apache.org/viewvc/thrift/site/publish/docs/committers/HowToThriftWebsite/index.html?rev=1525233&r1=1525232&r2=1525233&view=diff
==============================================================================
--- thrift/site/publish/docs/committers/HowToThriftWebsite/index.html (original)
+++ thrift/site/publish/docs/committers/HowToThriftWebsite/index.html Sat Sep 21 13:31:06 2013
@@ -103,8 +103,8 @@
 
 <p>The current release versioning is kept in the global configuration file config.yaml. Update the following values and then following <b>Updating the Website</b> section below </p>
 
-<pre><code>current_release: "0.9.1"
-current_release_date: "2013-08-21"
+<pre><code>current_release: "0.9.0"
+current_release_date: "2012-10-15"
 </code></pre>
 
 <h3>Updating the website</h3>

Modified: thrift/site/publish/docs/committers/HowToVersion/index.html
URL: http://svn.apache.org/viewvc/thrift/site/publish/docs/committers/HowToVersion/index.html?rev=1525233&r1=1525232&r2=1525233&view=diff
==============================================================================
--- thrift/site/publish/docs/committers/HowToVersion/index.html (original)
+++ thrift/site/publish/docs/committers/HowToVersion/index.html Sat Sep 21 13:31:06 2013
@@ -230,7 +230,7 @@
 
 <ul>
 <li>Name:           libthrift</li>
-<li>Version:        0.9.1-[dev|snapshot]</li>
+<li>Version:        0.9.0-[dev|snapshot]</li>
 <li>License:        Apache License 2.0</li>
 <li>License URL:    http://www.apache.org/licenses/LICENSE-2.0</li>
 <li>Homepage:       http://thrift.apache.org</li>

Modified: thrift/site/publish/docs/idl/index.html
URL: http://svn.apache.org/viewvc/thrift/site/publish/docs/idl/index.html?rev=1525233&r1=1525232&r2=1525233&view=diff
==============================================================================
--- thrift/site/publish/docs/idl/index.html (original)
+++ thrift/site/publish/docs/idl/index.html Sat Sep 21 13:31:06 2013
@@ -126,7 +126,7 @@
 
 <h2>Definition</h2>
 
-<pre><code>[7]  Definition      ::=  Const | Typedef | Enum | Senum | Struct | Exception | Service
+<pre><code>[7]  Definition      ::=  Const | Typedef | Enum | Senum | Struct | Union | Exception | Service
 </code></pre>
 
 <h3>Const</h3>
@@ -150,6 +150,8 @@
 
 <h3>Senum</h3>
 
+<p>Senum (and Slist) are now deprecated and should both be replaced with String.</p>
+
 <pre><code>[11] Senum           ::=  'senum' Identifier '{' (Literal ListSeparator?)* '}'
 </code></pre>
 
@@ -162,109 +164,118 @@
 
 <p>N.B.: The <code>xsd_all</code> keyword has some purpose internal to Facebook but serves no purpose in Thrift itself. Use of this feature is strongly discouraged</p>
 
+<h3>Union</h3>
+
+<p>Unions are similar to structs, except that they provide a means to transport exactly one field of a possible set of fields, just like union {} in C++. Consequently, union members cannot be required fields.</p>
+
+<pre><code>[13] Union          ::=  'union' Identifier 'xsd_all'? '{' Field* '}'
+</code></pre>
+
+<p>N.B.: The <code>xsd_all</code> keyword has some purpose internal to Facebook but serves no purpose in Thrift itself. Use of this feature is strongly discouraged</p>
+
 <h3>Exception</h3>
 
 <p>Exceptions are similar to structs except that they are intended to integrate with the native exception handling mechanisms in the target languages. The name of each field must be unique within the exception.</p>
 
-<pre><code>[13] Exception       ::=  'exception' Identifier '{' Field* '}'
+<pre><code>[14] Exception       ::=  'exception' Identifier '{' Field* '}'
 </code></pre>
 
 <h3>Service</h3>
 
 <p>A service provides the interface for a set of functionality provided by a Thrift server. The interface is simply a list of functions. A service can extend another service, which simply means that it provides the functions of the extended service in addition to its own.</p>
 
-<pre><code>[14] Service         ::=  'service' Identifier ( 'extends' Identifier )? '{' Function* '}'
+<pre><code>[15] Service         ::=  'service' Identifier ( 'extends' Identifier )? '{' Function* '}'
 </code></pre>
 
 <h2>Field</h2>
 
-<pre><code>[15] Field           ::=  FieldID? FieldReq? FieldType Identifier ('= ConstValue)? XsdFieldOptions ListSeparator?
+<pre><code>[16] Field           ::=  FieldID? FieldReq? FieldType Identifier ('= ConstValue)? XsdFieldOptions ListSeparator?
 </code></pre>
 
 <h3>Field ID</h3>
 
-<pre><code>[16] FieldID         ::=  IntConstant ':'
+<pre><code>[17] FieldID         ::=  IntConstant ':'
 </code></pre>
 
 <h3>Field Requiredness</h3>
 
-<pre><code>[17] FieldReq        ::=  'required' | 'optional'
+<pre><code>[18] FieldReq        ::=  'required' | 'optional'
 </code></pre>
 
 <h3>XSD Options</h3>
 
 <p>N.B.: These have  some internal purpose at Facebook but serve no current purpose in Thrift. Use of these options is strongly discouraged.</p>
 
-<pre><code>[18] XsdFieldOptions ::=  'xsd_optional'? 'xsd_nillable'? XsdAttrs?
+<pre><code>[19] XsdFieldOptions ::=  'xsd_optional'? 'xsd_nillable'? XsdAttrs?
 
-[19] XsdAttrs        ::=  'xsd_attrs' '{' Field* '}'
+[20] XsdAttrs        ::=  'xsd_attrs' '{' Field* '}'
 </code></pre>
 
 <h2>Functions</h2>
 
-<pre><code>[20] Function        ::=  'oneway'? FunctionType Identifier '(' Field* ')' Throws? ListSeparator?
+<pre><code>[21] Function        ::=  'oneway'? FunctionType Identifier '(' Field* ')' Throws? ListSeparator?
 
-[21] FunctionType    ::=  FieldType | 'void'
+[22] FunctionType    ::=  FieldType | 'void'
 
-[22] Throws          ::=  'throws' '(' Field* ')'
+[23] Throws          ::=  'throws' '(' Field* ')'
 </code></pre>
 
 <h2>Types</h2>
 
-<pre><code>[23] FieldType       ::=  Identifier | BaseType | ContainerType
+<pre><code>[24] FieldType       ::=  Identifier | BaseType | ContainerType
 
-[24] DefinitionType  ::=  BaseType | ContainerType
+[25] DefinitionType  ::=  BaseType | ContainerType
 
-[25] BaseType        ::=  'bool' | 'byte' | 'i16' | 'i32' | 'i64' | 'double' | 'string' | 'binary' | 'slist'
+[26] BaseType        ::=  'bool' | 'byte' | 'i16' | 'i32' | 'i64' | 'double' | 'string' | 'binary' | 'slist'
 
-[26] ContainerType   ::=  MapType | SetType | ListType
+[27] ContainerType   ::=  MapType | SetType | ListType
 
-[27] MapType         ::=  'map' CppType? '&lt;' FieldType ',' FieldType '&gt;'
+[28] MapType         ::=  'map' CppType? '&lt;' FieldType ',' FieldType '&gt;'
 
-[28] SetType         ::=  'set' CppType? '&lt;' FieldType '&gt;'
+[29] SetType         ::=  'set' CppType? '&lt;' FieldType '&gt;'
 
-[29] ListType        ::=  'list' '&lt;' FieldType '&gt;' CppType?
+[30] ListType        ::=  'list' '&lt;' FieldType '&gt;' CppType?
 
-[30] CppType         ::=  'cpp_type' Literal
+[31] CppType         ::=  'cpp_type' Literal
 </code></pre>
 
 <h2>Constant Values</h2>
 
-<pre><code>[31] ConstValue      ::=  IntConstant | DoubleConstant | Literal | Identifier | ConstList | ConstMap
+<pre><code>[32] ConstValue      ::=  IntConstant | DoubleConstant | Literal | Identifier | ConstList | ConstMap
 
-[32] IntConstant     ::=  ('+' | '-')? Digit+
+[33] IntConstant     ::=  ('+' | '-')? Digit+
 
-[33] DoubleConstant  ::=  ('+' | '-')? Digit* ('.' Digit+)? ( ('E' | 'e') IntConstant )?
+[34] DoubleConstant  ::=  ('+' | '-')? Digit* ('.' Digit+)? ( ('E' | 'e') IntConstant )?
 
-[34] ConstList       ::=  '[' (ConstValue ListSeparator?)* ']'
+[35] ConstList       ::=  '[' (ConstValue ListSeparator?)* ']'
 
-[35] ConstMap        ::=  '{' (ConstValue ':' ConstValue ListSeparator?)* '}'
+[36] ConstMap        ::=  '{' (ConstValue ':' ConstValue ListSeparator?)* '}'
 </code></pre>
 
 <h2>Basic Definitions</h2>
 
 <h3>Literal</h3>
 
-<pre><code>[36] Literal         ::=  ('"' [^"]* '"') | ("'" [^']* "'")
+<pre><code>[37] Literal         ::=  ('"' [^"]* '"') | ("'" [^']* "'")
 </code></pre>
 
 <h3>Identifier</h3>
 
-<pre><code>[37] Identifier      ::=  ( Letter | '_' ) ( Letter | Digit | '.' | '_' )*
+<pre><code>[38] Identifier      ::=  ( Letter | '_' ) ( Letter | Digit | '.' | '_' )*
 
-[38] STIdentifier    ::=  ( Letter | '_' ) ( Letter | Digit | '.' | '_' | '-' )*
+[39] STIdentifier    ::=  ( Letter | '_' ) ( Letter | Digit | '.' | '_' | '-' )*
 </code></pre>
 
 <h3>List Separator</h3>
 
-<pre><code>[39] ListSeparator   ::=  ',' | ';'
+<pre><code>[40] ListSeparator   ::=  ',' | ';'
 </code></pre>
 
 <h3>Letters and Digits</h3>
 
-<pre><code>[40] Letter          ::=  ['A'-'Z'] | ['a'-'z']
+<pre><code>[41] Letter          ::=  ['A'-'Z'] | ['a'-'z']
 
-[41] Digit           ::=  ['0'-'9']
+[42] Digit           ::=  ['0'-'9']
 </code></pre>
 
 <h2>Examples</h2>

Modified: thrift/site/publish/download/index.html
URL: http://svn.apache.org/viewvc/thrift/site/publish/download/index.html?rev=1525233&r1=1525232&r2=1525233&view=diff
==============================================================================
--- thrift/site/publish/download/index.html (original)
+++ thrift/site/publish/download/index.html Sat Sep 21 13:31:06 2013
@@ -68,14 +68,14 @@
   	<div class="container">
 		<h2>Release</h2>
 
-<p>The latest stable release of Thrift is 0.9.1 (released on 2013-08-21).</p>
+<p>The latest stable release of Thrift is 0.9.0 (released on 2012-10-15).</p>
 
 <ul>
 <li>
-<a href="http://www.apache.org/dyn/closer.cgi?path=/thrift/0.9.1/thrift-0.9.1.tar.gz">thrift-0.9.1.tar.gz</a> [<a href="https://dist.apache.org/repos/dist/release/thrift/0.9.1/thrift-0.9.1.tar.gz.asc">PGP</a>]
-[<a href="https://dist.apache.org/repos/dist/release/thrift/0.9.1/thrift-0.9.1.tar.gz.md5">MD5</a>]</li>
+<a href="http://www.apache.org/dyn/closer.cgi?path=/thrift/0.9.0/thrift-0.9.0.tar.gz">thrift-0.9.0.tar.gz</a> [<a href="https://dist.apache.org/repos/dist/release/thrift/0.9.0/thrift-0.9.0.tar.gz.asc">PGP</a>]
+[<a href="https://dist.apache.org/repos/dist/release/thrift/0.9.0/thrift-0.9.0.tar.gz.md5">MD5</a>]</li>
 <li>
-<a href="http://www.apache.org/dyn/closer.cgi?path=/thrift/0.9.1/thrift-0.9.1.exe">Thrift compiler for Windows (thrift-0.9.1.exe)</a> [<a href="https://dist.apache.org/repos/dist/release/thrift/0.9.1/thrift-0.9.1.exe.asc">PGP</a>] [<a href="https://dist.apache.org/repos/dist/release/thrift/0.9.1/thrift-0.9.1.exe.md5">MD5</a>]</li>
+<a href="http://www.apache.org/dyn/closer.cgi?path=/thrift/0.9.0/thrift-0.9.0.exe">Thrift compiler for Windows (thrift-0.9.0.exe)</a> [<a href="https://dist.apache.org/repos/dist/release/thrift/0.9.0/thrift-0.9.0.exe.asc">PGP</a>] [<a href="https://dist.apache.org/repos/dist/release/thrift/0.9.0/thrift-0.9.0.exe.md5">MD5</a>]</li>
 </ul>
 
 <h2>Maven artifact</h2>
@@ -84,7 +84,7 @@
 &lt;dependency&gt;
   &lt;groupId&gt;org.apache.thrift&lt;/groupId&gt;
   &lt;artifactId&gt;libthrift&lt;/artifactId&gt;
-  &lt;version&gt;0.9.1&lt;/version&gt;
+  &lt;version&gt;0.9.0&lt;/version&gt;
 &lt;/dependency&gt;
 </code></pre>
 

Modified: thrift/site/publish/index.html
URL: http://svn.apache.org/viewvc/thrift/site/publish/index.html?rev=1525233&r1=1525232&r2=1525233&view=diff
==============================================================================
--- thrift/site/publish/index.html (original)
+++ thrift/site/publish/index.html Sat Sep 21 13:31:06 2013
@@ -104,19 +104,19 @@
   </div>
   <div class="span3 well center pull-right">
     <h2>Download</h2>
-    <p>Apache Thrift v0.9.1</p>
+    <p>Apache Thrift v0.9.0</p>
     <p>
-      <a class="btn btn-large" href="http://www.apache.org/dyn/closer.cgi?path=/thrift/0.9.1/thrift-0.9.1.tar.gz">
-          Download <small>v0.9.1</small>
+      <a class="btn btn-large" href="http://www.apache.org/dyn/closer.cgi?path=/thrift/0.9.0/thrift-0.9.0.tar.gz">
+          Download <small>v0.9.0</small>
       </a>
     </p>
     <p>
       <small>
-       <a href="https://dist.apache.org/repos/dist/release/thrift/0.9.1/thrift-0.9.1.tar.gz.md5">MD5</a>
+       <a href="https://dist.apache.org/repos/dist/release/thrift/0.9.0/thrift-0.9.0.tar.gz.md5">MD5</a>
       </small>
       |
       <small>
-       <a href="https://dist.apache.org/repos/dist/release/thrift/0.9.1/thrift-0.9.1.tar.gz.asc">PGP</a>
+       <a href="https://dist.apache.org/repos/dist/release/thrift/0.9.0/thrift-0.9.0.tar.gz.asc">PGP</a>
       </small>
     </p>
     <p>
@@ -154,10 +154,10 @@
       </code></pre>
     </div>
     <div class="tab-pane" id="2">
-      <div class="CodeRay"><div class="code"><pre><code class="language-python"><span style="color:#777"># Make an object</span>
-up = UserProfile(uid=<span style="color:#00D">1</span>,
-                 name=<span style="background-color:hsla(0,100%,50%,0.05)"><span style="color:#710">"</span><span style="color:#D20">Test User</span><span style="color:#710">"</span></span>,
-                 blurb=<span style="background-color:hsla(0,100%,50%,0.05)"><span style="color:#710">"</span><span style="color:#D20">Thrift is great</span><span style="color:#710">"</span></span>)
+      <div class="CodeRay"><div class="code"><pre><code class="language-python">      <span style="color:#777"># Make an object</span>
+      up = UserProfile(uid=<span style="color:#00D">1</span>,
+                       name=<span style="background-color:hsla(0,100%,50%,0.05)"><span style="color:#710">"</span><span style="color:#D20">Test User</span><span style="color:#710">"</span></span>,
+                       blurb=<span style="background-color:hsla(0,100%,50%,0.05)"><span style="color:#710">"</span><span style="color:#D20">Thrift is great</span><span style="color:#710">"</span></span>)
 
   <span style="color:#777"># Talk to a server via TCP sockets, using a binary protocol</span>
   transport = TSocket.TSocket(<span style="background-color:hsla(0,100%,50%,0.05)"><span style="color:#710">"</span><span style="color:#D20">localhost</span><span style="color:#710">"</span></span>, <span style="color:#00D">9090</span>)
@@ -170,11 +170,10 @@ up = UserProfile(uid=<span style="color:
 
   <span style="color:#777"># Retrieve something as well</span>
   up2 = service.retrieve(<span style="color:#00D">2</span>)
-  </code></pre>
-</div>
-</div></div>
-<div class="tab-pane" id="3">
-<div class="CodeRay"><div class="code"><pre><code class="language-c">
+  &lt;/code&gt;&lt;/pre&gt;
+&lt;/div&gt;
+&lt;div <span style="color:#080;font-weight:bold">class</span>=<span style="background-color:hsla(0,100%,50%,0.05)"><span style="color:#710">"</span><span style="color:#D20">tab-pane</span><span style="color:#710">"</span></span> id=<span style="background-color:hsla(0,100%,50%,0.05)"><span style="color:#710">"</span><span style="color:#D20">3</span><span style="color:#710">"</span></span>&gt;
+  &lt;pre&gt;&lt;code <span style="color:#080;font-weight:bold">class</span>=<span style="background-color:hsla(0,100%,50%,0.05)"><span style="color:#710">"</span><span style="color:#D20">language-c</span><span style="color:#710">"</span></span>&gt;
   <span style="color:#080;font-weight:bold">class</span> <span style="color:#B06;font-weight:bold">UserStorageHandler</span> : virtual public UserStorageIf {
    public:
     UserStorageHandler() {
@@ -203,8 +202,8 @@ up = UserProfile(uid=<span style="color:
     server.serve();
     <span style="color:#080;font-weight:bold">return</span> <span style="color:#00D">0</span>;
   }
-  </code></pre>
-</div></div></div>
+  &lt;/code&gt;&lt;/pre&gt;
+&lt;/div&gt;</code></pre></div></div>
 </div>
 </div>
 </div>

Modified: thrift/site/publish/sitemap/index.html
URL: http://svn.apache.org/viewvc/thrift/site/publish/sitemap/index.html?rev=1525233&r1=1525232&r2=1525233&view=diff
==============================================================================
--- thrift/site/publish/sitemap/index.html (original)
+++ thrift/site/publish/sitemap/index.html Sat Sep 21 13:31:06 2013
@@ -71,9 +71,17 @@
     <a href="/">Home</a>
     </li>
     
-            <li><a href="/about/">About</a></li>
+            <li><a href="/mailing/">Mailing Lists</a></li>
     
-            <li><a href="/developers/">Developers</a></li>
+            <li><span class="active" title="You're here.">Sitemap</span></li>
+    
+            <li>
+<a href="/tutorial/">Tutorial</a><ul>
+    <li><a href="/tutorial/as3/">As3</a></li>   <li><a href="/tutorial/c_glib/">C Glib</a></li> <li><a href="/tutorial/cpp/">C++</a></li>   <li><a href="/tutorial/csharp/">CSharp</a></li> <li><a href="/tutorial/d/">D</a></li>   <li><a href="/tutorial/delphi/">Delphi</a></li> <li><a href="/tutorial/erl/">Erlang</a></li>    <li><a href="/tutorial/go/">Go</a></li> <li><a href="/tutorial/graphviz/">Graphviz</a></li> <li><a href="/tutorial/hs/">Haskell</a></li>    <li><a href="/tutorial/java/">Java</a></li> <li><a href="/tutorial/javame/">Java Me</a></li>    <li><a href="/tutorial/js/">Javascript</a></li> <li><a href="/tutorial/nodejs/">Node.js</a></li>    <li><a href="/tutorial/cocoa/">Objective-c</a></li> <li><a href="/tutorial/ocaml/">OCaml</a></li>   <li><a href="/tutorial/perl/">Perl</a></li> <li><a href="/tutorial/php/">PHP</a></li>   <li><a href="/tutorial/py/">Python</a></li> <li><a href="/tutorial/rb/">Ruby</a></li>   <li><a href="/tutorial/st/">Smalltalk</a></li>
+</ul>
+</li>
+    
+            <li><a href="/about/">About</a></li>
     
             <li>
 <a href="/docs/">Documentation</a><ul>
@@ -87,17 +95,9 @@
 </ul>
 </li>
     
-            <li><a href="/download/">Download</a></li>
-    
-            <li><a href="/mailing/">Mailing Lists</a></li>
-    
-            <li><span class="active" title="You're here.">Sitemap</span></li>
+            <li><a href="/developers/">Developers</a></li>
     
-            <li>
-<a href="/tutorial/">Tutorial</a><ul>
-    <li><a href="/tutorial/as3/">As3</a></li>   <li><a href="/tutorial/c_glib/">C Glib</a></li> <li><a href="/tutorial/cpp/">C++</a></li>   <li><a href="/tutorial/csharp/">CSharp</a></li> <li><a href="/tutorial/d/">D</a></li>   <li><a href="/tutorial/delphi/">Delphi</a></li> <li><a href="/tutorial/erl/">Erlang</a></li>    <li><a href="/tutorial/go/">Go</a></li> <li><a href="/tutorial/graphviz/">Graphviz</a></li> <li><a href="/tutorial/hs/">Haskell</a></li>    <li><a href="/tutorial/java/">Java</a></li> <li><a href="/tutorial/javame/">Java Me</a></li>    <li><a href="/tutorial/js/">Javascript</a></li> <li><a href="/tutorial/nodejs/">Node.js</a></li>    <li><a href="/tutorial/cocoa/">Objective-c</a></li> <li><a href="/tutorial/ocaml/">OCaml</a></li>   <li><a href="/tutorial/perl/">Perl</a></li> <li><a href="/tutorial/php/">PHP</a></li>   <li><a href="/tutorial/py/">Python</a></li> <li><a href="/tutorial/rb/">Ruby</a></li>   <li><a href="/tutorial/st/">Smalltalk</a></li>
-</ul>
-</li>
+            <li><a href="/download/">Download</a></li>
     
 </ul>