You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by js...@apache.org on 2008/12/09 16:39:16 UTC
svn commit: r724761 - in /activemq/camel/trunk:
camel-core/src/main/java/org/apache/camel/
camel-core/src/main/java/org/apache/camel/converter/
camel-core/src/main/java/org/apache/camel/language/ components/
components/camel-josql/src/main/java/org/apa...
Author: jstrachan
Date: Tue Dec 9 07:39:14 2008
New Revision: 724761
URL: http://svn.apache.org/viewvc?rev=724761&view=rev
Log:
added @Documented annotation (not that javadoc seems to need it :)
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Body.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Consume.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Converter.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/EndpointInject.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ExchangeException.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Header.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Headers.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/InOnly.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/InOut.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/MessageDriven.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/OutHeaders.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Pattern.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Produce.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Properties.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Property.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/RecipientList.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/HasAnnotation.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/Bean.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/Constant.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/LanguageAnnotation.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/LanguageExpression.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/NamespacePrefix.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/Simple.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/XPath.java
activemq/camel/trunk/components/camel-josql/src/main/java/org/apache/camel/builder/sql/SQL.java
activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/Consumed.java
activemq/camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/EL.java
activemq/camel/trunk/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPath.java
activemq/camel/trunk/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OGNL.java
activemq/camel/trunk/components/camel-ruby/pom.xml
activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQuery.java
activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/Groovy.java
activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/JavaScript.java
activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/PHP.java
activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/Python.java
activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/Ruby.java
activemq/camel/trunk/components/pom.xml
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Body.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Body.java?rev=724761&r1=724760&r2=724761&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Body.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Body.java Tue Dec 9 07:39:14 2008
@@ -20,6 +20,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Documented;
/**
* Marks a parameter as being the body of an inbound {@link Message}
@@ -27,6 +28,7 @@
* @version $Revision$
*/
@Retention(RetentionPolicy.RUNTIME)
+@Documented
@Target({ElementType.PARAMETER })
public @interface Body {
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Consume.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Consume.java?rev=724761&r1=724760&r2=724761&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Consume.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Consume.java Tue Dec 9 07:39:14 2008
@@ -20,6 +20,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Documented;
/**
* Subscribes a method to an {@link Endpoint} either via its
@@ -33,6 +34,7 @@
* @version $Revision$
*/
@Retention(RetentionPolicy.RUNTIME)
+@Documented
@Target({ElementType.FIELD, ElementType.METHOD, ElementType.CONSTRUCTOR })
public @interface Consume {
String uri() default "";
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Converter.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Converter.java?rev=724761&r1=724760&r2=724761&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Converter.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Converter.java Tue Dec 9 07:39:14 2008
@@ -20,6 +20,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Documented;
/**
* An annotation used to mark classes and methods to indicate code capable of
@@ -30,6 +31,7 @@
* @version $Revision$
*/
@Retention(RetentionPolicy.RUNTIME)
+@Documented
@Target({ElementType.TYPE, ElementType.METHOD })
public @interface Converter {
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/EndpointInject.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/EndpointInject.java?rev=724761&r1=724760&r2=724761&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/EndpointInject.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/EndpointInject.java Tue Dec 9 07:39:14 2008
@@ -20,6 +20,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Documented;
import org.apache.camel.spi.Registry;
@@ -36,6 +37,7 @@
* @version $Revision$
*/
@Retention(RetentionPolicy.RUNTIME)
+@Documented
@Target({ElementType.FIELD, ElementType.METHOD, ElementType.CONSTRUCTOR })
public @interface EndpointInject {
String uri() default "";
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ExchangeException.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ExchangeException.java?rev=724761&r1=724760&r2=724761&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ExchangeException.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ExchangeException.java Tue Dec 9 07:39:14 2008
@@ -20,11 +20,13 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Documented;
/**
* Marks a parameter as being the exception set on an exchange
*/
@Retention(RetentionPolicy.RUNTIME)
+@Documented
@Target({ElementType.PARAMETER })
public @interface ExchangeException {
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Header.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Header.java?rev=724761&r1=724760&r2=724761&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Header.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Header.java Tue Dec 9 07:39:14 2008
@@ -20,6 +20,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Documented;
/**
* Marks a parameter as being a header on an inbound {@link Message}
@@ -28,6 +29,7 @@
* @version $Revision$
*/
@Retention(RetentionPolicy.RUNTIME)
+@Documented
@Target({ElementType.PARAMETER })
public @interface Header {
String name();
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Headers.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Headers.java?rev=724761&r1=724760&r2=724761&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Headers.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Headers.java Tue Dec 9 07:39:14 2008
@@ -20,6 +20,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Documented;
/**
* Marks a parameter as being an injection point of the headers of an inbound {@link Message}
@@ -28,6 +29,7 @@
* @version $Revision$
*/
@Retention(RetentionPolicy.RUNTIME)
+@Documented
@Target({ElementType.PARAMETER })
public @interface Headers {
}
\ No newline at end of file
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/InOnly.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/InOnly.java?rev=724761&r1=724760&r2=724761&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/InOnly.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/InOnly.java Tue Dec 9 07:39:14 2008
@@ -20,6 +20,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Documented;
/**
* Marks methods as being {@link ExchangePattern#InOnly}
@@ -41,6 +42,7 @@
* @version $Revision$
*/
@Retention(RetentionPolicy.RUNTIME)
+@Documented
@Target({ElementType.TYPE, ElementType.METHOD})
@Pattern(ExchangePattern.InOnly)
public @interface InOnly {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/InOut.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/InOut.java?rev=724761&r1=724760&r2=724761&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/InOut.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/InOut.java Tue Dec 9 07:39:14 2008
@@ -20,6 +20,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Documented;
/**
* Marks a method as being {@link ExchangePattern#InOut} when a class or interface has been annotated with
@@ -40,6 +41,7 @@
* @version $Revision$
*/
@Retention(RetentionPolicy.RUNTIME)
+@Documented
@Target({ElementType.METHOD})
@Pattern(ExchangePattern.InOut)
public @interface InOut {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/MessageDriven.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/MessageDriven.java?rev=724761&r1=724760&r2=724761&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/MessageDriven.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/MessageDriven.java Tue Dec 9 07:39:14 2008
@@ -20,6 +20,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Documented;
/**
* Used to indicate a method on a POJO which is used as a {@link Consumer} of
@@ -32,6 +33,7 @@
* @version $Revision$
*/
@Retention(RetentionPolicy.RUNTIME)
+@Documented
@Target({ElementType.FIELD, ElementType.METHOD, ElementType.CONSTRUCTOR })
public @interface MessageDriven {
String uri() default "";
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/OutHeaders.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/OutHeaders.java?rev=724761&r1=724760&r2=724761&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/OutHeaders.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/OutHeaders.java Tue Dec 9 07:39:14 2008
@@ -20,6 +20,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Documented;
/**
* Marks a parameter as being an injection point of the headers of an outbound {@link Message}
@@ -28,6 +29,7 @@
* @version $Revision$
*/
@Retention(RetentionPolicy.RUNTIME)
+@Documented
@Target({ElementType.PARAMETER })
public @interface OutHeaders {
}
\ No newline at end of file
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Pattern.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Pattern.java?rev=724761&r1=724760&r2=724761&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Pattern.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Pattern.java Tue Dec 9 07:39:14 2008
@@ -20,6 +20,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Documented;
/**
* Marks a method as having a specific kind of {@link ExchangePattern} for use with
@@ -46,6 +47,7 @@
* @version $Revision$
*/
@Retention(RetentionPolicy.RUNTIME)
+@Documented
@Target({ElementType.TYPE, ElementType.METHOD})
public @interface Pattern {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Produce.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Produce.java?rev=724761&r1=724760&r2=724761&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Produce.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Produce.java Tue Dec 9 07:39:14 2008
@@ -20,6 +20,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Documented;
/**
* Marks a field or property as being a producer to an {@link org.apache.camel.Endpoint} either via its
@@ -35,6 +36,7 @@
* @version $Revision$
*/
@Retention(RetentionPolicy.RUNTIME)
+@Documented
@Target({ElementType.FIELD, ElementType.METHOD, ElementType.CONSTRUCTOR })
public @interface Produce {
String uri() default "";
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Properties.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Properties.java?rev=724761&r1=724760&r2=724761&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Properties.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Properties.java Tue Dec 9 07:39:14 2008
@@ -20,6 +20,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Documented;
/**
* Marks a parameter as being an injection point of the properties of an {@link Exchange}
@@ -28,6 +29,7 @@
* @version $Revision$
*/
@Retention(RetentionPolicy.RUNTIME)
+@Documented
@Target({ElementType.PARAMETER })
public @interface Properties {
}
\ No newline at end of file
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Property.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Property.java?rev=724761&r1=724760&r2=724761&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Property.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Property.java Tue Dec 9 07:39:14 2008
@@ -20,6 +20,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Documented;
/**
* Marks a parameter as being an injection point of a property of an {@link Exchange}
@@ -28,6 +29,7 @@
* @version $Revision$
*/
@Retention(RetentionPolicy.RUNTIME)
+@Documented
@Target({ElementType.PARAMETER })
public @interface Property {
String name();
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/RecipientList.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/RecipientList.java?rev=724761&r1=724760&r2=724761&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/RecipientList.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/RecipientList.java Tue Dec 9 07:39:14 2008
@@ -20,6 +20,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Documented;
/**
* Indicates that this method is to be used as a
@@ -39,6 +40,7 @@
* @version $Revision$
*/
@Retention(RetentionPolicy.RUNTIME)
+@Documented
@Target({ElementType.FIELD, ElementType.METHOD, ElementType.CONSTRUCTOR })
public @interface RecipientList {
}
\ No newline at end of file
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/HasAnnotation.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/HasAnnotation.java?rev=724761&r1=724760&r2=724761&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/HasAnnotation.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/HasAnnotation.java Tue Dec 9 07:39:14 2008
@@ -20,6 +20,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Documented;
/**
* Used to indicate that the actual type of a parameter on a converter method must have the given annotation class
@@ -29,6 +30,7 @@
* @version $Revision$
*/
@Retention(RetentionPolicy.RUNTIME)
+@Documented
@Target({ElementType.PARAMETER })
public @interface HasAnnotation {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/Bean.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/Bean.java?rev=724761&r1=724760&r2=724761&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/Bean.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/Bean.java Tue Dec 9 07:39:14 2008
@@ -20,6 +20,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Documented;
/**
* Used to inject a bean expression into a field, property, method or parameter when using
@@ -28,6 +29,7 @@
* @version $Revision$
*/
@Retention(RetentionPolicy.RUNTIME)
+@Documented
@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER })
@LanguageAnnotation(language = "bean")
public @interface Bean {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/Constant.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/Constant.java?rev=724761&r1=724760&r2=724761&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/Constant.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/Constant.java Tue Dec 9 07:39:14 2008
@@ -20,6 +20,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Documented;
/**
* Used to inject a constant expression into a field, property, method or parameter when using
@@ -27,6 +28,7 @@
*
*/
@Retention(RetentionPolicy.RUNTIME)
+@Documented
@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER })
@LanguageAnnotation(language = "constant")
public @interface Constant {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/LanguageAnnotation.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/LanguageAnnotation.java?rev=724761&r1=724760&r2=724761&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/LanguageAnnotation.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/LanguageAnnotation.java Tue Dec 9 07:39:14 2008
@@ -20,6 +20,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Documented;
import org.apache.camel.component.bean.DefaultAnnotationExpressionFactory;
@@ -29,6 +30,7 @@
* @version $Revision$
*/
@Retention(RetentionPolicy.RUNTIME)
+@Documented
@Target({ElementType.ANNOTATION_TYPE })
public @interface LanguageAnnotation {
String language();
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/LanguageExpression.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/LanguageExpression.java?rev=724761&r1=724760&r2=724761&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/LanguageExpression.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/LanguageExpression.java Tue Dec 9 07:39:14 2008
@@ -20,6 +20,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Documented;
/**
* Base annotation for language expressions.
@@ -27,6 +28,7 @@
* @version $Revision$
*/
@Retention(RetentionPolicy.RUNTIME)
+@Documented
@Target({ElementType.FIELD, ElementType.METHOD, ElementType.CONSTRUCTOR })
public @interface LanguageExpression {
String language();
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/NamespacePrefix.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/NamespacePrefix.java?rev=724761&r1=724760&r2=724761&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/NamespacePrefix.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/NamespacePrefix.java Tue Dec 9 07:39:14 2008
@@ -20,6 +20,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Documented;
/**
* Creates a namespace prefix for an XPath
@@ -27,6 +28,7 @@
* @version $Revision$
*/
@Retention(RetentionPolicy.RUNTIME)
+@Documented
@Target({ElementType.ANNOTATION_TYPE })
public @interface NamespacePrefix {
String prefix();
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/Simple.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/Simple.java?rev=724761&r1=724760&r2=724761&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/Simple.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/Simple.java Tue Dec 9 07:39:14 2008
@@ -20,6 +20,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Documented;
/**
* Used to inject a simple expression into a field, property, method or parameter when using
@@ -28,6 +29,7 @@
* @version $Revision$
*/
@Retention(RetentionPolicy.RUNTIME)
+@Documented
@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER })
@LanguageAnnotation(language = "simple")
public @interface Simple {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/XPath.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/XPath.java?rev=724761&r1=724760&r2=724761&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/XPath.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/XPath.java Tue Dec 9 07:39:14 2008
@@ -20,6 +20,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Documented;
import org.apache.camel.component.bean.XPathAnnotationExpressionFactory;
@@ -30,6 +31,7 @@
* @version $Revision$
*/
@Retention(RetentionPolicy.RUNTIME)
+@Documented
@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
@LanguageAnnotation(language = "xpath", factory = XPathAnnotationExpressionFactory.class)
public @interface XPath {
Modified: activemq/camel/trunk/components/camel-josql/src/main/java/org/apache/camel/builder/sql/SQL.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-josql/src/main/java/org/apache/camel/builder/sql/SQL.java?rev=724761&r1=724760&r2=724761&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-josql/src/main/java/org/apache/camel/builder/sql/SQL.java (original)
+++ activemq/camel/trunk/components/camel-josql/src/main/java/org/apache/camel/builder/sql/SQL.java Tue Dec 9 07:39:14 2008
@@ -20,6 +20,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Documented;
import org.apache.camel.language.LanguageAnnotation;
@@ -29,6 +30,7 @@
* @version $Revision$
*/
@Retention(RetentionPolicy.RUNTIME)
+@Documented
@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
@LanguageAnnotation(language = "sql")
public @interface SQL {
Modified: activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/Consumed.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/Consumed.java?rev=724761&r1=724760&r2=724761&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/Consumed.java (original)
+++ activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/Consumed.java Tue Dec 9 07:39:14 2008
@@ -20,6 +20,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Documented;
/**
* An annotation to mark a method to be invoked when an entity bean has been succesfully processed
@@ -30,6 +31,7 @@
* @version $Revision$
*/
@Retention(RetentionPolicy.RUNTIME)
+@Documented
@Target({ElementType.METHOD })
public @interface Consumed {
}
Modified: activemq/camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/EL.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/EL.java?rev=724761&r1=724760&r2=724761&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/EL.java (original)
+++ activemq/camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/EL.java Tue Dec 9 07:39:14 2008
@@ -20,6 +20,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Documented;
import org.apache.camel.language.LanguageAnnotation;
@@ -29,6 +30,7 @@
* @version $Revision$
*/
@Retention(RetentionPolicy.RUNTIME)
+@Documented
@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
@LanguageAnnotation(language = "el")
public @interface EL {
Modified: activemq/camel/trunk/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPath.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPath.java?rev=724761&r1=724760&r2=724761&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPath.java (original)
+++ activemq/camel/trunk/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPath.java Tue Dec 9 07:39:14 2008
@@ -20,6 +20,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Documented;
import org.apache.camel.language.LanguageAnnotation;
@@ -31,6 +32,7 @@
* @version $Revision$
*/
@Retention(RetentionPolicy.RUNTIME)
+@Documented
@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER })
@LanguageAnnotation(language = "jxpath")
public @interface JXPath {
Modified: activemq/camel/trunk/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OGNL.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OGNL.java?rev=724761&r1=724760&r2=724761&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OGNL.java (original)
+++ activemq/camel/trunk/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OGNL.java Tue Dec 9 07:39:14 2008
@@ -20,6 +20,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Documented;
import org.apache.camel.language.LanguageAnnotation;
@@ -30,6 +31,7 @@
* @version $Revision$
*/
@Retention(RetentionPolicy.RUNTIME)
+@Documented
@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
@LanguageAnnotation(language = "ognl")
public @interface OGNL {
Modified: activemq/camel/trunk/components/camel-ruby/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ruby/pom.xml?rev=724761&r1=724760&r2=724761&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-ruby/pom.xml (original)
+++ activemq/camel/trunk/components/camel-ruby/pom.xml Tue Dec 9 07:39:14 2008
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby</artifactId>
- <version>1.1.5</version>
+ <version>1.1.6RC1</version>
</dependency>
<!-- testing -->
Modified: activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQuery.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQuery.java?rev=724761&r1=724760&r2=724761&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQuery.java (original)
+++ activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQuery.java Tue Dec 9 07:39:14 2008
@@ -20,6 +20,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Documented;
import org.apache.camel.language.LanguageAnnotation;
import org.apache.camel.language.NamespacePrefix;
@@ -31,6 +32,7 @@
* @version $Revision$
*/
@Retention(RetentionPolicy.RUNTIME)
+@Documented
@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
@LanguageAnnotation(language = "xquery", factory = XQueryAnnotationExpressionFactory.class)
public @interface XQuery {
Modified: activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/Groovy.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/Groovy.java?rev=724761&r1=724760&r2=724761&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/Groovy.java (original)
+++ activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/Groovy.java Tue Dec 9 07:39:14 2008
@@ -20,6 +20,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Documented;
import org.apache.camel.language.LanguageAnnotation;
@@ -30,6 +31,7 @@
* @version $Revision$
*/
@Retention(RetentionPolicy.RUNTIME)
+@Documented
@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
@LanguageAnnotation(language = "groovy")
public @interface Groovy {
Modified: activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/JavaScript.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/JavaScript.java?rev=724761&r1=724760&r2=724761&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/JavaScript.java (original)
+++ activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/JavaScript.java Tue Dec 9 07:39:14 2008
@@ -20,6 +20,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Documented;
import org.apache.camel.language.LanguageAnnotation;
@@ -30,6 +31,7 @@
* @version $Revision$
*/
@Retention(RetentionPolicy.RUNTIME)
+@Documented
@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
@LanguageAnnotation(language = "js")
public @interface JavaScript {
Modified: activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/PHP.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/PHP.java?rev=724761&r1=724760&r2=724761&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/PHP.java (original)
+++ activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/PHP.java Tue Dec 9 07:39:14 2008
@@ -20,6 +20,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Documented;
import org.apache.camel.language.LanguageAnnotation;
@@ -30,6 +31,7 @@
* @version $Revision$
*/
@Retention(RetentionPolicy.RUNTIME)
+@Documented
@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
@LanguageAnnotation(language = "php")
public @interface PHP {
Modified: activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/Python.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/Python.java?rev=724761&r1=724760&r2=724761&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/Python.java (original)
+++ activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/Python.java Tue Dec 9 07:39:14 2008
@@ -20,6 +20,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Documented;
import org.apache.camel.language.LanguageAnnotation;
@@ -30,6 +31,7 @@
* @version $Revision$
*/
@Retention(RetentionPolicy.RUNTIME)
+@Documented
@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
@LanguageAnnotation(language = "python")
public @interface Python {
Modified: activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/Ruby.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/Ruby.java?rev=724761&r1=724760&r2=724761&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/Ruby.java (original)
+++ activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/Ruby.java Tue Dec 9 07:39:14 2008
@@ -20,6 +20,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Documented;
import org.apache.camel.language.LanguageAnnotation;
@@ -30,6 +31,7 @@
* @version $Revision$
*/
@Retention(RetentionPolicy.RUNTIME)
+@Documented
@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
@LanguageAnnotation(language = "jruby")
public @interface Ruby {
Modified: activemq/camel/trunk/components/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/pom.xml?rev=724761&r1=724760&r2=724761&view=diff
==============================================================================
--- activemq/camel/trunk/components/pom.xml (original)
+++ activemq/camel/trunk/components/pom.xml Tue Dec 9 07:39:14 2008
@@ -72,7 +72,7 @@
<module>camel-quartz</module>
<module>camel-rest</module>
<module>camel-rmi</module>
- <!--<module>camel-ruby</module>-->
+ <module>camel-ruby</module>
<module>camel-rss</module>
<module>camel-saxon</module>
<module>camel-scala</module>
Re: svn commit: r724761 - in /activemq/camel/trunk: camel-core/src/main/java/org/apache/camel/
camel-core/src/main/java/org/apache/camel/converter/ camel-core/src/main/java/org/apache/camel/language/
components/ components/camel-josql/src/main/java/org/apa...
Posted by Willem Jiang <wi...@gmail.com>.
Hi James,
I got below error when I run mvn install in the camel-ruby module with
JDK 1.5.0_13.
Can we downgrade the jruby version to 1.1.5 ?
Running org.apache.camel.ruby.RouteUsingNestedScopesTest
Error: Some library (perhaps JRuby) was built with a later JVM version.
Please use libraries built with the version you intend to use or an
earlier one.
Thanks,
Willem
jstrachan@apache.org wrote:
> Author: jstrachan
> Date: Tue Dec 9 07:39:14 2008
> New Revision: 724761
>
> URL: http://svn.apache.org/viewvc?rev=724761&view=rev
> Log:
> added @Documented annotation (not that javadoc seems to need it :)
>
> Modified:
> ...
> activemq/camel/trunk/components/camel-ruby/pom.xml
> ...
> activemq/camel/trunk/components/pom.xml
>
> Modified: activemq/camel/trunk/components/camel-ruby/pom.xml
> URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ruby/pom.xml?rev=724761&r1=724760&r2=724761&view=diff
> ==============================================================================
> --- activemq/camel/trunk/components/camel-ruby/pom.xml (original)
> +++ activemq/camel/trunk/components/camel-ruby/pom.xml Tue Dec 9 07:39:14 2008
> @@ -50,7 +50,7 @@
> <dependency>
> <groupId>org.jruby</groupId>
> <artifactId>jruby</artifactId>
> - <version>1.1.5</version>
> + <version>1.1.6RC1</version>
> </dependency>
>
> <!-- testing -->
>
> Modified: activemq/camel/trunk/components/pom.xml
> URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/pom.xml?rev=724761&r1=724760&r2=724761&view=diff
> ==============================================================================
> --- activemq/camel/trunk/components/pom.xml (original)
> +++ activemq/camel/trunk/components/pom.xml Tue Dec 9 07:39:14 2008
> @@ -72,7 +72,7 @@
> <module>camel-quartz</module>
> <module>camel-rest</module>
> <module>camel-rmi</module>
> - <!--<module>camel-ruby</module>-->
> + <module>camel-ruby</module>
> <module>camel-rss</module>
> <module>camel-saxon</module>
> <module>camel-scala</module>
>
>
>