Author: buildbot
Date: Mon Apr 23 21:48:32 2012
New Revision: 814149

Log:
Production update by buildbot for cxf

Modified:
    websites/production/cxf/content/cache/docs.pageCache
    websites/production/cxf/content/docs/jax-rs-advanced-features.html
    websites/production/cxf/content/docs/jax-rs-basics.html
    websites/production/cxf/content/docs/jax-rs.html

Modified: websites/production/cxf/content/cache/docs.pageCache
==============================================================================
Binary files - no diff available.

Modified: websites/production/cxf/content/docs/jax-rs-advanced-features.html
==============================================================================
--- websites/production/cxf/content/docs/jax-rs-advanced-features.html 
(original)
+++ websites/production/cxf/content/docs/jax-rs-advanced-features.html Mon Apr 
23 21:48:32 2012
@@ -124,7 +124,7 @@ Apache CXF -- JAX-RS Advanced Features
 <div id="ConfluenceContent"><p><span 
style="font-size:2em;font-weight:bold">JAX-RS : Advanced Features</span></p>
 
 <div>
-<ul><li><a shape="rect" href="#JAX-RSAdvancedFeatures-JMSSupport">JMS 
Support</a></li><li><a shape="rect" 
href="#JAX-RSAdvancedFeatures-FIQLsearchqueries">FIQL search 
queries</a></li><ul><li><a shape="rect" 
href="#JAX-RSAdvancedFeatures-ConsumingFIQLqueries">Consuming FIQL 
queries</a></li><li><a shape="rect" 
href="#JAX-RSAdvancedFeatures-BuildingFIQLqueries">Building FIQL 
queries</a></li><li><a shape="rect" 
href="#JAX-RSAdvancedFeatures-Usingdatesinqueries">Using dates in 
queries</a></li></ul><li><a shape="rect" 
href="#JAX-RSAdvancedFeatures-Onewayinvocations">Oneway 
invocations</a></li><li><a shape="rect" 
href="#JAX-RSAdvancedFeatures-SupportforContinuations">Support for 
Continuations</a></li><li><a shape="rect" 
href="#JAX-RSAdvancedFeatures-Serversidecaching">Server-side 
caching</a></li><li><a shape="rect" 
href="#JAX-RSAdvancedFeatures-RESTfulserviceswithoutannotations">RESTful 
services without annotations</a></li><ul><li><a shape="rect" 
href="#JAX-RSAdvancedFeatures-Confi
 guration">Configuration</a></li></ul></ul></div>
+<ul><li><a shape="rect" href="#JAX-RSAdvancedFeatures-JMSSupport">JMS 
Support</a></li><li><a shape="rect" 
href="#JAX-RSAdvancedFeatures-FIQLsearchqueries">FIQL search 
queries</a></li><ul><li><a shape="rect" 
href="#JAX-RSAdvancedFeatures-Introduction">Introduction</a></li><li><a 
shape="rect" 
href="#JAX-RSAdvancedFeatures-DependenciesandConfiguration">Dependencies and 
Configuration</a></li><li><a shape="rect" 
href="#JAX-RSAdvancedFeatures-ConsumingFIQLqueries">Consuming FIQL 
queries</a></li><li><a shape="rect" 
href="#JAX-RSAdvancedFeatures-BuildingFIQLqueries">Building FIQL 
queries</a></li><li><a shape="rect" 
href="#JAX-RSAdvancedFeatures-Usingdatesinqueries">Using dates in 
queries</a></li></ul><li><a shape="rect" 
href="#JAX-RSAdvancedFeatures-Onewayinvocations">Oneway 
invocations</a></li><li><a shape="rect" 
href="#JAX-RSAdvancedFeatures-SupportforContinuations">Support for 
Continuations</a></li><li><a shape="rect" 
href="#JAX-RSAdvancedFeatures-Serversidecaching">Server-side c
 aching</a></li><li><a shape="rect" 
