Preparing for 1.1 MR submission
svn path=/trunk/; revision=587
diff --git a/spec/chapters/context.tex b/spec/chapters/context.tex
index 3a01ae6..10c6c55 100644
--- a/spec/chapters/context.tex
+++ b/spec/chapters/context.tex
@@ -1,7 +1,7 @@
\chapter{Context}
\label{context}
-\jaxrs\ provides facilities for obtaining and processing information about the application deployment context and the context of individual requests. Such information is available to both root resource classes (see chapter \ref{resources}) and providers (see chapter \ref{providers}). This chapter describes these facilities.
+\jaxrs\ provides facilities for obtaining and processing information about the application deployment context and the context of individual requests. Such information is available to \code{Application} subclasses (see section \ref{config}), root resource classes (see chapter \ref{resources}), and providers (see chapter \ref{providers}). This chapter describes these facilities.
\section{Concurrency}
diff --git a/spec/chapters/environment.tex b/spec/chapters/environment.tex
index 2705f10..0ae0737 100644
--- a/spec/chapters/environment.tex
+++ b/spec/chapters/environment.tex
@@ -21,8 +21,16 @@
\begin{itemize}
\item In a product that also supports the Servlet specification, implementations MUST support \jaxrs\ applications that are packaged as a web application, see section \ref{servlet}.
-\item In a product that also supports Managed Beans, implementations MUST support use of Managed Beans as root resource classes, providers and \code{Application} subclasses. All such classes may make use of any container-supplied facilities including dependency injection and interceptors. Providers and \code{Application} subclasses MUST be singletons or use application scope.
-\item In a product that also supports EJB, an implementation MUST support use of stateless and singleton session beans as root resource classes, providers and \code{Application} subclasses in a Web application. \jaxrs\ annotations MAY be applied to a beanÕs local interface or directly to a no-interface bean. If an \code{Exception\-Mapper} for a \code{EJBException} or subclass is not included with an application then exceptions thrown by an EJB resource class or provider method MUST be treated as EJB application exceptions: the embedded cause of the \code{EJBException} MUST be unwrapped and processed as described in section \ref{method_exc}.
+\item In a product that also supports Managed Beans, implementations MUST support use of Managed Beans as root resource classes, providers and \code{Application} subclasses. In a product that also supports JSR 299, implementations MUST similarly support use of JSR299-style managed beans. Providers and \code{Application} subclasses MUST be singletons or use application scope.
+\item In a product that also supports EJB, an implementation MUST support use of stateless and singleton session beans as root resource classes, providers and \code{Application} subclasses. \jaxrs\ annotations MAY be applied to a bean's local interface or directly to a no-interface bean. If an \code{Exception\-Mapper} for a \code{EJBException} or subclass is not included with an application then exceptions thrown by an EJB resource class or provider method MUST be treated as EJB application exceptions: the embedded cause of the \code{EJBException} MUST be unwrapped and processed as described in section \ref{method_exc}.
+\end{itemize}
+
+The following additional requirements apply when using Managed Beans, JSR299-style Managed Beans or EJBs as resource classes, providers or \code{Application} subclasses:
+
+\begin{itemize}
+\item Field and property injection of \jaxrs\ resources MUST be performed prior to the container invoking any \code{@PostConstruct} annotated method.
+\item Support for constructor injection of \jaxrs\ resources is OPTIONAL. Portable applications MUST instead use fields or bean properties in conjunction with a \code{@PostConstruct} annotated method. Implementations SHOULD warn users about use of non-portable constructor injection.
+\item Implementations MUST NOT require use of \code{@Inject} or \code{@Resource} to trigger injection of \jaxrs\ annotated fields or properties. Implementations MAY support such usage but SHOULD warn users about non-portability.
\end{itemize}
\section{Other}
diff --git a/spec/chapters/intro.tex b/spec/chapters/intro.tex
index 2065ddd..c64cc98 100644
--- a/spec/chapters/intro.tex
+++ b/spec/chapters/intro.tex
@@ -11,17 +11,19 @@
\section{Status}
-This is an editors draft; this specification is not yet complete. A list of open issues can be found at:
+%This is an editors draft; this specification is not yet complete. A list of open issues can be found at:
%This is a JCP public review draft; this specification is not yet final. A list of open issues can be found at:
+This is a JCP final specification. A list of open issues can be found at:
\begin{quote}
https://jsr311.dev.java.net/servlets/ProjectIssues
\end{quote}
-The latest Javadocs can be found online at:
+The corresponding Javadocs can be found online at:
\begin{quote}
-https://jsr311.dev.java.net/nonav/javadoc/index.html
+%https://jsr311.dev.java.net/nonav/javadoc/index.html
+https://jsr311.dev.java.net/nonav/releases/1.1/index.html
\end{quote}
The reference implementation can be obtained from:
diff --git a/spec/chapters/license_final.tex b/spec/chapters/license_final.tex
index 263ac1e..9d5dc1e 100644
--- a/spec/chapters/license_final.tex
+++ b/spec/chapters/license_final.tex
@@ -1,7 +1,7 @@
\begin{flushleft}
{\bfseries Specification: JSR-000311 - Java\texttrademark\ API for RESTful Web Services (\lq\lq Specification\rq\rq)\\
-Version: 1.0\\
+Version: 1.1\\
Status: Final Release\\
Release: \today\\
Copyright 2007 Sun Microsystems, Inc.\\
diff --git a/spec/chapters/titlepage.tex b/spec/chapters/titlepage.tex
index 01fb033..d4ab926 100644
--- a/spec/chapters/titlepage.tex
+++ b/spec/chapters/titlepage.tex
@@ -11,7 +11,7 @@
{
%\Large\textit{Version 1.1\\
-\Large\textit{Version 1.1 Editors Draft\\
+\Large\textit{Version 1.1\\
\today}
}
diff --git a/spec/spec.tex b/spec/spec.tex
index e836a86..c1f2171 100644
--- a/spec/spec.tex
+++ b/spec/spec.tex
@@ -61,8 +61,8 @@
\cleardoublepage
{
\small
-\include{chapters/license}
-%\include{chapters/license_final}
+%\include{chapters/license}
+\include{chapters/license_final}
}
\pdfbookmark[0]{Contents}{toc}
diff --git a/src/jsr311-api/pom.xml b/src/jsr311-api/pom.xml
index a44c1cd..638b120 100644
--- a/src/jsr311-api/pom.xml
+++ b/src/jsr311-api/pom.xml
@@ -5,7 +5,7 @@
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
<packaging>jar</packaging>
- <version>1.1-ea-SNAPSHOT</version>
+ <version>1.1</version>
<name>jsr311-api</name>
<url>https://jsr311.dev.java.net</url>
