You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by bu...@apache.org on 2021/12/22 21:03:41 UTC

svn commit: r1077671 [37/44] - in /websites/production/cxf/content: ./ cache/ docs/ docs/custom-transport.data/ docs/how-it-works.data/ docs/ws-policy.data/ docs/xml-key-management-service-xkms.data/

Modified: websites/production/cxf/content/docs/undertow-configuration.html
==============================================================================
--- websites/production/cxf/content/docs/undertow-configuration.html (original)
+++ websites/production/cxf/content/docs/undertow-configuration.html Wed Dec 22 21:03:39 2021
@@ -58,11 +58,7 @@ Apache CXF -- Undertow Configuration
     <td id="cell-1-1">&nbsp;</td>
     <td id="cell-1-2">
       <!-- Banner -->
-<div class="banner" id="banner"><div><table border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td align="left" colspan="1" nowrap>
-<a shape="rect" href="http://cxf.apache.org/" title="Apache CXF"><span style="font-weight: bold; font-size: 170%; color: white">Apache CXF</span></a>
-</td><td align="right" colspan="1" nowrap>
-<a shape="rect" href="http://www.apache.org/" title="The Apache Sofware Foundation"><img border="0" alt="ASF Logo" src="http://cxf.apache.org/images/asf-logo.png"></a>
-</td></tr></table></div></div>
+<div class="banner" id="banner"><img class="wysiwyg-unknown-macro" src="https://cwiki.apache.org/confluence/plugins/servlet/confluence/placeholder/unknown-macro?name=html&amp;locale=en_GB&amp;version=2"></div>
       <!-- Banner -->
       <div id="top-menu">
         <table border="0" cellpadding="1" cellspacing="0" width="100%">
@@ -99,15 +95,7 @@ Apache CXF -- Undertow Configuration
                 <div id="wrapper-menu-page-bottom">
                   <div id="menu-page">
                     <!-- NavigationBar -->
-<div id="navigation"><ul class="alternate"><li><a shape="rect" href="overview.html">Overview</a></li><li><a shape="rect" href="how-tos.html">How-Tos</a></li><li><a shape="rect" href="frontends.html">Frontends</a></li><li><a shape="rect" href="databindings.html">DataBindings</a></li><li><a shape="rect" href="transports.html">Transports</a></li><li><a shape="rect" href="configuration.html">Configuration</a></li><li><a shape="rect" href="debugging-and-logging.html">Debugging and Logging</a></li><li><a shape="rect" href="tools.html">Tools</a></li><li><a shape="rect" href="restful-services.html">RESTful Services</a></li><li><a shape="rect" href="wsdl-bindings.html">WSDL Bindings</a></li><li><a shape="rect" href="service-routing.html">Service Routing</a></li><li><a shape="rect" href="dynamic-languages.html">Dynamic Languages</a></li><li><a shape="rect" href="ws-support.html">WS-* Support</a></li><li><a shape="rect" href="advanced-integration.html">Advanced Integration</a></li><li><a shape
 ="rect" href="deployment.html">Deployment</a></li><li><a shape="rect" href="schemas-and-namespaces.html">Use of Schemas and Namespaces</a></li></ul><hr><ul class="alternate"><li><p>Search</p></li></ul><form enctype="application/x-www-form-urlencoded" method="get" id="cse-search-box" action="http://www.google.com/cse">
-  <div>
-    <input type="hidden" name="cx" value="002890367768291051730:o99qiwa09y4">
-    <input type="hidden" name="ie" value="UTF-8">
-    <input type="text" name="q" size="21">
-    <input type="submit" name="sa" value="Search">
-  </div>
-</form>
-<script type="text/javascript" src="http://www.google.com/cse/brand?form=cse-search-box&amp;lang=en"></script><hr><ul class="alternate"><li><a shape="rect" href="http://cxf.apache.org/javadoc/latest/">API 3.2.x (Javadoc)</a></li><li><a shape="rect" href="http://cxf.apache.org/javadoc/latest-3.1.x/">API 3.1.x (Javadoc)</a></li><li><a shape="rect" href="http://cxf.apache.org/">CXF Website</a></li></ul><p>&#160;</p><p><a shape="rect" class="external-link" href="http://www.apache.org/events/current-event.html"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://www.apache.org/events/current-event-125x125.png" data-image-src="http://www.apache.org/events/current-event-125x125.png"></span></a></p></div>
+<div id="navigation"><ul class="alternate"><li><a shape="rect" href="overview.html">Overview</a></li><li><a shape="rect" href="how-tos.html">How-Tos</a></li><li><a shape="rect" href="frontends.html">Frontends</a></li><li><a shape="rect" href="databindings.html">DataBindings</a></li><li><a shape="rect" href="transports.html">Transports</a></li><li><a shape="rect" href="configuration.html">Configuration</a></li><li><a shape="rect" href="debugging-and-logging.html">Debugging and Logging</a></li><li><a shape="rect" href="tools.html">Tools</a></li><li><a shape="rect" href="restful-services.html">RESTful Services</a></li><li><a shape="rect" href="wsdl-bindings.html">WSDL Bindings</a></li><li><a shape="rect" href="service-routing.html">Service Routing</a></li><li><a shape="rect" href="dynamic-languages.html">Dynamic Languages</a></li><li><a shape="rect" href="ws-support.html">WS-* Support</a></li><li><a shape="rect" href="advanced-integration.html">Advanced Integration</a></li><li><a shape
 ="rect" href="deployment.html">Deployment</a></li><li><a shape="rect" href="schemas-and-namespaces.html">Use of Schemas and Namespaces</a></li></ul><hr><ul class="alternate"><li><p>Search</p></li></ul><p><img class="wysiwyg-unknown-macro" src="https://cwiki.apache.org/confluence/plugins/servlet/confluence/placeholder/unknown-macro?name=html&amp;locale=en_GB&amp;version=2"></p><hr><ul class="alternate"><li><a shape="rect" href="http://cxf.apache.org/javadoc/latest-3.5.x/">API 3.5.x (Javadoc)</a></li><li><a shape="rect" href="http://cxf.apache.org/javadoc/latest-3.2.x/">API 3.2.x (Javadoc)</a></li><li><a shape="rect" href="http://cxf.apache.org/javadoc/latest-3.1.x/">API 3.1.x (Javadoc)</a></li><li><a shape="rect" href="http://cxf.apache.org/">CXF Website</a></li></ul><p><br clear="none"></p><p><a shape="rect" class="external-link" href="http://www.apache.org/events/current-event.html"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-exte
 rnal-resource" src="http://www.apache.org/events/current-event-125x125.png" data-image-src="http://www.apache.org/events/current-event-125x125.png"></span></a></p></div>
                     <!-- NavigationBar -->
                   </div>
               </div>
@@ -118,11 +106,11 @@ Apache CXF -- Undertow Configuration
            <!-- Content -->
            <div class="wiki-content">
 <div id="ConfluenceContent"><p><style type="text/css">/*<![CDATA[*/
-div.rbtoc1635627396105 {padding: 0px;}
-div.rbtoc1635627396105 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1635627396105 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1640206704182 {padding: 0px;}
+div.rbtoc1640206704182 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1640206704182 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style></p><div class="toc-macro rbtoc1635627396105">
+/*]]>*/</style></p><div class="toc-macro rbtoc1640206704182">
 <ul class="toc-indentation"><li><a shape="rect" href="#UndertowConfiguration-ConfiguringtheUndertowRuntime">Configuring the Undertow Runtime</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#UndertowConfiguration-Overview">Overview</a></li><li><a shape="rect" href="#UndertowConfiguration-Namespace">Namespace</a></li><li><a shape="rect" href="#UndertowConfiguration-Theengine-factoryelement">The engine-factory element</a></li><li><a shape="rect" href="#UndertowConfiguration-Theengineelement">The engine element</a></li><li><a shape="rect" href="#UndertowConfiguration-Configuringthethread&amp;IOpools">Configuring the thread &amp; IO pools</a></li><li><a shape="rect" href="#UndertowConfiguration-undertow_http2HTTP/2support">HTTP/2 support</a></li><li><a shape="rect" href="#UndertowConfiguration-Example">Example</a></li></ul>
 </li></ul>

Modified: websites/production/cxf/content/docs/using-apache-htrace.html
==============================================================================
--- websites/production/cxf/content/docs/using-apache-htrace.html (original)
+++ websites/production/cxf/content/docs/using-apache-htrace.html Wed Dec 22 21:03:39 2021
@@ -59,11 +59,7 @@ Apache CXF -- Using Apache HTrace
     <td id="cell-1-1">&nbsp;</td>
     <td id="cell-1-2">
       <!-- Banner -->
-<div class="banner" id="banner"><div><table border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td align="left" colspan="1" nowrap>
-<a shape="rect" href="http://cxf.apache.org/" title="Apache CXF"><span style="font-weight: bold; font-size: 170%; color: white">Apache CXF</span></a>
-</td><td align="right" colspan="1" nowrap>
-<a shape="rect" href="http://www.apache.org/" title="The Apache Sofware Foundation"><img border="0" alt="ASF Logo" src="http://cxf.apache.org/images/asf-logo.png"></a>
-</td></tr></table></div></div>
+<div class="banner" id="banner"><img class="wysiwyg-unknown-macro" src="https://cwiki.apache.org/confluence/plugins/servlet/confluence/placeholder/unknown-macro?name=html&amp;locale=en_GB&amp;version=2"></div>
       <!-- Banner -->
       <div id="top-menu">
         <table border="0" cellpadding="1" cellspacing="0" width="100%">
@@ -100,15 +96,7 @@ Apache CXF -- Using Apache HTrace
                 <div id="wrapper-menu-page-bottom">
                   <div id="menu-page">
                     <!-- NavigationBar -->
-<div id="navigation"><ul class="alternate"><li><a shape="rect" href="overview.html">Overview</a></li><li><a shape="rect" href="how-tos.html">How-Tos</a></li><li><a shape="rect" href="frontends.html">Frontends</a></li><li><a shape="rect" href="databindings.html">DataBindings</a></li><li><a shape="rect" href="transports.html">Transports</a></li><li><a shape="rect" href="configuration.html">Configuration</a></li><li><a shape="rect" href="debugging-and-logging.html">Debugging and Logging</a></li><li><a shape="rect" href="tools.html">Tools</a></li><li><a shape="rect" href="restful-services.html">RESTful Services</a></li><li><a shape="rect" href="wsdl-bindings.html">WSDL Bindings</a></li><li><a shape="rect" href="service-routing.html">Service Routing</a></li><li><a shape="rect" href="dynamic-languages.html">Dynamic Languages</a></li><li><a shape="rect" href="ws-support.html">WS-* Support</a></li><li><a shape="rect" href="advanced-integration.html">Advanced Integration</a></li><li><a shape
 ="rect" href="deployment.html">Deployment</a></li><li><a shape="rect" href="schemas-and-namespaces.html">Use of Schemas and Namespaces</a></li></ul><hr><ul class="alternate"><li><p>Search</p></li></ul><form enctype="application/x-www-form-urlencoded" method="get" id="cse-search-box" action="http://www.google.com/cse">
