cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r926226 [1/2] - in /websites/production/cxf/content: cache/docs.pageCache docs/jax-rs-data-bindings.html docs/jax-rs-search.html docs/tls-configuration.html docs/ws-securitypolicy.html
Date Mon, 20 Oct 2014 15:46:54 GMT
Author: buildbot
Date: Mon Oct 20 15:46:54 2014
New Revision: 926226

Log:
Production update by buildbot for cxf

Modified:
    websites/production/cxf/content/cache/docs.pageCache
    websites/production/cxf/content/docs/jax-rs-data-bindings.html
    websites/production/cxf/content/docs/jax-rs-search.html
    websites/production/cxf/content/docs/tls-configuration.html
    websites/production/cxf/content/docs/ws-securitypolicy.html

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

Modified: websites/production/cxf/content/docs/jax-rs-data-bindings.html
==============================================================================
--- websites/production/cxf/content/docs/jax-rs-data-bindings.html (original)
+++ websites/production/cxf/content/docs/jax-rs-data-bindings.html Mon Oct 20 15:46:54 2014
@@ -117,12 +117,12 @@ Apache CXF -- JAX-RS Data Bindings
          <td height="100%">
            <!-- Content -->
            <div class="wiki-content">
-<div id="ConfluenceContent"><p>&#160;</p><p>&#160;</p><p>&#160;</p><p></p><p><span class="inline-first-p" style="font-size:2em;font-weight:bold"> JAX-RS : Data Bindings </span></p><p></p><p>&#160;</p><p>&#160;</p><p>&#160;</p><p><style type="text/css">/*<![CDATA[*/
-div.rbtoc1408383987569 {padding: 0px;}
-div.rbtoc1408383987569 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1408383987569 li {margin-left: 0px;padding-left: 0px;}
+<div id="ConfluenceContent"><p>&#160;</p><p>&#160;</p><p>&#160;</p><p>&#160;<span class="inline-first-p" style="font-size:2em;font-weight:bold">JAX-RS : Data Bindings</span>&#160;</p><p>&#160;</p><p>&#160;</p><p>&#160;</p><p><style type="text/css">/*<![CDATA[*/
+div.rbtoc1413819985672 {padding: 0px;}
+div.rbtoc1413819985672 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1413819985672 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style></p><div class="toc-macro rbtoc1408383987569">
+/*]]>*/</style></p><div class="toc-macro rbtoc1413819985672">
 <ul class="toc-indentation"><li><a shape="rect" href="#JAX-RSDataBindings-JAXBsupport">JAXB support</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#JAX-RSDataBindings-ConfiguringJAXBprovider">Configuring JAXB provider</a></li><li><a shape="rect" href="#JAX-RSDataBindings-JAXBandMoxy">JAXB and Moxy</a></li></ul>
 </li><li><a shape="rect" href="#JAX-RSDataBindings-JSONsupport">JSON support</a>
