Author: buildbot
Date: Mon Jan 14 08:23:47 2013
New Revision: 846593

Log:
Production update by buildbot for camel

Modified:
    websites/production/camel/content/book-cookbook.html
    websites/production/camel/content/camel-transport-for-cxf.html

Modified: websites/production/camel/content/book-cookbook.html
==============================================================================
--- websites/production/camel/content/book-cookbook.html (original)
+++ websites/production/camel/content/book-cookbook.html Mon Jan 14 08:23:47 
2013
@@ -1807,90 +1807,7 @@ mock.allMessages().arrives().noLaterThan
 
 <p>Here is a Camel test support enhanced&#160;<a shape="rect" 
href="spring-testing.html" title="Spring Testing">Spring Testing</a>&#160;<a 
shape="rect" class="external-link" 
href="https://svn.apache.org/repos/asf/camel/trunk/components/camel-test-spring/src/test/java/org/apache/camel/test/junit4/CamelSpringJUnit4ClassRunnerPlainTest.java";>example
 using XML Config and pure Spring Test based configuration of the Camel 
Context</a>.</p>
 
-<div class="code panel" style="border-width: 1px;"><div class="codeContent 
panelContent">
-<pre class="code-java">@RunWith(CamelSpringJUnit4ClassRunner.class)
-@ContextConfiguration
-<span class="code-comment">// Put here to prevent Spring context caching 
across tests and test methods since some tests inherit 
-</span><span class="code-comment">// from <span 
class="code-keyword">this</span> test and therefore use the same Spring 
context.  Also because we want to reset the
-</span><span class="code-comment">// Camel context and mock endpoints between 
test methods automatically.
-</span>@DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD)
-<span class="code-keyword">public</span> class 
CamelSpringJUnit4ClassRunnerPlainTest {
-    
-    @Autowired
-    <span class="code-keyword">protected</span> CamelContext camelContext;
-    
-    @Autowired
-    <span class="code-keyword">protected</span> CamelContext camelContext2;
-    
-    @EndpointInject(uri = <span class="code-quote">"mock:a"</span>, context = 
<span class="code-quote">"camelContext"</span>)
-    <span class="code-keyword">protected</span> MockEndpoint mockA;
-    
-    @EndpointInject(uri = <span class="code-quote">"mock:b"</span>, context = 
<span class="code-quote">"camelContext"</span>)
-    <span class="code-keyword">protected</span> MockEndpoint mockB;
-    
-    @EndpointInject(uri = <span class="code-quote">"mock:c"</span>, context = 
<span class="code-quote">"camelContext2"</span>)
-    <span class="code-keyword">protected</span> MockEndpoint mockC;
-    
-    @Produce(uri = <span class="code-quote">"direct:start"</span>, context = 
<span class="code-quote">"camelContext"</span>)
-    <span class="code-keyword">protected</span> ProducerTemplate start;
-    
-    @Produce(uri = <span class="code-quote">"direct:start2"</span>, context = 
<span class="code-quote">"camelContext2"</span>)
-    <span class="code-keyword">protected</span> ProducerTemplate start2;
-    
-    @Test
-    <span class="code-keyword">public</span> void testPositive() <span 
class="code-keyword">throws</span> Exception {
-        assertEquals(ServiceStatus.Started, camelContext.getStatus());
-        assertEquals(ServiceStatus.Started, camelContext2.getStatus());
-        
-        mockA.expectedBodiesReceived(<span class="code-quote">"David"</span>);
-        mockB.expectedBodiesReceived(<span class="code-quote">"Hello 
David"</span>);
-        mockC.expectedBodiesReceived(<span class="code-quote">"David"</span>);
-        
-        start.sendBody(<span class="code-quote">"David"</span>);
-        start2.sendBody(<span class="code-quote">"David"</span>);
-        
-        MockEndpoint.assertIsSatisfied(camelContext);
-    }
-    
-    @Test
-    <span class="code-keyword">public</span> void testJmx() <span 
class="code-keyword">throws</span> Exception {
-        assertEquals(DefaultManagementStrategy.class, 
camelContext.getManagementStrategy().getClass());
-    }
-    
-    @Test
-    <span class="code-keyword">public</span> void testShutdownTimeout() <span 
class="code-keyword">throws</span> Exception {
-        assertEquals(10, camelContext.getShutdownStrategy().getTimeout());
-        assertEquals(TimeUnit.SECONDS, 
camelContext.getShutdownStrategy().getTimeUnit());
-    }
-    
-    @Test
-    <span class="code-keyword">public</span> void testStopwatch() {
-        StopWatch stopWatch = StopWatchTestExecutionListener.getStopWatch();
-        
-        assertNotNull(stopWatch);
-        assertTrue(stopWatch.taken() &lt; 100);
-    }
-    
-    @Test
-    <span class="code-keyword">public</span> void testExcludedRoute() {
-        assertNotNull(camelContext.getRoute(<span 
class="code-quote">"excludedRoute"</span>));
-    }
-    
-    @Test
-    <span class="code-keyword">public</span> void testProvidesBreakpoint() {
-        assertNull(camelContext.getDebugger());
-        assertNull(camelContext2.getDebugger());
-    }
-
-    @SuppressWarnings(<span class="code-quote">"deprecation"</span>)
-    @Test
-    <span class="code-keyword">public</span> void testLazyLoadTypeConverters() 
{
-        assertTrue(camelContext.isLazyLoadTypeConverters());
-        assertTrue(camelContext2.isLazyLoadTypeConverters());
-    }
-}
-</pre>
-</div></div>
+<div class="error"><span class="error">Error formatting macro: snippet: 
java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</span> </div>
 
 <p>Notice how a custom test runner is used with 
the&#160;<b>@RunWith</b>&#160;annotation to support the features 
of&#160;<b>CamelTestSupport</b>&#160;through annotations on the test class. 
&#160;See&#160;<a shape="rect" href="spring-testing.html" title="Spring 
Testing">Spring Testing</a>&#160;for a list of annotations you can use in your 
tests.</p>
 
@@ -2857,10 +2774,11 @@ from(<span class="code-quote">"file:data
 
 <h3><a shape="rect" 
name="Bookcookbook-SettinguptheCamelTransportinSpring"></a>Setting up the Camel 
Transport in Spring</h3>
 
-<p>You can use the following snippet in your applicationcontext if you want to 
configure anything special. If you only want to activate the camel transport 
you do not have to do anything in your application context. As soon as you 
include the camel-cxf jar in your app cxf will scan the jar and load a 
CamelTransportFactory for you. </p>
+<p>You can use the following snippet in your applicationcontext if you want to 
configure anything special. If you only want to activate the camel transport 
you do not have to do anything in your application context. As soon as you 
include the camel-cxf-transport jar (or camel-cxf.jar if your camel version is 
less than 2.7.x) in your app cxf will scan the jar and load a 
CamelTransportFactory for you. </p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent 
panelContent">
 <pre class="code-xml">
+<span class="code-tag"><span class="code-comment">&lt;!-- you don't need to 
specify the CamelTransportFactory configuration as it is auto load by CXF bus 
--&gt;</span></span>
 <span class="code-tag">&lt;bean class=<span 
class="code-quote">"org.apache.camel.component.cxf.transport.CamelTransportFactory"</span>&gt;</span>
   <span class="code-tag">&lt;property name=<span 
class="code-quote">"bus"</span> ref=<span class="code-quote">"cxf"</span> 
/&gt;</span>
   <span class="code-tag">&lt;property name=<span 
class="code-quote">"camelContext"</span> ref=<span 
class="code-quote">"camelContext"</span> /&gt;</span>
@@ -2911,7 +2829,7 @@ dfm.registerDestinationFactory(CamelTran
 </pre>
 </div></div>
 
-<h2><a shape="rect" 
name="Bookcookbook-Configurethedestinationandconduit"></a>Configure the 
destination and conduit</h2>
+<h2><a shape="rect" 
name="Bookcookbook-ConfigurethedestinationandconduitwithSpring"></a>Configure 
the destination and conduit with Spring</h2>
 
 <h3><a shape="rect" name="Bookcookbook-Namespace"></a>Namespace</h3>
 
@@ -2945,11 +2863,15 @@ dfm.registerDestinationFactory(CamelTran
          &lt;/route&gt;
      &lt;/camelContext&gt;
   &lt;/camel:destination&gt;
+
+  &lt;!-- <span class="code-keyword">new</span> added feature since Camel 
2.11.x
+  &lt;camel:destination name=<span class="code-quote">"{http:<span 
class="code-comment">//widgets/widgetvendor.net}widgetSOAPPort.camel-destination"</span>
 camelContextId=<span class="code-quote">"context"</span> /&gt;  
+</span>
 ...
 </pre>
 </div></div>
 
-<p>The <tt>camel:destination</tt> element has a number of child elements that 
specify configuration information. They are described below.</p>
+<p>The <tt>camel:destination</tt> element for Spring has a number of child 
elements that specify configuration information. They are described below.</p>
 
 <div class="table-wrap">
 <table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" 
class="confluenceTh">Element</th><th colspan="1" rowspan="1" 
class="confluenceTh">Description</th></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"><tt>camel-spring:camelContext</tt></td><td colspan="1" 
rowspan="1" class="confluenceTd">You can specify the camel context in the camel 
destination</td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"><tt>camel:camelContextRef</tt></td><td colspan="1" 
rowspan="1" class="confluenceTd">The camel context id which you want inject 
into the camel destination</td></tr></tbody></table>
@@ -2974,6 +2896,10 @@ dfm.registerDestinationFactory(CamelTran
      <span 
class="code-tag">&lt;camel:camelContextRef&gt;</span>conduit_context<span 
class="code-tag">&lt;/camel:camelContextRef&gt;</span>
   <span class="code-tag">&lt;/camel:conduit&gt;</span>
 
+  &lt;!-- new added feature since Camel 2.11.x
+  <span class="code-tag">&lt;camel:conduit name=<span 
class="code-quote">"{http://widgets/widgetvendor.net}widgetSOAPPort.camel-conduit";</span>
 camelContextId=<span class="code-quote">"conduit_context"</span> /&gt;</span>
+     
+
   <span class="code-tag">&lt;camel:conduit name=<span 
class="code-quote">"*.camel-conduit"</span>&gt;</span>
   <span class="code-tag"><span class="code-comment">&lt;!-- you can also using 
the wild card to specify the camel-conduit that you want to configure 
--&gt;</span></span>
     ...
@@ -2989,6 +2915,30 @@ dfm.registerDestinationFactory(CamelTran
 </div>
 
 
+<h2><a shape="rect" 
name="Bookcookbook-ConfigurethedestinationandconduitwithBlueprint"></a>Configure
 the destination and conduit with Blueprint</h2>
+
+<p>From <b>Camel 2.11.x</b>, Camel Transport supports to be configured with 
Blueprint</p>
+
+<p>If you are using blueprint, you should use the the namespace <tt><a 
shape="rect" 
href="http://cxf.apache.org/transports/camel/blueprint";>http://cxf.apache.org/transports/camel/blueprint</a></tt>
 and import the schema like the blow.</p>
+<div class="code panel" style="border-width: 1px;"><div class="codeHeader 
panelHeader" style="border-bottom-width: 1px;"><b>Adding the Configuration 
Namespace for blueprint</b></div><div class="codeContent panelContent">
+<pre class="code-java">
+&lt;beans ...
+       xmlns:camel=<span class="code-quote">"http:<span 
class="code-comment">//cxf.apache.org/transports/camel/blueprint"</span>
+</span>       ...
+       xsi:schemaLocation="...
+                           http:<span 
class="code-comment">//cxf.apache.org/transports/camel/blueprint 
+</span>                           http:<span 
class="code-comment">//cxf.apache.org/schmemas/blueprint/camel.xsd
+</span>                          ...&gt;
+</pre>
+</div></div>
+
+<p>In blueprint <tt>camel:conduit</tt> <tt>camel:destination</tt> only has one 
camelContextId attribute, they doesn't support to specify the camel context in 
the camel destination.</p>
+<div class="code panel" style="border-width: 1px;"><div class="codeContent 
panelContent">
+<pre class="code-java">
+  &lt;camel:conduit id=<span class="code-quote">"*.camel-conduit"</span> 
camelContextId=<span class="code-quote">"camel1"</span> /&gt;
+  &lt;camel:destination id=<span 
class="code-quote">"*.camel-destination"</span> camelContextId=<span 
class="code-quote">"camel1"</span> /&gt;
+</pre>
+</div></div>
 
 <h2><a shape="rect" 
name="Bookcookbook-ExampleUsingCamelasaloadbalancerforCXF"></a>Example Using 
Camel as a load balancer for CXF</h2>
 

Modified: websites/production/camel/content/camel-transport-for-cxf.html
==============================================================================
--- websites/production/camel/content/camel-transport-for-cxf.html (original)
+++ websites/production/camel/content/camel-transport-for-cxf.html Mon Jan 14 
08:23:47 2013
@@ -88,10 +88,11 @@
 
 <h3><a shape="rect" 
name="CamelTransportforCXF-SettinguptheCamelTransportinSpring"></a>Setting up 
the Camel Transport in Spring</h3>
 
-<p>You can use the following snippet in your applicationcontext if you want to 
configure anything special. If you only want to activate the camel transport 
you do not have to do anything in your application context. As soon as you 
include the camel-cxf jar in your app cxf will scan the jar and load a 
CamelTransportFactory for you. </p>
+<p>You can use the following snippet in your applicationcontext if you want to 
configure anything special. If you only want to activate the camel transport 
you do not have to do anything in your application context. As soon as you 
include the camel-cxf-transport jar (or camel-cxf.jar if your camel version is 
less than 2.7.x) in your app cxf will scan the jar and load a 
CamelTransportFactory for you. </p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent 
panelContent">
 <pre class="code-xml">
+<span class="code-tag"><span class="code-comment">&lt;!-- you don't need to 
specify the CamelTransportFactory configuration as it is auto load by CXF bus 
--&gt;</span></span>
 <span class="code-tag">&lt;bean class=<span 
class="code-quote">"org.apache.camel.component.cxf.transport.CamelTransportFactory"</span>&gt;</span>
   <span class="code-tag">&lt;property name=<span 
class="code-quote">"bus"</span> ref=<span class="code-quote">"cxf"</span> 
/&gt;</span>
   <span class="code-tag">&lt;property name=<span 
class="code-quote">"camelContext"</span> ref=<span 
class="code-quote">"camelContext"</span> /&gt;</span>
@@ -142,7 +143,7 @@ dfm.registerDestinationFactory(CamelTran
 </pre>
 </div></div>
 
-<h2><a shape="rect" 
name="CamelTransportforCXF-Configurethedestinationandconduit"></a>Configure the 
destination and conduit</h2>
+<h2><a shape="rect" 
name="CamelTransportforCXF-ConfigurethedestinationandconduitwithSpring"></a>Configure
 the destination and conduit with Spring</h2>
 
 <h3><a shape="rect" name="CamelTransportforCXF-Namespace"></a>Namespace</h3>
 
@@ -176,11 +177,15 @@ dfm.registerDestinationFactory(CamelTran
          &lt;/route&gt;
      &lt;/camelContext&gt;
   &lt;/camel:destination&gt;
+
+  &lt;!-- <span class="code-keyword">new</span> added feature since Camel 
2.11.x
+  &lt;camel:destination name=<span class="code-quote">"{http:<span 
class="code-comment">//widgets/widgetvendor.net}widgetSOAPPort.camel-destination"</span>
 camelContextId=<span class="code-quote">"context"</span> /&gt;  
+</span>
 ...
 </pre>
 </div></div>
 
-<p>The <tt>camel:destination</tt> element has a number of child elements that 
specify configuration information. They are described below.</p>
+<p>The <tt>camel:destination</tt> element for Spring has a number of child 
elements that specify configuration information. They are described below.</p>
 
 <div class="table-wrap">
 <table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" 
class="confluenceTh">Element</th><th colspan="1" rowspan="1" 
class="confluenceTh">Description</th></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"><tt>camel-spring:camelContext</tt></td><td colspan="1" 
rowspan="1" class="confluenceTd">You can specify the camel context in the camel 
destination</td></tr><tr><td colspan="1" rowspan="1" 
class="confluenceTd"><tt>camel:camelContextRef</tt></td><td colspan="1" 
rowspan="1" class="confluenceTd">The camel context id which you want inject 
into the camel destination</td></tr></tbody></table>
@@ -205,6 +210,10 @@ dfm.registerDestinationFactory(CamelTran
      <span 
class="code-tag">&lt;camel:camelContextRef&gt;</span>conduit_context<span 
class="code-tag">&lt;/camel:camelContextRef&gt;</span>
   <span class="code-tag">&lt;/camel:conduit&gt;</span>
 
+  &lt;!-- new added feature since Camel 2.11.x
+  <span class="code-tag">&lt;camel:conduit name=<span 
class="code-quote">"{http://widgets/widgetvendor.net}widgetSOAPPort.camel-conduit";</span>
 camelContextId=<span class="code-quote">"conduit_context"</span> /&gt;</span>
+     
+
   <span class="code-tag">&lt;camel:conduit name=<span 
class="code-quote">"*.camel-conduit"</span>&gt;</span>
   <span class="code-tag"><span class="code-comment">&lt;!-- you can also using 
the wild card to specify the camel-conduit that you want to configure 
--&gt;</span></span>
     ...
@@ -220,6 +229,30 @@ dfm.registerDestinationFactory(CamelTran
 </div>
 
 
+<h2><a shape="rect" 
name="CamelTransportforCXF-ConfigurethedestinationandconduitwithBlueprint"></a>Configure
 the destination and conduit with Blueprint</h2>
+
+<p>From <b>Camel 2.11.x</b>, Camel Transport supports to be configured with 
Blueprint</p>
+
+<p>If you are using blueprint, you should use the the namespace <tt><a 
shape="rect" 
href="http://cxf.apache.org/transports/camel/blueprint";>http://cxf.apache.org/transports/camel/blueprint</a></tt>
 and import the schema like the blow.</p>
+<div class="code panel" style="border-width: 1px;"><div class="codeHeader 
panelHeader" style="border-bottom-width: 1px;"><b>Adding the Configuration 
Namespace for blueprint</b></div><div class="codeContent panelContent">
+<pre class="code-java">
+&lt;beans ...
+       xmlns:camel=<span class="code-quote">"http:<span 
class="code-comment">//cxf.apache.org/transports/camel/blueprint"</span>
+</span>       ...
+       xsi:schemaLocation="...
+                           http:<span 
class="code-comment">//cxf.apache.org/transports/camel/blueprint 
+</span>                           http:<span 
class="code-comment">//cxf.apache.org/schmemas/blueprint/camel.xsd
+</span>                          ...&gt;
+</pre>
+</div></div>
+
+<p>In blueprint <tt>camel:conduit</tt> <tt>camel:destination</tt> only has one 
camelContextId attribute, they doesn't support to specify the camel context in 
the camel destination.</p>
+<div class="code panel" style="border-width: 1px;"><div class="codeContent 
panelContent">
+<pre class="code-java">
+  &lt;camel:conduit id=<span class="code-quote">"*.camel-conduit"</span> 
camelContextId=<span class="code-quote">"camel1"</span> /&gt;
+  &lt;camel:destination id=<span 
class="code-quote">"*.camel-destination"</span> camelContextId=<span 
class="code-quote">"camel1"</span> /&gt;
+</pre>
+</div></div>
 
 <h2><a shape="rect" 
name="CamelTransportforCXF-ExampleUsingCamelasaloadbalancerforCXF"></a>Example 
Using Camel as a load balancer for CXF</h2>
 


Reply via email to