camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cschnei...@apache.org
Subject svn commit: r1171490 - in /camel/trunk/camel-core/src: main/java/org/apache/camel/language/simple/ main/java/org/apache/camel/language/simple/ast/ main/java/org/apache/camel/language/simple/types/ test/java/org/apache/camel/language/simple/
Date Fri, 16 Sep 2011 10:25:26 GMT
Author: cschneider
Date: Fri Sep 16 10:25:25 2011
New Revision: 1171490

URL: http://svn.apache.org/viewvc?rev=1171490&view=rev
Log:
CAMEl-4457 Move types of the simple language to a new package simple.types to avoid dependency
cycle

Added:
    camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/
    camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/BinaryOperatorType.java
      - copied, changed from r1171416, camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/BinaryOperatorType.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/LogicalOperatorType.java
      - copied, changed from r1171416, camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/LogicalOperatorType.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/SimpleIllegalSyntaxException.java
      - copied, changed from r1171416, camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleIllegalSyntaxException.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/SimpleParserException.java
      - copied, changed from r1171416, camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleParserException.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/SimpleToken.java
      - copied, changed from r1171416, camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleToken.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/SimpleTokenType.java
      - copied, changed from r1171416, camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleTokenType.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/TokenType.java
      - copied, changed from r1171416, camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/TokenType.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/UnaryOperatorType.java
      - copied, changed from r1171416, camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/UnaryOperatorType.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/package.html
Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/BaseSimpleParser.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/BinaryOperatorType.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/LogicalOperatorType.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleBackwardsCompatibleParser.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleExpressionParser.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleIllegalSyntaxException.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleParserException.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleToken.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleTokenType.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleTokenizer.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/TokenType.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/UnaryOperatorType.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/BaseSimpleNode.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/BinaryExpression.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/CompositeNodes.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/DoubleQuoteEnd.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/DoubleQuoteStart.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/LiteralExpression.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/LogicalExpression.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/NullExpression.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionEnd.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionStart.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleNode.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/SingleQuoteEnd.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/SingleQuoteStart.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/UnaryExpression.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleOperatorTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserExpressionInvalidTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserPredicateInvalidTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/BaseSimpleParser.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/BaseSimpleParser.java?rev=1171490&r1=1171489&r2=1171490&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/BaseSimpleParser.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/BaseSimpleParser.java
Fri Sep 16 10:25:25 2011
@@ -25,6 +25,10 @@ import org.apache.camel.language.simple.
 import org.apache.camel.language.simple.ast.BlockStart;
 import org.apache.camel.language.simple.ast.SimpleNode;
 import org.apache.camel.language.simple.ast.UnaryExpression;