@@ -131,7 +131,7 @@ div.rbtoc1408383987569 li {margin-left: 
 </li><li><a shape="rect" href="#JAX-RSDataBindings-Jackson">Jackson</a></li></ul>
 </li><li><a shape="rect" href="#JAX-RSDataBindings-CommonJAXBandJSONconfiguration">Common JAXB and JSON configuration</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#JAX-RSDataBindings-SingleJAXBContextandextrauserclasses">Single JAXBContext and extra user classes</a></li><li><a shape="rect" href="#JAX-RSDataBindings-AutomaticJAXBElementconversionduringserialization">Automatic JAXBElement conversion during serialization</a></li><li><a shape="rect" href="#JAX-RSDataBindings-HandlingJAXBbeanswithoutXmlRootElementannotations">Handling JAXB beans without XmlRootElement annotations</a></li><li><a shape="rect" href="#JAX-RSDataBindings-Handlingexplicitcollections">Handling explicit collections</a></li></ul>
-</li><li><a shape="rect" href="#JAX-RSDataBindings-CustomizingJAXBXMLandJSONinputandoutput">Customizing JAXB XML and JSON input and output</a></li><li><a shape="rect" href="#JAX-RSDataBindings-ControllingLargeJAXBXMLandJSONinputpayloads">Controlling Large JAXB XML and JSON input payloads</a></li><li><a shape="rect" href="#JAX-RSDataBindings-JSR-353JSONProcessing">JSR-353 JSON Processing</a></li><li><a shape="rect" href="#JAX-RSDataBindings-JSONWithPadding(JSONP)">JSON With Padding (JSONP)</a></li><li><a shape="rect" href="#JAX-RSDataBindings-Formpayloads">Form payloads</a></li><li><a shape="rect" href="#JAX-RSDataBindings-Atom">Atom</a></li><li><a shape="rect" href="#JAX-RSDataBindings-AegisDataBinding">Aegis Data Binding</a></li><li><a shape="rect" href="#JAX-RSDataBindings-XMLBeans">XMLBeans</a></li><li><a shape="rect" href="#JAX-RSDataBindings-CXFDataBindingsasJAX-RSproviders">CXF DataBindings as JAX-RS providers</a></li><li><a shape="rect" href="#JAX-RSDataBindings-JAXRSDataBind
 ing">JAXRS DataBinding</a></li><li><a shape="rect" href="#JAX-RSDataBindings-Schemavalidation">Schema validation</a>
+</li><li><a shape="rect" href="#JAX-RSDataBindings-CustomizingJAXBXMLandJSONinputandoutput">Customizing JAXB XML and JSON input and output</a></li><li><a shape="rect" href="#JAX-RSDataBindings-ControllingLargeJAXBXMLandJSONinputpayloads">Controlling Large JAXB XML and JSON input payloads</a></li><li><a shape="rect" href="#JAX-RSDataBindings-JSR-353JSONProcessing">JSR-353 JSON Processing</a></li><li><a shape="rect" href="#JAX-RSDataBindings-SimpleJsonMapObjectsupport">Simple JsonMapObject support</a></li><li><a shape="rect" href="#JAX-RSDataBindings-JSONWithPadding(JSONP)">JSON With Padding (JSONP)</a></li><li><a shape="rect" href="#JAX-RSDataBindings-Formpayloads">Form payloads</a></li><li><a shape="rect" href="#JAX-RSDataBindings-Atom">Atom</a></li><li><a shape="rect" href="#JAX-RSDataBindings-AegisDataBinding">Aegis Data Binding</a></li><li><a shape="rect" href="#JAX-RSDataBindings-XMLBeans">XMLBeans</a></li><li><a shape="rect" href="#JAX-RSDataBindings-CXFDataBindingsasJAX-RSprov
 iders">CXF DataBindings as JAX-RS providers</a></li><li><a shape="rect" href="#JAX-RSDataBindings-JAXRSDataBinding">JAXRS DataBinding</a></li><li><a shape="rect" href="#JAX-RSDataBindings-Schemavalidation">Schema validation</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#JAX-RSDataBindings-Supportforcatalogs">Support for catalogs</a></li><li><a shape="rect" href="#JAX-RSDataBindings-Outputvalidation">Output validation</a></li></ul>
 </li><li><a shape="rect" href="#JAX-RSDataBindings-BeanValidation">Bean Validation</a></li><li><a shape="rect" href="#JAX-RSDataBindings-FastInfoset">Fast Infoset</a></li></ul>
 </div><h1 id="JAX-RSDataBindings-JAXBsupport">JAXB support</h1><p>The request and response can be marshalled and unmarshalled to/from Java object using JAXB.</p><p>There's a number of ways to tell to the JAXB provider how objects can be serialized. The simplest way is to mark a given type with @XmlRootElement annotation.</p><p>For example:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
@@ -428,7 +428,7 @@ public JsonObject getBook(@PathParam(&qu
 public Response addBook(@Context final UriInfo uriInfo, JsonObject obj) {
     // Implementation here
 }]]></script>
-</div></div><p>The <strong>JsrJsonpProvider</strong> provider could be used on server side or on a client side. By default, the provider uses <a shape="rect" class="external-link" href="https://jsonp.java.net/" rel="nofollow">JSR-353 Java API for JSON Processing reference implementation</a> to read/write message bodies.</p><h1 id="JAX-RSDataBindings-JSONWithPadding(JSONP)">JSON With Padding (JSONP)</h1><p>One option for supporting "JSON With Padding" (<a shape="rect" class="external-link" href="http://en.wikipedia.org/wiki/JSONP" rel="nofollow">JSONP</a>) is to extend the default JSONProvider and override its writeTo method as follows:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+</div></div><p>The <strong>JsrJsonpProvider</strong> provider could be used on server side or on a client side. By default, the provider uses <a shape="rect" class="external-link" href="https://jsonp.java.net/" rel="nofollow">JSR-353 Java API for JSON Processing reference implementation</a> to read/write message bodies.</p><h1 id="JAX-RSDataBindings-SimpleJsonMapObjectsupport">Simple JsonMapObject support</h1><p>org.apache.cxf.jaxrs.provider.json.JsonMapObjectProvider is available starting from CXF 3.0.3 and CXF 3.1.0. This provider can read or write JSON into/from org.apache.cxf.jaxrs.provider.json.JsonMapObject which is a simple Map wrapper.</p><p>JsonMapObject can detect duplicate JSON sibling properties which can be useful in certain applications.</p><h1 id="JAX-RSDataBindings-JSONWithPadding(JSONP)">JSON With Padding (JSONP)</h1><p>One option for supporting "JSON With Padding" (<a shape="rect" class="external-link" href="http://en.wikipedia.org/wiki/JSONP" rel="nofollow">JSONP<
 /a>) is to extend the default JSONProvider and override its writeTo method as follows:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[@Produces(&quot;application/javascript&quot;)
 class JsonpProvider extends JSONProvider {
 		

Modified: websites/production/cxf/content/docs/jax-rs-search.html
==============================================================================
--- websites/production/cxf/content/docs/jax-rs-search.html (original)
+++ websites/production/cxf/content/docs/jax-rs-search.html Mon Oct 20 15:46:54 2014
@@ -118,11 +118,11 @@ Apache CXF -- JAX-RS Search
            <!-- Content -->
            <div class="wiki-content">
 <div id="ConfluenceContent"><h1 id="JAX-RSSearch-JAX-RSSearch">JAX-RS Search</h1><p>&#160;</p><p><style type="text/css">/*<![CDATA[*/
-div.rbtoc1410904000555 {padding: 0px;}
-div.rbtoc1410904000555 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1410904000555 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1413819985865 {padding: 0px;}
+div.rbtoc1413819985865 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1413819985865 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style></p><div class="toc-macro rbtoc1410904000555">
+/*]]>*/</style></p><div class="toc-macro rbtoc1413819985865">
 <ul class="toc-indentation"><li><a shape="rect" href="#JAX-RSSearch-JAX-RSSearch">JAX-RS Search</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#JAX-RSSearch-AdvancedSearchQueries">Advanced Search Queries</a></li><li><a shape="rect" href="#JAX-RSSearch-SupportedQueryLanguages">Supported Query Languages</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#JAX-RSSearch-FeedItemQueryLanguage">Feed Item Query Language</a></li><li><a shape="rect" href="#JAX-RSSearch-OpenDataProtocol">Open Data Protocol</a></li></ul>
@@ -138,7 +138,9 @@ div.rbtoc1410904000555 li {margin-left: 
 <ul class="toc-indentation"><li><a shape="rect" href="#JAX-RSSearch-Basicqueries">Basic queries</a></li><li><a shape="rect" href="#JAX-RSSearch-Complexqueries">Complex queries</a></li></ul>
 </li><li><a shape="rect" href="#JAX-RSSearch-Validation">Validation</a></li><li><a shape="rect" href="#JAX-RSSearch-Buildingthequeries">Building the queries</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#JAX-RSSearch-FIQL">FIQL</a></li><li><a shape="rect" href="#JAX-RSSearch-OData">OData</a></li></ul>
-</li><li><a shape="rect" href="#JAX-RSSearch-Usingdatesinqueries">Using dates in queries</a></li><li><a shape="rect" href="#JAX-RSSearch-Alternativequerylanguages">Alternative query languages</a></li></ul>
+</li><li><a shape="rect" href="#JAX-RSSearch-Usingdatesinqueries">Using dates in queries</a></li><li><a shape="rect" href="#JAX-RSSearch-Alternativequerylanguages">Alternative query languages</a></li><li><a shape="rect" href="#JAX-RSSearch-ContentExtraction">Content Extraction</a>
+<ul class="toc-indentation"><li><a shape="rect" href="#JAX-RSSearch-UsingTikaContentExtractor">Using&#160;TikaContentExtractor</a></li><li><a shape="rect" href="#JAX-RSSearch-UsingTikaLuceneContentExtractor">Using&#160;TikaLuceneContentExtractor</a></li></ul>
+</li></ul>
 </li></ul>
 </div><h2 id="JAX-RSSearch-AdvancedSearchQueries">Advanced Search Queries</h2><p>CXF supports mapping the advanced query expressions to the typed Search API with the help of query language specific parsers.&#160; &#160;</p><h2 id="JAX-RSSearch-SupportedQueryLanguages">Supported Query Languages</h2><h3 id="JAX-RSSearch-FeedItemQueryLanguage">Feed Item Query Language</h3><p><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) is supported since CXF 2.3.0.</p><p>For example, the following query</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[?_s=name==CXF;version=ge=2.2
@@ -515,7 +517,7 @@ filter.accept(jpa);
 long count = jpa.count();
 
 ]]></script>
-</div></div><p>&#160;</p><p>Second, <strong>only when using FIQL</strong>, a count extension can be used. For example, one may want to find 'all the books written by at least two authors or all the books with no reviews'.<br clear="none"> If a collection entity such as BookReview has a non primitive type, then typing "reviews==0" is all what is needed, otherwise a count extension needs to be used, for example: "count(authors)=ge=2"</p><h3 id="JAX-RSSearch-Lucene">Lucene</h3><p>Mapping of FIQL/OData expressions to Lucene (4.0.0-BETA) Query is supported starting from CXF 2.7.1.</p><p>org.apache.cxf.jaxrs.ext.search.lucene.LuceneQueryVisitor can be used to support the default (content) field or specific custom field queries.<br clear="none"> Queries for specific terms and phrases are supported.</p><p>Example, "find the documents containing a 'text' term":</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+</div></div><p>&#160;</p><p>Second, <strong>only when using FIQL</strong>, a count extension can be used. For example, one may want to find 'all the books written by at least two authors or all the books with no reviews'.<br clear="none"> If a collection entity such as BookReview has a non primitive type, then typing "reviews==0" is all what is needed, otherwise a count extension needs to be used, for example: "count(authors)=ge=2"</p><h3 id="JAX-RSSearch-Lucene">Lucene</h3><p>Mapping of FIQL/OData expressions to Lucene (4.0.0-BETA) Query is supported starting from CXF 2.7.1. Please notice that starting from CXF 3.0.2, the Lucene version has been upgraded to 4.9.0 in order to benefit from query builders and other improvements.</p><p>org.apache.cxf.jaxrs.ext.search.lucene.LuceneQueryVisitor can be used to support the default (content) field or specific custom field queries.<br clear="none"> Queries for specific terms and phrases are supported.</p><p>Example, "find the documents conta
 ining a 'text' term":</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[import org.apache.lucene.search.Query;
 
 SearchCondition&lt;SearchBean&gt; filter = new FiqlParser&lt;SearchBean&gt;(SearchBean.class).parse(&quot;ct==text&quot;);
@@ -531,7 +533,26 @@ lucene.visit(filter);
 org.apache.lucene.search.Query phraseQuery = lucene.getQuery();
 // use query
 ]]></script>
