cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r867253 [44/46] - in /websites/production/cxf/content: ./ 2008/04/28/ 2008/06/20/ 2009/02/10/ 2009/08/04/ cache/ docs/ docs/cxf-architecture.thumbs/ docs/cxf-dependency-graphs.thumbs/ docs/logbrowser-configuration.thumbs/ docs/logbrowser-so...
Date Mon, 24 Jun 2013 17:10:57 GMT
Modified: websites/production/cxf/content/faq.html
==============================================================================
--- websites/production/cxf/content/faq.html (original)
+++ websites/production/cxf/content/faq.html Mon Jun 24 17:10:51 2013
@@ -25,6 +25,18 @@
 <meta http-equiv="Content-type" content="text/html;charset=UTF-8">
 <meta name="keywords" content="business integration, EAI, SOA, Service Oriented Architecture, web services, SOAP, JBI, JMS, WSDL, XML, EDI, Electronic Data Interchange, standards support, integration standards, application integration, middleware, software, solutions, services, CXF, open source">
 <meta name="description" content="Apache CXF, Services Framework - FAQ">
+
+  <link href='http://cxf.apache.org/resources/highlighter/styles/shCore.css' rel='stylesheet' type='text/css' />
+  <link href='http://cxf.apache.org/resources/highlighter/styles/shThemeCXF.css' rel='stylesheet' type='text/css' />
+  <script src='http://cxf.apache.org/resources/highlighter/scripts/shCore.js' type='text/javascript'></script>
+  <script src='http://cxf.apache.org/resources/highlighter/scripts/shBrushJava.js' type='text/javascript'></script>
+  <script src='http://cxf.apache.org/resources/highlighter/scripts/shBrushXml.js' type='text/javascript'></script>
+  
+  <script type="text/javascript">
+  SyntaxHighlighter.defaults['toolbar'] = false;
+  SyntaxHighlighter.all();
+  </script>
+ 
     <title>
 Apache CXF -- FAQ
     </title>
@@ -42,19 +54,15 @@ Apache CXF -- FAQ
     <td id="cell-1-0">&nbsp;</td>
     <td id="cell-1-1">&nbsp;</td>
     <td id="cell-1-2">
-      <div style="padding: 5px;">
-        <div id="banner">
-          <!-- Banner -->
-<div id="banner-content">
+      <!-- Banner -->
+<div class="banner" id="banner"><p>
 <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 Software Foundation"><img border="0" alt="ASF Logo" src="http://cxf.apache.org/images/asf-logo.png"></a>
 </td></tr></table>
-</div>
-          <!-- Banner -->
-        </div>
-      </div>
+</p></div>
+      <!-- Banner -->
       <div id="top-menu">
         <table border="0" cellpadding="1" cellspacing="0" width="100%">
           <tr>
@@ -101,8 +109,8 @@ Apache CXF -- FAQ
 
 
 <h3><a shape="rect" name="Navigation-Search"></a>Search</h3>
-
-<form enctype="application/x-www-form-urlencoded" method="get" id="cse-search-box" action="http://www.google.com/cse">
+<p>
+</p><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">
@@ -187,52 +195,52 @@ Apache CXF -- FAQ
 
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-List&lt;Header&gt; headers = <span class="code-keyword">new</span> ArrayList&lt;Header&gt;();
-Header dummyHeader = <span class="code-keyword">new</span> Header(<span class="code-keyword">new</span> QName(<span class="code-quote">"uri:org.apache.cxf"</span>, <span class="code-quote">"dummy"</span>), <span class="code-quote">"decapitated"</span>,
-                                <span class="code-keyword">new</span> JAXBDataBinding(<span class="code-object">String</span>.class));
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+List&lt;Header&gt; headers = new ArrayList&lt;Header&gt;();
+Header dummyHeader = new Header(new QName("uri:org.apache.cxf", "dummy"), "decapitated",
+                                new JAXBDataBinding(String.class));
 headers.add(dummyHeader);
 
-<span class="code-comment">//server side:
-</span>context.getMessageContext().put(Header.HEADER_LIST, headers);
+//server side:
+context.getMessageContext().put(Header.HEADER_LIST, headers);
 
-<span class="code-comment">//client side:
-</span>((BindingProvider)proxy).getRequestContext().put(Header.HEADER_LIST, headers);
-</pre>
+//client side:
+((BindingProvider)proxy).getRequestContext().put(Header.HEADER_LIST, headers);
+]]></script>
 </div></div>
 
 <h3><a shape="rect" name="FAQ-HowcanIturnonschemavalidationforjaxwsendpoint%3F"></a>How can I turn on schema validation for jaxws endpoint?</h3>
 <p>For the client side</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-xml">
-    &lt;jaxws:client name=<span class="code-quote">"{http://apache.org/hello_world_soap_http}SoapPort"</span>
-        createdFromAPI=<span class="code-quote">"true"</span>&gt;
-        <span class="code-tag">&lt;jaxws:properties&gt;</span>
-            <span class="code-tag">&lt;entry key=<span class="code-quote">"schema-validation-enabled"</span> value=<span class="code-quote">"true"</span> /&gt;</span>
-        <span class="code-tag">&lt;/jaxws:properties&gt;</span>
-    <span class="code-tag">&lt;/jaxws:client&gt;</span>
-</pre>
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+    &lt;jaxws:client name="{http://apache.org/hello_world_soap_http}SoapPort"
+        createdFromAPI="true"&gt;
+        &lt;jaxws:properties&gt;
+            &lt;entry key="schema-validation-enabled" value="true" /&gt;
+        &lt;/jaxws:properties&gt;
+    &lt;/jaxws:client&gt;
+]]></script>
 </div></div>
 
 <p>You may also do this programmatically:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-((BindingProvider)port).getRequestContext().put(<span class="code-quote">"schema-validation-enabled"</span>, <span class="code-quote">"<span class="code-keyword">true</span>"</span>); 
-</pre>
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+((BindingProvider)port).getRequestContext().put("schema-validation-enabled", "true"); 
+]]></script>
 </div></div>
 
 <p>For the server side</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-    &lt;jaxws:endpoint name=<span class="code-quote">"{http:<span class="code-comment">//apache.org/hello_world_soap_http}SoapPort"</span>
-</span>        wsdlLocation=<span class="code-quote">"wsdl/hello_world.wsdl"</span>
-        createdFromAPI=<span class="code-quote">"<span class="code-keyword">true</span>"</span>&gt;
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+    &lt;jaxws:endpoint name="{http://apache.org/hello_world_soap_http}SoapPort"
+        wsdlLocation="wsdl/hello_world.wsdl"
+        createdFromAPI="true"&gt;
         &lt;jaxws:properties&gt;
-            &lt;entry key=<span class="code-quote">"schema-validation-enabled"</span> value=<span class="code-quote">"<span class="code-keyword">true</span>"</span> /&gt;
+            &lt;entry key="schema-validation-enabled" value="true" /&gt;
         &lt;/jaxws:properties&gt;
     &lt;/jaxws:endpoint&gt;
-</pre>
+]]></script>
 </div></div>
 
 <p>Starting with CXF 2.3 you have the additional option of using the org.apache.cxf.annotations.SchemaValidation annotation.</p>
@@ -245,9 +253,9 @@ headers.add(dummyHeader);
 
 <ul><li>Use of ((BindingProvider)proxy).getRequestContext() - per JAX-WS spec, the request context is PER INSTANCE.   Thus, anything set there will affect requests on other threads.   With CXF, you can do:
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-((BindingProvider)proxy).getRequestContext().put(<span class="code-quote">"thread.local.request.context"</span>, <span class="code-quote">"<span class="code-keyword">true</span>"</span>);
-</pre>
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+((BindingProvider)proxy).getRequestContext().put("thread.local.request.context", "true");
+]]></script>
 </div></div>
 <p>and future calls to getRequestContext() will use a thread local request context.   That allows the request context to be threadsafe.   (Note: the response context is always thread local in CXF)</p></li></ul>
 
@@ -277,23 +285,23 @@ headers.add(dummyHeader);
 
 <p><b>Reason:</b> When using Spring AOP, spring injects a proxy to the bean into CXF instead of the actual bean.   The Proxy does not have the annotations on it (like the @WebService annotation) so we cannot query the information directly from the object like we can in the non-AOP case.   The "fix" is to also specify the actual serviceClass of the object in the spring config:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
 &lt;jaxws:server 
-      id=<span class="code-quote">"myService"</span> 
-      serviceClass=<span class="code-quote">"my.<span class="code-keyword">package</span>.MyServiceImpl"</span> 
-      serviceBean=<span class="code-quote">"#myServiceImpl"</span> 
-      address=<span class="code-quote">"/MyService"</span> /&gt; 
-</pre>
+      id="myService" 
+      serviceClass="my.package.MyServiceImpl" 
+      serviceBean="#myServiceImpl" 
+      address="/MyService" /&gt; 
+]]></script>
 </div></div>
 <p>or:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-xml">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 &lt;jaxws:endpoint
-      id=<span class="code-quote">"myService"</span> 
-      implementorClass=<span class="code-quote">"my.package.MyServiceImpl"</span> 
-      implementor=<span class="code-quote">"#myServiceImpl"</span> 
-      address=<span class="code-quote">"/MyService"</span> /&gt; 
-</pre>
+      id="myService" 
+      implementorClass="my.package.MyServiceImpl" 
+      implementor="#myServiceImpl" 
+      address="/MyService" /&gt; 
+]]></script>
 </div></div>
 </div>
            </div>

Modified: websites/production/cxf/content/fediz-architecture.html
==============================================================================
--- websites/production/cxf/content/fediz-architecture.html (original)
+++ websites/production/cxf/content/fediz-architecture.html Mon Jun 24 17:10:51 2013
@@ -25,6 +25,8 @@
 <meta http-equiv="Content-type" content="text/html;charset=UTF-8">
 <meta name="keywords" content="business integration, EAI, SOA, Service Oriented Architecture, web services, SOAP, JBI, JMS, WSDL, XML, EDI, Electronic Data Interchange, standards support, integration standards, application integration, middleware, software, solutions, services, CXF, open source">
 <meta name="description" content="Apache CXF, Services Framework - Fediz Architecture">
+
+
     <title>
 Apache CXF -- Fediz Architecture
     </title>
@@ -42,19 +44,15 @@ Apache CXF -- Fediz Architecture
     <td id="cell-1-0">&nbsp;</td>
     <td id="cell-1-1">&nbsp;</td>
     <td id="cell-1-2">
-      <div style="padding: 5px;">
-        <div id="banner">
-          <!-- Banner -->
-<div id="banner-content">
+      <!-- Banner -->
+<div class="banner" id="banner"><p>
 <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 Software Foundation"><img border="0" alt="ASF Logo" src="http://cxf.apache.org/images/asf-logo.png"></a>
 </td></tr></table>