-  <div>
-    <input type="hidden" name="cx" value="002890367768291051730:o99qiwa09y4">
-    <input type="hidden" name="ie" value="UTF-8">
-    <input type="text" name="q" size="21">
-    <input type="submit" name="sa" value="Search">
-  </div>
-</form>
-<script type="text/javascript" src="http://www.google.com/cse/brand?form=cse-search-box&amp;lang=en"></script><hr><ul class="alternate"><li><a shape="rect" href="http://cxf.apache.org/javadoc/latest/">API 3.2.x (Javadoc)</a></li><li><a shape="rect" href="http://cxf.apache.org/javadoc/latest-3.1.x/">API 3.1.x (Javadoc)</a></li><li><a shape="rect" href="http://cxf.apache.org/">CXF Website</a></li></ul><p>&#160;</p><p><a shape="rect" class="external-link" href="http://www.apache.org/events/current-event.html"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://www.apache.org/events/current-event-125x125.png" data-image-src="http://www.apache.org/events/current-event-125x125.png"></span></a></p></div>
+<div id="navigation"><ul class="alternate"><li><a shape="rect" href="overview.html">Overview</a></li><li><a shape="rect" href="how-tos.html">How-Tos</a></li><li><a shape="rect" href="frontends.html">Frontends</a></li><li><a shape="rect" href="databindings.html">DataBindings</a></li><li><a shape="rect" href="transports.html">Transports</a></li><li><a shape="rect" href="configuration.html">Configuration</a></li><li><a shape="rect" href="debugging-and-logging.html">Debugging and Logging</a></li><li><a shape="rect" href="tools.html">Tools</a></li><li><a shape="rect" href="restful-services.html">RESTful Services</a></li><li><a shape="rect" href="wsdl-bindings.html">WSDL Bindings</a></li><li><a shape="rect" href="service-routing.html">Service Routing</a></li><li><a shape="rect" href="dynamic-languages.html">Dynamic Languages</a></li><li><a shape="rect" href="ws-support.html">WS-* Support</a></li><li><a shape="rect" href="advanced-integration.html">Advanced Integration</a></li><li><a shape
 ="rect" href="deployment.html">Deployment</a></li><li><a shape="rect" href="schemas-and-namespaces.html">Use of Schemas and Namespaces</a></li></ul><hr><ul class="alternate"><li><p>Search</p></li></ul><p><img class="wysiwyg-unknown-macro" src="https://cwiki.apache.org/confluence/plugins/servlet/confluence/placeholder/unknown-macro?name=html&amp;locale=en_GB&amp;version=2"></p><hr><ul class="alternate"><li><a shape="rect" href="http://cxf.apache.org/javadoc/latest-3.5.x/">API 3.5.x (Javadoc)</a></li><li><a shape="rect" href="http://cxf.apache.org/javadoc/latest-3.2.x/">API 3.2.x (Javadoc)</a></li><li><a shape="rect" href="http://cxf.apache.org/javadoc/latest-3.1.x/">API 3.1.x (Javadoc)</a></li><li><a shape="rect" href="http://cxf.apache.org/">CXF Website</a></li></ul><p><br clear="none"></p><p><a shape="rect" class="external-link" href="http://www.apache.org/events/current-event.html"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-exte
 rnal-resource" src="http://www.apache.org/events/current-event-125x125.png" data-image-src="http://www.apache.org/events/current-event-125x125.png"></span></a></p></div>
                     <!-- NavigationBar -->
                   </div>
               </div>
@@ -119,11 +107,11 @@ Apache CXF -- Using Apache HTrace
            <!-- Content -->
            <div class="wiki-content">
 <div id="ConfluenceContent"><p><style type="text/css">/*<![CDATA[*/
-div.rbtoc1582865766174 {padding: 0px;}
-div.rbtoc1582865766174 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1582865766174 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1640206663424 {padding: 0px;}
+div.rbtoc1640206663424 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1640206663424 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style></p><div class="toc-macro rbtoc1582865766174">
+/*]]>*/</style></p><div class="toc-macro rbtoc1640206663424">
 <ul class="toc-indentation"><li><a shape="rect" href="#UsingApacheHTrace-Overview">Overview</a></li><li><a shape="rect" href="#UsingApacheHTrace-DistributedTracinginNutshell">Distributed Tracing in Nutshell</a></li><li><a shape="rect" href="#UsingApacheHTrace-DistributedTracinginApacheCXFusingApacheHTrace">Distributed Tracing in Apache CXF using Apache HTrace</a></li><li><a shape="rect" href="#UsingApacheHTrace-ConfiguringClientconfigure.client">Configuring Client</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#UsingApacheHTrace-Configuringtracingheadernames">Configuring tracing header names</a></li></ul>
 </li><li><a shape="rect" href="#UsingApacheHTrace-ConfiguringServerconfigure.server">Configuring Server</a>