-</div></div><p>In this example, the visitor is requested to create Lucene org.apache.lucene.search.PhraseQuery against the specified contents field ("contents"). The visitor can also accept a contentsFieldMap map property when different phrases may need to be checked against different contents fields.</p><p>The current limitation is that no typed Date queries are supported yet (except for the equality match), for example, "find all the documents issued before a given date", to be supported shortly.</p><h3 id="JAX-RSSearch-LDAP">LDAP</h3><p>Mapping of FIQL/OData expressions to LDAP queries as defined by <a shape="rect" class="external-link" href="http://tools.ietf.org/html/rfc4515" rel="nofollow">RFC-4515</a> is supported starting from CXF 2.7.1 with the help of org.apache.cxf.jaxrs.ext.search.ldap.LdapQueryVisitor. Use this visitor when working with LDAP or OSGI.</p><p>Here is a summary of LDAP filter operators:</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><t
 h colspan="1" rowspan="1" class="confluenceTh"><p>Operator</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>"="</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Equal</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>"!"</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Not Equal</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>"&lt;="</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Less Or Equal</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>"&gt;="</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Greater or Equal</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>"&amp;"</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>AND</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>"|"</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>OR</p
 ></td></tr></tbody></table></div><p>FIQL "=le=" and "=lt=" will both map to "&lt;=", while "=ge=" and "=gt=" to "&gt;=".</p><p>For example:</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>FIQL</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>LDAP</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>"name==bar*"</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>"(name=bar*)"</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>"name!=bar"</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>"(!name=bar)"</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>"name!=bar;id=gt=10"</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>"(&amp;(!name=bar)(id&gt;=10))"</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>"name!=bar;(id=gt=10,id=lt=5)"</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>"(&amp;(!name
 =bar)(|(id&gt;=10)(id&lt;=5)))"</p></td></tr></tbody></table></div><p>The converter is created like all other converters:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+</div></div><p>In this example, the visitor is requested to create Lucene org.apache.lucene.search.PhraseQuery against the specified contents field ("contents"). The visitor can also accept a contentsFieldMap map property when different phrases may need to be checked against different contents fields.</p><p>Starting from CXF 3.0.2, the typed Date range queries are supported by LuceneQueryVisitor. However, this feature should be used together with 'primitiveFieldTypeMap' in order to hint the visitor which fields are temporal and should be treated as such in the filter expressions. For example:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[Map&lt; String, Class&lt; ? &gt; &gt; fieldTypes = new LinkedHashMap&lt; String, Class&lt; ? &gt; &gt;();
