cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r867253 [43/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/dosgi-discovery-demo-page.html
==============================================================================
--- websites/production/cxf/content/dosgi-discovery-demo-page.html (original)
+++ websites/production/cxf/content/dosgi-discovery-demo-page.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 - DOSGi Discovery Demo page">
+
+  <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 -- DOSGi Discovery Demo page
     </title>
@@ -42,19 +53,15 @@ Apache CXF -- DOSGi Discovery Demo page
     <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 -- DOSGi Discovery Demo page
 
 
 <h3><a shape="rect" name="Navigation-Search"></a>Search</h3>
-
-<form enctype="application/x-www-form-urlencoded" method="get" id="cse-search-box" action="http://www.google.com/cse">
+<p>
+</p><form enctype="application/x-www-form-urlencoded" method="get" id="cse-search-box" action="http://www.google.com/cse">
   <div>
     <input type="hidden" name="cx" value="002890367768291051730:o99qiwa09y4">
     <input type="hidden" name="ie" value="UTF-8">
@@ -152,59 +159,59 @@ 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" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java"><span class="code-keyword">public</span> <span class="code-keyword">interface</span> DisplayService {
-    <span class="code-object">boolean</span> displayText(<span class="code-object">String</span> text);
-    <span class="code-object">String</span> getID();
-}</pre>
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[public interface DisplayService {
+    boolean displayText(String text);
+    String getID();
+}]]></script>
 </div></div>
 
 <h2><a shape="rect" name="DOSGiDiscoveryDemopage-TheDisplayController%28serviceconsumer%29"></a>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" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java"><span class="code-keyword">public</span> class Activator <span class="code-keyword">implements</span> BundleActivator {
-    <span class="code-keyword">private</span> ServiceTracker tracker;
-    <span class="code-keyword">private</span> Map&lt;DisplayService, <span class="code-object">String</span>&gt; displays = <span class="code-keyword">new</span> ConcurrentHashMap&lt;DisplayService, <span class="code-object">String</span>&gt;();
-
-    <span class="code-keyword">public</span> void start(BundleContext bc) <span class="code-keyword">throws</span> Exception {
-        tracker = <span class="code-keyword">new</span> ServiceTracker(bc, DisplayService.class.getName(), <span class="code-keyword">null</span>) {
-            <span class="code-keyword">public</span> <span class="code-object">Object</span> addingService(ServiceReference reference) {
-                <span class="code-object">Object</span> svc = <span class="code-keyword">super</span>.addingService(reference);
-                <span class="code-keyword">if</span> (svc <span class="code-keyword">instanceof</span> DisplayService) {
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[public class Activator implements BundleActivator {
+    private ServiceTracker tracker;
+    private Map&lt;DisplayService, String&gt; displays = new ConcurrentHashMap&lt;DisplayService, String&gt;();
+
+    public void start(BundleContext bc) throws Exception {
+        tracker = new ServiceTracker(bc, DisplayService.class.getName(), null) {
+            public Object addingService(ServiceReference reference) {
+                Object svc = super.addingService(reference);
+                if (svc instanceof DisplayService) {
                     DisplayService d = (DisplayService) svc;
-                    <span class="code-object">System</span>.out.println(<span class="code-quote">"Adding display: "</span> + d.getID() + <span class="code-quote">" ("</span> + d + <span class="code-quote">")"</span>);
+                    System.out.println("Adding display: " + d.getID() + " (" + d + ")");
                     displays.put(d, d.getID());
                 }
-                <span class="code-keyword">return</span> svc;
+                return svc;
             }
 
-            <span class="code-keyword">public</span> void removedService(ServiceReference reference, <span class="code-object">Object</span> service) {
-                <span class="code-object">String</span> value = displays.remove(service);
-                <span class="code-object">System</span>.out.println(<span class="code-quote">"Removed display: "</span> + value);
-                <span class="code-keyword">super</span>.removedService(reference, service);
+            public void removedService(ServiceReference reference, Object service) {
+                String value = displays.remove(service);
+                System.out.println("Removed display: " + value);
+                super.removedService(reference, service);
             }            
         };        
         tracker.open();
-        <span class="code-comment">// ... scheduler stuff that sends messages to all registered displays ommitted
-</span>    }
+        // ... scheduler stuff that sends messages to all registered displays ommitted
+    }
 
-    <span class="code-keyword">public</span> void stop(BundleContext bc) <span class="code-keyword">throws</span> Exception {
+    public void stop(BundleContext bc) throws Exception {
         tracker.close();
     }
-}</pre>
+}]]></script>
 </div></div>
 <h3><a shape="rect" name="DOSGiDiscoveryDemopage-No%7B%7Bremoteservices.xml%7D%7Dfile%21"></a>No <tt>remote-services.xml</tt> file!</h3>
 <p>As we are using Discovery here, there is no static remote service metadata required. So no <tt>remote-services.xml</tt> file. Discovery will dynamically inform the DOSGi implementation of the locations of available remote services. The DOSGi implemenation will in turn register proxies for the remote services in the local service registry. As a service consumer you simply depend on the service - e.g. by using a ServiceTracker as above, or through a component framework such as Blueprint or DS. </p>
 
 <h3><a shape="rect" name="DOSGiDiscoveryDemopage-Runningthecontroller"></a>Running the controller</h3>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
--&gt; install http:<span class="code-comment">//repo1.maven.org/maven2/org/apache/cxf/dosgi/samples/cxf-dosgi-ri-samples-discovery-<span class="code-keyword">interface</span>/1.2/cxf-dosgi-ri-samples-discovery-<span class="code-keyword">interface</span>-1.2.jar
-</span>-&gt; start http:<span class="code-comment">//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
-</span>
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+-&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
+
 -&gt; ps
 START LEVEL 1
    ID   State         Level  Name
-[   0] [Active     ] [    0] <span class="code-object">System</span> Bundle (1.8.0)
+[   0] [Active     ] [    0] System Bundle (1.8.0)
 [   1] [Active     ] [    1] Apache Felix Shell Service (1.2.0)
 [   2] [Active     ] [    1] Apache Felix Shell TUI (1.2.0)
 [   3] [Active     ] [    1] Apache Felix Bundle Repository (1.4.0)
@@ -212,52 +219,51 @@ START LEVEL 1
 [   5] [Active     ] [    1] Distributed OSGi Distribution Software Single-Bundle Distribution
 [   6] [Active     ] [    1] Distributed OSGI Discovery Sample Client Bundle
 [   7] [Active     ] [    1] Distributed OSGI Discovery Sample Interface Bundle
-</pre>
+]]></script>
 </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" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">Sending text to displays: some text 1
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[Sending text to displays: some text 1
 Sending text to displays: some text 2
 Sending text to displays: some text 3
-...</pre>
+...]]></script>
 </div></div>
 
 <h2><a shape="rect" name="DOSGiDiscoveryDemopage-TheRemoteDisplays%28serviceimplementation%29"></a>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" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java"><span class="code-keyword">public</span> class Activator <span class="code-keyword">implements</span> BundleActivator {
-    <span class="code-keyword">private</span> ServiceRegistration reg;
+<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:<br clear="none">
+</p><div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[public class Activator implements BundleActivator {
+    private ServiceRegistration reg;
 
-    <span class="code-keyword">public</span> void start(BundleContext bc) <span class="code-keyword">throws</span> Exception {        
-        Dictionary props = <span class="code-keyword">new</span> Hashtable();
+    public void start(BundleContext bc) throws Exception {        
+        Dictionary props = new Hashtable();
+        
+        String host = getHostName(); // obtain the current host name
+        int port = getPort();        // find a free port
         
-        <span class="code-object">String</span> host = getHostName(); <span class="code-comment">// obtain the current host name
-</span>        <span class="code-object">int</span> port = getPort();        <span class="code-comment">// find a free port
-</span>        
-        props.put(<span class="code-quote">"service.exported.interfaces"</span>, <span class="code-quote">"*"</span>);
-        props.put(<span class="code-quote">"service.exported.configs"</span>, <span class="code-quote">"org.apache.cxf.ws"</span>);
-        props.put(<span class="code-quote">"org.apache.cxf.ws.address"</span>, <span class="code-quote">"http:<span class="code-comment">//"</span> + host + <span class="code-quote">":"</span> + port + <span class="code-quote">"/display"</span>);
-</span>
+        props.put("service.exported.interfaces", "*");
+        props.put("service.exported.configs", "org.apache.cxf.ws");
+        props.put("org.apache.cxf.ws.address", "http://" + host + ":" + port + "/display");
+
         reg = bc.registerService(DisplayService.class.getName(), 
-                <span class="code-keyword">new</span> DisplayServiceImpl(host + <span class="code-quote">":"</span> + port), props);
+                new DisplayServiceImpl(host + ":" + port), props);
     }
 
-    <span class="code-keyword">public</span> void stop(BundleContext bc) <span class="code-keyword">throws</span> Exception {
+    public void stop(BundleContext bc) throws Exception {
         reg.unregister();
     }
-}</pre>
-</div></div>
-<p>Note that the port where the service is made available is dynamically set to be any free port in the system. So you can safely run any number of remote Display Services on the same machine. Because we're using Discovery here, a well-known port is not needed. Registering the service as in the previous code snippet will make it available remotely <em>and</em> publish it to the installed Discovery system.</p>
+}]]></script>
+</div></div>Note that the port where the service is made available is dynamically set to be any free port in the system. So you can safely run any number of remote Display Services on the same machine. Because we're using Discovery here, a well-known port is not needed. Registering the service as in the previous code snippet will make it available remotely <em>and</em> publish it to the installed Discovery system.
 
 <p>Once the provider side bundles are started:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">-&gt; install http:<span class="code-comment">//repo1.maven.org/maven2/org/apache/cxf/dosgi/samples/cxf-dosgi-ri-samples-discovery-<span class="code-keyword">interface</span>/1.2/cxf-dosgi-ri-samples-discovery-<span class="code-keyword">interface</span>-1.2.jar
-</span>-&gt; start http:<span class="code-comment">//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
-</span>
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[-&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
 START LEVEL 1
    ID   State         Level  Name
-[   0] [Active     ] [    0] <span class="code-object">System</span> Bundle (1.8.0)
+[   0] [Active     ] [    0] System Bundle (1.8.0)
 [   1] [Active     ] [    1] Apache Felix Shell Service (1.2.0)
 [   2] [Active     ] [    1] Apache Felix Shell TUI (1.2.0)
 [   3] [Active     ] [    1] Apache Felix Bundle Repository (1.4.0)
@@ -265,13 +271,13 @@ START LEVEL 1
 [   5] [Active     ] [    1] Distributed OSGi Distribution Software Single-Bundle Distribution
 [   6] [Active     ] [    1] Distributed OSGI Discovery Sample Interface Bundle
 [   7] [Active     ] [    1] Distributed OSGI Discovery Sample Implementation Bundle
-</pre>
+]]></script>
 </div></div>
 <p>You will start seeing the messages appear on the remote display:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">DisplayService [myhost:1816]: some text 145
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[DisplayService [myhost:1816]: some text 145
 DisplayService [myhost:1816]: some text 146
-... </pre>
+... ]]></script>
 </div></div>
 <p>You can add more Display Services and they will also receive the messages. </p>
 <h2><a shape="rect" name="DOSGiDiscoveryDemopage-UnderthehoodintheZooKeeperserver"></a>Under the hood in the ZooKeeper server</h2>
