You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2012/02/23 13:14:50 UTC
svn commit: r1292761 - in /camel/branches/camel-2.9.x: ./
camel-core/src/main/java/org/apache/camel/language/simple/
components/camel-spring/src/test/java/org/apache/camel/language/
components/camel-spring/src/test/resources/org/apache/camel/language/ ...
Author: davsclaus
Date: Thu Feb 23 12:14:49 2012
New Revision: 1292761
URL: http://svn.apache.org/viewvc?rev=1292761&view=rev
Log:
CAMEL-4988: Fixed simple languauge issue with wire by constructor when using spring. And using custom start/end tokens should use the setter instead of the ctr.
Added:
camel/branches/camel-2.9.x/components/camel-spring/src/test/java/org/apache/camel/language/SpringSimpleWeirdIssueTest.java
- copied unchanged from r1292760, camel/trunk/components/camel-spring/src/test/java/org/apache/camel/language/SpringSimpleWeirdIssueTest.java
camel/branches/camel-2.9.x/components/camel-spring/src/test/resources/org/apache/camel/language/SpringSimpleWeirdIssueTest.xml
- copied unchanged from r1292760, camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/language/SpringSimpleWeirdIssueTest.xml
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java
camel/branches/camel-2.9.x/components/camel-spring/src/test/resources/org/apache/camel/spring/SpringChangeFunctionStartFunctionEndTest.xml
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 23 12:14:49 2012
@@ -1 +1 @@
-/camel/trunk:1243046,1243057,1243234,1244518,1244644,1244859,1244861,1244864,1244870,1244872,1245021,1291555,1291727,1291848,1291864,1292114,1292384,1292725
+/camel/trunk:1243046,1243057,1243234,1244518,1244644,1244859,1244861,1244864,1244870,1244872,1245021,1291555,1291727,1291848,1291864,1292114,1292384,1292725,1292760
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java?rev=1292761&r1=1292760&r2=1292761&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java (original)
+++ camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java Thu Feb 23 12:14:49 2012
@@ -101,17 +101,6 @@ public class SimpleLanguage implements L
public SimpleLanguage() {
}
- /**
- * Constructor that customizes the function start and end tokens.
- *
- * @param functionStartToken The function start token.
- * @param functionEndToken The function end token.
- */
- public SimpleLanguage(String functionStartToken, String functionEndToken) {
- changeFunctionStartToken(functionStartToken);
- changeFunctionEndToken(functionEndToken);
- }
-
public Class<?> getResultType() {
return resultType;
}
@@ -177,7 +166,7 @@ public class SimpleLanguage implements L
* This can be used to alter the function tokens to avoid clashes with other
* frameworks etc.
* <p/>
- * The default start tokens is <tt>${</tt> and <tt>$simple{}</tt>.
+ * The default start tokens is <tt>${</tt> and <tt>$simple{</tt>.
*
* @param startToken new start token(s) to be used for functions
*/
@@ -198,4 +187,32 @@ public class SimpleLanguage implements L
public static void changeFunctionEndToken(String... endToken) {
SimpleTokenizer.changeFunctionEndToken(endToken);
}
+
+ /**
+ * Change the start token used for functions.
+ * <p/>
+ * This can be used to alter the function tokens to avoid clashes with other
+ * frameworks etc.
+ * <p/>
+ * The default start tokens is <tt>${</tt> and <tt>$simple{</tt>.
+ *
+ * @param startToken new start token to be used for functions
+ */
+ public void setFunctionStartToken(String startToken) {
+ changeFunctionStartToken(startToken);
+ }
+
+ /**
+ * Change the end token used for functions.
+ * <p/>
+ * This can be used to alter the function tokens to avoid clashes with other
+ * frameworks etc.
+ * <p/>
+ * The default end token is <tt>}</tt>
+ *
+ * @param endToken new end token to be used for functions
+ */
+ public void setFunctionEndToken(String endToken) {
+ changeFunctionEndToken(endToken);
+ }
}
Modified: camel/branches/camel-2.9.x/components/camel-spring/src/test/resources/org/apache/camel/spring/SpringChangeFunctionStartFunctionEndTest.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-spring/src/test/resources/org/apache/camel/spring/SpringChangeFunctionStartFunctionEndTest.xml?rev=1292761&r1=1292760&r2=1292761&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-spring/src/test/resources/org/apache/camel/spring/SpringChangeFunctionStartFunctionEndTest.xml (original)
+++ camel/branches/camel-2.9.x/components/camel-spring/src/test/resources/org/apache/camel/spring/SpringChangeFunctionStartFunctionEndTest.xml Thu Feb 23 12:14:49 2012
@@ -23,8 +23,8 @@
<!-- configure Simple to use custom prefix/suffix tokens -->
<bean id="simple" class="org.apache.camel.language.simple.SimpleLanguage">
- <constructor-arg name="functionStartToken" value="["/>
- <constructor-arg name="functionEndToken" value="]"/>
+ <property name="functionStartToken" value="["/>
+ <property name="functionEndToken" value="]"/>
</bean>
<camelContext xmlns="http://camel.apache.org/schema/spring">