+fieldTypes.put( &quot;modified&quot;, Date.class);
+
+SearchCondition&lt;SearchBean&gt; filter = new FiqlParser&lt;SearchBean&gt;(SearchBean.class).parse(&quot;modified=gt=2007-09-16&quot;);
+LuceneQueryVisitor&lt;SearchBean&gt; lucene = new LuceneQueryVisitor&lt;SearchBean&gt;(&quot;ct&quot;, &quot;contents&quot;);
+lucene.setPrimitiveFieldTypeMap(fieldTypes);
+lucene.visit(filter);
+
+org.apache.lucene.search.Query query = lucene.getQuery();]]></script>
+</div></div><p>LuceneQueryVisitor supports wide range of date formats, still providing the option to customize it using 'search.date-format' property. This property accepts the date/time pattern expression in the SimpleDateFormat format. Also, since CXF 3.0.2, the LuceneQueryVisitor&#160; could be configured to use the Lucene analyzer. The reason to use analyzer is that during Lucene query construction the visitor can use the per-field filters and tokenizers, taking into account stemming, stop-worlds, lower-casing, etc., as such properly processing the filter expression. For example:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[Analyzer analyzer = new StandardAnalyzer(Version.LUCENE_4_9);
+
+// Lower-case filter and stop-words filter are part of the StandardAnalyzer
+SearchCondition&lt;SearchBean&gt; filter = new FiqlParser&lt;SearchBean&gt;(SearchBean.class).parse(&quot;contents==pears and APPLES&quot;);
+LuceneQueryVisitor&lt;SearchBean&gt; lucene = new LuceneQueryVisitor&lt;SearchBean&gt;(&quot;contents&quot;, analyzer);
+lucene.visit(filter);
+
+org.apache.lucene.search.Query query = lucene.getQuery();]]></script>
+</div></div><p>&#160;</p><h3 id="JAX-RSSearch-LDAP">LDAP</h3><p>Mapping of FIQL/OData expressions to LDAP queries as defined by <a shape="rect" class="external-link" href="http://tools.ietf.org/html/rfc4515" rel="nofollow">RFC-4515</a> is supported starting from CXF 2.7.1 with the help of org.apache.cxf.jaxrs.ext.search.ldap.LdapQueryVisitor. Use this visitor when working with LDAP or OSGI.</p><p>Here is a summary of LDAP filter operators:</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Operator</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>"="</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Equal</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>"!"</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Not Equal</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>
 "&lt;="</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Less Or Equal</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>"&gt;="</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Greater or Equal</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>"&amp;"</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>AND</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>"|"</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>OR</p></td></tr></tbody></table></div><p>FIQL "=le=" and "=lt=" will both map to "&lt;=", while "=ge=" and "=gt=" to "&gt;=".</p><p>For example:</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>FIQL</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>LDAP</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>"name==bar*"</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>"(name=ba
 r*)"</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>"name!=bar"</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>"(!name=bar)"</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>"name!=bar;id=gt=10"</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>"(&amp;(!name=bar)(id&gt;=10))"</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>"name!=bar;(id=gt=10,id=lt=5)"</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>"(&amp;(!name=bar)(|(id&gt;=10)(id&lt;=5)))"</p></td></tr></tbody></table></div><p>The converter is created like all other converters:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
 <script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[// FIQL &quot;oclass=Bar&quot;
 
 // map &#39;oclass&#39; used in the FIQL query to the actual property name, &#39;objectClass&#39;
@@ -916,7 +937,14 @@ FiqlSearchConditionBuilder bCustom = new
 String ret = bCustom.is(&quot;foo&quot;).equalTo(d).query();
 assertEquals(&quot;foo==2011-03-01T12:34:00&quot;, ret);
 ]]></script>
