You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2017/09/13 15:05:57 UTC

svn commit: r1018111 [31/33] - in /websites/production/cxf/content: ./ cache/ docs/

Modified: websites/production/cxf/content/dosgi-discovery-demo-page.html
==============================================================================
--- websites/production/cxf/content/dosgi-discovery-demo-page.html (original)
+++ websites/production/cxf/content/dosgi-discovery-demo-page.html Wed Sep 13 15:05:52 2017
@@ -125,7 +125,7 @@ Apache CXF -- DOSGi Discovery Demo page
 
 <p>The <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/cxf/dosgi/trunk/samples/discovery/interface/src/main/java/org/apache/cxf/dosgi/samples/discovery/DisplayService.java">Display Service interface</a> is as follows:</p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">public interface DisplayService {
+<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">public interface DisplayService {
     boolean displayText(String text);
     String getID();
 }</pre>
@@ -134,7 +134,7 @@ Apache CXF -- DOSGi Discovery Demo page
 <h2 id="DOSGiDiscoveryDemopage-TheDisplayController(serviceconsumer)">The Display Controller (service consumer)</h2>
 <p>Let's start with the controller, which is a consumer to the the DisplayService. It's simply using an OSGi ServiceTracker to consume all DisplayService services. It also uses a Scheduled Executor to periodically send test messages to all registered displays. Here's the <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/cxf/dosgi/trunk/samples/discovery/client/src/main/java/org/apache/cxf/dosgi/samples/discovery/consumer/Activator.java">Activator</a>:</p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">public class Activator implements BundleActivator {
+<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">public class Activator implements BundleActivator {
     private ServiceTracker tracker;
     private Map&lt;DisplayService, String&gt; displays = new ConcurrentHashMap&lt;DisplayService, String&gt;();
 
@@ -170,7 +170,7 @@ Apache CXF -- DOSGi Discovery Demo page
 
 <h3 id="DOSGiDiscoveryDemopage-Runningthecontroller">Running the controller</h3>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
 -&gt; install http://repo1.maven.org/maven2/org/apache/cxf/dosgi/samples/cxf-dosgi-ri-samples-discovery-interface/1.2/cxf-dosgi-ri-samples-discovery-interface-1.2.jar
 -&gt; start http://repo1.maven.org/maven2/org/apache/cxf/dosgi/samples/cxf-dosgi-ri-samples-discovery-client/1.2/cxf-dosgi-ri-samples-discovery-client-1.2.jar
 
@@ -189,7 +189,7 @@ START LEVEL 1
 </div></div>
 <p>After a brief moment, you will see messages appearing on the controller side. These are the messages sent to all registered displays. Since there are none, they won't show up anywhere just yet.</p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">Sending text to displays: some text 1
+<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">Sending text to displays: some text 1
 Sending text to displays: some text 2
 Sending text to displays: some text 3
 ...</pre>
@@ -198,7 +198,7 @@ Sending text to displays: some text 3
 <h2 id="DOSGiDiscoveryDemopage-TheRemoteDisplays(serviceimplementation)">The Remote Displays (service implementation)</h2>
 <p>Every Display in the system registers a <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/cxf/dosgi/trunk/samples/discovery/impl/src/main/java/org/apache/cxf/dosgi/samples/discovery/impl/DisplayServiceImpl.java">Display Service implementation</a> in the local Service Registry. This happens in the <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/cxf/dosgi/trunk/samples/discovery/impl/src/main/java/org/apache/cxf/dosgi/samples/discovery/impl/Activator.java">Activator</a> of the service implementation bundle. It adds the properties to make the service available remotely as well:</p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">public class Activator implements BundleActivator {