-</div>
-          <!-- Banner -->
-        </div>
-      </div>
+</p></div>
+      <!-- Banner -->
       <div id="top-menu">
         <table border="0" cellpadding="1" cellspacing="0" width="100%">
           <tr>
@@ -101,8 +99,8 @@ Apache CXF -- Fediz Architecture
 
 
 <h3><a shape="rect" name="Navigation-Search"></a>Search</h3>
-
-<form enctype="application/x-www-form-urlencoded" method="get" id="cse-search-box" action="http://www.google.com/cse">
+<p>
+</p><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">

Modified: websites/production/cxf/content/fediz-configuration.html
==============================================================================
--- websites/production/cxf/content/fediz-configuration.html (original)
+++ websites/production/cxf/content/fediz-configuration.html Mon Jun 24 17:10:51 2013
@@ -25,6 +25,18 @@
 <meta http-equiv="Content-type" content="text/html;charset=UTF-8">
 <meta name="keywords" content="business integration, EAI, SOA, Service Oriented Architecture, web services, SOAP, JBI, JMS, WSDL, XML, EDI, Electronic Data Interchange, standards support, integration standards, application integration, middleware, software, solutions, services, CXF, open source">
 <meta name="description" content="Apache CXF, Services Framework - Fediz Configuration">
+
+  <link href='http://cxf.apache.org/resources/highlighter/styles/shCore.css' rel='stylesheet' type='text/css' />
+  <link href='http://cxf.apache.org/resources/highlighter/styles/shThemeCXF.css' rel='stylesheet' type='text/css' />
+  <script src='http://cxf.apache.org/resources/highlighter/scripts/shCore.js' type='text/javascript'></script>
+  <script src='http://cxf.apache.org/resources/highlighter/scripts/shBrushJava.js' type='text/javascript'></script>
+  <script src='http://cxf.apache.org/resources/highlighter/scripts/shBrushXml.js' type='text/javascript'></script>
+  
+  <script type="text/javascript">
+  SyntaxHighlighter.defaults['toolbar'] = false;
+  SyntaxHighlighter.all();
+  </script>
+ 
     <title>
 Apache CXF -- Fediz Configuration
     </title>
@@ -42,19 +54,15 @@ Apache CXF -- Fediz Configuration
     <td id="cell-1-0">&nbsp;</td>
     <td id="cell-1-1">&nbsp;</td>
     <td id="cell-1-2">
-      <div style="padding: 5px;">
-        <div id="banner">
-          <!-- Banner -->
-<div id="banner-content">
+      <!-- Banner -->
+<div class="banner" id="banner"><p>
 <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 Software Foundation"><img border="0" alt="ASF Logo" src="http://cxf.apache.org/images/asf-logo.png"></a>
 </td></tr></table>
-</div>
-          <!-- Banner -->
-        </div>
-      </div>
+</p></div>
+      <!-- Banner -->
       <div id="top-menu">
         <table border="0" cellpadding="1" cellspacing="0" width="100%">
           <tr>
@@ -101,8 +109,8 @@ Apache CXF -- Fediz Configuration
 
 
 <h3><a shape="rect" name="Navigation-Search"></a>Search</h3>
-
-<form enctype="application/x-www-form-urlencoded" method="get" id="cse-search-box" action="http://www.google.com/cse">
+<p>
+</p><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">
@@ -144,27 +152,27 @@ Apache CXF -- Fediz Configuration
 <h3><a shape="rect" name="FedizConfiguration-Example"></a>Example</h3>
 <p>The following example shows the minimum configuration for Fediz.</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-xml">
-<span class="code-tag">&lt;?xml version=<span class="code-quote">"1.0"</span> encoding=<span class="code-quote">"UTF-8"</span> standalone=<span class="code-quote">"yes"</span>?&gt;</span>
-<span class="code-tag">&lt;FedizConfig&gt;</span>
-    <span class="code-tag">&lt;contextConfig name=<span class="code-quote">"/fedizhelloworld"</span>&gt;</span>
-        <span class="code-tag">&lt;audienceUris&gt;</span>
-            <span class="code-tag">&lt;audienceItem&gt;</span>https://localhost:8443/fedizhelloworld<span class="code-tag">&lt;/audienceItem&gt;</span>
-        <span class="code-tag">&lt;/audienceUris&gt;</span>
-        <span class="code-tag">&lt;certificateStores&gt;</span>
-            <span class="code-tag">&lt;trustManager&gt;</span>
-                <span class="code-tag">&lt;keyStore file=<span class="code-quote">"conf/stsstore.jks"</span> password=<span class="code-quote">"stsspass"</span> type=<span class="code-quote">"JKS"</span> /&gt;</span>
-            <span class="code-tag">&lt;/trustManager&gt;</span>
-        <span class="code-tag">&lt;/certificateStores&gt;</span>
-        <span class="code-tag">&lt;trustedIssuers&gt;</span>
-            <span class="code-tag">&lt;issuer name=<span class="code-quote">"issuer 1"</span> certificateValidation=<span class="code-quote">"ChainTrust"</span> subject=<span class="code-quote">".*CN=www.sts.com.*"</span> /&gt;</span>
-        <span class="code-tag">&lt;/trustedIssuers&gt;</span>
-        <span class="code-tag">&lt;protocol <span class="code-keyword">xmlns:xsi</span>=<span class="code-quote">"http://www.w3.org/2001/XMLSchema-instance"</span> xsi:type=<span class="code-quote">"federationProtocolType"</span> version=<span class="code-quote">"1.2"</span>&gt;</span>
-            <span class="code-tag">&lt;issuer&gt;</span>https://localhost:9443/fediz-idp/<span class="code-tag">&lt;/issuer&gt;</span>
-        <span class="code-tag">&lt;/protocol&gt;</span>
-    <span class="code-tag">&lt;/contextConfig&gt;</span>
-<span class="code-tag">&lt;/FedizConfig&gt;</span>
-</pre>
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+&lt;?xml version="1.0" encoding="UTF-8" standalone="yes"?&gt;
+&lt;FedizConfig&gt;
+    &lt;contextConfig name="/fedizhelloworld"&gt;
+        &lt;audienceUris&gt;
+            &lt;audienceItem&gt;https://localhost:8443/fedizhelloworld&lt;/audienceItem&gt;
+        &lt;/audienceUris&gt;
+        &lt;certificateStores&gt;
+            &lt;trustManager&gt;
+                &lt;keyStore file="conf/stsstore.jks" password="stsspass" type="JKS" /&gt;
+            &lt;/trustManager&gt;
+        &lt;/certificateStores&gt;
+        &lt;trustedIssuers&gt;
+            &lt;issuer name="issuer 1" certificateValidation="ChainTrust" subject=".*CN=www.sts.com.*" /&gt;
+        &lt;/trustedIssuers&gt;
+        &lt;protocol xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="federationProtocolType" version="1.2"&gt;
+            &lt;issuer&gt;https://localhost:9443/fediz-idp/&lt;/issuer&gt;
+        &lt;/protocol&gt;
+    &lt;/contextConfig&gt;
+&lt;/FedizConfig&gt;
+]]></script>
 </div></div>
 
 <p>The protocol element declares that the WS-Federation protocol is being used. The issuer element shows the URL to which authenticated requests will be redirected with a SignIn request.  </p>
@@ -215,39 +223,39 @@ See example <a shape="rect" class="exter
 <p>The following example defines the required claims and configures a custom callback handler to define some configuration values at runtime.</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-xml">
-<span class="code-tag">&lt;?xml version=<span class="code-quote">"1.0"</span> encoding=<span class="code-quote">"UTF-8"</span> standalone=<span class="code-quote">"yes"</span>?&gt;</span>
-<span class="code-tag">&lt;FedizConfig&gt;</span>
-    <span class="code-tag">&lt;contextConfig name=<span class="code-quote">"/fedizhelloworld"</span>&gt;</span>
-        <span class="code-tag">&lt;audienceUris&gt;</span>
-            <span class="code-tag">&lt;audienceItem&gt;</span>https://localhost:8443/fedizhelloworld<span class="code-tag">&lt;/audienceItem&gt;</span>
-        <span class="code-tag">&lt;/audienceUris&gt;</span>
-        <span class="code-tag">&lt;certificateStores&gt;</span>
-            <span class="code-tag">&lt;keyStore file=<span class="code-quote">"conf/stsstore.jks"</span> password=<span class="code-quote">"stsspass"</span> type=<span class="code-quote">"file"</span> /&gt;</span>
-        <span class="code-tag">&lt;/certificateStores&gt;</span>
-        <span class="code-tag">&lt;maximumClockSkew&gt;</span>10<span class="code-tag">&lt;/maximumClockSkew&gt;</span>
-        <span class="code-tag">&lt;trustedIssuers&gt;</span>
-            <span class="code-tag">&lt;issuer name=<span class="code-quote">"issuer 1"</span> certificateValidation=<span class="code-quote">"ChainTrust"</span> subject=<span class="code-quote">".*CN=www.sts.com.*"</span> /&gt;</span>
-        <span class="code-tag">&lt;/trustedIssuers&gt;</span>
-        <span class="code-tag">&lt;signingKey keyPassword=<span class="code-quote">"tompass"</span>&gt;</span>
-            <span class="code-tag">&lt;keyStore file=<span class="code-quote">"tomcatKeystore.jks"</span> password=<span class="code-quote">"tompass"</span> type=<span class="code-quote">"JKS"</span> /&gt;</span>
-        <span class="code-tag">&lt;/signingKey&gt;</span>
-        <span class="code-tag">&lt;protocol <span class="code-keyword">xmlns:xsi</span>=<span class="code-quote">"http://www.w3.org/2001/XMLSchema-instance"</span> xsi:type=<span class="code-quote">"federationProtocolType"</span> version=<span class="code-quote">"1.2"</span>&gt;</span>
-            <span class="code-tag">&lt;issuer&gt;</span>https://localhost:9443/fediz-idp/<span class="code-tag">&lt;/issuer&gt;</span>
-            <span class="code-tag">&lt;roleDelimiter&gt;</span>,<span class="code-tag">&lt;/roleDelimiter&gt;</span>
-            <span class="code-tag">&lt;roleURI&gt;</span>http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role<span class="code-tag">&lt;/roleURI&gt;</span>
-            <span class="code-tag">&lt;claimTypesRequested&gt;</span>
-                <span class="code-tag">&lt;claimType type=<span class="code-quote">"http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role"</span> optional=<span class="code-quote">"true"</span> /&gt;</span>
-            <span class="code-tag">&lt;/claimTypesRequested&gt;</span>
-            <span class="code-tag">&lt;authenticationType type=<span class="code-quote">"String"</span> value=<span class="code-quote">"http://docs.oasis-open.org/wsfed/authorization/200706/authntypes/smartcard"</span> /&gt;</span>
-            <span class="code-tag">&lt;homeRealm type=<span class="code-quote">"Class"</span> value=<span class="code-quote">"example.HomeRealmCallbackHandler"</span> /&gt;</span>
-            <span class="code-tag">&lt;tokenValidators&gt;</span>
-                <span class="code-tag">&lt;validator&gt;</span>org.apache.cxf.fediz.core.CustomValidator<span class="code-tag">&lt;/validator&gt;</span>
-            <span class="code-tag">&lt;/tokenValidators&gt;</span>
-        <span class="code-tag">&lt;/protocol&gt;</span>
-    <span class="code-tag">&lt;/contextConfig&gt;</span>
-<span class="code-tag">&lt;/FedizConfig&gt;</span>
-</pre>
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+&lt;?xml version="1.0" encoding="UTF-8" standalone="yes"?&gt;
+&lt;FedizConfig&gt;
+    &lt;contextConfig name="/fedizhelloworld"&gt;
+        &lt;audienceUris&gt;
+            &lt;audienceItem&gt;https://localhost:8443/fedizhelloworld&lt;/audienceItem&gt;
+        &lt;/audienceUris&gt;
+        &lt;certificateStores&gt;
+            &lt;keyStore file="conf/stsstore.jks" password="stsspass" type="file" /&gt;
+        &lt;/certificateStores&gt;
+        &lt;maximumClockSkew&gt;10&lt;/maximumClockSkew&gt;
+        &lt;trustedIssuers&gt;
+            &lt;issuer name="issuer 1" certificateValidation="ChainTrust" subject=".*CN=www.sts.com.*" /&gt;
+        &lt;/trustedIssuers&gt;
+        &lt;signingKey keyPassword="tompass"&gt;
+            &lt;keyStore file="tomcatKeystore.jks" password="tompass" type="JKS" /&gt;
+        &lt;/signingKey&gt;
+        &lt;protocol xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="federationProtocolType" version="1.2"&gt;
+            &lt;issuer&gt;https://localhost:9443/fediz-idp/&lt;/issuer&gt;
+            &lt;roleDelimiter&gt;,&lt;/roleDelimiter&gt;
+            &lt;roleURI&gt;http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role&lt;/roleURI&gt;
+            &lt;claimTypesRequested&gt;
+                &lt;claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role" optional="true" /&gt;
+            &lt;/claimTypesRequested&gt;
+            &lt;authenticationType type="String" value="http://docs.oasis-open.org/wsfed/authorization/200706/authntypes/smartcard" /&gt;
+            &lt;homeRealm type="Class" value="example.HomeRealmCallbackHandler" /&gt;
+            &lt;tokenValidators&gt;
+                &lt;validator&gt;org.apache.cxf.fediz.core.CustomValidator&lt;/validator&gt;
+            &lt;/tokenValidators&gt;
+        &lt;/protocol&gt;
+    &lt;/contextConfig&gt;
+&lt;/FedizConfig&gt;
+]]></script>
 </div></div></div>
            </div>
            <!-- Content -->