href="#JAX-RSAdvancedFeatures-RESTfulserviceswithoutannotations">RESTful 
services without annotations</a></li><ul><li><a shape="rect" 
href="#JAX-RSAdvancedFeatures-Configuration">Configuration</a></li></ul></ul></div>
 
 <h1><a shape="rect" name="JAX-RSAdvancedFeatures-JMSSupport"></a>JMS 
Support</h1>
 
@@ -158,6 +158,8 @@ jaxrs:server/@address is set to "/bar" t
 
 <h1><a shape="rect" name="JAX-RSAdvancedFeatures-FIQLsearchqueries"></a>FIQL 
search queries</h1>
 
+<h2><a shape="rect" 
name="JAX-RSAdvancedFeatures-Introduction"></a>Introduction</h2>
+
 <p>CXF JAXRS (since 2.3.0) lets users do the advanced search queries based on 
the <a shape="rect" class="external-link" 
href="http://tools.ietf.org/html/draft-nottingham-atompub-fiql-00"; 
rel="nofollow">Feed Item Query Language</a>(FIQL). FIQL lets users express 
complex search expressions using an intuitive and URI friendly language.</p>
 
 <p>For example, a query such as</p>
@@ -175,6 +177,22 @@ An expression such as "name==CXF*" can b
 
 <p>Note that either '_search' or '_s' query has to be used to pass the FIQL 
expression.</p>
 
+<h2><a shape="rect" 
name="JAX-RSAdvancedFeatures-DependenciesandConfiguration"></a>Dependencies and 
Configuration</h2>
+
+<p>The following dependency is required starting from CXF 2.6.0:</p>
+
+<div class="code panel" style="border-width: 1px;"><div class="codeContent 
panelContent">
+<pre class="code-xml">
+   <span class="code-tag">&lt;dependency&gt;</span>
+      <span class="code-tag">&lt;groupId&gt;</span>org.apache.cxf<span 
class="code-tag">&lt;/groupId&gt;</span>
+      <span 
class="code-tag">&lt;artifactId&gt;</span>cxf-rt-rs-extension-search<span 
class="code-tag">&lt;/artifactId&gt;</span>
+      <span class="code-tag">&lt;version&gt;</span>2.5.0<span 
class="code-tag">&lt;/version&gt;</span>
+   <span class="code-tag">&lt;/dependency&gt;</span>
+</pre>
+</div></div>
+
+<p>Additionally, in CXF 2.6.0, <a shape="rect" class="external-link" 
href="http://svn.apache.org/repos/asf/cxf/trunk/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchContextProvider.java";>SearchContextProvider</a>
 needs to be registered as jaxrs:provider. </p>
+
 <h2><a shape="rect" 
name="JAX-RSAdvancedFeatures-ConsumingFIQLqueries"></a>Consuming FIQL 
queries</h2>
 
 <p>To work with FIQL queries, a <a shape="rect" class="external-link" 
href="http://svn.apache.org/repos/asf/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchContext.java";>SearchContext</a>
 needs be injected into an application code and used to retrieve a <a 
shape="rect" class="external-link" 
href="http://svn.apache.org/repos/asf/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchCondition.java";>SearchCondition</a>
 representing the current FIQL query. This SearchCondition can be used in a 
number of ways for finding the matching data.</p>

Modified: websites/production/cxf/content/docs/jax-rs-basics.html
==============================================================================
--- websites/production/cxf/content/docs/jax-rs-basics.html (original)
+++ websites/production/cxf/content/docs/jax-rs-basics.html Mon Apr 23 21:48:32 
2012
@@ -124,7 +124,7 @@ Apache CXF -- JAX-RS Basics
 <div id="ConfluenceContent"><p><span style="font-size:2em;font-weight:bold"> 
JAX-RS : Understanding the Basics </span></p>
 
 <div>