@@ -279,38 +285,38 @@ DisplayService [myhost:1816]: some text 
 
 <p>ZooKeeper comes with a client program (<tt>zkCli</tt>) 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 <tt>/osgi/service_registry</tt>. 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 <tt>/osgi/service_registry/org/apache/cxf/dosgi/samples/discovery/DisplayService</tt>:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
 $ bin/zkCli localhost:2181
 
 -&gt; ls /osgi/service_registry/org/apache/cxf/dosgi/samples/discovery/DisplayService
 Processing ls
 [myhost#1816##display]
-</pre>
+]]></script>
 </div></div>
 <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" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">-&gt; get /osgi/service_registry/org/apache/cxf/dosgi/samples/discovery/DisplayService/myhost#52807##display
-&lt;?xml version=<span class="code-quote">"1.0"</span> encoding=<span class="code-quote">"UTF-8"</span>?&gt;
-&lt;endpoint-descriptions xmlns=<span class="code-quote">"http:<span class="code-comment">//www.osgi.org/xmlns/rsa/v1.0.0"</span>&gt;
-</span>  &lt;endpoint-description&gt;
-    &lt;property name=<span class="code-quote">"endpoint.framework.uuid"</span> value=<span class="code-quote">"b151dd13-69fe-4d99-8006-fcdafeb48db8"</span> /&gt;
-    &lt;property name=<span class="code-quote">"endpoint.id"</span> value=<span class="code-quote">"http:<span class="code-comment">//myhost:52807/display"</span> /&gt;
-</span>    &lt;property name=<span class="code-quote">"endpoint.<span class="code-keyword">package</span>.version.org.apache.cxf.dosgi.samples.discovery"</span> value=<span class="code-quote">"0.0.0"</span> /&gt;
-    &lt;property name=<span class="code-quote">"endpoint.service.id"</span> value-type=<span class="code-quote">"<span class="code-object">Long</span>"</span> value=<span class="code-quote">"16"</span> /&gt;
-    &lt;property name=<span class="code-quote">"objectClass"</span>&gt;
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[-&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;
+    &lt;property name="endpoint.framework.uuid" value="b151dd13-69fe-4d99-8006-fcdafeb48db8" /&gt;
+    &lt;property name="endpoint.id" value="http://myhost:52807/display" /&gt;
+    &lt;property name="endpoint.package.version.org.apache.cxf.dosgi.samples.discovery" value="0.0.0" /&gt;
+    &lt;property name="endpoint.service.id" value-type="Long" value="16" /&gt;
+    &lt;property name="objectClass"&gt;
       &lt;array&gt;
         &lt;value&gt;org.apache.cxf.dosgi.samples.discovery.DisplayService&lt;/value&gt;
       &lt;/array&gt;
     &lt;/property&gt;
-    &lt;property name=<span class="code-quote">"org.apache.cxf.ws.address"</span> value=<span class="code-quote">"http:<span class="code-comment">//myhost:52807/display"</span> /&gt;
-</span>    &lt;property name=<span class="code-quote">"service.imported"</span> value=<span class="code-quote">"<span class="code-keyword">true</span>"</span> /&gt;
-    &lt;property name=<span class="code-quote">"service.imported.configs"</span>&gt;
+    &lt;property name="org.apache.cxf.ws.address" value="http://myhost:52807/display" /&gt;
+    &lt;property name="service.imported" value="true" /&gt;
+    &lt;property name="service.imported.configs"&gt;
       &lt;array&gt;
         &lt;value&gt;org.apache.cxf.ws&lt;/value&gt;
       &lt;/array&gt;
     &lt;/property&gt;
-    &lt;property name=<span class="code-quote">"service.intents"</span>&gt;
+    &lt;property name="service.intents"&gt;
       &lt;array&gt;
         &lt;value&gt;SOAP.1_1&lt;/value&gt;
         &lt;value&gt;HTTP&lt;/value&gt;
@@ -330,7 +336,7 @@ dataVersion = 0
 aclVersion = 0
 ephemeralOwner = 0x1296f9228b40004
 dataLength = 1150
-numChildren = 0</pre>
+numChildren = 0]]></script>
 </div></div>
 
 <h2><a shape="rect" name="DOSGiDiscoveryDemopage-OtherResources"></a>Other Resources</h2>