+import org.apache.camel.language.simple.types.SimpleParserException;
+import org.apache.camel.language.simple.types.SimpleToken;
+import org.apache.camel.language.simple.types.SimpleTokenType;
+import org.apache.camel.language.simple.types.TokenType;
 
 /**
  * Base class for Simple language parser.

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleBackwardsCompatibleParser.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleBackwardsCompatibleParser.java?rev=1171490&r1=1171489&r2=1171490&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleBackwardsCompatibleParser.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleBackwardsCompatibleParser.java
Fri Sep 16 10:25:25 2011
@@ -20,6 +20,9 @@ import org.apache.camel.Expression;
 import org.apache.camel.Predicate;
 import org.apache.camel.builder.PredicateBuilder;
 import org.apache.camel.language.simple.ast.SimpleFunctionExpression;
+import org.apache.camel.language.simple.types.SimpleToken;
+import org.apache.camel.language.simple.types.SimpleTokenType;
+import org.apache.camel.language.simple.types.TokenType;
 
 /**
  * A backwards compatible parser, which supports the old simple language

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleExpressionParser.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleExpressionParser.java?rev=1171490&r1=1171489&r2=1171490&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleExpressionParser.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleExpressionParser.java
Fri Sep 16 10:25:25 2011
@@ -27,6 +27,10 @@ import org.apache.camel.language.simple.
 import org.apache.camel.language.simple.ast.SimpleFunctionStart;
 import org.apache.camel.language.simple.ast.SimpleNode;
 import org.apache.camel.language.simple.ast.UnaryExpression;
+import org.apache.camel.language.simple.types.SimpleIllegalSyntaxException;
+import org.apache.camel.language.simple.types.SimpleParserException;
+import org.apache.camel.language.simple.types.SimpleToken;
+import org.apache.camel.language.simple.types.TokenType;
 
 /**
  * A parser to parse simple language as a Camel {@link Expression}

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java?rev=1171490&r1=1171489&r2=1171490&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java
Fri Sep 16 10:25:25 2011
@@ -38,6 +38,12 @@ import org.apache.camel.language.simple.
 import org.apache.camel.language.simple.ast.SingleQuoteEnd;
 import org.apache.camel.language.simple.ast.SingleQuoteStart;
 import org.apache.camel.language.simple.ast.UnaryExpression;
+import org.apache.camel.language.simple.types.BinaryOperatorType;
+import org.apache.camel.language.simple.types.LogicalOperatorType;
+import org.apache.camel.language.simple.types.SimpleIllegalSyntaxException;
+import org.apache.camel.language.simple.types.SimpleParserException;
+import org.apache.camel.language.simple.types.SimpleToken;
+import org.apache.camel.language.simple.types.TokenType;
 
 /**
  * A parser to parse simple language as a Camel {@link Predicate}

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleTokenizer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleTokenizer.java?rev=1171490&r1=1171489&r2=1171490&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleTokenizer.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleTokenizer.java
Fri Sep 16 10:25:25 2011
@@ -19,6 +19,10 @@ package org.apache.camel.language.simple
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
+import org.apache.camel.language.simple.types.SimpleToken;
+import org.apache.camel.language.simple.types.SimpleTokenType;
+import org.apache.camel.language.simple.types.TokenType;
+
 /**
  * Tokenizer to create {@link SimpleToken} from the input.
  */

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/BaseSimpleNode.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/BaseSimpleNode.java?rev=1171490&r1=1171489&r2=1171490&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/BaseSimpleNode.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/BaseSimpleNode.java
Fri Sep 16 10:25:25 2011
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.language.simple.ast;
 
