Author: buildbot
Date: Tue Jan 29 20:23:06 2013
New Revision: 848471
Log:
Production update by buildbot for camel
Modified:
websites/production/camel/content/book-cookbook.html
websites/production/camel/content/book-in-one-page.html
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/guice.html
websites/production/camel/content/scala-dsl.html
Modified: websites/production/camel/content/book-cookbook.html
==============================================================================
--- websites/production/camel/content/book-cookbook.html (original)
+++ websites/production/camel/content/book-cookbook.html Tue Jan 29 20:23:06
2013
@@ -1690,7 +1690,7 @@ mock.allMessages().arrives().noLaterThan
<div class="code panel" style="border-width: 1px;"><div class="codeContent
panelContent">
<pre class="code-java">@ContextConfiguration
-<span class="code-keyword">public</span> class FilterTest <span
class="code-keyword">extends</span> AbstractJUnit38SpringContextTests {
+<span class="code-keyword">public</span> class FilterTest <span
class="code-keyword">extends</span> SpringRunWithTestSupport {
@EndpointInject(uri = <span class="code-quote">"mock:result"</span>)
<span class="code-keyword">protected</span> MockEndpoint resultEndpoint;
@@ -1699,6 +1699,7 @@ mock.allMessages().arrives().noLaterThan
<span class="code-keyword">protected</span> ProducerTemplate template;
@DirtiesContext
+ @Test
<span class="code-keyword">public</span> void testSendMatchingMessage()
<span class="code-keyword">throws</span> Exception {
<span class="code-object">String</span> expectedBody = <span
class="code-quote">"<matched/>"</span>;
@@ -1710,6 +1711,7 @@ mock.allMessages().arrives().noLaterThan
}
@DirtiesContext
+ @Test
<span class="code-keyword">public</span> void testSendNotMatchingMessage()
<span class="code-keyword">throws</span> Exception {
resultEndpoint.expectedMessageCount(0);
@@ -2141,7 +2143,7 @@ java.naming.factory.initial = org.apache
<p>Here is a simple unit test using JUnit 3.x support from Spring Test
using <a shape="rect" class="external-link"
href="http://svn.apache.org/repos/asf/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/patterns/FilterTest.java";>XML
Config</a>.</p>
<div class="code panel" style="border-width: 1px;"><div class="codeContent
panelContent">
<pre class="code-java">@ContextConfiguration
-<span class="code-keyword">public</span> class FilterTest <span
class="code-keyword">extends</span> AbstractJUnit38SpringContextTests {
+<span class="code-keyword">public</span> class FilterTest <span
class="code-keyword">extends</span> SpringRunWithTestSupport {
@EndpointInject(uri = <span class="code-quote">"mock:result"</span>)
<span class="code-keyword">protected</span> MockEndpoint resultEndpoint;
@@ -2150,6 +2152,7 @@ java.naming.factory.initial = org.apache
<span class="code-keyword">protected</span> ProducerTemplate template;
@DirtiesContext
+ @Test
<span class="code-keyword">public</span> void testSendMatchingMessage()
<span class="code-keyword">throws</span> Exception {
<span class="code-object">String</span> expectedBody = <span
class="code-quote">"<matched/>"</span>;
@@ -2161,6 +2164,7 @@ java.naming.factory.initial = org.apache
}
@DirtiesContext
+ @Test
<span class="code-keyword">public</span> void testSendNotMatchingMessage()
<span class="code-keyword">throws</span> Exception {
resultEndpoint.expectedMessageCount(0);
@@ -2429,7 +2433,19 @@ src/test/resources/org/apache/camel/spri
<h2><a shape="rect" name="Bookcookbook-CamelGuice"></a>Camel Guice</h2>
-<p>We have support for <a shape="rect" class="external-link"
href="http://code.google.com/p/google-guice/"; rel="nofollow">Google Guice</a>
as a dependency injection framework. To use it just be dependent on
<b>camel-guice.jar</b> which also depends on <a shape="rect"
class="external-link"
href="http://activemq.apache.org/camel/maven/camel-guice/dependencies.html";>the
following jars</a>.</p>
+<p>We have support for <a shape="rect" class="external-link"
href="http://code.google.com/p/google-guice/"; rel="nofollow">Google Guice</a>
as a dependency injection framework.</p>
+
+<p>Maven users will need to add the following dependency to their
<tt>pom.xml</tt> for this component:</p>
+<div class="code panel" style="border-width: 1px;"><div class="codeContent
panelContent">
+<pre class="code-xml">
+<span class="code-tag"><dependency></span>
+ <span class="code-tag"><groupId></span>org.apache.camel<span
class="code-tag"></groupId></span>
+ <span class="code-tag"><artifactId></span>camel-guice<span
class="code-tag"></artifactId></span>
+ <span class="code-tag"><version></span>x.x.x<span
class="code-tag"></version></span>
+ <span class="code-tag"><span class="code-comment"><!-- use the same
version as your Camel core version --></span></span>
+<span class="code-tag"></dependency></span>
+</pre>
+</div></div>
<h3><a shape="rect"
name="Bookcookbook-DependencyInjectingCamelwithGuice"></a>Dependency Injecting
Camel with Guice</h3>
Modified: websites/production/camel/content/book-in-one-page.html
==============================================================================
--- websites/production/camel/content/book-in-one-page.html (original)
+++ websites/production/camel/content/book-in-one-page.html Tue Jan 29 20:23:06
2013
@@ -3634,7 +3634,19 @@ src/test/resources/org/apache/camel/spri
<h2><a shape="rect" name="BookInOnePage-CamelGuice"></a>Camel Guice</h2>
-<p>We have support for <a shape="rect" class="external-link"
href="http://code.google.com/p/google-guice/"; rel="nofollow">Google Guice</a>
as a dependency injection framework. To use it just be dependent on
<b>camel-guice.jar</b> which also depends on <a shape="rect"
class="external-link"
href="http://activemq.apache.org/camel/maven/camel-guice/dependencies.html";>the
following jars</a>.</p>
+<p>We have support for <a shape="rect" class="external-link"
href="http://code.google.com/p/google-guice/"; rel="nofollow">Google Guice</a>
as a dependency injection framework.</p>
+
+<p>Maven users will need to add the following dependency to their
<tt>pom.xml</tt> for this component:</p>
+<div class="code panel" style="border-width: 1px;"><div class="codeContent
panelContent">
+<pre class="code-xml">
+<span class="code-tag"><dependency></span>
+ <span class="code-tag"><groupId></span>org.apache.camel<span
class="code-tag"></groupId></span>
+ <span class="code-tag"><artifactId></span>camel-guice<span
class="code-tag"></artifactId></span>
+ <span class="code-tag"><version></span>x.x.x<span
class="code-tag"></version></span>
+ <span class="code-tag"><span class="code-comment"><!-- use the same
version as your Camel core version --></span></span>
+<span class="code-tag"></dependency></span>
+</pre>
+</div></div>
<h3><a shape="rect"
name="BookInOnePage-DependencyInjectingCamelwithGuice"></a>Dependency Injecting
Camel with Guice</h3>
Modified: websites/production/camel/content/cache/main.pageCache
==============================================================================
Binary files - no diff available.
Modified: websites/production/camel/content/guice.html
==============================================================================
--- websites/production/camel/content/guice.html (original)
+++ websites/production/camel/content/guice.html Tue Jan 29 20:23:06 2013
@@ -77,7 +77,19 @@
<td valign="top" width="100%">
<div class="wiki-content maincontent"><h2><a shape="rect"
name="Guice-CamelGuice"></a>Camel Guice</h2>
-<p>We have support for <a shape="rect" class="external-link"
href="http://code.google.com/p/google-guice/"; rel="nofollow">Google Guice</a>
as a dependency injection framework. To use it just be dependent on
<b>camel-guice.jar</b> which also depends on <a shape="rect"
class="external-link"
href="http://activemq.apache.org/camel/maven/camel-guice/dependencies.html";>the
following jars</a>.</p>
+<p>We have support for <a shape="rect" class="external-link"
href="http://code.google.com/p/google-guice/"; rel="nofollow">Google Guice</a>
as a dependency injection framework.</p>
+
+<p>Maven users will need to add the following dependency to their
<tt>pom.xml</tt> for this component:</p>
+<div class="code panel" style="border-width: 1px;"><div class="codeContent
panelContent">
+<pre class="code-xml">
+<span class="code-tag"><dependency></span>
+ <span class="code-tag"><groupId></span>org.apache.camel<span
class="code-tag"></groupId></span>
+ <span class="code-tag"><artifactId></span>camel-guice<span
class="code-tag"></artifactId></span>
+ <span class="code-tag"><version></span>x.x.x<span
class="code-tag"></version></span>
+ <span class="code-tag"><span class="code-comment"><!-- use the same
version as your Camel core version --></span></span>
+<span class="code-tag"></dependency></span>
+</pre>
+</div></div>
<h3><a shape="rect"
name="Guice-DependencyInjectingCamelwithGuice"></a>Dependency Injecting Camel
with Guice</h3>
Modified: websites/production/camel/content/scala-dsl.html
==============================================================================
--- websites/production/camel/content/scala-dsl.html (original)
+++ websites/production/camel/content/scala-dsl.html Tue Jan 29 20:23:06 2013
@@ -97,10 +97,26 @@
<span class="code-tag"><dependency></span>
<span class="code-tag"><groupId></span>org.apache.camel<span
class="code-tag"></groupId></span>
<span class="code-tag"><artifactId></span>camel-scala<span
class="code-tag"></artifactId></span>
- <span class="code-tag"><version></span>2.9.0<span
class="code-tag"></version></span>
+ <span class="code-tag"><version></span>x.x.x<span
class="code-tag"></version></span>
+ <span class="code-tag"><span class="code-comment"><!-- use the same
version as your Camel core version --></span></span>
<span class="code-tag"></dependency></span>
</pre>
-</div></div></div>
+</div></div>
+
+<p>Starting from version 2.11 Camel Scala DSL is compiled against Scala 2.10.
If you plan to use Scala 2.9 with Camel 2.11, add the following to your pom.xml
file instead.</p>
+
+<div class="code panel" style="border-width: 1px;"><div class="codeContent
panelContent">
+<pre class="code-xml">
+<span class="code-tag"><dependency></span>
+ <span class="code-tag"><groupId></span>org.apache.camel<span
class="code-tag"></groupId></span>
+ <span class="code-tag"><artifactId></span>camel-scala29<span
class="code-tag"></artifactId></span>
+ <span class="code-tag"><version></span>2.11.x<span
class="code-tag"></version></span>
+ <span class="code-tag"><span class="code-comment"><!-- use the same
version as your Camel core version --></span></span>
+<span class="code-tag"></dependency></span>
+</pre>
+</div></div>
+
+<p>Support for Scala 2.9 is deprecated and will be removed starting from the
Camel 2.12 and 3.0.</p></div>
</td>
<td valign="top">
<div class="navigation">
