cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r867253 [45/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/fediz-spring.html
==============================================================================
--- websites/production/cxf/content/fediz-spring.html (original)
+++ websites/production/cxf/content/fediz-spring.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">
+
+  <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
     </title>
@@ -42,19 +54,15 @@ Apache CXF -- Fediz Spring
     <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
 
 
 <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">
@@ -169,40 +177,40 @@ Apache CXF -- Fediz Spring
 <p>The following configuration snippets illustrate the Fediz related configuration. The complete configuration file can be found in the example <em>springPreAuthWebapp</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">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 
-    &lt;bean id=<span class="code-quote">"preAuthenticatedUserDetailsService"</span>
-            class=<span class="code-quote">"org.apache.cxf.fediz.spring.preauth.PreAuthenticatedGrantedAuthoritiesUserDetailsFederationService"</span>/&gt;    
+    &lt;bean id="preAuthenticatedUserDetailsService"
+            class="org.apache.cxf.fediz.spring.preauth.PreAuthenticatedGrantedAuthoritiesUserDetailsFederationService"/&gt;    
     
-    <span class="code-tag">&lt;bean id=<span class="code-quote">"j2eePreAuthFilter"</span> class=<span class="code-quote">"org.apache.cxf.fediz.spring.preauth.FederationPreAuthenticatedProcessingFilter"</span>&gt;</span>
-        <span class="code-tag">&lt;property name=<span class="code-quote">"authenticationManager"</span> ref=<span class="code-quote">"authenticationManager"</span>/&gt;</span>
-        <span class="code-tag">&lt;property name=<span class="code-quote">"authenticationDetailsSource"</span>&gt;</span>
-            <span class="code-tag">&lt;bean class=<span class="code-quote">"org.springframework.security.web.authentication.preauth.j2ee.J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource"</span>&gt;</span>
-                <span class="code-tag">&lt;property name=<span class="code-quote">"mappableRolesRetriever"</span>&gt;</span>
-                    <span class="code-tag">&lt;bean class=<span class="code-quote">"org.springframework.security.web.authentication.preauth.j2ee.WebXmlMappableAttributesRetriever"</span> /&gt;</span>
-                <span class="code-tag">&lt;/property&gt;</span>
-                <span class="code-tag">&lt;property name=<span class="code-quote">"userRoles2GrantedAuthoritiesMapper"</span>&gt;</span>
-                    <span class="code-tag">&lt;bean class=<span class="code-quote">"org.springframework.security.core.authority.mapping.SimpleAttributes2GrantedAuthoritiesMapper"</span>&gt;</span>
-                        <span class="code-tag">&lt;property name=<span class="code-quote">"convertAttributeToUpperCase"</span> value=<span class="code-quote">"true"</span>/&gt;</span>
-                    <span class="code-tag">&lt;/bean&gt;</span>
-                <span class="code-tag">&lt;/property&gt;</span>
-            <span class="code-tag">&lt;/bean&gt;</span>
-        <span class="code-tag">&lt;/property&gt;</span>
-    <span class="code-tag">&lt;/bean&gt;</span>
-
-    <span class="code-tag">&lt;bean id=<span class="code-quote">"fsi"</span> class=<span class="code-quote">"org.springframework.security.web.access.intercept.FilterSecurityInterceptor"</span>&gt;</span>
-        <span class="code-tag">&lt;property name=<span class="code-quote">"authenticationManager"</span> ref=<span class="code-quote">"authenticationManager"</span>/&gt;</span>
-        <span class="code-tag">&lt;property name=<span class="code-quote">"accessDecisionManager"</span> ref=<span class="code-quote">"httpRequestAccessDecisionManager"</span>/&gt;</span>
-        <span class="code-tag">&lt;property name=<span class="code-quote">"securityMetadataSource"</span>&gt;</span>
-            <span class="code-tag">&lt;sec:filter-invocation-definition-source&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:intercept-url pattern=<span class="code-quote">"/secure/fedservlet"</span> access=<span class="code-quote">"ROLE_USER,ROLE_ADMIN,ROLE_MANAGER,ROLE_AUTHENTICATED"</span>/&gt;</span>
-            <span class="code-tag">&lt;/sec:filter-invocation-definition-source&gt;</span>
-        <span class="code-tag">&lt;/property&gt;</span>
-    <span class="code-tag">&lt;/bean&gt;</span>
-</pre>
+    &lt;bean id="j2eePreAuthFilter" class="org.apache.cxf.fediz.spring.preauth.FederationPreAuthenticatedProcessingFilter"&gt;
+        &lt;property name="authenticationManager" ref="authenticationManager"/&gt;
+        &lt;property name="authenticationDetailsSource"&gt;
+            &lt;bean class="org.springframework.security.web.authentication.preauth.j2ee.J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource"&gt;
+                &lt;property name="mappableRolesRetriever"&gt;
+                    &lt;bean class="org.springframework.security.web.authentication.preauth.j2ee.WebXmlMappableAttributesRetriever" /&gt;
+                &lt;/property&gt;
+                &lt;property name="userRoles2GrantedAuthoritiesMapper"&gt;
+                    &lt;bean class="org.springframework.security.core.authority.mapping.SimpleAttributes2GrantedAuthoritiesMapper"&gt;
+                        &lt;property name="convertAttributeToUpperCase" value="true"/&gt;
+                    &lt;/bean&gt;
+                &lt;/property&gt;
+            &lt;/bean&gt;
+        &lt;/property&gt;
+    &lt;/bean&gt;
+
+    &lt;bean id="fsi" class="org.springframework.security.web.access.intercept.FilterSecurityInterceptor"&gt;
+        &lt;property name="authenticationManager" ref="authenticationManager"/&gt;
+        &lt;property name="accessDecisionManager" ref="httpRequestAccessDecisionManager"/&gt;
+        &lt;property name="securityMetadataSource"&gt;
+            &lt;sec:filter-invocation-definition-source&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:intercept-url pattern="/secure/fedservlet" access="ROLE_USER,ROLE_ADMIN,ROLE_MANAGER,ROLE_AUTHENTICATED"/&gt;
+            &lt;/sec:filter-invocation-definition-source&gt;
+        &lt;/property&gt;
+    &lt;/bean&gt;
+]]></script>
 </div></div>
 
 <p>The beans <em>preAuthenticatedUserDetailsService</em> and <em>j2eePreAuthFilter</em> are required to provide the Fediz related security information (claims, login token) to the Spring Security Context. The bean <em>fsi</em> defines the authorization for the web requests which looks similar to security constraints definition in <tt>web.xml</tt>.</p>