-<ul><li><a shape="rect" href="#JAX-RSBasics-Resourceclass">Resource 
class</a></li><li><a shape="rect" 
href="#JAX-RSBasics-@Path">@Path</a></li><li><a shape="rect" 
href="#JAX-RSBasics-HTTPMethod">HTTP Method</a></li><li><a shape="rect" 
href="#JAX-RSBasics-Returntypes">Return types</a></li><li><a shape="rect" 
href="#JAX-RSBasics-Exceptionhandling">Exception handling</a></li><li><a 
shape="rect" href="#JAX-RSBasics-DealingwithParameters">Dealing with 
Parameters</a></li><ul><li><a shape="rect" 
href="#JAX-RSBasics-Parameterbeans">Parameter beans</a></li></ul><li><a 
shape="rect" href="#JAX-RSBasics-Resourcelifecycles">Resource 
lifecycles</a></li><li><a shape="rect" 
href="#JAX-RSBasics-Overviewoftheselectionalgorithm.">Overview of the selection 
algorithm.</a></li><ul><li><a shape="rect" 
href="#JAX-RSBasics-Selectingbetweenmultipleresourceclasses">Selecting between 
multiple resource classes</a></li><li><a shape="rect" 
href="#JAX-RSBasics-Selectingbetweenmultipleresourcemethods">Selec
 ting between multiple resource methods</a></li><li><a shape="rect" 
href="#JAX-RSBasics-Resourcemethodsandmediatypes">Resource methods and media 
types</a></li><li><a shape="rect" 
href="#JAX-RSBasics-Customselectionbetweenmultipleresources">Custom selection 
between multiple resources</a></li></ul><li><a shape="rect" 
href="#JAX-RSBasics-Contextannotations">Context annotations</a></li><li><a 
shape="rect" href="#JAX-RSBasics-URIcalculationusingUriInfoandUriBuilder">URI 
calculation using UriInfo and UriBuilder</a></li><li><a shape="rect" 
href="#JAX-RSBasics-Annotationinheritance">Annotation 
inheritance</a></li><li><a shape="rect" 
href="#JAX-RSBasics-Subresourcelocators.">Sub-resource 
locators.</a></li><ul><li><a shape="rect" 
href="#JAX-RSBasics-Staticresolutionofsubresources">Static resolution of 
subresources</a></li></ul><li><a shape="rect" 
href="#JAX-RSBasics-MessageBodyProviders">Message Body 
Providers</a></li><ul><li><a shape="rect" 
href="#JAX-RSBasics-CustomMessageBodyProvide
 rs">Custom Message Body Providers</a></li><li><a shape="rect" 
href="#JAX-RSBasics-Registeringcustomproviders">Registering custom 
providers</a></li></ul><li><a shape="rect" 
href="#JAX-RSBasics-Customizingmediatypesformessagebodyproviders">Customizing 
media types for message body providers</a></li><li><a shape="rect" 
href="#JAX-RSBasics-AdvancedHTTP">Advanced HTTP</a></li></ul></div>
+<ul><li><a shape="rect" href="#JAX-RSBasics-Resourceclass">Resource 
class</a></li><li><a shape="rect" 
href="#JAX-RSBasics-@Path">@Path</a></li><li><a shape="rect" 
href="#JAX-RSBasics-HTTPMethod">HTTP Method</a></li><li><a shape="rect" 
href="#JAX-RSBasics-Returntypes">Return types</a></li><li><a shape="rect" 
href="#JAX-RSBasics-Exceptionhandling">Exception handling</a></li><li><a 
shape="rect" href="#JAX-RSBasics-DealingwithParameters">Dealing with 
Parameters</a></li><ul><li><a shape="rect" 
href="#JAX-RSBasics-Parameterbeans">Parameter beans</a></li></ul><li><a 
shape="rect" href="#JAX-RSBasics-Resourcelifecycles">Resource 
lifecycles</a></li><li><a shape="rect" 
href="#JAX-RSBasics-Overviewoftheselectionalgorithm.">Overview of the selection 
algorithm.</a></li><ul><li><a shape="rect" 
href="#JAX-RSBasics-Selectingbetweenmultipleresourceclasses">Selecting between 
multiple resource classes</a></li><li><a shape="rect" 
href="#JAX-RSBasics-Selectingbetweenmultipleresourcemethods">Selec
 ting between multiple resource methods</a></li><li><a shape="rect" 
