commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1101960 [2/4] - in /incubator/ognl/trunk/src: java/ognl/ java/org/ java/org/apache/ java/org/apache/commons/ java/org/apache/commons/ognl/ java/org/apache/commons/ognl/enhance/ java/org/apache/commons/ognl/internal/ test/java/ognl/ test/ja...
Date Wed, 11 May 2011 16:38:00 GMT
Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/EnumerationPropertyAccessor.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/EnumerationPropertyAccessor.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/EnumerationPropertyAccessor.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/EnumerationPropertyAccessor.java Wed May 11 16:37:53 2011
@@ -28,7 +28,7 @@
 //  THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 //  DAMAGE.
 //--------------------------------------------------------------------------
-package ognl;
+package org.apache.commons.ognl;
 
 import java.util.*;
 

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/Evaluation.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/Evaluation.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/Evaluation.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/Evaluation.java Wed May 11 16:37:53 2011
@@ -28,7 +28,7 @@
 //  THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 //  DAMAGE.
 //--------------------------------------------------------------------------
-package ognl;
+package org.apache.commons.ognl;
 
 /**
     An <code>Evaluation</code> is and object that holds a node being evaluated

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/EvaluationPool.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/EvaluationPool.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/EvaluationPool.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/EvaluationPool.java Wed May 11 16:37:53 2011
@@ -28,7 +28,7 @@
 //  THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 //  DAMAGE.
 //--------------------------------------------------------------------------
-package ognl;
+package org.apache.commons.ognl;
 
 import java.util.*;
 

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/ExpressionNode.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/ExpressionNode.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/ExpressionNode.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/ExpressionNode.java Wed May 11 16:37:53 2011
@@ -28,9 +28,9 @@
 //  THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 //  DAMAGE.
 //--------------------------------------------------------------------------
-package ognl;
+package org.apache.commons.ognl;
 
-import ognl.enhance.ExpressionCompiler;
+import org.apache.commons.ognl.enhance.ExpressionCompiler;
 
 /**
  * @author Luke Blanshard (blanshlu@netscape.net)

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/ExpressionSyntaxException.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/ExpressionSyntaxException.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/ExpressionSyntaxException.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/ExpressionSyntaxException.java Wed May 11 16:37:53 2011
@@ -28,7 +28,7 @@
 //  THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 //  DAMAGE.
 //--------------------------------------------------------------------------
-package ognl;
+package org.apache.commons.ognl;
 
 
 /**

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/InappropriateExpressionException.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/InappropriateExpressionException.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/InappropriateExpressionException.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/InappropriateExpressionException.java Wed May 11 16:37:53 2011
@@ -28,7 +28,7 @@
 //  THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 //  DAMAGE.
 //--------------------------------------------------------------------------
-package ognl;
+package org.apache.commons.ognl;
 
 
 /**

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/IntHashMap.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/IntHashMap.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/IntHashMap.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/IntHashMap.java Wed May 11 16:37:53 2011
@@ -28,7 +28,7 @@
 //  THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 //  DAMAGE.
 //--------------------------------------------------------------------------
-package ognl;
+package org.apache.commons.ognl;
 
 import java.util.*;
 

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/IteratorElementsAccessor.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/IteratorElementsAccessor.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/IteratorElementsAccessor.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/IteratorElementsAccessor.java Wed May 11 16:37:53 2011
@@ -28,7 +28,7 @@
 //  THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 //  DAMAGE.
 //--------------------------------------------------------------------------
-package ognl;
+package org.apache.commons.ognl;
 
 import java.util.*;
 

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/IteratorEnumeration.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/IteratorEnumeration.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/IteratorEnumeration.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/IteratorEnumeration.java Wed May 11 16:37:53 2011
@@ -28,7 +28,7 @@
 //  THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 //  DAMAGE.
 //--------------------------------------------------------------------------
-package ognl;
+package org.apache.commons.ognl;
 
 import java.util.*;
 

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/IteratorPropertyAccessor.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/IteratorPropertyAccessor.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/IteratorPropertyAccessor.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/IteratorPropertyAccessor.java Wed May 11 16:37:53 2011
@@ -28,7 +28,7 @@
 //  THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 //  DAMAGE.
 //--------------------------------------------------------------------------
-package ognl;
+package org.apache.commons.ognl;
 
 import java.util.*;
 

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/JJTOgnlParserState.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/JJTOgnlParserState.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/JJTOgnlParserState.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/JJTOgnlParserState.java Wed May 11 16:37:53 2011
@@ -1,5 +1,5 @@
 /* Generated By:JavaCC: Do not edit this line. JJTOgnlParserState.java Version 4.1d1 */