@@ -210,9 +218,9 @@ Apache CXF -- Fediz Spring
 <p>The following code snippet of the FederationServlet example illustrates how to get access to the Spring Security Context of the current user.</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();
-</pre>
+]]></script>
 </div></div>
 
 <p>The <tt>Authentication</tt> object can be casted to the <tt>FederationAuthentiationToken</tt> which provides access to Claims, login token, etc.</p>
@@ -230,45 +238,45 @@ Apache CXF -- Fediz Spring
 <p>The following configuration snippets illustrate the Fediz related configuration. The complete configuration file can be found in the example <em>springWebapp</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> use-expressions=<span class="code-quote">"true"</span>&gt;</span>
-        <span class="code-tag">&lt;sec:intercept-url pattern=<span class="code-quote">"/"</span> access=<span class="code-quote">"permitAll"</span>/&gt;</span>
-        <span class="code-tag">&lt;sec:intercept-url pattern=<span class="code-quote">"/fediz"</span> access=<span class="code-quote">"permitAll"</span>/&gt;</span>
-        <span class="code-tag">&lt;sec:intercept-url pattern=<span class="code-quote">"/index.html"</span> access=<span class="code-quote">"permitAll"</span>/&gt;</span>
-        <span class="code-tag">&lt;sec:intercept-url pattern=<span class="code-quote">"/secure/fedservlet"</span> access=<span class="code-quote">"isAuthenticated()"</span>/&gt;</span>
-        <span class="code-tag">&lt;sec:intercept-url pattern=<span class="code-quote">"/secure/manager/**"</span> access=<span class="code-quote">"hasRole('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">"hasRole('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">"hasAnyRole('ROLE_USER','ROLE_ADMIN','ROLE_MANAGER')"</span>/&gt;</span>
-        <span class="code-tag">&lt;sec:custom-filter ref=<span class="code-quote">"federationFilter"</span> after=<span class="code-quote">"BASIC_AUTH_FILTER"</span> /&gt;</span>
-        <span class="code-tag">&lt;sec:session-management session-authentication-strategy-ref=<span class="code-quote">"sas"</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>
-        <span class="code-tag">&lt;sec:authentication-provider ref=<span class="code-quote">"federationAuthProvider"</span> /&gt;</span>
-    <span class="code-tag">&lt;/sec:authentication-manager&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> /&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" use-expressions="true"&gt;
+        &lt;sec:intercept-url pattern="/" access="permitAll"/&gt;
+        &lt;sec:intercept-url pattern="/fediz" access="permitAll"/&gt;
+        &lt;sec:intercept-url pattern="/index.html" access="permitAll"/&gt;
+        &lt;sec:intercept-url pattern="/secure/fedservlet" access="isAuthenticated()"/&gt;
+        &lt;sec:intercept-url pattern="/secure/manager/**" access="hasRole('ROLE_MANAGER')"/&gt;
+        &lt;sec:intercept-url pattern="/secure/admin/**" access="hasRole('ROLE_ADMIN')"/&gt;
+        &lt;sec:intercept-url pattern="/secure/user/**" access="hasAnyRole('ROLE_USER','ROLE_ADMIN','ROLE_MANAGER')"/&gt;
+        &lt;sec:custom-filter ref="federationFilter" after="BASIC_AUTH_FILTER" /&gt;
+        &lt;sec:session-management session-authentication-strategy-ref="sas"/&gt;
+    &lt;/sec:http&gt;
+
+    &lt;sec:authentication-manager alias="authManager"&gt;
+        &lt;sec:authentication-provider ref="federationAuthProvider" /&gt;
+    &lt;/sec:authentication-manager&gt;
+
+    &lt;bean id="fedizConfig" class="org.apache.cxf.fediz.spring.FederationConfigImpl" init-method="init"
+        p:configFile="WEB-INF/fediz_config.xml" /&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>&gt;
-        <span class="code-tag">&lt;property name=<span class="code-quote">"authenticationFailureHandler"</span>&gt;</span>
-            <span class="code-tag">&lt;bean class=<span class="code-quote">"org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler"</span> /&gt;</span>
-        <span class="code-tag">&lt;/property&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"&gt;
+        &lt;property name="authenticationFailureHandler"&gt;
+            &lt;bean class="org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler" /&gt;
+        &lt;/property&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;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>
-</pre>
+    &lt;bean id="federationAuthProvider" class="org.apache.cxf.fediz.spring.authentication.FederationAuthenticationProvider"
+        p:federationConfig-ref="fedizConfig"&gt;
+        &lt;property name="authenticationUserDetailsService"&gt;
+            &lt;bean class="org.apache.cxf.fediz.spring.authentication.GrantedAuthoritiesUserDetailsFederationService"/&gt;
+        &lt;/property&gt;
+    &lt;/bean&gt;
+]]></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>
@@ -276,18 +284,18 @@ Apache CXF -- Fediz Spring
 <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>
 
 