Modified: websites/production/cxf/content/dosgi-discovery.html
==============================================================================
--- websites/production/cxf/content/dosgi-discovery.html (original)
+++ websites/production/cxf/content/dosgi-discovery.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 - DOSGi Discovery">
+
+  <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 -- DOSGi Discovery
     </title>
@@ -42,19 +53,15 @@ Apache CXF -- DOSGi Discovery
     <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 -- DOSGi Discovery
 
 
 <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">
@@ -150,19 +157,19 @@ 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" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">$ bin/zkServer
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[$ bin/zkServer
 ... log messages ...
 2009-06-10 13:23:27,288 - INFO  [main:FileTxnSnapLog@198] - Snapshotting: 0
-</pre>
+]]></script>
 </div></div>
 <p>The ZooKeeper server is now ready.</p>
 
 <p>You can check that all is well by running the client program:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">$ bin/zkCli -server localhost:2181
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[$ bin/zkCli -server localhost:2181
 --&gt; ls /
 Processing ls
-[zookeeper]</pre>
+[zookeeper]]]></script>
 </div></div>
 <p>So besides the zookeeper node, there is nothing in the ZooKeeper virtual filesystem yet.</p>
 
@@ -172,22 +179,22 @@ Processing ls
 <h3><a shape="rect" name="DOSGiDiscovery-SingleBundleDistribution"></a>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" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
--&gt; install http:<span class="code-comment">//repo1.maven.org/maven2/org/osgi/org.osgi.compendium/4.2.0/org.osgi.compendium-4.2.0.jar
-</span>Bundle ID: 4
--&gt; install http:<span class="code-comment">//www.apache.org/dist/cxf/dosgi/1.1/cxf-dosgi-ri-singlebundle-distribution-1.1.jar
-</span>Bundle ID: 5
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+-&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
+Bundle ID: 5
 -&gt; start 5
 ... log messages ...
 -&gt; ps
 START LEVEL 1
    ID   State         Level  Name
-[   0] [Active     ] [    0] <span class="code-object">System</span> Bundle (1.8.0)
+[   0] [Active     ] [    0] System Bundle (1.8.0)
 [   1] [Active     ] [    1] Apache Felix Shell Service (1.2.0)
 [   2] [Active     ] [    1] Apache Felix Shell TUI (1.2.0)
 [   3] [Active     ] [    1] Apache Felix Bundle Repository (1.4.0)
 [   4] [Resolved   ] [    1] osgi.cmpn (4.2.0.200908310645)
-[   5] [Active     ] [    1] Distributed OSGi Distribution Software Single-Bundle Distribution (1.1)</pre>
+[   5] [Active     ] [    1] Distributed OSGi Distribution Software Single-Bundle Distribution (1.1)]]></script>
 </div></div>
 <p>The Discovery bundle is now active, but it doesn't do anything yet since it's not yet configured. </p>
 