Modified: websites/production/cxf/content/fediz-downloads.html
==============================================================================
--- websites/production/cxf/content/fediz-downloads.html (original)
+++ websites/production/cxf/content/fediz-downloads.html Mon Jun 24 17:10:51 2013
@@ -25,6 +25,17 @@
 <meta http-equiv="Content-type" content="text/html;charset=UTF-8">
 <meta name="keywords" content="business integration, EAI, SOA, Service Oriented Architecture, web services, SOAP, JBI, JMS, WSDL, XML, EDI, Electronic Data Interchange, standards support, integration standards, application integration, middleware, software, solutions, services, CXF, open source">
 <meta name="description" content="Apache CXF, Services Framework - Fediz Downloads">
+
+  <link href='http://cxf.apache.org/resources/highlighter/styles/shCore.css' rel='stylesheet' type='text/css' />
+  <link href='http://cxf.apache.org/resources/highlighter/styles/shThemeCXF.css' rel='stylesheet' type='text/css' />
+  <script src='http://cxf.apache.org/resources/highlighter/scripts/shCore.js' type='text/javascript'></script>
+  <script src='http://cxf.apache.org/resources/highlighter/scripts/shBrushJava.js' type='text/javascript'></script>
+  
+  <script type="text/javascript">
+  SyntaxHighlighter.defaults['toolbar'] = false;
+  SyntaxHighlighter.all();
+  </script>
+ 
     <title>
 Apache CXF -- Fediz Downloads
     </title>
@@ -42,19 +53,15 @@ Apache CXF -- Fediz Downloads
     <td id="cell-1-0">&nbsp;</td>
     <td id="cell-1-1">&nbsp;</td>
     <td id="cell-1-2">
-      <div style="padding: 5px;">
-        <div id="banner">
-          <!-- Banner -->
-<div id="banner-content">
+      <!-- Banner -->
+<div class="banner" id="banner"><p>
 <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 Software Foundation"><img border="0" alt="ASF Logo" src="http://cxf.apache.org/images/asf-logo.png"></a>
 </td></tr></table>
-</div>
-          <!-- Banner -->
-        </div>
-      </div>
+</p></div>
+      <!-- Banner -->
       <div id="top-menu">
         <table border="0" cellpadding="1" cellspacing="0" width="100%">
           <tr>
@@ -101,8 +108,8 @@ Apache CXF -- Fediz Downloads
 
 
 <h3><a shape="rect" name="Navigation-Search"></a>Search</h3>
-
-<form enctype="application/x-www-form-urlencoded" method="get" id="cse-search-box" action="http://www.google.com/cse">
+<p>
+</p><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">
@@ -152,23 +159,23 @@ Apache CXF -- Fediz Downloads
 
 <p>You can check the OpenPGP signature with:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
 gpg --verify apache-fediz-*.zip.asc
-</pre>
+]]></script>
 </div></div>
 
 <p>You can check the MD5 checksum with:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
 md5sum --check apache-fediz-*.zip.md5
-</pre>
+]]></script>
 </div></div>
 
 <p>You can check the SHA1 checksum with:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
 sha1sum --check apache-fediz-*.zip.sha1
-</pre>
+]]></script>
 </div></div>
 
 <h1><a shape="rect" name="FedizDownloads-Previousreleases"></a>Previous releases</h1>

Modified: websites/production/cxf/content/fediz-extensions.html
==============================================================================
--- websites/production/cxf/content/fediz-extensions.html (original)
+++ websites/production/cxf/content/fediz-extensions.html Mon Jun 24 17:10:51 2013
@@ -25,6 +25,17 @@
 <meta http-equiv="Content-type" content="text/html;charset=UTF-8">
 <meta name="keywords" content="business integration, EAI, SOA, Service Oriented Architecture, web services, SOAP, JBI, JMS, WSDL, XML, EDI, Electronic Data Interchange, standards support, integration standards, application integration, middleware, software, solutions, services, CXF, open source">
 <meta name="description" content="Apache CXF, Services Framework - Fediz Extensions">
+
+  <link href='http://cxf.apache.org/resources/highlighter/styles/shCore.css' rel='stylesheet' type='text/css' />
+  <link href='http://cxf.apache.org/resources/highlighter/styles/shThemeCXF.css' rel='stylesheet' type='text/css' />
+  <script src='http://cxf.apache.org/resources/highlighter/scripts/shCore.js' type='text/javascript'></script>
+  <script src='http://cxf.apache.org/resources/highlighter/scripts/shBrushJava.js' type='text/javascript'></script>
+  
+  <script type="text/javascript">
+  SyntaxHighlighter.defaults['toolbar'] = false;
+  SyntaxHighlighter.all();
+  </script>
+ 
     <title>
 Apache CXF -- Fediz Extensions
     </title>
@@ -42,19 +53,15 @@ Apache CXF -- Fediz Extensions
     <td id="cell-1-0">&nbsp;</td>
     <td id="cell-1-1">&nbsp;</td>
     <td id="cell-1-2">
-      <div style="padding: 5px;">
-        <div id="banner">
-          <!-- Banner -->
-<div id="banner-content">
+      <!-- Banner -->
+<div class="banner" id="banner"><p>
 <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 Software Foundation"><img border="0" alt="ASF Logo" src="http://cxf.apache.org/images/asf-logo.png"></a>
 </td></tr></table>
-</div>
-          <!-- Banner -->
-        </div>
-      </div>
+</p></div>
+      <!-- Banner -->
       <div id="top-menu">
         <table border="0" cellpadding="1" cellspacing="0" width="100%">
           <tr>
@@ -101,8 +108,8 @@ Apache CXF -- Fediz Extensions
 
 
 <h3><a shape="rect" name="Navigation-Search"></a>Search</h3>
-
-<form enctype="application/x-www-form-urlencoded" method="get" id="cse-search-box" action="http://www.google.com/cse">
+<p>
+</p><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">
@@ -155,37 +162,37 @@ Apache CXF -- Fediz Extensions
 <p>Here is a snippet of the configuration to configure a CallbackHandler:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
 ...
-        &lt;protocol xmlns:xsi=<span class="code-quote">"http:<span class="code-comment">//www.w3.org/2001/XMLSchema-instance"</span> xsi:type=<span class="code-quote">"federationProtocolType"</span> version=<span class="code-quote">"1.2"</span>&gt;
-</span>            ...
-            &lt;homeRealm type=<span class="code-quote">"<span class="code-object">Class</span>"</span> value=<span class="code-quote">"MyCallbackHandler "</span> /&gt;
+        &lt;protocol xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="federationProtocolType" version="1.2"&gt;
+            ...
+            &lt;homeRealm type="Class" value="MyCallbackHandler " /&gt;
             ...
         &lt;/protocol&gt;
 ...