Modified: websites/production/cxf/content/docs/using-cxf-and-cdi-11-jsr-346.html
==============================================================================
--- websites/production/cxf/content/docs/using-cxf-and-cdi-11-jsr-346.html (original)
+++ websites/production/cxf/content/docs/using-cxf-and-cdi-11-jsr-346.html Wed Dec 22 21:03:39 2021
@@ -58,11 +58,7 @@ Apache CXF -- Using CXF and CDI 1.1 (JSR
     <td id="cell-1-1">&nbsp;</td>
     <td id="cell-1-2">
       <!-- Banner -->
-<div class="banner" id="banner"><div><table border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td align="left" colspan="1" nowrap>
-<a shape="rect" href="http://cxf.apache.org/" title="Apache CXF"><span style="font-weight: bold; font-size: 170%; color: white">Apache CXF</span></a>
-</td><td align="right" colspan="1" nowrap>
-<a shape="rect" href="http://www.apache.org/" title="The Apache Sofware Foundation"><img border="0" alt="ASF Logo" src="http://cxf.apache.org/images/asf-logo.png"></a>
-</td></tr></table></div></div>
+<div class="banner" id="banner"><img class="wysiwyg-unknown-macro" src="https://cwiki.apache.org/confluence/plugins/servlet/confluence/placeholder/unknown-macro?name=html&amp;locale=en_GB&amp;version=2"></div>
       <!-- Banner -->
       <div id="top-menu">
         <table border="0" cellpadding="1" cellspacing="0" width="100%">
@@ -99,15 +95,7 @@ Apache CXF -- Using CXF and CDI 1.1 (JSR
                 <div id="wrapper-menu-page-bottom">
                   <div id="menu-page">
                     <!-- NavigationBar -->
-<div id="navigation"><ul class="alternate"><li><a shape="rect" href="overview.html">Overview</a></li><li><a shape="rect" href="how-tos.html">How-Tos</a></li><li><a shape="rect" href="frontends.html">Frontends</a></li><li><a shape="rect" href="databindings.html">DataBindings</a></li><li><a shape="rect" href="transports.html">Transports</a></li><li><a shape="rect" href="configuration.html">Configuration</a></li><li><a shape="rect" href="debugging-and-logging.html">Debugging and Logging</a></li><li><a shape="rect" href="tools.html">Tools</a></li><li><a shape="rect" href="restful-services.html">RESTful Services</a></li><li><a shape="rect" href="wsdl-bindings.html">WSDL Bindings</a></li><li><a shape="rect" href="service-routing.html">Service Routing</a></li><li><a shape="rect" href="dynamic-languages.html">Dynamic Languages</a></li><li><a shape="rect" href="ws-support.html">WS-* Support</a></li><li><a shape="rect" href="advanced-integration.html">Advanced Integration</a></li><li><a shape
 ="rect" href="deployment.html">Deployment</a></li><li><a shape="rect" href="schemas-and-namespaces.html">Use of Schemas and Namespaces</a></li></ul><hr><ul class="alternate"><li><p>Search</p></li></ul><form enctype="application/x-www-form-urlencoded" method="get" id="cse-search-box" action="http://www.google.com/cse">
-  <div>
-    <input type="hidden" name="cx" value="002890367768291051730:o99qiwa09y4">
-    <input type="hidden" name="ie" value="UTF-8">
-    <input type="text" name="q" size="21">
-    <input type="submit" name="sa" value="Search">
-  </div>
-</form>
-<script type="text/javascript" src="http://www.google.com/cse/brand?form=cse-search-box&amp;lang=en"></script><hr><ul class="alternate"><li><a shape="rect" href="http://cxf.apache.org/javadoc/latest/">API 3.2.x (Javadoc)</a></li><li><a shape="rect" href="http://cxf.apache.org/javadoc/latest-3.1.x/">API 3.1.x (Javadoc)</a></li><li><a shape="rect" href="http://cxf.apache.org/">CXF Website</a></li></ul><p>&#160;</p><p><a shape="rect" class="external-link" href="http://www.apache.org/events/current-event.html"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://www.apache.org/events/current-event-125x125.png" data-image-src="http://www.apache.org/events/current-event-125x125.png"></span></a></p></div>
+<div id="navigation"><ul class="alternate"><li><a shape="rect" href="overview.html">Overview</a></li><li><a shape="rect" href="how-tos.html">How-Tos</a></li><li><a shape="rect" href="frontends.html">Frontends</a></li><li><a shape="rect" href="databindings.html">DataBindings</a></li><li><a shape="rect" href="transports.html">Transports</a></li><li><a shape="rect" href="configuration.html">Configuration</a></li><li><a shape="rect" href="debugging-and-logging.html">Debugging and Logging</a></li><li><a shape="rect" href="tools.html">Tools</a></li><li><a shape="rect" href="restful-services.html">RESTful Services</a></li><li><a shape="rect" href="wsdl-bindings.html">WSDL Bindings</a></li><li><a shape="rect" href="service-routing.html">Service Routing</a></li><li><a shape="rect" href="dynamic-languages.html">Dynamic Languages</a></li><li><a shape="rect" href="ws-support.html">WS-* Support</a></li><li><a shape="rect" href="advanced-integration.html">Advanced Integration</a></li><li><a shape
 ="rect" href="deployment.html">Deployment</a></li><li><a shape="rect" href="schemas-and-namespaces.html">Use of Schemas and Namespaces</a></li></ul><hr><ul class="alternate"><li><p>Search</p></li></ul><p><img class="wysiwyg-unknown-macro" src="https://cwiki.apache.org/confluence/plugins/servlet/confluence/placeholder/unknown-macro?name=html&amp;locale=en_GB&amp;version=2"></p><hr><ul class="alternate"><li><a shape="rect" href="http://cxf.apache.org/javadoc/latest-3.5.x/">API 3.5.x (Javadoc)</a></li><li><a shape="rect" href="http://cxf.apache.org/javadoc/latest-3.2.x/">API 3.2.x (Javadoc)</a></li><li><a shape="rect" href="http://cxf.apache.org/javadoc/latest-3.1.x/">API 3.1.x (Javadoc)</a></li><li><a shape="rect" href="http://cxf.apache.org/">CXF Website</a></li></ul><p><br clear="none"></p><p><a shape="rect" class="external-link" href="http://www.apache.org/events/current-event.html"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-exte
 rnal-resource" src="http://www.apache.org/events/current-event-125x125.png" data-image-src="http://www.apache.org/events/current-event-125x125.png"></span></a></p></div>
                     <!-- NavigationBar -->
                   </div>
               </div>
@@ -117,12 +105,12 @@ Apache CXF -- Using CXF and CDI 1.1 (JSR
          <td height="100%">
            <!-- Content -->
            <div class="wiki-content">
-<div id="ConfluenceContent"><h1 id="UsingCXFandCDI1.1(JSR-346)-Introduction">Introduction&#160;</h1><p>The JAX-RS 2.0 specification (JSR-339) mandates the support of CDI 1.1 (JSR-346) and Apache CXF starting from the version 3.0 introduces the initial support of this feature. As the starting point, the emphasis has been done on supporting embedded Jety 8/9 and Tomcat 7/8 containers as primary deployment (though other application servers will be supported in the future).&#160;</p><h1 id="UsingCXFandCDI1.1(JSR-346)-Architectureanddesign">Architecture and design&#160;</h1><p>At the moment, the integration of Apache CXF and CDI revolves around two key components, which reside in the new module called <strong>cxf-integration-cdi</strong></p><ul><li><strong>CXFCdiServlet</strong> servlet</li><li><strong>JAXRSCdiResourceExtension</strong> portable CDI extension</li></ul><p>The fact of including <strong>cxf-integration-cdi</strong> as a dependency allows&#160; <strong>JAXRSCdiResourceExtens
 ion</strong>&#160;&#160;portable CDI extension to be discovered by CDI container. The&#160; <strong>JAXRSCdiResourceExtension</strong> creates the instance of the <strong>Bus</strong>&#160;and registers&#160;it with <strong>BeanManager</strong>. From this point, the&#160; <strong>Bus</strong> instance is a regular CDI bean (with <span><strong>@</strong><span><strong>Application</strong> scope)</span></span> available for injection.&#160;This instance of the&#160; <strong>Bus</strong> is being injected into&#160;<strong>CXFCdiServlet</strong> servlet once it is initialized by servlet container.</p><p>Depending on the design, <strong>JAXRSCdiResourceExtension</strong> may use zero-based configuration approach or rely on particular JAX-RS <strong>Application</strong> instances. The&#160;<strong>org.apache.cxf.cdi.CXFCdiServlet</strong> should be configured as well (more examples for programmatic and WAR scenarios below).</p><h1 id="UsingCXFandCDI1.1(JSR-346)-Zero-basedConfiguration">Ze
 ro-based Configuration</h1><p>If the Apache CXF application contains either no instance of JAX-RS <strong>Application</strong> or&#160;only one single instance of JAX-RS <strong>Application</strong> (annotated with <strong>@ApplicationPath</strong>) with no singletons and classes defined, the following rules are being applied by <strong>JAXRSCdiResourceExtension</strong> in order to configure and publish the configured JAX-RS resources:</p><ul><li>the instance of the JAX-RS <strong>Application</strong> (annotated with <strong>@ApplicationPath</strong>) is being created and registered with <strong>BeanManager</strong></li><li>all instances of the discovered JAX-RS <strong>providers </strong>(annotated with <strong>@Provider</strong>) are being created and registered with <strong>BeanManager</strong></li><li>all instances of the discovered JAX-RS <strong>resources</strong> (annotated with <strong>@Path</strong>) are being created and registered with <strong>BeanManager</strong></li></
 ul><p>Lastly, the instance of the <strong>JAXRSServerFactoryBean</strong> is being created and configured with all service beans and providers discovered before. Additionally, the providers are enriched with the services for <strong>javax.ws.rs.ext.MessageBodyReader</strong> and <strong>javax.ws.rs.ext.MessageBodyWriter</strong>, loaded via <strong>ServiceLoader</strong>. From this moment, Apache CXF application is ready to serve the requests. The quick example is shown below.</p><p>The empty JAX-RS <strong>Application</strong>:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">@ApplicationPath("/api")
+<div id="ConfluenceContent"><h1 id="UsingCXFandCDI1.1(JSR346)-Introduction">Introduction&#160;</h1><p>The JAX-RS 2.0 specification (JSR-339) mandates the support of CDI 1.1 (JSR-346) and Apache CXF starting from the version 3.0 introduces the initial support of this feature. As the starting point, the emphasis has been done on supporting embedded Jety 8/9 and Tomcat 7/8 containers as primary deployment (though other application servers will be supported in the future).&#160;</p><h1 id="UsingCXFandCDI1.1(JSR346)-Architectureanddesign">Architecture and design&#160;</h1><p>At the moment, the integration of Apache CXF and CDI revolves around two key components, which reside in the new module called <strong>cxf-integration-cdi</strong></p><ul><li><strong>CXFCdiServlet</strong> servlet</li><li><strong>JAXRSCdiResourceExtension</strong> portable CDI extension</li></ul><p>The fact of including <strong>cxf-integration-cdi</strong> as a dependency allows&#160; <strong>JAXRSCdiResourceExtensio
 n</strong>&#160;&#160;portable CDI extension to be discovered by CDI container. The&#160; <strong>JAXRSCdiResourceExtension</strong> creates the instance of the <strong>Bus</strong>&#160;and registers&#160;it with <strong>BeanManager</strong>. From this point, the&#160; <strong>Bus</strong> instance is a regular CDI bean (with <span><strong>@</strong><span><strong>Application</strong> scope)</span></span> available for injection.&#160;This instance of the&#160; <strong>Bus</strong> is being injected into&#160;<strong>CXFCdiServlet</strong> servlet once it is initialized by servlet container.</p><p>Depending on the design, <strong>JAXRSCdiResourceExtension</strong> may use zero-based configuration approach or rely on particular JAX-RS <strong>Application</strong> instances. The&#160;<strong>org.apache.cxf.cdi.CXFCdiServlet</strong> should be configured as well (more examples for programmatic and WAR scenarios below).</p><h1 id="UsingCXFandCDI1.1(JSR346)-Zero-basedConfiguration">Zero-
 based Configuration</h1><p>If the Apache CXF application contains either no instance of JAX-RS <strong>Application</strong> or&#160;only one single instance of JAX-RS <strong>Application</strong> (annotated with <strong>@ApplicationPath</strong>) with no singletons and classes defined, the following rules are being applied by <strong>JAXRSCdiResourceExtension</strong> in order to configure and publish the configured JAX-RS resources:</p><ul><li>the instance of the JAX-RS <strong>Application</strong> (annotated with <strong>@ApplicationPath</strong>) is being created and registered with <strong>BeanManager</strong></li><li>all instances of the discovered JAX-RS <strong>providers </strong>(annotated with <strong>@Provider</strong>) are being created and registered with <strong>BeanManager</strong></li><li>all instances of the discovered JAX-RS <strong>resources</strong> (annotated with <strong>@Path</strong>) are being created and registered with <strong>BeanManager</strong></li></ul>
 <p>Lastly, the instance of the <strong>JAXRSServerFactoryBean</strong> is being created and configured with all service beans and providers discovered before. Additionally, the providers are enriched with the services for <strong>javax.ws.rs.ext.MessageBodyReader</strong> and <strong>javax.ws.rs.ext.MessageBodyWriter</strong>, loaded via <strong>ServiceLoader</strong>. From this moment, Apache CXF application is ready to serve the requests. The quick example is shown below.</p><p>The empty JAX-RS <strong>Application</strong>:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<pre class="brush: java; gutter: false; theme: Default">@ApplicationPath("/api")
 public class BookStoreApplication extends Application {
 }</pre>
 </div></div><p>And one JAX-RS resource:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">@Path("/bookstore/")
+<pre class="brush: java; gutter: false; theme: Default">@Path("/bookstore/")
 public class BookStore {
     @Inject private BookStoreService service;
     
@@ -133,8 +121,8 @@ public class BookStore {
         return service.get(id);
     }
 }</pre>
-</div></div><h1 id="UsingCXFandCDI1.1(JSR-346)-CustomizedConfiguration">Customized Configuration</h1><p>If the Apache CXF application contains one or more instances of JAX-RS <strong>Application</strong> (annotated with <strong>@ApplicationPath</strong>) with singletons or classes defined, the following rules are being applied by <strong>JAXRSCdiResourceExtension</strong> in order to configure and publish the configured JAX-RS resources:</p><ul><li>the instance of each JAX-RS <strong>Application</strong> (annotated with <strong>@ApplicationPath</strong>) is being created and registered with <strong>BeanManager</strong></li><li>for each JAX-RS <strong>Application</strong> instance created before, the instance of the <strong>JAXRSServerFactoryBean</strong> is being created and configured in a way that application's singletons/classes are being splitted to providers&#160;(annotated with <strong>@Provider</strong>), service beans (annotated with <strong>@Path</strong>) and features (imp
 lementation of <strong>org.apache.cxf.feature.Feature</strong>)<strong> </strong></li></ul><p>From this moment, Apache CXF application is ready to serve the requests. The quick example is shown below.</p><p>The configured JAX-RS <strong>Application</strong>:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">@ApplicationPath("/custom")
+</div></div><h1 id="UsingCXFandCDI1.1(JSR346)-CustomizedConfiguration">Customized Configuration</h1><p>If the Apache CXF application contains one or more instances of JAX-RS <strong>Application</strong> (annotated with <strong>@ApplicationPath</strong>) with singletons or classes defined, the following rules are being applied by <strong>JAXRSCdiResourceExtension</strong> in order to configure and publish the configured JAX-RS resources:</p><ul><li>the instance of each JAX-RS <strong>Application</strong> (annotated with <strong>@ApplicationPath</strong>) is being created and registered with <strong>BeanManager</strong></li><li>for each JAX-RS <strong>Application</strong> instance created before, the instance of the <strong>JAXRSServerFactoryBean</strong> is being created and configured in a way that application's singletons/classes are being splitted to providers&#160;(annotated with <strong>@Provider</strong>), service beans (annotated with <strong>@Path</strong>) and features (impl
 ementation of <strong>org.apache.cxf.feature.Feature</strong>)<strong> </strong></li></ul><p>From this moment, Apache CXF application is ready to serve the requests. The quick example is shown below.</p><p>The configured JAX-RS <strong>Application</strong>:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<pre class="brush: java; gutter: false; theme: Default">@ApplicationPath("/custom")
 public class BookStoreCustomApplication extends Application {
     @Inject private BookStore bookStore;
     
@@ -148,7 +136,7 @@ public class BookStoreCustomApplication
     }
 }</pre>
 </div></div><p>And one JAX-RS resource:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">@Path("/bookstore/")
+<pre class="brush: java; gutter: false; theme: Default">@Path("/bookstore/")
 public class BookStore {
     @Inject private BookStoreService service;
     
@@ -159,8 +147,8 @@ public class BookStore {
         return service.get(id);
     }
 }</pre>
