camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r727288 - in /activemq/camel/branches/camel-1.x: ./ camel-core/src/main/java/org/apache/camel/ProducerTemplate.java camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java
Date Wed, 17 Dec 2008 05:23:36 GMT
Author: davsclaus
Date: Tue Dec 16 21:23:35 2008
New Revision: 727288

URL: http://svn.apache.org/viewvc?rev=727288&view=rev
Log:
Merged revisions 727113 via svnmerge from 
https://svn.apache.org/repos/asf/activemq/camel/trunk

........
  r727113 | davsclaus | 2008-12-16 19:39:45 +0100 (ti, 16 dec 2008) | 1 line
  
  CAMEL-1188: added unit test (already fixed). Polished javadoc. The new # uri option lookup
should not throw exception if not found, this is handled by the component later (to support
lenient properties)
........

Modified:
    activemq/camel/branches/camel-1.x/   (props changed)
    activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/ProducerTemplate.java
    activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java

Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 16 21:23:35 2008
@@ -1 +1 @@
-/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925,713013,713107,713136,713273,713290,713292,713295,713314,713475,713625,713932,713944,714032,717965,717989,718242,718273,718312-718515,719163-719184,719334,719339,719524,719662,719848,719851,719855,719864,719978-719979,720207,720435-720437,720806,721272,721331,721333-721334,721360,721669,721764,721813,721985,722005,722070,722110,722415,722438,722726,722845,722878,723264,723314,723325-723327,723409,723835,723966,724122,724619,724681,725040,725309-725320,725340,725351,725569-725572,725612,725652-725660,726640-726645,726932
+/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925,713013,713107,713136,713273,713290,713292,713295,713314,713475,713625,713932,713944,714032,717965,717989,718242,718273,718312-718515,719163-719184,719334,719339,719524,719662,719848,719851,719855,719864,719978-719979,720207,720435-720437,720806,721272,721331,721333-721334,721360,721669,721764,721813,721985,722005,722070,722110,722415,722438,722726,722845,722878,723264,723314,723325-723327,723409,723835,723966,724122,724619,724681,725040,725309-725320,725340,725351,725569-725572,725612,725652-725660,726640-726645,726932,727113

Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/ProducerTemplate.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/ProducerTemplate.java?rev=727288&r1=727287&r2=727288&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/ProducerTemplate.java
(original)
+++ activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/ProducerTemplate.java
Tue Dec 16 21:23:35 2008
@@ -35,6 +35,10 @@
  *   <li>Either <tt>IN</tt> or <tt>OUT</tt> body according
to the message exchange pattern. If the pattern is
  *   Out capable then the <tt>OUT</tt> body is returned, otherwise <tt>IN</tt>.
  * </ul>
+ * <p/>
+ * <b>Important note on usage:</b> See this
+ * <a href="http://activemq.apache.org/camel/why-does-camel-use-too-many-threads-with-producertemplate.html">FAQ
entry</a>
+ * before using.
  *
  * @version $Revision$
  */

Modified: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java?rev=727288&r1=727287&r2=727288&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java
(original)
+++ activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java
Tue Dec 16 21:23:35 2008
@@ -82,6 +82,9 @@
         return onNewPredicate(PredicateBuilder.isInstanceOf(expression, type));
     }
 
+    /**
+     * @deprecated use {@link #regex(String)}. Will be removed in Camel 2.0
+     */
     public Predicate<E> matchesRegex(String regex) {
         return onNewPredicate(PredicateBuilder.regex(expression, regex));
     }



Mime
View raw message