-</pre>
+]]></script>
 </div></div>
 
 <p>And a sample implementation of the CallbackHandler:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-<span class="code-keyword">public</span> class MyCallbackHandler <span class="code-keyword">implements</span> CallbackHandler {
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+public class MyCallbackHandler implements CallbackHandler {
     
-    <span class="code-keyword">public</span> void handle(Callback[] callbacks) <span class="code-keyword">throws</span> IOException, UnsupportedCallbackException {
-        <span class="code-keyword">for</span> (<span class="code-object">int</span> i = 0; i &lt; callbacks.length; i++) {
-            <span class="code-keyword">if</span> (callbacks[i] <span class="code-keyword">instanceof</span> HomeRealmCallback) {
+    public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
+        for (int i = 0; i &lt; callbacks.length; i++) {
+            if (callbacks[i] instanceof HomeRealmCallback) {
                 HomeRealmCallback callback = (HomeRealmCallback) callbacks[i];
                 HttpServletRequest request = callback.getRequest();
-                <span class="code-object">String</span> homeRealm = ...
+                String homeRealm = ...
                 callback.setHomeRealm(homeRealm);
-            } <span class="code-keyword">else</span> {
-                <span class="code-keyword">throw</span> <span class="code-keyword">new</span> UnsupportedCallbackException(callbacks[i], <span class="code-quote">"Unrecognized Callback"</span>);
+            } else {
+                throw new UnsupportedCallbackException(callbacks[i], "Unrecognized Callback");
             }
         }
     }
 }
-</pre>
+]]></script>
 </div></div>
 
 

Modified: websites/production/cxf/content/fediz-idp.html
==============================================================================
--- websites/production/cxf/content/fediz-idp.html (original)
+++ websites/production/cxf/content/fediz-idp.html Mon Jun 24 17:10:51 2013
@@ -25,6 +25,18 @@
 <meta http-equiv="Content-type" content="text/html;charset=UTF-8">
 <meta name="keywords" content="business integration, EAI, SOA, Service Oriented Architecture, web services, SOAP, JBI, JMS, WSDL, XML, EDI, Electronic Data Interchange, standards support, integration standards, application integration, middleware, software, solutions, services, CXF, open source">
 <meta name="description" content="Apache CXF, Services Framework - Fediz IDP">
+
+  <link href='http://cxf.apache.org/resources/highlighter/styles/shCore.css' rel='stylesheet' type='text/css' />
+  <link href='http://cxf.apache.org/resources/highlighter/styles/shThemeCXF.css' rel='stylesheet' type='text/css' />
+  <script src='http://cxf.apache.org/resources/highlighter/scripts/shCore.js' type='text/javascript'></script>
+  <script src='http://cxf.apache.org/resources/highlighter/scripts/shBrushJava.js' type='text/javascript'></script>
+  <script src='http://cxf.apache.org/resources/highlighter/scripts/shBrushXml.js' type='text/javascript'></script>
+  
+  <script type="text/javascript">
+  SyntaxHighlighter.defaults['toolbar'] = false;
+  SyntaxHighlighter.all();
+  </script>
+ 
     <title>
 Apache CXF -- Fediz IDP
     </title>
@@ -42,19 +54,15 @@ Apache CXF -- Fediz IDP
     <td id="cell-1-0">&nbsp;</td>
     <td id="cell-1-1">&nbsp;</td>
     <td id="cell-1-2">
-      <div style="padding: 5px;">
-        <div id="banner">
-          <!-- Banner -->
-<div id="banner-content">
+      <!-- Banner -->
+<div class="banner" id="banner"><p>
 <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 Software Foundation"><img border="0" alt="ASF Logo" src="http://cxf.apache.org/images/asf-logo.png"></a>
 </td></tr></table>
-</div>
-          <!-- Banner -->
-        </div>
-      </div>
+</p></div>
+      <!-- Banner -->
       <div id="top-menu">
         <table border="0" cellpadding="1" cellspacing="0" width="100%">
           <tr>
@@ -101,8 +109,8 @@ Apache CXF -- Fediz IDP
 
 
 <h3><a shape="rect" name="Navigation-Search"></a>Search</h3>
-
-<form enctype="application/x-www-form-urlencoded" method="get" id="cse-search-box" action="http://www.google.com/cse">
+<p>
+</p><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">
@@ -151,19 +159,19 @@ Apache CXF -- Fediz IDP
 <p>To start and stop this second Tomcat instance, it is perhaps easiest to create small startup.sh and shutdown.sh scripts that temporarily redefine $CATALINA_HOME from the first to the second instance, for example:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
 CATALINA_HOME=/path/to/second/tomcat
 $CATALINA_HOME/bin/startup.sh
-</pre>
+]]></script>
 </div></div>
 
 <p>and</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
 CATALINA_HOME=/path/to/second/tomcat
 $CATALINA_HOME/bin/shutdown.sh
-</pre>
+]]></script>
 </div></div>
 
 <p>If you're using the one Tomcat with multiple instance option, it's $CATALINA_BASE instead that will need to be redefined above.</p>
@@ -178,29 +186,29 @@ $CATALINA_HOME/bin/shutdown.sh
 <p>Here is a sample snippet for showing the configuration of the above three values:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-xml">
-<span class="code-tag">&lt;Server port=<span class="code-quote">"9005"</span> shutdown=<span class="code-quote">"SHUTDOWN"</span>&gt;</span>
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+&lt;Server port="9005" shutdown="SHUTDOWN"&gt;
 ...
 
-   <span class="code-tag"><span class="code-comment">&lt;!-- http configuration --&gt;</span></span>
-   &lt;Connector port=<span class="code-quote">"9080"</span> protocol=<span class="code-quote">"HTTP/1.1"</span>
-        connectionTimeout=<span class="code-quote">"20000"</span>
-        redirectPort=<span class="code-quote">"9443"</span> /&gt;
+   &lt;!-- http configuration --&gt;
+   &lt;Connector port="9080" protocol="HTTP/1.1"
+        connectionTimeout="20000"
+        redirectPort="9443" /&gt;
 
    ...
 
-   <span class="code-tag"><span class="code-comment">&lt;!-- https configuration --&gt;</span></span>
-   &lt;Connector port=<span class="code-quote">"9443"</span> protocol=<span class="code-quote">"HTTP/1.1"</span> SSLEnabled=<span class="code-quote">"true"</span>
-        maxThreads=<span class="code-quote">"150"</span> scheme=<span class="code-quote">"https"</span> secure=<span class="code-quote">"true"</span>
-        keystoreFile=<span class="code-quote">"tomcat-idp.jks"</span>
-        keystorePass=<span class="code-quote">"tompass"</span> sslProtocol=<span class="code-quote">"TLS"</span> /&gt;
+   &lt;!-- https configuration --&gt;
+   &lt;Connector port="9443" protocol="HTTP/1.1" SSLEnabled="true"
+        maxThreads="150" scheme="https" secure="true"
+        keystoreFile="tomcat-idp.jks"
+        keystorePass="tompass" sslProtocol="TLS" /&gt;
    ...
  
-   <span class="code-tag">&lt;Connector port=<span class="code-quote">"9009"</span> protocol=<span class="code-quote">"AJP/1.3"</span> redirectPort=<span class="code-quote">"9443"</span> /&gt;</span>
+   &lt;Connector port="9009" protocol="AJP/1.3" redirectPort="9443" /&gt;
 
 ...
-<span class="code-tag">&lt;/Server&gt;</span>
-</pre>
+&lt;/Server&gt;
+]]></script>
 </div></div>
 
 <p>The keystoreFile is relative to $CATALINA_HOME. See <a shape="rect" class="external-link" href="http://tomcat.apache.org/tomcat-7.0-doc/ssl-howto.html">here</a> for the Tomcat 7 configuration reference. This page also describes how to create certificates.  Sample Tomcat keystores (not for production use, but useful for demoing Fediz and running the sample applications) are provided in the examples/samplekeys folder of the Fediz distribution.</p>
@@ -220,44 +228,44 @@ $CATALINA_HOME/bin/shutdown.sh
 
 <p>The users and passwords are configured in a Spring configuration file in <tt>webapps/fediz-idp-sts/WEB-INF/passwords.xml</tt>. The following users are already configured and can easily be extended.</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-xml">
-    <span class="code-tag">&lt;util:map id=<span class="code-quote">"passwords"</span>&gt;</span>
-        &lt;entry key=<span class="code-quote">"alice"</span>
-            value=<span class="code-quote">"ecila"</span> /&gt;
-        &lt;entry key=<span class="code-quote">"bob"</span>
-            value=<span class="code-quote">"bob"</span> /&gt;
-        &lt;entry key=<span class="code-quote">"ted"</span>
-            value=<span class="code-quote">"det"</span> /&gt;
-    <span class="code-tag">&lt;/util:map&gt;</span>
-</pre>
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+    &lt;util:map id="passwords"&gt;
+        &lt;entry key="alice"
+            value="ecila" /&gt;
+        &lt;entry key="bob"
+            value="bob" /&gt;
+        &lt;entry key="ted"
+            value="det" /&gt;
+    &lt;/util:map&gt;
+]]></script>
 </div></div>
 
 <h5><a shape="rect" name="FedizIDP-UserClaims"></a>User Claims</h5>
 
 <p>The claims of each user are configured in a spring configuration file <tt>webapps/fediz-idp-sts/WEB-INF/userClaims.xml</tt>. The following claims are already configured:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-xml">
-    <span class="code-tag">&lt;util:map id=<span class="code-quote">"userClaims"</span>&gt;</span>
-        &lt;entry key=<span class="code-quote">"alice"</span>
-            value-ref=<span class="code-quote">"aliceClaims"</span> /&gt;
-        &lt;entry key=<span class="code-quote">"bob"</span>
-            value-ref=<span class="code-quote">"bobClaims"</span> /&gt;
-        &lt;entry key=<span class="code-quote">"ted"</span>
-            value-ref=<span class="code-quote">"tedClaims"</span> /&gt;
-    <span class="code-tag">&lt;/util:map&gt;</span>
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+    &lt;util:map id="userClaims"&gt;
+        &lt;entry key="alice"
+            value-ref="aliceClaims" /&gt;
+        &lt;entry key="bob"
+            value-ref="bobClaims" /&gt;
+        &lt;entry key="ted"
+            value-ref="tedClaims" /&gt;
+    &lt;/util:map&gt;
    
-    <span class="code-tag">&lt;util:map id=<span class="code-quote">"aliceClaims"</span>&gt;</span>
-        &lt;entry key=<span class="code-quote">"http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname"</span>
-            value=<span class="code-quote">"Alice"</span> /&gt;
-        &lt;entry key=<span class="code-quote">"http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname"</span>
-            value=<span class="code-quote">"Smith"</span> /&gt;
-        &lt;entry key=<span class="code-quote">"http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress"</span>
-            value=<span class="code-quote">"alice@mycompany.org"</span> /&gt;
-        &lt;entry key=<span class="code-quote">"http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role"</span>
-            value=<span class="code-quote">"user"</span> /&gt;
+    &lt;util:map id="aliceClaims"&gt;
+        &lt;entry key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname"
+            value="Alice" /&gt;
+        &lt;entry key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname"
+            value="Smith" /&gt;
+        &lt;entry key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress"
+            value="alice@mycompany.org" /&gt;
+        &lt;entry key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role"
+            value="user" /&gt;
            
-    <span class="code-tag">&lt;/util:map&gt;</span>
-</pre>
+    &lt;/util:map&gt;
+]]></script>
 </div></div>
 
 <p>The claim id's are configured according to Section 7.5 in the specification <a shape="rect" class="external-link" href="http://docs.oasis-open.org/imi/identity/v1.0/identity.html" rel="nofollow">Identity Metasystem Interoperability</a>. The mapping of claims to a SAML attribute statement are described in Section 7.2.</p>