@@ -208,15 +215,15 @@ START LEVEL 1
 
 <p>An easy way to set the configuration, it by placing a file called <tt>org.apache.cxf.dosgi.discovery.zookeeper.cfg</tt> in the load directory created by the FileInstall bundle with the following content:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
 zookeeper.host = 127.0.0.1
-</pre>
+]]></script>
 </div></div>
 <p>As soon as you set the configuration, the Discovery will connect to the ZooKeeper server. You will see a few log messages on the ZooKeeper server console to reflect this.</p>
 
 <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" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">-&gt; services 5
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[-&gt; services 5
 
 Distributed OSGi Zookeeper-Based Discovery Single-Bundle Distribution (6) provides:
 -----------------------------------------------------------------------------------
@@ -229,7 +236,7 @@ service.pid = org.apache.cxf.dosgi.disco
 zookeeper.host = localhost
 zookeeper.port = 2181
 zookeeper.timeout = 3000
-</pre>
+]]></script>
 </div></div>
 
 <p>For further information and a walkthrough of the Discovery demo see the <a shape="rect" href="dosgi-discovery-demo-page.html" title="DOSGi Discovery Demo page">DOSGi Discovery Demo page</a>.</p></div>

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 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 - DOSGi DS Demo page">
+
+  <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 -- DOSGi DS Demo page
     </title>
@@ -42,19 +54,15 @@ Apache CXF -- DOSGi DS Demo page
     <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 -- DOSGi DS Demo page
 
 
 <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">
@@ -153,9 +161,9 @@ Declarative Services is similar to Sprin
 <span class="image-wrap" style=""><img src="dosgi-ds-demo-page.data/dosgi_cxf_ds.png" style="border: 0px solid black"></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" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java"><span class="code-keyword">public</span> <span class="code-keyword">interface</span> AdderService {
-    <span class="code-object">int</span> add(<span class="code-object">int</span> a, <span class="code-object">int</span> b);
-}</pre>
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[public interface AdderService {
+    int add(int a, int b);
+}]]></script>
 </div></div>
 
 <h2><a shape="rect" name="DOSGiDSDemopage-TheAdderServiceImplementation"></a>The Adder Service Implementation</h2>
@@ -164,21 +172,21 @@ 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"><tt>OSGI-INF/component.xml</tt></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" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-xml"><span class="code-tag">&lt;scr:component <span class="code-keyword">xmlns:scr</span>=<span class="code-quote">"http://www.osgi.org/xmlns/scr/v1.1.0"</span> name=<span class="code-quote">"DS Service Sample"</span>&gt;</span>
-  <span class="code-tag">&lt;implementation class=<span class="code-quote">"org.apache.cxf.dosgi.samples.ds.impl.AdderServiceImpl"</span>/&gt;</span>
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[&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;
 
-  <span class="code-tag">&lt;property name=<span class="code-quote">"service.exported.interfaces"</span> value=<span class="code-quote">"*"</span> /&gt;</span>
-  <span class="code-tag">&lt;property name=<span class="code-quote">"service.exported.configs"</span> value=<span class="code-quote">"org.apache.cxf.ws"</span> /&gt;</span>
-  <span class="code-tag">&lt;property name=<span class="code-quote">"org.apache.cxf.ws.address"</span> value=<span class="code-quote">"http://localhost:9090/adder"</span> /&gt;</span>
-
-  <span class="code-tag">&lt;service&gt;</span>
-    <span class="code-tag">&lt;provide interface=<span class="code-quote">"org.apache.cxf.dosgi.samples.ds.AdderService"</span>/&gt;</span>
-  <span class="code-tag">&lt;/service&gt;</span>
-<span class="code-tag">&lt;/scr:component&gt;</span></pre>
+  &lt;property name="service.exported.interfaces" value="*" /&gt;
+  &lt;property name="service.exported.configs" value="org.apache.cxf.ws" /&gt;
+  &lt;property name="org.apache.cxf.ws.address" value="http://localhost:9090/adder" /&gt;
+
+  &lt;service&gt;
+    &lt;provide interface="org.apache.cxf.dosgi.samples.ds.AdderService"/&gt;
+  &lt;/service&gt;
+&lt;/scr:component&gt;]]></script>
 </div></div>
 <p>Note that the <tt>META-INF/MANIFEST.MF</tt> 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" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">  Service-Component: OSGI-INF/component.xml</pre>
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[  Service-Component: OSGI-INF/component.xml]]></script>
 </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">
@@ -192,7 +200,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" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">osgi&gt; ss
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[osgi&gt; ss
 
 Framework is launched.
 
@@ -201,18 +209,18 @@ id	State       Bundle
 1	ACTIVE      org.eclipse.equinox.util_1.0.100.v20090520-1800
 2	ACTIVE      org.eclipse.osgi.services_3.2.0.v20090520-1800
 3	ACTIVE      cxf-dosgi-ri-singlebundle-distribution
-4	ACTIVE      org.eclipse.equinox.ds_1.1.0.v20090520-1800</pre>
+4	ACTIVE      org.eclipse.equinox.ds_1.1.0.v20090520-1800]]></script>
 </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" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">osgi&gt; install http:<span class="code-comment">//repo1.maven.org/maven2/org/apache/cxf/dosgi/samples/cxf-dosgi-ri-samples-ds-<span class="code-keyword">interface</span>/1.2/cxf-dosgi-ri-samples-ds-<span class="code-keyword">interface</span>-1.2.jar
-</span>Bundle id is 5
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[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:<span class="code-comment">//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
-</span>Bundle id is 6
+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
+Bundle id is 6
 
 osgi&gt; start 6
-... log messages may appear ...</pre>
+... log messages may appear ...]]></script>
 </div></div>
 <div class="panelMacro"><table class="tipMacro"><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/check.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1">You can also import the maven projects of the DS demo into Eclipse, this would save you from installing it with a URL as above. To do this, check out the CXF/DOSGi source from SVN (<a shape="rect" class="external-link" href="http://svn.apache.org/repos/asf/cxf/dosgi/trunk">http://svn.apache.org/repos/asf/cxf/dosgi/trunk</a>), run <tt>mvn eclipse:eclipse</tt> and import all Eclipse projects under the <tt>samples/ds</tt> directory in Eclipse with <em>File -&gt; Import | Existing Projects into Workspace</em>.</td></tr></table></div>
 <p>At this point, the service should be available remotely, you can check this by obtaining the WSDL:<br clear="none">