-</div></div><h2 id="JAX-RSSearch-Alternativequerylanguages">Alternative query languages</h2><p>Custom org.apache.cxf.jaxrs.ext.search.SearchConditionParser implementations can be registered as a "search.parser" contextual property starting from CXF 3.0.0-milestone2.</p></div>
+</div></div><h2 id="JAX-RSSearch-Alternativequerylanguages">Alternative query languages</h2><p>Custom org.apache.cxf.jaxrs.ext.search.SearchConditionParser implementations can be registered as a "search.parser" contextual property starting from CXF 3.0.0-milestone2.</p><h2 id="JAX-RSSearch-ContentExtraction">Content Extraction</h2><p>Starting from CXF 3.0.2, the content extraction support has been added in order to complement the search capabilites with text extraction from various document formats (PDF, ODF, DOC,TXT,RTF,...). It is based on Apache Tika and is available in two shapes: raw content extraction (TikaContentExtractor) and Lucene document content extraction (TikaLuceneContentExtractor).</p><h3 id="JAX-RSSearch-UsingTikaContentExtractor">Using&#160;TikaContentExtractor</h3><p>The purpose of Tika content extractor is to provide the essential support of text extraction from supported document formats. Additionally, the metadata is being extracted as well depending on the doc
 ument format (author, modified, created, pages, ...). The TikaContentExtractor accepts the list of supported parsers and returns the extracted metadata together with the desired extracted content format (by default raw text). For example:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[TikaContentExtractor extractor = new TikaContentExtractor(new PDFParser(), true);
+TikaContent content = extractor .extract( Files.newInputStream( new File( &quot;testPDF.pdf&quot; ).toPath() ) );]]></script>
+</div></div><p>By default, the TikaContentExtractor&#160; also performs the content type detection and validation, which could be turned off using the 'validateMediaType' constructor argument.</p><h3 id="JAX-RSSearch-UsingTikaLuceneContentExtractor">Using&#160;TikaLuceneContentExtractor</h3><p>The TikaLuceneContentExtractor is very similar to TikaContentExtractor but instead of raw content and metadata it returns prepared Lucene document. However, in order to properly create the Lucene document which is ready to be indexed, TikaLuceneContentExtractor&#160; accepts an additional parameter, LuceneDocumentMetadata, with the field types and type converters. For example:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[LuceneDocumentMetadata documentMetadata = new LuceneDocumentMetadata(&quot;contents&quot;).withField(&quot;modified&quot;, Date.class);
+TikaLuceneContentExtractor extractor = new TikaLuceneContentExtractor(new PDFParser(), true);
+Document document = extractor.extract( Files.newInputStream( new File( &quot;testPDF.pdf&quot; ).toPath() ), documentMetadata  );]]></script>
+</div></div><p>At this point, the document is ready to be analyzed and indexed. The TikaLuceneContentExtractor uses&#160;LuceneDocumentMetadata to create the properly typed document fields and currently supports DoubleField, FloatField, LongField, IntField,&#160;IntField,&#160;TextField (for content) and StringField (also used to store dates).</p><p>To demonstrate the full power of the CXF 3.0.2 content extraction and search capabiities, the demo project 'jax_rs_search' has been developed and is distributed in the samples bundle. The project could be found in the <a shape="rect" class="external-link" href="https://github.com/apache/cxf/tree/master/distribution/src/main/release/samples/jax_rs/search" rel="nofollow">official Apache CXF Github repository</a>. It integrates together Apache CXF, Apache Lucene and Apache Tika showing off some advanced features related to custom analyzers and different filter criteria (keyword and&#160; phrase search).</p><pre>&#160;</pre></div>
            </div>
            <!-- Content -->
          </td>

Modified: websites/production/cxf/content/docs/tls-configuration.html
==============================================================================
--- websites/production/cxf/content/docs/tls-configuration.html (original)
+++ websites/production/cxf/content/docs/tls-configuration.html Mon Oct 20 15:46:54 2014
@@ -116,12 +116,12 @@ Apache CXF -- TLS Configuration
          <td height="100%">
            <!-- Content -->
            <div class="wiki-content">
-<div id="ConfluenceContent"><style type="text/css">/*<![CDATA[*/
-div.rbtoc1396468203678 {padding: 0px;}
-div.rbtoc1396468203678 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1396468203678 li {margin-left: 0px;padding-left: 0px;}
+<div id="ConfluenceContent"><p><style type="text/css">/*<![CDATA[*/
+div.rbtoc1413819986046 {padding: 0px;}
+div.rbtoc1413819986046 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1413819986046 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style><div class="toc-macro rbtoc1396468203678">
+/*]]>*/</style></p><div class="toc-macro rbtoc1413819986046">
 <ul class="toc-indentation"><li><a shape="rect" href="#TLSConfiguration-TLSParameterscommontobothClientsandServers">TLS Parameters common to both Clients and Servers</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#TLSConfiguration-KeyManagers">Key Managers</a></li><li><a shape="rect" href="#TLSConfiguration-TrustManagers">Trust Managers</a></li><li><a shape="rect" href="#TLSConfiguration-CipherSuitesFilter">CipherSuites Filter</a></li><li><a shape="rect" href="#TLSConfiguration-CertConstraints">Cert Constraints</a></li></ul>
 </li><li><a shape="rect" href="#TLSConfiguration-ClientTLSParameters">Client TLS Parameters</a>