@@ -267,19 +275,19 @@ $CATALINA_HOME/bin/shutdown.sh
 <p>The required claims per relying party are configured in the <tt>webapps/fediz-idp/WEB-INF/RPClaims.xml</tt>. The XML file has the following structure:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-xml">
-    <span class="code-tag">&lt;util:map id=<span class="code-quote">"realm2ClaimsMap"</span>&gt;</span>
-        &lt;entry key=<span class="code-quote">"https://localhost:8443/fedizhelloworld/"</span>
-            value-ref=<span class="code-quote">"claimsWsfedhelloworld"</span> /&gt;
-    <span class="code-tag">&lt;/util:map&gt;</span>
-
-    <span class="code-tag">&lt;util:list id=<span class="code-quote">"claimsWsfedhelloworld"</span>&gt;</span>
-        <span class="code-tag">&lt;value&gt;</span>http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname<span class="code-tag">&lt;/value&gt;</span>
-        <span class="code-tag">&lt;value&gt;</span>http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname<span class="code-tag">&lt;/value&gt;</span>
-        <span class="code-tag">&lt;value&gt;</span>http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress<span class="code-tag">&lt;/value&gt;</span>
-        <span class="code-tag">&lt;value&gt;</span>http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role<span class="code-tag">&lt;/value&gt;</span>
-    <span class="code-tag">&lt;/util:list&gt;</span>   
-</pre>
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+    &lt;util:map id="realm2ClaimsMap"&gt;
+        &lt;entry key="https://localhost:8443/fedizhelloworld/"
+            value-ref="claimsWsfedhelloworld" /&gt;
+    &lt;/util:map&gt;
+
+    &lt;util:list id="claimsWsfedhelloworld"&gt;
+        &lt;value&gt;http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname&lt;/value&gt;
+        &lt;value&gt;http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname&lt;/value&gt;
+        &lt;value&gt;http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress&lt;/value&gt;
+        &lt;value&gt;http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role&lt;/value&gt;
+    &lt;/util:list&gt;   
+]]></script>
 </div></div>
 
 <p>The key of each map entry must match with the <tt>wtrealm</tt> paramater in the redirect triggered by the relying party. The required claims for the different type of applications are grouped in beans which are a list of Strings as illustrated in <tt>claimsWsfedhelloworld</tt>.</p>
@@ -297,15 +305,15 @@ $CATALINA_HOME/bin/shutdown.sh
 <p>WSS4J supports username/password authentication using JAAS. The JDK provides a JAAS LoginModule for LDAP which can be configured as illustrated here in a sample jaas configuration (jaas.config):</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
 myldap {
  com.sun.security.auth.module.LdapLoginModule REQUIRED
- userProvider=ldap:<span class="code-comment">//ldap.mycompany.org:389/OU=Users,DC=mycompany,DC=org"
-</span> authIdentity=<span class="code-quote">"cn={USERNAME},OU=Users,DC=mycompany,DC=org"</span>
- useSSL=<span class="code-keyword">false</span>
- debug=<span class="code-keyword">true</span>;
+ userProvider=ldap://ldap.mycompany.org:389/OU=Users,DC=mycompany,DC=org"
+ authIdentity="cn={USERNAME},OU=Users,DC=mycompany,DC=org"
+ useSSL=false
+ debug=true;
 };
-</pre>
+]]></script>
 </div></div>
 
 <p>You can get more information about this LoginModule <a shape="rect" class="external-link" href="http://download.oracle.com/javase/6/docs/jre/api/security/jaas/spec/com/sun/security/auth/module/LdapLoginModule.html" rel="nofollow">here</a>.</p>
@@ -313,37 +321,37 @@ myldap {
 <p>In this example, all the users are stored in the organization unit Users within mycompany.org. The configuration filename can be chosen, e.g. <tt>jaas.config</tt>. The filename must be configured as a JVM argument. JVM related configurations for Tomcat can be done in the file <tt>setenv.sh/bat</tt> located in directory <tt>tomcat/bin</tt>. This script is called implicitly by <tt>catalina.bat/sh</tt> and might look like this for UNIX:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
 #!/bin/sh
-JAVA_OPTS=<span class="code-quote">"-Djava.security.auth.login.config=/opt/tomcat/conf/jaas.config"</span>
+JAVA_OPTS="-Djava.security.auth.login.config=/opt/tomcat/conf/jaas.config"
 export JAVA_OPTS
-</pre>
+]]></script>
 </div></div>
 
 <p>Next, the STS endpoint has to be configured to use the JAAS LoginModule which is accomplished by the <tt>JAASUsernameTokenValidator</tt>.</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-xml">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 &lt;bean
-  class=<span class="code-quote">"org.apache.ws.security.validate.JAASUsernameTokenValidator"</span>
-      id=<span class="code-quote">"jaasUTValidator"</span>&gt;
-   <span class="code-tag">&lt;property name=<span class="code-quote">"contextName"</span> value=<span class="code-quote">"myldap"</span>/&gt;</span>
-<span class="code-tag">&lt;/bean&gt;</span>
-
-&lt;jaxws:endpoint id=<span class="code-quote">"transportSTSUT"</span>
-  endpointName=<span class="code-quote">"ns1:TransportUT_Port"</span>
-  serviceName=<span class="code-quote">"ns1:SecurityTokenService"</span>
-  <span class="code-keyword">xmlns:ns1</span>=http://docs.oasis-open.org/ws-sx/ws-trust/200512/
-  wsdlLocation=<span class="code-quote">"/WEB-INF/wsdl/ws-trust-1.4-service.wsdl"</span>
-  address=<span class="code-quote">"/STSServiceTransportUT"</span>
-  implementor=<span class="code-quote">"#transportSTSProviderBean"</span>&gt;
-
-  <span class="code-tag">&lt;jaxws:properties&gt;</span>
-    &lt;entry key=<span class="code-quote">"ws-security.ut.validator"</span>
-         value-ref=<span class="code-quote">"jaasUTValidator"</span>/&gt;
-  <span class="code-tag">&lt;/jaxws:properties&gt;</span>
-<span class="code-tag">&lt;/jaxws:endpoint&gt;</span>
-</pre>
+  class="org.apache.ws.security.validate.JAASUsernameTokenValidator"
+      id="jaasUTValidator"&gt;
+   &lt;property name="contextName" value="myldap"/&gt;
+&lt;/bean&gt;
+
+&lt;jaxws:endpoint id="transportSTSUT"
+  endpointName="ns1:TransportUT_Port"
+  serviceName="ns1:SecurityTokenService"
+  xmlns:ns1=http://docs.oasis-open.org/ws-sx/ws-trust/200512/
+  wsdlLocation="/WEB-INF/wsdl/ws-trust-1.4-service.wsdl"
+  address="/STSServiceTransportUT"
+  implementor="#transportSTSProviderBean"&gt;
+
+  &lt;jaxws:properties&gt;
+    &lt;entry key="ws-security.ut.validator"
+         value-ref="jaasUTValidator"/&gt;
+  &lt;/jaxws:properties&gt;
+&lt;/jaxws:endpoint&gt;
+]]></script>
 </div></div>
 
 <p>The property <tt>contextName</tt> must match the context name defined in the JAAS configuration file which is <tt>myldap</tt> in this example.</p>
@@ -357,46 +365,46 @@ export JAVA_OPTS
 <p>The following example illustrate the changes to be made in <tt>webapps/fediz-idp-sts/WEB-INF/cxf-transport.xml</tt>:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-xml">
-<span class="code-tag">&lt;util:list id=<span class="code-quote">"claimHandlerList"</span>&gt;</span>
-  <span class="code-tag">&lt;ref bean=<span class="code-quote">"ldapClaimsHandler"</span> /&gt;</span>
-<span class="code-tag">&lt;/util:list&gt;</span>
-
-&lt;bean id=<span class="code-quote">"contextSource"</span>
-   class=<span class="code-quote">"org.springframework.ldap.core.support.LdapContextSource"</span>&gt;
-  <span class="code-tag">&lt;property name=<span class="code-quote">"url"</span> value=<span class="code-quote">"ldap://ldap.mycompany.org:389"</span> /&gt;</span>
-  &lt;property name=<span class="code-quote">"userDn"</span>
-    value=<span class="code-quote">"CN=techUser,OU=Users,DC=mycompany,DC=org"</span> /&gt;
-  <span class="code-tag">&lt;property name=<span class="code-quote">"password"</span> value=<span class="code-quote">"mypassword"</span> /&gt;</span>
-<span class="code-tag">&lt;/bean&gt;</span>
-
-&lt;bean id=<span class="code-quote">"ldapTemplate"</span>
-   class=<span class="code-quote">"org.springframework.ldap.core.LdapTemplate"</span>&gt;
-  <span class="code-tag">&lt;constructor-arg ref=<span class="code-quote">"contextSource"</span> /&gt;</span>
-<span class="code-tag">&lt;/bean&gt;</span>
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+&lt;util:list id="claimHandlerList"&gt;
+  &lt;ref bean="ldapClaimsHandler" /&gt;
+&lt;/util:list&gt;
+
+&lt;bean id="contextSource"
+   class="org.springframework.ldap.core.support.LdapContextSource"&gt;
+  &lt;property name="url" value="ldap://ldap.mycompany.org:389" /&gt;
+  &lt;property name="userDn"
+    value="CN=techUser,OU=Users,DC=mycompany,DC=org" /&gt;
+  &lt;property name="password" value="mypassword" /&gt;
+&lt;/bean&gt;
+
+&lt;bean id="ldapTemplate"
+   class="org.springframework.ldap.core.LdapTemplate"&gt;
+  &lt;constructor-arg ref="contextSource" /&gt;
+&lt;/bean&gt;
 
-<span class="code-tag">&lt;util:map id=<span class="code-quote">"claimsToLdapAttributeMapping"</span>&gt;</span>
+&lt;util:map id="claimsToLdapAttributeMapping"&gt;
   &lt;entry
-key=<span class="code-quote">"http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname"</span>
-value=<span class="code-quote">"givenName"</span> /&gt;
-  &lt;entry key=<span class="code-quote">"http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname"</span>
-value=<span class="code-quote">"sn"</span> /&gt;
+key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname"
+value="givenName" /&gt;
+  &lt;entry key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname"
+value="sn" /&gt;
   &lt;entry