Modified: websites/production/cxf/content/fediz-tomcat.html
==============================================================================
--- websites/production/cxf/content/fediz-tomcat.html (original)
+++ websites/production/cxf/content/fediz-tomcat.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 Tomcat">
+
+  <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 Tomcat
     </title>
@@ -42,19 +54,15 @@ Apache CXF -- Fediz Tomcat
     <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 Tomcat
 
 
 <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">
@@ -169,12 +177,12 @@ add the previously created directory to 
 <p>This is a sample snippet for an HTTPS configuration:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-xml">
-    &lt;Connector port=<span class="code-quote">"8443"</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-rp.jks"</span>
-               keystorePass=<span class="code-quote">"tompass"</span> sslProtocol=<span class="code-quote">"TLS"</span> /&gt;
-</pre>
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+    &lt;Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
+               maxThreads="150" scheme="https" secure="true"
+               keystoreFile="tomcat-rp.jks"
+               keystorePass="tompass" sslProtocol="TLS" /&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.  Note the Tomcat keystore here is different from the one used to configure the Tomcat-IDP instance.</p>
@@ -198,33 +206,33 @@ add the previously created directory to 
 
 <h6><a shape="rect" name="FedizTomcat-METAINF%2Fcontext.xml"></a>META-INF/context.xml</h6>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-xml"> 