@@ -129,22 +129,8 @@ div.rbtoc1396468203678 li {margin-left: 
 </li><li><a shape="rect" href="#TLSConfiguration-ServerTLSParameters">Server TLS Parameters</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#TLSConfiguration-ClientAuthentication">Client Authentication</a></li></ul>
 </li></ul>
-</div>
-
-<h1 id="TLSConfiguration-TLSParameterscommontobothClientsandServers">TLS Parameters common to both Clients and Servers</h1>
-
-<p>The TLS Parameters common to both Clients and Servers are given <a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/cxf/trunk/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterBase.java">here</a>:</p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Attribute </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Default </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>keyManagers</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> JVM default Key Managers </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Key Managers to hold X509 certificates. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>trustManagers</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> JVM default Trust Managers </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> TrustManagers to validate peer X509 certificates. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>jsseProvider</code> </p></td><td colspan="1" rowspan="1" class=
 "confluenceTd"><p> JVM default provider associated with protocol </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> JSSE provider name. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>cipherSuites</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> JVM default cipher suites </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> CipherSuites that will be supported. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>cipherSuitesFilter</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> filters of the supported CipherSuites that will be supported and used if available. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>certConstraints</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Certificate Constrain
 ts specification. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>secureRandomParameters</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> JVM default Secure Random </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> SecureRandom specification. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>secureSocketProtocol</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> "TLS" </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Protocol Name. Most common example are "SSL", "TLS" or "TLSv1". </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>certAlias</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Cert alias to use. Useful when keystore has multiple certs. </p></td></tr></tbody></table></div>
-
-
-<h2 id="TLSConfiguration-KeyManagers">Key Managers</h2>
-
-<p>The Key Managers configuration item is used to retrieve key information. It is required for a Server, but is only required for a Client when the Server requires Client Authentication.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Key Manager sample</b></div><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-    &lt;httpj:tlsServerParameters&gt;
+</div><h1 id="TLSConfiguration-TLSParameterscommontobothClientsandServers">TLS Parameters common to both Clients and Servers</h1><p>The TLS Parameters common to both Clients and Servers are given <a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/cxf/trunk/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterBase.java">here</a>:</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Attribute</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>keyManagers</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>JVM default Key Managers</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Key Managers to hold X509 certificates.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>tru
 stManagers</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>JVM default Trust Managers</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>TrustManagers to validate peer X509 certificates.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>jsseProvider</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>JVM default provider associated with protocol</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>JSSE provider name.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>cipherSuites</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>JVM default cipher suites</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>CipherSuites that will be supported.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>cipherSuitesFilter</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td><td colspan="1" rowspan="1" class="confluenceTd
 "><p>filters of the supported CipherSuites that will be supported and used if available.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>certConstraints</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Certificate Constraints specification.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>secureRandomParameters</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>JVM default Secure Random</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>SecureRandom specification.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>secureSocketProtocol</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>"TLS"</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Protocol Name. Most common example are "SSL", "TLS" or "TLSv1".</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><co
 de>certAlias</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Cert alias to use. Useful when keystore has multiple certs.</p></td></tr></tbody></table></div><p>&#160;</p><p>Note that from CXF 3.0.3 and 2.7.14, the SSLv3 protocol is disabled on the service side (if Jetty is used) unless "SSLv3" is explicitly specified for the "secureSocketProtocol" parameter.</p><h2 id="TLSConfiguration-KeyManagers">Key Managers</h2><p>The Key Managers configuration item is used to retrieve key information. It is required for a Server, but is only required for a Client when the Server requires Client Authentication.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Key Manager sample</b></div><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[    &lt;httpj:tlsServerParameters&gt;
         ...
         &lt;sec:keyManagers keyPassword=&quot;stskpass&quot;&gt;
             &lt;sec:keyStore type=&quot;jks&quot; password=&quot;stsspass&quot; resource=&quot;stsstore.jks&quot; /&gt;
@@ -152,15 +138,8 @@ div.rbtoc1396468203678 li {margin-left: 
         ...
     &lt;/httpj:tlsServerParameters&gt;
 ]]></script>
-</div></div>
-
-<h2 id="TLSConfiguration-TrustManagers">Trust Managers</h2>
-
-<p>The Trust Managers configuration item is used to validate trust in peer X.509 certificates. It is required for both Servers and Clients. </p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Trust Manager sample</b></div><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-    &lt;httpj:tlsServerParameters&gt;
+</div></div><h2 id="TLSConfiguration-TrustManagers">Trust Managers</h2><p>The Trust Managers configuration item is used to validate trust in peer X.509 certificates. It is required for both Servers and Clients.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Trust Manager sample</b></div><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[    &lt;httpj:tlsServerParameters&gt;
         ...
         &lt;sec:trustManagers&gt;
             &lt;sec:keyStore type=&quot;jks&quot; password=&quot;stsspass&quot; resource=&quot;stsstore.jks&quot; /&gt;
@@ -168,36 +147,21 @@ div.rbtoc1396468203678 li {margin-left: 
         ...
     &lt;/httpj:tlsServerParameters&gt;
 ]]></script>
