Added license and incorporated feedback for EA.

Author: spericas

spec/chapters/controllers.tex

@@ -28,7 +28,7 @@ \section{Controllers}
 }
 \end{listing}
 
-In this example, \code{hello} is a controller method that returns a path to a Java Server Page (JSP).
+In this example, \code{hello} is a controller method that returns a path to a JavaServer Page (JSP).
 The semantics of controller methods differ slightly from \jaxrs\ resource methods; in particular, a
 return type of \code{String} is interpreted as a view path rather than text content. Moreover,
 the default media type for a response is assumed to be \code{text/html}, but otherwise can
@@ -37,7 +37,7 @@ \section{Controllers}
 The return type of a controller method is restricted to be one of four possible types
 \assertref{controller-types}:
 \begin{description}
-\item[void] A controller method that returns void is REQUIRED to be decorated by \View
+\item[void] A controller method that returns void is REQUIRED to be decorated by \View\
 \assertref{void-controllers}. 
 \item[String] The string returned is interpreted as a path to a view. 
 \item[Viewable] A \Viewable\ is a class that encapsulates information about a view and
@@ -144,7 +144,8 @@ \section{Models}
 which defines a map between names and objects. Support for the \Models\ 
 interface is mandatory for all view engines; support for CDI \Named\ beans is
 OPTIONAL but highly RECOMMENDED. Application developers are encouraged to use CDI-based
-models whenever supported.  
+models whenever supported, and thus take advantage of the existing CDI and EL integration
+on the platform. 
 
 Let us now revisit our hello-world example, this time also showing how to update
 a model. Since we intent to show the two ways in which models can be used, we define the