href="#JAX-RSBasics-Resourcemethodsandmediatypes">Resource methods and media 
types</a></li><li><a shape="rect" 
href="#JAX-RSBasics-Customselectionbetweenmultipleresources">Custom selection 
between multiple resources</a></li></ul><li><a shape="rect" 
href="#JAX-RSBasics-Contextannotations">Context annotations</a></li><ul><li><a 
shape="rect" href="#JAX-RSBasics-CustomContexts">Custom 
Contexts</a></li></ul><li><a shape="rect" 
href="#JAX-RSBasics-URIcalculationusingUriInfoandUriBuilder">URI calculation 
using UriInfo and UriBuilder</a></li><li><a shape="rect" 
href="#JAX-RSBasics-Annotationinheritance">Annotation 
inheritance</a></li><li><a shape="rect" 
href="#JAX-RSBasics-Subresourcelocators.">Sub-resource 
locators.</a></li><ul><li><a shape="rect" 
href="#JAX-RSBasics-Staticresolutionofsubresources">Static resolution of 
subresources</a></li></ul><li><a shape="rect" 
href="#JAX-RSBasics-MessageBodyProviders">Message Bo
 dy Providers</a></li><ul><li><a shape="rect" 
href="#JAX-RSBasics-CustomMessageBodyProviders">Custom Message Body 
Providers</a></li><li><a shape="rect" 
href="#JAX-RSBasics-Registeringcustomproviders">Registering custom 
providers</a></li></ul><li><a shape="rect" 
href="#JAX-RSBasics-Customizingmediatypesformessagebodyproviders">Customizing 
media types for message body providers</a></li><li><a shape="rect" 
href="#JAX-RSBasics-AdvancedHTTP">Advanced HTTP</a></li></ul></div>
 
 <h1><a shape="rect" name="JAX-RSBasics-Resourceclass"></a>Resource class</h1>
 
@@ -737,6 +737,40 @@ UriInfo, SecurityContext, HttpHeaders, P
 
 <p>Note that Providers and ContextResolver are likely to be of interest to 
message body providers rather than to the actual application code. You can also 
inject all the context types into @Resource annotated fields.</p>
 
+<h2><a shape="rect" name="JAX-RSBasics-CustomContexts"></a>Custom Contexts</h2>
+
+<p>Registering a custom <a shape="rect" class="external-link" 
href="http://svn.apache.org/repos/asf/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/ContextProvider.java";>ContextProvider</a>
 implementation such as <a shape="rect" class="external-link" 
href="http://svn.apache.org/repos/asf/cxf/trunk/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchContextProvider.java";>SearchContextProvider</a>
 lets attach Context annotations to arbitrary classes which can be helpful when 
some of the information representing the current request needs to be optimized 
or specialized, example:</p>
+
+<div class="code panel" style="border-width: 1px;"><div class="codeContent 
panelContent">
+<pre class="code-java">
+<span class="code-keyword">package</span> resources;
+<span class="code-keyword">import</span> 
org.apache.cxf.jaxrs.ext.search.SearchContext;
+@Path(<span class="code-quote">"/"</span>)
+<span class="code-keyword">public</span> class RootResource {
+    @Context
+    <span class="code-keyword">private</span>  SearchContext sc;
+    <span class="code-comment">// the <span class="code-keyword">rest</span> 
of the code
+</span>}
+</pre>
+</div></div> 
+
+<p>and</p>
+
+<div class="code panel" style="border-width: 1px;"><div class="codeContent 
panelContent">
+<pre class="code-xml">
+<span class="code-tag">&lt;jaxrs:server&gt;</span>
+  <span class="code-tag">&lt;serviceBeans&gt;</span>
+    <span class="code-tag">&lt;bean class=<span 
class="code-quote">"resources.RootResource"</span>/&gt;</span>
+  <span class="code-tag">&lt;/serviceBeans&gt;</span>
+  <span class="code-tag">&lt;jaxrs:providers&gt;</span>
+    <span class="code-tag">&lt;bean class=<span 
class="code-quote">"org.apache.cxf.jaxrs.ext.search.SearchContextProvider"</span>/&gt;</span>
+  <span class="code-tag">&lt;/jaxrs:providers&gt;</span>
+<span class="code-tag">&lt;/jaxrs:server&gt;</span>
+</pre>
+</div></div>
+
+<p>Note registering SearchContextProvider is a temporarily requirement, it 
will be auto-discovered in future CXF versions.</p>
+
 <h1><a shape="rect" 