-  <span class="code-tag">&lt;Context&gt;</span> 
-    &lt;Valve className=<span class="code-quote">"org.apache.cxf.fediz.tomcat.FederationAuthenticator"</span>
-      configFile=<span class="code-quote">"conf/Fediz_config.xml"</span> /&gt;
-  <span class="code-tag">&lt;/Context&gt;</span> 
-</pre>
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[ 
+  &lt;Context&gt; 
+    &lt;Valve className="org.apache.cxf.fediz.tomcat.FederationAuthenticator"
+      configFile="conf/Fediz_config.xml" /&gt;
+  &lt;/Context&gt; 
+]]></script>
 </div></div>
 
 <h6><a shape="rect" name="FedizTomcat-Hostlevelinserver.xml"></a>Host level in server.xml</h6>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-xml"> 
-  &lt;Host name=<span class="code-quote">"localhost"</span>  appBase=<span class="code-quote">"webapps"</span>
-        unpackWARs=<span class="code-quote">"true"</span> autoDeploy=<span class="code-quote">"true"</span>&gt;
-    &lt;Valve className=<span class="code-quote">"org.apache.cxf.fediz.tomcat.FederationAuthenticator"</span>
-           configFile=<span class="code-quote">"conf/Fediz_config.xml"</span> /&gt;
-  <span class="code-tag">&lt;/Host&gt;</span>
-</pre>
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[ 
+  &lt;Host name="localhost"  appBase="webapps"
+        unpackWARs="true" autoDeploy="true"&gt;
+    &lt;Valve className="org.apache.cxf.fediz.tomcat.FederationAuthenticator"
+           configFile="conf/Fediz_config.xml" /&gt;
+  &lt;/Host&gt;
+]]></script>
 </div></div> 
 
 <h6><a shape="rect" name="FedizTomcat-Contextlevelinserver.xml"></a>Context level in server.xml</h6>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-xml"> 
-  <span class="code-tag">&lt;Context path=<span class="code-quote">"/fedizhelloworld"</span> docBase=<span class="code-quote">"fedizhelloworld"</span>&gt;</span>
-    &lt;Valve className=<span class="code-quote">"org.apache.cxf.fediz.tomcat.FederationAuthenticator"</span>
-      configFile=<span class="code-quote">"conf/Fediz_config.xml"</span> /&gt;
-  <span class="code-tag">&lt;/Context&gt;</span>
-</pre>
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[ 
+  &lt;Context path="/fedizhelloworld" docBase="fedizhelloworld"&gt;
+    &lt;Valve className="org.apache.cxf.fediz.tomcat.FederationAuthenticator"
+      configFile="conf/Fediz_config.xml" /&gt;
+  &lt;/Context&gt;
+]]></script>
 </div></div>
 
 <p>The Fediz configuration file is a Servlet container independent configuration file and described <a shape="rect" href="fediz-configuration.html" title="Fediz Configuration">here</a></p>

Modified: websites/production/cxf/content/fediz-websphere.html
==============================================================================
--- websites/production/cxf/content/fediz-websphere.html (original)
+++ websites/production/cxf/content/fediz-websphere.html Mon Jun 24 17:10:51 2013
@@ -26,7 +26,17 @@
 <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 Websphere">
 
