Renamed ApplicationConfig to Application
svn path=/trunk/; revision=412
diff --git a/spec/chapters/applications.tex b/spec/chapters/applications.tex
index 90ceb39..3a9e485 100644
--- a/spec/chapters/applications.tex
+++ b/spec/chapters/applications.tex
@@ -5,7 +5,7 @@
\section{Configuration}
\label{config}
-The resources and providers that make up a \jaxrs\ application are configured via an application-supplied subclass of \code{Application\-Config}. An implementation MAY provide alternate mechanisms for locating resource classes and providers (e.g. runtime class scanning) but use of \code{Application\-Config} is the only portable means of configuration.
+The resources and providers that make up a \jaxrs\ application are configured via an application-supplied subclass of \code{Application}. An implementation MAY provide alternate mechanisms for locating resource classes and providers (e.g. runtime class scanning) but use of \code{Application} is the only portable means of configuration.
\section{Publication}
@@ -13,7 +13,7 @@
\subsection{Java SE}
-In a Java SE environment a configured instance of an endpoint class can be obtained using the \code{create\-Endpoint} method of \rd. The application supplies an instance of \code{Application\-Config} and the type of endpoint required. An implementation MAY support zero or more endpoint types of any desired type.
+In a Java SE environment a configured instance of an endpoint class can be obtained using the \code{create\-Endpoint} method of \rd. The application supplies an instance of \code{Application} and the type of endpoint required. An implementation MAY support zero or more endpoint types of any desired type.
How the resulting endpoint class instance is used to publish the application is outside the scope of this specification.
@@ -23,11 +23,11 @@
\subsection{Servlet}
-A \jaxrs\ application is packaged as a Servlet in a \code{.war} file. The \code{Application\-Config} subclass (see section \ref{config}), resource classes, and providers are packaged in \code{WEB-INF/classes}, required libraries are packaged in \code{WEB-INF/lib}. Included libraries MAY also contain resource classes and providers as desired. See the Servlet specification for full details on packaging of web applications.
+A \jaxrs\ application is packaged as a Servlet in a \code{.war} file. The \code{Application} subclass (see section \ref{config}), resource classes, and providers are packaged in \code{WEB-INF/classes}, required libraries are packaged in \code{WEB-INF/lib}. Included libraries MAY also contain resource classes and providers as desired. See the Servlet specification for full details on packaging of web applications.
-When using a \jaxrs\ aware servlet container, the \code{servlet-class} element of the \code{web.xml} descriptor SHOULD name the application-supplied subclass of \code{Application\-Config}.
+When using a \jaxrs\ aware servlet container, the \code{servlet-class} element of the \code{web.xml} descriptor SHOULD name the application-supplied subclass of \code{Application}.
-When using a non-\jaxrs\ aware servlet container, the \code{servlet-class} element of the \code{web.xml} descriptor SHOULD name the \jaxrs\ implementation-supplied Servlet class. The application-supplied subclass of \code{Application\-Config} is identified using an \code{init-param} with a \code{param-name} of \code{javax\-.ws\-.rs\-.Application\-Config}.
+When using a non-\jaxrs\ aware servlet container, the \code{servlet-class} element of the \code{web.xml} descriptor SHOULD name the \jaxrs\ implementation-supplied Servlet class. The application-supplied subclass of \code{Application} is identified using an \code{init-param} with a \code{param-name} of \code{javax\-.ws\-.rs\-.Application}.
\subsection{Other Container}
diff --git a/spec/chapters/changes.tex b/spec/chapters/changes.tex
index 336497e..ef1300b 100644
--- a/spec/chapters/changes.tex
+++ b/spec/chapters/changes.tex
@@ -13,4 +13,5 @@
\item Section \ref{providercontext}: Changed name to Providers, removed entity provider-specific text to reflect more generic capabilities.
\item Section \ref{standard_entity_providers}: Require standard JAXB entity providers to use application-supplied JAXB contexts in preference to their own.
\item Section \ref{contextprovider}: Add support for specifying media type capabilities of context providers.
+\item Renamed ApplicationConfig class to Application.
\end{itemize}
\ No newline at end of file
diff --git a/spec/chapters/resources.tex b/spec/chapters/resources.tex
index e4e5c72..fc5a350 100644
--- a/spec/chapters/resources.tex
+++ b/spec/chapters/resources.tex
@@ -317,7 +317,7 @@
\item $L = \{\mbox{\code{config.getLanguageMappings().keySet()}}\}$
\item $m = \mbox{\code{null}}$
\item $l = \mbox{\code{null}}$
-\item Where \code{config} is an instance of the application-supplied subclass of \code{Application\-Config}.
+\item Where \code{config} is an instance of the application-supplied subclass of \code{Application}.
\end{itemize}
\item For each extension (a \lq.\rq\ character followed by one or more alphanumeric characters) $e$ in the final path segment scanning from right to left:
\begin{enumerate}
@@ -336,7 +336,7 @@
\item[\code{Accept-Language}] \code{fr}
\end{description}
-Also assumed is an \code{Application\-Config} subclass with the following mappings:
+Also assumed is an \code{Application} subclass with the following mappings:
\begin{description}
\item[Media Type] $\mbox{\lq\lq xml\rq\rq}\Rightarrow\mbox{\lq\lq application/xml\rq\rq}$; $\mbox{\lq\lq json\rq\rq}\Rightarrow\mbox{\lq\lq application/json\rq\rq}$
\item[Language] $\mbox{\lq\lq en\rq\rq}\Rightarrow\mbox{\lq\lq en-US\rq\rq}$; $\mbox{\lq\lq de\rq\rq}\Rightarrow\mbox{\lq\lq de\rq\rq}$
diff --git a/src/jsr311-api/src/javax/ws/rs/core/ApplicationConfig.java b/src/jsr311-api/src/javax/ws/rs/core/Application.java
similarity index 98%
rename from src/jsr311-api/src/javax/ws/rs/core/ApplicationConfig.java
rename to src/jsr311-api/src/javax/ws/rs/core/Application.java
index 6c86679..5f7c07a 100644
--- a/src/jsr311-api/src/javax/ws/rs/core/ApplicationConfig.java
+++ b/src/jsr311-api/src/javax/ws/rs/core/Application.java
@@ -22,7 +22,7 @@
* subclass of this abstract class.
*
*/
-public abstract class ApplicationConfig {
+public abstract class Application {
private static final Set<Object> emptySet = Collections.emptySet();
private static final Map<String, MediaType> emptyMediaMap = Collections.emptyMap();
private static final Map<String, String> emptyLanguageMap = Collections.emptyMap();
diff --git a/src/jsr311-api/src/javax/ws/rs/core/UriInfo.java b/src/jsr311-api/src/javax/ws/rs/core/UriInfo.java
index 8177c9c..c4c97fc 100644
--- a/src/jsr311-api/src/javax/ws/rs/core/UriInfo.java
+++ b/src/jsr311-api/src/javax/ws/rs/core/UriInfo.java
@@ -33,13 +33,13 @@
*
* <p>Note that the URIs obtained from the methods of this interface provide
* access to request URIs after URI-based content negotiation preprocessing. E.g.
- * if the request URI is "foo.xml" and {@link ApplicationConfig#getMediaTypeMappings()}
+ * if the request URI is "foo.xml" and {@link Application#getMediaTypeMappings()}
* includes a mapping for "xml", then {@link #getPath()} will return "foo", not
* "foo.xml". The removed "xml" extension is available via {@link #getConnegExtension}.</p>
*
* @see Context
- * @see ApplicationConfig#getLanguageMappings()
- * @see ApplicationConfig#getMediaTypeMappings()
+ * @see Application#getLanguageMappings()
+ * @see Application#getMediaTypeMappings()
*/
public interface UriInfo {
@@ -154,7 +154,7 @@
* negotiation preprocessing. The extension does not include the leading "."
* nor any matrix parameters that might be present after the extension.
* E.g. if the request URI is "foo.xml" and
- * {@link ApplicationConfig#getMediaTypeMappings()} includes a mapping for
+ * {@link Application#getMediaTypeMappings()} includes a mapping for
* "xml", then this method will return "xml". Note that the extension might
* include both a media type and language extension, e.g. "xml.en", if
* both are in use.
diff --git a/src/jsr311-api/src/javax/ws/rs/ext/RuntimeDelegate.java b/src/jsr311-api/src/javax/ws/rs/ext/RuntimeDelegate.java
index 4d1fa38..89942df 100644
--- a/src/jsr311-api/src/javax/ws/rs/ext/RuntimeDelegate.java
+++ b/src/jsr311-api/src/javax/ws/rs/ext/RuntimeDelegate.java
@@ -21,7 +21,7 @@
import java.net.URL;
import java.util.concurrent.atomic.AtomicReference;
-import javax.ws.rs.core.ApplicationConfig;
+import javax.ws.rs.core.Application;
import javax.ws.rs.core.Response.ResponseBuilder;
import javax.ws.rs.core.Variant.VariantListBuilder;
import javax.ws.rs.core.UriBuilder;
@@ -150,7 +150,7 @@
* Create a configured instance of the supplied endpoint type. How the
* returned endpoint instance is published is dependent on the type of
* endpoint.
- * @param applicationConfig the application configuration
+ * @param application the application configuration
* @param endpointType the type of endpoint instance to be created.
* @return a configured instance of the requested type.
* @throws java.lang.IllegalArgumentException if the requested endpoint
@@ -158,7 +158,7 @@
* @throws java.lang.UnsupportedOperationException if the implementation
* supports no endpoint types.
*/
- public abstract <T> T createEndpoint(ApplicationConfig applicationConfig,
+ public abstract <T> T createEndpoint(Application application,
Class<T> endpointType) throws IllegalArgumentException, UnsupportedOperationException;
/**
diff --git a/src/jsr311-api/test/javax/ws/rs/core/RuntimeDelegateStub.java b/src/jsr311-api/test/javax/ws/rs/core/RuntimeDelegateStub.java
index b380e49..45f302b 100644
--- a/src/jsr311-api/test/javax/ws/rs/core/RuntimeDelegateStub.java
+++ b/src/jsr311-api/test/javax/ws/rs/core/RuntimeDelegateStub.java
@@ -34,7 +34,7 @@
}
@Override
- public <T> T createEndpoint(ApplicationConfig applicationConfig, Class<T> endpointType) throws IllegalArgumentException, UnsupportedOperationException {
+ public <T> T createEndpoint(Application application, Class<T> endpointType) throws IllegalArgumentException, UnsupportedOperationException {
return null;
}