-key=<span class="code-quote">"http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress"</span>
-value=<span class="code-quote">"mail"</span> /&gt;
-  &lt;entry key=<span class="code-quote">"http://schemas.xmlsoap.org/ws/2005/05/identity/claims/country"</span>
-value=<span class="code-quote">"c"</span> /&gt;
-<span class="code-tag">&lt;/util:map&gt;</span>
-
-&lt;bean id=<span class="code-quote">"ldapClaimsHandler"</span>
-    class=<span class="code-quote">"org.apache.cxf.sts.claims.LdapClaimsHandler"</span>&gt;
-  <span class="code-tag">&lt;property name=<span class="code-quote">"ldapTemplate"</span> ref=<span class="code-quote">"ldapTemplate"</span> /&gt;</span>
-  &lt;property name=<span class="code-quote">"claimsLdapAttributeMapping"</span>
-            ref=<span class="code-quote">"claimsToLdapAttributeMapping"</span> /&gt;
-  &lt;property name=<span class="code-quote">"userBaseDN"</span>
-      value=<span class="code-quote">"OU=Users,DC=mycompany,DC=org"</span> /&gt;
-<span class="code-tag">&lt;/bean&gt;</span>
-</pre>
+key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress"
+value="mail" /&gt;
+  &lt;entry key="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/country"
+value="c" /&gt;
+&lt;/util:map&gt;
+
+&lt;bean id="ldapClaimsHandler"
+    class="org.apache.cxf.sts.claims.LdapClaimsHandler"&gt;
+  &lt;property name="ldapTemplate" ref="ldapTemplate" /&gt;
+  &lt;property name="claimsLdapAttributeMapping"
+            ref="claimsToLdapAttributeMapping" /&gt;
+  &lt;property name="userBaseDN"
+      value="OU=Users,DC=mycompany,DC=org" /&gt;
+&lt;/bean&gt;
+]]></script>
 </div></div>
 
 <p>You must deploy the library for the spring ldap module and its dependencies. The POM of the spring ldap module is available <a shape="rect" class="external-link" href="http://repo1.maven.org/maven2/org/springframework/ldap/spring-ldap/1.2/spring-ldap-1.2.pom" rel="nofollow">here</a>.</p>

Modified: websites/production/cxf/content/fediz-jetty.html
==============================================================================
--- websites/production/cxf/content/fediz-jetty.html (original)
+++ websites/production/cxf/content/fediz-jetty.html Mon Jun 24 17:10:51 2013
@@ -25,6 +25,18 @@
 <meta http-equiv="Content-type" content="text/html;charset=UTF-8">
 <meta name="keywords" content="business integration, EAI, SOA, Service Oriented Architecture, web services, SOAP, JBI, JMS, WSDL, XML, EDI, Electronic Data Interchange, standards support, integration standards, application integration, middleware, software, solutions, services, CXF, open source">
 <meta name="description" content="Apache CXF, Services Framework - Fediz Jetty">
+
+  <link href='http://cxf.apache.org/resources/highlighter/styles/shCore.css' rel='stylesheet' type='text/css' />
+  <link href='http://cxf.apache.org/resources/highlighter/styles/shThemeCXF.css' rel='stylesheet' type='text/css' />
+  <script src='http://cxf.apache.org/resources/highlighter/scripts/shCore.js' type='text/javascript'></script>
+  <script src='http://cxf.apache.org/resources/highlighter/scripts/shBrushJava.js' type='text/javascript'></script>
+  <script src='http://cxf.apache.org/resources/highlighter/scripts/shBrushXml.js' type='text/javascript'></script>
+  
+  <script type="text/javascript">
+  SyntaxHighlighter.defaults['toolbar'] = false;
+  SyntaxHighlighter.all();
+  </script>
+ 
     <title>
 Apache CXF -- Fediz Jetty
     </title>
@@ -42,19 +54,15 @@ Apache CXF -- Fediz Jetty
     <td id="cell-1-0">&nbsp;</td>
     <td id="cell-1-1">&nbsp;</td>
     <td id="cell-1-2">
-      <div style="padding: 5px;">
-        <div id="banner">
-          <!-- Banner -->
-<div id="banner-content">
+      <!-- Banner -->
+<div class="banner" id="banner"><p>
 <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 Software Foundation"><img border="0" alt="ASF Logo" src="http://cxf.apache.org/images/asf-logo.png"></a>
 </td></tr></table>
-</div>
-          <!-- Banner -->
-        </div>
-      </div>
+</p></div>
+      <!-- Banner -->
       <div id="top-menu">
         <table border="0" cellpadding="1" cellspacing="0" width="100%">
           <tr>
@@ -101,8 +109,8 @@ Apache CXF -- Fediz Jetty
 
 
 <h3><a shape="rect" name="Navigation-Search"></a>Search</h3>
-
-<form enctype="application/x-www-form-urlencoded" method="get" id="cse-search-box" action="http://www.google.com/cse">
+<p>
+</p><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">
@@ -148,9 +156,9 @@ Apache CXF -- Fediz Jetty
 
 <ol><li>Create sub-directory <tt>fediz</tt> in <tt>${jetty.home}/lib/fediz</tt></li><li>Update start.ini in ${jetty.home}/start.ini by adding <tt>fediz</tt> to the OPTIONS
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
 OPTIONS=Server,fediz
-</pre>
+]]></script>
 </div></div></li><li>Deploy the libraries to the directory created in (1)</li></ol>
 
 
@@ -194,20 +202,20 @@ OPTIONS=Server,fediz
 <p>Hint: file name must be equal to war file name</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-xml"> 
-  <span class="code-tag">&lt;Get name=<span class="code-quote">"securityHandler"</span>&gt;</span>
-    <span class="code-tag">&lt;Set name=<span class="code-quote">"loginService"</span>&gt;</span>
-      <span class="code-tag">&lt;New class=<span class="code-quote">"org.apache.cxf.fediz.jetty.FederationLoginService"</span>&gt;</span>
-        <span class="code-tag">&lt;Set name=<span class="code-quote">"name"</span>&gt;</span>WSFED<span class="code-tag">&lt;/Set&gt;</span>
-      <span class="code-tag">&lt;/New&gt;</span>
-    <span class="code-tag">&lt;/Set&gt;</span>
-    <span class="code-tag">&lt;Set name=<span class="code-quote">"authenticator"</span>&gt;</span>
-      <span class="code-tag">&lt;New class=<span class="code-quote">"org.apache.cxf.fediz.jetty.FederationAuthenticator"</span>&gt;</span>
-        <span class="code-tag">&lt;Set name=<span class="code-quote">"configFile"</span>&gt;</span><span class="code-tag">&lt;SystemProperty name=<span class="code-quote">"jetty.home"</span> default=<span class="code-quote">"."</span>/&gt;</span>/etc/fediz_config.xml<span class="code-tag">&lt;/Set&gt;</span>
-      <span class="code-tag">&lt;/New&gt;</span>
-    <span class="code-tag">&lt;/Set&gt;</span>
-  <span class="code-tag">&lt;/Get&gt;</span>
-</pre>
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[ 
+  &lt;Get name="securityHandler"&gt;
+    &lt;Set name="loginService"&gt;
+      &lt;New class="org.apache.cxf.fediz.jetty.FederationLoginService"&gt;
+        &lt;Set name="name"&gt;WSFED&lt;/Set&gt;
+      &lt;/New&gt;
+    &lt;/Set&gt;
+    &lt;Set name="authenticator"&gt;
+      &lt;New class="org.apache.cxf.fediz.jetty.FederationAuthenticator"&gt;
+        &lt;Set name="configFile"&gt;&lt;SystemProperty name="jetty.home" default="."/&gt;/etc/fediz_config.xml&lt;/Set&gt;
+      &lt;/New&gt;
+    &lt;/Set&gt;
+  &lt;/Get&gt;
+]]></script>
 </div></div>
 
 

Modified: websites/production/cxf/content/fediz-metadata.html
==============================================================================
--- websites/production/cxf/content/fediz-metadata.html (original)
+++ websites/production/cxf/content/fediz-metadata.html Mon Jun 24 17:10:51 2013
@@ -25,6 +25,18 @@
 <meta http-equiv="Content-type" content="text/html;charset=UTF-8">
 <meta name="keywords" content="business integration, EAI, SOA, Service Oriented Architecture, web services, SOAP, JBI, JMS, WSDL, XML, EDI, Electronic Data Interchange, standards support, integration standards, application integration, middleware, software, solutions, services, CXF, open source">
 <meta name="description" content="Apache CXF, Services Framework - Fediz Metadata">
+
+  <link href='http://cxf.apache.org/resources/highlighter/styles/shCore.css' rel='stylesheet' type='text/css' />
+  <link href='http://cxf.apache.org/resources/highlighter/styles/shThemeCXF.css' rel='stylesheet' type='text/css' />
+  <script src='http://cxf.apache.org/resources/highlighter/scripts/shCore.js' type='text/javascript'></script>
+  <script src='http://cxf.apache.org/resources/highlighter/scripts/shBrushJava.js' type='text/javascript'></script>
+  <script src='http://cxf.apache.org/resources/highlighter/scripts/shBrushXml.js' type='text/javascript'></script>
+  
+  <script type="text/javascript">
+  SyntaxHighlighter.defaults['toolbar'] = false;
+  SyntaxHighlighter.all();
+  </script>
+ 
     <title>
 Apache CXF -- Fediz Metadata
     </title>
@@ -42,19 +54,15 @@ Apache CXF -- Fediz Metadata
     <td id="cell-1-0">&nbsp;</td>
     <td id="cell-1-1">&nbsp;</td>
     <td id="cell-1-2">
-      <div style="padding: 5px;">
-        <div id="banner">
-          <!-- Banner -->
-<div id="banner-content">
+      <!-- Banner -->
+<div class="banner" id="banner"><p>
 <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 Software Foundation"><img border="0" alt="ASF Logo" src="http://cxf.apache.org/images/asf-logo.png"></a>
 </td></tr></table>
-</div>
-          <!-- Banner -->
-        </div>
-      </div>
+</p></div>
+      <!-- Banner -->
       <div id="top-menu">
         <table border="0" cellpadding="1" cellspacing="0" width="100%">
           <tr>
@@ -101,8 +109,8 @@ Apache CXF -- Fediz Metadata
 
 
 <h3><a shape="rect" name="Navigation-Search"></a>Search</h3>
-
-<form enctype="application/x-www-form-urlencoded" method="get" id="cse-search-box" action="http://www.google.com/cse">
+<p>
+</p><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">
@@ -148,20 +156,20 @@ Apache CXF -- Fediz Metadata
 
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-xml">
-&lt;EntityDescriptor xmlns=<span class="code-quote">"urn:oasis:names:tc:SAML:2.0:metadata"</span>
-   <span class="code-keyword">xmlns:saml</span>=<span class="code-quote">"urn:oasis:names:tc:SAML:2.0:assertion"</span>
-   <span class="code-keyword">xmlns:ds</span>=<span class="code-quote">"http://www.w3.org/2000/09/xmldsig#"</span>
-   entityID=<span class="code-quote">"..."</span>&gt;
-   <span class="code-tag">&lt;ds:Signature&gt;</span>...<span class="code-tag">&lt;/ds:Signature&gt;</span>
-   &lt;RoleDescriptor xsi:type=<span class="code-quote">"fed:ApplicationServiceType"</span>
-          protocolSupportEnumeration=<span class="code-quote">"http://docs.oasis-open.org/wsfed/federation/200706"</span>
-          <span class="code-quote">"http://docs.oasis-open.org/ws-sx/ws-trust/200512"</span>&gt;
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+&lt;EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+   xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
+   xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+   entityID="..."&gt;
+   &lt;ds:Signature&gt;...&lt;/ds:Signature&gt;
+   &lt;RoleDescriptor xsi:type="fed:ApplicationServiceType"
+          protocolSupportEnumeration="http://docs.oasis-open.org/wsfed/federation/200706"
+          "http://docs.oasis-open.org/ws-sx/ws-trust/200512"&gt;
           ...