-</div></div><h1 id="UsingCXFandCDI1.1(JSR-346)-AdditionalConfigurationCapabilities">Additional Configuration Capabilities</h1><p>If you have a need to, you can configure the underlying&#160;<strong>JAXRSServerFactoryBean</strong> by implementing the interface&#160;<strong>JAXRSServerFactoryCustomizationExtension</strong>.&#160; Instances of this extension can be located via <strong>ServiceLoader</strong> of as CDI beans.&#160; You can use this to programmatically add new providers, or otherwise manipulate the runtime before the server is created.&#160; An example of how this is used can be seen at&#160;<a shape="rect" class="external-link" href="https://github.com/apache/cxf/blob/master/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/cdi/SseTransportCustomizationExtension.java" rel="nofollow">SseTransportCustomizationExtension</a>.</p><h1 id="UsingCXFandCDI1.1(JSR-346)-CDiLifecycleforJAX-RSContextObjects">CDi Lifecycle for JAX-RS Context Objects</h1><p>The CDI extension also suppor
 ts the injection (via CDI) of&#160;<strong>@Context </strong>objects.&#160; Any known object can be injected via CDI.&#160; This happens automatically when the CDI extension is used, and a&#160;<strong>@Context</strong> is declared as a field on a resource class.&#160; Note that this does allow you to inject your&#160;<strong>@Context</strong> objects in non-JAX-RS components as well.&#160; The logic is in two parts:</p><ol><li>Rewriting injection points<ol><li>When an injection point is found that contains&#160;<strong>@Context</strong> two additional annotations are added</li><li>These annotations are&#160;<strong>@Inject </strong>and&#160;<strong>@ContextResolved</strong></li><li>The use of&#160;<strong>@Inject </strong>will force the CDI runtime to take over the injection of the bean value, while<strong>&#160;@ContextResolved </strong>is simply a qualifier we apply to the injection point to avoid ambiguities</li></ol></li><li><strong>Providing Beans</strong><ol><li>For each of t
 he built in<strong>&#160;@Context </strong>types, we register a bean that provides a<strong>&#160;@RequestScoped </strong>bean that resolves the value, by looking up the internal context value</li><li>In addition, a user or intergrator can implement<strong> ContextClassProvider </strong>to register an additional class as context type to be resolved.</li></ol></li></ol><p>&#160;</p><h1 id="UsingCXFandCDI1.1(JSR-346)-DeployingwithembeddedJetty8/9(programmaticconfiguration)">Deploying with embedded Jetty 8/9 (programmatic configuration)</h1><p>With <strong>Jetty 8/9</strong> it possible to create fully embeddable REST / JAX-RS servers without <strong>web.xml</strong> or <strong>WAR</strong>&#160;files involved. For Apache CXF applications which are using CDI 1.1, the&#160;<strong>CXFCdiServlet</strong>&#160;servlet should be used as a starting point. Following example demonstrates the necessary configuration points in order to create embedded <strong>Jetty 8/9</strong> instance. As a C
 DI 1.1 implementation, <strong>JBoss Weld 2.0</strong> is being used.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">System.setProperty("java.naming.factory.url", "org.eclipse.jetty.jndi");
+</div></div><h1 id="UsingCXFandCDI1.1(JSR346)-AdditionalConfigurationCapabilities">Additional Configuration Capabilities</h1><p>If you have a need to, you can configure the underlying&#160;<strong>JAXRSServerFactoryBean</strong> by implementing the interface&#160;<strong>JAXRSServerFactoryCustomizationExtension</strong>.&#160; Instances of this extension can be located via <strong>ServiceLoader</strong> of as CDI beans.&#160; You can use this to programmatically add new providers, or otherwise manipulate the runtime before the server is created.&#160; An example of how this is used can be seen at&#160;<a shape="rect" class="external-link" href="https://github.com/apache/cxf/blob/master/rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/cdi/SseTransportCustomizationExtension.java" rel="nofollow">SseTransportCustomizationExtension</a>.</p><h1 id="UsingCXFandCDI1.1(JSR346)-CDiLifecycleforJAX-RSContextObjects">CDi Lifecycle for JAX-RS Context Objects</h1><p>The CDI extension also supports
  the injection (via CDI) of&#160;<strong>@Context </strong>objects.&#160; Any known object can be injected via CDI.&#160; This happens automatically when the CDI extension is used, and a&#160;<strong>@Context</strong> is declared as a field on a resource class.&#160; Note that this does allow you to inject your&#160;<strong>@Context</strong> objects in non-JAX-RS components as well.&#160; The logic is in two parts:</p><ol><li>Rewriting injection points<ol><li>When an injection point is found that contains&#160;<strong>@Context</strong> two additional annotations are added</li><li>These annotations are&#160;<strong>@Inject </strong>and&#160;<strong>@ContextResolved</strong></li><li>The use of&#160;<strong>@Inject </strong>will force the CDI runtime to take over the injection of the bean value, while<strong>&#160;@ContextResolved </strong>is simply a qualifier we apply to the injection point to avoid ambiguities</li></ol></li><li><strong>Providing Beans</strong><ol><li>For each of the
  built in<strong>&#160;@Context </strong>types, we register a bean that provides a<strong>&#160;@RequestScoped </strong>bean that resolves the value, by looking up the internal context value</li><li>In addition, a user or intergrator can implement<strong> ContextClassProvider </strong>to register an additional class as context type to be resolved.</li></ol></li></ol><p>&#160;</p><h1 id="UsingCXFandCDI1.1(JSR346)-DeployingwithembeddedJetty8/9(programmaticconfiguration)">Deploying with embedded Jetty 8/9 (programmatic configuration)</h1><p>With <strong>Jetty 8/9</strong> it possible to create fully embeddable REST / JAX-RS servers without <strong>web.xml</strong> or <strong>WAR</strong>&#160;files involved. For Apache CXF applications which are using CDI 1.1, the&#160;<strong>CXFCdiServlet</strong>&#160;servlet should be used as a starting point. Following example demonstrates the necessary configuration points in order to create embedded <strong>Jetty 8/9</strong> instance. As a CDI 
 1.1 implementation, <strong>JBoss Weld 2.0</strong> is being used.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<pre class="brush: java; gutter: false; theme: Default">System.setProperty("java.naming.factory.url", "org.eclipse.jetty.jndi");
 System.setProperty("java.naming.factory.initial", "org.eclipse.jetty.jndi.InitialContextFactory");
 
 // Register and map the dispatcher servlet
@@ -173,8 +161,8 @@ context.addEventListener(new BeanManager
 context.addServlet(servletHolder, "/rest/*");
 server.setHandler(context);
 server.start();</pre>
-</div></div><p>This code snippet is enough to trigger the CDI portable extension discovery, to perform the configuration (depending on JAX-RS <strong>Applications</strong> present) and to wire up all defined dependencies together.</p><h1 id="UsingCXFandCDI1.1(JSR-346)-DeployingwithembeddedJetty8/9(WAR-baseddeployment)">Deploying with embedded Jetty 8/9 (WAR-based deployment)&#160;</h1><p>Another option to deploy Apache CXF application with CDI 1.1 support and embedded <strong>Jetty 8/9</strong> is by using <strong>web.xml</strong> descriptor and WAR-like deployment structure. In this case, the Apache CXF application needs to declare <strong>CXFCdiServlet</strong>&#160;servlet (and its mappings) and, if required, CDI-specific listeners (in the example below the <strong>JBoss Weld 2.0</strong> is being used as CDI 1.1 container).</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
+</div></div><p>This code snippet is enough to trigger the CDI portable extension discovery, to perform the configuration (depending on JAX-RS <strong>Applications</strong> present) and to wire up all defined dependencies together.</p><h1 id="UsingCXFandCDI1.1(JSR346)-DeployingwithembeddedJetty8/9(WAR-baseddeployment)">Deploying with embedded Jetty 8/9 (WAR-based deployment)&#160;</h1><p>Another option to deploy Apache CXF application with CDI 1.1 support and embedded <strong>Jetty 8/9</strong> is by using <strong>web.xml</strong> descriptor and WAR-like deployment structure. In this case, the Apache CXF application needs to declare <strong>CXFCdiServlet</strong>&#160;servlet (and its mappings) and, if required, CDI-specific listeners (in the example below the <strong>JBoss Weld 2.0</strong> is being used as CDI 1.1 container).</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<pre class="brush: java; gutter: false; theme: Default">&lt;web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt;
 
     &lt;listener&gt;
@@ -200,7 +188,7 @@ server.start();</pre>
     &lt;/resource-env-ref&gt;
 &lt;/web-app&gt;</pre>
 </div></div><p>The server initialization in this case looks simpler.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">System.setProperty("java.naming.factory.url", "org.eclipse.jetty.jndi");
+<pre class="brush: java; gutter: false; theme: Default">System.setProperty("java.naming.factory.url", "org.eclipse.jetty.jndi");
 System.setProperty("java.naming.factory.initial", "org.eclipse.jetty.jndi.InitialContextFactory");
 
 final Server server = new Server(&lt;port&gt;);
@@ -213,8 +201,8 @@ HandlerCollection handlers = new Handler
 handlers.setHandlers(new Handler[] {context, new DefaultHandler()});
 server.setHandler(handlers);
 server.start();</pre>
-</div></div><p>Please notice, usage of Jetty-specific server classes ("org.eclipse.jetty.servlet.ServletContextHandler.Decorator") is very important to allow CDI 1.1 injections (backed by <strong>JBoss Weld 2.0</strong>) to work seamlessly across servlets / listeners / filters. It is not stricktly necessary for Apache CXF (everything will work as expected) but complex applications would definitely benefit from that.</p><h1 id="UsingCXFandCDI1.1(JSR-346)-DeployingwithembeddedTomcat7/8(WAR-baseddeployment)">Deploying with embedded Tomcat 7/8 (WAR-based deployment)&#160;</h1><p>In case of embedded Tomcat 7/8, Apache CXF application with CDI 1.1 support could be deployed with <strong>web.xml</strong> descriptor and WAR-like deployment structure, similarly to Jetty 8/9 WAR-based deployment. Apache CXF application needs to declare <strong>CXFCdiServlet</strong>&#160;servlet (and its mappings) and, if required, CDI-specific listeners (in the example below the <strong>JBoss Weld 2.0</strong
 > is being used as CDI 1.1 container).</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
+</div></div><p>Please notice, usage of Jetty-specific server classes ("org.eclipse.jetty.servlet.ServletContextHandler.Decorator") is very important to allow CDI 1.1 injections (backed by <strong>JBoss Weld 2.0</strong>) to work seamlessly across servlets / listeners / filters. It is not stricktly necessary for Apache CXF (everything will work as expected) but complex applications would definitely benefit from that.</p><h1 id="UsingCXFandCDI1.1(JSR346)-DeployingwithembeddedTomcat7/8(WAR-baseddeployment)">Deploying with embedded Tomcat 7/8 (WAR-based deployment)&#160;</h1><p>In case of embedded Tomcat 7/8, Apache CXF application with CDI 1.1 support could be deployed with <strong>web.xml</strong> descriptor and WAR-like deployment structure, similarly to Jetty 8/9 WAR-based deployment. Apache CXF application needs to declare <strong>CXFCdiServlet</strong>&#160;servlet (and its mappings) and, if required, CDI-specific listeners (in the example below the <strong>JBoss Weld 2.0</strong>
  is being used as CDI 1.1 container).</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<pre class="brush: java; gutter: false; theme: Default">&lt;web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt;
 
     &lt;listener&gt;