-import org.apache.camel.language.simple.SimpleToken;
+import org.apache.camel.language.simple.types.SimpleToken;
 
 /**
  * Base class for {@link SimpleNode} nodes.

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/BinaryExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/BinaryExpression.java?rev=1171490&r1=1171489&r2=1171490&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/BinaryExpression.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/BinaryExpression.java
Fri Sep 16 10:25:25 2011
@@ -28,10 +28,10 @@ import org.apache.camel.Predicate;
 import org.apache.camel.builder.ExpressionBuilder;
 import org.apache.camel.builder.PredicateBuilder;
 import org.apache.camel.builder.ValueBuilder;
-import org.apache.camel.language.simple.BinaryOperatorType;
-import org.apache.camel.language.simple.SimpleIllegalSyntaxException;
-import org.apache.camel.language.simple.SimpleParserException;
-import org.apache.camel.language.simple.SimpleToken;
+import org.apache.camel.language.simple.types.BinaryOperatorType;
+import org.apache.camel.language.simple.types.SimpleIllegalSyntaxException;
+import org.apache.camel.language.simple.types.SimpleParserException;
+import org.apache.camel.language.simple.types.SimpleToken;
 import org.apache.camel.util.ObjectHelper;
 
 /**

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/CompositeNodes.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/CompositeNodes.java?rev=1171490&r1=1171489&r2=1171490&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/CompositeNodes.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/CompositeNodes.java
Fri Sep 16 10:25:25 2011
@@ -21,7 +21,7 @@ import java.util.List;
 
 import org.apache.camel.Expression;
 import org.apache.camel.builder.ExpressionBuilder;
-import org.apache.camel.language.simple.SimpleToken;
+import org.apache.camel.language.simple.types.SimpleToken;
 
 /**
  * A node which contains other {@link SimpleNode nodes}.

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/DoubleQuoteEnd.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/DoubleQuoteEnd.java?rev=1171490&r1=1171489&r2=1171490&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/DoubleQuoteEnd.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/DoubleQuoteEnd.java
Fri Sep 16 10:25:25 2011
@@ -17,7 +17,7 @@
 package org.apache.camel.language.simple.ast;
 
 import org.apache.camel.Expression;
-import org.apache.camel.language.simple.SimpleToken;
+import org.apache.camel.language.simple.types.SimpleToken;
 
 /**
  * Ends a block enclosed by double quotes

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/DoubleQuoteStart.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/DoubleQuoteStart.java?rev=1171490&r1=1171489&r2=1171490&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/DoubleQuoteStart.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/DoubleQuoteStart.java
Fri Sep 16 10:25:25 2011
@@ -17,7 +17,7 @@
 package org.apache.camel.language.simple.ast;
 
 import org.apache.camel.Expression;
-import org.apache.camel.language.simple.SimpleToken;
+import org.apache.camel.language.simple.types.SimpleToken;
 
 /**
  * Starts a block enclosed by double quotes

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/LiteralExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/LiteralExpression.java?rev=1171490&r1=1171489&r2=1171490&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/LiteralExpression.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/LiteralExpression.java
Fri Sep 16 10:25:25 2011
@@ -18,7 +18,7 @@ package org.apache.camel.language.simple
 
 import org.apache.camel.Expression;
 import org.apache.camel.builder.ExpressionBuilder;
-import org.apache.camel.language.simple.SimpleToken;
+import org.apache.camel.language.simple.types.SimpleToken;
 
 /**
  * Represents literals in the AST.

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/LogicalExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/LogicalExpression.java?rev=1171490&r1=1171489&r2=1171490&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/LogicalExpression.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/LogicalExpression.java
Fri Sep 16 10:25:25 2011
@@ -20,9 +20,9 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Expression;
 import org.apache.camel.Predicate;
 import org.apache.camel.builder.PredicateBuilder;
-import org.apache.camel.language.simple.LogicalOperatorType;
-import org.apache.camel.language.simple.SimpleParserException;
-import org.apache.camel.language.simple.SimpleToken;
+import org.apache.camel.language.simple.types.LogicalOperatorType;
+import org.apache.camel.language.simple.types.SimpleParserException;
+import org.apache.camel.language.simple.types.SimpleToken;
 import org.apache.camel.util.ObjectHelper;
 
 /**

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/NullExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/NullExpression.java?rev=1171490&r1=1171489&r2=1171490&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/NullExpression.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/NullExpression.java
Fri Sep 16 10:25:25 2011
@@ -18,8 +18,8 @@ package org.apache.camel.language.simple
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Expression;
-import org.apache.camel.language.simple.SimpleParserException;
-import org.apache.camel.language.simple.SimpleToken;
+import org.apache.camel.language.simple.types.SimpleParserException;
+import org.apache.camel.language.simple.types.SimpleToken;
 
 /**
  * Represents a null expression.

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionEnd.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionEnd.java?rev=1171490&r1=1171489&r2=1171490&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionEnd.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionEnd.java
Fri Sep 16 10:25:25 2011
@@ -17,7 +17,7 @@
 package org.apache.camel.language.simple.ast;
 
 import org.apache.camel.Expression;
-import org.apache.camel.language.simple.SimpleToken;
+import org.apache.camel.language.simple.types.SimpleToken;
 
 /**
  * Ends a function

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java?rev=1171490&r1=1171489&r2=1171490&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
Fri Sep 16 10:25:25 2011
@@ -18,8 +18,8 @@ package org.apache.camel.language.simple
 
 import org.apache.camel.Expression;
 import org.apache.camel.builder.ExpressionBuilder;
-import org.apache.camel.language.simple.SimpleParserException;
-import org.apache.camel.language.simple.SimpleToken;
+import org.apache.camel.language.simple.types.SimpleParserException;
+import org.apache.camel.language.simple.types.SimpleToken;
 import org.apache.camel.util.ObjectHelper;
 import org.apache.camel.util.OgnlHelper;
 import org.apache.camel.util.StringHelper;
@@ -47,7 +47,7 @@ public class SimpleFunctionExpression ex
      * @param strict whether to throw exception if the expression was not a function,
      *          otherwise <tt>null</tt> is returned
      * @return the created {@link Expression}
-     * @throws org.apache.camel.language.simple.SimpleParserException
+     * @throws org.apache.camel.language.simple.types.SimpleParserException
      *          should be thrown if error parsing the model
      */
     public Expression createExpression(String expression, boolean strict) {

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionStart.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionStart.java?rev=1171490&r1=1171489&r2=1171490&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionStart.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionStart.java
Fri Sep 16 10:25:25 2011
@@ -18,9 +18,9 @@ package org.apache.camel.language.simple
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Expression;
-import org.apache.camel.language.simple.SimpleIllegalSyntaxException;
-import org.apache.camel.language.simple.SimpleParserException;
-import org.apache.camel.language.simple.SimpleToken;
+import org.apache.camel.language.simple.types.SimpleIllegalSyntaxException;
+import org.apache.camel.language.simple.types.SimpleParserException;
+import org.apache.camel.language.simple.types.SimpleToken;
 
 /**
  * Starts a function

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleNode.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleNode.java?rev=1171490&r1=1171489&r2=1171490&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleNode.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/SimpleNode.java
Fri Sep 16 10:25:25 2011
@@ -17,8 +17,8 @@
 package org.apache.camel.language.simple.ast;
 
 import org.apache.camel.Expression;
-import org.apache.camel.language.simple.SimpleParserException;
-import org.apache.camel.language.simple.SimpleToken;
+import org.apache.camel.language.simple.types.SimpleParserException;
+import org.apache.camel.language.simple.types.SimpleToken;
 
 /**
  * Represents a node in the Simple AST
@@ -37,7 +37,7 @@ public interface SimpleNode {
      *
      * @param expression the input string
      * @return the created {@link Expression}
-     * @throws org.apache.camel.language.simple.SimpleParserException
+     * @throws org.apache.camel.language.simple.types.SimpleParserException
      *          should be thrown if error parsing the model
      */
     Expression createExpression(String expression) throws SimpleParserException;

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/SingleQuoteEnd.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/SingleQuoteEnd.java?rev=1171490&r1=1171489&r2=1171490&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/SingleQuoteEnd.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/SingleQuoteEnd.java
Fri Sep 16 10:25:25 2011
@@ -17,7 +17,7 @@
 package org.apache.camel.language.simple.ast;
 
 import org.apache.camel.Expression;
-import org.apache.camel.language.simple.SimpleToken;
+import org.apache.camel.language.simple.types.SimpleToken;
 
 /**
  * Ends a block enclosed by single quotes

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/SingleQuoteStart.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/SingleQuoteStart.java?rev=1171490&r1=1171489&r2=1171490&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/SingleQuoteStart.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/SingleQuoteStart.java
Fri Sep 16 10:25:25 2011
@@ -17,7 +17,7 @@
 package org.apache.camel.language.simple.ast;
 
 import org.apache.camel.Expression;
-import org.apache.camel.language.simple.SimpleToken;
+import org.apache.camel.language.simple.types.SimpleToken;
 
 /**
  * Starts a block enclosed by single quotes

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/UnaryExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/UnaryExpression.java?rev=1171490&r1=1171489&r2=1171490&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/UnaryExpression.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/ast/UnaryExpression.java
Fri Sep 16 10:25:25 2011
@@ -20,9 +20,9 @@ import org.apache.camel.CamelExchangeExc
 import org.apache.camel.Exchange;
 import org.apache.camel.Expression;
 import org.apache.camel.NoTypeConversionAvailableException;
-import org.apache.camel.language.simple.SimpleParserException;
-import org.apache.camel.language.simple.SimpleToken;
-import org.apache.camel.language.simple.UnaryOperatorType;
+import org.apache.camel.language.simple.types.SimpleParserException;
+import org.apache.camel.language.simple.types.SimpleToken;
+import org.apache.camel.language.simple.types.UnaryOperatorType;
 import org.apache.camel.util.ObjectHelper;
 
 /**

Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/BinaryOperatorType.java
(from r1171416, camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/BinaryOperatorType.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/BinaryOperatorType.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/BinaryOperatorType.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/BinaryOperatorType.java&r1=1171416&r2=1171490&rev=1171490&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/BinaryOperatorType.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/BinaryOperatorType.java
Fri Sep 16 10:25:25 2011
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.language.simple;
+package org.apache.camel.language.simple.types;
 
 /**
  * Types of binary operators supported
@@ -112,27 +112,27 @@ public enum BinaryOperatorType {
     public enum ParameterType {
         Literal, LiteralWithFunction, Function, NumericValue, BooleanValue, NullValue;
 
-        boolean isLiteralSupported() {
+        public boolean isLiteralSupported() {
             return this == Literal;
         }
 
-        boolean isLiteralWithFunctionSupport() {
+        public boolean isLiteralWithFunctionSupport() {
             return this == LiteralWithFunction;
         }
 
-        boolean isFunctionSupport() {
+        public boolean isFunctionSupport() {
             return this == Function;
         }
 
-        boolean isNumericValueSupported() {
+        public boolean isNumericValueSupported() {
             return this == NumericValue;
         }
 
-        boolean isBooleanValueSupported() {
+        public boolean isBooleanValueSupported() {
             return this == BooleanValue;
         }
 
-        boolean isNullValueSupported() {
+        public boolean isNullValueSupported() {
             return this == NullValue;
         }
     }

Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/LogicalOperatorType.java
(from r1171416, camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/LogicalOperatorType.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/LogicalOperatorType.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/LogicalOperatorType.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/LogicalOperatorType.java&r1=1171416&r2=1171490&rev=1171490&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/LogicalOperatorType.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/LogicalOperatorType.java
Fri Sep 16 10:25:25 2011
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.language.simple;
+package org.apache.camel.language.simple.types;
 
 /**
  * Types of logical operators supported

Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/SimpleIllegalSyntaxException.java
(from r1171416, camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleIllegalSyntaxException.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/SimpleIllegalSyntaxException.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/SimpleIllegalSyntaxException.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleIllegalSyntaxException.java&r1=1171416&r2=1171490&rev=1171490&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleIllegalSyntaxException.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/SimpleIllegalSyntaxException.java
Fri Sep 16 10:25:25 2011
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.language.simple;
+package org.apache.camel.language.simple.types;
 
 import org.apache.camel.ExpressionIllegalSyntaxException;
 

Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/SimpleParserException.java
(from r1171416, camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleParserException.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/SimpleParserException.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/SimpleParserException.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleParserException.java&r1=1171416&r2=1171490&rev=1171490&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleParserException.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/SimpleParserException.java
Fri Sep 16 10:25:25 2011
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.language.simple;
+package org.apache.camel.language.simple.types;
 
 import org.apache.camel.RuntimeCamelException;
 

Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/SimpleToken.java
(from r1171416, camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleToken.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/SimpleToken.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/SimpleToken.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleToken.java&r1=1171416&r2=1171490&rev=1171490&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleToken.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/SimpleToken.java
Fri Sep 16 10:25:25 2011
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.language.simple;
+package org.apache.camel.language.simple.types;
 
 /**
  * Holder for a token, with associated type and position in the input.

Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/SimpleTokenType.java
(from r1171416, camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleTokenType.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/SimpleTokenType.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/SimpleTokenType.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleTokenType.java&r1=1171416&r2=1171490&rev=1171490&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleTokenType.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/SimpleTokenType.java
Fri Sep 16 10:25:25 2011
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.language.simple;
+package org.apache.camel.language.simple.types;
 
 /**
  * The different token types used by the simple parser.

Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/TokenType.java
(from r1171416, camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/TokenType.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/TokenType.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/TokenType.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/TokenType.java&r1=1171416&r2=1171490&rev=1171490&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/TokenType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/TokenType.java
Fri Sep 16 10:25:25 2011
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.language.simple;
+package org.apache.camel.language.simple.types;
 
 /**
  * Classifications of known token types.

Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/UnaryOperatorType.java
(from r1171416, camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/UnaryOperatorType.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/UnaryOperatorType.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/UnaryOperatorType.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/UnaryOperatorType.java&r1=1171416&r2=1171490&rev=1171490&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/UnaryOperatorType.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/UnaryOperatorType.java
Fri Sep 16 10:25:25 2011
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.language.simple;
+package org.apache.camel.language.simple.types;
 
 /**
  * Types of unary operators supported.

Added: camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/package.html
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/package.html?rev=1171490&view=auto
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/package.html
(added)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/package.html
Fri Sep 16 10:25:25 2011
@@ -0,0 +1,25 @@
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<html>
+<head>
+</head>
+<body>
+
+Types for the Camel <a href="http://camel.apache.org/simple.html">Simple</a>
language.
+
+</body>
+</html>

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleOperatorTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleOperatorTest.java?rev=1171490&r1=1171489&r2=1171490&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleOperatorTest.java
(original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleOperatorTest.java
Fri Sep 16 10:25:25 2011
@@ -19,6 +19,7 @@ package org.apache.camel.language.simple
 import org.apache.camel.Exchange;
 import org.apache.camel.LanguageTestSupport;
 import org.apache.camel.impl.JndiRegistry;
+import org.apache.camel.language.simple.types.SimpleIllegalSyntaxException;
 
 /**
  * @version 

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserExpressionInvalidTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserExpressionInvalidTest.java?rev=1171490&r1=1171489&r2=1171490&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserExpressionInvalidTest.java
(original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserExpressionInvalidTest.java
Fri Sep 16 10:25:25 2011
@@ -17,6 +17,7 @@
 package org.apache.camel.language.simple;
 
 import org.apache.camel.ExchangeTestSupport;
+import org.apache.camel.language.simple.types.SimpleIllegalSyntaxException;
 
 /**
  *

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserPredicateInvalidTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserPredicateInvalidTest.java?rev=1171490&r1=1171489&r2=1171490&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserPredicateInvalidTest.java
(original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserPredicateInvalidTest.java
Fri Sep 16 10:25:25 2011
@@ -17,6 +17,7 @@
 package org.apache.camel.language.simple;
 
 import org.apache.camel.ExchangeTestSupport;
+import org.apache.camel.language.simple.types.SimpleIllegalSyntaxException;
 
 /**
  *

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java?rev=1171490&r1=1171489&r2=1171490&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
(original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
Fri Sep 16 10:25:25 2011
@@ -34,6 +34,8 @@ import org.apache.camel.LanguageTestSupp
 import org.apache.camel.component.bean.MethodNotFoundException;
 import org.apache.camel.impl.JndiRegistry;
 import org.apache.camel.language.bean.RuntimeBeanExpressionException;
+import org.apache.camel.language.simple.types.SimpleIllegalSyntaxException;
+import org.apache.camel.language.simple.types.SimpleParserException;
 import org.apache.camel.spi.Language;
 
 /**



Mime
View raw message