-
+  <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 Websphere
     </title>
@@ -44,19 +54,15 @@ Apache CXF -- Fediz Websphere
     <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"><p>
+      <!-- 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>
 </p></div>
-          <!-- Banner -->
-        </div>
-      </div>
+      <!-- Banner -->
       <div id="top-menu">
         <table border="0" cellpadding="1" cellspacing="0" width="100%">
           <tr>
@@ -170,11 +176,14 @@ add the previously created directory to 
 
 <p>This is a sample snippet for an HTTPS configuration:</p>
 
-<div class="error"><span class="error">Unknown macro: {code}</span> 
-<p>    &lt;Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"<br clear="none">
-               maxThreads="150" scheme="https" secure="true"<br clear="none">
-               keystoreFile="tomcat-rp.jks"<br clear="none">
-               keystorePass="tompass" sslProtocol="TLS" /&gt;</p></div>
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+    &lt;Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
+               maxThreads="150" scheme="https" secure="true"
+               keystoreFile="tomcat-rp.jks"
+               keystorePass="tompass" sslProtocol="TLS" /&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.  Note the Tomcat keystore here is different from the one used to configure the Tomcat-IDP instance.</p>
 
@@ -196,26 +205,35 @@ add the previously created directory to 
 <p>You can either configure the context in the server.xml or in META-INF/context.xml as part of your WAR file.</p>
 
 <h6><a shape="rect" name="FedizWebsphere-METAINF%2Fcontext.xml"></a>META-INF/context.xml</h6>
-<div class="error"><span class="error">Unknown macro: {code}</span> 
-<p>  &lt;Context&gt; <br clear="none">
-    &lt;Valve className="org.apache.cxf.fediz.tomcat.FederationAuthenticator"<br clear="none">
-      configFile="conf/Fediz_config.xml" /&gt;<br clear="none">
-  &lt;/Context&gt; </p></div>
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[ 
+  &lt;Context&gt; 
+    &lt;Valve className="org.apache.cxf.fediz.tomcat.FederationAuthenticator"
+      configFile="conf/Fediz_config.xml" /&gt;
+  &lt;/Context&gt; 
+]]></script>
+</div></div>
 
 <h6><a shape="rect" name="FedizWebsphere-Hostlevelinserver.xml"></a>Host level in server.xml</h6>
-<div class="error"><span class="error">Unknown macro: {code}</span> 
-<p>  &lt;Host name="localhost"  appBase="webapps"<br clear="none">
-        unpackWARs="true" autoDeploy="true"&gt;<br clear="none">
-    &lt;Valve className="org.apache.cxf.fediz.tomcat.FederationAuthenticator"<br clear="none">
-           configFile="conf/Fediz_config.xml" /&gt;<br clear="none">
-  &lt;/Host&gt;</p></div> 
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[ 
+  &lt;Host name="localhost"  appBase="webapps"
+        unpackWARs="true" autoDeploy="true"&gt;
+    &lt;Valve className="org.apache.cxf.fediz.tomcat.FederationAuthenticator"
+           configFile="conf/Fediz_config.xml" /&gt;
+  &lt;/Host&gt;
+]]></script>
+</div></div> 
 
 <h6><a shape="rect" name="FedizWebsphere-Contextlevelinserver.xml"></a>Context level in server.xml</h6>
-<div class="error"><span class="error">Unknown macro: {code}</span> 
-<p>  &lt;Context path="/fedizhelloworld" docBase="fedizhelloworld"&gt;<br clear="none">
-    &lt;Valve className="org.apache.cxf.fediz.tomcat.FederationAuthenticator"<br clear="none">
-      configFile="conf/Fediz_config.xml" /&gt;<br clear="none">
-  &lt;/Context&gt;</p></div>
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[ 
+  &lt;Context path="/fedizhelloworld" docBase="fedizhelloworld"&gt;
+    &lt;Valve className="org.apache.cxf.fediz.tomcat.FederationAuthenticator"
+      configFile="conf/Fediz_config.xml" /&gt;
+  &lt;/Context&gt;
+]]></script>
+</div></div>
 
 <p>The Fediz configuration file is a Servlet container independent configuration file and described <a shape="rect" href="fediz-configuration.html" title="Fediz Configuration">here</a></p>
 