-package ognl;
+package org.apache.commons.ognl;
 
 public class JJTOgnlParserState {
   private java.util.List nodes;

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/JavaCharStream.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/JavaCharStream.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/JavaCharStream.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/JavaCharStream.java Wed May 11 16:37:53 2011
@@ -1,6 +1,6 @@
 /* Generated By:JavaCC: Do not edit this line. JavaCharStream.java Version 4.1 */
 /* JavaCCOptions:STATIC=false */
-package ognl;
+package org.apache.commons.ognl;
 
 /**
  * An implementation of interface CharStream, where the stream is assumed to

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/JavaSource.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/JavaSource.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/JavaSource.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/JavaSource.java Wed May 11 16:37:53 2011
@@ -1,9 +1,9 @@
 /**
  * 
  */
-package ognl;
+package org.apache.commons.ognl;
 
-import ognl.enhance.ExpressionAccessor;
+import org.apache.commons.ognl.enhance.ExpressionAccessor;
 
 /**
  * Defines an object that can return a representation of itself and any objects it contains

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/ListPropertyAccessor.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/ListPropertyAccessor.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/ListPropertyAccessor.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/ListPropertyAccessor.java Wed May 11 16:37:53 2011
@@ -28,7 +28,7 @@
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 // DAMAGE.
 // --------------------------------------------------------------------------
-package ognl;
+package org.apache.commons.ognl;
 
 import java.lang.reflect.Method;
 import java.util.*;
@@ -215,7 +215,7 @@ public class ListPropertyAccessor extend
 
             String toString = String.class.isInstance(index) && context.getCurrentType() != Object.class ? "" : ".toString()";
 
-            indexStr = "ognl.OgnlOps#getIntValue(" + indexStr + toString + ")";
+            indexStr = "org.apache.commons.ognl.OgnlOps#getIntValue(" + indexStr + toString + ")";
         }
 
         context.setCurrentType(Object.class);
@@ -269,7 +269,7 @@ public class ListPropertyAccessor extend
 
             String toString = String.class.isInstance(index) && context.getCurrentType() != Object.class ? "" : ".toString()";
 
-            indexStr = "ognl.OgnlOps#getIntValue(" + indexStr + toString + ")";
+            indexStr = "org.apache.commons.ognl.OgnlOps#getIntValue(" + indexStr + toString + ")";
         }
 
         context.setCurrentType(Object.class);

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/MapElementsAccessor.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/MapElementsAccessor.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/MapElementsAccessor.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/MapElementsAccessor.java Wed May 11 16:37:53 2011
@@ -28,7 +28,7 @@
 //  THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 //  DAMAGE.
 //--------------------------------------------------------------------------
-package ognl;
+package org.apache.commons.ognl;
 
 import java.util.*;
 

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/MapPropertyAccessor.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/MapPropertyAccessor.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/MapPropertyAccessor.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/MapPropertyAccessor.java Wed May 11 16:37:53 2011
@@ -28,7 +28,7 @@
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 // DAMAGE.
 // --------------------------------------------------------------------------
-package ognl;
+package org.apache.commons.ognl;
 
 import java.util.Collection;
 import java.util.Map;

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/MemberAccess.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/MemberAccess.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/MemberAccess.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/MemberAccess.java Wed May 11 16:37:53 2011
@@ -28,7 +28,7 @@
 //  THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 //  DAMAGE.
 //--------------------------------------------------------------------------
-package ognl;
+package org.apache.commons.ognl;
 
 import java.lang.reflect.Member;
 import java.util.Map;

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/MethodAccessor.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/MethodAccessor.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/MethodAccessor.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/MethodAccessor.java Wed May 11 16:37:53 2011
@@ -28,7 +28,7 @@
 //  THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 //  DAMAGE.
 //--------------------------------------------------------------------------
-package ognl;
+package org.apache.commons.ognl;
 
 import java.util.Map;
 

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/MethodFailedException.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/MethodFailedException.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/MethodFailedException.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/MethodFailedException.java Wed May 11 16:37:53 2011
@@ -28,7 +28,7 @@
 //  THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 //  DAMAGE.
 //--------------------------------------------------------------------------
-package ognl;
+package org.apache.commons.ognl;
 
 /**
  * Exception thrown if a method or constructor call fails.

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/NoSuchPropertyException.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/NoSuchPropertyException.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/NoSuchPropertyException.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/NoSuchPropertyException.java Wed May 11 16:37:53 2011
@@ -28,7 +28,7 @@
 //  THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 //  DAMAGE.
 //--------------------------------------------------------------------------
-package ognl;
+package org.apache.commons.ognl;
 
 
 /**

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/Node.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/Node.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/Node.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/Node.java Wed May 11 16:37:53 2011
@@ -28,9 +28,9 @@
 //  THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 //  DAMAGE.
 //--------------------------------------------------------------------------
-package ognl;
+package org.apache.commons.ognl;
 
-import ognl.enhance.ExpressionAccessor;
+import org.apache.commons.ognl.enhance.ExpressionAccessor;
 
 /**
    JJTree interface for AST nodes, as modified to handle the OGNL operations getValue and

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/NodeType.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/NodeType.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/NodeType.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/NodeType.java Wed May 11 16:37:53 2011
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package ognl;
+package org.apache.commons.ognl;
 
 
 /**

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/NullHandler.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/NullHandler.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/NullHandler.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/NullHandler.java Wed May 11 16:37:53 2011
@@ -28,7 +28,7 @@
 //  THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 //  DAMAGE.
 //--------------------------------------------------------------------------
-package ognl;
+package org.apache.commons.ognl;
 
 import java.util.Map;
 

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/NumberElementsAccessor.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/NumberElementsAccessor.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/NumberElementsAccessor.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/NumberElementsAccessor.java Wed May 11 16:37:53 2011
@@ -28,7 +28,7 @@
 //  THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 //  DAMAGE.
 //--------------------------------------------------------------------------
-package ognl;
+package org.apache.commons.ognl;
 
 import java.util.*;
 

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/NumericExpression.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/NumericExpression.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/NumericExpression.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/NumericExpression.java Wed May 11 16:37:53 2011
@@ -1,9 +1,9 @@
 /**
  * 
  */
-package ognl;
+package org.apache.commons.ognl;
 
-import ognl.enhance.ExpressionCompiler;
+import org.apache.commons.ognl.enhance.ExpressionCompiler;
 
 
 /**

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/NumericTypes.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/NumericTypes.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/NumericTypes.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/NumericTypes.java Wed May 11 16:37:53 2011
@@ -28,7 +28,7 @@
 //  THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 //  DAMAGE.
 //--------------------------------------------------------------------------
-package ognl;
+package org.apache.commons.ognl;
 
 
 /**

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/ObjectArrayPool.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/ObjectArrayPool.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/ObjectArrayPool.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/ObjectArrayPool.java Wed May 11 16:37:53 2011
@@ -28,7 +28,7 @@
 //  THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 //  DAMAGE.
 //--------------------------------------------------------------------------
-package ognl;
+package org.apache.commons.ognl;
 
 import java.util.*;
 

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/ObjectElementsAccessor.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/ObjectElementsAccessor.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/ObjectElementsAccessor.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/ObjectElementsAccessor.java Wed May 11 16:37:53 2011
@@ -28,7 +28,7 @@
 //  THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 //  DAMAGE.
 //--------------------------------------------------------------------------
-package ognl;
+package org.apache.commons.ognl;
 
 import java.util.*;
 

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/ObjectIndexedPropertyDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/ObjectIndexedPropertyDescriptor.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/ObjectIndexedPropertyDescriptor.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/ObjectIndexedPropertyDescriptor.java Wed May 11 16:37:53 2011
@@ -28,7 +28,7 @@
 //  THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 //  DAMAGE.
 //--------------------------------------------------------------------------
-package ognl;
+package org.apache.commons.ognl;
 
 import java.beans.*;
 import java.lang.reflect.*;

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/ObjectMethodAccessor.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/ObjectMethodAccessor.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/ObjectMethodAccessor.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/ObjectMethodAccessor.java Wed May 11 16:37:53 2011
@@ -28,7 +28,7 @@
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 // DAMAGE.
 // --------------------------------------------------------------------------
-package ognl;
+package org.apache.commons.ognl;
 
 import java.util.List;
 import java.util.Map;

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/ObjectNullHandler.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/ObjectNullHandler.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/ObjectNullHandler.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/ObjectNullHandler.java Wed May 11 16:37:53 2011
@@ -28,7 +28,7 @@
 //  THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 //  DAMAGE.
 //--------------------------------------------------------------------------
-package ognl;
+package org.apache.commons.ognl;
 
 import java.util.*;
 

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/ObjectPropertyAccessor.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/ObjectPropertyAccessor.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/ObjectPropertyAccessor.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/ObjectPropertyAccessor.java Wed May 11 16:37:53 2011
@@ -28,10 +28,10 @@
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 // DAMAGE.
 // --------------------------------------------------------------------------
-package ognl;
+package org.apache.commons.ognl;
 
-import ognl.enhance.ExpressionCompiler;
-import ognl.enhance.UnsupportedCompilationException;
+import org.apache.commons.ognl.enhance.ExpressionCompiler;
+import org.apache.commons.ognl.enhance.UnsupportedCompilationException;
 
 import java.beans.IntrospectionException;
 import java.lang.reflect.Field;
@@ -276,21 +276,21 @@ public class ObjectPropertyAccessor impl
             {
                 Class wrapClass = OgnlRuntime.getPrimitiveWrapperClass(parm);
                 conversion = OgnlRuntime.getCompiler().createLocalReference(context,
-                                                                            "((" + wrapClass.getName() + ")ognl.OgnlOps#convertValue($3," + wrapClass.getName()
+                                                                            "((" + wrapClass.getName() + ")org.apache.commons.ognl.OgnlOps#convertValue($3," + wrapClass.getName()
                                                                             + ".class, true))." + OgnlRuntime.getNumericValueGetter(wrapClass),
                                                                             parm);
 
             } else if (parm.isArray())
             {
                 conversion = OgnlRuntime.getCompiler().createLocalReference(context,
-                                                                            "(" + ExpressionCompiler.getCastString(parm) + ")ognl.OgnlOps#toArray($3,"
+                                                                            "(" + ExpressionCompiler.getCastString(parm) + ")org.apache.commons.ognl.OgnlOps#toArray($3,"
                                                                             + parm.getComponentType().getName() + ".class)",
                                                                             parm);
 
             } else
             {
                 conversion = OgnlRuntime.getCompiler().createLocalReference(context,
-                                                                            "(" + parm.getName()+ ")ognl.OgnlOps#convertValue($3,"
+                                                                            "(" + parm.getName()+ ")org.apache.commons.ognl.OgnlOps#convertValue($3,"
                                                                             + parm.getName()
                                                                             + ".class)",
                                                                             parm);

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/Ognl.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/Ognl.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/Ognl.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/Ognl.java Wed May 11 16:37:53 2011
@@ -28,9 +28,9 @@
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 // DAMAGE.
 // --------------------------------------------------------------------------
-package ognl;
+package org.apache.commons.ognl;
 
-import ognl.enhance.ExpressionAccessor;
+import org.apache.commons.ognl.enhance.ExpressionAccessor;
 
 import java.io.StringReader;
 import java.util.Map;
@@ -46,7 +46,7 @@ import java.util.Map;
  *
  * <PRE>
  *
- * import ognl.Ognl; import ognl.OgnlException; try { result = Ognl.getValue(expression, root); }
+ * import org.apache.commons.ognl.Ognl; import org.apache.commons.ognl.OgnlException; try { result = Ognl.getValue(expression, root); }
  * catch (OgnlException ex) { // Report error or recover }
  *
  * </PRE>

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/OgnlContext.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/OgnlContext.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/OgnlContext.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/OgnlContext.java Wed May 11 16:37:53 2011
@@ -28,9 +28,9 @@
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 // DAMAGE.
 // --------------------------------------------------------------------------
-package ognl;
+package org.apache.commons.ognl;
 
-import ognl.enhance.LocalReference;
+import org.apache.commons.ognl.enhance.LocalReference;
 
 import java.util.*;
 

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/OgnlException.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/OgnlException.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/OgnlException.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/OgnlException.java Wed May 11 16:37:53 2011
@@ -28,7 +28,7 @@
 //  THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 //  DAMAGE.
 //--------------------------------------------------------------------------
-package ognl;
+package org.apache.commons.ognl;
 
 import java.lang.reflect.Method;
 

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/OgnlInvokePermission.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/OgnlInvokePermission.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/OgnlInvokePermission.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/OgnlInvokePermission.java Wed May 11 16:37:53 2011
@@ -28,7 +28,7 @@
 //  THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 //  DAMAGE.
 //--------------------------------------------------------------------------
-package ognl;
+package org.apache.commons.ognl;
 
 import java.security.*;
 

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/OgnlOps.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/OgnlOps.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/OgnlOps.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/OgnlOps.java Wed May 11 16:37:53 2011
@@ -28,9 +28,9 @@
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 // DAMAGE.
 // --------------------------------------------------------------------------
-package ognl;
+package org.apache.commons.ognl;
 
-import ognl.enhance.UnsupportedCompilationException;
+import org.apache.commons.ognl.enhance.UnsupportedCompilationException;
 
 import java.lang.reflect.Array;
 import java.math.BigDecimal;

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/OgnlParser.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/OgnlParser.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/OgnlParser.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/OgnlParser.java Wed May 11 16:37:53 2011
@@ -1,5 +1,5 @@
 /* Generated By:JJTree&JavaCC: Do not edit this line. OgnlParser.java */
-package ognl;
+package org.apache.commons.ognl;
 
 /**
  * OgnlParser is a JavaCC parser class; it translates OGNL expressions into abstract

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/OgnlParserConstants.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/OgnlParserConstants.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/OgnlParserConstants.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/OgnlParserConstants.java Wed May 11 16:37:53 2011
@@ -1,5 +1,5 @@
 /* Generated By:JJTree&JavaCC: Do not edit this line. OgnlParserConstants.java */
-package ognl;
+package org.apache.commons.ognl;
 
 
 /** 

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/OgnlParserTokenManager.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/OgnlParserTokenManager.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/OgnlParserTokenManager.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/OgnlParserTokenManager.java Wed May 11 16:37:53 2011
@@ -1,5 +1,5 @@
 /* Generated By:JJTree&JavaCC: Do not edit this line. OgnlParserTokenManager.java */
-package ognl;
+package org.apache.commons.ognl;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/OgnlParserTreeConstants.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/OgnlParserTreeConstants.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/OgnlParserTreeConstants.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/OgnlParserTreeConstants.java Wed May 11 16:37:53 2011
@@ -1,5 +1,5 @@
 /* Generated By:JavaCC: Do not edit this line. OgnlParserTreeConstants.java Version 4.1d1 */
-package ognl;
+package org.apache.commons.ognl;
 
 public interface OgnlParserTreeConstants
 {

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/OgnlRuntime.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/OgnlRuntime.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/OgnlRuntime.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/OgnlRuntime.java Wed May 11 16:37:53 2011
@@ -28,19 +28,46 @@
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 // DAMAGE.
 // --------------------------------------------------------------------------
-package ognl;
+package org.apache.commons.ognl;
 
-import ognl.enhance.ExpressionCompiler;
-import ognl.enhance.OgnlExpressionCompiler;
-import ognl.internal.ClassCache;
-import ognl.internal.ClassCacheImpl;
-
-import java.beans.*;
-import java.lang.reflect.*;
+import org.apache.commons.ognl.enhance.ExpressionCompiler;
+import org.apache.commons.ognl.enhance.OgnlExpressionCompiler;
+import org.apache.commons.ognl.internal.ClassCache;
+import org.apache.commons.ognl.internal.ClassCacheImpl;
+
+import java.beans.BeanInfo;
+import java.beans.IndexedPropertyDescriptor;
+import java.beans.IntrospectionException;
+import java.beans.Introspector;
+import java.beans.MethodDescriptor;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.Array;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.GenericArrayType;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Member;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Proxy;
+import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.security.Permission;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.IdentityHashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * Utility class used by internal OGNL API to do various things like:
@@ -2642,7 +2669,7 @@ public class OgnlRuntime {
             || "!(true)".equals(expression)
             || "(false)".equals(expression)
             || "!(false)".equals(expression)
-            || expression.startsWith("ognl.OgnlOps"))
+            || expression.startsWith("org.apache.commons.ognl.OgnlOps"))
             return true;
 
         return false;

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/ParseException.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/ParseException.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/ParseException.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/ParseException.java Wed May 11 16:37:53 2011
@@ -1,6 +1,6 @@
 /* Generated By:JavaCC: Do not edit this line. ParseException.java Version 4.1 */
 /* JavaCCOptions:KEEP_LINE_COL=null */
-package ognl;
+package org.apache.commons.ognl;
 
 /**
  * This exception is thrown when parse errors are encountered.

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/PropertyAccessor.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/PropertyAccessor.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/PropertyAccessor.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/PropertyAccessor.java Wed May 11 16:37:53 2011
@@ -28,7 +28,7 @@
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 // DAMAGE.
 // --------------------------------------------------------------------------
-package ognl;
+package org.apache.commons.ognl;
 
 import java.util.Map;
 

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/SetPropertyAccessor.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/SetPropertyAccessor.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/SetPropertyAccessor.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/SetPropertyAccessor.java Wed May 11 16:37:53 2011
@@ -28,7 +28,7 @@
 //  THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 //  DAMAGE.
 //--------------------------------------------------------------------------
-package ognl;
+package org.apache.commons.ognl;
 
 import java.util.Map;
 import java.util.Set;

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/SimpleNode.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/SimpleNode.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/SimpleNode.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/SimpleNode.java Wed May 11 16:37:53 2011
@@ -28,9 +28,9 @@
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 // DAMAGE.
 // --------------------------------------------------------------------------
-package ognl;
+package org.apache.commons.ognl;
 
-import ognl.enhance.ExpressionAccessor;
+import org.apache.commons.ognl.enhance.ExpressionAccessor;
 
 import java.io.PrintWriter;
 import java.io.Serializable;

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/Token.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/Token.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/Token.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/Token.java Wed May 11 16:37:53 2011
@@ -1,6 +1,6 @@
 /* Generated By:JavaCC: Do not edit this line. Token.java Version 4.1 */
 /* JavaCCOptions:TOKEN_EXTENDS=,KEEP_LINE_COL=null */
-package ognl;
+package org.apache.commons.ognl;
 
 /**
  * Describes the input token stream.

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/TokenMgrError.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/TokenMgrError.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/TokenMgrError.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/TokenMgrError.java Wed May 11 16:37:53 2011
@@ -1,6 +1,6 @@
 /* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 4.1 */
 /* JavaCCOptions: */
-package ognl;
+package org.apache.commons.ognl;
 
 /** Token Manager Error. */
 public class TokenMgrError extends Error

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/TypeConverter.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/TypeConverter.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/TypeConverter.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/TypeConverter.java Wed May 11 16:37:53 2011
@@ -28,7 +28,7 @@
 //  THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 //  DAMAGE.
 //--------------------------------------------------------------------------
-package ognl;
+package org.apache.commons.ognl;
 
 import java.lang.reflect.Member;
 import java.util.Map;

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/enhance/ContextClassLoader.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/enhance/ContextClassLoader.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/enhance/ContextClassLoader.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/enhance/ContextClassLoader.java Wed May 11 16:37:53 2011
@@ -28,9 +28,9 @@
 //  THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 //  DAMAGE.
 //--------------------------------------------------------------------------
-package ognl.enhance;
+package org.apache.commons.ognl.enhance;
 
-import ognl.OgnlContext;
+import org.apache.commons.ognl.OgnlContext;
 
 public class ContextClassLoader extends ClassLoader
 {

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/enhance/EnhancedClassLoader.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/enhance/EnhancedClassLoader.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/enhance/EnhancedClassLoader.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/enhance/EnhancedClassLoader.java Wed May 11 16:37:53 2011
@@ -28,7 +28,7 @@
 //  THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 //  DAMAGE.
 //--------------------------------------------------------------------------
-package ognl.enhance;
+package org.apache.commons.ognl.enhance;
 
 public class EnhancedClassLoader extends ClassLoader
 {

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/enhance/ExpressionAccessor.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/enhance/ExpressionAccessor.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/enhance/ExpressionAccessor.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/enhance/ExpressionAccessor.java Wed May 11 16:37:53 2011
@@ -1,10 +1,10 @@
 /**
  * 
  */
-package ognl.enhance;
+package org.apache.commons.ognl.enhance;
 
-import ognl.Node;
-import ognl.OgnlContext;
+import org.apache.commons.ognl.Node;
+import org.apache.commons.ognl.OgnlContext;
 
 
 /**

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java Wed May 11 16:37:53 2011
@@ -1,11 +1,40 @@
-package ognl.enhance;
+package org.apache.commons.ognl.enhance;
 
-import javassist.*;
-import ognl.*;
+import javassist.CannotCompileException;
+import javassist.ClassPool;
+import javassist.CtClass;
+import javassist.CtField;
+import javassist.CtMethod;
+import javassist.CtNewConstructor;
+import javassist.CtNewMethod;
+import javassist.LoaderClassPath;
+import javassist.NotFoundException;
+import org.apache.commons.ognl.ASTAnd;
+import org.apache.commons.ognl.ASTChain;
+import org.apache.commons.ognl.ASTConst;
+import org.apache.commons.ognl.ASTCtor;
+import org.apache.commons.ognl.ASTList;
+import org.apache.commons.ognl.ASTMethod;
+import org.apache.commons.ognl.ASTOr;
+import org.apache.commons.ognl.ASTProperty;
+import org.apache.commons.ognl.ASTRootVarRef;
+import org.apache.commons.ognl.ASTStaticField;
+import org.apache.commons.ognl.ASTStaticMethod;
+import org.apache.commons.ognl.ASTThisVarRef;
+import org.apache.commons.ognl.ASTVarRef;
+import org.apache.commons.ognl.ExpressionNode;
+import org.apache.commons.ognl.Node;
+import org.apache.commons.ognl.OgnlContext;
+import org.apache.commons.ognl.OgnlRuntime;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
-import java.util.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 
 /**
@@ -40,8 +69,8 @@ public class ExpressionCompiler implemen
     }
 
     /**
-     * Used by {@link #castExpression(ognl.OgnlContext, ognl.Node, String)} to store the cast java
-     * source string in to the current {@link OgnlContext}. This will either add to the existing
+     * Used by {@link #castExpression(org.apache.commons.ognl.OgnlContext, org.apache.commons.ognl.Node, String)} to store the cast java
+     * source string in to the current {@link org.apache.commons.ognl.OgnlContext}. This will either add to the existing
      * string present if it already exists or create a new instance and store it using the static key
      * of {@link #PRE_CAST}.
      *
@@ -50,7 +79,7 @@ public class ExpressionCompiler implemen
      * @param cast
      *          The java source string to store in to the context.
      */
-    public static void addCastString(OgnlContext context, String cast)
+    public static void addCastString(org.apache.commons.ognl.OgnlContext context, String cast)
     {
         String value = (String) context.get(PRE_CAST);
 
@@ -137,7 +166,7 @@ public class ExpressionCompiler implemen
     }
 
     /**
-     * Used by {@link #getRootExpression(ognl.Node, Object, ognl.OgnlContext)} to determine if the expression
+     * Used by {@link #getRootExpression(org.apache.commons.ognl.Node, Object, org.apache.commons.ognl.OgnlContext)} to determine if the expression
      * needs to be cast at all.
      *
      * @param expression
@@ -727,7 +756,7 @@ public class ExpressionCompiler implemen
      * @param context
      *          The current execution context.
      * @param loader
-     *          The {@link ClassLoader} instance to use - as returned by {@link #getClassLoader(ognl.OgnlContext)}.
+     *          The {@link ClassLoader} instance to use - as returned by {@link #getClassLoader(org.apache.commons.ognl.OgnlContext)}.
      * @return The existing or new {@link ClassPool} instance.
      */
     protected ClassPool getClassPool(OgnlContext context, EnhancedClassLoader loader)

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/enhance/LocalReference.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/enhance/LocalReference.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/enhance/LocalReference.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/enhance/LocalReference.java Wed May 11 16:37:53 2011
@@ -1,4 +1,4 @@
-package ognl.enhance;
+package org.apache.commons.ognl.enhance;
 
 /**
  * Container class for {@link OgnlExpressionCompiler} generated local method

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/enhance/LocalReferenceImpl.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/enhance/LocalReferenceImpl.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/enhance/LocalReferenceImpl.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/enhance/LocalReferenceImpl.java Wed May 11 16:37:53 2011
@@ -1,4 +1,4 @@
-package ognl.enhance;
+package org.apache.commons.ognl.enhance;
 
 /**
  * Implementation of {@link LocalReference}. 

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/enhance/OgnlExpressionCompiler.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/enhance/OgnlExpressionCompiler.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/enhance/OgnlExpressionCompiler.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/enhance/OgnlExpressionCompiler.java Wed May 11 16:37:53 2011
@@ -1,10 +1,10 @@
 /**
  *
  */
-package ognl.enhance;
+package org.apache.commons.ognl.enhance;
 
-import ognl.Node;
-import ognl.OgnlContext;
+import org.apache.commons.ognl.Node;
+import org.apache.commons.ognl.OgnlContext;
 
 import java.lang.reflect.Method;
 
@@ -18,7 +18,7 @@ public interface OgnlExpressionCompiler 
 
     /**
      * The core method executed to compile a specific expression.  It is expected that this expression
-     * always return a {@link Node} with a non null {@link ognl.Node#getAccessor()} instance - unless an exception
+     * always return a {@link Node} with a non null {@link org.apache.commons.ognl.Node#getAccessor()} instance - unless an exception
      * is thrown by the method or the statement wasn't compilable in this instance because of missing/null objects
      * in the expression.  These instances may in some cases continue to call this compilation method until the expression
      * is resolvable.
@@ -85,11 +85,11 @@ public interface OgnlExpressionCompiler 
     Class getRootExpressionClass(Node rootNode, OgnlContext context);
 
     /**
-     * Used primarily by AST types like {@link ognl.ASTChain} where <code>foo.bar.id</code> type references
+     * Used primarily by AST types like {@link org.apache.commons.ognl.ASTChain} where <code>foo.bar.id</code> type references
      * may need to be cast multiple times in order to properly resolve the members in a compiled statement.
      *
      * <p>
-     * This method should be using the various {@link ognl.OgnlContext#getCurrentType()} / {@link ognl.OgnlContext#getCurrentAccessor()} methods
+     * This method should be using the various {@link org.apache.commons.ognl.OgnlContext#getCurrentType()} / {@link org.apache.commons.ognl.OgnlContext#getCurrentAccessor()} methods
      * to inspect the type stack and properly cast to the right classes - but only when necessary.
      * </p>
      *

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/enhance/OrderedReturn.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/enhance/OrderedReturn.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/enhance/OrderedReturn.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/enhance/OrderedReturn.java Wed May 11 16:37:53 2011
@@ -1,6 +1,6 @@
-package ognl.enhance;
+package org.apache.commons.ognl.enhance;
 
-import ognl.Node;
+import org.apache.commons.ognl.Node;
 
 
 /**

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/enhance/UnsupportedCompilationException.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/enhance/UnsupportedCompilationException.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/enhance/UnsupportedCompilationException.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/enhance/UnsupportedCompilationException.java Wed May 11 16:37:53 2011
@@ -1,4 +1,4 @@
-package ognl.enhance;
+package org.apache.commons.ognl.enhance;
 
 
 

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/internal/ClassCache.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/internal/ClassCache.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/internal/ClassCache.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/internal/ClassCache.java Wed May 11 16:37:53 2011
@@ -1,6 +1,6 @@
-package ognl.internal;
+package org.apache.commons.ognl.internal;
 
-import ognl.ClassCacheInspector;
+import org.apache.commons.ognl.ClassCacheInspector;
 
 /**
  * This is a highly specialized map for storing values keyed by Class objects.

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/internal/ClassCacheImpl.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/internal/ClassCacheImpl.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/internal/ClassCacheImpl.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/internal/ClassCacheImpl.java Wed May 11 16:37:53 2011
@@ -1,6 +1,6 @@
-package ognl.internal;
+package org.apache.commons.ognl.internal;
 
-import ognl.ClassCacheInspector;
+import org.apache.commons.ognl.ClassCacheInspector;
 
 import java.util.Arrays;
 

Modified: incubator/ognl/trunk/src/java/org/apache/commons/ognl/internal/Entry.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/java/org/apache/commons/ognl/internal/Entry.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/java/org/apache/commons/ognl/internal/Entry.java (original)
+++ incubator/ognl/trunk/src/java/org/apache/commons/ognl/internal/Entry.java Wed May 11 16:37:53 2011
@@ -1,4 +1,4 @@
-package ognl.internal;
+package org.apache.commons.ognl.internal;
 
 /**
  * Used by {@link ClassCacheImpl} to store entries in the cache.

Modified: incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/InExpressionTest.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/InExpressionTest.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/InExpressionTest.java (original)
+++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/InExpressionTest.java Wed May 11 16:37:53 2011
@@ -1,4 +1,4 @@
-package ognl;
+package org.apache.commons.ognl;
 
 import junit.framework.TestCase;
 

Modified: incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/TestOgnlException.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/TestOgnlException.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/TestOgnlException.java (original)
+++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/TestOgnlException.java Wed May 11 16:37:53 2011
@@ -1,4 +1,4 @@
-package ognl;
+package org.apache.commons.ognl;
 
 import junit.framework.TestCase;
 

Modified: incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/TestOgnlRuntime.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/TestOgnlRuntime.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/TestOgnlRuntime.java (original)
+++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/TestOgnlRuntime.java Wed May 11 16:37:53 2011
@@ -1,7 +1,22 @@
-package ognl;
+package org.apache.commons.ognl;
 
 import junit.framework.TestCase;
-import org.ognl.test.objects.*;
+import org.apache.commons.ognl.test.objects.BaseGeneric;
+import org.apache.commons.ognl.test.objects.Bean2;
+import org.apache.commons.ognl.test.objects.FormImpl;
+import org.apache.commons.ognl.test.objects.GameGeneric;
+import org.apache.commons.ognl.test.objects.GameGenericObject;
+import org.apache.commons.ognl.test.objects.GenericCracker;
+import org.apache.commons.ognl.test.objects.GenericService;
+import org.apache.commons.ognl.test.objects.GenericServiceImpl;
+import org.apache.commons.ognl.test.objects.GetterMethods;
+import org.apache.commons.ognl.test.objects.IComponent;
+import org.apache.commons.ognl.test.objects.IForm;
+import org.apache.commons.ognl.test.objects.ListSource;
+import org.apache.commons.ognl.test.objects.ListSourceImpl;
+import org.apache.commons.ognl.test.objects.Root;
+import org.apache.commons.ognl.test.objects.SetterReturns;
+import org.apache.commons.ognl.test.objects.SubclassSyntheticObject;
 
 import java.beans.PropertyDescriptor;
 import java.io.Serializable;
@@ -10,7 +25,7 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * Tests various methods / functionality of {@link ognl.OgnlRuntime}.
+ * Tests various methods / functionality of {@link org.apache.commons.ognl.OgnlRuntime}.
  */
 public class TestOgnlRuntime extends TestCase {
 

Modified: incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ASTChainTest.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ASTChainTest.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ASTChainTest.java (original)
+++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ASTChainTest.java Wed May 11 16:37:53 2011
@@ -1,9 +1,9 @@
-package org.ognl.test;
+package org.apache.commons.ognl.test;
 
 import junit.framework.TestCase;
-import ognl.Ognl;
-import ognl.OgnlContext;
-import org.ognl.test.objects.IndexedSetObject;
+import org.apache.commons.ognl.Ognl;
+import org.apache.commons.ognl.OgnlContext;
+import org.apache.commons.ognl.test.objects.IndexedSetObject;
 
 /**
  * Tests for {@link ognl.ASTChain}.

Modified: incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ASTMethodTest.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ASTMethodTest.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ASTMethodTest.java (original)
+++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ASTMethodTest.java Wed May 11 16:37:53 2011
@@ -1,11 +1,11 @@
-package org.ognl.test;
+package org.apache.commons.ognl.test;
 
 import junit.framework.TestCase;
-import ognl.*;
-import ognl.enhance.ExpressionCompiler;
-import org.ognl.test.objects.Bean2;
-import org.ognl.test.objects.Bean3;
-import org.ognl.test.objects.Root;
+import org.apache.commons.ognl.*;
+import org.apache.commons.ognl.enhance.ExpressionCompiler;
+import org.apache.commons.ognl.test.objects.Bean2;
+import org.apache.commons.ognl.test.objects.Bean3;
+import org.apache.commons.ognl.test.objects.Root;
 
 import java.util.Map;
 

Modified: incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ASTPropertyTest.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ASTPropertyTest.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ASTPropertyTest.java (original)
+++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ASTPropertyTest.java Wed May 11 16:37:53 2011
@@ -1,13 +1,24 @@
-package org.ognl.test;
+package org.apache.commons.ognl.test;
 
 import junit.framework.TestCase;
-import ognl.*;
-import static org.ognl.test.OgnlTestCase.isEqual;
-import org.ognl.test.objects.*;
+import org.apache.commons.ognl.ASTChain;
+import org.apache.commons.ognl.ASTConst;
+import org.apache.commons.ognl.ASTProperty;
+import org.apache.commons.ognl.Ognl;
+import org.apache.commons.ognl.OgnlContext;
+import org.apache.commons.ognl.OgnlRuntime;
+import org.apache.commons.ognl.SimpleNode;
+import org.apache.commons.ognl.test.objects.BaseGeneric;
+import org.apache.commons.ognl.test.objects.GameGeneric;
+import org.apache.commons.ognl.test.objects.GameGenericObject;
+import org.apache.commons.ognl.test.objects.GenericRoot;
+import org.apache.commons.ognl.test.objects.Root;
 
 import java.util.List;
 import java.util.Map;
 
+import static org.apache.commons.ognl.test.OgnlTestCase.isEqual;
+
 /**
  * Tests functionality of {@link ognl.ASTProperty}.
  */
@@ -197,7 +208,7 @@ public class ASTPropertyTest extends Tes
 
         // test with only getIndex
 
-        assertEquals(".get(ognl.OgnlOps#getIntValue(((org.ognl.test.objects.Root)$2)..getGenericIndex().toString()))", p.toGetSourceString(context, root.getList()));
+        assertEquals(".get(org.apache.commons.ognl.OgnlOps#getIntValue(((org.ognl.test.objects.Root)$2)..getGenericIndex().toString()))", p.toGetSourceString(context, root.getList()));
         assertEquals(root.getArray(), context.getCurrentObject());
         assertEquals(Object.class, context.getCurrentType());
     }
@@ -208,17 +219,17 @@ public class ASTPropertyTest extends Tes
         OgnlContext context = (OgnlContext)Ognl.createDefaultContext(null);
         
         SimpleNode node = (SimpleNode) Ognl.compileExpression(context, root,
-                "{ new org.ognl.test.objects.MenuItem('Home', 'Main', "
-                    + "{ new org.ognl.test.objects.MenuItem('Help', 'Help'), "
-                    + "new org.ognl.test.objects.MenuItem('Contact', 'Contact') }), " // end first item
-                    + "new org.ognl.test.objects.MenuItem('UserList', getMessages().getMessage('menu.members')), " +
-                    "new org.ognl.test.objects.MenuItem('account/BetSlipList', getMessages().getMessage('menu.account'), " +
-                    "{ new org.ognl.test.objects.MenuItem('account/BetSlipList', 'My Bets'), " +
-                    "new org.ognl.test.objects.MenuItem('account/TransactionList', 'My Transactions') }), " +
-                    "new org.ognl.test.objects.MenuItem('About', 'About'), " +
-                    "new org.ognl.test.objects.MenuItem('admin/Admin', getMessages().getMessage('menu.admin'), " +
-                    "{ new org.ognl.test.objects.MenuItem('admin/AddEvent', 'Add event'), " +
-                    "new org.ognl.test.objects.MenuItem('admin/AddResult', 'Add result') })}");
+                "{ new org.apache.commons.ognl.test.objects.MenuItem('Home', 'Main', "
+                    + "{ new org.apache.commons.ognl.test.objects.MenuItem('Help', 'Help'), "
+                    + "new org.apache.commons.ognl.test.objects.MenuItem('Contact', 'Contact') }), " // end first item
+                    + "new org.apache.commons.ognl.test.objects.MenuItem('UserList', getMessages().getMessage('menu.members')), " +
+                    "new org.apache.commons.ognl.test.objects.MenuItem('account/BetSlipList', getMessages().getMessage('menu.account'), " +
+                    "{ new org.apache.commons.ognl.test.objects.MenuItem('account/BetSlipList', 'My Bets'), " +
+                    "new org.apache.commons.ognl.test.objects.MenuItem('account/TransactionList', 'My Transactions') }), " +
+                    "new org.apache.commons.ognl.test.objects.MenuItem('About', 'About'), " +
+                    "new org.apache.commons.ognl.test.objects.MenuItem('admin/Admin', getMessages().getMessage('menu.admin'), " +
+                    "{ new org.apache.commons.ognl.test.objects.MenuItem('admin/AddEvent', 'Add event'), " +
+                    "new org.apache.commons.ognl.test.objects.MenuItem('admin/AddResult', 'Add result') })}");
         
         assertTrue(List.class.isAssignableFrom(node.getAccessor().get(context, root).getClass()));
     }

Modified: incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ArithmeticAndLogicalOperatorsTest.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ArithmeticAndLogicalOperatorsTest.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ArithmeticAndLogicalOperatorsTest.java (original)
+++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ArithmeticAndLogicalOperatorsTest.java Wed May 11 16:37:53 2011
@@ -28,7 +28,7 @@
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 // DAMAGE.
 // --------------------------------------------------------------------------
-package org.ognl.test;
+package org.apache.commons.ognl.test;
 
 import junit.framework.TestSuite;
 

Modified: incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ArrayCreationTest.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ArrayCreationTest.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ArrayCreationTest.java (original)
+++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ArrayCreationTest.java Wed May 11 16:37:53 2011
@@ -28,13 +28,13 @@
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 // DAMAGE.
 // --------------------------------------------------------------------------
-package org.ognl.test;
+package org.apache.commons.ognl.test;
 
 import junit.framework.TestSuite;
-import ognl.ExpressionSyntaxException;
-import org.ognl.test.objects.Entry;
-import org.ognl.test.objects.Root;
-import org.ognl.test.objects.Simple;
+import org.apache.commons.ognl.ExpressionSyntaxException;
+import org.apache.commons.ognl.test.objects.Entry;
+import org.apache.commons.ognl.test.objects.Root;
+import org.apache.commons.ognl.test.objects.Simple;
 
 public class ArrayCreationTest extends OgnlTestCase
 {
@@ -52,13 +52,13 @@ public class ArrayCreationTest extends O
             { ROOT, "new Object[4]", new Object[4] },
             { ROOT, "new Object[] { #root, #this }", new Object[] { ROOT, ROOT } },
             { ROOT,
-              "new org.ognl.test.objects.Simple[] { new org.ognl.test.objects.Simple(), new org.ognl.test.objects.Simple(\"foo\", 1.0f, 2) }",
+              "new org.apache.commons.ognl.test.objects.Simple[] { new org.apache.commons.ognl.test.objects.Simple(), new org.apache.commons.ognl.test.objects.Simple(\"foo\", 1.0f, 2) }",
               new Simple[] { new Simple(), new Simple("foo", 1.0f, 2) } },
-            { ROOT, "new org.ognl.test.objects.Simple[5]", new Simple[5] },
-            { ROOT, "new org.ognl.test.objects.Simple(new Object[5])", new Simple(new Object[5]) },
-            { ROOT, "new org.ognl.test.objects.Simple(new String[5])", new Simple(new String[5]) },
-            { ROOT, "objectIndex ? new org.ognl.test.objects.Entry[] { new org.ognl.test.objects.Entry(), new org.ognl.test.objects.Entry()} "
-                    + ": new org.ognl.test.objects.Entry[] { new org.ognl.test.objects.Entry(), new org.ognl.test.objects.Entry()} ",
+            { ROOT, "new org.apache.commons.ognl.test.objects.Simple[5]", new Simple[5] },
+            { ROOT, "new org.apache.commons.ognl.test.objects.Simple(new Object[5])", new Simple(new Object[5]) },
+            { ROOT, "new org.apache.commons.ognl.test.objects.Simple(new String[5])", new Simple(new String[5]) },
+            { ROOT, "objectIndex ? new org.apache.commons.ognl.test.objects.Entry[] { new org.apache.commons.ognl.test.objects.Entry(), new org.apache.commons.ognl.test.objects.Entry()} "
+                    + ": new org.apache.commons.ognl.test.objects.Entry[] { new org.apache.commons.ognl.test.objects.Entry(), new org.apache.commons.ognl.test.objects.Entry()} ",
               new Entry[] { new Entry(), new Entry()} }
     };
 

Modified: incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ArrayElementsTest.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ArrayElementsTest.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ArrayElementsTest.java (original)
+++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ArrayElementsTest.java Wed May 11 16:37:53 2011
@@ -28,11 +28,11 @@
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 // DAMAGE.
 // --------------------------------------------------------------------------
-package org.ognl.test;
+package org.apache.commons.ognl.test;
 
 import junit.framework.TestSuite;
-import ognl.TypeConverter;
-import org.ognl.test.objects.Root;
+import org.apache.commons.ognl.TypeConverter;
+import org.apache.commons.ognl.test.objects.Root;
 
 import java.util.Arrays;
 

Modified: incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ClassMethodTest.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ClassMethodTest.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ClassMethodTest.java (original)
+++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ClassMethodTest.java Wed May 11 16:37:53 2011
@@ -28,10 +28,10 @@
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 // DAMAGE.
 // --------------------------------------------------------------------------
-package org.ognl.test;
+package org.apache.commons.ognl.test;
 
 import junit.framework.TestSuite;
-import org.ognl.test.objects.CorrectedObject;
+import org.apache.commons.ognl.test.objects.CorrectedObject;
 
 public class ClassMethodTest extends OgnlTestCase
 {

Modified: incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/CollectionDirectPropertyTest.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/CollectionDirectPropertyTest.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/CollectionDirectPropertyTest.java (original)
+++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/CollectionDirectPropertyTest.java Wed May 11 16:37:53 2011
@@ -28,10 +28,10 @@
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 // DAMAGE.
 // --------------------------------------------------------------------------
-package org.ognl.test;
+package org.apache.commons.ognl.test;
 
 import junit.framework.TestSuite;
-import org.ognl.test.objects.Root;
+import org.apache.commons.ognl.test.objects.Root;
 
 import java.util.Arrays;
 

Modified: incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/CompilingPropertyAccessor.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/CompilingPropertyAccessor.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/CompilingPropertyAccessor.java (original)
+++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/CompilingPropertyAccessor.java Wed May 11 16:37:53 2011
@@ -28,19 +28,19 @@
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 // DAMAGE.
 // --------------------------------------------------------------------------
-package org.ognl.test;
+package org.apache.commons.ognl.test;
 
 import javassist.ClassPool;
 import javassist.CtClass;
 import javassist.CtMethod;
 import javassist.LoaderClassPath;
-import ognl.ObjectPropertyAccessor;
-import ognl.OgnlContext;
-import ognl.OgnlException;
-import ognl.OgnlRuntime;
-import ognl.enhance.ContextClassLoader;
-import ognl.enhance.EnhancedClassLoader;
-import org.ognl.test.util.NameFactory;
+import org.apache.commons.ognl.ObjectPropertyAccessor;
+import org.apache.commons.ognl.OgnlContext;
+import org.apache.commons.ognl.OgnlException;
+import org.apache.commons.ognl.OgnlRuntime;
+import org.apache.commons.ognl.enhance.ContextClassLoader;
+import org.apache.commons.ognl.enhance.EnhancedClassLoader;
+import org.apache.commons.ognl.test.util.NameFactory;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;

Modified: incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ConstantTest.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ConstantTest.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ConstantTest.java (original)
+++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ConstantTest.java Wed May 11 16:37:53 2011
@@ -28,10 +28,10 @@
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 // DAMAGE.
 // --------------------------------------------------------------------------
-package org.ognl.test;
+package org.apache.commons.ognl.test;
 
 import junit.framework.TestSuite;
-import ognl.ExpressionSyntaxException;
+import org.apache.commons.ognl.ExpressionSyntaxException;
 
 import java.util.Arrays;
 

Modified: incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ConstantTreeTest.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ConstantTreeTest.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ConstantTreeTest.java (original)
+++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ConstantTreeTest.java Wed May 11 16:37:53 2011
@@ -28,10 +28,10 @@
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 // DAMAGE.
 // --------------------------------------------------------------------------
-package org.ognl.test;
+package org.apache.commons.ognl.test;
 
 import junit.framework.TestSuite;
-import ognl.Ognl;
+import org.apache.commons.ognl.Ognl;
 
 public class ConstantTreeTest extends OgnlTestCase
 {
@@ -42,8 +42,8 @@ public class ConstantTreeTest extends Og
         { "true", Boolean.TRUE }, 
         { "55", Boolean.TRUE }, 
         { "@java.awt.Color@black", Boolean.TRUE }, 
-        { "@org.ognl.test.ConstantTreeTest@nonFinalStaticVariable", Boolean.FALSE }, 
-        { "@org.ognl.test.ConstantTreeTest@nonFinalStaticVariable + 10", Boolean.FALSE },
+        { "@org.apache.commons.ognl.test.ConstantTreeTest@nonFinalStaticVariable", Boolean.FALSE },
+        { "@org.apache.commons.ognl.test.ConstantTreeTest@nonFinalStaticVariable + 10", Boolean.FALSE },
         { "55 + 24 + @java.awt.Event@ALT_MASK", Boolean.TRUE },
         { "name", Boolean.FALSE },
         { "name[i]", Boolean.FALSE },

Modified: incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ContextVariableTest.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ContextVariableTest.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ContextVariableTest.java (original)
+++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ContextVariableTest.java Wed May 11 16:37:53 2011
@@ -28,10 +28,10 @@
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 // DAMAGE.
 // --------------------------------------------------------------------------
-package org.ognl.test;
+package org.apache.commons.ognl.test;
 
 import junit.framework.TestSuite;
-import org.ognl.test.objects.Simple;
+import org.apache.commons.ognl.test.objects.Simple;
 
 public class ContextVariableTest extends OgnlTestCase {
 

Modified: incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/CorrectedObjectNullHandler.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/CorrectedObjectNullHandler.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/CorrectedObjectNullHandler.java (original)
+++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/CorrectedObjectNullHandler.java Wed May 11 16:37:53 2011
@@ -28,9 +28,9 @@
 //  THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 //  DAMAGE.
 //--------------------------------------------------------------------------
-package org.ognl.test;
+package org.apache.commons.ognl.test;
 
-import ognl.NullHandler;
+import org.apache.commons.ognl.NullHandler;
 
 import java.util.Map;
 

Modified: incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/GenericsTest.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/GenericsTest.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/GenericsTest.java (original)
+++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/GenericsTest.java Wed May 11 16:37:53 2011
@@ -1,10 +1,10 @@
-package org.ognl.test;
+package org.apache.commons.ognl.test;
 
 import junit.framework.TestSuite;
-import org.ognl.test.objects.BaseGeneric;
-import org.ognl.test.objects.GameGeneric;
-import org.ognl.test.objects.GameGenericObject;
-import org.ognl.test.objects.GenericRoot;
+import org.apache.commons.ognl.test.objects.BaseGeneric;
+import org.apache.commons.ognl.test.objects.GameGeneric;
+import org.apache.commons.ognl.test.objects.GameGenericObject;
+import org.apache.commons.ognl.test.objects.GenericRoot;
 
 /**
  * Tests java >= 1.5 generics support in ognl.

Modified: incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/IndexAccessTest.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/IndexAccessTest.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/IndexAccessTest.java (original)
+++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/IndexAccessTest.java Wed May 11 16:37:53 2011
@@ -28,13 +28,13 @@
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 // DAMAGE.
 // --------------------------------------------------------------------------
-package org.ognl.test;
+package org.apache.commons.ognl.test;
 
 import junit.framework.TestSuite;
-import ognl.MethodFailedException;
-import ognl.NoSuchPropertyException;
-import org.ognl.test.objects.IndexedSetObject;
-import org.ognl.test.objects.Root;
+import org.apache.commons.ognl.MethodFailedException;
+import org.apache.commons.ognl.NoSuchPropertyException;
+import org.apache.commons.ognl.test.objects.IndexedSetObject;
+import org.apache.commons.ognl.test.objects.Root;
 
 public class IndexAccessTest extends OgnlTestCase {
 

Modified: incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/IndexedPropertyTest.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/IndexedPropertyTest.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/IndexedPropertyTest.java (original)
+++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/IndexedPropertyTest.java Wed May 11 16:37:53 2011
@@ -28,11 +28,11 @@
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 // DAMAGE.
 // --------------------------------------------------------------------------
-package org.ognl.test;
+package org.apache.commons.ognl.test;
 
 import junit.framework.TestSuite;
-import org.ognl.test.objects.Indexed;
-import org.ognl.test.objects.Root;
+import org.apache.commons.ognl.test.objects.Indexed;
+import org.apache.commons.ognl.test.objects.Root;
 
 public class IndexedPropertyTest extends OgnlTestCase {
 

Modified: incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/InheritedMethodsTest.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/InheritedMethodsTest.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/InheritedMethodsTest.java (original)
+++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/InheritedMethodsTest.java Wed May 11 16:37:53 2011
@@ -1,16 +1,16 @@
 /**
  * 
  */
-package org.ognl.test;
+package org.apache.commons.ognl.test;
 
 import junit.framework.TestCase;
-import ognl.Node;
-import ognl.Ognl;
-import ognl.OgnlContext;
-import org.ognl.test.objects.BaseBean;
-import org.ognl.test.objects.FirstBean;
-import org.ognl.test.objects.Root;
-import org.ognl.test.objects.SecondBean;
+import org.apache.commons.ognl.Node;
+import org.apache.commons.ognl.Ognl;
+import org.apache.commons.ognl.OgnlContext;
+import org.apache.commons.ognl.test.objects.BaseBean;
+import org.apache.commons.ognl.test.objects.FirstBean;
+import org.apache.commons.ognl.test.objects.Root;
+import org.apache.commons.ognl.test.objects.SecondBean;
 
 
 /**

Modified: incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/InterfaceInheritanceTest.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/InterfaceInheritanceTest.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/InterfaceInheritanceTest.java (original)
+++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/InterfaceInheritanceTest.java Wed May 11 16:37:53 2011
@@ -28,11 +28,16 @@
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 // DAMAGE.
 // --------------------------------------------------------------------------
-package org.ognl.test;
+package org.apache.commons.ognl.test;
 
 import junit.framework.TestSuite;
-import ognl.OgnlRuntime;
-import org.ognl.test.objects.*;
+import org.apache.commons.ognl.OgnlRuntime;
+import org.apache.commons.ognl.test.objects.Bean1;
+import org.apache.commons.ognl.test.objects.BeanProvider;
+import org.apache.commons.ognl.test.objects.BeanProviderAccessor;
+import org.apache.commons.ognl.test.objects.EvenOdd;
+import org.apache.commons.ognl.test.objects.ListSourceImpl;
+import org.apache.commons.ognl.test.objects.Root;
 
 import java.util.List;
 
@@ -140,6 +145,6 @@ public class InterfaceInheritanceTest ex
     {
         super.setUp();
 
-        OgnlRuntime.setPropertyAccessor(BeanProvider.class, new BeanProviderAccessor());
+        OgnlRuntime.setPropertyAccessor( BeanProvider.class, new BeanProviderAccessor() );
     }
 }

Modified: incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/LambdaExpressionTest.java
URL: http://svn.apache.org/viewvc/incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/LambdaExpressionTest.java?rev=1101960&r1=1101878&r2=1101960&view=diff
==============================================================================
--- incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/LambdaExpressionTest.java (original)
+++ incubator/ognl/trunk/src/test/java/org/apache/commons/ognl/test/LambdaExpressionTest.java Wed May 11 16:37:53 2011
@@ -28,7 +28,7 @@
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 // DAMAGE.
 // --------------------------------------------------------------------------
-package org.ognl.test;
+package org.apache.commons.ognl.test;
 
 import junit.framework.TestSuite;
 



Mime
View raw message