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 2008/09/30 17:59:53 UTC
svn commit: r700514 - in /activemq/camel/trunk:
camel-core/src/main/java/org/apache/camel/builder/
camel-core/src/main/java/org/apache/camel/model/language/
components/camel-script/src/main/java/org/apache/camel/builder/script/
Author: davsclaus
Date: Tue Sep 30 08:59:53 2008
New Revision: 700514
URL: http://svn.apache.org/viewvc?rev=700514&view=rev
Log:
CAMEL-950: @deprecated beanshell as scripting language supported in DSL. You can use it using it the generic scripting DSL.
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/BeanShellExpression.java
activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/BeanShell.java
activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptLanguageResolver.java
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java?rev=700514&r1=700513&r2=700514&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java Tue Sep 30 08:59:53 2008
@@ -193,6 +193,7 @@
*
* @param text the expression to be evaluated
* @return the builder to continue processing the DSL
+ * @deprecated use language(<tt>"beanshell"</tt>, text). Will be removed in Camel 2.0.
*/
public T beanShell(String text) {
return language("beanshell", text);
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/BeanShellExpression.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/BeanShellExpression.java?rev=700514&r1=700513&r2=700514&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/BeanShellExpression.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/BeanShellExpression.java Tue Sep 30 08:59:53 2008
@@ -21,6 +21,7 @@
/**
* For BeanShell expressions and predicates
*
+ * @deprecated use {@link org.apache.camel.model.language.LanguageExpression} will be remaved in Camel 2.0
* @version $Revision$
*/
@XmlRootElement(name = "beanshell")
Modified: activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/BeanShell.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/BeanShell.java?rev=700514&r1=700513&r2=700514&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/BeanShell.java (original)
+++ activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/BeanShell.java Tue Sep 30 08:59:53 2008
@@ -27,11 +27,13 @@
* An annotation for injection of BeanShell expressions
* into method parameters, fields or properties
*
+ * @deprecated will be removed in Camel 2.0
* @version $Revision$
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
@LanguageAnnotation(language = "beanshell")
+@Deprecated
public @interface BeanShell {
String value();
}
\ No newline at end of file
Modified: activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java?rev=700514&r1=700513&r2=700514&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java (original)
+++ activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java Tue Sep 30 08:59:53 2008
@@ -164,6 +164,7 @@
*
* @param scriptText the script text to be evaluted
* @return the builder
+ * @deprecated will be removed in Camel 2.0
*/
public static ScriptBuilder beanShell(String scriptText) {
return new ScriptBuilder("beanshell", scriptText);
@@ -174,6 +175,7 @@
*
* @param scriptResource the resource used to load the script
* @return the builder
+ * @deprecated will be removed in Camel 2.0
*/
public static ScriptBuilder beanShell(Resource scriptResource) {
return new ScriptBuilder("beanshell", scriptResource);
@@ -184,6 +186,7 @@
*
* @param scriptFile the file used to load the script
* @return the builder
+ * @deprecated will be removed in Camel 2.0
*/
public static ScriptBuilder beanShell(File scriptFile) {
return new ScriptBuilder("beanshell", new FileSystemResource(scriptFile));
@@ -194,6 +197,7 @@
*
* @param scriptURL the URL used to load the script
* @return the builder
+ * @deprecated will be removed in Camel 2.0
*/
public static ScriptBuilder beanShell(URL scriptURL) {
return new ScriptBuilder("beanshell", new UrlResource(scriptURL));
Modified: activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptLanguageResolver.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptLanguageResolver.java?rev=700514&r1=700513&r2=700514&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptLanguageResolver.java (original)
+++ activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptLanguageResolver.java Tue Sep 30 08:59:53 2008
@@ -24,6 +24,7 @@
* @version $Revision$
*/
public class ScriptLanguageResolver implements LanguageResolver {
+
public Language resolveLanguage(String name, CamelContext context) {
return new ScriptLanguage(name);
}