name="JAX-RSBasics-URIcalculationusingUriInfoandUriBuilder"></a>URI calculation 
using UriInfo and UriBuilder</h1>
 
 <p>Mapping of a particular URI to a service that returns some resource is 
straightforward using the @Path annotation. However RESTful services are often 
connected: one service returns data that is used as the key in another service. 
Listing entities and accessing a particular entity is a typical example:</p>

Modified: websites/production/cxf/content/docs/jax-rs.html
==============================================================================
--- websites/production/cxf/content/docs/jax-rs.html (original)
+++ websites/production/cxf/content/docs/jax-rs.html Mon Apr 23 21:48:32 2012
@@ -125,7 +125,7 @@ Apache CXF -- JAX-RS
 
 
 <div>
-<ul><li><a shape="rect" 
href="#JAX-RS-Introduction">Introduction</a></li><li><a shape="rect" 
href="#JAX-RS-Projectsetupandconfiguration">Project setup and 
configuration</a></li><ul><li><a shape="rect" 
href="#JAX-RS-Migration">Migration</a></li><li><a shape="rect" 
href="#JAX-RS-Mavendependencies">Maven dependencies</a></li><li><a shape="rect" 
href="#JAX-RS-Settinguptheclasspath">Setting up the classpath</a></li><li><a 
shape="rect" href="#JAX-RS-CXFJAXRSbundle">CXF JAX-RS 
bundle</a></li></ul><li><a shape="rect" href="#JAX-RS-WhatisNew">What is 
New</a></li><li><a shape="rect" href="#JAX-RS-GettingStartedwithJAXRS">Getting 
Started with JAX-RS</a></li><ul><li><a shape="rect" 
href="#JAX-RS-UnderstandingtheBasics">Understanding the Basics</a></li><li><a 
shape="rect" href="#JAX-RS-SupportforDataBindings">Support for Data 
Bindings</a></li><li><a shape="rect" href="#JAX-RS-HowRequestURIisMatched">How 
Request URI is Matched</a></li><li><a shape="rect" 
href="#JAX-RS-ClientAPI">Client AP
 I</a></li><li><a shape="rect" 
href="#JAX-RS-Filters%2CInterceptorsandInvokers">Filters, Interceptors and 
Invokers</a></li><li><a shape="rect" 
href="#JAX-RS-ServicelistingsandWADLsupport">Service listings and WADL 
support</a></li><li><a shape="rect" 
href="#JAX-RS-ConfiguringJAXRSservices">Configuring JAX-RS 
services</a></li><li><a shape="rect" 
href="#JAX-RS-Debugging">Debugging</a></li><li><a shape="rect" 
href="#JAX-RS-Logging">Logging</a></li></ul><li><a shape="rect" 
href="#JAX-RS-AdvancedFeatures">Advanced Features</a></li><ul><li><a 
shape="rect" href="#JAX-RS-Multiparts">Multiparts</a></li><li><a shape="rect" 
href="#JAX-RS-SecureJAXRSservices">Secure JAX-RS services</a></li><li><a 
shape="rect" href="#JAX-RS-FailoverandLoadDistributionFeatures">Failover and 
Load Distribution Features</a></li><li><a shape="rect" 
href="#JAX-RS-Redirection">Redirection</a></li><li><a shape="rect" 
href="#JAX-RS-XSLTandXPath">XSLT and XPath</a></li><li><a shape="rect" 
href="#JAX-RS-ComplexSearch
 Queries">Complex Search Queries</a></li><li><a shape="rect" 