@@ -222,64 +230,64 @@ 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" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java"><span class="code-keyword">public</span> class AdderConsumer {
-    <span class="code-keyword">private</span> AdderService adder;
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[public class AdderConsumer {
+    private AdderService adder;
 
-    <span class="code-keyword">public</span> void bindAdder(AdderService a) {
+    public void bindAdder(AdderService a) {
         adder = a;
     }
 
-    <span class="code-keyword">public</span> void unbindAdder(AdderService a) {
-        adder = <span class="code-keyword">null</span>;
+    public void unbindAdder(AdderService a) {
+        adder = null;
     }
 
-    <span class="code-keyword">public</span> void start(ComponentContext cc) {
-        <span class="code-object">System</span>.out.println(<span class="code-quote">"Using adder service: 1 + 1 = "</span> + adder.add(1, 1));
+    public void start(ComponentContext cc) {
+        System.out.println("Using adder service: 1 + 1 = " + adder.add(1, 1));
     }
-}</pre>
+}]]></script>
 </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"><tt>OSGI-INF/component.xml</tt></a> which drives the component creation and injection:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-xml"><span class="code-tag">&lt;scr:component <span class="code-keyword">xmlns:scr</span>=<span class="code-quote">"http://www.osgi.org/xmlns/scr/v1.1.0"</span> activate=<span class="code-quote">"start"</span>&gt;</span>
-   <span class="code-tag">&lt;implementation class=<span class="code-quote">"org.apache.cxf.dosgi.samples.ds.consumer.AdderConsumer"</span>/&gt;</span>
-   <span class="code-tag">&lt;reference interface=<span class="code-quote">"org.apache.cxf.dosgi.samples.ds.AdderService"</span> name=<span class="code-quote">"AdderService"</span> cardinality=<span class="code-quote">"1..1"</span> policy=<span class="code-quote">"dynamic"</span> bind=<span class="code-quote">"bindAdder"</span> unbind=<span class="code-quote">"unbindAdder"</span>/&gt;</span>
-<span class="code-tag">&lt;/scr:component&gt;</span></pre>
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[&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;]]></script>
 </div></div>
 <p>As on the service provider side, the client side bundle needs to contain the DS header in the <tt>META-INF/MANIFEST.MF</tt>:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">  Service-Component: OSGI-INF/component.xml</pre>
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[  Service-Component: OSGI-INF/component.xml]]></script>
 </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"><tt>OSGI-INF/remote-service/remote-services.xml</tt></a> file:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-xml"><span class="code-tag">&lt;endpoint-descriptions xmlns=<span class="code-quote">"http://www.osgi.org/xmlns/rsa/v1.0.0"</span>&gt;</span>
-  <span class="code-tag">&lt;endpoint-description&gt;</span>
-    <span class="code-tag">&lt;property name=<span class="code-quote">"objectClass"</span>&gt;</span>
-      <span class="code-tag">&lt;array&gt;</span>
-        <span class="code-tag">&lt;value&gt;</span>org.apache.cxf.dosgi.samples.ds.AdderService<span class="code-tag">&lt;/value&gt;</span>
-      <span class="code-tag">&lt;/array&gt;</span>
-    <span class="code-tag">&lt;/property&gt;</span>
-    <span class="code-tag">&lt;property name=<span class="code-quote">"endpoint.id"</span>&gt;</span>http://localhost:9090/adder<span class="code-tag">&lt;/property&gt;</span>
-    <span class="code-tag">&lt;property name=<span class="code-quote">"service.imported.configs"</span>&gt;</span>org.apache.cxf.ws<span class="code-tag">&lt;/property&gt;</span>
-  <span class="code-tag">&lt;/endpoint-description&gt;</span>
-<span class="code-tag">&lt;/endpoint-descriptions&gt;</span></pre>
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[&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;
+        &lt;value&gt;org.apache.cxf.dosgi.samples.ds.AdderService&lt;/value&gt;
+      &lt;/array&gt;
+    &lt;/property&gt;
+    &lt;property name="endpoint.id"&gt;http://localhost:9090/adder&lt;/property&gt;
+    &lt;property name="service.imported.configs"&gt;org.apache.cxf.ws&lt;/property&gt;
+  &lt;/endpoint-description&gt;
+&lt;/endpoint-descriptions&gt;]]></script>
 </div></div>
 <p>Install and run the consumer side of the demo in a separate Equinox instance (tip: you can duplicate the launch configuration used for the server side in the 'Run Configurations' dialog):</p>
 
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">osgi&gt; install http:<span class="code-comment">//repo1.maven.org/maven2/org/apache/cxf/dosgi/samples/cxf-dosgi-ri-samples-ds-<span class="code-keyword">interface</span>/1.2/cxf-dosgi-ri-samples-ds-<span class="code-keyword">interface</span>-1.2.jar
-</span>Bundle id is 5
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[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:<span class="code-comment">//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
-</span>Bundle id is 6
+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
+Bundle id is 6
 
 osgi&gt; start 6
-... log messages may appear, after a little <span class="code-keyword">while</span> the following message appears:
-Using adder service: 1 + 1 = 2</pre>
+... log messages may appear, after a little while the following message appears:
+Using adder service: 1 + 1 = 2]]></script>
 </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" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">Adder service invoked: 1 + 1 = 2</pre>
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[Adder service invoked: 1 + 1 = 2]]></script>
 </div></div>
 
 <h3><a shape="rect" name="DOSGiDSDemopage-ConsumerNote"></a>Consumer Note</h3>

Modified: websites/production/cxf/content/dosgi-faq.html
==============================================================================
--- websites/production/cxf/content/dosgi-faq.html (original)
+++ websites/production/cxf/content/dosgi-faq.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 - DOSGi FAQ">
+
+
     <title>
 Apache CXF -- DOSGi FAQ
     </title>