@@ -197,7 +198,7 @@ \section{Models}
     @GET
     @Controller
     public String hello() {
-        models.set("greeting", new Greeting("Hello there!");
+        models.put("greeting", new Greeting("Hello there!");
         return "hello.jsp";
     }
 }

spec/chapters/engines.tex

@@ -77,8 +77,8 @@ \section{Selection Algorithm}
 access to the named models from EL expressions.
 
 A view returned by a controller method represents a path within an
-application archive. If the path is relative, does not start with \code{/}, implementations 
-MUST resolve view paths relative to \code{ViewEngine.DEFAULT\_VIEW\_FOLDER}, 
+application archive. If the path is relative, does not start with \code{"/"}, implementations 
+MUST resolve view paths relative to value of \code{ViewEngine. DEFAULT\_VIEW\_FOLDER}, 
 which is set to \code{/WEB-INF/views/}. If the path is absolute, no further processing
 is required \assertref{view-resolution}. It is recommended to use relative paths and a 
 location under \code{WEB-INF} to prevent direct access to views as static resources.

spec/chapters/intro.tex

@@ -14,7 +14,7 @@ \chapter{Introduction}
 
 The API defined by this specification falls into the action-based 
 category and is, therefore, not intended to be a replacement for component-based framworks such as
-Java Server Faces (JSF) \cite{jsf}, but simply a different approach to building Web applications on the 
+JavaServer Faces (JSF) \cite{jsf}, but simply a different approach to building Web applications on the 
 Java EE platform.
 
 \section{Goals}

spec/chapters/license.tex

@@ -1,14 +1,81 @@
 \begin{flushleft}
 
-{\bfseries JSR-371 MVC (\lq\lq Specification\rq\rq)\\
-Version: 1.0 \\
-Status: Early Draft \\
-Release: \today\\ 
-Copyright 2014-2015 Oracle America, Inc. (``Oracle'') \\
-500 Oracle Parkway, Redwood Shores, California 94065, U.S.A\\ 
-All rights reserved.
+\vspace{1em}
+
+ORACLE AMERICA, INC. IS WILLING TO LICENSE THIS SPECIFICATION TO YOU ONLY UPON THE CONDITION THAT YOU ACCEPT ALL OF THE TERMS CONTAINED IN THIS LICENSE AGREEMENT ("AGREEMENT"). PLEASE READ THE TERMS AND CONDITIONS OF THIS AGREEMENT CAREFULLY. BY DOWNLOADING THIS SPECIFICATION, YOU ACCEPT THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU ARE NOT WILLING TO BE BOUND BY THEM, SELECT THE "DECLINE" BUTTON AT THE BOTTOM OF THIS PAGE AND THE DOWNLOADING PROCESS WILL NOT CONTINUE. 
+
+\vspace{1em}
+
+{\bfseries
+Specification: JSR-371 MVC ("Specification") Version: 1.0 \\
+Status: Early Draft Review \\
+Release: March 2015 \\
+Copyright 2015 Oracle America, Inc. \\
+500 Oracle Parkway, Redwood City, California 94065, U.S.A. \\
+All rights reserved.\\
 }
 
-TBD
+\vspace{1em}
+{\bfseries NOTICE}
+
+The Specification is protected by copyright and the information described therein may be protected by one or more U.S. patents, foreign patents, or pending applications. Except as provided under the following license, no part of the Specification may be reproduced in any form by any means without the prior written authorization of Oracle America, Inc. ("Oracle") and its licensors, if any. Any use of the Specification and the information described therein will be governed by the terms and conditions of this Agreement.
+
+Subject to the terms and conditions of this license, including your compliance with Paragraphs 1 and 2 below, Oracle hereby grants you a fully-paid, non-exclusive, non-transferable, limited license (without the right to sublicense) under Oracle's intellectual property rights to:
+
+1. Review the Specification for the purposes of evaluation. This includes: (i) developing implementations of the Specification for your internal, non-commercial use; (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 Technology.
+
+2. Distribute implementations of the Specification to third parties for their testing and evaluation use, provided that any such implementation:
+(i) 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;
+(ii) is clearly and prominently marked with the word "UNTESTED" or "EARLY ACCESS" or "INCOMPATIBLE" or "UNSTABLE" or "BETA" in any list of available builds and in proximity to every link initiating its download, where the list or link is under Licensee's control; and
+(iii) includes the following notice:
+"This is an implementation of an early-draft specification developed under the Java Community Process (JCP) and is made available for testing and evaluation purposes only. The code is not compatible with
+any specification of the JCP."
+
+The grant set forth above concerning your distribution of implementations of the specification is contingent upon your agreement to terminate development and distribution of your "early draft" implementation as soon as feasible following final completion of the specification. If you fail to do so, the foregoing grant shall be considered null and void.
+
+No provision of this Agreement shall be understood to restrict your ability to make and distribute to third parties applications written to the Specification.
+
+Other than this limited license, you acquire no right, title or interest in or to the Specification or any other Oracle intellectual property, and the Specification may only be used in accordance with the license terms set forth herein. This license will expire on the earlier of: (a) two (2) years from the date of Release listed above; (b) the date on which the final version of the Specification is publicly released; or (c) the date on which the Java Specification Request (JSR) to which the Specification corresponds is withdrawn. In addition, this license will terminate immediately without notice from Oracle if you fail to comply with any provision of this license. Upon termination, you must cease use of or destroy the Specification.
+
+"Licensor Name Space" means the public class or interface declarations whose names begin with "java", "javax", "com.oracle" or their equivalents in any subsequent naming convention adopted by Oracle through the Java Community Process, or any recognized successors or replacements thereof
+
+\vspace{1em}
+{\bfseries TRADEMARKS}
+
+No right, title, or interest in or to any trademarks, service marks, or trade names of Oracle or Oracle's licensors is granted hereunder. Oracle, the Oracle logo, and Java are trademarks or registered trademarks of Oracle America, Inc. in the U.S. and other countries.
+
+\vspace{1em}
+{\bfseries DISCLAIMER OF WARRANTIES}
+
+THE SPECIFICATION IS PROVIDED "AS IS" AND IS EXPERIMENTAL AND MAY CONTAIN DEFECTS OR DEFICIENCIES WHICH CANNOT OR WILL NOT BE CORRECTED BY ORACLE. ORACLE MAKES NO REPRESENTATIONS OR WARRANTIES, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT THAT THE CONTENTS OF THE SPECIFICATION ARE SUITABLE FOR ANY PURPOSE OR THAT ANY PRACTICE OR IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADE SECRETS OR OTHER RIGHTS. This document does not represent any commitment to release or implement any portion of the Specification in any product.
+
+THE SPECIFICATION COULD INCLUDE TECHNICAL INACCURACIES OR TYPOGRAPHICAL ERRORS. CHANGES ARE PERIODICALLY ADDED TO THE INFORMATION THEREIN; THESE CHANGES WILL BE INCORPORATED INTO NEW VERSIONS OF THE SPECIFICATION, IF ANY. ORACLE MAY MAKE IMPROVEMENTS AND/OR CHANGES TO THE PRODUCT(S) AND/OR THE PROGRAM(S) DESCRIBED IN THE SPECIFICATION AT ANY TIME. Any use of such changes in the Specification will be governed by the then-current license for the applicable version of the Specification.
+
+\vspace{1em}
+{\bfseries LIMITATION OF LIABILITY}
+
+TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL ORACLE 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 TO ANY FURNISHING, PRACTICING, MODIFYING OR ANY USE OF THE SPECIFICATION, EVEN IF ORACLE AND/OR ITS LICENSORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+You will hold Oracle (and its licensors) harmless from any claims based on your use of the Specification for any purposes other than the limited right of evaluation as described above, and from any claims that later versions or releases of any Specification furnished to you are incompatible with the Specification provided to you under this license.
+
+\vspace{1em}
+{\bfseries RESTRICTED RIGHTS LEGEND}
+
+If this Software 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).
+
+\vspace{1em}
+{\bfseries REPORT}
+
+You may wish to report any ambiguities, inconsistencies or inaccuracies you may find in connection with your evaluation of the Specification ("Feedback"). To the extent that you provide Oracle with any Feedback, you hereby: (i) agree that such Feedback is provided on a non-proprietary and non- confidential basis, and (ii) grant Oracle 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 related to the Specification and future versions, implementations, and test suites thereof.
+
+\vspace{1em}
+{\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.
 
 \end{flushleft}

spec/chapters/validation.tex

@@ -23,7 +23,6 @@ \section{Exception Mappers}
 \begin{listing}{1}
 @Controller
 @Path("form")
-@Produces("text/html")
 public class FormController {
 
     @POST
@@ -98,7 +97,6 @@ \section{Validation Exceptions}
 \begin{listing}{1}
 @Controller
 @Path("form")
-@Produces("text/html")
 public class FormController {
 
     @Inject
@@ -124,7 +122,7 @@ \section{Validation Exceptions}
 class can handle validation errors. As a result, methods in this class
 that validate parameters should call \code{vr.isFailed()} to verify if
 validation errors were found.~\footnote{The \code{ValidateOnExecution} 
-annotation is necessary to ensure that CDI does not abort the
+annotation is necessary to ensure that CDI and BV do not abort the
 invocation upon detecting a violation. Thus, to ensure the correct semantics, 
 validation must be performed by the JAX-RS implementation before the method 
 is called.}
@@ -141,7 +139,6 @@ \section{Validation Exceptions}
 \begin{listing}{1}
 @Controller
 @Path("form")
-@Produces("text/html")
 public class FormController {
 
     private ValidationResult vr;