Modified: websites/production/cxf/content/fediz.html
==============================================================================
--- websites/production/cxf/content/fediz.html (original)
+++ websites/production/cxf/content/fediz.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">
+
+
     <title>
 Apache CXF -- Fediz
     </title>
@@ -42,19 +44,15 @@ Apache CXF -- Fediz
     <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
 
 
 <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/getting-involved.html
==============================================================================
--- websites/production/cxf/content/getting-involved.html (original)
+++ websites/production/cxf/content/getting-involved.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 - Getting Involved">
+
+
     <title>
 Apache CXF -- Getting Involved
     </title>
@@ -42,19 +44,15 @@ Apache CXF -- Getting Involved
     <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 -- Getting Involved
 
 
 <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/index.html
==============================================================================
--- websites/production/cxf/content/index.html (original)
+++ websites/production/cxf/content/index.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 - Index">
+
+
     <title>
 Apache CXF -- Index
     </title>
@@ -42,19 +44,15 @@ Apache CXF -- Index
     <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 -- Index
 
 
 <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/logo-contest.html
==============================================================================
--- websites/production/cxf/content/logo-contest.html (original)
+++ websites/production/cxf/content/logo-contest.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 - Logo Contest">
+
+
     <title>
 Apache CXF -- Logo Contest
     </title>
@@ -42,19 +44,15 @@ Apache CXF -- Logo Contest
     <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 -- Logo Contest
 
 
 <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/mailing-lists.html
==============================================================================
--- websites/production/cxf/content/mailing-lists.html (original)
+++ websites/production/cxf/content/mailing-lists.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 - Mailing Lists">
+
+
     <title>
 Apache CXF -- Mailing Lists
     </title>
@@ -42,19 +44,15 @@ Apache CXF -- Mailing Lists
     <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 -- Mailing Lists
 
 
 <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/navigation.html
==============================================================================
--- websites/production/cxf/content/navigation.html (original)
+++ websites/production/cxf/content/navigation.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 - Navigation">
+
+
     <title>
 Apache CXF -- Navigation
     </title>
@@ -42,19 +44,15 @@ Apache CXF -- Navigation
     <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 -- Navigation
 
 
 <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">
@@ -147,8 +145,8 @@ Apache CXF -- Navigation
 
 
 <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/note-on-cve-2011-1096.html
==============================================================================
--- websites/production/cxf/content/note-on-cve-2011-1096.html (original)
+++ websites/production/cxf/content/note-on-cve-2011-1096.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 - Note on CVE-2011-1096">
+
+
     <title>
 Apache CXF -- Note on CVE-2011-1096
     </title>
@@ -42,19 +44,15 @@ Apache CXF -- Note on CVE-2011-1096
     <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 -- Note on CVE-2011-1096
 
 
 <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/note-on-cve-2011-2487.html
==============================================================================
--- websites/production/cxf/content/note-on-cve-2011-2487.html (original)
+++ websites/production/cxf/content/note-on-cve-2011-2487.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 - Note on CVE-2011-2487">
+
+
     <title>
 Apache CXF -- Note on CVE-2011-2487
     </title>
@@ -42,19 +44,15 @@ Apache CXF -- Note on CVE-2011-2487
     <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 -- Note on CVE-2011-2487
 
 
 <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/people.html
==============================================================================
--- websites/production/cxf/content/people.html (original)
+++ websites/production/cxf/content/people.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 - People">
+
+
     <title>
 Apache CXF -- People
     </title>
@@ -42,19 +44,15 @@ Apache CXF -- People
     <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 -- People
 
 
 <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/privacy-policy.html
==============================================================================
--- websites/production/cxf/content/privacy-policy.html (original)
+++ websites/production/cxf/content/privacy-policy.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 - Privacy Policy">
+
+
     <title>
 Apache CXF -- Privacy Policy
     </title>