@@ -42,19 +44,15 @@ Apache CXF -- DOSGi FAQ
     <td id="cell-1-0">&nbsp;</td>
     <td id="cell-1-1">&nbsp;</td>
     <td id="cell-1-2">
-      <div style="padding: 5px;">
-        <div id="banner">
-          <!-- Banner -->
-<div id="banner-content">
+      <!-- Banner -->
+<div class="banner" id="banner"><p>
 <table border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td align="left" colspan="1" nowrap>
 <a shape="rect" href="http://cxf.apache.org/" title="Apache CXF"><span style="font-weight: bold; font-size: 170%; color: white">Apache CXF</span></a>
 </td><td align="right" colspan="1" nowrap>
 <a shape="rect" href="http://www.apache.org/" title="The Apache Software Foundation"><img border="0" alt="ASF Logo" src="http://cxf.apache.org/images/asf-logo.png"></a>
 </td></tr></table>
-</div>
-          <!-- Banner -->
-        </div>
-      </div>
+</p></div>
+      <!-- Banner -->
       <div id="top-menu">
         <table border="0" cellpadding="1" cellspacing="0" width="100%">
           <tr>
@@ -101,8 +99,8 @@ Apache CXF -- DOSGi FAQ
 
 
 <h3><a shape="rect" name="Navigation-Search"></a>Search</h3>
-
-<form enctype="application/x-www-form-urlencoded" method="get" id="cse-search-box" action="http://www.google.com/cse">
+<p>
+</p><form enctype="application/x-www-form-urlencoded" method="get" id="cse-search-box" action="http://www.google.com/cse">
   <div>
     <input type="hidden" name="cx" value="002890367768291051730:o99qiwa09y4">
     <input type="hidden" name="ie" value="UTF-8">

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 Mon Jun 24 17:10:51 2013
@@ -27,7 +27,7 @@
 <meta name="description" content="Apache CXF, Services Framework - DOSGi Multi Bundle Distribution">
 
   <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/shThemeEclipse.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>
   
@@ -53,19 +53,15 @@ Apache CXF -- DOSGi Multi Bundle Distrib
     <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>

Modified: websites/production/cxf/content/dosgi-presentations-and-articles.html
==============================================================================
--- websites/production/cxf/content/dosgi-presentations-and-articles.html (original)
+++ websites/production/cxf/content/dosgi-presentations-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 - DOSGi Presentations and Articles">
+
+
     <title>
 Apache CXF -- DOSGi Presentations and Articles
     </title>
@@ -42,19 +44,15 @@ Apache CXF -- DOSGi Presentations and Ar
     <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 -- DOSGi Presentations and Ar
 
 
 <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/dosgi-releases.html
==============================================================================
--- websites/production/cxf/content/dosgi-releases.html (original)
+++ websites/production/cxf/content/dosgi-releases.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 - DOSGi Releases">
+
+
     <title>
 Apache CXF -- DOSGi Releases
     </title>
@@ -42,19 +44,15 @@ Apache CXF -- DOSGi Releases
     <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 -- DOSGi Releases
 
 
 <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/dosgi-single-bundle-distribution.html
==============================================================================
--- websites/production/cxf/content/dosgi-single-bundle-distribution.html (original)
+++ websites/production/cxf/content/dosgi-single-bundle-distribution.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 - DOSGi Single Bundle Distribution">
+
+  <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 -- DOSGi Single Bundle Distribution
     </title>
@@ -42,19 +53,15 @@ Apache CXF -- DOSGi Single Bundle Distri
     <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 -- DOSGi Single Bundle Distri
 
 
 <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">
@@ -154,18 +161,18 @@ Apache CXF -- DOSGi Single Bundle Distri
 <p>To set up Felix you can follow these steps:<br clear="none">
 <em>Verified with: Felix 4.0.2 and DOSGI RI 1.3</em></p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">../felix-4.0.2&gt; java -jar bin/felix.jar
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[../felix-4.0.2&gt; java -jar bin/felix.jar
 
 Welcome to Apache Felix Gogo
-g! start http:<span class="code-comment">//www.apache.org/dist/cxf/dosgi/1.3/cxf-dosgi-ri-singlebundle-distribution-1.3.jar
-</span>... some log messages may appear...
+g! start http://www.apache.org/dist/cxf/dosgi/1.3/cxf-dosgi-ri-singlebundle-distribution-1.3.jar
+... some log messages may appear...
 g! lb
     0|Active     |    0|org.apache.felix.framework (4.0.2)
     1|Active     |    1|org.apache.felix.bundlerepository (1.6.6)
     2|Active     |    1|org.apache.felix.gogo.command (0.12.0)
     3|Active     |    1|org.apache.felix.gogo.runtime (0.10.0)
     4|Active     |    1|org.apache.felix.gogo.shell (0.10.0)
-    5|Active     |    1|cxf-dosgi-ri-singlebundle-distribution (1.3.0)</pre>
+    5|Active     |    1|cxf-dosgi-ri-singlebundle-distribution (1.3.0)]]></script>
 </div></div>
 
 <p>However, you can also change the <tt>conf/config.properties</tt> file to automatically load these bundles. This approach is described in the <a shape="rect" href="dosgi-multi-bundle-distribution.html" title="DOSGi Multi Bundle Distribution">Multi Bundle Setup</a> page.</p>