@@ -240,7 +228,7 @@ server.start();</pre>
     &lt;/resource-env-ref&gt;
 &lt;/web-app&gt;</pre>
 </div></div><p>Tomcat 7/8 server has a different API, by still quite simple initialization procedure.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">final Tomcat server = new Tomcat();
+<pre class="brush: java; gutter: false; theme: Default">final Tomcat server = new Tomcat();
 server.setPort(&lt;port&gt;);
 
 final File base = createTemporaryDirectory();
@@ -252,7 +240,7 @@ server.getHost().setDeployOnStartup(true
             
 server.addWebapp(&lt;context path&gt;, &lt;path to WAR folder/file&gt;);   
 server.start();</pre>
-</div></div><h1 id="UsingCXFandCDI1.1(JSR-346)-Futurework">Future work</h1><p>The Apache CXF team is committed to improve the CDI integration and to cover more deployment scenarios and wide range of application configurations and demands. However, by and large the CDI integration is implementation-independent and it is expected to work in JBoss WildFly or other EE containers.</p></div>
+</div></div><h1 id="UsingCXFandCDI1.1(JSR346)-Futurework">Future work</h1><p>The Apache CXF team is committed to improve the CDI integration and to cover more deployment scenarios and wide range of application configurations and demands. However, by and large the CDI integration is implementation-independent and it is expected to work in JBoss WildFly or other EE containers.</p></div>
            </div>
            <!-- Content -->
          </td>

Modified: websites/production/cxf/content/docs/using-cxf-and-cdi-1112-jsr-346-in-osgi-environment.html
==============================================================================
--- websites/production/cxf/content/docs/using-cxf-and-cdi-1112-jsr-346-in-osgi-environment.html (original)
+++ websites/production/cxf/content/docs/using-cxf-and-cdi-1112-jsr-346-in-osgi-environment.html Wed Dec 22 21:03:39 2021
@@ -58,11 +58,7 @@ Apache CXF -- Using CXF and CDI 1.1/1.2
     <td id="cell-1-1">&nbsp;</td>
     <td id="cell-1-2">
       <!-- Banner -->
-<div class="banner" id="banner"><div><table border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td align="left" colspan="1" nowrap>
-<a shape="rect" href="http://cxf.apache.org/" title="Apache CXF"><span style="font-weight: bold; font-size: 170%; color: white">Apache CXF</span></a>
-</td><td align="right" colspan="1" nowrap>
-<a shape="rect" href="http://www.apache.org/" title="The Apache Sofware Foundation"><img border="0" alt="ASF Logo" src="http://cxf.apache.org/images/asf-logo.png"></a>
-</td></tr></table></div></div>
+<div class="banner" id="banner"><img class="wysiwyg-unknown-macro" src="https://cwiki.apache.org/confluence/plugins/servlet/confluence/placeholder/unknown-macro?name=html&amp;locale=en_GB&amp;version=2"></div>
       <!-- Banner -->
       <div id="top-menu">
         <table border="0" cellpadding="1" cellspacing="0" width="100%">
@@ -99,15 +95,7 @@ Apache CXF -- Using CXF and CDI 1.1/1.2
                 <div id="wrapper-menu-page-bottom">
                   <div id="menu-page">
                     <!-- NavigationBar -->
-<div id="navigation"><ul class="alternate"><li><a shape="rect" href="overview.html">Overview</a></li><li><a shape="rect" href="how-tos.html">How-Tos</a></li><li><a shape="rect" href="frontends.html">Frontends</a></li><li><a shape="rect" href="databindings.html">DataBindings</a></li><li><a shape="rect" href="transports.html">Transports</a></li><li><a shape="rect" href="configuration.html">Configuration</a></li><li><a shape="rect" href="debugging-and-logging.html">Debugging and Logging</a></li><li><a shape="rect" href="tools.html">Tools</a></li><li><a shape="rect" href="restful-services.html">RESTful Services</a></li><li><a shape="rect" href="wsdl-bindings.html">WSDL Bindings</a></li><li><a shape="rect" href="service-routing.html">Service Routing</a></li><li><a shape="rect" href="dynamic-languages.html">Dynamic Languages</a></li><li><a shape="rect" href="ws-support.html">WS-* Support</a></li><li><a shape="rect" href="advanced-integration.html">Advanced Integration</a></li><li><a shape
 ="rect" href="deployment.html">Deployment</a></li><li><a shape="rect" href="schemas-and-namespaces.html">Use of Schemas and Namespaces</a></li></ul><hr><ul class="alternate"><li><p>Search</p></li></ul><form enctype="application/x-www-form-urlencoded" method="get" id="cse-search-box" action="http://www.google.com/cse">
-  <div>
-    <input type="hidden" name="cx" value="002890367768291051730:o99qiwa09y4">
-    <input type="hidden" name="ie" value="UTF-8">
-    <input type="text" name="q" size="21">
-    <input type="submit" name="sa" value="Search">
-  </div>
-</form>
-<script type="text/javascript" src="http://www.google.com/cse/brand?form=cse-search-box&amp;lang=en"></script><hr><ul class="alternate"><li><a shape="rect" href="http://cxf.apache.org/javadoc/latest/">API 3.2.x (Javadoc)</a></li><li><a shape="rect" href="http://cxf.apache.org/javadoc/latest-3.1.x/">API 3.1.x (Javadoc)</a></li><li><a shape="rect" href="http://cxf.apache.org/">CXF Website</a></li></ul><p>&#160;</p><p><a shape="rect" class="external-link" href="http://www.apache.org/events/current-event.html"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://www.apache.org/events/current-event-125x125.png" data-image-src="http://www.apache.org/events/current-event-125x125.png"></span></a></p></div>
+<div id="navigation"><ul class="alternate"><li><a shape="rect" href="overview.html">Overview</a></li><li><a shape="rect" href="how-tos.html">How-Tos</a></li><li><a shape="rect" href="frontends.html">Frontends</a></li><li><a shape="rect" href="databindings.html">DataBindings</a></li><li><a shape="rect" href="transports.html">Transports</a></li><li><a shape="rect" href="configuration.html">Configuration</a></li><li><a shape="rect" href="debugging-and-logging.html">Debugging and Logging</a></li><li><a shape="rect" href="tools.html">Tools</a></li><li><a shape="rect" href="restful-services.html">RESTful Services</a></li><li><a shape="rect" href="wsdl-bindings.html">WSDL Bindings</a></li><li><a shape="rect" href="service-routing.html">Service Routing</a></li><li><a shape="rect" href="dynamic-languages.html">Dynamic Languages</a></li><li><a shape="rect" href="ws-support.html">WS-* Support</a></li><li><a shape="rect" href="advanced-integration.html">Advanced Integration</a></li><li><a shape
 ="rect" href="deployment.html">Deployment</a></li><li><a shape="rect" href="schemas-and-namespaces.html">Use of Schemas and Namespaces</a></li></ul><hr><ul class="alternate"><li><p>Search</p></li></ul><p><img class="wysiwyg-unknown-macro" src="https://cwiki.apache.org/confluence/plugins/servlet/confluence/placeholder/unknown-macro?name=html&amp;locale=en_GB&amp;version=2"></p><hr><ul class="alternate"><li><a shape="rect" href="http://cxf.apache.org/javadoc/latest-3.5.x/">API 3.5.x (Javadoc)</a></li><li><a shape="rect" href="http://cxf.apache.org/javadoc/latest-3.2.x/">API 3.2.x (Javadoc)</a></li><li><a shape="rect" href="http://cxf.apache.org/javadoc/latest-3.1.x/">API 3.1.x (Javadoc)</a></li><li><a shape="rect" href="http://cxf.apache.org/">CXF Website</a></li></ul><p><br clear="none"></p><p><a shape="rect" class="external-link" href="http://www.apache.org/events/current-event.html"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-exte
 rnal-resource" src="http://www.apache.org/events/current-event-125x125.png" data-image-src="http://www.apache.org/events/current-event-125x125.png"></span></a></p></div>
                     <!-- NavigationBar -->
                   </div>
               </div>
@@ -117,15 +105,15 @@ Apache CXF -- Using CXF and CDI 1.1/1.2
          <td height="100%">
            <!-- Content -->
            <div class="wiki-content">
-<div id="ConfluenceContent"><h1 id="UsingCXFandCDI1.1/1.2(JSR-346)inOSGienvironment-Introduction">Introduction</h1><p>Since 3.1.0 release, Apache CXF supports CDI-based deployment inside OSGi container which uses Pax CDI (Contexts and Dependency Injection for OSGi) implementation (<a shape="rect" class="external-link" href="https://github.com/ops4j/org.ops4j.pax.cdi" rel="nofollow">https://github.com/ops4j/org.ops4j.pax.cdi</a>).&#160;Apache CXF provides the <strong>cxf-jaxrs-cdi</strong> feature (for easy deployment into OSGi containers such as <strong>Apache Karaf</strong>) as well as <strong>cxf-integration-cdi</strong> module, which includes necessary OSGi bundle metadata to be used by Pax CDI.</p><h1 id="UsingCXFandCDI1.1/1.2(JSR-346)inOSGienvironment-Installation">Installation</h1><p>For the installation steps, <strong>Apache Karaf 3.0.3</strong>&#160; is going to be used as it is the most widely used OSGi container. All commands shown below are intended to be executed from Ap
 ache Karaf shell. The first step is to install <strong>http</strong> and Pax CDI features, which is CDI-version dependent.</p><p>For CDI 1.1, please use&#160;<strong>pax-cdi-1.1-web-weld</strong> feature:</p><div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
+<div id="ConfluenceContent"><h1 id="UsingCXFandCDI1.1/1.2(JSR346)inOSGienvironment-Introduction">Introduction</h1><p>Since 3.1.0 release, Apache CXF supports CDI-based deployment inside OSGi container which uses Pax CDI (Contexts and Dependency Injection for OSGi) implementation (<a shape="rect" class="external-link" href="https://github.com/ops4j/org.ops4j.pax.cdi" rel="nofollow">https://github.com/ops4j/org.ops4j.pax.cdi</a>).&#160;Apache CXF provides the <strong>cxf-jaxrs-cdi</strong> feature (for easy deployment into OSGi containers such as <strong>Apache Karaf</strong>) as well as <strong>cxf-integration-cdi</strong> module, which includes necessary OSGi bundle metadata to be used by Pax CDI.</p><h1 id="UsingCXFandCDI1.1/1.2(JSR346)inOSGienvironment-Installation">Installation</h1><p>For the installation steps, <strong>Apache Karaf 3.0.3</strong>&#160; is going to be used as it is the most widely used OSGi container. All commands shown below are intended to be executed from Apac
 he Karaf shell. The first step is to install <strong>http</strong> and Pax CDI features, which is CDI-version dependent.</p><p>For CDI 1.1, please use&#160;<strong>pax-cdi-1.1-web-weld</strong> feature:</p><div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
 <pre>feature:install http pax-cdi-1.1-web-weld</pre>
 </div></div><p>For CDI 1.2, please use&#160;<strong>pax-cdi-1.2-web-weld</strong> feature:</p><div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
 <pre>feature:install http pax-cdi-1.2-web-weld</pre>
 </div></div><p>Next, Apache CXF 3.1.0+ features should be installed:</p><div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
 <pre>feature:repo-add cxf 3.1.0
 feature:install cxf/3.1.0 cxf-jaxrs-cdi/3.1.0</pre>
-</div></div><h1 id="UsingCXFandCDI1.1/1.2(JSR-346)inOSGienvironment-BundleMetadata">Bundle Metadata</h1><p>In order for the bundle to be recognized as web CDI one and use Apache CXF CDI capabilities, it should provide special bundle manifest instructions (f.e. by&#160; using <strong>maven-bundle-plugin</strong> plugin).</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;/instructions&gt;
+</div></div><h1 id="UsingCXFandCDI1.1/1.2(JSR346)inOSGienvironment-BundleMetadata">Bundle Metadata</h1><p>In order for the bundle to be recognized as web CDI one and use Apache CXF CDI capabilities, it should provide special bundle manifest instructions (f.e. by&#160; using <strong>maven-bundle-plugin</strong> plugin).</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<pre class="brush: java; gutter: false; theme: Default">&lt;/instructions&gt;
     ... 
     &lt;Import-Package&gt;
         javax.servlet;version="[2.6,4)", 
@@ -141,8 +129,8 @@ feature:install cxf/3.1.0 cxf-jaxrs-cdi/
    &#160;&lt;Web-ContextPath&gt;...&lt;/Web-ContextPath&gt;
     &lt;_wab&gt;src/main/webapp&lt;/_wab&gt;
 &lt;/instructions&gt;</pre>
-</div></div><p>The <strong>Require-Capability</strong> instruction is very important in order for CDI initialization, discovery and injections to work with Apache CXF. The <strong>Web-ContextPath</strong> is the context path for this web application to be deployed at. And <strong>_wab</strong> is the instruction&#160; to point out the <strong>web.xml</strong> file location. Please notice, the application will not be deployed under usual<strong> /cxf</strong> endpoint (common endpoint for regular Apache CXF services). The reason for that is that Pax Web is used for deployment of web CDI applications.</p><h1 id="UsingCXFandCDI1.1/1.2(JSR-346)inOSGienvironment-WebApplicationConfiguration">Web Application Configuration</h1><p>At the moment, Apache CXF OSGi application should explicitly provide <strong>web.xml</strong> descriptor with at least <strong>CXFCdiServlet </strong>defined. For example:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelConten
 t pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
+</div></div><p>The <strong>Require-Capability</strong> instruction is very important in order for CDI initialization, discovery and injections to work with Apache CXF. The <strong>Web-ContextPath</strong> is the context path for this web application to be deployed at. And <strong>_wab</strong> is the instruction&#160; to point out the <strong>web.xml</strong> file location. Please notice, the application will not be deployed under usual<strong> /cxf</strong> endpoint (common endpoint for regular Apache CXF services). The reason for that is that Pax Web is used for deployment of web CDI applications.</p><h1 id="UsingCXFandCDI1.1/1.2(JSR346)inOSGienvironment-WebApplicationConfiguration">Web Application Configuration</h1><p>At the moment, Apache CXF OSGi application should explicitly provide <strong>web.xml</strong> descriptor with at least <strong>CXFCdiServlet </strong>defined. For example:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent
  pdl">
+<pre class="brush: java; gutter: false; theme: Default">&lt;web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt;
 
     &lt;servlet&gt;
@@ -157,7 +145,7 @@ feature:install cxf/3.1.0 cxf-jaxrs-cdi/
         &lt;url-pattern&gt;/*&lt;/url-pattern&gt;
     &lt;/servlet-mapping&gt;
 &lt;/web-app&gt;</pre>
-</div></div><h1 id="UsingCXFandCDI1.1/1.2(JSR-346)inOSGienvironment-Discovery">Discovery</h1><p>Pax CDI uses own definition of bean bundles and as such, only bundles which follow these requirements are available for discovery (providers, services and features) and injection (see please <a shape="rect" class="external-link" href="https://ops4j1.jira.com/wiki/display/PAXCDI/Getting+Started+for+OSGi+Users" rel="nofollow">https://ops4j1.jira.com/wiki/display/PAXCDI/Getting+Started+for+OSGi+Users</a> for more details).</p></div>
+</div></div><h1 id="UsingCXFandCDI1.1/1.2(JSR346)inOSGienvironment-Discovery">Discovery</h1><p>Pax CDI uses own definition of bean bundles and as such, only bundles which follow these requirements are available for discovery (providers, services and features) and injection (see please <a shape="rect" class="external-link" href="https://ops4j1.jira.com/wiki/display/PAXCDI/Getting+Started+for+OSGi+Users" rel="nofollow">https://ops4j1.jira.com/wiki/display/PAXCDI/Getting+Started+for+OSGi+Users</a> for more details).</p></div>
            </div>
            <!-- Content -->
          </td>

Modified: websites/production/cxf/content/docs/using-cxf-and-failover-in-osgi-environment.html
==============================================================================
--- websites/production/cxf/content/docs/using-cxf-and-failover-in-osgi-environment.html (original)
+++ websites/production/cxf/content/docs/using-cxf-and-failover-in-osgi-environment.html Wed Dec 22 21:03:39 2021
@@ -58,11 +58,7 @@ Apache CXF -- Using CXF and Failover in
     <td id="cell-1-1">&nbsp;</td>
     <td id="cell-1-2">
       <!-- Banner -->
-<div class="banner" id="banner"><div><table border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td align="left" colspan="1" nowrap>
-<a shape="rect" href="http://cxf.apache.org/" title="Apache CXF"><span style="font-weight: bold; font-size: 170%; color: white">Apache CXF</span></a>
-</td><td align="right" colspan="1" nowrap>
-<a shape="rect" href="http://www.apache.org/" title="The Apache Sofware Foundation"><img border="0" alt="ASF Logo" src="http://cxf.apache.org/images/asf-logo.png"></a>
-</td></tr></table></div></div>
+<div class="banner" id="banner"><img class="wysiwyg-unknown-macro" src="https://cwiki.apache.org/confluence/plugins/servlet/confluence/placeholder/unknown-macro?name=html&amp;locale=en_GB&amp;version=2"></div>
       <!-- Banner -->
       <div id="top-menu">
         <table border="0" cellpadding="1" cellspacing="0" width="100%">
@@ -99,15 +95,7 @@ Apache CXF -- Using CXF and Failover in
                 <div id="wrapper-menu-page-bottom">
                   <div id="menu-page">
                     <!-- NavigationBar -->
-<div id="navigation"><ul class="alternate"><li><a shape="rect" href="overview.html">Overview</a></li><li><a shape="rect" href="how-tos.html">How-Tos</a></li><li><a shape="rect" href="frontends.html">Frontends</a></li><li><a shape="rect" href="databindings.html">DataBindings</a></li><li><a shape="rect" href="transports.html">Transports</a></li><li><a shape="rect" href="configuration.html">Configuration</a></li><li><a shape="rect" href="debugging-and-logging.html">Debugging and Logging</a></li><li><a shape="rect" href="tools.html">Tools</a></li><li><a shape="rect" href="restful-services.html">RESTful Services</a></li><li><a shape="rect" href="wsdl-bindings.html">WSDL Bindings</a></li><li><a shape="rect" href="service-routing.html">Service Routing</a></li><li><a shape="rect" href="dynamic-languages.html">Dynamic Languages</a></li><li><a shape="rect" href="ws-support.html">WS-* Support</a></li><li><a shape="rect" href="advanced-integration.html">Advanced Integration</a></li><li><a shape
 ="rect" href="deployment.html">Deployment</a></li><li><a shape="rect" href="schemas-and-namespaces.html">Use of Schemas and Namespaces</a></li></ul><hr><ul class="alternate"><li><p>Search</p></li></ul><form enctype="application/x-www-form-urlencoded" method="get" id="cse-search-box" action="http://www.google.com/cse">
-  <div>
-    <input type="hidden" name="cx" value="002890367768291051730:o99qiwa09y4">
-    <input type="hidden" name="ie" value="UTF-8">
-    <input type="text" name="q" size="21">
-    <input type="submit" name="sa" value="Search">
-  </div>
-</form>
-<script type="text/javascript" src="http://www.google.com/cse/brand?form=cse-search-box&amp;lang=en"></script><hr><ul class="alternate"><li><a shape="rect" href="http://cxf.apache.org/javadoc/latest/">API 3.2.x (Javadoc)</a></li><li><a shape="rect" href="http://cxf.apache.org/javadoc/latest-3.1.x/">API 3.1.x (Javadoc)</a></li><li><a shape="rect" href="http://cxf.apache.org/">CXF Website</a></li></ul><p>&#160;</p><p><a shape="rect" class="external-link" href="http://www.apache.org/events/current-event.html"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://www.apache.org/events/current-event-125x125.png" data-image-src="http://www.apache.org/events/current-event-125x125.png"></span></a></p></div>
+<div id="navigation"><ul class="alternate"><li><a shape="rect" href="overview.html">Overview</a></li><li><a shape="rect" href="how-tos.html">How-Tos</a></li><li><a shape="rect" href="frontends.html">Frontends</a></li><li><a shape="rect" href="databindings.html">DataBindings</a></li><li><a shape="rect" href="transports.html">Transports</a></li><li><a shape="rect" href="configuration.html">Configuration</a></li><li><a shape="rect" href="debugging-and-logging.html">Debugging and Logging</a></li><li><a shape="rect" href="tools.html">Tools</a></li><li><a shape="rect" href="restful-services.html">RESTful Services</a></li><li><a shape="rect" href="wsdl-bindings.html">WSDL Bindings</a></li><li><a shape="rect" href="service-routing.html">Service Routing</a></li><li><a shape="rect" href="dynamic-languages.html">Dynamic Languages</a></li><li><a shape="rect" href="ws-support.html">WS-* Support</a></li><li><a shape="rect" href="advanced-integration.html">Advanced Integration</a></li><li><a shape
 ="rect" href="deployment.html">Deployment</a></li><li><a shape="rect" href="schemas-and-namespaces.html">Use of Schemas and Namespaces</a></li></ul><hr><ul class="alternate"><li><p>Search</p></li></ul><p><img class="wysiwyg-unknown-macro" src="https://cwiki.apache.org/confluence/plugins/servlet/confluence/placeholder/unknown-macro?name=html&amp;locale=en_GB&amp;version=2"></p><hr><ul class="alternate"><li><a shape="rect" href="http://cxf.apache.org/javadoc/latest-3.5.x/">API 3.5.x (Javadoc)</a></li><li><a shape="rect" href="http://cxf.apache.org/javadoc/latest-3.2.x/">API 3.2.x (Javadoc)</a></li><li><a shape="rect" href="http://cxf.apache.org/javadoc/latest-3.1.x/">API 3.1.x (Javadoc)</a></li><li><a shape="rect" href="http://cxf.apache.org/">CXF Website</a></li></ul><p><br clear="none"></p><p><a shape="rect" class="external-link" href="http://www.apache.org/events/current-event.html"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-exte
 rnal-resource" src="http://www.apache.org/events/current-event-125x125.png" data-image-src="http://www.apache.org/events/current-event-125x125.png"></span></a></p></div>
                     <!-- NavigationBar -->
                   </div>
               </div>
@@ -132,7 +120,7 @@ install -s mvn:org.qi4j.core/org.qi4j.co
 install -s mvn:org.qi4j.library/org.qi4j.library.jmx/2.1
 install -s mvn:org.qi4j.library/org.qi4j.library.circuitbreaker/2.1</pre>
 </div></div><h1 id="UsingCXFandFailoverinOSGienvironment-BlueprintConfiguration">Blueprint Configuration</h1><p>Once all prerequisites are installed, the configuration becomes really trivial, for example here is the OSGi blueprint snippet which registers <a shape="rect" href="failoverfeature.html">JAX-WS</a>&#160; failover-aware client. Although it uses <strong>circuit-breaker-failover</strong>, the way to register regular <strong>failover</strong> and <strong>loadDistribution&#160;</strong>features is very similar.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+<pre class="brush: java; gutter: false; theme: Default">&lt;blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:jaxws="http://cxf.apache.org/blueprint/jaxws"
        xmlns:clustering="http://cxf.apache.org/clustering"

Modified: websites/production/cxf/content/docs/using-cxf-jca-rar-in-application-server.html
==============================================================================
--- websites/production/cxf/content/docs/using-cxf-jca-rar-in-application-server.html (original)
+++ websites/production/cxf/content/docs/using-cxf-jca-rar-in-application-server.html Wed Dec 22 21:03:39 2021
@@ -58,11 +58,7 @@ Apache CXF -- Using CXF-JCA RAR in Appli
     <td id="cell-1-1">&nbsp;</td>
     <td id="cell-1-2">
       <!-- Banner -->
-<div class="banner" id="banner"><div><table border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td align="left" colspan="1" nowrap>
-<a shape="rect" href="http://cxf.apache.org/" title="Apache CXF"><span style="font-weight: bold; font-size: 170%; color: white">Apache CXF</span></a>
-</td><td align="right" colspan="1" nowrap>
-<a shape="rect" href="http://www.apache.org/" title="The Apache Sofware Foundation"><img border="0" alt="ASF Logo" src="http://cxf.apache.org/images/asf-logo.png"></a>
-</td></tr></table></div></div>
+<div class="banner" id="banner"><img class="wysiwyg-unknown-macro" src="https://cwiki.apache.org/confluence/plugins/servlet/confluence/placeholder/unknown-macro?name=html&amp;locale=en_GB&amp;version=2"></div>
       <!-- Banner -->
       <div id="top-menu">
         <table border="0" cellpadding="1" cellspacing="0" width="100%">
@@ -99,15 +95,7 @@ Apache CXF -- Using CXF-JCA RAR in Appli
                 <div id="wrapper-menu-page-bottom">
                   <div id="menu-page">
                     <!-- NavigationBar -->
-<div id="navigation"><ul class="alternate"><li><a shape="rect" href="overview.html">Overview</a></li><li><a shape="rect" href="how-tos.html">How-Tos</a></li><li><a shape="rect" href="frontends.html">Frontends</a></li><li><a shape="rect" href="databindings.html">DataBindings</a></li><li><a shape="rect" href="transports.html">Transports</a></li><li><a shape="rect" href="configuration.html">Configuration</a></li><li><a shape="rect" href="debugging-and-logging.html">Debugging and Logging</a></li><li><a shape="rect" href="tools.html">Tools</a></li><li><a shape="rect" href="restful-services.html">RESTful Services</a></li><li><a shape="rect" href="wsdl-bindings.html">WSDL Bindings</a></li><li><a shape="rect" href="service-routing.html">Service Routing</a></li><li><a shape="rect" href="dynamic-languages.html">Dynamic Languages</a></li><li><a shape="rect" href="ws-support.html">WS-* Support</a></li><li><a shape="rect" href="advanced-integration.html">Advanced Integration</a></li><li><a shape
 ="rect" href="deployment.html">Deployment</a></li><li><a shape="rect" href="schemas-and-namespaces.html">Use of Schemas and Namespaces</a></li></ul><hr><ul class="alternate"><li><p>Search</p></li></ul><form enctype="application/x-www-form-urlencoded" method="get" id="cse-search-box" action="http://www.google.com/cse">
-  <div>
-    <input type="hidden" name="cx" value="002890367768291051730:o99qiwa09y4">
-    <input type="hidden" name="ie" value="UTF-8">
-    <input type="text" name="q" size="21">
-    <input type="submit" name="sa" value="Search">
-  </div>
-</form>
-<script type="text/javascript" src="http://www.google.com/cse/brand?form=cse-search-box&amp;lang=en"></script><hr><ul class="alternate"><li><a shape="rect" href="http://cxf.apache.org/javadoc/latest/">API 3.2.x (Javadoc)</a></li><li><a shape="rect" href="http://cxf.apache.org/javadoc/latest-3.1.x/">API 3.1.x (Javadoc)</a></li><li><a shape="rect" href="http://cxf.apache.org/">CXF Website</a></li></ul><p>&#160;</p><p><a shape="rect" class="external-link" href="http://www.apache.org/events/current-event.html"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-external-resource" src="http://www.apache.org/events/current-event-125x125.png" data-image-src="http://www.apache.org/events/current-event-125x125.png"></span></a></p></div>
+<div id="navigation"><ul class="alternate"><li><a shape="rect" href="overview.html">Overview</a></li><li><a shape="rect" href="how-tos.html">How-Tos</a></li><li><a shape="rect" href="frontends.html">Frontends</a></li><li><a shape="rect" href="databindings.html">DataBindings</a></li><li><a shape="rect" href="transports.html">Transports</a></li><li><a shape="rect" href="configuration.html">Configuration</a></li><li><a shape="rect" href="debugging-and-logging.html">Debugging and Logging</a></li><li><a shape="rect" href="tools.html">Tools</a></li><li><a shape="rect" href="restful-services.html">RESTful Services</a></li><li><a shape="rect" href="wsdl-bindings.html">WSDL Bindings</a></li><li><a shape="rect" href="service-routing.html">Service Routing</a></li><li><a shape="rect" href="dynamic-languages.html">Dynamic Languages</a></li><li><a shape="rect" href="ws-support.html">WS-* Support</a></li><li><a shape="rect" href="advanced-integration.html">Advanced Integration</a></li><li><a shape
 ="rect" href="deployment.html">Deployment</a></li><li><a shape="rect" href="schemas-and-namespaces.html">Use of Schemas and Namespaces</a></li></ul><hr><ul class="alternate"><li><p>Search</p></li></ul><p><img class="wysiwyg-unknown-macro" src="https://cwiki.apache.org/confluence/plugins/servlet/confluence/placeholder/unknown-macro?name=html&amp;locale=en_GB&amp;version=2"></p><hr><ul class="alternate"><li><a shape="rect" href="http://cxf.apache.org/javadoc/latest-3.5.x/">API 3.5.x (Javadoc)</a></li><li><a shape="rect" href="http://cxf.apache.org/javadoc/latest-3.2.x/">API 3.2.x (Javadoc)</a></li><li><a shape="rect" href="http://cxf.apache.org/javadoc/latest-3.1.x/">API 3.1.x (Javadoc)</a></li><li><a shape="rect" href="http://cxf.apache.org/">CXF Website</a></li></ul><p><br clear="none"></p><p><a shape="rect" class="external-link" href="http://www.apache.org/events/current-event.html"><span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image confluence-exte
 rnal-resource" src="http://www.apache.org/events/current-event-125x125.png" data-image-src="http://www.apache.org/events/current-event-125x125.png"></span></a></p></div>
                     <!-- NavigationBar -->
                   </div>
               </div>
@@ -117,29 +105,29 @@ Apache CXF -- Using CXF-JCA RAR in Appli
          <td height="100%">
            <!-- Content -->
            <div class="wiki-content">
-<div id="ConfluenceContent"><h1 id="UsingCXF-JCARARinApplicationServer-DeployCXF-JCARAR.">Deploy CXF-JCA RAR.</h1>
+<div id="ConfluenceContent"><h1 id="UsingCXFJCARARinApplicationServer-DeployCXF-JCARAR.">Deploy CXF-JCA RAR.</h1>
 <p>cxf-integration-jca module has implemented the JCA1.5 outbound connection. You can see samples in $CXF_HOME/samples/integration/jca.</p>
 
 <style type="text/css">/*<![CDATA[*/
-div.rbtoc1524513368290 {padding: 0px;}
-div.rbtoc1524513368290 ul {list-style: disc;margin-left: 0px;padding-left: 20px;}
-div.rbtoc1524513368290 li {margin-left: 0px;padding-left: 0px;}
-
-/*]]>*/</style><div class="toc-macro rbtoc1524513368290">
-<ul class="toc-indentation"><li><a shape="rect" href="#UsingCXF-JCARARinApplicationServer-DeployCXF-JCARAR.">Deploy CXF-JCA RAR.</a>
-<ul class="toc-indentation"><li><a shape="rect" href="#UsingCXF-JCARARinApplicationServer-BuildCXF-JCARAR">Build CXF-JCA RAR</a></li><li><a shape="rect" href="#UsingCXF-JCARARinApplicationServer-DeployRARtoJBOSS.">Deploy RAR to JBOSS.</a>
-<ul class="toc-indentation"><li><a shape="rect" href="#UsingCXF-JCARARinApplicationServer-DeploythestandaloneRAR.">Deploy the standalone RAR.</a></li><li><a shape="rect" href="#UsingCXF-JCARARinApplicationServer-DeploytheRARinEAR.">Deploy the RAR in EAR.</a></li></ul>
-</li><li><a shape="rect" href="#UsingCXF-JCARARinApplicationServer-DeployRARtoWeblogic.">Deploy RAR to Weblogic.</a>
-<ul class="toc-indentation"><li><a shape="rect" href="#UsingCXF-JCARARinApplicationServer-PackageRARinanEAR.">Package RAR in an EAR.</a></li></ul>
-</li><li><a shape="rect" href="#UsingCXF-JCARARinApplicationServer-DeployRARtoWebSphere.">Deploy RAR to WebSphere.</a></li></ul>
-</li><li><a shape="rect" href="#UsingCXF-JCARARinApplicationServer-UsingJCAConnection.">Using JCA Connection.</a>
-<ul class="toc-indentation"><li><a shape="rect" href="#UsingCXF-JCARARinApplicationServer-GetConnectionfromManagedConnectionFactory.">Get Connection from ManagedConnectionFactory.</a></li><li><a shape="rect" href="#UsingCXF-JCARARinApplicationServer-UsingCXF-JCARARtoaccesstheStatelessSessionBean.">Using CXF-JCA RAR to access the Stateless Session Bean.</a>
-<ul class="toc-indentation"><li><a shape="rect" href="#UsingCXF-JCARARinApplicationServer-Activatetheejb_servant.propertiesfile.">Activate the ejb_servant.properties file.</a></li></ul>
+div.rbtoc1640206609275 {padding: 0px;}
+div.rbtoc1640206609275 ul {list-style: disc;margin-left: 0px;padding-left: 20px;}
+div.rbtoc1640206609275 li {margin-left: 0px;padding-left: 0px;}
+
+/*]]>*/</style><div class="toc-macro rbtoc1640206609275">
+<ul class="toc-indentation"><li><a shape="rect" href="#UsingCXFJCARARinApplicationServer-DeployCXF-JCARAR.">Deploy CXF-JCA RAR.</a>
+<ul class="toc-indentation"><li><a shape="rect" href="#UsingCXFJCARARinApplicationServer-BuildCXF-JCARAR">Build CXF-JCA RAR</a></li><li><a shape="rect" href="#UsingCXFJCARARinApplicationServer-DeployRARtoJBOSS.">Deploy RAR to JBOSS.</a>
+<ul class="toc-indentation"><li><a shape="rect" href="#UsingCXFJCARARinApplicationServer-DeploythestandaloneRAR.">Deploy the standalone RAR.</a></li><li><a shape="rect" href="#UsingCXFJCARARinApplicationServer-DeploytheRARinEAR.">Deploy the RAR in EAR.</a></li></ul>
+</li><li><a shape="rect" href="#UsingCXFJCARARinApplicationServer-DeployRARtoWeblogic.">Deploy RAR to Weblogic.</a>
+<ul class="toc-indentation"><li><a shape="rect" href="#UsingCXFJCARARinApplicationServer-PackageRARinanEAR.">Package RAR in an EAR.</a></li></ul>
+</li><li><a shape="rect" href="#UsingCXFJCARARinApplicationServer-DeployRARtoWebSphere.">Deploy RAR to WebSphere.</a></li></ul>
+</li><li><a shape="rect" href="#UsingCXFJCARARinApplicationServer-UsingJCAConnection.">Using JCA Connection.</a>
+<ul class="toc-indentation"><li><a shape="rect" href="#UsingCXFJCARARinApplicationServer-GetConnectionfromManagedConnectionFactory.">Get Connection from ManagedConnectionFactory.</a></li><li><a shape="rect" href="#UsingCXFJCARARinApplicationServer-UsingCXF-JCARARtoaccesstheStatelessSessionBean.">Using CXF-JCA RAR to access the Stateless Session Bean.</a>
+<ul class="toc-indentation"><li><a shape="rect" href="#UsingCXFJCARARinApplicationServer-Activatetheejb_servant.propertiesfile.">Activate the ejb_servant.properties file.</a></li></ul>
 </li></ul>
 </li></ul>
 </div>
 
-<h2 id="UsingCXF-JCARARinApplicationServer-BuildCXF-JCARAR">Build CXF-JCA RAR</h2>
+<h2 id="UsingCXFJCARARinApplicationServer-BuildCXF-JCARAR">Build CXF-JCA RAR</h2>
 <p>    The jca rar package structure would be:</p>
     <div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
 <pre>    |---META-INF
@@ -152,16 +140,16 @@ div.rbtoc1524513368290 li {margin-left:
 
 <p>Refer to this <a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/incubator/cxf/trunk/distribution/src/main/release/samples/integration/jca/inbound/build.xml">build.xml</a> "generate.rar" target for building rar detail.</p>
 
-<h2 id="UsingCXF-JCARARinApplicationServer-DeployRARtoJBOSS.">Deploy RAR to JBOSS.</h2>
+<h2 id="UsingCXFJCARARinApplicationServer-DeployRARtoJBOSS.">Deploy RAR to JBOSS.</h2>
 
-<h3 id="UsingCXF-JCARARinApplicationServer-DeploythestandaloneRAR.">Deploy the standalone RAR.</h3>
+<h3 id="UsingCXFJCARARinApplicationServer-DeploythestandaloneRAR.">Deploy the standalone RAR.</h3>
 <p><strong>(Note: This has been tested against JBoss4.0.5)</strong></p>
 
 <ol><li>You need to put below jars in the $JBOSS_HOME/lib/endorsed.
 	<ul><li>geronimo-activation_1.1_spec-1.0-M1.jar</li><li>geronimo-annotation_1.0_spec-1.1.jar</li><li>geronimo-ws-metadata_2.0_spec-1.1.1.jar</li><li>jaxb-api-2.1.jar</li><li>jaxb-impl-2.1.4.jar</li><li>jaxb-xjc-2.1.4.jar</li><li>jsr181-api-1.0-MR1.jar</li><li>saaj-api-1.3.jar</li><li>saaj-impl-1.3.jar</li><li>stax-api-1.0.1.jar</li><li>stax-utils-20060502.jar</li></ul>
 	</li><li>Copy the rar to the $JBOSS_HOME/server/default</li><li>Create the cxfj2ee_1_5-ds.xml as below, and copy it to $JBOSS_HOME/server/default
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 &lt;!DOCTYPE connection-factories
     PUBLIC "-//JBoss//DTD JBOSS JCA Config 1.5//EN"
     "http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd"&gt;
@@ -178,11 +166,11 @@ div.rbtoc1524513368290 li {margin-left:
 
 <p>You can refer to jca sample's <a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/incubator/cxf/trunk/distribution/src/main/release/samples/integration/jca/inbound/README.txt">README</a> for detail.</p>
 
-<h3 id="UsingCXF-JCARARinApplicationServer-DeploytheRARinEAR.">Deploy the RAR in EAR.</h3>
+<h3 id="UsingCXFJCARARinApplicationServer-DeploytheRARinEAR.">Deploy the RAR in EAR.</h3>
 <p><strong>(Note: This has been tested against JBoss4.0.5 and JBoss4.2.1)</strong></p>
 <ul><li>Having application.xml
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 &lt;?xml version="1.0" encoding="UTF-8"?&gt;
 &lt;application&gt;
 	&lt;display-name&gt;cxf-jca&lt;/display-name&gt;
@@ -196,7 +184,7 @@ div.rbtoc1524513368290 li {margin-left:
 
 <ul><li>Having jboss-app.xml to configure the classloader.
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 &lt;?xml version="1.0" encoding="UTF-8"?&gt;
 &lt;jboss-app&gt;
 	&lt;loader-repository&gt;
@@ -215,7 +203,7 @@ div.rbtoc1524513368290 li {margin-left:
 
 <ul><li>Having cxf-ds for jca outbound in JBoss.
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
  &lt;?xml version="1.0" encoding="UTF-8"?&gt;
 &lt;connection-factories&gt;
   &lt;no-tx-connection-factory&gt;
@@ -240,13 +228,13 @@ div.rbtoc1524513368290 li {margin-left:
 
 
 
-<h2 id="UsingCXF-JCARARinApplicationServer-DeployRARtoWeblogic.">Deploy RAR to Weblogic.</h2>
+<h2 id="UsingCXFJCARARinApplicationServer-DeployRARtoWeblogic.">Deploy RAR to Weblogic.</h2>
 <p><strong>(Note: this has been tested against WebLogic9.1)</strong></p>
 
-<h3 id="UsingCXF-JCARARinApplicationServer-PackageRARinanEAR.">Package RAR in an EAR.</h3>
+<h3 id="UsingCXFJCARARinApplicationServer-PackageRARinanEAR.">Package RAR in an EAR.</h3>
 <ul><li>Add a weblogic-ra.xml in the <strong>META-INF</strong> folder.
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 &lt;weblogic-connector xmlns="http://www.bea.com/ns/weblogic/90"&gt;
     &lt;outbound-resource-adapter&gt;
         &lt;connection-definition-group&gt;
@@ -265,16 +253,16 @@ div.rbtoc1524513368290 li {margin-left:
 
 
 
-<h2 id="UsingCXF-JCARARinApplicationServer-DeployRARtoWebSphere.">Deploy RAR to WebSphere.</h2>
+<h2 id="UsingCXFJCARARinApplicationServer-DeployRARtoWebSphere.">Deploy RAR to WebSphere.</h2>
 
 <p>TBD</p>
 
-<h1 id="UsingCXF-JCARARinApplicationServer-UsingJCAConnection.">Using JCA Connection.</h1>
+<h1 id="UsingCXFJCARARinApplicationServer-UsingJCAConnection.">Using JCA Connection.</h1>
 
-<h2 id="UsingCXF-JCARARinApplicationServer-GetConnectionfromManagedConnectionFactory.">Get Connection from ManagedConnectionFactory.</h2>
+<h2 id="UsingCXFJCARARinApplicationServer-GetConnectionfromManagedConnectionFactory.">Get Connection from ManagedConnectionFactory.</h2>
 <p>Below is the code snippet to get the Connection.</p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 
         URL wsdl = getClass().getResource("/wsdl/hello_world.wsdl");                
         CXFConnectionRequestInfo cri = new CXFConnectionRequestInfo(Greeter.class, 
@@ -291,7 +279,7 @@ div.rbtoc1524513368290 li {margin-left:
 <p>Also can get the connection without wsdl, but you need to provide the address.</p>
 
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 
         CXFConnectionRequestInfo requestInfo = new CXFConnectionRequestInfo();
         requestInfo.setInterface(Greeter.class);
@@ -303,12 +291,12 @@ div.rbtoc1524513368290 li {margin-left:
 </pre>
 </div></div>
 
-<h2 id="UsingCXF-JCARARinApplicationServer-UsingCXF-JCARARtoaccesstheStatelessSessionBean.">Using CXF-JCA RAR to access the Stateless Session Bean.</h2>
+<h2 id="UsingCXFJCARARinApplicationServer-UsingCXF-JCARARtoaccesstheStatelessSessionBean.">Using CXF-JCA RAR to access the Stateless Session Bean.</h2>
 <p>By using cxf-jca RAR, the EIS is able to access the Stateless Session Bean by CXF Interal API or JAXWS API.<br clear="none">
 If you want to deploy the Stateless Session Bean, you need to modify the ejb_servant.properties file.</p>
-<h3 id="UsingCXF-JCARARinApplicationServer-Activatetheejb_servant.propertiesfile.">Activate the ejb_servant.properties file.</h3>
+<h3 id="UsingCXFJCARARinApplicationServer-Activatetheejb_servant.propertiesfile.">Activate the ejb_servant.properties file.</h3>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default">
 # Format: 
 # jndi_name={namespace}ServiceName@url_to_swdl
 #