@@ -42,19 +44,15 @@ Apache CXF -- Privacy Policy
     <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 -- Privacy Policy
 
 
 <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/project-status.html
==============================================================================
--- websites/production/cxf/content/project-status.html (original)
+++ websites/production/cxf/content/project-status.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 - Project Status">
+
+
     <title>
 Apache CXF -- Project Status
     </title>
@@ -42,19 +44,15 @@ Apache CXF -- Project Status
     <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 -- Project Status
 
 
 <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/quicklinks.html
==============================================================================
--- websites/production/cxf/content/quicklinks.html (original)
+++ websites/production/cxf/content/quicklinks.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 - QuickLinks">
+
+
     <title>
 Apache CXF -- QuickLinks
     </title>
@@ -42,19 +44,15 @@ Apache CXF -- QuickLinks
     <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 -- QuickLinks
 
 
 <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/release-management.html
==============================================================================
--- websites/production/cxf/content/release-management.html (original)
+++ websites/production/cxf/content/release-management.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 - Release Management">
+
+  <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 -- Release Management
     </title>
@@ -42,19 +53,15 @@ Apache CXF -- Release Management
     <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 -- Release Management
 
 
 <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">
@@ -163,7 +170,7 @@ Apache CXF -- Release Management
 <div class="panelMacro"><table class="noteMacro"><colgroup span="1"><col span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" valign="top"><img align="middle" src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1">Don't manually update the POM versions from X.Y.Z-SNAPSHOT to X.Y.Z, the Maven Release Plugin commands below will automatically take care of that.  Also, prior to performing the release you'll need to have your Apache LDAP information configured in your Maven settings.xml file:
 
 <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;server&gt;                                                                
    &lt;id&gt;apache.releases.https&lt;/id&gt;
@@ -171,7 +178,7 @@ Apache CXF -- Release Management
    &lt;password&gt;yourLDAPPassword&lt;/password&gt;
 &lt;/server&gt;
 ...
-</pre>
+]]></script>
 </div></div></td></tr></table></div>
 
 <p>Then, to actually perform the release, run the below commands.  </p>
@@ -206,12 +213,12 @@ will pick up the left task from last run
 <a shape="rect" class="external-link" href="https://dist.apache.org/repos/dist/release/cxf">https://dist.apache.org/repos/dist/release/cxf</a><br clear="none">
 after you commit they will be live on dist.apache.org fairly quickly, but it will still take time for the mirrors to get copies.   It's likely easier to make the directory via an svn command, check out just that directory, and then add the files.  The dist area is rather large (400MB or so) so checking out the entire thing may be slow. 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
-svn mkdir https:<span class="code-comment">//dist.apache.org/repos/dist/release/cxf/2.6.3
-</span>svn checkout https:<span class="code-comment">//dist.apache.org/repos/dist/release/cxf/2.6.3
-</span>....  add files to 2.6.3 .....
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+svn mkdir https://dist.apache.org/repos/dist/release/cxf/2.6.3
+svn checkout https://dist.apache.org/repos/dist/release/cxf/2.6.3
+....  add files to 2.6.3 .....
 svn commit
-</pre>
+]]></script>
 </div></div></li></ul>
 
 

Modified: websites/production/cxf/content/resources-and-articles.html
==============================================================================
--- websites/production/cxf/content/resources-and-articles.html (original)
+++ websites/production/cxf/content/resources-and-articles.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 - Resources and Articles">
+
+
     <title>
 Apache CXF -- Resources and Articles
     </title>
@@ -42,19 +44,15 @@ Apache CXF -- Resources and Articles
     <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 -- Resources and Articles
 
 
 <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/roadmap.html
==============================================================================
--- websites/production/cxf/content/roadmap.html (original)
+++ websites/production/cxf/content/roadmap.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 - Roadmap">
+
+
     <title>
 Apache CXF -- Roadmap
     </title>
@@ -42,19 +44,15 @@ Apache CXF -- Roadmap
     <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 -- Roadmap
 
 
 <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">



Mime
View raw message