@@ -178,10 +185,10 @@ g! lb
 <p>To set up Equinox you can follow these steps:<br clear="none">
 <em>Verified with: Eclipse 3.6.2</em></p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">.../eclipse&gt; java -jar plugins/org.eclipse.osgi_3.6.2.R36x_v20110210.jar -console
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[.../eclipse&gt; java -jar plugins/org.eclipse.osgi_3.6.2.R36x_v20110210.jar -console
 
-osgi&gt; install http:<span class="code-comment">//www.apache.org/dist/cxf/dosgi/1.3/cxf-dosgi-ri-singlebundle-distribution-1.3.jar
-</span>Bundle id is 1
+osgi&gt; install http://www.apache.org/dist/cxf/dosgi/1.3/cxf-dosgi-ri-singlebundle-distribution-1.3.jar
+Bundle id is 1
 
 osgi&gt; start 1
 ... some log messages may appear...
@@ -191,7 +198,7 @@ Framework is launched.
 
 id      State       Bundle
 0       ACTIVE      org.eclipse.osgi_3.6.2.R36x_v20110210
-1       ACTIVE      cxf-dosgi-ri-singlebundle-distribution_1.3.0</pre>
+1       ACTIVE      cxf-dosgi-ri-singlebundle-distribution_1.3.0]]></script>
 </div></div>
 
 <p>However, you can also create a <tt>config.ini</tt> file to automatically load these bundles. This approach is described in the <a shape="rect" href="dosgi-multi-bundle-distribution.html" title="DOSGi Multi Bundle Distribution">Multi Bundle Setup</a> page.</p>

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 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 - DOSGi Spring-DM Demo page">
+
+  <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 -- DOSGi Spring-DM Demo page
     </title>
@@ -42,19 +54,15 @@ Apache CXF -- DOSGi Spring-DM Demo page
     <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 -- DOSGi Spring-DM Demo page
 
 
 <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">
@@ -150,9 +158,9 @@ 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" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java"><span class="code-keyword">public</span> <span class="code-keyword">interface</span> DinnerService {
-    List&lt;Restaurant&gt; findRestaurants(<span class="code-object">String</span> searchQuery);
-}</pre>
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[public interface DinnerService {
+    List&lt;Restaurant&gt; findRestaurants(String searchQuery);
+}]]></script>
 </div></div>
 
 <h2><a shape="rect" name="DOSGiSpring-DMDemopage-TheDinnerServiceProvider"></a>The Dinner Service Provider</h2>
@@ -161,33 +169,33 @@ 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"><tt>META-INF/spring/spring.xml</tt></a> file. This file creates the DinnerServiceImpl bean and registers it with the OSGi Service Registry. It also sets the <tt>osgi.remote.interfaces</tt> property on the service to mark is as suitable for remoting. Here are the important parts of the <tt>spring.xml</tt> file:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-xml">
-<span class="code-tag">&lt;beans <span class="code-keyword">xmlns:osgi</span>=<span class="code-quote">"..."</span>&gt;</span>
-  <span class="code-tag">&lt;osgi:service interface=<span class="code-quote">"org.apache.cxf.dosgi.samples.springdm.DinnerService"</span>&gt;</span>
-    <span class="code-tag">&lt;osgi:service-properties&gt;</span>
-      <span class="code-tag">&lt;entry key=<span class="code-quote">"service.exported.interfaces"</span> value=<span class="code-quote">"*"</span> /&gt;</span>
-    <span class="code-tag">&lt;/osgi:service-properties&gt;</span>
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+&lt;beans xmlns:osgi="..."&gt;
+  &lt;osgi:service interface="org.apache.cxf.dosgi.samples.springdm.DinnerService"&gt;
+    &lt;osgi:service-properties&gt;
+      &lt;entry key="service.exported.interfaces" value="*" /&gt;
+    &lt;/osgi:service-properties&gt;
     
-    <span class="code-tag">&lt;bean class=<span class="code-quote">"org.apache.cxf.dosgi.samples.springdm.impl.DinnerServiceImpl"</span> /&gt;</span>
-  <span class="code-tag">&lt;/osgi:service&gt;</span>                     
-<span class="code-tag">&lt;/beans&gt;</span>
-</pre>
+    &lt;bean class="org.apache.cxf.dosgi.samples.springdm.impl.DinnerServiceImpl" /&gt;
+  &lt;/osgi:service&gt;                     
+&lt;/beans&gt;
+]]></script>
 </div></div>
 <p>Unlike in the Greeter demo <tt>osgi.remote.configuration...</tt> properties are not set in the configuration, this means that the service is exposed on the default location of <tt><a shape="rect" class="external-link" href="http://localhost:9000/org/apache/cxf/dosgi/samples/springdm/DinnerService" rel="nofollow">http://localhost:9000/org/apache/cxf/dosgi/samples/springdm/DinnerService</a></tt>. The default location is based on the interface name of the service being remoted.</p>
 
 <p>In this example, the bundles are installed in Felix.</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">-&gt; start http:<span class="code-comment">//repo2.maven.org/maven2/org/apache/cxf/dosgi/samples/cxf-dosgi-ri-samples-spring-dm-<span class="code-keyword">interface</span>/1.2/cxf-dosgi-ri-samples-spring-dm-<span class="code-keyword">interface</span>-1.2.jar
-</span>-&gt; start http:<span class="code-comment">//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
-</span>... log messages may appear ...
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[-&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
 START LEVEL 32
    ID   State         Level  Name
-[   0] [Active     ] [    0] <span class="code-object">System</span> Bundle (1.8.0)
+[   0] [Active     ] [    0] System Bundle (1.8.0)
 ... bundles ...
 [  35] [Active     ] [    1] CXF Distributed OSGi Spring-DM Sample Interface Bundle
 [  36] [Active     ] [    1] CXF Distributed OSGi Spring-DM Sample Implementation Bundle
-</pre>
+]]></script>
 </div></div>
 <p>At this point the service should be available. You can check this by obtaining the WSDL:</p>
 