href="#JAX-RS-ModelViewControllersupport">Model-View-Controller 
support</a></li><li><a shape="rect" 
href="#JAX-RS-CombiningJAXWSandJAXRS">Combining JAX-WS and 
JAX-RS</a></li><li><a shape="rect" 
href="#JAX-RS-IntegrationwithDistributedOSGi">Integration with Distributed 
OSGi</a></li><li><a shape="rect" href="#JAX-RS-OtherAdvancedFeatures">Other 
Advanced Features</a></li></ul><li><a shape="rect" 
href="#JAX-RS-MavenPlugins">Maven Plugins</a></li><li><a shape="rect" 
href="#JAX-RS-Deployment">Deployment</a></li><li><a shape="rect" 
href="#JAX-RS-RESTfulResources">RESTful Resources</a></li><li><a shape="rect" 
href="#JAX-RS-Howtocontribute">How to contribute</a></li></ul></div>
+<ul><li><a shape="rect" 
href="#JAX-RS-Introduction">Introduction</a></li><li><a shape="rect" 
href="#JAX-RS-Projectsetupandconfiguration">Project setup and 
configuration</a></li><ul><li><a shape="rect" 
href="#JAX-RS-Migration">Migration</a></li><li><a shape="rect" 
href="#JAX-RS-Mavendependencies">Maven dependencies</a></li><ul><li><a 
shape="rect" href="#JAX-RS-CXF2.3.xCXF2.5.x">CXF 2.3.x - CXF 
2.5.x</a></li><li><a shape="rect" href="#JAX-RS-CXF2.6.x">CXF 
2.6.x</a></li></ul><li><a shape="rect" 
href="#JAX-RS-Settinguptheclasspath">Setting up the classpath</a></li><li><a 
shape="rect" href="#JAX-RS-CXFJAXRSbundle">CXF JAX-RS 
bundle</a></li></ul><li><a shape="rect" href="#JAX-RS-WhatisNew">What is 
New</a></li><li><a shape="rect" href="#JAX-RS-GettingStartedwithJAXRS">Getting 
Started with JAX-RS</a></li><ul><li><a shape="rect" 
href="#JAX-RS-UnderstandingtheBasics">Understanding the Basics</a></li><li><a 
shape="rect" href="#JAX-RS-SupportforDataBindings">Support for Data Bindings</a
 ></li><li><a shape="rect" href="#JAX-RS-HowRequestURIisMatched">How Request 
 >URI is Matched</a></li><li><a shape="rect" href="#JAX-RS-ClientAPI">Client 
 >API</a></li><li><a shape="rect" 
 >href="#JAX-RS-Filters%2CInterceptorsandInvokers">Filters, Interceptors and 
 >Invokers</a></li><li><a shape="rect" 
 >href="#JAX-RS-ServicelistingsandWADLsupport">Service listings and WADL 
 >support</a></li><li><a shape="rect" 
 >href="#JAX-RS-ConfiguringJAXRSservices">Configuring JAX-RS 
 >services</a></li><li><a shape="rect" 
 >href="#JAX-RS-Debugging">Debugging</a></li><li><a shape="rect" 
 >href="#JAX-RS-Logging">Logging</a></li></ul><li><a shape="rect" 
 >href="#JAX-RS-AdvancedFeatures">Advanced Features</a></li><ul><li><a 
 >shape="rect" href="#JAX-RS-Multiparts">Multiparts</a></li><li><a shape="rect" 
 >href="#JAX-RS-SecureJAXRSservices">Secure JAX-RS services</a></li><li><a 
 >shape="rect" href="#JAX-RS-FailoverandLoadDistributionFeatures">Failover and 
 >Load Distribution Features</a></li><li><a shape="rect" href="#JAX-R
 S-Redirection">Redirection</a></li><li><a shape="rect" 