-   <span class="code-tag">&lt;/RoleDescriptor&gt;</span>
+   &lt;/RoleDescriptor&gt;
    ...
-<span class="code-tag">&lt;/EntityDescriptor&gt;</span>
-</pre>
+&lt;/EntityDescriptor&gt;
+]]></script>
 </div></div>
 
 
@@ -169,20 +177,20 @@ Apache CXF -- Fediz Metadata
 
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-xml">
-&lt;EntityDescriptor xmlns=<span class="code-quote">"urn:oasis:names:tc:SAML:2.0:metadata"</span>
-   <span class="code-keyword">xmlns:saml</span>=<span class="code-quote">"urn:oasis:names:tc:SAML:2.0:assertion"</span>
-   <span class="code-keyword">xmlns:ds</span>=<span class="code-quote">"http://www.w3.org/2000/09/xmldsig#"</span>
-   entityID=<span class="code-quote">"..."</span>&gt;
-   <span class="code-tag">&lt;ds:Signature&gt;</span>...<span class="code-tag">&lt;/ds:Signature&gt;</span>
-   &lt;RoleDescriptor xsi:type=<span class="code-quote">"fed:SecurityTokenServiceType"</span>
-          protocolSupportEnumeration=<span class="code-quote">"http://docs.oasis-open.org/wsfed/federation/200706"</span>
-          <span class="code-quote">"http://docs.oasis-open.org/ws-sx/ws-trust/200512"</span>&gt;
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+&lt;EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+   xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
+   xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+   entityID="..."&gt;
+   &lt;ds:Signature&gt;...&lt;/ds:Signature&gt;
+   &lt;RoleDescriptor xsi:type="fed:SecurityTokenServiceType"
+          protocolSupportEnumeration="http://docs.oasis-open.org/wsfed/federation/200706"
+          "http://docs.oasis-open.org/ws-sx/ws-trust/200512"&gt;
           ...
-   <span class="code-tag">&lt;/RoleDescriptor&gt;</span>
+   &lt;/RoleDescriptor&gt;
    ...
-<span class="code-tag">&lt;/EntityDescriptor&gt;</span>
-</pre>
+&lt;/EntityDescriptor&gt;
+]]></script>
 </div></div>
 
 <h3><a shape="rect" name="FedizMetadata-Usage"></a>Usage</h3>
@@ -212,55 +220,55 @@ Apache CXF -- Fediz Metadata
 <p>This is an example metadata document:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-xml">
-&lt;EntityDescriptor ID=<span class="code-quote">"_36BF9BFBF49BA48A2D13395075556522"</span> entityID=<span class="code-quote">"https://localhost:8443/fedizhelloworld/"</span> 
-   <span class="code-keyword">xmlns:auth</span>=<span class="code-quote">"http://docs.oasis-open.org/wsfed/federation/200706"</span> 
-   <span class="code-keyword">xmlns:fed</span>=<span class="code-quote">"http://docs.oasis-open.org/wsfed/federation/200706"</span> 
-   <span class="code-keyword">xmlns:wsa</span>=<span class="code-quote">"http://www.w3.org/2005/08/addressing"</span> 
-   <span class="code-keyword">xmlns:xsi</span>=<span class="code-quote">"http://www.w3.org/2001/XMLSchema-instance"</span>&gt;
-   <span class="code-tag">&lt;Signature xmlns=<span class="code-quote">"http://www.w3.org/2000/09/xmldsig#"</span>&gt;</span>
-      <span class="code-tag">&lt;SignedInfo&gt;</span>
-         <span class="code-tag">&lt;CanonicalizationMethod Algorithm=<span class="code-quote">"http://www.w3.org/TR/2001/REC-xml-c14n-20010315"</span>/&gt;</span>
-         <span class="code-tag">&lt;SignatureMethod Algorithm=<span class="code-quote">"http://www.w3.org/2000/09/xmldsig#rsa-sha1"</span>/&gt;</span>
-         <span class="code-tag">&lt;Reference URI=<span class="code-quote">"#_36BF9BFBF49BA48A2D13395075556522"</span>&gt;</span>
-            <span class="code-tag">&lt;Transforms&gt;</span>
-               <span class="code-tag">&lt;Transform Algorithm=<span class="code-quote">"http://www.w3.org/2000/09/xmldsig#enveloped-signature"</span>/&gt;</span>
-            <span class="code-tag">&lt;/Transforms&gt;</span>
-            <span class="code-tag">&lt;DigestMethod Algorithm=<span class="code-quote">"http://www.w3.org/2000/09/xmldsig#sha1"</span>/&gt;</span>
-            <span class="code-tag">&lt;DigestValue&gt;</span>GP0clMqrkm58j17R/IlG+ksITDQ=<span class="code-tag">&lt;/DigestValue&gt;</span>
-         <span class="code-tag">&lt;/Reference&gt;</span>
-      <span class="code-tag">&lt;/SignedInfo&gt;</span>
-      <span class="code-tag">&lt;SignatureValue&gt;</span>REMOVED<span class="code-tag">&lt;/SignatureValue&gt;</span>
-      <span class="code-tag">&lt;KeyInfo&gt;</span>
-         <span class="code-tag">&lt;X509Data&gt;</span>
-            <span class="code-tag">&lt;X509SubjectName&gt;</span>CN=localhost<span class="code-tag">&lt;/X509SubjectName&gt;</span>
-            <span class="code-tag">&lt;X509Certificate&gt;</span>REMOVED<span class="code-tag">&lt;/X509Certificate&gt;</span>
-         <span class="code-tag">&lt;/X509Data&gt;</span>
-      <span class="code-tag">&lt;/KeyInfo&gt;</span>
-   <span class="code-tag">&lt;/Signature&gt;</span>
-   &lt;fed:RoleDescriptor protocolSupportEnumeration=<span class="code-quote">"http://docs.oasis-open.org/wsfed/federation/200706"</span> 
-      xsi:type=<span class="code-quote">"fed:ApplicationServiceType"</span>&gt;
-      <span class="code-tag">&lt;fed:ApplicationServiceEndpoint&gt;</span>
-         <span class="code-tag">&lt;wsa:EndpointReference&gt;</span>
-            <span class="code-tag">&lt;wsa:Address&gt;</span>https://localhost:8443/fedizhelloworld/<span class="code-tag">&lt;/wsa:Address&gt;</span>
-         <span class="code-tag">&lt;/wsa:EndpointReference&gt;</span>
-      <span class="code-tag">&lt;/fed:ApplicationServiceEndpoint&gt;</span>
-      <span class="code-tag">&lt;fed:TargetScope&gt;</span>
-         <span class="code-tag">&lt;wsa:EndpointReference&gt;</span>
-            <span class="code-tag">&lt;wsa:Address/&gt;</span>
-         <span class="code-tag">&lt;/wsa:EndpointReference&gt;</span>
-         <span class="code-tag">&lt;/fed:TargetScope&gt;</span>
-      <span class="code-tag">&lt;fed:ClaimTypesRequested&gt;</span>
-         <span class="code-tag">&lt;auth:ClaimType Optional=<span class="code-quote">"true"</span> Uri=<span class="code-quote">"http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role"</span>/&gt;</span>
-      <span class="code-tag">&lt;/fed:ClaimTypesRequested&gt;</span>
-      <span class="code-tag">&lt;fed:PassiveRequestorEndpoint&gt;</span>
-         <span class="code-tag">&lt;wsa:EndpointReference&gt;</span>
-            <span class="code-tag">&lt;wsa:Address&gt;</span>https://localhost:9443/fediz-idp/<span class="code-tag">&lt;/wsa:Address&gt;</span>
-         <span class="code-tag">&lt;/wsa:EndpointReference&gt;</span>
-      <span class="code-tag">&lt;/fed:PassiveRequestorEndpoint&gt;</span>
-   <span class="code-tag">&lt;/fed:RoleDescriptor&gt;</span>
-<span class="code-tag">&lt;/EntityDescriptor&gt;</span>
-</pre>
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+&lt;EntityDescriptor ID="_36BF9BFBF49BA48A2D13395075556522" entityID="https://localhost:8443/fedizhelloworld/" 
+   xmlns:auth="http://docs.oasis-open.org/wsfed/federation/200706" 
+   xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" 
+   xmlns:wsa="http://www.w3.org/2005/08/addressing" 
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt;
+   &lt;Signature xmlns="http://www.w3.org/2000/09/xmldsig#"&gt;
+      &lt;SignedInfo&gt;
+         &lt;CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/&gt;
+         &lt;SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/&gt;
+         &lt;Reference URI="#_36BF9BFBF49BA48A2D13395075556522"&gt;
+            &lt;Transforms&gt;
+               &lt;Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/&gt;
+            &lt;/Transforms&gt;
+            &lt;DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/&gt;
+            &lt;DigestValue&gt;GP0clMqrkm58j17R/IlG+ksITDQ=&lt;/DigestValue&gt;
+         &lt;/Reference&gt;
+      &lt;/SignedInfo&gt;
+      &lt;SignatureValue&gt;REMOVED&lt;/SignatureValue&gt;
+      &lt;KeyInfo&gt;
+         &lt;X509Data&gt;
+            &lt;X509SubjectName&gt;CN=localhost&lt;/X509SubjectName&gt;
+            &lt;X509Certificate&gt;REMOVED&lt;/X509Certificate&gt;
+         &lt;/X509Data&gt;
+      &lt;/KeyInfo&gt;
+   &lt;/Signature&gt;
+   &lt;fed:RoleDescriptor protocolSupportEnumeration="http://docs.oasis-open.org/wsfed/federation/200706" 
+      xsi:type="fed:ApplicationServiceType"&gt;
+      &lt;fed:ApplicationServiceEndpoint&gt;
+         &lt;wsa:EndpointReference&gt;
+            &lt;wsa:Address&gt;https://localhost:8443/fedizhelloworld/&lt;/wsa:Address&gt;
+         &lt;/wsa:EndpointReference&gt;
+      &lt;/fed:ApplicationServiceEndpoint&gt;
+      &lt;fed:TargetScope&gt;
+         &lt;wsa:EndpointReference&gt;
+            &lt;wsa:Address/&gt;
+         &lt;/wsa:EndpointReference&gt;
+         &lt;/fed:TargetScope&gt;
+      &lt;fed:ClaimTypesRequested&gt;
+         &lt;auth:ClaimType Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role"/&gt;
+      &lt;/fed:ClaimTypesRequested&gt;
+      &lt;fed:PassiveRequestorEndpoint&gt;
+         &lt;wsa:EndpointReference&gt;
+            &lt;wsa:Address&gt;https://localhost:9443/fediz-idp/&lt;/wsa:Address&gt;
+         &lt;/wsa:EndpointReference&gt;
+      &lt;/fed:PassiveRequestorEndpoint&gt;
+   &lt;/fed:RoleDescriptor&gt;
+&lt;/EntityDescriptor&gt;
+]]></script>
 </div></div>
 
 