@@ -196,63 +204,63 @@ START LEVEL 32
 <h2><a shape="rect" name="DOSGiSpring-DMDemopage-TheDinnerServiceConsumer"></a>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 <tt>start()</tt> method where the remote service is used. </p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java"><span class="code-keyword">public</span> class DinnerServiceConsumer {
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[public class DinnerServiceConsumer {
     DinnerService dinnerService;
     
-    <span class="code-keyword">public</span> void setDinnerService(DinnerService ds) {
+    public void setDinnerService(DinnerService ds) {
         dinnerService = ds;
     }
     
-    <span class="code-keyword">public</span> void start() {
-        <span class="code-object">System</span>.out.println(<span class="code-quote">"Found the following restaurants:"</span>);
-        <span class="code-keyword">for</span> (Restaurant r : dinnerService.findRestaurants(<span class="code-quote">"nice and not too expensive!"</span>)) {
-            <span class="code-object">System</span>.out.format(<span class="code-quote">"  %s (%s) Rating: %d\n"</span>, r.getName(), r.getAddress(), r.getRating());
+    public void start() {
+        System.out.println("Found the following restaurants:");
+        for (Restaurant r : dinnerService.findRestaurants("nice and not too expensive!")) {
+            System.out.format("  %s (%s) Rating: %d\n", r.getName(), r.getAddress(), r.getRating());
         }
     }
 }
-</pre>
+]]></script>
 </div></div>
 
 <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"><tt>META-INF/spring/spring.xml</tt></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" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-xml">
-<span class="code-tag">&lt;beans&gt;</span>
-  <span class="code-tag">&lt;osgi:reference id=<span class="code-quote">"dinnerServiceRef"</span> interface=<span class="code-quote">"org.apache.cxf.dosgi.samples.springdm.DinnerService"</span>/&gt;</span>
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+&lt;beans&gt;
+  &lt;osgi:reference id="dinnerServiceRef" interface="org.apache.cxf.dosgi.samples.springdm.DinnerService"/&gt;
   
-  &lt;bean class=<span class="code-quote">"org.apache.cxf.dosgi.samples.springdm.client.DinnerServiceConsumer"</span>
-        init-method=<span class="code-quote">"start"</span>&gt;
-    <span class="code-tag">&lt;property name=<span class="code-quote">"dinnerService"</span> ref=<span class="code-quote">"dinnerServiceRef"</span>/&gt;</span>
-  <span class="code-tag">&lt;/bean&gt;</span>
-<span class="code-tag">&lt;/beans&gt;</span>
-</pre>
+  &lt;bean class="org.apache.cxf.dosgi.samples.springdm.client.DinnerServiceConsumer"
+        init-method="start"&gt;
+    &lt;property name="dinnerService" ref="dinnerServiceRef"/&gt;
+  &lt;/bean&gt;
+&lt;/beans&gt;
+]]></script>
 </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" title="DOSGi Discovery Demo page">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"><tt>OSGI-INF/remote-service/remote-services.xml</tt></a> file. </p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-xml"><span class="code-tag">&lt;endpoint-descriptions xmlns=<span class="code-quote">"http://www.osgi.org/xmlns/rsa/v1.0.0"</span>&gt;</span>
-  <span class="code-tag">&lt;endpoint-description&gt;</span>
-    <span class="code-tag">&lt;property name=<span class="code-quote">"objectClass"</span>&gt;</span>
-      <span class="code-tag">&lt;array&gt;</span>
-        <span class="code-tag">&lt;value&gt;</span>org.apache.cxf.dosgi.samples.springdm.DinnerService<span class="code-tag">&lt;/value&gt;</span>
-      <span class="code-tag">&lt;/array&gt;</span>
-    <span class="code-tag">&lt;/property&gt;</span>
-    <span class="code-tag">&lt;property name=<span class="code-quote">"endpoint.id"</span>&gt;</span>http://localhost:9000/org/apache/cxf/dosgi/samples/springdm/DinnerService<span class="code-tag">&lt;/property&gt;</span>
-    <span class="code-tag">&lt;property name=<span class="code-quote">"service.imported.configs"</span>&gt;</span>org.apache.cxf.ws<span class="code-tag">&lt;/property&gt;</span>
-  <span class="code-tag">&lt;/endpoint-description&gt;</span>
-<span class="code-tag">&lt;/endpoint-descriptions&gt;</span></pre>
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[&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;
+        &lt;value&gt;org.apache.cxf.dosgi.samples.springdm.DinnerService&lt;/value&gt;
+      &lt;/array&gt;
+    &lt;/property&gt;
+    &lt;property name="endpoint.id"&gt;http://localhost:9000/org/apache/cxf/dosgi/samples/springdm/DinnerService&lt;/property&gt;
+    &lt;property name="service.imported.configs"&gt;org.apache.cxf.ws&lt;/property&gt;
+  &lt;/endpoint-description&gt;
+&lt;/endpoint-descriptions&gt;]]></script>
 </div></div>
 <p>Install and run the consumer side of the demo in a separate Felix instance:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">-&gt; start http:<span class="code-comment">//repo2.maven.org/maven2/org/apache/cxf/dosgi/samples/cxf-dosgi-ri-samples-spring-dm-<span class="code-keyword">interface</span>/1.2/cxf-dosgi-ri-samples-spring-dm-<span class="code-keyword">interface</span>-1.2.jar
-</span>-&gt; start http:<span class="code-comment">//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
-</span>... log messages may appear, at some point the consumer will make an invocation on the remote service, you will see:
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[-&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:
   Jojo's (1 food way) Rating: 3
   Boohaa's (95 forage ave) Rating: 1
-  MicMac (Plastic Plaza) Rating: 1</pre>
+  MicMac (Plastic Plaza) Rating: 1]]></script>
 </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" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">-&gt; Hey! Someone's using the Dinner Service! Query: nice and not too expensive!</pre>
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[-&gt; Hey! Someone's using the Dinner Service! Query: nice and not too expensive!]]></script>
 </div></div>
 </div>
            </div>

Modified: websites/production/cxf/content/download.html
==============================================================================
--- websites/production/cxf/content/download.html (original)
+++ websites/production/cxf/content/download.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 - Download">
+
+  <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 -- Download
     </title>
@@ -42,19 +53,15 @@ Apache CXF -- Download
     <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 -- Download
 
 
 <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">
@@ -171,23 +178,23 @@ Apache CXF -- Download
 
 <p>You can check the OpenPGP signature with:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
 gpg --verify apache-cxf-*.tar.gz.asc
-</pre>
+]]></script>
 </div></div>
 
 <p>You can check the MD5 checksum with:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
 md5sum --check apache-cxf-*.tar.gz.md5
-</pre>
+]]></script>
 </div></div>
 
 <p>You can check the SHA1 checksum with:</p>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<pre class="code-java">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
 sha1sum --check apache-cxf-*.tar.gz.sha1
-</pre>
+]]></script>
 </div></div>
 
 <h1><a shape="rect" name="Download-Previousreleases"></a>Previous releases</h1>



Mime
View raw message