href="#JAX-RS-XSLTandXPath">XSLT and XPath</a></li><li><a shape="rect" 
href="#JAX-RS-ComplexSearchQueries">Complex Search Queries</a></li><li><a 
shape="rect" href="#JAX-RS-ModelViewControllersupport">Model-View-Controller 
support</a></li><li><a shape="rect" 
href="#JAX-RS-CombiningJAXWSandJAXRS">Combining JAX-WS and 
JAX-RS</a></li><li><a shape="rect" 
href="#JAX-RS-IntegrationwithDistributedOSGi">Integration with Distributed 
OSGi</a></li><li><a shape="rect" href="#JAX-RS-OtherAdvancedFeatures">Other 
Advanced Features</a></li></ul><li><a shape="rect" 
href="#JAX-RS-MavenPlugins">Maven Plugins</a></li><li><a shape="rect" 
href="#JAX-RS-Deployment">Deployment</a></li><li><a shape="rect" 
href="#JAX-RS-RESTfulResources">RESTful Resources</a></li><li><a shape="rect" 
href="#JAX-RS-Howtocontribute">How to contribute</a></li></ul></div>
 
 <h1><a shape="rect" name="JAX-RS-Introduction"></a>Introduction</h1>
 
@@ -133,7 +133,7 @@ Apache CXF -- JAX-RS
 
 <p>CXF supports JAX-RS (<a shape="rect" class="external-link" 
href="http://jcp.org/en/jsr/detail?id=311"; rel="nofollow">JSR-311</a>), the 
Java API for RESTful Web Services. JAX-RS standardizes the way RESTful services 
can be developed in Java. </p>
 
-<p>CXF 2.5.x, 2.4.x and 2.3.x supports <a shape="rect" class="external-link" 
href="https://jsr311.dev.java.net/nonav/releases/1.1/index.html"; 
rel="nofollow">JSR-311 API 1.1</a> and is JAX-RS TCK 1.1 compliant.<br 
clear="none">
+<p>CXF 2.6.x, 2.5.x, 2.4.x and 2.3.x supports <a shape="rect" 
class="external-link" 
href="https://jsr311.dev.java.net/nonav/releases/1.1/index.html"; 
rel="nofollow">JSR-311 API 1.1</a> and is JAX-RS TCK 1.1 compliant.<br 
clear="none">
 The JAX-RS 1.1 specification may be found <a shape="rect" 
class="external-link" 
href="http://jcp.org/aboutJava/communityprocess/mrel/jsr311/index.html"; 
rel="nofollow">here</a></p>
 
 <p>CXF 2.2.x supports <a shape="rect" class="external-link" 
href="https://jsr311.dev.java.net/nonav/releases/1.0/index.html"; 
rel="nofollow">JSR-311 API 1.0 </a> and is JAX-RS TCK 1.0. compliant.<br 
clear="none">
@@ -151,16 +151,16 @@ The JAX-RS 1.0 specification may be foun
 
 <h2><a shape="rect" name="JAX-RS-Migration"></a>Migration</h2>
 
-<p><b>Migrating from 1.0 to 1.1</b></p>
+<p><b>Migrating from JAX-RS 1.0 to 1.1</b></p>
 
-<p>Existing JAX-RS 1.0 applications should run in CXF 2.4.x without any 
problems.<br clear="none">
+<p>Existing JAX-RS 1.0 applications should run in CXF starting from 2.3.x 
without any problems.<br clear="none">
 There have been just a few minor modifications at the JAX-RS API level:</p>
 <ul class="alternate" type="square"><li>The <a shape="rect" 
class="external-link" 
href="http://jsr311.java.net/nonav/releases/1.1/javax/ws/rs/ApplicationPath.html";
 rel="nofollow"><tt>@ApplicationPath</tt> annotation </a> has been added for 
JAX-RS Application subclasses</li><li>The <tt>Request</tt> interface has been 
updated with a new no-argument <tt>evaluatePreconditions</tt> method - existing 
applications which are already using the <tt>Request</tt> interface may need to 
be recompiled</li></ul>
 
 
 <h2><a shape="rect" name="JAX-RS-Mavendependencies"></a>Maven dependencies</h2>
 