-</div></div>
-
-<h2 id="TLSConfiguration-CipherSuitesFilter">CipherSuites Filter</h2>
-
-<p>The CipherSuites Filter is used to either include or exclude particular CipherSuites.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>CipherSuites Filter sample</b></div><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-    &lt;httpj:tlsServerParameters&gt;
+</div></div><h2 id="TLSConfiguration-CipherSuitesFilter">CipherSuites Filter</h2><p>The CipherSuites Filter is used to either include or exclude particular CipherSuites. If no exclusion filter is specified, the default is to exclude all "NULL" and "anon" filters. CXF 3.1 will also exclude all "DES" filters.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>CipherSuites Filter sample</b></div><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[    &lt;httpj:tlsServerParameters&gt;
         ...
         &lt;sec:cipherSuitesFilter&gt;
             &lt;sec:include&gt;.*_EXPORT_.*&lt;/sec:include&gt;
             &lt;sec:include&gt;.*_EXPORT1024_.*&lt;/sec:include&gt;
             &lt;sec:include&gt;.*_WITH_DES_.*&lt;/sec:include&gt;
             &lt;sec:include&gt;.*_WITH_AES_.*&lt;/sec:include&gt;
-            &lt;sec:include&gt;.*_WITH_NULL_.*&lt;/sec:include&gt;
             &lt;sec:exclude&gt;.*_DH_anon_.*&lt;/sec:exclude&gt;
         &lt;/sec:cipherSuitesFilter&gt;
         ...
     &lt;/httpj:tlsServerParameters&gt;
 ]]></script>
-</div></div>
-
-<h2 id="TLSConfiguration-CertConstraints">Cert Constraints</h2>
-
-<p>Cert constraints can be used by either the client or server to impose constraints on the peer certificates. This can be done by specifying a set of regular expressions on either the Subject DN (Distinguished Name) or the Issuer DN (or both) of the certificate. A "combinator" attribute can also be specified for either the SubjectDNConstraints or IssuerDNConstraints Elements. This attribute can be either "ANY" or "ALL", and refers to whether any or all of the defined regular expressions should apply. The default value is "ALL".</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>CipherSuites Filter sample</b></div><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-    &lt;httpj:tlsServerParameters&gt;
+</div></div><h2 id="TLSConfiguration-CertConstraints">Cert Constraints</h2><p>Cert constraints can be used by either the client or server to impose constraints on the peer certificates. This can be done by specifying a set of regular expressions on either the Subject DN (Distinguished Name) or the Issuer DN (or both) of the certificate. A "combinator" attribute can also be specified for either the SubjectDNConstraints or IssuerDNConstraints Elements. This attribute can be either "ANY" or "ALL", and refers to whether any or all of the defined regular expressions should apply. The default value is "ALL".</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>CipherSuites Filter sample</b></div><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[    &lt;httpj:tlsServerParameters&gt;
         ...
         &lt;sec:certConstraints&gt;
             &lt;sec:SubjectDNConstraints&gt;
@@ -211,43 +175,14 @@ div.rbtoc1396468203678 li {margin-left: 
         ...
     &lt;/httpj:tlsServerParameters&gt;
 ]]></script>
-</div></div>
-
-
-<h1 id="TLSConfiguration-ClientTLSParameters">Client TLS Parameters</h1>
-
-<p>In addition to the TLS Parameters common to both Clients and Servers, there are some parameters that are <a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/cxf/trunk/core/src/main/java/org/apache/cxf/configuration/jsse/TLSClientParameters.java">specific</a> to Clients:</p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Attribute </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Default </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>disableCNCheck</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>false</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Indicates whether that the hostname given in the HTTPS URL will be checked against the service's Common Name (CN) given in its certificate during requests, and failing if there is a mismatch.  If set to <code>true</code> (<strong>not recommended for production use</strong>), such checks will be bypassed.  That will allow you, for example, to use a URL such as <code>localhost</code> during development. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>
 sslSocketFactory</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> A SSLSocketFactory to use. All other bean properties are ignored if this is set. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>sslCacheTimeout</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> 86400 seconds (24 hours) </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> SSL Cache Timeout in seconds. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>useHttpsURLConnectionDefaultSslSocketFactory</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>false</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> This attribute specifies if <a shape="rect" class="external-link" href="http://java.sun.com/javase/6/docs/api/javax/net/ssl/HttpsURLConnection.html#getDefaultSSLSocketFactory()" rel="nofollow">HttpsURLConnection.
 getDefaultSSLSocketFactory()</a> should be used to create https connections. If '<code>true</code>', '<code>jsseProvider</code>', '<code>secureSocketProtocol</code>', '<code>trustManagers</code>', '<code>keyManagers</code>', '<code>secureRandom</code>', '<code>cipherSuites</code>' and '<code>cipherSuitesFilter</code>' configuration parameters are ignored. </p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>useHttpsURLConnectionDefaultHostnameVerifier</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>false</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> This attribute specifies if <a shape="rect" class="external-link" href="http://java.sun.com/javase/6/docs/api/javax/net/ssl/HttpsURLConnection.html#getDefaultHostnameVerifier()" rel="nofollow">HttpsURLConnection.getDefaultHostnameVerifier()</a> should be used to create https connections. If '<code>true</code>', '<code>disableCNCheck</code>' configuration parameter 
 is ignored. </p></td></tr></tbody></table></div>