+<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">public class Activator implements BundleActivator {
     private ServiceRegistration reg;
 
     public void start(BundleContext bc) throws Exception {        
@@ -224,7 +224,7 @@ Sending text to displays: some text 3
 
 <p>Once the provider side bundles are started:</p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">-&gt; install http://repo1.maven.org/maven2/org/apache/cxf/dosgi/samples/cxf-dosgi-ri-samples-discovery-interface/1.2/cxf-dosgi-ri-samples-discovery-interface-1.2.jar
+<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">-&gt; install http://repo1.maven.org/maven2/org/apache/cxf/dosgi/samples/cxf-dosgi-ri-samples-discovery-interface/1.2/cxf-dosgi-ri-samples-discovery-interface-1.2.jar
 -&gt; start http://repo1.maven.org/maven2/org/apache/cxf/dosgi/samples/cxf-dosgi-ri-samples-discovery-impl/1.2/cxf-dosgi-ri-samples-discovery-impl-1.2.jar
 
 -&gt; ps
@@ -242,7 +242,7 @@ START LEVEL 1
 </div></div>
 <p>You will start seeing the messages appear on the remote display:</p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">DisplayService [myhost:1816]: some text 145
+<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">DisplayService [myhost:1816]: some text 145
 DisplayService [myhost:1816]: some text 146
 ... </pre>
 </div></div>
@@ -252,7 +252,7 @@ DisplayService [myhost:1816]: some text
 
 <p>ZooKeeper comes with a client program (<code>zkCli</code>) that allows you to look in the ZooKeeper virtual filesystem. All of the OSGi-registered services are stored in a virtual directory under the node <code>/osgi/service_registry</code>. The virtual directory name is based on the fully qualified name of the interface that is implemented by the remote service. So in the case of the DisplayService the remote service metadata is stored under <code>/osgi/service_registry/org/apache/cxf/dosgi/samples/discovery/DisplayService</code>:</p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
 $ bin/zkCli localhost:2181
 
 -&gt; ls /osgi/service_registry/org/apache/cxf/dosgi/samples/discovery/DisplayService
@@ -263,7 +263,7 @@ Processing ls
 <p>Every instance of a remote service that implements the org.apache.cxf.dosgi.samples.discovery.DisplayService interface will get a virtual file in this location. The virtual file is only there for the lifetime of the service. If you stop the service, or kill the OSGi container that hosts it, its associated file in this directory will disappear.<br clear="none">
 You can obtain the information stored in the node, to get an idea of the metadata that's being communicated using the Discovery system:</p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">-&gt; get /osgi/service_registry/org/apache/cxf/dosgi/samples/discovery/DisplayService/myhost#52807##display
+<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">-&gt; get /osgi/service_registry/org/apache/cxf/dosgi/samples/discovery/DisplayService/myhost#52807##display
 &lt;?xml version="1.0" encoding="UTF-8"?&gt;
 &lt;endpoint-descriptions xmlns="http://www.osgi.org/xmlns/rsa/v1.0.0"&gt;
   &lt;endpoint-description&gt;

Modified: websites/production/cxf/content/dosgi-discovery.html
==============================================================================
--- websites/production/cxf/content/dosgi-discovery.html (original)
+++ websites/production/cxf/content/dosgi-discovery.html Wed Sep 13 15:05:52 2017
@@ -123,7 +123,7 @@ Apache CXF -- DOSGi Discovery
 
 <p>Once you have ZooKeeper installed (the current version used is 3.2.1), run its server:</p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">$ bin/zkServer
+<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">$ bin/zkServer
 ... log messages ...
 2009-06-10 13:23:27,288 - INFO  [main:FileTxnSnapLog@198] - Snapshotting: 0
 </pre>
@@ -132,7 +132,7 @@ Apache CXF -- DOSGi Discovery
 
 <p>You can check that all is well by running the client program:</p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">$ bin/zkCli -server localhost:2181
+<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">$ bin/zkCli -server localhost:2181
 --&gt; ls /
 Processing ls
 [zookeeper]</pre>
@@ -145,7 +145,7 @@ Processing ls
 <h3 id="DOSGiDiscovery-SingleBundleDistribution">Single Bundle Distribution</h3>
 <p>When you are using the CXF-DOSGi Single-Bundle distro, you automatically get the Discovery functionality with that.</p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
 -&gt; install http://repo1.maven.org/maven2/org/osgi/org.osgi.compendium/4.2.0/org.osgi.compendium-4.2.0.jar
 Bundle ID: 4
 -&gt; install http://www.apache.org/dist/cxf/dosgi/1.1/cxf-dosgi-ri-singlebundle-distribution-1.1.jar
@@ -179,7 +179,7 @@ START LEVEL 1
 
 <p>An easy way to set the configuration, it by placing a file called <code>org.apache.cxf.dosgi.discovery.zookeeper.cfg</code> in the load directory created by the FileInstall bundle with the following content:</p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
 zookeeper.host = 127.0.0.1
 </pre>
 </div></div>
@@ -187,7 +187,7 @@ zookeeper.host = 127.0.0.1
 
 <p>You can always check the configuration of the ZooKeeper client by looking at the ManagedService registered by the CXF/Discovery bundle:</p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">-&gt; services 5
+<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">-&gt; services 5
 
 Distributed OSGi Zookeeper-Based Discovery Single-Bundle Distribution (6) provides:
 -----------------------------------------------------------------------------------

Modified: websites/production/cxf/content/dosgi-ds-demo-page.html
==============================================================================
--- websites/production/cxf/content/dosgi-ds-demo-page.html (original)
+++ websites/production/cxf/content/dosgi-ds-demo-page.html Wed Sep 13 15:05:52 2017
@@ -127,7 +127,7 @@ Declarative Services is similar to Sprin
 <span class="confluence-embedded-file-wrapper"><img class="confluence-embedded-image" src="dosgi-ds-demo-page.data/dosgi_cxf_ds.png"></span><br clear="none">
 The <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/cxf/dosgi/trunk/samples/ds/interface/src/main/java/org/apache/cxf/dosgi/samples/ds/AdderService.java">Adder Service interface</a> is as follows:</p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">public interface AdderService {
+<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">public interface AdderService {
     int add(int a, int b);
 }</pre>
 </div></div>
@@ -138,7 +138,7 @@ The <a shape="rect" class="external-link
 
 <p>In the <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/cxf/dosgi/trunk/samples/ds/impl/src/main/resources/OSGI-INF/component.xml"><code>OSGI-INF/component.xml</code></a> file the AdderServiceImpl is instantiated and registered with the OSGi service registry with the distribution properties. These properties instruct. Distributed OSGi into making the service available on <a shape="rect" class="external-link" href="http://localhost:9090/adder" rel="nofollow">http://localhost:9090/adder</a>.</p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">&lt;scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="DS Service Sample"&gt;
+<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="DS Service Sample"&gt;
   &lt;implementation class="org.apache.cxf.dosgi.samples.ds.impl.AdderServiceImpl"/&gt;
 
   &lt;property name="service.exported.interfaces" value="*" /&gt;
@@ -152,7 +152,7 @@ The <a shape="rect" class="external-link
 </div></div>
 <p>Note that the <code>META-INF/MANIFEST.MF</code> file needs to contain a special DS header that tells the system where to find this file. In case of this demo, this header is added by the Maven build system. The header used by the demo is:</p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">  Service-Component: OSGI-INF/component.xml</pre>
+<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">  Service-Component: OSGI-INF/component.xml</pre>
 </div></div>
 
 <p>So let's install the server side in Equinox, together with the Equinox DS implementation. You can do this from the Equinox command line, but in this document I'll launch Equinox from within Eclipse (last tried with Eclipse 3.6).<br clear="none">
@@ -166,7 +166,7 @@ Next I'll create an OSGi Framework launc
 
 <p>Now run the OSGi container, you will get a setup like this:</p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">osgi&gt; ss
+<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">osgi&gt; ss
 
 Framework is launched.
 
@@ -179,7 +179,7 @@ id	State       Bundle
 </div></div>
 <p>Now I can install the DOSGi DS bundles in the OSGi container directly from the maven repository.</p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">osgi&gt; install http://repo1.maven.org/maven2/org/apache/cxf/dosgi/samples/cxf-dosgi-ri-samples-ds-interface/1.2/cxf-dosgi-ri-samples-ds-interface-1.2.jar
+<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">osgi&gt; install http://repo1.maven.org/maven2/org/apache/cxf/dosgi/samples/cxf-dosgi-ri-samples-ds-interface/1.2/cxf-dosgi-ri-samples-ds-interface-1.2.jar
 Bundle id is 5
 
 osgi&gt; install http://repo1.maven.org/maven2/org/apache/cxf/dosgi/samples/cxf-dosgi-ri-samples-ds-impl/1.2/cxf-dosgi-ri-samples-ds-impl-1.2.jar
@@ -196,7 +196,7 @@ osgi&gt; start 6
 
 <p>The service consumer is also created using DS. DS creates an AdderConsumer component which is injected with a reference to the remote AdderService. Like in Spring, the injection is done by DS, which makes the code nice and simple. When the injection is done, the start() method is called.</p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">public class AdderConsumer {
+<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">public class AdderConsumer {
     private AdderService adder;
 
     public void bindAdder(AdderService a) {
@@ -214,18 +214,18 @@ osgi&gt; start 6
 </div></div>
 <p>The client side bundle contains an <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/cxf/dosgi/trunk/samples/ds/client/src/main/resources/OSGI-INF/component.xml"><code>OSGI-INF/component.xml</code></a> which drives the component creation and injection:</p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">&lt;scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="start"&gt;
+<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="start"&gt;
    &lt;implementation class="org.apache.cxf.dosgi.samples.ds.consumer.AdderConsumer"/&gt;
    &lt;reference interface="org.apache.cxf.dosgi.samples.ds.AdderService" name="AdderService" cardinality="1..1" policy="dynamic" bind="bindAdder" unbind="unbindAdder"/&gt;
 &lt;/scr:component&gt;</pre>
 </div></div>
 <p>As on the service provider side, the client side bundle needs to contain the DS header in the <code>META-INF/MANIFEST.MF</code>:</p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">  Service-Component: OSGI-INF/component.xml</pre>
+<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">  Service-Component: OSGI-INF/component.xml</pre>
 </div></div>
 <p>As in the Greeter demo, the client side needs to be configured to know where the remote service actually is. This is one in the <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/cxf/dosgi/trunk/samples/ds/client/src/main/resources/OSGI-INF/remote-service/remote-services.xml"><code>OSGI-INF/remote-service/remote-services.xml</code></a> file:</p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">&lt;endpoint-descriptions xmlns="http://www.osgi.org/xmlns/rsa/v1.0.0"&gt;
+<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;endpoint-descriptions xmlns="http://www.osgi.org/xmlns/rsa/v1.0.0"&gt;
   &lt;endpoint-description&gt;
     &lt;property name="objectClass"&gt;
       &lt;array&gt;
@@ -241,7 +241,7 @@ osgi&gt; start 6
 
 
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">osgi&gt; install http://repo1.maven.org/maven2/org/apache/cxf/dosgi/samples/cxf-dosgi-ri-samples-ds-interface/1.2/cxf-dosgi-ri-samples-ds-interface-1.2.jar
+<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">osgi&gt; install http://repo1.maven.org/maven2/org/apache/cxf/dosgi/samples/cxf-dosgi-ri-samples-ds-interface/1.2/cxf-dosgi-ri-samples-ds-interface-1.2.jar
 Bundle id is 5
 
 osgi&gt; install http://repo1.maven.org/maven2/org/apache/cxf/dosgi/samples/cxf-dosgi-ri-samples-ds-client/1.2/cxf-dosgi-ri-samples-ds-client-1.2.jar
@@ -253,7 +253,7 @@ Using adder service: 1 + 1 = 2</pre>
 </div></div>
 <p>The remote adder service has now been invoked. You will see the following line on the server side Equinox window:</p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">Adder service invoked: 1 + 1 = 2</pre>
+<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">Adder service invoked: 1 + 1 = 2</pre>
 </div></div>
 
 <h3 id="DOSGiDSDemopage-ConsumerNote">Consumer Note</h3>

Modified: websites/production/cxf/content/dosgi-multi-bundle-distribution.html
==============================================================================
--- websites/production/cxf/content/dosgi-multi-bundle-distribution.html (original)
+++ websites/production/cxf/content/dosgi-multi-bundle-distribution.html Wed Sep 13 15:05:52 2017
@@ -117,7 +117,7 @@ Apache CXF -- DOSGi Multi Bundle Distrib
 <p>Change directory to the felix framework main dir. Unpack the cxf dosgi distro there. Append the felix config from the distro to the felix config.properties. Start felix.</p>
 
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
 tar -xzvf cxf-dosgi-ri-multibundle-distribution-1.4-SNAPSHOT-dir.tar.gz
 cat apache-cxf-dosgi-ri-1.4-SNAPSHOT/conf/felix.config.properties.append &gt;&gt; conf/config.properties
 java -jar bin/felix.jar
@@ -134,14 +134,14 @@ java -jar bin/felix.jar
 
 <p>At the end the <code>dosgi_conf/config.ini</code> file looks like this:</p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">org.ops4j.pax.web.session.timeout=30
+<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">org.ops4j.pax.web.session.timeout=30
 osgi.bundles=org.eclipse.osgi.services@start, \
 c:/apache-cxf-dosgi-ri-1.3/dosgi_bundles/geronimo-annotation_1.0_spec-1.1.1.jar@start, c:/apache-cxf-dosgi-ri-1.3/dosgi_bundles/geronimo-activation_1.1_spec-1.0.2.jar@start, 
 ... and so on ...</pre>
 </div></div>
 <p>Now start Equinox and verify that all bundles are in state Active</p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
 java -jar plugins/org.eclipse.osgi_3.6.2.R36x_v20110210.jar -console -configuration dosgi_conf
 osgi&gt; ss
 </pre>

Modified: websites/production/cxf/content/dosgi-spring-dm-demo-page.html
==============================================================================
--- websites/production/cxf/content/dosgi-spring-dm-demo-page.html (original)
+++ websites/production/cxf/content/dosgi-spring-dm-demo-page.html Wed Sep 13 15:05:52 2017
@@ -124,7 +124,7 @@ Apache CXF -- DOSGi Spring-DM Demo page
 
 <p>The <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/cxf/dosgi/trunk/samples/spring_dm/interface/src/main/java/org/apache/cxf/dosgi/samples/springdm/DinnerService.java">Dinner Service interface</a> is as follows:</p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">public interface DinnerService {
+<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">public interface DinnerService {
     List&lt;Restaurant&gt; findRestaurants(String searchQuery);
 }</pre>
 </div></div>
@@ -135,7 +135,7 @@ Apache CXF -- DOSGi Spring-DM Demo page
 
 <p>The interesting bit is in the <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/cxf/dosgi/trunk/samples/spring_dm/impl/src/main/resources/META-INF/spring/spring.xml"><code>META-INF/spring/spring.xml</code></a> file. This file creates the DinnerServiceImpl bean and registers it with the OSGi Service Registry. It also sets the <code>osgi.remote.interfaces</code> property on the service to mark is as suitable for remoting. Here are the important parts of the <code>spring.xml</code> file:</p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
 &lt;beans xmlns:osgi="..."&gt;
   &lt;osgi:service interface="org.apache.cxf.dosgi.samples.springdm.DinnerService"&gt;
     &lt;osgi:service-properties&gt;
@@ -151,7 +151,7 @@ Apache CXF -- DOSGi Spring-DM Demo page
 
 <p>In this example, the bundles are installed in Felix.</p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">-&gt; start http://repo2.maven.org/maven2/org/apache/cxf/dosgi/samples/cxf-dosgi-ri-samples-spring-dm-interface/1.2/cxf-dosgi-ri-samples-spring-dm-interface-1.2.jar
+<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">-&gt; start http://repo2.maven.org/maven2/org/apache/cxf/dosgi/samples/cxf-dosgi-ri-samples-spring-dm-interface/1.2/cxf-dosgi-ri-samples-spring-dm-interface-1.2.jar
 -&gt; start http://repo2.maven.org/maven2/org/apache/cxf/dosgi/samples/cxf-dosgi-ri-samples-spring-dm-impl/1.2/cxf-dosgi-ri-samples-spring-dm-impl-1.2.jar
 ... log messages may appear ...
 -&gt; ps
@@ -170,7 +170,7 @@ START LEVEL 32
 <h2 id="DOSGiSpring-DMDemopage-TheDinnerServiceConsumer">The Dinner Service Consumer</h2>
 <p>As on the remote service provider side, the service consumer is also created using spring. Spring creates a <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/cxf/dosgi/trunk/samples/spring_dm/client/src/main/java/org/apache/cxf/dosgi/samples/springdm/client/DinnerServiceConsumer.java">DinnerServiceConsumer</a> bean which is injected with the a proxy to the remote DinnerService. The injection is all done by Spring, which makes the code extremely simple. When Spring is done injecting, it calls the <code>start()</code> method where the remote service is used. </p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">public class DinnerServiceConsumer {
+<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">public class DinnerServiceConsumer {
     DinnerService dinnerService;
     
     public void setDinnerService(DinnerService ds) {
@@ -189,7 +189,7 @@ START LEVEL 32
 
 <p>The client side <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/cxf/dosgi/trunk/samples/spring_dm/client/src/main/resources/META-INF/spring/client-spring.xml"><code>META-INF/spring/spring.xml</code></a> file is also really simple. It simply declares a dependency on the OSGi DinnerService, which is injected into the DinnerServiceConsumer bean. </p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">
+<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">
 &lt;beans&gt;
   &lt;osgi:reference id="dinnerServiceRef" interface="org.apache.cxf.dosgi.samples.springdm.DinnerService"/&gt;
   
@@ -202,7 +202,7 @@ START LEVEL 32
 </div></div>
 <p>Like in the Greeter demo, the client side needs to be configured to know where the remote service actually is. When using a Discovery system this configuration is provided dynamically via Discovery, see the <a shape="rect" href="dosgi-discovery-demo-page.html">DOSGi Discovery Demo page</a>. In this demo this information is provided statically in a <a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/cxf/dosgi/trunk/samples/spring_dm/client/src/main/resources/OSGI-INF/remote-service/remote-services.xml"><code>OSGI-INF/remote-service/remote-services.xml</code></a> file. </p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">&lt;endpoint-descriptions xmlns="http://www.osgi.org/xmlns/rsa/v1.0.0"&gt;
+<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;endpoint-descriptions xmlns="http://www.osgi.org/xmlns/rsa/v1.0.0"&gt;
   &lt;endpoint-description&gt;
     &lt;property name="objectClass"&gt;
       &lt;array&gt;
@@ -216,7 +216,7 @@ START LEVEL 32
 </div></div>
 <p>Install and run the consumer side of the demo in a separate Felix instance:</p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">-&gt; start http://repo2.maven.org/maven2/org/apache/cxf/dosgi/samples/cxf-dosgi-ri-samples-spring-dm-interface/1.2/cxf-dosgi-ri-samples-spring-dm-interface-1.2.jar
+<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">-&gt; start http://repo2.maven.org/maven2/org/apache/cxf/dosgi/samples/cxf-dosgi-ri-samples-spring-dm-interface/1.2/cxf-dosgi-ri-samples-spring-dm-interface-1.2.jar
 -&gt; start http://repo2.maven.org/maven2/org/apache/cxf/dosgi/samples/cxf-dosgi-ri-samples-spring-dm-client/1.2/cxf-dosgi-ri-samples-spring-dm-client-1.2.jar
 ... log messages may appear, at some point the consumer will make an invocation on the remote service, you will see:
 Found the following restaurants:
@@ -226,7 +226,7 @@ Found the following restaurants:
 </div></div>
 <p>And on the service provider side, you can see that it has been invoked as the following message appears: </p>
 <div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">-&gt; Hey! Someone's using the Dinner Service! Query: nice and not too expensive!</pre>
+<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">-&gt; Hey! Someone's using the Dinner Service! Query: nice and not too expensive!</pre>
 </div></div></div>
            </div>
            <!-- Content -->

Modified: websites/production/cxf/content/download.html
==============================================================================
--- websites/production/cxf/content/download.html (original)
+++ websites/production/cxf/content/download.html Wed Sep 13 15:05:52 2017
@@ -110,14 +110,14 @@ Apache CXF -- Download
            <!-- Content -->
            <div class="wiki-content">
 <div id="ConfluenceContent"><h1 id="Download-Releases">Releases</h1><h2 id="Download-3.2.0">3.2.0</h2><p>The 3.2.0 release is our latest release representing a significant amount of work on new features, enhancements, code cleanups, etc... For a complete list of new features, API changes, etc... please see the <a shape="rect" href="http://cxf.apache.org/docs/32-migration-guide.html">migration guide</a>&#160;for more details.</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>File</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>MD5</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>SHA1</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="exter
 nal-link" href="http://www.apache.org/dyn/closer.lua/cxf/3.2.0/apache-cxf-3.2.0-src.tar.gz">apache-cxf-3.2.0-src.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/cxf/3.2.0/apache-cxf-3.2.0-src.tar.gz.md5">apache-cxf-3.2.0-src.tar.gz.md5</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/cxf/3.2.0/apache-cxf-3.2.0-src.tar.gz.sha1">apache-cxf-3.2.0-src.tar.gz.sha1</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/cxf/3.2.0/apache-cxf-3.2.0-src.tar.gz.asc">apache-cxf-3.2.0-src.tar.gz.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.lua/cxf/3.2.0/apache-cxf-
 3.2.0-src.zip">apache-cxf-3.2.0-src.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/cxf/3.2.0/apache-cxf-3.2.0-src.zip.md5">apache-cxf-3.2.0-src.zip.md5</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/cxf/3.2.0/apache-cxf-3.2.0-src.zip.sha1">apache-cxf-3.2.0-src.zip.sha1</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/cxf/3.2.0/apache-cxf-3.2.0-src.zip.asc">apache-cxf-3.2.0-src.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.lua/cxf/3.2.0/apache-cxf-3.2.0.tar.gz">apache-cxf-3.2.0.tar.gz</a></p></td><td colspan="1" rowspan="1" class="
 confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/cxf/3.2.0/apache-cxf-3.2.0.tar.gz.md5">apache-cxf-3.2.0.tar.gz.md5</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/cxf/3.2.0/apache-cxf-3.2.0.tar.gz.sha1">apache-cxf-3.2.0.tar.gz.sha1</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/cxf/3.2.0/apache-cxf-3.2.0.tar.gz.asc">apache-cxf-3.2.0.tar.gz.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.lua/cxf/3.2.0/apache-cxf-3.2.0.zip">apache-cxf-3.2.0.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/cxf/3.2.0/apache-cxf-3.
 2.0.zip.md5">apache-cxf-3.2.0.zip.md5</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/cxf/3.2.0/apache-cxf-3.2.0.zip.sha1">apache-cxf-3.2.0.zip.sha1</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/cxf/3.2.0/apache-cxf-3.2.0.zip.asc">apache-cxf-3.2.0.zip.asc</a></p></td></tr></tbody></table></div><h2 id="Download-3.1.13">3.1.13</h2><p>The 3.1.13 release is our latest patch release for 3.1.x. For a complete list of new features, API changes, etc... please see the <a shape="rect" href="cxf-3113-release-notes.html">release notes</a>&#160;and <a shape="rect" href="http://cxf.apache.org/docs/31-migration-guide.html">migration guide</a>.</p><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="conflu
 enceTh"><p>File</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>MD5</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>SHA1</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.lua/cxf/3.1.13/apache-cxf-3.1.13-src.tar.gz">apache-cxf-3.1.13-src.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/cxf/3.1.13/apache-cxf-3.1.13-src.tar.gz.md5">apache-cxf-3.1.13-src.tar.gz.md5</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/cxf/3.1.13/apache-cxf-3.1.13-src.tar.gz.sha1">apache-cxf-3.1.13-src.tar.gz.sha1</a></p></td><td colspan="1" rowspan="1" class="confluenceT
 d"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/cxf/3.1.13/apache-cxf-3.1.13-src.tar.gz.asc">apache-cxf-3.1.13-src.tar.gz.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.lua/cxf/3.1.13/apache-cxf-3.1.13-src.zip">apache-cxf-3.1.13-src.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/cxf/3.1.13/apache-cxf-3.1.13-src.zip.md5">apache-cxf-3.1.13-src.zip.md5</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/cxf/3.1.13/apache-cxf-3.1.13-src.zip.sha1">apache-cxf-3.1.13-src.zip.sha1</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/cx
 f/3.1.13/apache-cxf-3.1.13-src.zip.asc">apache-cxf-3.1.13-src.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.lua/cxf/3.1.13/apache-cxf-3.1.13.tar.gz">apache-cxf-3.1.13.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/cxf/3.1.13/apache-cxf-3.1.13.tar.gz.md5">apache-cxf-3.1.13.tar.gz.md5</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/cxf/3.1.13/apache-cxf-3.1.13.tar.gz.sha1">apache-cxf-3.1.13.tar.gz.sha1</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/cxf/3.1.13/apache-cxf-3.1.13.tar.gz.asc">apache-cxf-3.1.13.tar.gz.asc</a></p></td
 ></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.lua/cxf/3.1.13/apache-cxf-3.1.13.zip">apache-cxf-3.1.13.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/cxf/3.1.13/apache-cxf-3.1.13.zip.md5">apache-cxf-3.1.13.zip.md5</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/cxf/3.1.13/apache-cxf-3.1.13.zip.sha1">apache-cxf-3.1.13.zip.sha1</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/cxf/3.1.13/apache-cxf-3.1.13.zip.asc">apache-cxf-3.1.13.zip.asc</a></p></td></tr></tbody></table></div><h2 id="Download-3.0.15">3.0.15</h2><p>The 3.0.15 release is our latest patch release for 
 3.0.x. For a complete list of new features, API changes, etc... please see the <a shape="rect" href="cxf-3015-release-notes.html">release notes</a> and the <a shape="rect" href="http://cxf.apache.org/docs/30-migration-guide.html">migration guide</a>.</p><div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>This is the last planned release of the 3.0.x versions of CXF. Users are strongly encouraged to migrate to 3.2.x as soon as possible.</p></div></div><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>File</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>MD5</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>SHA1</p></th><th colspan="1" rowspan="1" class="
 confluenceTh"><p>PGP</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.lua/cxf/3.0.15/apache-cxf-3.0.15-src.tar.gz">apache-cxf-3.0.15-src.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/cxf/3.0.15/apache-cxf-3.0.15-src.tar.gz.md5">apache-cxf-3.0.15-src.tar.gz.md5</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/cxf/3.0.15/apache-cxf-3.0.15-src.tar.gz.sha1">apache-cxf-3.0.15-src.tar.gz.sha1</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/cxf/3.0.15/apache-cxf-3.0.15-src.tar.gz.asc">apache-cxf-3.0.15-src.tar.gz.asc</a></p></td></tr><tr><td colspan
 ="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.lua/cxf/3.0.15/apache-cxf-3.0.15-src.zip">apache-cxf-3.0.15-src.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/cxf/3.0.15/apache-cxf-3.0.15-src.zip.md5">apache-cxf-3.0.15-src.zip.md5</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/cxf/3.0.15/apache-cxf-3.0.15-src.zip.sha1">apache-cxf-3.0.15-src.zip.sha1</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/cxf/3.0.15/apache-cxf-3.0.15-src.zip.asc">apache-cxf-3.0.15-src.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary distribution</p></td><td colspan="1" r
 owspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.lua/cxf/3.0.15/apache-cxf-3.0.15.tar.gz">apache-cxf-3.0.15.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/cxf/3.0.15/apache-cxf-3.0.15.tar.gz.md5">apache-cxf-3.0.15.tar.gz.md5</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/cxf/3.0.15/apache-cxf-3.0.15.tar.gz.sha1">apache-cxf-3.0.15.tar.gz.sha1</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/cxf/3.0.15/apache-cxf-3.0.15.tar.gz.asc">apache-cxf-3.0.15.tar.gz.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apac
 he.org/dyn/closer.lua/cxf/3.0.15/apache-cxf-3.0.15.zip">apache-cxf-3.0.15.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/cxf/3.0.15/apache-cxf-3.0.15.zip.md5">apache-cxf-3.0.15.zip.md5</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/cxf/3.0.15/apache-cxf-3.0.15.zip.sha1">apache-cxf-3.0.15.zip.sha1</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/cxf/3.0.15/apache-cxf-3.0.15.zip.asc">apache-cxf-3.0.15.zip.asc</a></p></td></tr></tbody></table></div><h2 id="Download-2.7.18">2.7.18</h2><p>The 2.7.18 release is our last patch release for 2.7.x. For a complete list if new features, API changes, etc... please see the <a shape="rect" href="cxf-2718-release-notes.html">release notes</a> and the <a shape="rect" href="http://cxf.a
 pache.org/docs/27-migration-guide.html">migration guide</a>.</p><div class="confluence-information-macro confluence-information-macro-warning"><span class="aui-icon aui-icon-small aui-iconfont-error confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>This is the last planned release of the 2.7.x versions of CXF. Users are strongly encouraged to migrate to 3.1.x as soon as possible.</p></div></div><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>File</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>MD5</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>SHA1</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>PGP</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Source distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" clas
 s="external-link" href="http://www.apache.org/dyn/closer.lua/cxf/2.7.18/apache-cxf-2.7.18-src.tar.gz">apache-cxf-2.7.18-src.tar.gz</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/cxf/2.7.18/apache-cxf-2.7.18-src.tar.gz.md5">apache-cxf-2.7.18-src.tar.gz.md5</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/cxf/2.7.18/apache-cxf-2.7.18-src.tar.gz.sha1">apache-cxf-2.7.18-src.tar.gz.sha1</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/cxf/2.7.18/apache-cxf-2.7.18-src.tar.gz.asc">apache-cxf-2.7.18-src.tar.gz.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.lua/c
 xf/2.7.18/apache-cxf-2.7.18-src.zip">apache-cxf-2.7.18-src.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/cxf/2.7.18/apache-cxf-2.7.18-src.zip.md5">apache-cxf-2.7.18-src.zip.md5</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/cxf/2.7.18/apache-cxf-2.7.18-src.zip.sha1">apache-cxf-2.7.18-src.zip.sha1</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/cxf/2.7.18/apache-cxf-2.7.18-src.zip.asc">apache-cxf-2.7.18-src.zip.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>Binary distribution</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.lua/cxf/2.7.18/apache-cxf-2.7.18.tar.gz">apache-cxf-2.7.18.tar.gz</a></p></td>
 <td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/cxf/2.7.18/apache-cxf-2.7.18.tar.gz.md5">apache-cxf-2.7.18.tar.gz.md5</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/cxf/2.7.18/apache-cxf-2.7.18.tar.gz.sha1">apache-cxf-2.7.18.tar.gz.sha1</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/cxf/2.7.18/apache-cxf-2.7.18.tar.gz.asc">apache-cxf-2.7.18.tar.gz.asc</a></p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>&#160;</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http://www.apache.org/dyn/closer.lua/cxf/2.7.18/apache-cxf-2.7.18.zip">apache-cxf-2.7.18.zip</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="http
 s://www.apache.org/dist/cxf/2.7.18/apache-cxf-2.7.18.zip.md5">apache-cxf-2.7.18.zip.md5</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/cxf/2.7.18/apache-cxf-2.7.18.zip.sha1">apache-cxf-2.7.18.zip.sha1</a></p></td><td colspan="1" rowspan="1" class="confluenceTd"><p><a shape="rect" class="external-link" href="https://www.apache.org/dist/cxf/2.7.18/apache-cxf-2.7.18.zip.asc">apache-cxf-2.7.18.zip.asc</a></p></td></tr></tbody></table></div><h2 id="Download-VerifyingReleases">Verifying Releases</h2><p>When downloading from a mirror please check the SHA1/MD5 checksums as well as verifying the OpenPGP compatible signature available from the main Apache site. The <a shape="rect" class="external-link" href="https://www.apache.org/dist/cxf/KEYS">KEYS</a> file contains the public keys used for signing the release. It is recommended that a web of trust is used to confirm the identity of these keys.</p><p>Yo
 u can check the OpenPGP signature with GnuPG via:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">gpg --import KEYS
+<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">gpg --import KEYS
 gpg --verify apache-cxf-*.tar.gz.asc
 </pre>
 </div></div><p>You can check the MD5 checksum with:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">md5sum --check apache-cxf-*.tar.gz.md5
+<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">md5sum --check apache-cxf-*.tar.gz.md5
 </pre>
 </div></div><p>You can check the SHA1 checksum with:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">sha1sum --check apache-cxf-*.tar.gz.sha1
+<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">sha1sum --check apache-cxf-*.tar.gz.sha1
 </pre>
 </div></div><h1 id="Download-Previousreleases">Previous releases</h1><p>Previous releases are all archived in the apache archive:<br clear="none"> Non-incubator releases: <a shape="rect" class="external-link" href="http://archive.apache.org/dist/cxf/">http://archive.apache.org/dist/cxf/</a> <br clear="none"> Incubator releases: <a shape="rect" class="external-link" href="http://archive.apache.org/dist/incubator/cxf/">http://archive.apache.org/dist/incubator/cxf/</a></p><h1 id="Download-Snapshots">Snapshots</h1><div class="confluence-information-macro confluence-information-macro-information"><p class="title">Warning about snapshots</p><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>These are snapshot builds - untested builds provided for your convenience. They have not been tested, and are not official releases of the Apache CXF project or the Apache Software Foundation.</p></div></div
 ><p>Snapshot distributions can be found at: (the latest one is at the bottom)</p><p>3.0.16 <a shape="rect" class="external-link" href="http://repository.apache.org/snapshots/org/apache/cxf/apache-cxf/3.0.16-SNAPSHOT/">http://repository.apache.org/snapshots/org/apache/cxf/apache-cxf/3.0.16-SNAPSHOT/</a></p><p>3.1.14 <a shape="rect" class="external-link" href="http://repository.apache.org/snapshots/org/apache/cxf/apache-cxf/3.1.14-SNAPSHOT/">http://repository.apache.org/snapshots/org/apache/cxf/apache-cxf/3.1.14-SNAPSHOT/</a></p><p>3.2.0 <a shape="rect" class="external-link" href="http://repository.apache.org/snapshots/org/apache/cxf/apache-cxf/3.2.0-SNAPSHOT/">http://repository.apache.org/snapshots/org/apache/cxf/apache-cxf/3.2.0-SNAPSHOT/</a></p><p>The snapshot Maven repository is <a shape="rect" class="external-link" href="http://repository.apache.org/snapshots">http://repository.apache.org/snapshots</a>.</p><h1 id="Download-MavenRepositories">Maven Repositories</h1><p>If you use M
 aven for building your applications, Apache CXF artifacts are available from the following repository URLS:</p><h3 id="Download-Releases:">Releases:</h3><p>All supported CXF releases are synced into the maven central repository: <a shape="rect" class="external-link" href="http://repo1.maven.org/maven2/" rel="nofollow">http://repo1.maven.org/maven2/</a></p><h3 id="Download-Snapshots:">Snapshots:</h3><p>Snapshots are available in Apache's snapshot repository: <a shape="rect" class="external-link" href="http://repository.apache.org/snapshots">http://repository.apache.org/snapshots</a></p><div class="confluence-information-macro confluence-information-macro-note"><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>Snapshot builds are relatively untested and unsupported and are provided for verification and testing purposes.</p></div></div></div>
            </div>

Modified: websites/production/cxf/content/faq.html
==============================================================================
--- websites/production/cxf/content/faq.html (original)
+++ websites/production/cxf/content/faq.html Wed Sep 13 15:05:52 2017
@@ -111,11 +111,11 @@ Apache CXF -- FAQ
            <!-- Content -->
            <div class="wiki-content">
 <div id="ConfluenceContent"><h1 id="FAQ-FrequentlyAskedQuestions">Frequently Asked Questions</h1><p><style type="text/css">/*<![CDATA[*/
-div.rbtoc1505243065236 {padding: 0px;}
-div.rbtoc1505243065236 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1505243065236 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1505314973892 {padding: 0px;}
+div.rbtoc1505314973892 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1505314973892 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]>*/</style></p><div class="toc-macro rbtoc1505243065236">
+/*]]>*/</style></p><div class="toc-macro rbtoc1505314973892">
 <ul class="toc-indentation"><li><a shape="rect" href="#FAQ-General">General</a>
 <ul class="toc-indentation"><li><a shape="rect" href="#FAQ-CanCXFrunwithJDK1.8/Java8?">Can CXF run with JDK 1.8/Java 8?</a></li><li><a shape="rect" href="#FAQ-CanCXFrunwithJDK1.7/Java7?">Can CXF run with JDK 1.7/Java 7?</a></li><li><a shape="rect" href="#FAQ-CanCXFrunwithJDK1.6?">Can CXF run with JDK 1.6?</a></li><li><a shape="rect" href="#FAQ-CanCXFrunwithouttheSunreferenceSAAJimplementation?">Can CXF run without the Sun reference SAAJ implementation?</a></li><li><a shape="rect" href="#FAQ-AretherecommercialofferingsofCXFthatprovideservices,support,andadditionalfeatures?">Are there commercial offerings of CXF that provide services, support, and additional features?</a></li><li><a shape="rect" href="#FAQ-IsthereanApacheCXFcertificationprogram?">Is there an Apache CXF certification program?</a></li></ul>
 </li><li><a shape="rect" href="#FAQ-JAX-WSRelated">JAX-WS Related</a>
@@ -124,7 +124,7 @@ div.rbtoc1505243065236 li {margin-left:
 <ul class="toc-indentation"><li><a shape="rect" href="#FAQ-WhenusingSpringAOPtoenablethingsliketransactionsandsecurity,thegeneratedWSDLisverymessedupwithwrongnamespaces,partnames,etc...">When using Spring AOP to enable things like transactions and security, the generated WSDL is very messed up with wrong namespaces, part names, etc...</a></li></ul>
 </li></ul>
 </div><h2 id="FAQ-General">General</h2><h3 id="FAQ-CanCXFrunwithJDK1.8/Java8?">Can CXF run with JDK 1.8/Java 8?</h3><p>Yes. CXF supports Java 8. The latest 3.x version is built using JDK 1.8.</p><h3 id="FAQ-CanCXFrunwithJDK1.7/Java7?">Can CXF run with JDK 1.7/Java 7?</h3><p>Yes. CXF supports Java 7. Since Java 7 contains the 2.2.x versions of both JAXB and JAX-WS API jars, using CXF with Java 7 is much easier than with Java 6.</p><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>CXF 3.2 no longer supports Java 7 and requires Java 8 or newer. Users are strongly encouraged to start moving to Java 8.</p></div></div><h3 id="FAQ-CanCXFrunwithJDK1.6?">Can CXF run with JDK 1.6?</h3><p>JDK 1.6 incorporates the JAXB reference implementation. However, it incorporates an old version of the RI. CXF does not support th
 is version. As of 1.6_04, this is easy to deal with: you must put the versions of JAXB RI (the 'impl' and 'xjc' jars) that we include with CXF in your classpath. As of this writing, these are version 2.2.10.</p><div class="confluence-information-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>CXF 3.1 no longer supports Java 6 and requires Java 7 or newer.</p></div></div><p><span style="color: rgb(0,0,0);font-size: 1.4em;line-height: 1.5625;">Can CXF run with JDK 1.5?</span></p><p>Yes for CXF 2.6.x and older. Keep in mind though that Java 2 SE 5.0 with JDK 1.5 has reached end of life (<a shape="rect" class="external-link" href="http://www.oracle.com/technetwork/java/eol-135779.html" rel="nofollow">EOL</a>). CXF 2.7.x no longer supports Java 5. In order to upgrade to 2.7.x, you must be using Java 6 (or newer).</p><div class="confluence-info
 rmation-macro confluence-information-macro-information"><span class="aui-icon aui-icon-small aui-iconfont-info confluence-information-macro-icon"></span><div class="confluence-information-macro-body"><p>There is one more planned release for the 2.6.x series of CXF. After that, there are no more planned releases of CXF that will support Java 5. Users are strongly encouraged to start moving to Java 7 and to start migrating to newer versions of CXF.</p></div></div><p>&#160;</p><h3 id="FAQ-CanCXFrunwithouttheSunreferenceSAAJimplementation?">Can CXF run without the Sun reference SAAJ implementation?</h3><p>In many cases, CXF can run without an SAAJ implementation. However, some features such as JAX-WS handlers and WS-Security do require an SAAJ implementation. By default, CXF ships with the Sun SAAJ implementation, but CXF also supports axis2-saaj version 1.4.1 as an alternative. When using a Java6 JRE, CXF can also use the SAAJ implementation built into Java.</p><h3 id="FAQ-Aretherecomm
 ercialofferingsofCXFthatprovideservices,support,andadditionalfeatures?">Are there commercial offerings of CXF that provide services, support, and additional features?</h3><p>Several companies provide services, training, documentation, support, etc... on top of CXF. Some of those companies also produce products that are either based on Apache CXF or include Apache CXF. See the <a shape="rect" href="commercial-cxf-offerings.html">Commercial CXF Offerings</a> page for a list of companies and the services they provide.</p><h3 id="FAQ-IsthereanApacheCXFcertificationprogram?">Is there an Apache CXF certification program?</h3><p>No, but Oracle's <a shape="rect" class="external-link" href="http://education.oracle.com/pls/web_prod-plq-dad/db_pages.getpage?page_id=41&amp;p_exam_id=1Z0_862" rel="nofollow">SCDJWS</a> certification covers the web services stack and related areas. Note, that the popular SCJP certification is a prerequisite to the SCDJWS. Also, check out the <a shape="rect" class=
 "external-link" href="http://www.coderanch.com/forums/f-80/java-Web-Services-SCDJWS" rel="nofollow">SCDJWS Forum</a> at the Java Ranch for healthy discussions in regards to the certification. Study notes can be found at <a shape="rect" class="external-link" href="http://java.boot.by/scdjws5-guide/" rel="nofollow">SCDJWS 5.0 Study Guide</a>, <a shape="rect" class="external-link" href="http://en.wikibooks.org/wiki/Sun_Certified_Web_Services_Developer_Certification" rel="nofollow">WikiBooks</a> and <a shape="rect" class="external-link" href="http://www.coderanch.com/how-to/content/Exam-Objectives-5.pdf" rel="nofollow">Ivan A. Krizsan Study Notes</a>. Java Ranch also provides and information <a shape="rect" class="external-link" href="http://www.coderanch.com/how-to/java/ScdjwsLinks" rel="nofollow">page</a> in regards to the certification.</p><h2 id="FAQ-JAX-WSRelated">JAX-WS Related</h2><h3 id="FAQ-Thepartsinmygeneratedwsdlhavenamesoftheform&quot;arg0&quot;,&quot;arg1&quot;,...Whydon't
 theparts(andJavageneratedfromthem)usetheniceparameternamesItypedintotheinterfacedefinition?">The parts in my generated wsdl have names of the form "arg0", "arg1", ... Why don't the parts (and Java generated from them) use the nice parameter names I typed into the interface definition?</h3><p><strong>Official answer:</strong> The JAX-WS spec (specifically section 3.6.1) mandates that it be generated this way. To customize the name, you have to use an @WebParam(name = "blah") annotation to specify better names. (You can use @WebResult for the return value, but you'll only see the results if you look at the XML.)</p><p><strong>Reason:</strong> One of the mysteries of java is that abstract methods (and thus interface methods) do NOT get their parameter names compiled into them even with debug info. Thus, when the service model is built from an interface, there is no way to determine the names that were using in the original code.</p><p>If the service is built from a concrete class (inst
 ead of an interface) AND the class was compiled with debug info, we can get the parameter names. The simple frontend does this. However, this could cause potential problems. For example, when you go from developement to production, you may turn off debug information (remove -g from javac flags) and suddenly the application may break since the generated wsdl (and thus expect soap messages) would change. Thus, the JAX-WS spec writers went the safe route and mandate that you have to use the @WebParam annotations to specify the more descriptive names.</p><h3 id="FAQ-HowcanIaddsoapheaderstotherequest/response?">How can I add soap headers to the request/response?</h3><p>There are several ways to do this depending on how your project is written (code first or wsdl first) and requirements such as portability.</p><ol><li>The "JAX-WS" standard way to do this is to write a SOAP Handler that will add the headers to the SOAP message and register the handler on the client/server. This is complete
 ly portable from jax-ws vendor to vendor, but is also more difficult and can have performance implications. You have to handle the conversion of the JAXB objects to XML yourself. It involves having the entire soap message in a DOM which breaks streaming. Requires more memory. etc... However, it doesn't require any changes to wsdl or SEI interfaces.</li><li>JAX-WS standard "java first" way: if doing java first development, you can just add an extra parameter to the method and annotate it with @WebParam(header = true). If it's a response header, make it a Holder and add the mode = Mode.OUT to @WebParam.</li><li>wsdl first way: you can add elements to the message in the wsdl and then mark them as soap:headers in the soap:binding section of the wsdl. The wsdl2java tool will generate the @WebParam(header = true) annotations as above. With CXF, you can also put the headers in their own message (not the same message as the request/response) and mark them as headers in the soap:binding, but
  you will need to pass the -exsh true flag to wsdl2java to get the paramters generated. This is not portable to other jax-ws providers. Processing headers from other messages it optional in the jaxws spec.</li><li>CXF proprietary way: In the context (BindingProvider.getRequestContext() on client, WebServiceContext on server), you can add a List&lt;org.apache.cxf.headers.Header&gt; with the key Header.HEADER_LIST. The headers in the list are streamed at the appropriate time to the wire according to the databinding object found in the Header object. Like option 1, this doesn't require changes to wsdl or method signatures. However, it's much faster as it doesn't break streaming and the memory overhead is less.</li></ol><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Confluence" style="font-size:12px;">List&lt;Header&gt; headers = new ArrayList&lt;Header&gt;();
+<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">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);
@@ -136,7 +136,7 @@ context.getMessageContext().put(Header.H
 ((BindingProvider)proxy).getRequestContext().put(Header.HEADER_LIST, headers);
 </pre>
 </div></div><h3 id="FAQ-HowcanIturnonschemavalidationforjaxwsendpoint?">How can I turn on schema validation for jaxws endpoint?</h3><p>For the client side</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">    &lt;jaxws:client name="{http://apache.org/hello_world_soap_http}SoapPort"
+<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">    &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;
@@ -144,10 +144,10 @@ context.getMessageContext().put(Header.H
     &lt;/jaxws:client&gt;
 </pre>
 </div></div><p>You may also do this programmatically:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">((BindingProvider)port).getRequestContext().put("schema-validation-enabled", "true"); 
+<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">((BindingProvider)port).getRequestContext().put("schema-validation-enabled", "true"); 
 </pre>
 </div></div><p>For the server side</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Confluence" style="font-size:12px;">    &lt;jaxws:endpoint name="{http://apache.org/hello_world_soap_http}SoapPort"
+<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">    &lt;jaxws:endpoint name="{http://apache.org/hello_world_soap_http}SoapPort"
         wsdlLocation="wsdl/hello_world.wsdl"
         createdFromAPI="true"&gt;
         &lt;jaxws:properties&gt;
@@ -156,17 +156,17 @@ context.getMessageContext().put(Header.H
     &lt;/jaxws:endpoint&gt;
 </pre>
 </div></div><p>Starting with CXF 2.3 you have the additional option of using the org.apache.cxf.annotations.SchemaValidation annotation.</p><h3 id="FAQ-AreJAX-WSclientproxiesthreadsafe?">Are JAX-WS client proxies thread safe?</h3><p><strong>Official JAX-WS answer:</strong> No. According to the JAX-WS spec, the client proxies are NOT thread safe. To write portable code, you should treat them as non-thread safe and synchronize access or use a pool of instances or similar.</p><p><strong>CXF answer:</strong> CXF proxies are thread safe for MANY use cases. The exceptions are:</p><ul><li><p>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:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Confluence" style="font-size:12px;">((BindingProvider)proxy).getRequestContext().put("thread.local.request.context", "true");
+<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">((BindingProvider)proxy).getRequestContext().put("thread.local.request.context", "true");
 </pre>
 </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><ul><li>Settings on the conduit - if you use code or configuration to directly manipulate the conduit (like to set TLS settings or similar), those are not thread safe. The conduit is per-instance and thus those settings would be shared. Also, if you use the FailoverFeature and LoadBalanceFeatures, the conduit is replaced on the fly. Thus, settings set on the conduit could get lost before being used on the setting thread.</li></ul><ul><li>Session support - if you turn on sessions support (see jaxws spec), the session cookie is stored in the conduit. Thus, it would fall into the above rules on conduit settings and thus be shared across threads.</li></ul><ul><li>WS-Security tokens - If use WS-SecureConversation or WS-Trust, the retrieved token is cached in the Endpoint/Pr
 oxy to avoid the extra (and expensive) calls to the STS to obtain tokens. Thus, multiple threads will share the token. If each thread has different security credentials or requirements, you need to use separate proxy instances.</li></ul><p>For the conduit issues, you COULD install a new ConduitSelector that uses a thread local or similar. That's a bit complex though.</p><p>For most "simple" use cases, you can use CXF proxies on multiple threads. The above outlines the workarounds for the others.</p><h3 id="FAQ-Thegeneratedwsdl(GETrequestonthe?wsdladdress)doesn'tcontainthemessages,types,portType,etc...WhatdidIdowrong?">The generated wsdl (GET request on the ?wsdl address) doesn't contain the messages, types, portType, etc... What did I do wrong?</h3><p>Usually this means the wsdl at that address contains the service and binding, but uses a &lt;wsdl:import&gt; element to import another wsdl (usually at ?wsdl=MyService1.wsdl type address) that defines the types, messages, and portType.
  The cause of this is different targetNamespaces for the Service Interface (mapped to the port type) and the service implementation (mapped to the Service/Binding). By default, the targetNamespace is derived from the package of each of those, so if they are in different packages, you will see this issue. Also, if you define a targetNamespace attribute on the @WebService annotation on one of them, but not the other, you will likely see this as well. The easiest fix is to update the @WebService annotation on BOTH to have the exact same targetNamespace defined.</p><h2 id="FAQ-SpringRelated">Spring Related</h2><h3 id="FAQ-WhenusingSpringAOPtoenablethingsliketransactionsandsecurity,thegeneratedWSDLisverymessedupwithwrongnamespaces,partnames,etc...">When using Spring AOP to enable things like transactions and security, the generated WSDL is very messed up with wrong namespaces, part names, etc...</h3><p><strong>Reason:</strong> When using Spring AOP, spring injects a proxy to the bean int
 o 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 pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Confluence" style="font-size:12px;">&lt;jaxws:server 
+<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;jaxws:server 
       id="myService" 
       serviceClass="my.package.MyServiceImpl" 
       serviceBean="#myServiceImpl" 
       address="/MyService" /&gt; 
 </pre>
 </div></div><p>or:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Confluence" style="font-size:12px;">&lt;jaxws:endpoint
+<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;jaxws:endpoint
       id="myService" 
       implementorClass="my.package.MyServiceImpl" 
       implementor="#myServiceImpl" 

Modified: websites/production/cxf/content/fediz-configuration.html
==============================================================================
--- websites/production/cxf/content/fediz-configuration.html (original)
+++ websites/production/cxf/content/fediz-configuration.html Wed Sep 13 15:05:52 2017
@@ -109,7 +109,7 @@ Apache CXF -- Fediz Configuration
            <!-- Content -->
            <div class="wiki-content">
 <div id="ConfluenceContent"><h1 id="FedizConfiguration-FedizPluginconfiguration">Fediz Plugin configuration</h1><p>This page describes the Fediz configuration file referenced by the security interceptor of the Servlet Container (eg. authenticator in Tomcat/Jetty).</p><p>The Fediz configuration information is used to publish the federation Metadata document which is described <a shape="rect" href="fediz-metadata.html">here</a></p><h3 id="FedizConfiguration-Example">Example</h3><p>The following example shows the minimum configuration for Fediz.</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">&lt;?xml version="1.0" encoding="UTF-8" standalone="yes"?&gt;
+<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;?xml version="1.0" encoding="UTF-8" standalone="yes"?&gt;
 &lt;FedizConfig&gt;
     &lt;contextConfig name="/fedizhelloworld"&gt;
         &lt;audienceUris&gt;
@@ -130,7 +130,7 @@ Apache CXF -- Fediz Configuration
 &lt;/FedizConfig&gt;
 </pre>
 </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><p>The IDP issues a SAML token which must be validated by the plugin. The validation requires the certificate store of the Certificate Authority(ies) of the certificate which signed the SAML token. This is defined in <code>certificateStore</code>. The signing certificate itself is not required because <code>certificateValidation</code> is set to <code>ChainTrust</code>. The <code>subject</code> defines the trusted signing certificate using the subject as a regular expression.<br clear="none"> Finally, the audience URI is validated against the audience restriction in the SAML token.</p><h3 id="FedizConfiguration-Configurationreference">Configuration reference</h3><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>XML el
 ement</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Use</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>audienceUris</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Audience URI</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Required</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The values of the list of audience URIs are verified against the element <code>AudienceRestriction</code> in the SAML token</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>certificateStores</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Trusted certificate store</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Required</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The list of keystores (JKS, PEM) includes at least the certificate of the Certif
 icate Authorities (CA) which signed the certificate which is used to sign the SAML token.<br clear="none"> If the file location is not fully qualified it needs to be relative to the Container home directory</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>trustedIssuers</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Trusted Issuers</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Required</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>There are two ways to configure a trusted issuer (IDP). Either you configure the subject name and the CA(s) who signed the certificate of the IDP (<code>certificateValidation=ChainTrust</code>) or you configure the certificate of the IDP and the CA(s) who signed it (<code>certificateValidation=PeerTrust</code>)</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>maximumClockSkew</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Maximum Clock Skew</p></td><td colspan="1"
  rowspan="1" class="confluenceTd"><p>Optional</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Maximum allowable time difference between the system clocks of the IDP and RP.<br clear="none"> Default 5 seconds.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>tokenReplayCache</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Token Replay Cache</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Optional</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The <a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/core/src/main/java/org/apache/cxf/fediz/core/TokenReplayCache.java?view=markup">TokenReplayCache</a> implementation to use to cache tokens. The default is an implementation based on EHCache.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>signingKey</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Key for Signature</p></td><td colspan="1" rowspan=
 "1" class="confluenceTd"><p>Optional</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>If configured, the published (WS-Federation) <a shape="rect" href="fediz-metadata.html">Metadata document</a> is signed by this key. Otherwise, not signed.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>tokenDecryptionKey</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Decryption Key</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Optional</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>A Keystore used to decrypt an encrypted token.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">tokenExpirationValidation</td><td colspan="1" rowspan="1" class="confluenceTd">Token Expiration Validation</td><td colspan="1" rowspan="1" class="confluenceTd">Optional</td><td colspan="1" rowspan="1" class="confluenceTd"><p>Decision whether the token validation (e.g. lifetime) shall be performed on every request (true) or only once at i
 nitial authentication (false). The default is "false".</p></td></tr></tbody></table></div><h5 id="FedizConfiguration-WS-Federationprotocolconfigurationreference">WS-Federation protocol configuration reference</h5><div class="table-wrap"><table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"><p>XML element</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Name</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Use</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Metadata</p></th><th colspan="1" rowspan="1" class="confluenceTh"><p>Description</p></th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>issuer</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Issuer URL</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Required</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>PassiveRequestorEndpoint</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>This URL defines the lo
 cation of the IDP to whom unauthenticated requests are redirected</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>realm</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Realm</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Optional</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>TargetScope</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Security realm of the Relying Party / Application. This value is part of the SignIn request as the <code>wtrealm</code> parameter.<br clear="none"> Default: URL including the Servlet Context</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>authenticationType</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Authentication Type</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Optional</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>NA</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The authentication type defines what k
 ind of authentication is required. This information is provided in the SignInRequest to the IDP (parameter <code>wauth</code>)<br clear="none"> The WS-Federation standard defines a list of predefined URIs for wauth <a shape="rect" class="external-link" href="http://docs.oasis-open.org/wsfed/federation/v1.2/os/ws-federation-1.2-spec-os.html#_Toc223174997" rel="nofollow">here</a>.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>roleURI</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Role Claim URI</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Optional</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>NA</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Defines the attribute name of the SAML token which contains the roles.<br clear="none"> Required for Role Based Access Control.</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>roleDelimiter</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>
 Role Value Delimiter</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Optional</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>NA</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>There are different ways to encode multi value attributes in SAML.</p><ul><li>Single attribute with multiple values</li><li>Several attributes with the same name but only one value</li><li>Single attribute with single value. Roles are delimited by <code>roleDelimiter</code></li></ul></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>claimTypesRequested</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Requested claims</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Optional</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>ClaimTypesRequested</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The claims required by the Relying Party are listed here. Claims can be optional. If a mandatory claim can't be provided by the 
 IDP the issuance of the token should fail</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>homeRealm</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Home Realm</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Optional</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>NA</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Indicates the Resource IDP the home realm of the requestor. This may be an URL or an identifier like urn: or uuid: and depends on the Resource IDP implementation. This value is part of the SignIn request as the <code>whr</code> parameter</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>freshness</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Freshness</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Optional</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>NA</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>The desired "freshness" of the tok
 en from the IdP. This information is provided in the SignInRequest to the IdP (parameter <code>wfresh</code>)</p></td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">request</td><td colspan="1" rowspan="1" class="confluenceTd">Request</td><td colspan="1" rowspan="1" class="confluenceTd">Optional</td><td colspan="1" rowspan="1" class="confluenceTd">NA</td><td colspan="1" rowspan="1" class="confluenceTd">This value is part of the SignIn request as the wreq parameter. It can be used to specify a desired TokenType from the IdP.</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"><p>tokenValidators</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>TokenValidators</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Optional</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>NA</p></td><td colspan="1" rowspan="1" class="confluenceTd"><p>Custom Token validator classes can be configured here. The SAML Token validator is enabled by default.<br cl
 ear="none"> See example <a shape="rect" class="external-link" href="http://svn.apache.org/viewvc/cxf/fediz/trunk/plugins/core/src/test/java/org/apache/cxf/fediz/core/CustomValidator.java">here</a></p></td></tr></tbody></table></div><h5 id="FedizConfiguration-Attributesresolvedatruntime">Attributes resolved at runtime</h5><p>The following attributes can be either configured statically at deployment time or dynamically when the initial request is received:</p><ul><li>authenticationType</li><li>homeRealm</li><li>issuer</li><li>realm</li></ul><p>These configuration elements allows for configuring a CallbackHandler which gets a Callback object where the appropriate value must be set. The CallbackHandler implementation has access to the HttpServletRequest. The XML attribute <code>type</code> must be set to <code>Class</code>.</p><p>For more information see <a shape="rect" href="fediz-extensions.html">Fediz Extensions</a>.</p><h3 id="FedizConfiguration-Advancedexample">Advanced example</h3
 ><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 pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: bash; gutter: false; theme: Confluence" style="font-size:12px;">&lt;?xml version="1.0" encoding="UTF-8" standalone="yes"?&gt;
+<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;?xml version="1.0" encoding="UTF-8" standalone="yes"?&gt;
 &lt;FedizConfig&gt;
     &lt;contextConfig name="/fedizhelloworld"&gt;
         &lt;audienceUris&gt;