-<p>To incorporate JAX-RS, you will need:</p>
+<h3><a shape="rect" name="JAX-RS-CXF2.3.xCXF2.5.x"></a>CXF 2.3.x - CXF 
2.5.x</h3>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent 
panelContent">
 <pre class="code-xml">
@@ -213,6 +213,46 @@ There have been just a few minor modific
 
 <p>Please check the <a shape="rect" class="external-link" 
href="http://svn.apache.org/repos/asf/cxf/trunk/rt/frontend/jaxrs/pom.xml";>pom.xml</a>
 for the list of cxf components used by the JAX-RS implementation. Snapshots 
are available from <a shape="rect" class="external-link" 
href="http://repository.apache.org/snapshots/org/apache/cxf/apache-cxf/";>http://repository.apache.org/snapshots/org/apache/cxf/apache-cxf/</a>.</p>
 
+<h3><a shape="rect" name="JAX-RS-CXF2.6.x"></a>CXF 2.6.x</h3>
+
+<p>Please check the <a shape="rect" 
href="http://cxf.apache.org/docs/26-migration-guide.html";>CXF 2.6 Migration 
Guide</a> for the information about all the changes affecting the JAX-RS users. 
Typically the frontend dependency should be enough:</p>
+
+<div class="code panel" style="border-width: 1px;"><div class="codeContent 
panelContent">
+<pre class="code-xml">
+   <span class="code-tag">&lt;dependency&gt;</span>
+      <span class="code-tag">&lt;groupId&gt;</span>org.apache.cxf<span 
class="code-tag">&lt;/groupId&gt;</span>
+      <span 
class="code-tag">&lt;artifactId&gt;</span>cxf-rt-frontend-jaxrs<span 
class="code-tag">&lt;/artifactId&gt;</span>
+      <span class="code-tag">&lt;version&gt;</span>2.5.0<span 
class="code-tag">&lt;/version&gt;</span>
+   <span class="code-tag">&lt;/dependency&gt;</span>
+</pre>
+</div></div>
+
+<p>Optional providers (including the default JSONProvider) are located in this 
module:</p>
+
+<div class="code panel" style="border-width: 1px;"><div class="codeContent 
panelContent">
+<pre class="code-xml">
+   <span class="code-tag">&lt;dependency&gt;</span>
+      <span class="code-tag">&lt;groupId&gt;</span>org.apache.cxf<span 
class="code-tag">&lt;/groupId&gt;</span>
+      <span 
class="code-tag">&lt;artifactId&gt;</span>cxf-rt-rs-extension-providers<span 
class="code-tag">&lt;/artifactId&gt;</span>
+      <span class="code-tag">&lt;version&gt;</span>2.5.0<span 
class="code-tag">&lt;/version&gt;</span>
+   <span class="code-tag">&lt;/dependency&gt;</span>
+</pre>
+</div></div>
+
+<p>The Search extension is now located in</p>
+
+<div class="code panel" style="border-width: 1px;"><div class="codeContent 
panelContent">
+<pre class="code-xml">
+   <span class="code-tag">&lt;dependency&gt;</span>
+      <span class="code-tag">&lt;groupId&gt;</span>org.apache.cxf<span 
class="code-tag">&lt;/groupId&gt;</span>
+      <span 
class="code-tag">&lt;artifactId&gt;</span>cxf-rt-rs-extension-search<span 
class="code-tag">&lt;/artifactId&gt;</span>
+      <span class="code-tag">&lt;version&gt;</span>2.5.0<span 
class="code-tag">&lt;/version&gt;</span>
+   <span class="code-tag">&lt;/dependency&gt;</span>
+</pre>
+</div></div>
+
+
+
 <h2><a shape="rect" name="JAX-RS-Settinguptheclasspath"></a>Setting up the 
classpath</h2>
 
 <p>If Maven is not used then the following JARs will need to be available at 
the runtime classpath.</p>


Reply via email to