-
-
-<h2 id="TLSConfiguration-DisableCNCheck">Disable CN Check</h2>
-
-<p><code>disableCNCheck</code> is a parameterized boolean, you can use a fixed variable <code>true</code>|<code>false</code> as well as a <a shape="rect" class="external-link" href="http://static.springsource.org/spring/docs/3.0.x/spring-framework-reference/html/beans.html#beans-factory-placeholderconfigurer" rel="nofollow">Spring externalized property</a> variable (e.g. <code>${disable-https-hostname-verification</code>}) or a <a shape="rect" class="external-link" href="http://static.springsource.org/spring/docs/3.0.x/spring-framework-reference/html/expressions.html#expressions-beandef" rel="nofollow">Spring expression</a> (e.g. <code>#{systemProperties['dev-mode']</code>}).</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>HTTP conduit configuration disabling HTTP URL hostname verification (usage of localhost, etc)</b></div><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-   &lt;!-- deactivate HTTPS url hostname verification (localhost, etc)    --&gt;
+</div></div><h1 id="TLSConfiguration-ClientTLSParameters">Client TLS Parameters</h1><p>In addition to the TLS Parameters common to both Clients and Servers, there are some parameters that are <a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/cxf/trunk/core/src/main/java/org/apache/cxf/configuration/jsse/TLSClientParameters.java">specific</a> to Clients:</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Attribute</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>disableCNCheck</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Indicates whether that the hostname given in the HTTPS URL will be checked against the service's Common Nam
 e (CN) given in its certificate during requests, and failing if there is a mismatch. If set to <code>true</code> (<strong>not recommended for production use</strong>), such checks will be bypassed. That will allow you, for example, to use a URL such as <code>localhost</code> during development.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>sslSocketFactory</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>A SSLSocketFactory to use. All other bean properties are ignored if this is set.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>sslCacheTimeout</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>86400 seconds (24 hours)</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>SSL Cache Timeout in seconds.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>useHttpsURLConnectionDefaultSslSocketFactory</
 code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>This attribute specifies if <a shape="rect" class="external-link" href="http://java.sun.com/javase/6/docs/api/javax/net/ssl/HttpsURLConnection.html#getDefaultSSLSocketFactory()" rel="nofollow">HttpsURLConnection.getDefaultSSLSocketFactory()</a> should be used to create https connections. If '<code>true</code>', '<code>jsseProvider</code>', '<code>secureSocketProtocol</code>', '<code>trustManagers</code>', '<code>keyManagers</code>', '<code>secureRandom</code>', '<code>cipherSuites</code>' and '<code>cipherSuitesFilter</code>' configuration parameters are ignored.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>useHttpsURLConnectionDefaultHostnameVerifier</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><code>false</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>This attribute s
 pecifies if <a shape="rect" class="external-link" href="http://java.sun.com/javase/6/docs/api/javax/net/ssl/HttpsURLConnection.html#getDefaultHostnameVerifier()" rel="nofollow">HttpsURLConnection.getDefaultHostnameVerifier()</a> should be used to create https connections. If '<code>true</code>', '<code>disableCNCheck</code>' configuration parameter is ignored.</p></td></tr></tbody></table></div><h2 id="TLSConfiguration-DisableCNCheck">Disable CN Check</h2><p><code>disableCNCheck</code> is a parameterized boolean, you can use a fixed variable <code>true</code>|<code>false</code> as well as a <a shape="rect" class="external-link" href="http://static.springsource.org/spring/docs/3.0.x/spring-framework-reference/html/beans.html#beans-factory-placeholderconfigurer" rel="nofollow">Spring externalized property</a> variable (e.g. <code>${disable-https-hostname-verification</code>}) or a <a shape="rect" class="external-link" href="http://static.springsource.org/spring/docs/3.0.x/spring-frame
 work-reference/html/expressions.html#expressions-beandef" rel="nofollow">Spring expression</a> (e.g. <code>#{systemProperties['dev-mode']</code>}).</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>HTTP conduit configuration disabling HTTP URL hostname verification (usage of localhost, etc)</b></div><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[   &lt;!-- deactivate HTTPS url hostname verification (localhost, etc)    --&gt;
    &lt;!-- WARNING ! disableCNcheck=true should NOT be used in production --&gt;
    &lt;http-conf:tlsClientParameters disableCNCheck=&quot;true&quot; /&gt;
    ...
 ]]></script>
-</div></div>
-
-<h1 id="TLSConfiguration-ServerTLSParameters">Server TLS Parameters</h1>
-
-<p>In addition to the TLS Parameters common to both Clients and Servers, there are some parameters that are <a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/cxf/trunk/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParameters.java">specific</a> to Servers:</p>
-
-<div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p> Attribute </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Default </p></th><th colspan="1" rowspan="1" class="confluenceTh"><p> Description </p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p> <code>clientAuthentication</code> </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Not "wanted" or "required" </p></td><td colspan="1" rowspan="1" class="confluenceTd"><p> Allows you to configure whether client authentication is "wanted" and/or "required. </p></td></tr></tbody></table></div>
-
-
-<h2 id="TLSConfiguration-ClientAuthentication">Client Authentication</h2>
-
-<p>This allows you to define whether client authentication is wanted and/or required.</p>
-
-<div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Client Authentication sample</b></div><div class="codeContent panelContent pdl">
-<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-    &lt;httpj:tlsServerParameters&gt;
+</div></div><h1 id="TLSConfiguration-ServerTLSParameters">Server TLS Parameters</h1><p>In addition to the TLS Parameters common to both Clients and Servers, there are some parameters that are <a shape="rect" class="external-link" href="https://svn.apache.org/repos/asf/cxf/trunk/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParameters.java">specific</a> to Servers:</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Attribute</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Default</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p><code>clientAuthentication</code></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Not "wanted" or "required"</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Allows you to configure whether client authentication is "wanted" and/or "required.</p></td><
 /tr></tbody></table></div><h2 id="TLSConfiguration-ClientAuthentication">Client Authentication</h2><p>This allows you to define whether client authentication is wanted and/or required.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width: 1px;"><b>Client Authentication sample</b></div><div class="codeContent panelContent pdl">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[    &lt;httpj:tlsServerParameters&gt;
         ...
         &lt;sec:clientAuthentication want=&quot;true&quot; required=&quot;true&quot; /&gt;
         ...



Mime
View raw message