Changes in preparation for 1.0 FCS
svn path=/trunk/; revision=517
diff --git a/spec/chapters/changes.tex b/spec/chapters/changes.tex
index bc4816e..577517b 100644
--- a/spec/chapters/changes.tex
+++ b/spec/chapters/changes.tex
@@ -5,6 +5,7 @@
\begin{itemize}
\item Section \ref{request_matching}: Additional sort criteria so that templates with explicit regexs are sorted ahead of those with the default.
\item Sections \ref{request_matching}, \ref{determine_response_type}, \ref{declaring_provider_capabilities} and \ref{context_media_type}: Q-values not used in \Consumes\ or \Produces.
+\item Section \ref{message_body_writer}: Fixed algorithm to refer to section \ref{determine_response_type} instead of restating it. Fixed status code returned when the media type has been determined but an appropriate message body writer cannot be located.
\item Chapter \ref{runtimedelegate}: Clarify that an implementation can supply an alternate \rd\ API class.
\end{itemize}
diff --git a/spec/chapters/intro.tex b/spec/chapters/intro.tex
index 4c6789d..90a153c 100644
--- a/spec/chapters/intro.tex
+++ b/spec/chapters/intro.tex
@@ -117,6 +117,7 @@
Jan Algermissen (Individual Member) \\
Heiko Braun (Red Hat Middleware LLC) \\
+Bill Burke (Red Hat Middleware LLC) \\
Larry Cable (BEA Systems) \\
Bill De Hora (Individual Member) \\
Roy Fielding (Day Software, Inc.) \\
@@ -143,7 +144,7 @@
\section{Acknowledgements}
-During the course of the JSR we received many excellent suggestions on the JSR and Jersey (RI) mailing lists, thanks in particular to Bill Burke (Red Hat) and James Manger (Telstra) for their contributions.
+During the course of the JSR we received many excellent suggestions on the JSR and Jersey (RI) mailing lists, thanks in particular to James Manger (Telstra) for his contributions.
The \code{GenericEntity} class was inspired by the Google Guice \code{Type\-Literal} class. Our thanks to Bob Lee and Google for donating this class to \jaxrs.
diff --git a/spec/chapters/license_final.tex b/spec/chapters/license_final.tex
new file mode 100644
index 0000000..263ac1e
--- /dev/null
+++ b/spec/chapters/license_final.tex
@@ -0,0 +1,82 @@
+\begin{flushleft}
+
+{\bfseries Specification: JSR-000311 - Java\texttrademark\ API for RESTful Web Services (\lq\lq Specification\rq\rq)\\
+Version: 1.0\\
+Status: Final Release\\
+Release: \today\\
+Copyright 2007 Sun Microsystems, Inc.\\
+4150 Network Circle, Santa Clara, California 95054, U.S.A\\
+180, Avenue de L'Europe, 38330 Montbonnot Saint Martin, France\\
+All rights reserved.
+}
+
+{\bfseries LIMITED LICENSE GRANTS}
+
+\begin{enumerate}
+\item License for Evaluation Purposes. Sun hereby grants you a fully-paid, non-exclusive, non-transferable, worldwide, limited license (without the right to sublicense), under Sun's Êapplicable intellectual property rights to view, download, use and reproduce the Specification only for the purpose of internal evaluation. ÊThis includes (i) developing applications intended to run on an implementation of the Specification, provided that such applications do not themselves implement any portion(s) of the Specification, and (ii) discussing the Specification with any third party; and (iii) excerpting brief portions of the Specification in oral or written communications which discuss the Specification provided that such excerpts do not in the aggregate constitute a significant portion of the Specification.
+
+\item License for the Distribution of Compliant Implementations. Sun Êalso grants you a perpetual, non-exclusive, non-transferable, worldwide, fully paid-up, royalty free, limited license (without the right to sublicense) under any applicable copyrights or, subject to the provisions of subsection 4 below, patent rights it may have covering the Specification to create and/or distribute an Independent Implementation of the Specification that: (a) fully implements the Specification including all its required interfaces and functionality; (b) does not modify, subset, superset or otherwise extend the Licensor Name Space, or include any public or protected packages, classes, Java interfaces, fields or methods within the Licensor Name Space other than those required/authorized by the Specification or Specifications being implemented; and (c) passes the Technology Compatibility Kit (including satisfying the requirements of the applicable TCK Users Guide) for such Specification (\lq\lq Compliant Implementation\rq\rq). ÊIn addition, the foregoing license is expressly conditioned on your not acting outside its scope. ÊNo license is granted hereunder for any other purpose (including, for example, modifying the Specification, other than to the extent of your fair use rights, or distributing the Specification to third parties). ÊAlso, no right, title, or interest in or to any trademarks, service marks, or trade names of Sun or Sun's licensors is granted hereunder. ÊJava, and Java-related logos, marks and names are trademarks or registered trademarks of Sun Microsystems, Inc. in the U.S. and other countries.
+
+\item Pass-through Conditions. You need not include limitations (a)-(c) from the previous paragraph or any other particular \lq\lq pass through\rq\rq\ requirements in any license You grant concerning the use of your Independent Implementation or products derived from it. ÊHowever, except with respect to Independent Implementations (and products derived from them) that satisfy limitations (a)-(c) from the previous paragraph, You may neither: Ê(a) grant or otherwise pass through to your licensees any licenses under Sun's Êapplicable intellectual property rights; nor (b) authorize your licensees to make any claims concerning their implementation's compliance with the Specification in question.
+
+\item Reciprocity Concerning Patent Licenses. Ê
+\begin{enumerate}
+\itemÊWith respect to any patent claims covered by the license granted under subparagraph 2 above that would be infringed by all technically feasible implementations of the Specification, such license is conditioned upon your offering on fair, reasonable and non-discriminatory terms, to any party seeking it from You, a perpetual, non-exclusive, non-transferable, worldwide license under Your patent rights which are or would be infringed by all technically feasible implementations of the Specification to develop, distribute and use a Compliant Implementation.
+
+\itemÊWith respect to any patent claims owned by Sun and covered by the license granted under subparagraph 2, whether or not their infringement can be avoided in a technically feasible manner when implementing the Specification, such license shall terminate with respect to such claims if You initiate a claim against Sun that it has, in the course of performing its responsibilities as the Specification Lead, induced any other entity to infringe Your patent rights.
+
+\itemÊAlso with respect to any patent claims owned by Sun and covered by the license granted under subparagraph 2 above, where the infringement of such claims can be avoided in a technically feasible manner when implementing the Specification such license, with respect to such claims, shall terminate if You initiate a claim against Sun Êthat its making, having made, using, offering to sell, selling or importing a Compliant Implementation infringes Your patent rights.
+\end{enumerate}
+
+\item Definitions. For the purposes of this Agreement: Ê\lq\lq Independent
+Implementation\rq\rq\ shall mean an implementation of the Specification that
+neither derives from any of Sun's Êsource code or binary code materials nor,
+except with an appropriate and separate license from Sun, includes any of Sun's
+source code or binary code materials; \lq\lq Licensor Name Space\rq\rq\ shall
+mean the public class or interface declarations whose names begin with \lq\lq
+java\rq\rq, \lq\lq javax\rq\rq, \lq\lq com.sun\rq\rq\ or their equivalents in
+any subsequent naming convention adopted by Sun Êthrough the Java Community
+Process, or any recognized successors or replacements thereof; and \lq\lq
+Technology Compatibility Kit\rq\rq\ or \lq\lq TCK\rq\rq\ shall mean the test
+suite and accompanying TCK User's Guide provided by Sun Êwhich corresponds to
+the Specification and that was available either (i) from Sun's 120 days before
+the first release of Your Independent Implementation that allows its use for
+commercial purposes, or (ii) more recently than 120 days from such release but
+against which You elect to test Your implementation of the Specification.
+\end{enumerate}
+
+This Agreement will terminate immediately without notice from Sun if you breach the Agreement or act outside the scope of the licenses granted above.
+
+{\bfseries TRADEMARKS}
+
+No right, title, or interest in or to any trademarks, service marks, or trade names of Sun or Sun's licensors is granted hereunder. Sun, Sun Microsystems, the Sun logo, Java, are trademarks or registered trademarks of Sun Microsystems, Inc. in the
+U.S. and other countries.
+
+{\bfseries DISCLAIMER OF WARRANTIES}
+
+THE SPECIFICATION IS PROVIDED \lq\lq AS IS\rq\rq. SUN MAKES NO REPRESENTATIONS OR WARRANTIES, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT (INCLUDING AS A CONSEQUENCE OF ANY PRACTICE OR IMPLEMENTATION OF THE SPECIFICATION), OR THAT THE CONTENTS OF THE SPECIFICATION ARE SUITABLE FOR ANY PURPOSE. ÊThis document does not represent any commitment to release or implement any portion of the Specification in any product. In addition, the Specification could include technical inaccuracies or typographical errors.
+
+{\bfseries LIMITATION OF LIABILITY}
+
+TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR ANY DAMAGES, INCLUDING WITHOUT LIMITATION, LOST REVENUE, PROFITS OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF OR RELATED IN ANY WAY TO YOUR HAVING, IMPELEMENTING OR OTHERWISE USING USING ÊTHE SPECIFICATION, EVEN IF SUN AND/OR ITS LICENSORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+You will indemnify, hold harmless, and defend Sun and its licensors from any claims arising or resulting from: (i) your use of the Specification; (ii) the use or distribution of your Java application, applet and/or implementation; and/or (iii) any claims that later versions or releases of any Specification furnished to you are incompatible with the Specification provided to you under this license.
+
+{\bfseries RESTRICTED RIGHTS LEGEND}
+
+U.S. Government: If this Specification is being acquired by or on behalf of the U.S. Government or by a U.S. Government prime contractor or subcontractor (at any tier), then the Government's rights in the Software and accompanying documentation shall be only as set forth in this license; this is in accordance with 48 C.F.R. 227.7201 through 227.7202-4 (for Department of Defense (DoD) acquisitions) and with 48 C.F.R. 2.101 and 12.212 (for non-DoD acquisitions).
+
+{\bfseries REPORT}
+
+If you provide Sun with any comments or suggestions concerning the Specification (\lq\lq Feedback\rq\rq), you hereby: (i) agree that such Feedback is provided on a non-proprietary and non-confidential basis, and (ii) grant Sun a perpetual, non-exclusive, worldwide, fully paid-up, irrevocable license, with the right to sublicense through multiple levels of sublicensees, to incorporate, disclose, and use without limitation the Feedback for any purpose.
+
+{\bfseries GENERAL TERMS}
+
+Any action related to this Agreement will be governed by California law and controlling U.S. federal law. The U.N. Convention for the International Sale of Goods and the choice of law rules of any jurisdiction will not apply.
+
+The Specification is subject to U.S. export control laws and may be subject to export or import regulations in other countries. Licensee agrees to comply strictly with all such laws and regulations and acknowledges that it has the responsibility to obtain such licenses to export, re-export or import as may be required after delivery to Licensee.
+
+This Agreement is the parties' entire agreement relating to its subject matter. It supersedes all prior or contemporaneous oral or written communications, proposals, conditions, representations and warranties and prevails over any conflicting or additional terms of any quote, order, Êacknowledgment, or other communication between the parties relating to its subject matter during the term of this Agreement. No modification to this Agreement will be binding, unless in writing and signed by an authorized representative of each party.
+
+Rev. April, 2006
+\end{flushleft}
\ No newline at end of file
diff --git a/spec/chapters/titlepage.tex b/spec/chapters/titlepage.tex
index e02a590..958d560 100644
--- a/spec/chapters/titlepage.tex
+++ b/spec/chapters/titlepage.tex
@@ -10,8 +10,8 @@
\vspace{20pt}
{
-\Large\textit{Editors Draft\\
-% \Large\textit{Proposed Final Draft\\
+\Large\textit{Version 1.0\\
+% \Large\textit{Editors Draft\\
\today}
}
diff --git a/spec/spec.tex b/spec/spec.tex
index 7a0cd98..f282f53 100644
--- a/spec/spec.tex
+++ b/spec/spec.tex
@@ -48,7 +48,7 @@
\usepackage[dvips]{changebar}
\usepackage{longtable}
-% \renewcommand{\today}{August 1, 2008}
+\renewcommand{\today}{September 8, 2008}
\begin{document}
@@ -61,12 +61,10 @@
\cleardoublepage
{
\small
-\include{chapters/license}
+%\include{chapters/license}
+\include{chapters/license_final}
}
-%\cleardoublepage
-%\include{chapters/status}
-
\pdfbookmark[0]{Contents}{toc}
\tableofcontents
