moved antlr -> Spring.Expressions.Parser.antlr

src/Spring/Spring.Core/Expressions/ArrayConstructorNode.cs

@@ -21,10 +21,8 @@
 using System;
 using System.Collections;
 using System.Runtime.Serialization;
-
-using antlr.collections;
-using Spring.Core.TypeResolution;
-using Spring.Util;
+using Spring.Core.TypeResolution;
+using Spring.Expressions.Parser.antlr.collections;
 
 namespace Spring.Expressions
 {

src/Spring/Spring.Core/Expressions/AssignNode.cs

@@ -20,7 +20,7 @@
 
 using System;
 using System.Runtime.Serialization;
-using antlr.collections;
+using Spring.Expressions.Parser.antlr.collections;
 
 namespace Spring.Expressions
 {

src/Spring/Spring.Core/Expressions/DateLiteralNode.cs

@@ -20,8 +20,8 @@
 
 using System;
 using System.Globalization;
-using System.Runtime.Serialization;
-using antlr.collections;
+using System.Runtime.Serialization;
+using Spring.Expressions.Parser.antlr.collections;
 
 namespace Spring.Expressions
 {

src/Spring/Spring.Core/Expressions/Expression.cs

@@ -23,8 +23,9 @@ using System.Collections;
 using System.IO;
 using System.Reflection;
 using System.Runtime.Serialization;
-using antlr;
-using antlr.collections;
+using Spring.Expressions.Parser;
+using Spring.Expressions.Parser.antlr;
+using Spring.Expressions.Parser.antlr.collections;
 using Spring.Core;
 using Spring.Util;
 using StringUtils = Spring.Util.StringUtils;
@@ -86,7 +87,7 @@ namespace Spring.Expressions
         static Expression()
         {
             // Ensure antlr is loaded (fixes GAC issues)!
-            Assembly antlrAss = typeof( antlr.LLkParser ).Assembly;
+            Assembly antlrAss = typeof( Parser.antlr.LLkParser ).Assembly;
         }
 
         /// <summary>

src/Spring/Spring.Core/Expressions/Expression.g

@@ -1,7 +1,7 @@
 options
 {
 	language = "CSharp";
-	namespace = "Spring.Expressions";
+	namespace = "Spring.Expressions.Parser";
 }
 
 class ExpressionParser extends Parser;

src/Spring/Spring.Core/Expressions/ExpressionListNode.cs

@@ -20,7 +20,7 @@
 
 using System;
 using System.Runtime.Serialization;
-using antlr.collections;
+using Spring.Expressions.Parser.antlr.collections;
 
 namespace Spring.Expressions
 {

src/Spring/Spring.Core/Expressions/LambdaExpressionNode.cs

@@ -20,8 +20,8 @@
 
 using System;
 using System.Collections;
-using System.Runtime.Serialization;
-using antlr.collections;
+using System.Runtime.Serialization;
+using Spring.Expressions.Parser.antlr.collections;
 
 namespace Spring.Expressions
 {

src/Spring/Spring.Core/Expressions/MapInitializerNode.cs

@@ -20,8 +20,8 @@
 
 using System;
 using System.Collections;
-using System.Runtime.Serialization;
-using antlr.collections;
+using System.Runtime.Serialization;
+using Spring.Expressions.Parser.antlr.collections;
 
 namespace Spring.Expressions
 {

src/Spring/Spring.Core/Expressions/NodeWithArguments.cs

@@ -20,8 +20,8 @@
 
 using System;
 using System.Collections;
-using System.Runtime.Serialization;
-using antlr.collections;
+using System.Runtime.Serialization;
+using Spring.Expressions.Parser.antlr.collections;
 
 namespace Spring.Expressions
 {

src/Spring/Spring.Core/Expressions/Parser/ExpressionLexer.cs

@@ -1,6 +1,6 @@
 // $ANTLR 2.7.6 (2005-12-22): "Expression.g" -> "ExpressionLexer.cs"$
 
-namespace Spring.Expressions
+namespace Spring.Expressions.Parser
 {
 	// Generate header specific to lexer CSharp file
 	using System;

src/Spring/Spring.Core/Expressions/Parser/ExpressionParser.cs

@@ -1,6 +1,6 @@
 // $ANTLR 2.7.6 (2005-12-22): "Expression.g" -> "ExpressionParser.cs"$
 
-namespace Spring.Expressions
+namespace Spring.Expressions.Parser
 {
 	// Generate the header common to all output files.
 	using System;

src/Spring/Spring.Core/Expressions/Parser/ExpressionParserTokenTypes.cs

@@ -1,6 +1,6 @@
 // $ANTLR 2.7.6 (2005-12-22): "Expression.g" -> "ExpressionLexer.cs"$
 
-namespace Spring.Expressions
+namespace Spring.Expressions.Parser
 {
 	public class ExpressionParserTokenTypes
 	{

src/Spring/Spring.Core/Expressions/Parser/antlr/ANTLRException.cs

@@ -1,4 +1,4 @@
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	/*ANTLR Translator Generator
 	* Project led by Terence Parr at http://www.jGuru.com

src/Spring/Spring.Core/Expressions/Parser/antlr/ANTLRPanicException.cs

@@ -1,4 +1,4 @@
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	/*ANTLR Translator Generator
 	* Project led by Terence Parr at http://www.jGuru.com

src/Spring/Spring.Core/Expressions/Parser/antlr/ASTFactory.cs

@@ -1,13 +1,15 @@
 using System;
 using System.Collections;
+using Spring.Expressions.Parser.antlr.collections;
+using Spring.Expressions.Parser.antlr.collections.impl;
 using Assembly			= System.Reflection.Assembly;
 using ArrayList			= System.Collections.ArrayList;
 using Debug				= System.Diagnostics.Debug;
-using AST				= antlr.collections.AST;
-using ASTArray			= antlr.collections.impl.ASTArray;
-using ANTLRException	= antlr.ANTLRException;
+using AST				= Spring.Expressions.Parser.antlr.collections.AST;
+using ASTArray			= Spring.Expressions.Parser.antlr.collections.impl.ASTArray;
+using ANTLRException	= Spring.Expressions.Parser.antlr.ANTLRException;
 
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	/*ANTLR Translator Generator
 	* Project led by Terence Parr at http://www.jGuru.com
@@ -57,7 +59,7 @@ namespace antlr
 		/// Constructs an <c>ASTFactory</c> with the default AST node type of
 		/// <see cref="antlr.CommonAST"/>.
 		/// </summary>
-		public ASTFactory() : this("antlr.CommonAST")
+		public ASTFactory() : this(typeof(CommonAST).FullName)
 		{
 		}
 

src/Spring/Spring.Core/Expressions/Parser/antlr/ASTNULLType.cs

@@ -1,10 +1,11 @@
 using System;
+using Spring.Expressions.Parser.antlr.collections;
 using IEnumerator		= System.Collections.IEnumerator;
 
-using AST				= antlr.collections.AST;
-using Token				= antlr.Token;
+using AST				= Spring.Expressions.Parser.antlr.collections.AST;
+using Token				= Spring.Expressions.Parser.antlr.Token;
 
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	/*ANTLR Translator Generator
 	* Project led by Terence Parr at http://www.jGuru.com

src/Spring/Spring.Core/Expressions/Parser/antlr/ASTNodeCreator.cs

@@ -1,4 +1,4 @@
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	using System;
 	using AST		= antlr.collections.AST;

src/Spring/Spring.Core/Expressions/Parser/antlr/ASTPair.cs

@@ -1,4 +1,4 @@
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	using System;
 	using Queue = System.Collections.Queue;

src/Spring/Spring.Core/Expressions/Parser/antlr/ASTVisitor.cs

@@ -1,8 +1,8 @@
-using System;
+using System;
+using Spring.Expressions.Parser.antlr.collections;
+using AST		= Spring.Expressions.Parser.antlr.collections.AST;
 
-using AST		= antlr.collections.AST;
-
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	/* ANTLR Translator Generator
 	 * Project led by Terence Parr at http://www.jGuru.com

src/Spring/Spring.Core/Expressions/Parser/antlr/BaseAST.cs

@@ -1,13 +1,14 @@
 using System;
+using Spring.Expressions.Parser.antlr.collections;
 using StringBuilder		= System.Text.StringBuilder;
 using ISerializable		= System.Runtime.Serialization.ISerializable;
 using TextWriter		= System.IO.TextWriter;
 using ArrayList			= System.Collections.ArrayList;
 using IEnumerator		= System.Collections.IEnumerator;
 
-using AST				= antlr.collections.AST;
+using AST				= Spring.Expressions.Parser.antlr.collections.AST;
 
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	/*ANTLR Translator Generator
 	* Project led by Terence Parr at http://www.jGuru.com

src/Spring/Spring.Core/Expressions/Parser/antlr/ByteBuffer.cs

@@ -4,7 +4,7 @@ using Stream		= System.IO.Stream;
 using BinaryReader	= System.IO.BinaryReader;
 using IOException	= System.IO.IOException;
 
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	/*ANTLR Translator Generator
 	* Project led by Terence Parr at http://www.jGuru.com

src/Spring/Spring.Core/Expressions/Parser/antlr/CharBuffer.cs

@@ -4,7 +4,7 @@ using TextReader		= System.IO.TextReader;
 using IOException		= System.IO.IOException;
 
 
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	/*ANTLR Translator Generator
 	* Project led by Terence Parr at http://www.jGuru.com

src/Spring/Spring.Core/Expressions/Parser/antlr/CharQueue.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	/*ANTLR Translator Generator
 	* Project led by Terence Parr at http://www.jGuru.com

src/Spring/Spring.Core/Expressions/Parser/antlr/CharScanner.cs

@@ -1,4 +1,6 @@
 using System;
+using Spring.Expressions.Parser.antlr.collections.impl;
+using Spring.Expressions.Parser.antlr.debug;
 using Stream			= System.IO.Stream;
 using TextReader		= System.IO.TextReader;
 using StringBuilder		= System.Text.StringBuilder;
@@ -6,10 +8,9 @@ using Hashtable			= System.Collections.Hashtable;
 using Assembly			= System.Reflection.Assembly;
 using EventHandlerList	= System.ComponentModel.EventHandlerList;
 
-using BitSet			= antlr.collections.impl.BitSet;
-using antlr.debug;
+using BitSet			= Spring.Expressions.Parser.antlr.collections.impl.BitSet;
 
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	/*ANTLR Translator Generator
 	* Project led by Terence Parr at http://www.jGuru.com

src/Spring/Spring.Core/Expressions/Parser/antlr/CharStreamException.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	/*ANTLR Translator Generator
 	* Project led by Terence Parr at http://www.jGuru.com

src/Spring/Spring.Core/Expressions/Parser/antlr/CharStreamIOException.cs

@@ -1,7 +1,7 @@
 using System;
 using IOException = System.IO.IOException;
 
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	/*ANTLR Translator Generator
 	* Project led by Terence Parr at http://www.jGuru.com

src/Spring/Spring.Core/Expressions/Parser/antlr/CommonAST.cs

@@ -1,7 +1,8 @@
 using System;
-using AST = antlr.collections.AST;
+using Spring.Expressions.Parser.antlr.collections;
+using AST = Spring.Expressions.Parser.antlr.collections.AST;
 	
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	/*ANTLR Translator Generator
 	* Project led by Terence Parr at http://www.jGuru.com
@@ -56,7 +57,7 @@ namespace antlr
 			setText(txt);
 		}
 		
-		override public void  initialize(AST t)
+		override public void  initialize(collections.AST t)
 		{
 			setText(t.getText());
 			Type = t.Type;

src/Spring/Spring.Core/Expressions/Parser/antlr/CommonASTWithHiddenTokens.cs

@@ -1,7 +1,8 @@
 using System;
-using AST		= antlr.collections.AST;
+using Spring.Expressions.Parser.antlr.collections;
+using AST		= Spring.Expressions.Parser.antlr.collections.AST;
 
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	/*ANTLR Translator Generator
 	* Project led by Terence Parr at http://www.jGuru.com
@@ -53,7 +54,7 @@ namespace antlr
 			return hiddenBefore;
 		}
 		
-		override public void initialize(AST t)
+		override public void initialize(collections.AST t)
 		{
 			hiddenBefore = ((CommonASTWithHiddenTokens) t).getHiddenBefore();
 			hiddenAfter  = ((CommonASTWithHiddenTokens) t).getHiddenAfter();

src/Spring/Spring.Core/Expressions/Parser/antlr/CommonHiddenStreamToken.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	/*ANTLR Translator Generator
 	* Project led by Terence Parr at http://www.jGuru.com

src/Spring/Spring.Core/Expressions/Parser/antlr/CommonToken.cs

@@ -1,6 +1,6 @@
 using System;
 	
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	/*ANTLR Translator Generator
 	* Project led by Terence Parr at http://www.jGuru.com

src/Spring/Spring.Core/Expressions/Parser/antlr/DefaultFileLineFormatter.cs

@@ -1,7 +1,7 @@
 using System;
 using StringBuilder			= System.Text.StringBuilder;
 
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	/*ANTLR Translator Generator
 	* Project led by Terence Parr at http://www.jGuru.com

src/Spring/Spring.Core/Expressions/Parser/antlr/DumpASTVisitor.cs

@@ -1,8 +1,8 @@
-using System;
+using System;
+using Spring.Expressions.Parser.antlr.collections;
+using AST			= Spring.Expressions.Parser.antlr.collections.AST;
 
-using AST			= antlr.collections.AST;
-
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	/* ANTLR Translator Generator
 	 * Project led by Terence Parr at http://www.jGuru.com

src/Spring/Spring.Core/Expressions/Parser/antlr/FileLineFormatter.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	/*ANTLR Translator Generator
 	* Project led by Terence Parr at http://www.jGuru.com

src/Spring/Spring.Core/Expressions/Parser/antlr/IHiddenStreamToken.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	/*ANTLR Translator Generator
 	* Project led by Terence Parr at http://www.jGuru.com

src/Spring/Spring.Core/Expressions/Parser/antlr/IToken.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	/*ANTLR Translator Generator
 	* Project led by Terence Parr at http://www.jGuru.com

src/Spring/Spring.Core/Expressions/Parser/antlr/InputBuffer.cs

@@ -1,4 +1,4 @@
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	using System;
 	using ArrayList		= System.Collections.ArrayList;

src/Spring/Spring.Core/Expressions/Parser/antlr/LLkParser.cs

@@ -1,6 +1,6 @@
 using System;
 	
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	/*ANTLR Translator Generator
 	* Project led by Terence Parr at http://www.jGuru.com

src/Spring/Spring.Core/Expressions/Parser/antlr/LexerSharedInputState.cs

@@ -2,7 +2,7 @@ using System;
 using Stream			= System.IO.Stream;
 using TextReader		= System.IO.TextReader;
 
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	/*ANTLR Translator Generator
 	* Project led by Terence Parr at http://www.jGuru.com

src/Spring/Spring.Core/Expressions/Parser/antlr/MismatchedCharException.cs

@@ -1,9 +1,10 @@
 using System;
+using Spring.Expressions.Parser.antlr.collections.impl;
 using StringBuilder			= System.Text.StringBuilder;
 
-using BitSet				= antlr.collections.impl.BitSet;
+using BitSet				= Spring.Expressions.Parser.antlr.collections.impl.BitSet;
 
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	/*ANTLR Translator Generator
 	* Project led by Terence Parr at http://www.jGuru.com

src/Spring/Spring.Core/Expressions/Parser/antlr/MismatchedTokenException.cs

@@ -1,10 +1,12 @@
 using System;
+using Spring.Expressions.Parser.antlr.collections;
+using Spring.Expressions.Parser.antlr.collections.impl;
 using StringBuilder			= System.Text.StringBuilder;
 
-using BitSet				= antlr.collections.impl.BitSet;
-using AST					= antlr.collections.AST;
+using BitSet				= Spring.Expressions.Parser.antlr.collections.impl.BitSet;
+using AST					= Spring.Expressions.Parser.antlr.collections.AST;
 
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	/*ANTLR Translator Generator
 	* Project led by Terence Parr at http://www.jGuru.com

src/Spring/Spring.Core/Expressions/Parser/antlr/NoViableAltException.cs

@@ -1,8 +1,8 @@
-using System;
+using System;
+using Spring.Expressions.Parser.antlr.collections;
+using AST					= Spring.Expressions.Parser.antlr.collections.AST;
 
-using AST					= antlr.collections.AST;
-
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	/*ANTLR Translator Generator
 	* Project led by Terence Parr at http://www.jGuru.com

src/Spring/Spring.Core/Expressions/Parser/antlr/NoViableAltForCharException.cs

@@ -1,7 +1,7 @@
 using System;
 using StringBuilder				= System.Text.StringBuilder;
 
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	/*ANTLR Translator Generator
 	* Project led by Terence Parr at http://www.jGuru.com

src/Spring/Spring.Core/Expressions/Parser/antlr/ParseTree.cs

@@ -1,4 +1,4 @@
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	/* ANTLR Translator Generator
 	 * Project led by Terence Parr at http://www.jGuru.com

src/Spring/Spring.Core/Expressions/Parser/antlr/ParseTreeRule.cs

@@ -1,4 +1,4 @@
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 
 	/* ANTLR Translator Generator

src/Spring/Spring.Core/Expressions/Parser/antlr/ParseTreeToken.cs

@@ -1,4 +1,4 @@
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 
 	/* ANTLR Translator Generator

src/Spring/Spring.Core/Expressions/Parser/antlr/Parser.cs

@@ -1,18 +1,19 @@
 using System;
+using Spring.Expressions.Parser.antlr.collections;
+using Spring.Expressions.Parser.antlr.collections.impl;
+using Spring.Expressions.Parser.antlr.debug;
 using EventHandlerList			= System.ComponentModel.EventHandlerList;
 
-using BitSet					= antlr.collections.impl.BitSet;
-using AST						= antlr.collections.AST;
-using ASTArray					= antlr.collections.impl.ASTArray;
-using antlr.debug;
-
-using MessageListener				= antlr.debug.MessageListener;
-using ParserListener				= antlr.debug.ParserListener;
-using ParserMatchListener			= antlr.debug.ParserMatchListener;
-using ParserTokenListener			= antlr.debug.ParserTokenListener;
-using SemanticPredicateListener		= antlr.debug.SemanticPredicateListener;
-using SyntacticPredicateListener	= antlr.debug.SyntacticPredicateListener;
-using TraceListener					= antlr.debug.TraceListener;
+using BitSet					= Spring.Expressions.Parser.antlr.collections.impl.BitSet;
+using AST						= Spring.Expressions.Parser.antlr.collections.AST;
+using ASTArray					= Spring.Expressions.Parser.antlr.collections.impl.ASTArray;
+using MessageListener				= Spring.Expressions.Parser.antlr.debug.MessageListener;
+using ParserListener				= Spring.Expressions.Parser.antlr.debug.ParserListener;
+using ParserMatchListener			= Spring.Expressions.Parser.antlr.debug.ParserMatchListener;
+using ParserTokenListener			= Spring.Expressions.Parser.antlr.debug.ParserTokenListener;
+using SemanticPredicateListener		= Spring.Expressions.Parser.antlr.debug.SemanticPredicateListener;
+using SyntacticPredicateListener	= Spring.Expressions.Parser.antlr.debug.SyntacticPredicateListener;
+using TraceListener					= Spring.Expressions.Parser.antlr.debug.TraceListener;
 
 /*
 	private Vector messageListeners;
@@ -24,7 +25,7 @@ using TraceListener					= antlr.debug.TraceListener;
 	private Vector traceListeners;
 */
 	
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	/*ANTLR Translator Generator
 	* Project led by Terence Parr at http://www.jGuru.com

src/Spring/Spring.Core/Expressions/Parser/antlr/ParserSharedInputState.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	/*ANTLR Translator Generator
 	* Project led by Terence Parr at http://www.jGuru.com

src/Spring/Spring.Core/Expressions/Parser/antlr/RecognitionException.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	/*ANTLR Translator Generator
 	* Project led by Terence Parr at http://www.jGuru.com

src/Spring/Spring.Core/Expressions/Parser/antlr/SemanticException.cs

@@ -1,6 +1,6 @@
 using System;
 	
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	/*ANTLR Translator Generator
 	* Project led by Terence Parr at http://www.jGuru.com

src/Spring/Spring.Core/Expressions/Parser/antlr/StringUtils.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	/* ANTLR Translator Generator
 	 * Project led by Terence Parr at http://www.jGuru.com

src/Spring/Spring.Core/Expressions/Parser/antlr/SupportClass.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
     internal class SupportClass
     {

src/Spring/Spring.Core/Expressions/Parser/antlr/Token.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	/*ANTLR Translator Generator
 	* Project led by Terence Parr at http://www.jGuru.com

src/Spring/Spring.Core/Expressions/Parser/antlr/TokenBuffer.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	/*ANTLR Translator Generator
 	* Project led by Terence Parr at http://www.jGuru.com

src/Spring/Spring.Core/Expressions/Parser/antlr/TokenCreator.cs

@@ -1,4 +1,4 @@
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	using System;
 

src/Spring/Spring.Core/Expressions/Parser/antlr/TokenQueue.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	/*ANTLR Translator Generator
 	* Project led by Terence Parr at http://www.jGuru.com

src/Spring/Spring.Core/Expressions/Parser/antlr/TokenStream.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	/*ANTLR Translator Generator
 	* Project led by Terence Parr at http://www.jGuru.com

src/Spring/Spring.Core/Expressions/Parser/antlr/TokenStreamBasicFilter.cs

@@ -1,7 +1,8 @@
 using System;
-using BitSet = antlr.collections.impl.BitSet;
+using Spring.Expressions.Parser.antlr.collections.impl;
+using BitSet = Spring.Expressions.Parser.antlr.collections.impl.BitSet;
 	
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	/*ANTLR Translator Generator
 	* Project led by Terence Parr at http://www.jGuru.com

src/Spring/Spring.Core/Expressions/Parser/antlr/TokenStreamException.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	/*ANTLR Translator Generator
 	* Project led by Terence Parr at http://www.jGuru.com

src/Spring/Spring.Core/Expressions/Parser/antlr/TokenStreamHiddenTokenFilter.cs

@@ -1,7 +1,8 @@
 using System;
-using BitSet = antlr.collections.impl.BitSet;
+using Spring.Expressions.Parser.antlr.collections.impl;
+using BitSet = Spring.Expressions.Parser.antlr.collections.impl.BitSet;
 	
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	/*ANTLR Translator Generator
 	* Project led by Terence Parr at http://www.jGuru.com

src/Spring/Spring.Core/Expressions/Parser/antlr/TokenStreamIOException.cs

@@ -1,7 +1,7 @@
 using System;
 using IOException = System.IO.IOException;
 	
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	/*ANTLR Translator Generator
 	* Project led by Terence Parr at http://www.jGuru.com

src/Spring/Spring.Core/Expressions/Parser/antlr/TokenStreamRecognitionException.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	/*ANTLR Translator Generator
 	* Project led by Terence Parr at http://www.jGuru.com

src/Spring/Spring.Core/Expressions/Parser/antlr/TokenStreamRetryException.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	/*ANTLR Translator Generator
 	* Project led by Terence Parr at http://www.jGuru.com

src/Spring/Spring.Core/Expressions/Parser/antlr/TokenStreamRewriteEngine.cs

@@ -1,4 +1,4 @@
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	/* ANTLR Translator Generator
 	 * Project led by Terence Parr at http://www.jGuru.com

src/Spring/Spring.Core/Expressions/Parser/antlr/TokenStreamSelector.cs

@@ -2,7 +2,7 @@ using System;
 using Hashtable		= System.Collections.Hashtable;
 using Stack    		= System.Collections.Stack;
 	
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	/*ANTLR Translator Generator
 	* Project led by Terence Parr at http://www.jGuru.com

src/Spring/Spring.Core/Expressions/Parser/antlr/TokenWithIndex.cs

@@ -1,4 +1,4 @@
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	/* ANTLR Translator Generator
 	 * Project led by Terence Parr at http://www.jGuru.com

src/Spring/Spring.Core/Expressions/Parser/antlr/TreeParser.cs

@@ -1,8 +1,10 @@
 using System;
-using AST = antlr.collections.AST;
-using BitSet = antlr.collections.impl.BitSet;
+using Spring.Expressions.Parser.antlr.collections;
+using Spring.Expressions.Parser.antlr.collections.impl;
+using AST = Spring.Expressions.Parser.antlr.collections.AST;
+using BitSet = Spring.Expressions.Parser.antlr.collections.impl.BitSet;
 	
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	/*ANTLR Translator Generator
 	* Project led by Terence Parr at http://www.jGuru.com

src/Spring/Spring.Core/Expressions/Parser/antlr/TreeParserSharedInputState.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace antlr
+namespace Spring.Expressions.Parser.antlr
 {
 	/*ANTLR Translator Generator
 	* Project led by Terence Parr at http://www.jGuru.com

src/Spring/Spring.Core/Expressions/Parser/antlr/collections/AST.cs

@@ -1,9 +1,9 @@
 using System;
 using IEnumerator = System.Collections.IEnumerator;
 
-using IToken = antlr.IToken;
+using IToken = Spring.Expressions.Parser.antlr.IToken;
 	
-namespace antlr.collections
+namespace Spring.Expressions.Parser.antlr.collections
 {
 	/*ANTLR Translator Generator
 	* Project led by Terence Parr at http://www.jGuru.com

src/Spring/Spring.Core/Expressions/Parser/antlr/collections/impl/ASTArray.cs

@@ -1,7 +1,7 @@
 using System;
-using AST = antlr.collections.AST;
+using AST = Spring.Expressions.Parser.antlr.collections.AST;
 	
-namespace antlr.collections.impl
+namespace Spring.Expressions.Parser.antlr.collections.impl
 {
 	/*ANTLR Translator Generator
 	* Project led by Terence Parr at http://www.jGuru.com

src/Spring/Spring.Core/Expressions/Parser/antlr/collections/impl/BitSet.cs

@@ -3,7 +3,7 @@ using ArrayList					= System.Collections.ArrayList;
 
 //using CharFormatter				= antlr.CharFormatter;
 
-namespace antlr.collections.impl
+namespace Spring.Expressions.Parser.antlr.collections.impl
 {
 	/*ANTLR Translator Generator
 	* Project led by Terence Parr at http://www.jGuru.com

src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ANTLREventArgs.cs

@@ -1,4 +1,4 @@
-namespace antlr.debug
+namespace Spring.Expressions.Parser.antlr.debug
 {
 	using System;
 	

src/Spring/Spring.Core/Expressions/Parser/antlr/debug/DebuggingCharScanner.cs

@@ -1,4 +1,4 @@
-namespace antlr.debug
+namespace Spring.Expressions.Parser.antlr.debug
 {
 	using System;
 	using System.Threading;

src/Spring/Spring.Core/Expressions/Parser/antlr/debug/DebuggingInputBuffer.cs

@@ -1,4 +1,4 @@
-namespace antlr.debug
+namespace Spring.Expressions.Parser.antlr.debug
 {
 	using System;
 	using ArrayList	= System.Collections.ArrayList;

src/Spring/Spring.Core/Expressions/Parser/antlr/debug/DebuggingParser.cs

@@ -1,4 +1,4 @@
-namespace antlr.debug
+namespace Spring.Expressions.Parser.antlr.debug
 {
 	using System;
 	

src/Spring/Spring.Core/Expressions/Parser/antlr/debug/GuessingEventArgs.cs

@@ -1,4 +1,4 @@
-namespace antlr.debug
+namespace Spring.Expressions.Parser.antlr.debug
 {
 	using System;
 	

src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ICharScannerDebugSubject.cs

@@ -1,4 +1,4 @@
-namespace antlr.debug
+namespace Spring.Expressions.Parser.antlr.debug
 {
 	using System;
 	

src/Spring/Spring.Core/Expressions/Parser/antlr/debug/IDebugSubject.cs

@@ -1,4 +1,4 @@
-namespace antlr.debug
+namespace Spring.Expressions.Parser.antlr.debug
 {
 	using System;
 	//using EventHandlerList	= System.ComponentModel.EventHandlerList;

src/Spring/Spring.Core/Expressions/Parser/antlr/debug/IParserDebugSubject.cs

@@ -1,4 +1,4 @@
-namespace antlr.debug
+namespace Spring.Expressions.Parser.antlr.debug
 {
 	using System;
 	

src/Spring/Spring.Core/Expressions/Parser/antlr/debug/InputBufferEventArgs.cs

@@ -1,4 +1,4 @@
-namespace antlr.debug
+namespace Spring.Expressions.Parser.antlr.debug
 {
 	using System;
 	

src/Spring/Spring.Core/Expressions/Parser/antlr/debug/InputBufferEventSupport.cs

@@ -1,4 +1,4 @@
-namespace antlr.debug
+namespace Spring.Expressions.Parser.antlr.debug
 {
 	using System;
 	using ArrayList	= System.Collections.ArrayList;

src/Spring/Spring.Core/Expressions/Parser/antlr/debug/InputBufferListener.cs

@@ -1,4 +1,4 @@
-namespace antlr.debug
+namespace Spring.Expressions.Parser.antlr.debug
 {
 	using System;
 	

src/Spring/Spring.Core/Expressions/Parser/antlr/debug/InputBufferListenerBase.cs

@@ -1,4 +1,4 @@
-namespace antlr.debug
+namespace Spring.Expressions.Parser.antlr.debug
 {
 	using System;
 	

src/Spring/Spring.Core/Expressions/Parser/antlr/debug/InputBufferReporter.cs

@@ -1,4 +1,4 @@
-namespace antlr.debug
+namespace Spring.Expressions.Parser.antlr.debug
 {
 	using System;
 	

src/Spring/Spring.Core/Expressions/Parser/antlr/debug/LLkDebuggingParser.cs

@@ -1,4 +1,4 @@
-namespace antlr.debug
+namespace Spring.Expressions.Parser.antlr.debug
 {
 	using System;
 	using System.Threading;

src/Spring/Spring.Core/Expressions/Parser/antlr/debug/Listener.cs

@@ -1,4 +1,4 @@
-namespace antlr.debug
+namespace Spring.Expressions.Parser.antlr.debug
 {
 	using System;
 	

src/Spring/Spring.Core/Expressions/Parser/antlr/debug/MessageEventArgs.cs

@@ -1,4 +1,4 @@
-namespace antlr.debug
+namespace Spring.Expressions.Parser.antlr.debug
 {
 	using System;
 	

src/Spring/Spring.Core/Expressions/Parser/antlr/debug/MessageListener.cs

@@ -1,4 +1,4 @@
-namespace antlr.debug
+namespace Spring.Expressions.Parser.antlr.debug
 {
 	using System;
 	

src/Spring/Spring.Core/Expressions/Parser/antlr/debug/MessageListenerBase.cs

@@ -1,4 +1,4 @@
-namespace antlr.debug
+namespace Spring.Expressions.Parser.antlr.debug
 {
 	using System;
 	

src/Spring/Spring.Core/Expressions/Parser/antlr/debug/NewLineEventArgs.cs

@@ -1,4 +1,4 @@
-namespace antlr.debug
+namespace Spring.Expressions.Parser.antlr.debug
 {
 	using System;
 	

src/Spring/Spring.Core/Expressions/Parser/antlr/debug/NewLineListener.cs

@@ -1,4 +1,4 @@
-namespace antlr.debug
+namespace Spring.Expressions.Parser.antlr.debug
 {
 	using System;
 	

src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ParseTreeDebugParser.cs

@@ -1,4 +1,4 @@
-namespace antlr.debug
+namespace Spring.Expressions.Parser.antlr.debug
 {
 
 	/* ANTLR Translator Generator

src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ParserController.cs

@@ -1,4 +1,4 @@
-namespace antlr.debug
+namespace Spring.Expressions.Parser.antlr.debug
 {
 	using System;
 	

src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ParserEventSupport.cs

@@ -1,4 +1,4 @@
-namespace antlr.debug
+namespace Spring.Expressions.Parser.antlr.debug
 {
 	using System;
 	using System.Reflection;

src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ParserListener.cs

@@ -1,4 +1,4 @@
-namespace antlr.debug
+namespace Spring.Expressions.Parser.antlr.debug
 {
 	using System;
 	

src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ParserListenerBase.cs

@@ -1,4 +1,4 @@
-namespace antlr.debug
+namespace Spring.Expressions.Parser.antlr.debug
 {
 	using System;
 	

src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ParserMatchEventArgs.cs

@@ -1,4 +1,4 @@
-namespace antlr.debug
+namespace Spring.Expressions.Parser.antlr.debug
 {
 	using System;
 	

src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ParserMatchListener.cs

@@ -1,4 +1,4 @@
-namespace antlr.debug
+namespace Spring.Expressions.Parser.antlr.debug
 {
 	using System;
 	

src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ParserMatchListenerBase.cs

@@ -1,4 +1,4 @@
-namespace antlr.debug
+namespace Spring.Expressions.Parser.antlr.debug
 {
 	using System;
 	

src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ParserReporter.cs

@@ -1,4 +1,4 @@
-namespace antlr.debug
+namespace Spring.Expressions.Parser.antlr.debug
 {
 	using System;
 	

src/Spring/Spring.Core/Expressions/Parser/antlr/debug/ParserTokenEventArgs.cs

@@ -1,4 +1,4 @@
-namespace antlr.debug
+namespace Spring.Expressions.Parser.antlr.debug
 {
 	using System;