Merge branch 'master' of https://github.com/jersey/jersey

Author: eoff

containers/glassfish/jersey-gf-cdi/src/main/java/org/glassfish/jersey/gf/cdi/internal/CdiComponentProvider.java

@@ -411,8 +411,10 @@ public boolean bind(final Class<?> clazz, final Set<Class<?>> providerContracts)
 
     @Override
     public void done() {
-        bindHk2ClassAnalyzer();
-        bindWaeRestoringExceptionMapper();
+        if (beanManager != null) {
+            bindHk2ClassAnalyzer();
+            bindWaeRestoringExceptionMapper();
+        }
     }
 
     private void bindWaeRestoringExceptionMapper() {

docs/pom.xml

@@ -97,7 +97,7 @@
             <plugin>
                 <groupId>com.agilejava.docbkx</groupId>
                 <artifactId>docbkx-maven-plugin</artifactId>
-                <version>2.0.14</version>
+                <version>2.0.15</version>
                 <dependencies>
                     <dependency>
                         <groupId>net.sf.docbook</groupId>

docs/src/main/docbook/client.xml

@@ -659,7 +659,7 @@ webTarget.request().post(Entity.entity(f, MediaType.TEXT_PLAIN_TYPE));
                         <listitem>&lit.http.header.Transfer-Encoding;</listitem>
                         <listitem>&lit.http.header.Upgrade;</listitem>
                         <listitem>&lit.http.header.Via;</listitem>
-                        <listitem>all the headers starting with &lit.http.header.Sec-prefix;</listitem>
+                        <listitem>all the headers starting with &lit.http.header.Sec.prefix;</listitem>
                     </itemizedlist>
                     The underlying connection can be configured to permit all headers to be sent,
                     however this behaviour can be changed only by setting the system property

docs/src/main/docbook/filters.xml

@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2012-2013 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2012-2014 Oracle and/or its affiliates. All rights reserved.
 
     The contents of this file are subject to the terms of either the GNU
     General Public License Version 2 only ("GPL") or the Common Development
@@ -619,7 +619,7 @@ public class CompressionDynamicBinding implements DynamicFeature {
             The example contains one <literal>HelloWorldResource</literal> which is known from the previous name binding example.
             The difference is in the <literal>getVeryLongString</literal> method, which now does not define
             the <literal>@Compress</literal> name binding annotations. The binding is done
-            using the provider which implements &jaxrs.server.DynamicFeature; interface. The interface defines
+            using the provider which implements &jaxrs.container.DynamicFeature; interface. The interface defines
             one <literal>configure</literal>
             method with two arguments, <literal>ResourceInfo</literal> and <literal>FeatureContext</literal>.
             <literal>ResourceInfo</literal> contains information about the resource and method to which the binding can be done.