Modified: websites/production/cxf/content/fediz-spring-2.html
==============================================================================
--- websites/production/cxf/content/fediz-spring-2.html (original)
+++ websites/production/cxf/content/fediz-spring-2.html Mon Jun 24 17:10:51 2013
@@ -25,6 +25,18 @@
 <meta http-equiv="Content-type" content="text/html;charset=UTF-8">
 <meta name="keywords" content="business integration, EAI, SOA, Service Oriented Architecture, web services, SOAP, JBI, JMS, WSDL, XML, EDI, Electronic Data Interchange, standards support, integration standards, application integration, middleware, software, solutions, services, CXF, open source">
 <meta name="description" content="Apache CXF, Services Framework - Fediz Spring 2">
+
+  <link href='http://cxf.apache.org/resources/highlighter/styles/shCore.css' rel='stylesheet' type='text/css' />
+  <link href='http://cxf.apache.org/resources/highlighter/styles/shThemeCXF.css' rel='stylesheet' type='text/css' />
+  <script src='http://cxf.apache.org/resources/highlighter/scripts/shCore.js' type='text/javascript'></script>
+  <script src='http://cxf.apache.org/resources/highlighter/scripts/shBrushJava.js' type='text/javascript'></script>
+  <script src='http://cxf.apache.org/resources/highlighter/scripts/shBrushXml.js' type='text/javascript'></script>
+  
+  <script type="text/javascript">
+  SyntaxHighlighter.defaults['toolbar'] = false;
+  SyntaxHighlighter.all();
+  </script>
+ 
     <title>
 Apache CXF -- Fediz Spring 2
     </title>
@@ -42,19 +54,15 @@ Apache CXF -- Fediz Spring 2
     <td id="cell-1-0">&nbsp;</td>
     <td id="cell-1-1">&nbsp;</td>
     <td id="cell-1-2">
-      <div style="padding: 5px;">
-        <div id="banner">
-          <!-- Banner -->
-<div id="banner-content">
+      <!-- Banner -->
+<div class="banner" id="banner"><p>
 <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 Software Foundation"><img border="0" alt="ASF Logo" src="http://cxf.apache.org/images/asf-logo.png"></a>
 </td></tr></table>
-</div>
-          <!-- Banner -->
-        </div>
-      </div>
+</p></div>
+      <!-- Banner -->
       <div id="top-menu">
         <table border="0" cellpadding="1" cellspacing="0" width="100%">
           <tr>
@@ -101,8 +109,8 @@ Apache CXF -- Fediz Spring 2
 
 
 <h3><a shape="rect" name="Navigation-Search"></a>Search</h3>
-
-<form enctype="application/x-www-form-urlencoded" method="get" id="cse-search-box" action="http://www.google.com/cse">
+<p>
+</p><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">
@@ -165,39 +173,39 @@ Apache CXF -- Fediz Spring 2
 <p>The following configuration snippets illustrate the Fediz related configuration. The complete configuration file can be found in the example <em>spring2Webapp</em>.</p>
 
 <div class="code panel" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>applicationContext-security.xml</b></div><div class="codeContent panelContent">
-<pre class="code-xml">
-    <span class="code-tag">&lt;sec:http entry-point-ref=<span class="code-quote">"federationEntryPoint"</span>&gt;</span>
-        <span class="code-tag">&lt;sec:intercept-url pattern=<span class="code-quote">"/secure/fedservlet"</span> access=<span class="code-quote">"IS_AUTHENTICATED_FULLY"</span>/&gt;</span>
-        <span class="code-tag">&lt;sec:intercept-url pattern=<span class="code-quote">"/secure/manager/**"</span> access=<span class="code-quote">"ROLE_MANAGER"</span>/&gt;</span>
-        <span class="code-tag">&lt;sec:intercept-url pattern=<span class="code-quote">"/secure/admin/**"</span> access=<span class="code-quote">"ROLE_ADMIN"</span>/&gt;</span>
-        <span class="code-tag">&lt;sec:intercept-url pattern=<span class="code-quote">"/secure/user/**"</span> access=<span class="code-quote">"ROLE_USER,ROLE_ADMIN,ROLE_MANAGER"</span>/&gt;</span>
-    <span class="code-tag">&lt;/sec:http&gt;</span>
-
-
-    <span class="code-tag">&lt;sec:authentication-manager alias=<span class="code-quote">"authManager"</span>/&gt;</span>
-
-    &lt;bean id=<span class="code-quote">"fedizConfig"</span> class=<span class="code-quote">"org.apache.cxf.fediz.spring.FederationConfigImpl"</span> init-method=<span class="code-quote">"init"</span>
-        p:configFile=<span class="code-quote">"WEB-INF/fediz_config.xml"</span> p:contextName=<span class="code-quote">"/fedizhelloworld"</span> /&gt;
-
-    &lt;bean id=<span class="code-quote">"federationEntryPoint"</span>
-        class=<span class="code-quote">"org.apache.cxf.fediz.spring.web.FederationAuthenticationEntryPoint"</span>
-        p:federationConfig-ref=<span class="code-quote">"fedizConfig"</span> /&gt;
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+    &lt;sec:http entry-point-ref="federationEntryPoint"&gt;
+        &lt;sec:intercept-url pattern="/secure/fedservlet" access="IS_AUTHENTICATED_FULLY"/&gt;
+        &lt;sec:intercept-url pattern="/secure/manager/**" access="ROLE_MANAGER"/&gt;
+        &lt;sec:intercept-url pattern="/secure/admin/**" access="ROLE_ADMIN"/&gt;
+        &lt;sec:intercept-url pattern="/secure/user/**" access="ROLE_USER,ROLE_ADMIN,ROLE_MANAGER"/&gt;
+    &lt;/sec:http&gt;
+
+
+    &lt;sec:authentication-manager alias="authManager"/&gt;
+
+    &lt;bean id="fedizConfig" class="org.apache.cxf.fediz.spring.FederationConfigImpl" init-method="init"
+        p:configFile="WEB-INF/fediz_config.xml" p:contextName="/fedizhelloworld" /&gt;
+
+    &lt;bean id="federationEntryPoint"
+        class="org.apache.cxf.fediz.spring.web.FederationAuthenticationEntryPoint"
+        p:federationConfig-ref="fedizConfig" /&gt;
  
-    &lt;bean id=<span class="code-quote">"federationFilter"</span>
-        class=<span class="code-quote">"org.apache.cxf.fediz.spring.web.FederationAuthenticationFilter"</span>
-        p:authenticationManager-ref=<span class="code-quote">"authManager"</span> p:defaultTargetUrl=<span class="code-quote">"/whatever"</span>&gt;
-        <span class="code-tag">&lt;sec:custom-filter after=<span class="code-quote">"BASIC_PROCESSING_FILTER"</span>/&gt;</span>
-    <span class="code-tag">&lt;/bean&gt;</span>
+    &lt;bean id="federationFilter"
+        class="org.apache.cxf.fediz.spring.web.FederationAuthenticationFilter"
+        p:authenticationManager-ref="authManager" p:defaultTargetUrl="/whatever"&gt;
+        &lt;sec:custom-filter after="BASIC_PROCESSING_FILTER"/&gt;
+    &lt;/bean&gt;
     
-    &lt;bean id=<span class="code-quote">"federationAuthProvider"</span> class=<span class="code-quote">"org.apache.cxf.fediz.spring.authentication.FederationAuthenticationProvider"</span>
-        p:federationConfig-ref=<span class="code-quote">"fedizConfig"</span>&gt;
-        <span class="code-tag">&lt;sec:custom-authentication-provider /&gt;</span>
-        <span class="code-tag">&lt;property name=<span class="code-quote">"authenticationUserDetailsService"</span>&gt;</span>
-            <span class="code-tag">&lt;bean class=<span class="code-quote">"org.apache.cxf.fediz.spring.authentication.GrantedAuthoritiesUserDetailsFederationService"</span>/&gt;</span>
-        <span class="code-tag">&lt;/property&gt;</span>
-    <span class="code-tag">&lt;/bean&gt;</span>
+    &lt;bean id="federationAuthProvider" class="org.apache.cxf.fediz.spring.authentication.FederationAuthenticationProvider"
+        p:federationConfig-ref="fedizConfig"&gt;
+        &lt;sec:custom-authentication-provider /&gt;
+        &lt;property name="authenticationUserDetailsService"&gt;
+            &lt;bean class="org.apache.cxf.fediz.spring.authentication.GrantedAuthoritiesUserDetailsFederationService"/&gt;
+        &lt;/property&gt;
+    &lt;/bean&gt;
 
-</pre>
+]]></script>
 </div></div>
 
 <p>The <em>http</em> element is the key element which depends on the other bean definitions like <em>federationFilter</em> and the <em>federationAuthProvider</em>. Web request authorizing is configured in the <em>http</em> element as well which looks similar to security constraints definition in <tt>web.xml</tt>.</p>
@@ -205,18 +213,18 @@ Apache CXF -- Fediz Spring 2
 <p>The following code snippet of the FederationServlet example illustrates how to get access to the Spring Security Context of the current user and to the Federation releated information like claims and login token.</p>
 
 <div class="code panel" style="border-style: solid;border-width: 1px;"><div class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><b>FederationServlet.java</b></div><div class="codeContent panelContent">
-<pre class="code-java">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
     Authentication obj = SecurityContextHolder.getContext().getAuthentication();
     FederationAuthenticationToken fedAuthToken = (FederationAuthenticationToken)auth;
-    <span class="code-keyword">for</span> (GrantedAuthority item : fedAuthToken.getAuthorities()) {
+    for (GrantedAuthority item : fedAuthToken.getAuthorities()) {
         ...
     }
     
     ClaimCollection claims = ((FederationUser)fedAuthToken.getUserDetails()).getClaims();
-    <span class="code-keyword">for</span> (Claim c: claims) {
+    for (Claim c: claims) {
         ...
     }
-</pre>
+]]></script>
 </div></div>
 
 



Mime
View raw message