From 32dd054b6d32bafee98c01ba83617de5c717aacd Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Fri, 15 Jul 2022 09:09:06 +0200 Subject: [PATCH] Ports IllegalArgumentException : Can't decide wich method to use fix This refers to #159 --- docs/DeveloperGuide.md | 4 +- pom.xml | 4 +- src/main/java/{org => }/ognl/ASTAdd.java | 5 ++- src/main/java/{org => }/ognl/ASTAnd.java | 11 ++--- src/main/java/{org => }/ognl/ASTAssign.java | 11 ++--- src/main/java/{org => }/ognl/ASTBitAnd.java | 4 +- .../java/{org => }/ognl/ASTBitNegate.java | 4 +- src/main/java/{org => }/ognl/ASTBitOr.java | 4 +- src/main/java/{org => }/ognl/ASTChain.java | 9 ++-- src/main/java/{org => }/ognl/ASTConst.java | 5 ++- src/main/java/{org => }/ognl/ASTCtor.java | 5 ++- src/main/java/{org => }/ognl/ASTDivide.java | 4 +- src/main/java/{org => }/ognl/ASTEq.java | 6 ++- src/main/java/{org => }/ognl/ASTEval.java | 5 ++- src/main/java/{org => }/ognl/ASTGreater.java | 6 ++- .../java/{org => }/ognl/ASTGreaterEq.java | 6 ++- src/main/java/{org => }/ognl/ASTIn.java | 7 +-- .../java/{org => }/ognl/ASTInstanceof.java | 4 +- src/main/java/{org => }/ognl/ASTKeyValue.java | 4 +- src/main/java/{org => }/ognl/ASTLess.java | 6 ++- src/main/java/{org => }/ognl/ASTLessEq.java | 6 ++- src/main/java/{org => }/ognl/ASTList.java | 11 ++--- src/main/java/{org => }/ognl/ASTMap.java | 5 ++- src/main/java/{org => }/ognl/ASTMethod.java | 21 ++++----- src/main/java/{org => }/ognl/ASTMultiply.java | 4 +- src/main/java/{org => }/ognl/ASTNegate.java | 4 +- src/main/java/{org => }/ognl/ASTNot.java | 6 ++- src/main/java/{org => }/ognl/ASTNotEq.java | 6 ++- src/main/java/{org => }/ognl/ASTNotIn.java | 7 +-- src/main/java/{org => }/ognl/ASTOr.java | 11 ++--- src/main/java/{org => }/ognl/ASTProject.java | 5 ++- src/main/java/{org => }/ognl/ASTProperty.java | 6 +-- .../java/{org => }/ognl/ASTRemainder.java | 4 +- .../java/{org => }/ognl/ASTRootVarRef.java | 5 ++- src/main/java/{org => }/ognl/ASTSelect.java | 5 ++- .../java/{org => }/ognl/ASTSelectFirst.java | 5 ++- .../java/{org => }/ognl/ASTSelectLast.java | 5 ++- src/main/java/{org => }/ognl/ASTSequence.java | 7 +-- .../java/{org => }/ognl/ASTShiftLeft.java | 4 +- .../java/{org => }/ognl/ASTShiftRight.java | 4 +- .../java/{org => }/ognl/ASTStaticField.java | 4 +- .../java/{org => }/ognl/ASTStaticMethod.java | 13 +++--- src/main/java/{org => }/ognl/ASTSubtract.java | 4 +- src/main/java/{org => }/ognl/ASTTest.java | 7 +-- .../java/{org => }/ognl/ASTThisVarRef.java | 5 ++- .../{org => }/ognl/ASTUnsignedShiftRight.java | 4 +- src/main/java/{org => }/ognl/ASTVarRef.java | 7 +-- src/main/java/{org => }/ognl/ASTXor.java | 4 +- .../{org => }/ognl/AbstractMemberAccess.java | 3 +- .../ognl/AccessibleObjectHandler.java | 2 +- .../ognl/AccessibleObjectHandlerJDK9Plus.java | 2 +- .../ognl/AccessibleObjectHandlerPreJDK9.java | 2 +- .../{org => }/ognl/ArrayElementsAccessor.java | 2 +- .../{org => }/ognl/ArrayPropertyAccessor.java | 10 ++--- .../{org => }/ognl/BooleanExpression.java | 5 ++- .../{org => }/ognl/ClassCacheInspector.java | 2 +- .../java/{org => }/ognl/ClassResolver.java | 2 +- .../ognl/CollectionElementsAccessor.java | 2 +- .../{org => }/ognl/ComparisonExpression.java | 5 ++- .../{org => }/ognl/DefaultClassResolver.java | 2 +- .../{org => }/ognl/DefaultTypeConverter.java | 3 +- .../java/{org => }/ognl/DynamicSubscript.java | 2 +- .../java/{org => }/ognl/ElementsAccessor.java | 2 +- .../ognl/EnumerationElementsAccessor.java | 2 +- .../{org => }/ognl/EnumerationIterator.java | 2 +- .../ognl/EnumerationPropertyAccessor.java | 2 +- src/main/java/{org => }/ognl/Evaluation.java | 2 +- .../java/{org => }/ognl/EvaluationPool.java | 2 +- .../java/{org => }/ognl/ExpressionNode.java | 5 ++- .../ognl/ExpressionSyntaxException.java | 2 +- .../InappropriateExpressionException.java | 2 +- .../ognl/IteratorElementsAccessor.java | 2 +- .../{org => }/ognl/IteratorEnumeration.java | 2 +- .../ognl/IteratorPropertyAccessor.java | 2 +- .../{org => }/ognl/JJTOgnlParserState.java | 2 +- src/main/java/{org => }/ognl/JavaSource.java | 4 +- .../{org => }/ognl/ListPropertyAccessor.java | 6 +-- .../{org => }/ognl/MapElementsAccessor.java | 2 +- .../{org => }/ognl/MapPropertyAccessor.java | 2 +- .../java/{org => }/ognl/MemberAccess.java | 2 +- .../java/{org => }/ognl/MethodAccessor.java | 2 +- .../{org => }/ognl/MethodFailedException.java | 2 +- .../ognl/NoSuchPropertyException.java | 2 +- src/main/java/{org => }/ognl/Node.java | 4 +- src/main/java/{org => }/ognl/NodeType.java | 4 +- src/main/java/{org => }/ognl/NullHandler.java | 2 +- .../ognl/NumberElementsAccessor.java | 2 +- .../java/{org => }/ognl/NumericCasts.java | 2 +- .../java/{org => }/ognl/NumericDefaults.java | 2 +- .../{org => }/ognl/NumericExpression.java | 5 ++- .../java/{org => }/ognl/NumericLiterals.java | 2 +- .../java/{org => }/ognl/NumericTypes.java | 2 +- .../java/{org => }/ognl/NumericValues.java | 2 +- .../ognl/ObjectElementsAccessor.java | 2 +- .../ognl/ObjectIndexedPropertyDescriptor.java | 2 +- .../{org => }/ognl/ObjectMethodAccessor.java | 3 +- .../{org => }/ognl/ObjectNullHandler.java | 2 +- .../ognl/ObjectPropertyAccessor.java | 12 ++--- src/main/java/{org => }/ognl/Ognl.java | 8 ++-- src/main/java/{org => }/ognl/OgnlCache.java | 38 ++++++++-------- src/main/java/{org => }/ognl/OgnlContext.java | 6 +-- .../java/{org => }/ognl/OgnlException.java | 2 +- .../{org => }/ognl/OgnlInvokePermission.java | 2 +- src/main/java/{org => }/ognl/OgnlOps.java | 4 +- .../ognl/OgnlParserTreeConstants.java | 2 +- src/main/java/{org => }/ognl/OgnlRuntime.java | 34 +++++++------- .../{org => }/ognl/PrimitiveDefaults.java | 2 +- .../java/{org => }/ognl/PrimitiveTypes.java | 2 +- .../ognl/PrimitiveWrapperClasses.java | 2 +- .../java/{org => }/ognl/PropertyAccessor.java | 2 +- .../{org => }/ognl/SetPropertyAccessor.java | 2 +- src/main/java/{org => }/ognl/SimpleNode.java | 5 ++- .../java/{org => }/ognl/TypeConverter.java | 2 +- .../ognl/enhance/ContextClassLoader.java | 4 +- .../ognl/enhance/EnhancedClassLoader.java | 2 +- .../ognl/enhance/ExpressionAccessor.java | 6 +-- .../ognl/enhance/ExpressionCompiler.java | 36 +++++++-------- .../ognl/enhance/LocalReference.java | 2 +- .../ognl/enhance/OgnlExpressionCompiler.java | 8 ++-- .../ognl/enhance/OgnlLocalReference.java | 2 +- .../{org => }/ognl/enhance/OrderedReturn.java | 4 +- .../UnsupportedCompilationException.java | 2 +- .../java/{org => }/ognl/internal/Cache.java | 2 +- .../ognl/internal/CacheException.java | 2 +- .../{org => }/ognl/internal/CacheFactory.java | 6 +-- .../{org => }/ognl/internal/ClassCache.java | 4 +- .../ognl/internal/ClassCacheHandler.java | 2 +- .../{org => }/ognl/internal/HashMapCache.java | 4 +- .../ognl/internal/HashMapCacheFactory.java | 6 +-- .../ognl/internal/HashMapClassCache.java | 6 +-- .../ognl/internal/entry/CacheEntry.java | 2 +- .../internal/entry/CacheEntryFactory.java | 4 +- .../entry/ClassCacheEntryFactory.java | 2 +- .../entry/DeclaredMethodCacheEntry.java | 2 +- .../DeclaredMethodCacheEntryFactory.java | 2 +- .../entry/FieldCacheEntryFactory.java | 4 +- .../GenericMethodParameterTypeCacheEntry.java | 2 +- .../GenericMethodParameterTypeFactory.java | 4 +- .../entry/MethodAccessCacheEntryFactory.java | 4 +- .../entry/MethodAccessEntryValue.java | 2 +- .../ognl/internal/entry/MethodCacheEntry.java | 2 +- .../entry/MethodCacheEntryFactory.java | 6 +-- .../entry/MethodPermCacheEntryFactory.java | 6 +-- .../internal/entry/PermissionCacheEntry.java | 2 +- .../entry/PermissionCacheEntryFactory.java | 6 +-- .../PropertyDescriptorCacheEntryFactory.java | 8 ++-- src/main/java/{org => }/ognl/package.html | 0 .../ognl/security/OgnlSecurityManager.java | 4 +- .../security/OgnlSecurityManagerFactory.java | 2 +- .../{org => }/ognl/security/UserMethod.java | 2 +- src/main/javacc/ognl.jj | 2 +- src/main/jjtree/ognl.jjt | 2 +- .../{org => }/ognl/DefaultMemberAccess.java | 9 +++- .../java/{org => }/ognl/OgnlRuntimeTest.java | 9 ++-- .../java/{org => }/ognl/TestOgnlRuntime.java | 44 +++++++++---------- .../{org => }/ognl/test/ASTChainTest.java | 12 ++--- .../{org => }/ognl/test/ASTMethodTest.java | 19 +++++--- .../{org => }/ognl/test/ASTPropertyTest.java | 41 ++++++++++------- .../{org => }/ognl/test/ASTSequenceTest.java | 12 ++--- .../ArithmeticAndLogicalOperatorsTest.java | 8 ++-- .../ognl/test/ArrayCreationTest.java | 22 +++++----- .../ognl/test/ArrayElementsTest.java | 6 +-- .../java/{org => }/ognl/test/ChainTest.java | 10 ++--- .../{org => }/ognl/test/ClassMethodTest.java | 4 +- .../test/CollectionDirectPropertyTest.java | 4 +- .../ognl/test/CompilingPropertyAccessor.java | 20 ++++----- .../{org => }/ognl/test/ConstantTest.java | 4 +- .../{org => }/ognl/test/ConstantTreeTest.java | 8 ++-- .../ognl/test/ContextVariableTest.java | 4 +- .../ognl/test/CorrectedObjectNullHandler.java | 6 +-- .../ognl/test/DefaultClassResolverTest.java | 7 ++- .../{org => }/ognl/test/GenericsTest.java | 10 ++--- .../{org => }/ognl/test/InExpressionTest.java | 6 ++- .../{org => }/ognl/test/IndexAccessTest.java | 10 ++--- .../ognl/test/IndexedPropertyTest.java | 6 +-- .../ognl/test/InheritedMethodsTest.java | 18 ++++---- .../ognl/test/InterfaceInheritanceTest.java | 6 +-- .../java/{org => }/ognl/test/IsTruckTest.java | 6 ++- .../java/{org => }/ognl/test/Java8Test.java | 6 +-- .../ognl/test/LambdaExpressionTest.java | 2 +- .../{org => }/ognl/test/MapCreationTest.java | 4 +- .../{org => }/ognl/test/MemberAccessTest.java | 12 ++--- .../java/{org => }/ognl/test/MethodTest.java | 15 +++---- .../ognl/test/MethodWithConversionTest.java | 6 +-- .../{org => }/ognl/test/NestedMethodTest.java | 6 +-- .../{org => }/ognl/test/NullHandlerTest.java | 6 +-- .../ognl/test/NullStringCatenationTest.java | 6 +-- .../ognl/test/NumberFormatExceptionTest.java | 6 +-- .../ognl/test/NumericConversionTest.java | 6 +-- .../ognl/test/ObjectIndexedPropertyTest.java | 8 ++-- .../ognl/test/ObjectIndexedTest.java | 14 +++--- .../java/{org => }/ognl/test/OgnlOpsTest.java | 4 +- .../{org => }/ognl/test/OgnlTestCase.java | 10 ++--- .../{org => }/ognl/test/OperationTest.java | 10 ++--- .../{org => }/ognl/test/OperatorTest.java | 2 +- .../java/{org => }/ognl/test/Performance.java | 16 +++---- .../ognl/test/PrimitiveArrayTest.java | 4 +- .../ognl/test/PrimitiveNullHandlingTest.java | 4 +- .../ognl/test/PrivateAccessorTest.java | 8 ++-- .../ognl/test/PrivateMemberTest.java | 12 ++--- .../ognl/test/ProjectionSelectionTest.java | 12 ++--- ...ertyArithmeticAndLogicalOperatorsTest.java | 8 ++-- .../ognl/test/PropertyNotFoundTest.java | 10 ++--- .../ognl/test/PropertySetterTest.java | 10 ++--- .../{org => }/ognl/test/PropertyTest.java | 18 ++++---- .../ognl/test/ProtectedInnerClassTest.java | 6 +-- .../ognl/test/ProtectedMemberTest.java | 12 ++--- .../{org => }/ognl/test/PublicMemberTest.java | 12 ++--- .../java/{org => }/ognl/test/QuotingTest.java | 2 +- .../ognl/test/RaceConditionTest.java | 4 +- .../java/{org => }/ognl/test/SetterTest.java | 8 ++-- .../ognl/test/SetterWithConversionTest.java | 4 +- .../test/ShortCircuitingExpressionTest.java | 6 +-- .../test/SimpleNavigationChainTreeTest.java | 4 +- .../ognl/test/SimplePropertyTreeTest.java | 4 +- .../ognl/test/StaticsAndConstructorsTest.java | 30 ++++++------- .../ognl/test/TestOgnlException.java | 4 +- .../ognl/test/VarArgsMethodTest.java | 10 ++--- .../accessors/ListPropertyAccessorTest.java | 18 ++++---- .../test/accessors/PropertyAccessTest.java | 21 +++++---- .../test/enhance/TestExpressionCompiler.java | 20 ++++----- .../{org => }/ognl/test/objects/BaseBean.java | 2 +- .../ognl/test/objects/BaseGeneric.java | 2 +- .../ognl/test/objects/BaseIndexed.java | 2 +- .../ognl/test/objects/BaseObjectIndexed.java | 2 +- .../test/objects/BaseSyntheticObject.java | 2 +- .../{org => }/ognl/test/objects/Bean1.java | 2 +- .../{org => }/ognl/test/objects/Bean2.java | 2 +- .../{org => }/ognl/test/objects/Bean3.java | 12 ++--- .../ognl/test/objects/BeanProvider.java | 2 +- .../test/objects/BeanProviderAccessor.java | 18 ++++---- .../ognl/test/objects/BeanProviderImpl.java | 10 ++--- .../ognl/test/objects/Component.java | 2 +- .../ognl/test/objects/ComponentImpl.java | 4 +- .../ognl/test/objects/ComponentSubclass.java | 2 +- .../{org => }/ognl/test/objects/Copy.java | 2 +- .../ognl/test/objects/CorrectedObject.java | 2 +- .../{org => }/ognl/test/objects/Cracker.java | 4 +- .../{org => }/ognl/test/objects/Entry.java | 2 +- .../{org => }/ognl/test/objects/EvenOdd.java | 2 +- .../ognl/test/objects/FirstBean.java | 6 +-- .../ognl/test/objects/FormComponentImpl.java | 2 +- .../{org => }/ognl/test/objects/FormImpl.java | 4 +- .../ognl/test/objects/GameGeneric.java | 2 +- .../ognl/test/objects/GameGenericObject.java | 2 +- .../ognl/test/objects/GenericCracker.java | 2 +- .../ognl/test/objects/GenericObject.java | 2 +- .../ognl/test/objects/GenericRoot.java | 2 +- .../ognl/test/objects/GenericService.java | 2 +- .../ognl/test/objects/GenericServiceImpl.java | 8 ++-- .../ognl/test/objects/GetterMethods.java | 2 +- .../ognl/test/objects/IComponent.java | 4 +- .../ognl/test/objects/IContentProvider.java | 2 +- .../{org => }/ognl/test/objects/IForm.java | 4 +- .../ognl/test/objects/IFormComponent.java | 6 +-- .../test/objects/ITreeContentProvider.java | 2 +- .../{org => }/ognl/test/objects/Indexed.java | 10 ++--- .../ognl/test/objects/IndexedMapObject.java | 2 +- .../ognl/test/objects/IndexedSetObject.java | 2 +- .../ognl/test/objects/Inherited.java | 2 +- .../ognl/test/objects/ListSource.java | 2 +- .../ognl/test/objects/ListSourceImpl.java | 2 +- .../{org => }/ognl/test/objects/MenuItem.java | 4 +- .../{org => }/ognl/test/objects/Messages.java | 4 +- .../ognl/test/objects/MethodTestMethods.java | 4 +- .../{org => }/ognl/test/objects/Model.java | 2 +- .../{org => }/ognl/test/objects/MyMap.java | 2 +- .../ognl/test/objects/MyMapImpl.java | 2 +- .../ognl/test/objects/ObjectIndexed.java | 2 +- .../ognl/test/objects/OtherEnum.java | 2 +- .../ognl/test/objects/OtherObjectIndexed.java | 2 +- .../test/objects/PersonGenericObject.java | 2 +- .../ognl/test/objects/PropertyHolder.java | 4 +- .../{org => }/ognl/test/objects/Root.java | 4 +- .../ognl/test/objects/SearchCriteria.java | 2 +- .../ognl/test/objects/SearchTab.java | 6 +-- .../ognl/test/objects/SecondBean.java | 4 +- .../ognl/test/objects/SetterReturns.java | 2 +- .../{org => }/ognl/test/objects/Simple.java | 4 +- .../ognl/test/objects/SimpleEnum.java | 2 +- .../ognl/test/objects/SimpleNumeric.java | 4 +- .../test/objects/SubclassSyntheticObject.java | 2 +- .../ognl/test/objects/TestClass.java | 2 +- .../{org => }/ognl/test/objects/TestImpl.java | 2 +- .../ognl/test/objects/TestInherited1.java | 2 +- .../ognl/test/objects/TestInherited2.java | 2 +- .../ognl/test/objects/TestModel.java | 2 +- .../test/objects/TreeContentProvider.java | 2 +- .../java/{org => }/ognl/test/objects/Two.java | 2 +- .../java/{org => }/ognl/test/race/Base.java | 2 +- .../{org => }/ognl/test/race/Persion.java | 2 +- .../ognl/test/race/RaceTestCase.java | 10 ++--- .../ognl/test/util/ContextClassLoader.java | 4 +- .../ognl/test/util/EnhancedClassLoader.java | 2 +- .../{org => }/ognl/test/util/NameFactory.java | 2 +- 295 files changed, 881 insertions(+), 781 deletions(-) rename src/main/java/{org => }/ognl/ASTAdd.java (99%) rename src/main/java/{org => }/ognl/ASTAnd.java (94%) rename src/main/java/{org => }/ognl/ASTAssign.java (92%) rename src/main/java/{org => }/ognl/ASTBitAnd.java (97%) rename src/main/java/{org => }/ognl/ASTBitNegate.java (97%) rename src/main/java/{org => }/ognl/ASTBitOr.java (97%) rename src/main/java/{org => }/ognl/ASTChain.java (98%) rename src/main/java/{org => }/ognl/ASTConst.java (98%) rename src/main/java/{org => }/ognl/ASTCtor.java (99%) rename src/main/java/{org => }/ognl/ASTDivide.java (97%) rename src/main/java/{org => }/ognl/ASTEq.java (95%) rename src/main/java/{org => }/ognl/ASTEval.java (96%) rename src/main/java/{org => }/ognl/ASTGreater.java (95%) rename src/main/java/{org => }/ognl/ASTGreaterEq.java (95%) rename src/main/java/{org => }/ognl/ASTIn.java (94%) rename src/main/java/{org => }/ognl/ASTInstanceof.java (98%) rename src/main/java/{org => }/ognl/ASTKeyValue.java (97%) rename src/main/java/{org => }/ognl/ASTLess.java (95%) rename src/main/java/{org => }/ognl/ASTLessEq.java (94%) rename src/main/java/{org => }/ognl/ASTList.java (93%) rename src/main/java/{org => }/ognl/ASTMap.java (97%) rename src/main/java/{org => }/ognl/ASTMethod.java (96%) rename src/main/java/{org => }/ognl/ASTMultiply.java (97%) rename src/main/java/{org => }/ognl/ASTNegate.java (98%) rename src/main/java/{org => }/ognl/ASTNot.java (94%) rename src/main/java/{org => }/ognl/ASTNotEq.java (95%) rename src/main/java/{org => }/ognl/ASTNotIn.java (93%) rename src/main/java/{org => }/ognl/ASTOr.java (95%) rename src/main/java/{org => }/ognl/ASTProject.java (95%) rename src/main/java/{org => }/ognl/ASTProperty.java (99%) rename src/main/java/{org => }/ognl/ASTRemainder.java (97%) rename src/main/java/{org => }/ognl/ASTRootVarRef.java (96%) rename src/main/java/{org => }/ognl/ASTSelect.java (96%) rename src/main/java/{org => }/ognl/ASTSelectFirst.java (96%) rename src/main/java/{org => }/ognl/ASTSelectLast.java (96%) rename src/main/java/{org => }/ognl/ASTSequence.java (97%) rename src/main/java/{org => }/ognl/ASTShiftLeft.java (97%) rename src/main/java/{org => }/ognl/ASTShiftRight.java (97%) rename src/main/java/{org => }/ognl/ASTStaticField.java (99%) rename src/main/java/{org => }/ognl/ASTStaticMethod.java (94%) rename src/main/java/{org => }/ognl/ASTSubtract.java (97%) rename src/main/java/{org => }/ognl/ASTTest.java (96%) rename src/main/java/{org => }/ognl/ASTThisVarRef.java (95%) rename src/main/java/{org => }/ognl/ASTUnsignedShiftRight.java (98%) rename src/main/java/{org => }/ognl/ASTVarRef.java (96%) rename src/main/java/{org => }/ognl/ASTXor.java (97%) rename src/main/java/{org => }/ognl/AbstractMemberAccess.java (96%) rename src/main/java/{org => }/ognl/AccessibleObjectHandler.java (98%) rename src/main/java/{org => }/ognl/AccessibleObjectHandlerJDK9Plus.java (99%) rename src/main/java/{org => }/ognl/AccessibleObjectHandlerPreJDK9.java (99%) rename src/main/java/{org => }/ognl/ArrayElementsAccessor.java (98%) rename src/main/java/{org => }/ognl/ArrayPropertyAccessor.java (95%) rename src/main/java/{org => }/ognl/BooleanExpression.java (96%) rename src/main/java/{org => }/ognl/ClassCacheInspector.java (98%) rename src/main/java/{org => }/ognl/ClassResolver.java (98%) rename src/main/java/{org => }/ognl/CollectionElementsAccessor.java (98%) rename src/main/java/{org => }/ognl/ComparisonExpression.java (97%) rename src/main/java/{org => }/ognl/DefaultClassResolver.java (99%) rename src/main/java/{org => }/ognl/DefaultTypeConverter.java (97%) rename src/main/java/{org => }/ognl/DynamicSubscript.java (99%) rename src/main/java/{org => }/ognl/ElementsAccessor.java (99%) rename src/main/java/{org => }/ognl/EnumerationElementsAccessor.java (98%) rename src/main/java/{org => }/ognl/EnumerationIterator.java (98%) rename src/main/java/{org => }/ognl/EnumerationPropertyAccessor.java (99%) rename src/main/java/{org => }/ognl/Evaluation.java (99%) rename src/main/java/{org => }/ognl/EvaluationPool.java (99%) rename src/main/java/{org => }/ognl/ExpressionNode.java (98%) rename src/main/java/{org => }/ognl/ExpressionSyntaxException.java (98%) rename src/main/java/{org => }/ognl/InappropriateExpressionException.java (98%) rename src/main/java/{org => }/ognl/IteratorElementsAccessor.java (98%) rename src/main/java/{org => }/ognl/IteratorEnumeration.java (98%) rename src/main/java/{org => }/ognl/IteratorPropertyAccessor.java (99%) rename src/main/java/{org => }/ognl/JJTOgnlParserState.java (99%) rename src/main/java/{org => }/ognl/JavaSource.java (97%) rename src/main/java/{org => }/ognl/ListPropertyAccessor.java (98%) rename src/main/java/{org => }/ognl/MapElementsAccessor.java (98%) rename src/main/java/{org => }/ognl/MapPropertyAccessor.java (99%) rename src/main/java/{org => }/ognl/MemberAccess.java (99%) rename src/main/java/{org => }/ognl/MethodAccessor.java (99%) rename src/main/java/{org => }/ognl/MethodFailedException.java (98%) rename src/main/java/{org => }/ognl/NoSuchPropertyException.java (99%) rename src/main/java/{org => }/ognl/Node.java (98%) rename src/main/java/{org => }/ognl/NodeType.java (94%) rename src/main/java/{org => }/ognl/NullHandler.java (99%) rename src/main/java/{org => }/ognl/NumberElementsAccessor.java (98%) rename src/main/java/{org => }/ognl/NumericCasts.java (98%) rename src/main/java/{org => }/ognl/NumericDefaults.java (98%) rename src/main/java/{org => }/ognl/NumericExpression.java (97%) rename src/main/java/{org => }/ognl/NumericLiterals.java (98%) rename src/main/java/{org => }/ognl/NumericTypes.java (99%) rename src/main/java/{org => }/ognl/NumericValues.java (99%) rename src/main/java/{org => }/ognl/ObjectElementsAccessor.java (98%) rename src/main/java/{org => }/ognl/ObjectIndexedPropertyDescriptor.java (99%) rename src/main/java/{org => }/ognl/ObjectMethodAccessor.java (98%) rename src/main/java/{org => }/ognl/ObjectNullHandler.java (98%) rename src/main/java/{org => }/ognl/ObjectPropertyAccessor.java (96%) rename src/main/java/{org => }/ognl/Ognl.java (99%) rename src/main/java/{org => }/ognl/OgnlCache.java (92%) rename src/main/java/{org => }/ognl/OgnlContext.java (99%) rename src/main/java/{org => }/ognl/OgnlException.java (99%) rename src/main/java/{org => }/ognl/OgnlInvokePermission.java (98%) rename src/main/java/{org => }/ognl/OgnlOps.java (99%) rename src/main/java/{org => }/ognl/OgnlParserTreeConstants.java (99%) rename src/main/java/{org => }/ognl/OgnlRuntime.java (99%) rename src/main/java/{org => }/ognl/PrimitiveDefaults.java (99%) rename src/main/java/{org => }/ognl/PrimitiveTypes.java (98%) rename src/main/java/{org => }/ognl/PrimitiveWrapperClasses.java (99%) rename src/main/java/{org => }/ognl/PropertyAccessor.java (99%) rename src/main/java/{org => }/ognl/SetPropertyAccessor.java (99%) rename src/main/java/{org => }/ognl/SimpleNode.java (99%) rename src/main/java/{org => }/ognl/TypeConverter.java (99%) rename src/main/java/{org => }/ognl/enhance/ContextClassLoader.java (96%) rename src/main/java/{org => }/ognl/enhance/EnhancedClassLoader.java (97%) rename src/main/java/{org => }/ognl/enhance/ExpressionAccessor.java (96%) rename src/main/java/{org => }/ognl/enhance/ExpressionCompiler.java (98%) rename src/main/java/{org => }/ognl/enhance/LocalReference.java (98%) rename src/main/java/{org => }/ognl/enhance/OgnlExpressionCompiler.java (98%) rename src/main/java/{org => }/ognl/enhance/OgnlLocalReference.java (98%) rename src/main/java/{org => }/ognl/enhance/OrderedReturn.java (97%) rename src/main/java/{org => }/ognl/enhance/UnsupportedCompilationException.java (98%) rename src/main/java/{org => }/ognl/internal/Cache.java (97%) rename src/main/java/{org => }/ognl/internal/CacheException.java (97%) rename src/main/java/{org => }/ognl/internal/CacheFactory.java (88%) rename src/main/java/{org => }/ognl/internal/ClassCache.java (94%) rename src/main/java/{org => }/ognl/internal/ClassCacheHandler.java (98%) rename src/main/java/{org => }/ognl/internal/HashMapCache.java (96%) rename src/main/java/{org => }/ognl/internal/HashMapCacheFactory.java (90%) rename src/main/java/{org => }/ognl/internal/HashMapClassCache.java (92%) rename src/main/java/{org => }/ognl/internal/entry/CacheEntry.java (96%) rename src/main/java/{org => }/ognl/internal/entry/CacheEntryFactory.java (92%) rename src/main/java/{org => }/ognl/internal/entry/ClassCacheEntryFactory.java (96%) rename src/main/java/{org => }/ognl/internal/entry/DeclaredMethodCacheEntry.java (98%) rename src/main/java/{org => }/ognl/internal/entry/DeclaredMethodCacheEntryFactory.java (97%) rename src/main/java/{org => }/ognl/internal/entry/FieldCacheEntryFactory.java (94%) rename src/main/java/{org => }/ognl/internal/entry/GenericMethodParameterTypeCacheEntry.java (98%) rename src/main/java/{org => }/ognl/internal/entry/GenericMethodParameterTypeFactory.java (97%) rename src/main/java/{org => }/ognl/internal/entry/MethodAccessCacheEntryFactory.java (96%) rename src/main/java/{org => }/ognl/internal/entry/MethodAccessEntryValue.java (97%) rename src/main/java/{org => }/ognl/internal/entry/MethodCacheEntry.java (97%) rename src/main/java/{org => }/ognl/internal/entry/MethodCacheEntryFactory.java (95%) rename src/main/java/{org => }/ognl/internal/entry/MethodPermCacheEntryFactory.java (93%) rename src/main/java/{org => }/ognl/internal/entry/PermissionCacheEntry.java (97%) rename src/main/java/{org => }/ognl/internal/entry/PermissionCacheEntryFactory.java (91%) rename src/main/java/{org => }/ognl/internal/entry/PropertyDescriptorCacheEntryFactory.java (97%) rename src/main/java/{org => }/ognl/package.html (100%) rename src/main/java/{org => }/ognl/security/OgnlSecurityManager.java (97%) rename src/main/java/{org => }/ognl/security/OgnlSecurityManagerFactory.java (99%) rename src/main/java/{org => }/ognl/security/UserMethod.java (98%) rename src/test/java/{org => }/ognl/DefaultMemberAccess.java (96%) rename src/test/java/{org => }/ognl/OgnlRuntimeTest.java (99%) rename src/test/java/{org => }/ognl/TestOgnlRuntime.java (96%) rename src/test/java/{org => }/ognl/test/ASTChainTest.java (75%) rename src/test/java/{org => }/ognl/test/ASTMethodTest.java (90%) rename src/test/java/{org => }/ognl/test/ASTPropertyTest.java (85%) rename src/test/java/{org => }/ognl/test/ASTSequenceTest.java (80%) rename src/test/java/{org => }/ognl/test/ArithmeticAndLogicalOperatorsTest.java (99%) rename src/test/java/{org => }/ognl/test/ArrayCreationTest.java (85%) rename src/test/java/{org => }/ognl/test/ArrayElementsTest.java (98%) rename src/test/java/{org => }/ognl/test/ChainTest.java (92%) rename src/test/java/{org => }/ognl/test/ClassMethodTest.java (98%) rename src/test/java/{org => }/ognl/test/CollectionDirectPropertyTest.java (98%) rename src/test/java/{org => }/ognl/test/CompilingPropertyAccessor.java (96%) rename src/test/java/{org => }/ognl/test/ConstantTest.java (98%) rename src/test/java/{org => }/ognl/test/ConstantTreeTest.java (95%) rename src/test/java/{org => }/ognl/test/ContextVariableTest.java (98%) rename src/test/java/{org => }/ognl/test/CorrectedObjectNullHandler.java (96%) rename src/test/java/{org => }/ognl/test/DefaultClassResolverTest.java (92%) rename src/test/java/{org => }/ognl/test/GenericsTest.java (87%) rename src/test/java/{org => }/ognl/test/InExpressionTest.java (85%) rename src/test/java/{org => }/ognl/test/IndexAccessTest.java (96%) rename src/test/java/{org => }/ognl/test/IndexedPropertyTest.java (98%) rename src/test/java/{org => }/ognl/test/InheritedMethodsTest.java (84%) rename src/test/java/{org => }/ognl/test/InterfaceInheritanceTest.java (98%) rename src/test/java/{org => }/ognl/test/IsTruckTest.java (82%) rename src/test/java/{org => }/ognl/test/Java8Test.java (95%) rename src/test/java/{org => }/ognl/test/LambdaExpressionTest.java (99%) rename src/test/java/{org => }/ognl/test/MapCreationTest.java (98%) rename src/test/java/{org => }/ognl/test/MemberAccessTest.java (96%) rename src/test/java/{org => }/ognl/test/MethodTest.java (95%) rename src/test/java/{org => }/ognl/test/MethodWithConversionTest.java (98%) rename src/test/java/{org => }/ognl/test/NestedMethodTest.java (97%) rename src/test/java/{org => }/ognl/test/NullHandlerTest.java (98%) rename src/test/java/{org => }/ognl/test/NullStringCatenationTest.java (96%) rename src/test/java/{org => }/ognl/test/NumberFormatExceptionTest.java (98%) rename src/test/java/{org => }/ognl/test/NumericConversionTest.java (99%) rename src/test/java/{org => }/ognl/test/ObjectIndexedPropertyTest.java (97%) rename src/test/java/{org => }/ognl/test/ObjectIndexedTest.java (96%) rename src/test/java/{org => }/ognl/test/OgnlOpsTest.java (98%) rename src/test/java/{org => }/ognl/test/OgnlTestCase.java (98%) rename src/test/java/{org => }/ognl/test/OperationTest.java (92%) rename src/test/java/{org => }/ognl/test/OperatorTest.java (99%) rename src/test/java/{org => }/ognl/test/Performance.java (98%) rename src/test/java/{org => }/ognl/test/PrimitiveArrayTest.java (98%) rename src/test/java/{org => }/ognl/test/PrimitiveNullHandlingTest.java (98%) rename src/test/java/{org => }/ognl/test/PrivateAccessorTest.java (97%) rename src/test/java/{org => }/ognl/test/PrivateMemberTest.java (99%) rename src/test/java/{org => }/ognl/test/ProjectionSelectionTest.java (97%) rename src/test/java/{org => }/ognl/test/PropertyArithmeticAndLogicalOperatorsTest.java (96%) rename src/test/java/{org => }/ognl/test/PropertyNotFoundTest.java (97%) rename src/test/java/{org => }/ognl/test/PropertySetterTest.java (93%) rename src/test/java/{org => }/ognl/test/PropertyTest.java (92%) rename src/test/java/{org => }/ognl/test/ProtectedInnerClassTest.java (98%) rename src/test/java/{org => }/ognl/test/ProtectedMemberTest.java (99%) rename src/test/java/{org => }/ognl/test/PublicMemberTest.java (98%) rename src/test/java/{org => }/ognl/test/QuotingTest.java (99%) rename src/test/java/{org => }/ognl/test/RaceConditionTest.java (97%) rename src/test/java/{org => }/ognl/test/SetterTest.java (97%) rename src/test/java/{org => }/ognl/test/SetterWithConversionTest.java (98%) rename src/test/java/{org => }/ognl/test/ShortCircuitingExpressionTest.java (97%) rename src/test/java/{org => }/ognl/test/SimpleNavigationChainTreeTest.java (98%) rename src/test/java/{org => }/ognl/test/SimplePropertyTreeTest.java (98%) rename src/test/java/{org => }/ognl/test/StaticsAndConstructorsTest.java (81%) rename src/test/java/{org => }/ognl/test/TestOgnlException.java (91%) rename src/test/java/{org => }/ognl/test/VarArgsMethodTest.java (94%) rename src/test/java/{org => }/ognl/test/accessors/ListPropertyAccessorTest.java (87%) rename src/test/java/{org => }/ognl/test/accessors/PropertyAccessTest.java (78%) rename src/test/java/{org => }/ognl/test/enhance/TestExpressionCompiler.java (98%) rename src/test/java/{org => }/ognl/test/objects/BaseBean.java (94%) rename src/test/java/{org => }/ognl/test/objects/BaseGeneric.java (95%) rename src/test/java/{org => }/ognl/test/objects/BaseIndexed.java (83%) rename src/test/java/{org => }/ognl/test/objects/BaseObjectIndexed.java (98%) rename src/test/java/{org => }/ognl/test/objects/BaseSyntheticObject.java (88%) rename src/test/java/{org => }/ognl/test/objects/Bean1.java (98%) rename src/test/java/{org => }/ognl/test/objects/Bean2.java (98%) rename src/test/java/{org => }/ognl/test/objects/Bean3.java (98%) rename src/test/java/{org => }/ognl/test/objects/BeanProvider.java (97%) rename src/test/java/{org => }/ognl/test/objects/BeanProviderAccessor.java (85%) rename src/test/java/{org => }/ognl/test/objects/BeanProviderImpl.java (90%) rename src/test/java/{org => }/ognl/test/objects/Component.java (98%) rename src/test/java/{org => }/ognl/test/objects/ComponentImpl.java (86%) rename src/test/java/{org => }/ognl/test/objects/ComponentSubclass.java (87%) rename src/test/java/{org => }/ognl/test/objects/Copy.java (73%) rename src/test/java/{org => }/ognl/test/objects/CorrectedObject.java (98%) rename src/test/java/{org => }/ognl/test/objects/Cracker.java (81%) rename src/test/java/{org => }/ognl/test/objects/Entry.java (94%) rename src/test/java/{org => }/ognl/test/objects/EvenOdd.java (97%) rename src/test/java/{org => }/ognl/test/objects/FirstBean.java (76%) rename src/test/java/{org => }/ognl/test/objects/FormComponentImpl.java (88%) rename src/test/java/{org => }/ognl/test/objects/FormImpl.java (68%) rename src/test/java/{org => }/ognl/test/objects/GameGeneric.java (84%) rename src/test/java/{org => }/ognl/test/objects/GameGenericObject.java (91%) rename src/test/java/{org => }/ognl/test/objects/GenericCracker.java (88%) rename src/test/java/{org => }/ognl/test/objects/GenericObject.java (82%) rename src/test/java/{org => }/ognl/test/objects/GenericRoot.java (93%) rename src/test/java/{org => }/ognl/test/objects/GenericService.java (97%) rename src/test/java/{org => }/ognl/test/objects/GenericServiceImpl.java (96%) rename src/test/java/{org => }/ognl/test/objects/GetterMethods.java (90%) rename src/test/java/{org => }/ognl/test/objects/IComponent.java (83%) rename src/test/java/{org => }/ognl/test/objects/IContentProvider.java (77%) rename src/test/java/{org => }/ognl/test/objects/IForm.java (61%) rename src/test/java/{org => }/ognl/test/objects/IFormComponent.java (77%) rename src/test/java/{org => }/ognl/test/objects/ITreeContentProvider.java (87%) rename src/test/java/{org => }/ognl/test/objects/Indexed.java (98%) rename src/test/java/{org => }/ognl/test/objects/IndexedMapObject.java (90%) rename src/test/java/{org => }/ognl/test/objects/IndexedSetObject.java (95%) rename src/test/java/{org => }/ognl/test/objects/Inherited.java (69%) rename src/test/java/{org => }/ognl/test/objects/ListSource.java (82%) rename src/test/java/{org => }/ognl/test/objects/ListSourceImpl.java (92%) rename src/test/java/{org => }/ognl/test/objects/MenuItem.java (96%) rename src/test/java/{org => }/ognl/test/objects/Messages.java (94%) rename src/test/java/{org => }/ognl/test/objects/MethodTestMethods.java (99%) rename src/test/java/{org => }/ognl/test/objects/Model.java (75%) rename src/test/java/{org => }/ognl/test/objects/MyMap.java (98%) rename src/test/java/{org => }/ognl/test/objects/MyMapImpl.java (98%) rename src/test/java/{org => }/ognl/test/objects/ObjectIndexed.java (98%) rename src/test/java/{org => }/ognl/test/objects/OtherEnum.java (89%) rename src/test/java/{org => }/ognl/test/objects/OtherObjectIndexed.java (98%) rename src/test/java/{org => }/ognl/test/objects/PersonGenericObject.java (87%) rename src/test/java/{org => }/ognl/test/objects/PropertyHolder.java (94%) rename src/test/java/{org => }/ognl/test/objects/Root.java (99%) rename src/test/java/{org => }/ognl/test/objects/SearchCriteria.java (88%) rename src/test/java/{org => }/ognl/test/objects/SearchTab.java (97%) rename src/test/java/{org => }/ognl/test/objects/SecondBean.java (79%) rename src/test/java/{org => }/ognl/test/objects/SetterReturns.java (88%) rename src/test/java/{org => }/ognl/test/objects/Simple.java (98%) rename src/test/java/{org => }/ognl/test/objects/SimpleEnum.java (87%) rename src/test/java/{org => }/ognl/test/objects/SimpleNumeric.java (68%) rename src/test/java/{org => }/ognl/test/objects/SubclassSyntheticObject.java (86%) rename src/test/java/{org => }/ognl/test/objects/TestClass.java (61%) rename src/test/java/{org => }/ognl/test/objects/TestImpl.java (89%) rename src/test/java/{org => }/ognl/test/objects/TestInherited1.java (81%) rename src/test/java/{org => }/ognl/test/objects/TestInherited2.java (81%) rename src/test/java/{org => }/ognl/test/objects/TestModel.java (91%) rename src/test/java/{org => }/ognl/test/objects/TreeContentProvider.java (93%) rename src/test/java/{org => }/ognl/test/objects/Two.java (87%) rename src/test/java/{org => }/ognl/test/race/Base.java (86%) rename src/test/java/{org => }/ognl/test/race/Persion.java (87%) rename src/test/java/{org => }/ognl/test/race/RaceTestCase.java (93%) rename src/test/java/{org => }/ognl/test/util/ContextClassLoader.java (97%) rename src/test/java/{org => }/ognl/test/util/EnhancedClassLoader.java (98%) rename src/test/java/{org => }/ognl/test/util/NameFactory.java (98%) diff --git a/docs/DeveloperGuide.md b/docs/DeveloperGuide.md index f19b1ac5..2e9a0829 100644 --- a/docs/DeveloperGuide.md +++ b/docs/DeveloperGuide.md @@ -43,8 +43,8 @@ efficient. The class then takes an `OgnlContext` and a root object to evaluate against. ```java -import org.ognl.Ognl; -import org.ognl.OgnlContext; +import ognl.Ognl; +import ognl.OgnlContext; public class OgnlExpression { diff --git a/pom.xml b/pom.xml index 57142d11..372cd12d 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ 9 - org.ognl + ognl ognl jar 3.4.0-SNAPSHOT @@ -177,7 +177,7 @@ generate-sources ${project.build.directory}/generated-sources/java - org.ognl + ognl diff --git a/src/main/java/org/ognl/ASTAdd.java b/src/main/java/ognl/ASTAdd.java similarity index 99% rename from src/main/java/org/ognl/ASTAdd.java rename to src/main/java/ognl/ASTAdd.java index 6b176014..3073f8d1 100644 --- a/src/main/java/org/ognl/ASTAdd.java +++ b/src/main/java/ognl/ASTAdd.java @@ -16,9 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; -import org.ognl.enhance.ExpressionCompiler; +import ognl.OgnlParser; +import ognl.enhance.ExpressionCompiler; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/src/main/java/org/ognl/ASTAnd.java b/src/main/java/ognl/ASTAnd.java similarity index 94% rename from src/main/java/org/ognl/ASTAnd.java rename to src/main/java/ognl/ASTAnd.java index e5fc1093..63872182 100644 --- a/src/main/java/org/ognl/ASTAnd.java +++ b/src/main/java/ognl/ASTAnd.java @@ -16,10 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; -import org.ognl.enhance.ExpressionCompiler; -import org.ognl.enhance.UnsupportedCompilationException; +import ognl.OgnlParser; +import ognl.enhance.ExpressionCompiler; +import ognl.enhance.UnsupportedCompilationException; public class ASTAnd extends BooleanExpression { @@ -93,7 +94,7 @@ public String toGetSourceString(OgnlContext context, Object target) { if (!OgnlRuntime.isBoolean(second) && !context.getCurrentType().isPrimitive()) second = OgnlRuntime.getCompiler().createLocalReference(context, second, context.getCurrentType()); - result += "(org.ognl.OgnlOps.booleanValue(" + first + ")"; + result += "(ognl.OgnlOps.booleanValue(" + first + ")"; result += " ? "; @@ -141,7 +142,7 @@ public String toSetSourceString(OgnlContext context, Object target) { + pre + children[1].toSetSourceString(context, target); if (!OgnlRuntime.isBoolean(first)) - result += "if(org.ognl.OgnlOps.booleanValue(" + first + ")){"; + result += "if(ognl.OgnlOps.booleanValue(" + first + ")){"; else result += "if(" + first + "){"; diff --git a/src/main/java/org/ognl/ASTAssign.java b/src/main/java/ognl/ASTAssign.java similarity index 92% rename from src/main/java/org/ognl/ASTAssign.java rename to src/main/java/ognl/ASTAssign.java index 66cceeb3..7b2c0136 100644 --- a/src/main/java/org/ognl/ASTAssign.java +++ b/src/main/java/ognl/ASTAssign.java @@ -16,10 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; -import org.ognl.enhance.OrderedReturn; -import org.ognl.enhance.UnsupportedCompilationException; +import ognl.OgnlParser; +import ognl.enhance.OrderedReturn; +import ognl.enhance.UnsupportedCompilationException; public class ASTAssign extends SimpleNode { @@ -65,7 +66,7 @@ public String toGetSourceString(OgnlContext context, Object target) { core = core.substring(0, core.lastIndexOf(";")); second = OgnlRuntime.getCompiler().createLocalReference(context, - "org.ognl.OgnlOps.returnValue(($w)" + core + ", ($w) " + seq.getLastExpression() + ")", + "ognl.OgnlOps.returnValue(($w)" + core + ", ($w) " + seq.getLastExpression() + ")", Object.class); } @@ -85,7 +86,7 @@ public String toGetSourceString(OgnlContext context, Object target) { // System.out.println("building ordered ret from child[0] with result of:" + result); result = OgnlRuntime.getCompiler().createLocalReference(context, - "org.ognl.OgnlOps.returnValue(($w)" + result + ", ($w)" + ((OrderedReturn) children[0]).getLastExpression() + ")", + "ognl.OgnlOps.returnValue(($w)" + result + ", ($w)" + ((OrderedReturn) children[0]).getLastExpression() + ")", Object.class); } diff --git a/src/main/java/org/ognl/ASTBitAnd.java b/src/main/java/ognl/ASTBitAnd.java similarity index 97% rename from src/main/java/org/ognl/ASTBitAnd.java rename to src/main/java/ognl/ASTBitAnd.java index a204e36c..59862f5d 100644 --- a/src/main/java/org/ognl/ASTBitAnd.java +++ b/src/main/java/ognl/ASTBitAnd.java @@ -16,7 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; + +import ognl.OgnlParser; public class ASTBitAnd extends NumericExpression { diff --git a/src/main/java/org/ognl/ASTBitNegate.java b/src/main/java/ognl/ASTBitNegate.java similarity index 97% rename from src/main/java/org/ognl/ASTBitNegate.java rename to src/main/java/ognl/ASTBitNegate.java index d9a6fcd1..e6c8d33d 100644 --- a/src/main/java/org/ognl/ASTBitNegate.java +++ b/src/main/java/ognl/ASTBitNegate.java @@ -16,7 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; + +import ognl.OgnlParser; public class ASTBitNegate extends NumericExpression { diff --git a/src/main/java/org/ognl/ASTBitOr.java b/src/main/java/ognl/ASTBitOr.java similarity index 97% rename from src/main/java/org/ognl/ASTBitOr.java rename to src/main/java/ognl/ASTBitOr.java index 483d8a15..18ffe36b 100644 --- a/src/main/java/org/ognl/ASTBitOr.java +++ b/src/main/java/ognl/ASTBitOr.java @@ -16,7 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; + +import ognl.OgnlParser; public class ASTBitOr extends NumericExpression { diff --git a/src/main/java/org/ognl/ASTChain.java b/src/main/java/ognl/ASTChain.java similarity index 98% rename from src/main/java/org/ognl/ASTChain.java rename to src/main/java/ognl/ASTChain.java index 21b0b3b5..63725c0b 100644 --- a/src/main/java/org/ognl/ASTChain.java +++ b/src/main/java/ognl/ASTChain.java @@ -16,11 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; -import org.ognl.enhance.ExpressionCompiler; -import org.ognl.enhance.OrderedReturn; -import org.ognl.enhance.UnsupportedCompilationException; +import ognl.OgnlParser; +import ognl.enhance.ExpressionCompiler; +import ognl.enhance.OrderedReturn; +import ognl.enhance.UnsupportedCompilationException; import java.lang.reflect.Array; diff --git a/src/main/java/org/ognl/ASTConst.java b/src/main/java/ognl/ASTConst.java similarity index 98% rename from src/main/java/org/ognl/ASTConst.java rename to src/main/java/ognl/ASTConst.java index 3e7c0f79..e8331240 100644 --- a/src/main/java/org/ognl/ASTConst.java +++ b/src/main/java/ognl/ASTConst.java @@ -16,9 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; -import org.ognl.enhance.UnsupportedCompilationException; +import ognl.OgnlParser; +import ognl.enhance.UnsupportedCompilationException; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/src/main/java/org/ognl/ASTCtor.java b/src/main/java/ognl/ASTCtor.java similarity index 99% rename from src/main/java/org/ognl/ASTCtor.java rename to src/main/java/ognl/ASTCtor.java index 5262d7b1..59b011a6 100644 --- a/src/main/java/org/ognl/ASTCtor.java +++ b/src/main/java/ognl/ASTCtor.java @@ -16,9 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; -import org.ognl.enhance.ExpressionCompiler; +import ognl.OgnlParser; +import ognl.enhance.ExpressionCompiler; import java.lang.reflect.Array; import java.lang.reflect.Constructor; diff --git a/src/main/java/org/ognl/ASTDivide.java b/src/main/java/ognl/ASTDivide.java similarity index 97% rename from src/main/java/org/ognl/ASTDivide.java rename to src/main/java/ognl/ASTDivide.java index 59afa54b..69053eff 100644 --- a/src/main/java/org/ognl/ASTDivide.java +++ b/src/main/java/ognl/ASTDivide.java @@ -16,7 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; + +import ognl.OgnlParser; public class ASTDivide extends NumericExpression { diff --git a/src/main/java/org/ognl/ASTEq.java b/src/main/java/ognl/ASTEq.java similarity index 95% rename from src/main/java/org/ognl/ASTEq.java rename to src/main/java/ognl/ASTEq.java index 0d50daa3..fce6b1cf 100644 --- a/src/main/java/org/ognl/ASTEq.java +++ b/src/main/java/ognl/ASTEq.java @@ -16,7 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; + +import ognl.OgnlParser; public class ASTEq extends ComparisonExpression { @@ -41,6 +43,6 @@ public String getExpressionOperator(int index) { } public String getComparisonFunction() { - return "org.ognl.OgnlOps.equal"; + return "ognl.OgnlOps.equal"; } } diff --git a/src/main/java/org/ognl/ASTEval.java b/src/main/java/ognl/ASTEval.java similarity index 96% rename from src/main/java/org/ognl/ASTEval.java rename to src/main/java/ognl/ASTEval.java index d2e8ecb7..20e1c671 100644 --- a/src/main/java/org/ognl/ASTEval.java +++ b/src/main/java/ognl/ASTEval.java @@ -16,9 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; -import org.ognl.enhance.UnsupportedCompilationException; +import ognl.OgnlParser; +import ognl.enhance.UnsupportedCompilationException; public class ASTEval extends SimpleNode { diff --git a/src/main/java/org/ognl/ASTGreater.java b/src/main/java/ognl/ASTGreater.java similarity index 95% rename from src/main/java/org/ognl/ASTGreater.java rename to src/main/java/ognl/ASTGreater.java index d23c9f7c..eb9bd175 100644 --- a/src/main/java/org/ognl/ASTGreater.java +++ b/src/main/java/ognl/ASTGreater.java @@ -16,7 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; + +import ognl.OgnlParser; public class ASTGreater extends ComparisonExpression { @@ -42,6 +44,6 @@ public String getExpressionOperator(int index) { } public String getComparisonFunction() { - return "org.ognl.OgnlOps.greater"; + return "ognl.OgnlOps.greater"; } } diff --git a/src/main/java/org/ognl/ASTGreaterEq.java b/src/main/java/ognl/ASTGreaterEq.java similarity index 95% rename from src/main/java/org/ognl/ASTGreaterEq.java rename to src/main/java/ognl/ASTGreaterEq.java index 26a30a01..56c54e90 100644 --- a/src/main/java/org/ognl/ASTGreaterEq.java +++ b/src/main/java/ognl/ASTGreaterEq.java @@ -16,7 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; + +import ognl.OgnlParser; public class ASTGreaterEq extends ComparisonExpression { @@ -41,6 +43,6 @@ public String getExpressionOperator(int index) { } public String getComparisonFunction() { - return "!org.ognl.OgnlOps.less"; + return "!ognl.OgnlOps.less"; } } diff --git a/src/main/java/org/ognl/ASTIn.java b/src/main/java/ognl/ASTIn.java similarity index 94% rename from src/main/java/org/ognl/ASTIn.java rename to src/main/java/ognl/ASTIn.java index 7d4c3a19..0a741aa9 100644 --- a/src/main/java/org/ognl/ASTIn.java +++ b/src/main/java/ognl/ASTIn.java @@ -16,9 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; -import org.ognl.enhance.UnsupportedCompilationException; +import ognl.OgnlParser; +import ognl.enhance.UnsupportedCompilationException; public class ASTIn extends SimpleNode implements NodeType { @@ -54,7 +55,7 @@ public Class getSetterClass() { public String toGetSourceString(OgnlContext context, Object target) { try { - String result = "org.ognl.OgnlOps.in( ($w) "; + String result = "ognl.OgnlOps.in( ($w) "; result += OgnlRuntime.getChildSource(context, target, children[0]) + ", ($w) " + OgnlRuntime.getChildSource(context, target, children[1]); diff --git a/src/main/java/org/ognl/ASTInstanceof.java b/src/main/java/ognl/ASTInstanceof.java similarity index 98% rename from src/main/java/org/ognl/ASTInstanceof.java rename to src/main/java/ognl/ASTInstanceof.java index ad5b957c..eabc66ca 100644 --- a/src/main/java/org/ognl/ASTInstanceof.java +++ b/src/main/java/ognl/ASTInstanceof.java @@ -16,7 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; + +import ognl.OgnlParser; public class ASTInstanceof extends SimpleNode implements NodeType { diff --git a/src/main/java/org/ognl/ASTKeyValue.java b/src/main/java/ognl/ASTKeyValue.java similarity index 97% rename from src/main/java/org/ognl/ASTKeyValue.java rename to src/main/java/ognl/ASTKeyValue.java index 044e63a6..9dae7e13 100644 --- a/src/main/java/org/ognl/ASTKeyValue.java +++ b/src/main/java/ognl/ASTKeyValue.java @@ -16,7 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; + +import ognl.OgnlParser; public class ASTKeyValue extends SimpleNode { diff --git a/src/main/java/org/ognl/ASTLess.java b/src/main/java/ognl/ASTLess.java similarity index 95% rename from src/main/java/org/ognl/ASTLess.java rename to src/main/java/ognl/ASTLess.java index a2a7dd38..354a3d49 100644 --- a/src/main/java/org/ognl/ASTLess.java +++ b/src/main/java/ognl/ASTLess.java @@ -16,7 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; + +import ognl.OgnlParser; class ASTLess extends ComparisonExpression { @@ -42,6 +44,6 @@ public String getExpressionOperator(int index) { } public String getComparisonFunction() { - return "org.ognl.OgnlOps.less"; + return "ognl.OgnlOps.less"; } } diff --git a/src/main/java/org/ognl/ASTLessEq.java b/src/main/java/ognl/ASTLessEq.java similarity index 94% rename from src/main/java/org/ognl/ASTLessEq.java rename to src/main/java/ognl/ASTLessEq.java index fc8cc00c..88c2137f 100644 --- a/src/main/java/org/ognl/ASTLessEq.java +++ b/src/main/java/ognl/ASTLessEq.java @@ -16,7 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; + +import ognl.OgnlParser; public class ASTLessEq extends ComparisonExpression { @@ -41,7 +43,7 @@ public String getExpressionOperator(int index) { } public String getComparisonFunction() { - return "!org.ognl.OgnlOps.greater"; + return "!ognl.OgnlOps.greater"; } } diff --git a/src/main/java/org/ognl/ASTList.java b/src/main/java/ognl/ASTList.java similarity index 93% rename from src/main/java/org/ognl/ASTList.java rename to src/main/java/ognl/ASTList.java index 6012cf38..a88b47a2 100644 --- a/src/main/java/org/ognl/ASTList.java +++ b/src/main/java/ognl/ASTList.java @@ -16,10 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; -import org.ognl.enhance.ExpressionCompiler; -import org.ognl.enhance.UnsupportedCompilationException; +import ognl.OgnlParser; +import ognl.enhance.ExpressionCompiler; +import ognl.enhance.UnsupportedCompilationException; import java.util.ArrayList; import java.util.List; @@ -124,14 +125,14 @@ public String toGetSourceString(OgnlContext context, Object target) { value = OgnlRuntime.getCompiler().createLocalReference(context, "(" + ExpressionCompiler.getCastString(ctorClass) - + ")org.ognl.OgnlOps.toArray(" + value + ", " + ctorClass.getComponentType().getName() + + ")ognl.OgnlOps.toArray(" + value + ", " + ctorClass.getComponentType().getName() + ".class, true)", ctorClass ); } else if (ctorClass != Object.class) { value = OgnlRuntime.getCompiler().createLocalReference(context, - "(" + ctorClass.getName() + ")org.ognl.OgnlOps.convertValue(" + value + "," + ctorClass.getName() + ".class)", + "(" + ctorClass.getName() + ")ognl.OgnlOps.convertValue(" + value + "," + ctorClass.getName() + ".class)", ctorClass ); } else if ((children[i] instanceof NodeType diff --git a/src/main/java/org/ognl/ASTMap.java b/src/main/java/ognl/ASTMap.java similarity index 97% rename from src/main/java/org/ognl/ASTMap.java rename to src/main/java/ognl/ASTMap.java index d2b50a33..dd9ad1a0 100644 --- a/src/main/java/org/ognl/ASTMap.java +++ b/src/main/java/ognl/ASTMap.java @@ -16,9 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; -import org.ognl.enhance.UnsupportedCompilationException; +import ognl.OgnlParser; +import ognl.enhance.UnsupportedCompilationException; import java.util.LinkedHashMap; import java.util.Map; diff --git a/src/main/java/org/ognl/ASTMethod.java b/src/main/java/ognl/ASTMethod.java similarity index 96% rename from src/main/java/org/ognl/ASTMethod.java rename to src/main/java/ognl/ASTMethod.java index 42bb9fbc..d677d035 100644 --- a/src/main/java/org/ognl/ASTMethod.java +++ b/src/main/java/ognl/ASTMethod.java @@ -16,11 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; -import org.ognl.enhance.ExpressionCompiler; -import org.ognl.enhance.OrderedReturn; -import org.ognl.enhance.UnsupportedCompilationException; +import ognl.OgnlParser; +import ognl.enhance.ExpressionCompiler; +import ognl.enhance.OrderedReturn; +import ognl.enhance.UnsupportedCompilationException; import java.lang.reflect.Method; import java.util.List; @@ -211,7 +212,7 @@ public String toGetSourceString(OgnlContext context, Object target) { parmString = OgnlRuntime.getCompiler().createLocalReference(context, "(" + ExpressionCompiler.getCastString(parms[i]) - + ")org.ognl.OgnlOps#toArray(" + parmString + ", " + parms[i].getComponentType().getName() + + ")ognl.OgnlOps#toArray(" + parmString + ", " + parms[i].getComponentType().getName() + ".class, true)", parms[i] ); @@ -222,7 +223,7 @@ public String toGetSourceString(OgnlContext context, Object target) { parmString = OgnlRuntime.getCompiler().createLocalReference(context, "((" + wrapClass.getName() - + ")org.ognl.OgnlOps#convertValue(" + parmString + "," + + ")ognl.OgnlOps#convertValue(" + parmString + "," + wrapClass.getName() + ".class, true))." + OgnlRuntime.getNumericValueGetter(wrapClass), parms[i] @@ -230,7 +231,7 @@ public String toGetSourceString(OgnlContext context, Object target) { } else if (parms[i] != Object.class) { parmString = OgnlRuntime.getCompiler().createLocalReference(context, - "(" + parms[i].getName() + ")org.ognl.OgnlOps#convertValue(" + parmString + "," + parms[i].getName() + ".class)", + "(" + parms[i].getName() + ")ognl.OgnlOps#convertValue(" + parmString + "," + parms[i].getName() + ".class)", parms[i] ); } else if ((children[i] instanceof NodeType @@ -359,7 +360,7 @@ public String toSetSourceString(OgnlContext context, Object target) { if (parms[i].isArray()) { parmString = OgnlRuntime.getCompiler().createLocalReference(context, "(" + ExpressionCompiler.getCastString(parms[i]) - + ")org.ognl.OgnlOps#toArray(" + parmString + ", " + + ")ognl.OgnlOps#toArray(" + parmString + ", " + parms[i].getComponentType().getName() + ".class)", parms[i] @@ -370,7 +371,7 @@ public String toSetSourceString(OgnlContext context, Object target) { parmString = OgnlRuntime.getCompiler().createLocalReference(context, "((" + wrapClass.getName() - + ")org.ognl.OgnlOps#convertValue(" + parmString + "," + + ")ognl.OgnlOps#convertValue(" + parmString + "," + wrapClass.getName() + ".class, true))." + OgnlRuntime.getNumericValueGetter(wrapClass), parms[i] @@ -378,7 +379,7 @@ public String toSetSourceString(OgnlContext context, Object target) { } else if (parms[i] != Object.class) { parmString = OgnlRuntime.getCompiler().createLocalReference(context, - "(" + parms[i].getName() + ")org.ognl.OgnlOps#convertValue(" + "(" + parms[i].getName() + ")ognl.OgnlOps#convertValue(" + parmString + "," + parms[i].getName() + ".class)", parms[i] ); diff --git a/src/main/java/org/ognl/ASTMultiply.java b/src/main/java/ognl/ASTMultiply.java similarity index 97% rename from src/main/java/org/ognl/ASTMultiply.java rename to src/main/java/ognl/ASTMultiply.java index ecd11373..03216cbb 100644 --- a/src/main/java/org/ognl/ASTMultiply.java +++ b/src/main/java/ognl/ASTMultiply.java @@ -16,7 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; + +import ognl.OgnlParser; public class ASTMultiply extends NumericExpression { diff --git a/src/main/java/org/ognl/ASTNegate.java b/src/main/java/ognl/ASTNegate.java similarity index 98% rename from src/main/java/org/ognl/ASTNegate.java rename to src/main/java/ognl/ASTNegate.java index 28c59ad7..7064c0bb 100644 --- a/src/main/java/org/ognl/ASTNegate.java +++ b/src/main/java/ognl/ASTNegate.java @@ -16,7 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; + +import ognl.OgnlParser; public class ASTNegate extends NumericExpression { diff --git a/src/main/java/org/ognl/ASTNot.java b/src/main/java/ognl/ASTNot.java similarity index 94% rename from src/main/java/org/ognl/ASTNot.java rename to src/main/java/ognl/ASTNot.java index aed9be57..5023d931 100644 --- a/src/main/java/org/ognl/ASTNot.java +++ b/src/main/java/ognl/ASTNot.java @@ -16,7 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; + +import ognl.OgnlParser; public class ASTNot extends BooleanExpression { @@ -48,7 +50,7 @@ public String toGetSourceString(OgnlContext context, Object target) { context.setCurrentType(Boolean.TYPE); - return "(! org.ognl.OgnlOps.booleanValue(" + srcString + ") )"; + return "(! ognl.OgnlOps.booleanValue(" + srcString + ") )"; } catch (Throwable t) { throw OgnlOps.castToRuntime(t); diff --git a/src/main/java/org/ognl/ASTNotEq.java b/src/main/java/ognl/ASTNotEq.java similarity index 95% rename from src/main/java/org/ognl/ASTNotEq.java rename to src/main/java/ognl/ASTNotEq.java index 11e705d4..bcf167a7 100644 --- a/src/main/java/org/ognl/ASTNotEq.java +++ b/src/main/java/ognl/ASTNotEq.java @@ -16,7 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; + +import ognl.OgnlParser; public class ASTNotEq extends ComparisonExpression { @@ -42,6 +44,6 @@ public String getExpressionOperator(int index) { } public String getComparisonFunction() { - return "!org.ognl.OgnlOps.equal"; + return "!ognl.OgnlOps.equal"; } } diff --git a/src/main/java/org/ognl/ASTNotIn.java b/src/main/java/ognl/ASTNotIn.java similarity index 93% rename from src/main/java/org/ognl/ASTNotIn.java rename to src/main/java/ognl/ASTNotIn.java index 0dce84e1..c715e94e 100644 --- a/src/main/java/org/ognl/ASTNotIn.java +++ b/src/main/java/ognl/ASTNotIn.java @@ -16,9 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; -import org.ognl.enhance.UnsupportedCompilationException; +import ognl.OgnlParser; +import ognl.enhance.UnsupportedCompilationException; public class ASTNotIn extends SimpleNode implements NodeType { @@ -52,7 +53,7 @@ public Class getSetterClass() { public String toGetSourceString(OgnlContext context, Object target) { try { - String result = "(! org.ognl.OgnlOps.in( ($w) "; + String result = "(! ognl.OgnlOps.in( ($w) "; result += OgnlRuntime.getChildSource(context, target, children[0]) + ", ($w) " + OgnlRuntime.getChildSource(context, target, children[1]); result += ") )"; context.setCurrentType(Boolean.TYPE); diff --git a/src/main/java/org/ognl/ASTOr.java b/src/main/java/ognl/ASTOr.java similarity index 95% rename from src/main/java/org/ognl/ASTOr.java rename to src/main/java/ognl/ASTOr.java index e765bdda..8e77ab1c 100644 --- a/src/main/java/org/ognl/ASTOr.java +++ b/src/main/java/ognl/ASTOr.java @@ -16,10 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; -import org.ognl.enhance.ExpressionCompiler; -import org.ognl.enhance.UnsupportedCompilationException; +import ognl.OgnlParser; +import ognl.enhance.ExpressionCompiler; +import ognl.enhance.UnsupportedCompilationException; public class ASTOr extends BooleanExpression { @@ -89,7 +90,7 @@ public String toGetSourceString(OgnlContext context, Object target) { boolean mismatched = (firstType.isPrimitive() && !secondType.isPrimitive()) || (!firstType.isPrimitive() && secondType.isPrimitive()); - result += "org.ognl.OgnlOps.booleanValue(" + first + ")"; + result += "ognl.OgnlOps.booleanValue(" + first + ")"; result += " ? "; result += (mismatched ? " ($w) " : "") + first; result += " : "; @@ -132,7 +133,7 @@ public String toSetSourceString(OgnlContext context, Object target) { if (!OgnlRuntime.isBoolean(second)) second = OgnlRuntime.getCompiler().createLocalReference(context, second, context.getCurrentType()); - result += "org.ognl.OgnlOps.booleanValue(" + first + ")"; + result += "ognl.OgnlOps.booleanValue(" + first + ")"; result += " ? "; diff --git a/src/main/java/org/ognl/ASTProject.java b/src/main/java/ognl/ASTProject.java similarity index 95% rename from src/main/java/org/ognl/ASTProject.java rename to src/main/java/ognl/ASTProject.java index 65e792ef..6f52e4b5 100644 --- a/src/main/java/org/ognl/ASTProject.java +++ b/src/main/java/ognl/ASTProject.java @@ -16,9 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; -import org.ognl.enhance.UnsupportedCompilationException; +import ognl.OgnlParser; +import ognl.enhance.UnsupportedCompilationException; import java.util.ArrayList; import java.util.Enumeration; diff --git a/src/main/java/org/ognl/ASTProperty.java b/src/main/java/ognl/ASTProperty.java similarity index 99% rename from src/main/java/org/ognl/ASTProperty.java rename to src/main/java/ognl/ASTProperty.java index 0a5b58de..6c309da0 100644 --- a/src/main/java/org/ognl/ASTProperty.java +++ b/src/main/java/ognl/ASTProperty.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; -import org.ognl.enhance.ExpressionCompiler; -import org.ognl.enhance.UnsupportedCompilationException; +import ognl.enhance.ExpressionCompiler; +import ognl.enhance.UnsupportedCompilationException; import java.beans.IndexedPropertyDescriptor; import java.beans.PropertyDescriptor; diff --git a/src/main/java/org/ognl/ASTRemainder.java b/src/main/java/ognl/ASTRemainder.java similarity index 97% rename from src/main/java/org/ognl/ASTRemainder.java rename to src/main/java/ognl/ASTRemainder.java index a0e174bf..0d83de80 100644 --- a/src/main/java/org/ognl/ASTRemainder.java +++ b/src/main/java/ognl/ASTRemainder.java @@ -16,7 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; + +import ognl.OgnlParser; public class ASTRemainder extends NumericExpression { diff --git a/src/main/java/org/ognl/ASTRootVarRef.java b/src/main/java/ognl/ASTRootVarRef.java similarity index 96% rename from src/main/java/org/ognl/ASTRootVarRef.java rename to src/main/java/ognl/ASTRootVarRef.java index d874d0ae..a11978f9 100644 --- a/src/main/java/org/ognl/ASTRootVarRef.java +++ b/src/main/java/ognl/ASTRootVarRef.java @@ -16,9 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; -import org.ognl.enhance.ExpressionCompiler; +import ognl.OgnlParser; +import ognl.enhance.ExpressionCompiler; public class ASTRootVarRef extends ASTVarRef { diff --git a/src/main/java/org/ognl/ASTSelect.java b/src/main/java/ognl/ASTSelect.java similarity index 96% rename from src/main/java/org/ognl/ASTSelect.java rename to src/main/java/ognl/ASTSelect.java index e014fd54..c8a706c3 100644 --- a/src/main/java/org/ognl/ASTSelect.java +++ b/src/main/java/ognl/ASTSelect.java @@ -16,9 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; -import org.ognl.enhance.UnsupportedCompilationException; +import ognl.OgnlParser; +import ognl.enhance.UnsupportedCompilationException; import java.util.ArrayList; import java.util.Enumeration; diff --git a/src/main/java/org/ognl/ASTSelectFirst.java b/src/main/java/ognl/ASTSelectFirst.java similarity index 96% rename from src/main/java/org/ognl/ASTSelectFirst.java rename to src/main/java/ognl/ASTSelectFirst.java index c2800abf..69d0729b 100644 --- a/src/main/java/org/ognl/ASTSelectFirst.java +++ b/src/main/java/ognl/ASTSelectFirst.java @@ -16,9 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; -import org.ognl.enhance.UnsupportedCompilationException; +import ognl.OgnlParser; +import ognl.enhance.UnsupportedCompilationException; import java.util.ArrayList; import java.util.Enumeration; diff --git a/src/main/java/org/ognl/ASTSelectLast.java b/src/main/java/ognl/ASTSelectLast.java similarity index 96% rename from src/main/java/org/ognl/ASTSelectLast.java rename to src/main/java/ognl/ASTSelectLast.java index 0621a1a8..91bef001 100644 --- a/src/main/java/org/ognl/ASTSelectLast.java +++ b/src/main/java/ognl/ASTSelectLast.java @@ -16,9 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; -import org.ognl.enhance.UnsupportedCompilationException; +import ognl.OgnlParser; +import ognl.enhance.UnsupportedCompilationException; import java.util.ArrayList; import java.util.Enumeration; diff --git a/src/main/java/org/ognl/ASTSequence.java b/src/main/java/ognl/ASTSequence.java similarity index 97% rename from src/main/java/org/ognl/ASTSequence.java rename to src/main/java/ognl/ASTSequence.java index 02048e8d..e050d79e 100644 --- a/src/main/java/org/ognl/ASTSequence.java +++ b/src/main/java/ognl/ASTSequence.java @@ -16,10 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; -import org.ognl.enhance.ExpressionCompiler; -import org.ognl.enhance.OrderedReturn; +import ognl.OgnlParser; +import ognl.enhance.ExpressionCompiler; +import ognl.enhance.OrderedReturn; public class ASTSequence extends SimpleNode implements NodeType, OrderedReturn { diff --git a/src/main/java/org/ognl/ASTShiftLeft.java b/src/main/java/ognl/ASTShiftLeft.java similarity index 97% rename from src/main/java/org/ognl/ASTShiftLeft.java rename to src/main/java/ognl/ASTShiftLeft.java index dc68f91b..cc9d24cd 100644 --- a/src/main/java/org/ognl/ASTShiftLeft.java +++ b/src/main/java/ognl/ASTShiftLeft.java @@ -16,7 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; + +import ognl.OgnlParser; public class ASTShiftLeft extends NumericExpression { diff --git a/src/main/java/org/ognl/ASTShiftRight.java b/src/main/java/ognl/ASTShiftRight.java similarity index 97% rename from src/main/java/org/ognl/ASTShiftRight.java rename to src/main/java/ognl/ASTShiftRight.java index 37b3dc07..2e7214f3 100644 --- a/src/main/java/org/ognl/ASTShiftRight.java +++ b/src/main/java/ognl/ASTShiftRight.java @@ -16,7 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; + +import ognl.OgnlParser; public class ASTShiftRight extends NumericExpression { diff --git a/src/main/java/org/ognl/ASTStaticField.java b/src/main/java/ognl/ASTStaticField.java similarity index 99% rename from src/main/java/org/ognl/ASTStaticField.java rename to src/main/java/ognl/ASTStaticField.java index ef364223..0287f695 100644 --- a/src/main/java/org/ognl/ASTStaticField.java +++ b/src/main/java/ognl/ASTStaticField.java @@ -16,7 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; + +import ognl.OgnlParser; import java.lang.reflect.Field; import java.lang.reflect.Modifier; diff --git a/src/main/java/org/ognl/ASTStaticMethod.java b/src/main/java/ognl/ASTStaticMethod.java similarity index 94% rename from src/main/java/org/ognl/ASTStaticMethod.java rename to src/main/java/ognl/ASTStaticMethod.java index 62305b02..70016f9b 100644 --- a/src/main/java/org/ognl/ASTStaticMethod.java +++ b/src/main/java/ognl/ASTStaticMethod.java @@ -16,10 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; -import org.ognl.enhance.ExpressionCompiler; -import org.ognl.enhance.UnsupportedCompilationException; +import ognl.OgnlParser; +import ognl.enhance.ExpressionCompiler; +import ognl.enhance.UnsupportedCompilationException; import java.lang.reflect.Method; import java.util.Objects; @@ -143,7 +144,7 @@ public String toGetSourceString(OgnlContext context, Object target) { parmString = OgnlRuntime.getCompiler() .createLocalReference(context, "(" + ExpressionCompiler.getCastString(parms[i]) - + ")org.ognl.OgnlOps.toArray(" + parmString + ", " + parms[i].getComponentType().getName() + + ")ognl.OgnlOps.toArray(" + parmString + ", " + parms[i].getComponentType().getName() + ".class, true)", parms[i] ); @@ -153,7 +154,7 @@ public String toGetSourceString(OgnlContext context, Object target) { parmString = OgnlRuntime.getCompiler().createLocalReference(context, "((" + wrapClass.getName() - + ")org.ognl.OgnlOps.convertValue(" + parmString + "," + + ")ognl.OgnlOps.convertValue(" + parmString + "," + wrapClass.getName() + ".class, true))." + OgnlRuntime.getNumericValueGetter(wrapClass), parms[i] @@ -162,7 +163,7 @@ public String toGetSourceString(OgnlContext context, Object target) { } else if (parms[i] != Object.class) { parmString = OgnlRuntime.getCompiler() .createLocalReference(context, - "(" + parms[i].getName() + ")org.ognl.OgnlOps.convertValue(" + parmString + "," + parms[i].getName() + ".class)", + "(" + parms[i].getName() + ")ognl.OgnlOps.convertValue(" + parmString + "," + parms[i].getName() + ".class)", parms[i] ); } else if ((children[i] instanceof NodeType diff --git a/src/main/java/org/ognl/ASTSubtract.java b/src/main/java/ognl/ASTSubtract.java similarity index 97% rename from src/main/java/org/ognl/ASTSubtract.java rename to src/main/java/ognl/ASTSubtract.java index 30511e7c..94e0b683 100644 --- a/src/main/java/org/ognl/ASTSubtract.java +++ b/src/main/java/ognl/ASTSubtract.java @@ -16,7 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; + +import ognl.OgnlParser; public class ASTSubtract extends NumericExpression { diff --git a/src/main/java/org/ognl/ASTTest.java b/src/main/java/ognl/ASTTest.java similarity index 96% rename from src/main/java/org/ognl/ASTTest.java rename to src/main/java/ognl/ASTTest.java index c3a028d8..41102ec2 100644 --- a/src/main/java/org/ognl/ASTTest.java +++ b/src/main/java/ognl/ASTTest.java @@ -16,9 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; -import org.ognl.enhance.UnsupportedCompilationException; +import ognl.OgnlParser; +import ognl.enhance.UnsupportedCompilationException; public class ASTTest extends ExpressionNode { @@ -89,7 +90,7 @@ public String toGetSourceString(OgnlContext context, Object target) { boolean mismatched = (secondType.isPrimitive() && !thirdType.isPrimitive()) || (!secondType.isPrimitive() && thirdType.isPrimitive()); - result += "org.ognl.OgnlOps.booleanValue(" + first + ")"; + result += "ognl.OgnlOps.booleanValue(" + first + ")"; result += " ? "; result += (mismatched ? " ($w) " : "") + second; result += " : "; diff --git a/src/main/java/org/ognl/ASTThisVarRef.java b/src/main/java/ognl/ASTThisVarRef.java similarity index 95% rename from src/main/java/org/ognl/ASTThisVarRef.java rename to src/main/java/ognl/ASTThisVarRef.java index 22cd8a12..8eb24851 100644 --- a/src/main/java/org/ognl/ASTThisVarRef.java +++ b/src/main/java/ognl/ASTThisVarRef.java @@ -16,9 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; -import org.ognl.enhance.UnsupportedCompilationException; +import ognl.OgnlParser; +import ognl.enhance.UnsupportedCompilationException; public class ASTThisVarRef extends ASTVarRef { diff --git a/src/main/java/org/ognl/ASTUnsignedShiftRight.java b/src/main/java/ognl/ASTUnsignedShiftRight.java similarity index 98% rename from src/main/java/org/ognl/ASTUnsignedShiftRight.java rename to src/main/java/ognl/ASTUnsignedShiftRight.java index 3a180f23..5cde1c5b 100644 --- a/src/main/java/org/ognl/ASTUnsignedShiftRight.java +++ b/src/main/java/ognl/ASTUnsignedShiftRight.java @@ -16,7 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; + +import ognl.OgnlParser; public class ASTUnsignedShiftRight extends NumericExpression { diff --git a/src/main/java/org/ognl/ASTVarRef.java b/src/main/java/ognl/ASTVarRef.java similarity index 96% rename from src/main/java/org/ognl/ASTVarRef.java rename to src/main/java/ognl/ASTVarRef.java index e7c1f1cd..057ce460 100644 --- a/src/main/java/org/ognl/ASTVarRef.java +++ b/src/main/java/ognl/ASTVarRef.java @@ -16,10 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; -import org.ognl.enhance.OrderedReturn; -import org.ognl.enhance.UnsupportedCompilationException; +import ognl.OgnlParser; +import ognl.enhance.OrderedReturn; +import ognl.enhance.UnsupportedCompilationException; public class ASTVarRef extends SimpleNode implements NodeType, OrderedReturn { diff --git a/src/main/java/org/ognl/ASTXor.java b/src/main/java/ognl/ASTXor.java similarity index 97% rename from src/main/java/org/ognl/ASTXor.java rename to src/main/java/ognl/ASTXor.java index 78a9fc08..74767caf 100644 --- a/src/main/java/org/ognl/ASTXor.java +++ b/src/main/java/ognl/ASTXor.java @@ -16,7 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; + +import ognl.OgnlParser; public class ASTXor extends NumericExpression { diff --git a/src/main/java/org/ognl/AbstractMemberAccess.java b/src/main/java/ognl/AbstractMemberAccess.java similarity index 96% rename from src/main/java/org/ognl/AbstractMemberAccess.java rename to src/main/java/ognl/AbstractMemberAccess.java index 114b9a39..9bc0b3dc 100644 --- a/src/main/java/org/ognl/AbstractMemberAccess.java +++ b/src/main/java/ognl/AbstractMemberAccess.java @@ -16,10 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; import java.lang.reflect.Member; -import java.util.Map; /** * Used as a based class diff --git a/src/main/java/org/ognl/AccessibleObjectHandler.java b/src/main/java/ognl/AccessibleObjectHandler.java similarity index 98% rename from src/main/java/org/ognl/AccessibleObjectHandler.java rename to src/main/java/ognl/AccessibleObjectHandler.java index 0044377a..ffe4738e 100644 --- a/src/main/java/org/ognl/AccessibleObjectHandler.java +++ b/src/main/java/ognl/AccessibleObjectHandler.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; import java.lang.reflect.AccessibleObject; diff --git a/src/main/java/org/ognl/AccessibleObjectHandlerJDK9Plus.java b/src/main/java/ognl/AccessibleObjectHandlerJDK9Plus.java similarity index 99% rename from src/main/java/org/ognl/AccessibleObjectHandlerJDK9Plus.java rename to src/main/java/ognl/AccessibleObjectHandlerJDK9Plus.java index d1d09941..80de6107 100644 --- a/src/main/java/org/ognl/AccessibleObjectHandlerJDK9Plus.java +++ b/src/main/java/ognl/AccessibleObjectHandlerJDK9Plus.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; import java.lang.reflect.AccessibleObject; import java.lang.reflect.Field; diff --git a/src/main/java/org/ognl/AccessibleObjectHandlerPreJDK9.java b/src/main/java/ognl/AccessibleObjectHandlerPreJDK9.java similarity index 99% rename from src/main/java/org/ognl/AccessibleObjectHandlerPreJDK9.java rename to src/main/java/ognl/AccessibleObjectHandlerPreJDK9.java index a30b8f2d..b8bcdabe 100644 --- a/src/main/java/org/ognl/AccessibleObjectHandlerPreJDK9.java +++ b/src/main/java/ognl/AccessibleObjectHandlerPreJDK9.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; import java.lang.reflect.AccessibleObject; diff --git a/src/main/java/org/ognl/ArrayElementsAccessor.java b/src/main/java/ognl/ArrayElementsAccessor.java similarity index 98% rename from src/main/java/org/ognl/ArrayElementsAccessor.java rename to src/main/java/ognl/ArrayElementsAccessor.java index fbbbe6fd..e9756cab 100644 --- a/src/main/java/org/ognl/ArrayElementsAccessor.java +++ b/src/main/java/ognl/ArrayElementsAccessor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; import java.lang.reflect.Array; import java.util.Enumeration; diff --git a/src/main/java/org/ognl/ArrayPropertyAccessor.java b/src/main/java/ognl/ArrayPropertyAccessor.java similarity index 95% rename from src/main/java/org/ognl/ArrayPropertyAccessor.java rename to src/main/java/ognl/ArrayPropertyAccessor.java index 33bd2534..6b568515 100644 --- a/src/main/java/org/ognl/ArrayPropertyAccessor.java +++ b/src/main/java/ognl/ArrayPropertyAccessor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; import java.lang.reflect.Array; @@ -124,7 +124,7 @@ public String getSourceAccessor(OgnlContext context, Object target, Object index && !context.getCurrentType().isPrimitive()) { // means it needs to be cast first as well String toString = index instanceof String && context.getCurrentType() != Object.class ? "" : ".toString()"; - indexStr = "org.ognl.OgnlOps#getIntValue(" + indexStr + toString + ")"; + indexStr = "ognl.OgnlOps#getIntValue(" + indexStr + toString + ")"; } context.setCurrentAccessor(target.getClass()); @@ -145,7 +145,7 @@ public String getSourceSetter(OgnlContext context, Object target, Object index) && !context.getCurrentType().isPrimitive()) { // means it needs to be cast first as well String toString = index instanceof String && context.getCurrentType() != Object.class ? "" : ".toString()"; - indexStr = "org.ognl.OgnlOps#getIntValue(" + indexStr + toString + ")"; + indexStr = "ognl.OgnlOps#getIntValue(" + indexStr + toString + ")"; } Class type = target.getClass().isArray() ? target.getClass().getComponentType() : target.getClass(); @@ -155,10 +155,10 @@ public String getSourceSetter(OgnlContext context, Object target, Object index) if (type.isPrimitive()) { Class wrapClass = OgnlRuntime.getPrimitiveWrapperClass(type); - return "[" + indexStr + "]=((" + wrapClass.getName() + ")org.ognl.OgnlOps.convertValue($3," + wrapClass.getName() + return "[" + indexStr + "]=((" + wrapClass.getName() + ")ognl.OgnlOps.convertValue($3," + wrapClass.getName() + ".class, true))." + OgnlRuntime.getNumericValueGetter(wrapClass); } else { - return "[" + indexStr + "]=org.ognl.OgnlOps.convertValue($3," + type.getName() + ".class)"; + return "[" + indexStr + "]=ognl.OgnlOps.convertValue($3," + type.getName() + ".class)"; } } } diff --git a/src/main/java/org/ognl/BooleanExpression.java b/src/main/java/ognl/BooleanExpression.java similarity index 96% rename from src/main/java/org/ognl/BooleanExpression.java rename to src/main/java/ognl/BooleanExpression.java index 61846932..a7e9edb4 100644 --- a/src/main/java/org/ognl/BooleanExpression.java +++ b/src/main/java/ognl/BooleanExpression.java @@ -16,9 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; -import org.ognl.enhance.UnsupportedCompilationException; +import ognl.OgnlParser; +import ognl.enhance.UnsupportedCompilationException; /** * Base class for boolean expressions. diff --git a/src/main/java/org/ognl/ClassCacheInspector.java b/src/main/java/ognl/ClassCacheInspector.java similarity index 98% rename from src/main/java/org/ognl/ClassCacheInspector.java rename to src/main/java/ognl/ClassCacheInspector.java index fc9efc44..708b92e6 100644 --- a/src/main/java/org/ognl/ClassCacheInspector.java +++ b/src/main/java/ognl/ClassCacheInspector.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; /** * Optional interface that may be registered with {@link OgnlRuntime#setClassCacheInspector(ClassCacheInspector)} diff --git a/src/main/java/org/ognl/ClassResolver.java b/src/main/java/ognl/ClassResolver.java similarity index 98% rename from src/main/java/org/ognl/ClassResolver.java rename to src/main/java/ognl/ClassResolver.java index 9098ef0d..0403d511 100644 --- a/src/main/java/org/ognl/ClassResolver.java +++ b/src/main/java/ognl/ClassResolver.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; /** * This interface defines an object that will resolve a class from a string diff --git a/src/main/java/org/ognl/CollectionElementsAccessor.java b/src/main/java/ognl/CollectionElementsAccessor.java similarity index 98% rename from src/main/java/org/ognl/CollectionElementsAccessor.java rename to src/main/java/ognl/CollectionElementsAccessor.java index 41047bd8..ad1803a6 100644 --- a/src/main/java/org/ognl/CollectionElementsAccessor.java +++ b/src/main/java/ognl/CollectionElementsAccessor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; import java.util.Collection; import java.util.Enumeration; diff --git a/src/main/java/org/ognl/ComparisonExpression.java b/src/main/java/ognl/ComparisonExpression.java similarity index 97% rename from src/main/java/org/ognl/ComparisonExpression.java rename to src/main/java/ognl/ComparisonExpression.java index cecc2fe8..a777763d 100644 --- a/src/main/java/org/ognl/ComparisonExpression.java +++ b/src/main/java/ognl/ComparisonExpression.java @@ -16,9 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; -import org.ognl.enhance.UnsupportedCompilationException; +import ognl.OgnlParser; +import ognl.enhance.UnsupportedCompilationException; /** * Base class for types that compare values. diff --git a/src/main/java/org/ognl/DefaultClassResolver.java b/src/main/java/ognl/DefaultClassResolver.java similarity index 99% rename from src/main/java/org/ognl/DefaultClassResolver.java rename to src/main/java/ognl/DefaultClassResolver.java index 690a77d8..a8eb76a4 100644 --- a/src/main/java/org/ognl/DefaultClassResolver.java +++ b/src/main/java/ognl/DefaultClassResolver.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; import java.util.concurrent.ConcurrentHashMap; diff --git a/src/main/java/org/ognl/DefaultTypeConverter.java b/src/main/java/ognl/DefaultTypeConverter.java similarity index 97% rename from src/main/java/org/ognl/DefaultTypeConverter.java rename to src/main/java/ognl/DefaultTypeConverter.java index facd1d01..24132406 100644 --- a/src/main/java/org/ognl/DefaultTypeConverter.java +++ b/src/main/java/ognl/DefaultTypeConverter.java @@ -16,10 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; import java.lang.reflect.Member; -import java.util.Map; /** * Default type conversion. Converts among numeric types and also strings. diff --git a/src/main/java/org/ognl/DynamicSubscript.java b/src/main/java/ognl/DynamicSubscript.java similarity index 99% rename from src/main/java/org/ognl/DynamicSubscript.java rename to src/main/java/ognl/DynamicSubscript.java index 34926f26..7fcaef8c 100644 --- a/src/main/java/org/ognl/DynamicSubscript.java +++ b/src/main/java/ognl/DynamicSubscript.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; /** * This class has predefined instances that stand for OGNL's special "dynamic subscripts" diff --git a/src/main/java/org/ognl/ElementsAccessor.java b/src/main/java/ognl/ElementsAccessor.java similarity index 99% rename from src/main/java/org/ognl/ElementsAccessor.java rename to src/main/java/ognl/ElementsAccessor.java index b252bc71..46c1c358 100644 --- a/src/main/java/org/ognl/ElementsAccessor.java +++ b/src/main/java/ognl/ElementsAccessor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; import java.util.Enumeration; diff --git a/src/main/java/org/ognl/EnumerationElementsAccessor.java b/src/main/java/ognl/EnumerationElementsAccessor.java similarity index 98% rename from src/main/java/org/ognl/EnumerationElementsAccessor.java rename to src/main/java/ognl/EnumerationElementsAccessor.java index 71c581c5..58fbae40 100644 --- a/src/main/java/org/ognl/EnumerationElementsAccessor.java +++ b/src/main/java/ognl/EnumerationElementsAccessor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; import java.util.Enumeration; diff --git a/src/main/java/org/ognl/EnumerationIterator.java b/src/main/java/ognl/EnumerationIterator.java similarity index 98% rename from src/main/java/org/ognl/EnumerationIterator.java rename to src/main/java/ognl/EnumerationIterator.java index ba6ff898..9a3b3a0c 100644 --- a/src/main/java/org/ognl/EnumerationIterator.java +++ b/src/main/java/ognl/EnumerationIterator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; import java.util.Enumeration; import java.util.Iterator; diff --git a/src/main/java/org/ognl/EnumerationPropertyAccessor.java b/src/main/java/ognl/EnumerationPropertyAccessor.java similarity index 99% rename from src/main/java/org/ognl/EnumerationPropertyAccessor.java rename to src/main/java/ognl/EnumerationPropertyAccessor.java index d124dbd7..20c359c6 100644 --- a/src/main/java/org/ognl/EnumerationPropertyAccessor.java +++ b/src/main/java/ognl/EnumerationPropertyAccessor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; import java.util.Enumeration; diff --git a/src/main/java/org/ognl/Evaluation.java b/src/main/java/ognl/Evaluation.java similarity index 99% rename from src/main/java/org/ognl/Evaluation.java rename to src/main/java/ognl/Evaluation.java index 054871df..192064ca 100644 --- a/src/main/java/org/ognl/Evaluation.java +++ b/src/main/java/ognl/Evaluation.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; /** * An Evaluation is and object that holds a node being evaluated diff --git a/src/main/java/org/ognl/EvaluationPool.java b/src/main/java/ognl/EvaluationPool.java similarity index 99% rename from src/main/java/org/ognl/EvaluationPool.java rename to src/main/java/ognl/EvaluationPool.java index 273b5e28..e933a39c 100644 --- a/src/main/java/org/ognl/EvaluationPool.java +++ b/src/main/java/ognl/EvaluationPool.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; public final class EvaluationPool { diff --git a/src/main/java/org/ognl/ExpressionNode.java b/src/main/java/ognl/ExpressionNode.java similarity index 98% rename from src/main/java/org/ognl/ExpressionNode.java rename to src/main/java/ognl/ExpressionNode.java index bfb14170..63dfcaec 100644 --- a/src/main/java/org/ognl/ExpressionNode.java +++ b/src/main/java/ognl/ExpressionNode.java @@ -16,9 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; -import org.ognl.enhance.ExpressionCompiler; +import ognl.OgnlParser; +import ognl.enhance.ExpressionCompiler; public abstract class ExpressionNode extends SimpleNode { diff --git a/src/main/java/org/ognl/ExpressionSyntaxException.java b/src/main/java/ognl/ExpressionSyntaxException.java similarity index 98% rename from src/main/java/org/ognl/ExpressionSyntaxException.java rename to src/main/java/ognl/ExpressionSyntaxException.java index da9ea039..6007b580 100644 --- a/src/main/java/org/ognl/ExpressionSyntaxException.java +++ b/src/main/java/ognl/ExpressionSyntaxException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; /** * Exception thrown if a malformed OGNL expression is encountered. diff --git a/src/main/java/org/ognl/InappropriateExpressionException.java b/src/main/java/ognl/InappropriateExpressionException.java similarity index 98% rename from src/main/java/org/ognl/InappropriateExpressionException.java rename to src/main/java/ognl/InappropriateExpressionException.java index 681b7811..e02f3a59 100644 --- a/src/main/java/org/ognl/InappropriateExpressionException.java +++ b/src/main/java/ognl/InappropriateExpressionException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; /** * Exception thrown if an OGNL expression is evaluated in the wrong context; the usual diff --git a/src/main/java/org/ognl/IteratorElementsAccessor.java b/src/main/java/ognl/IteratorElementsAccessor.java similarity index 98% rename from src/main/java/org/ognl/IteratorElementsAccessor.java rename to src/main/java/ognl/IteratorElementsAccessor.java index 2a47fff5..88f596fc 100644 --- a/src/main/java/org/ognl/IteratorElementsAccessor.java +++ b/src/main/java/ognl/IteratorElementsAccessor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; import java.util.Enumeration; import java.util.Iterator; diff --git a/src/main/java/org/ognl/IteratorEnumeration.java b/src/main/java/ognl/IteratorEnumeration.java similarity index 98% rename from src/main/java/org/ognl/IteratorEnumeration.java rename to src/main/java/ognl/IteratorEnumeration.java index 2bee689e..1f3783d3 100644 --- a/src/main/java/org/ognl/IteratorEnumeration.java +++ b/src/main/java/ognl/IteratorEnumeration.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; import java.util.Enumeration; import java.util.Iterator; diff --git a/src/main/java/org/ognl/IteratorPropertyAccessor.java b/src/main/java/ognl/IteratorPropertyAccessor.java similarity index 99% rename from src/main/java/org/ognl/IteratorPropertyAccessor.java rename to src/main/java/ognl/IteratorPropertyAccessor.java index 5e861ed7..0480d3f4 100644 --- a/src/main/java/org/ognl/IteratorPropertyAccessor.java +++ b/src/main/java/ognl/IteratorPropertyAccessor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; import java.util.Iterator; diff --git a/src/main/java/org/ognl/JJTOgnlParserState.java b/src/main/java/ognl/JJTOgnlParserState.java similarity index 99% rename from src/main/java/org/ognl/JJTOgnlParserState.java rename to src/main/java/ognl/JJTOgnlParserState.java index 81eaa639..30b3059d 100644 --- a/src/main/java/org/ognl/JJTOgnlParserState.java +++ b/src/main/java/ognl/JJTOgnlParserState.java @@ -1,5 +1,5 @@ /* Generated By:JavaCC: Do not edit this line. JJTOgnlParserState.java Version 4.1d1 */ -package org.ognl; +package ognl; public class JJTOgnlParserState { private java.util.List nodes; diff --git a/src/main/java/org/ognl/JavaSource.java b/src/main/java/ognl/JavaSource.java similarity index 97% rename from src/main/java/org/ognl/JavaSource.java rename to src/main/java/ognl/JavaSource.java index 02caa291..75195e6a 100644 --- a/src/main/java/org/ognl/JavaSource.java +++ b/src/main/java/ognl/JavaSource.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; -import org.ognl.enhance.ExpressionAccessor; +import ognl.enhance.ExpressionAccessor; /** * Defines an object that can return a representation of itself and any objects it contains diff --git a/src/main/java/org/ognl/ListPropertyAccessor.java b/src/main/java/ognl/ListPropertyAccessor.java similarity index 98% rename from src/main/java/org/ognl/ListPropertyAccessor.java rename to src/main/java/ognl/ListPropertyAccessor.java index ee0d3df4..685dad02 100644 --- a/src/main/java/org/ognl/ListPropertyAccessor.java +++ b/src/main/java/ognl/ListPropertyAccessor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; import java.lang.reflect.Method; import java.util.ArrayList; @@ -187,7 +187,7 @@ public String getSourceAccessor(OgnlContext context, Object target, Object index String toString = index instanceof String && context.getCurrentType() != Object.class ? "" : ".toString()"; - indexStr = "org.ognl.OgnlOps#getIntValue(" + indexStr + toString + ")"; + indexStr = "ognl.OgnlOps#getIntValue(" + indexStr + toString + ")"; } context.setCurrentType(Object.class); @@ -228,7 +228,7 @@ public String getSourceSetter(OgnlContext context, Object target, Object index) } else if (context.getCurrentObject() != null && Number.class.isAssignableFrom(context.getCurrentObject().getClass()) && !context.getCurrentType().isPrimitive()) { // means it needs to be cast first as well String toString = index instanceof String && context.getCurrentType() != Object.class ? "" : ".toString()"; - indexStr = "org.ognl.OgnlOps#getIntValue(" + indexStr + toString + ")"; + indexStr = "ognl.OgnlOps#getIntValue(" + indexStr + toString + ")"; } context.setCurrentType(Object.class); diff --git a/src/main/java/org/ognl/MapElementsAccessor.java b/src/main/java/ognl/MapElementsAccessor.java similarity index 98% rename from src/main/java/org/ognl/MapElementsAccessor.java rename to src/main/java/ognl/MapElementsAccessor.java index 6a5e39bc..05ffdc3b 100644 --- a/src/main/java/org/ognl/MapElementsAccessor.java +++ b/src/main/java/ognl/MapElementsAccessor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; import java.util.Enumeration; import java.util.Map; diff --git a/src/main/java/org/ognl/MapPropertyAccessor.java b/src/main/java/ognl/MapPropertyAccessor.java similarity index 99% rename from src/main/java/org/ognl/MapPropertyAccessor.java rename to src/main/java/ognl/MapPropertyAccessor.java index e32dbd07..feab17f2 100644 --- a/src/main/java/org/ognl/MapPropertyAccessor.java +++ b/src/main/java/ognl/MapPropertyAccessor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; import java.util.Collection; import java.util.Map; diff --git a/src/main/java/org/ognl/MemberAccess.java b/src/main/java/ognl/MemberAccess.java similarity index 99% rename from src/main/java/org/ognl/MemberAccess.java rename to src/main/java/ognl/MemberAccess.java index 8f840e17..8ea4fbff 100644 --- a/src/main/java/org/ognl/MemberAccess.java +++ b/src/main/java/ognl/MemberAccess.java @@ -28,7 +28,7 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. //-------------------------------------------------------------------------- -package org.ognl; +package ognl; import java.lang.reflect.Member; diff --git a/src/main/java/org/ognl/MethodAccessor.java b/src/main/java/ognl/MethodAccessor.java similarity index 99% rename from src/main/java/org/ognl/MethodAccessor.java rename to src/main/java/ognl/MethodAccessor.java index 92e59e08..4e145f87 100644 --- a/src/main/java/org/ognl/MethodAccessor.java +++ b/src/main/java/ognl/MethodAccessor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; /** * This interface defines methods for calling methods in a target object. diff --git a/src/main/java/org/ognl/MethodFailedException.java b/src/main/java/ognl/MethodFailedException.java similarity index 98% rename from src/main/java/org/ognl/MethodFailedException.java rename to src/main/java/ognl/MethodFailedException.java index bb55a308..534c43bd 100644 --- a/src/main/java/org/ognl/MethodFailedException.java +++ b/src/main/java/ognl/MethodFailedException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; /** * Exception thrown if a method or constructor call fails. diff --git a/src/main/java/org/ognl/NoSuchPropertyException.java b/src/main/java/ognl/NoSuchPropertyException.java similarity index 99% rename from src/main/java/org/ognl/NoSuchPropertyException.java rename to src/main/java/ognl/NoSuchPropertyException.java index 96060363..ea0ec983 100644 --- a/src/main/java/org/ognl/NoSuchPropertyException.java +++ b/src/main/java/ognl/NoSuchPropertyException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; /** * Exception thrown if a property is attempted to be extracted from an object that does diff --git a/src/main/java/org/ognl/Node.java b/src/main/java/ognl/Node.java similarity index 98% rename from src/main/java/org/ognl/Node.java rename to src/main/java/ognl/Node.java index a9bbd9dd..5b0603a3 100644 --- a/src/main/java/org/ognl/Node.java +++ b/src/main/java/ognl/Node.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; -import org.ognl.enhance.ExpressionAccessor; +import ognl.enhance.ExpressionAccessor; /** * JJTree interface for AST nodes, as modified to handle the OGNL operations getValue and diff --git a/src/main/java/org/ognl/NodeType.java b/src/main/java/ognl/NodeType.java similarity index 94% rename from src/main/java/org/ognl/NodeType.java rename to src/main/java/ognl/NodeType.java index 75340213..9b62ea4b 100644 --- a/src/main/java/org/ognl/NodeType.java +++ b/src/main/java/ognl/NodeType.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; -import org.ognl.enhance.OgnlExpressionCompiler; +import ognl.enhance.OgnlExpressionCompiler; /** * Used by some of the {@link OgnlExpressionCompiler} logic to determine the object diff --git a/src/main/java/org/ognl/NullHandler.java b/src/main/java/ognl/NullHandler.java similarity index 99% rename from src/main/java/org/ognl/NullHandler.java rename to src/main/java/ognl/NullHandler.java index d53a8f9a..9594be9d 100644 --- a/src/main/java/org/ognl/NullHandler.java +++ b/src/main/java/ognl/NullHandler.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; /** * Interface for handling null results from Chains. diff --git a/src/main/java/org/ognl/NumberElementsAccessor.java b/src/main/java/ognl/NumberElementsAccessor.java similarity index 98% rename from src/main/java/org/ognl/NumberElementsAccessor.java rename to src/main/java/ognl/NumberElementsAccessor.java index ca1e053b..bc0a2029 100644 --- a/src/main/java/org/ognl/NumberElementsAccessor.java +++ b/src/main/java/ognl/NumberElementsAccessor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; import java.util.Enumeration; import java.util.NoSuchElementException; diff --git a/src/main/java/org/ognl/NumericCasts.java b/src/main/java/ognl/NumericCasts.java similarity index 98% rename from src/main/java/org/ognl/NumericCasts.java rename to src/main/java/ognl/NumericCasts.java index fa68b2c8..087f149f 100644 --- a/src/main/java/org/ognl/NumericCasts.java +++ b/src/main/java/ognl/NumericCasts.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/src/main/java/org/ognl/NumericDefaults.java b/src/main/java/ognl/NumericDefaults.java similarity index 98% rename from src/main/java/org/ognl/NumericDefaults.java rename to src/main/java/ognl/NumericDefaults.java index 153abc82..0cd7b861 100644 --- a/src/main/java/org/ognl/NumericDefaults.java +++ b/src/main/java/ognl/NumericDefaults.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/src/main/java/org/ognl/NumericExpression.java b/src/main/java/ognl/NumericExpression.java similarity index 97% rename from src/main/java/org/ognl/NumericExpression.java rename to src/main/java/ognl/NumericExpression.java index 3a6369a3..44e66b8f 100644 --- a/src/main/java/org/ognl/NumericExpression.java +++ b/src/main/java/ognl/NumericExpression.java @@ -16,9 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; -import org.ognl.enhance.ExpressionCompiler; +import ognl.OgnlParser; +import ognl.enhance.ExpressionCompiler; /** * Base class for numeric expressions. diff --git a/src/main/java/org/ognl/NumericLiterals.java b/src/main/java/ognl/NumericLiterals.java similarity index 98% rename from src/main/java/org/ognl/NumericLiterals.java rename to src/main/java/ognl/NumericLiterals.java index fc649131..a1cc6e40 100644 --- a/src/main/java/org/ognl/NumericLiterals.java +++ b/src/main/java/ognl/NumericLiterals.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/src/main/java/org/ognl/NumericTypes.java b/src/main/java/ognl/NumericTypes.java similarity index 99% rename from src/main/java/org/ognl/NumericTypes.java rename to src/main/java/ognl/NumericTypes.java index ae6b0e14..85d2ae76 100644 --- a/src/main/java/org/ognl/NumericTypes.java +++ b/src/main/java/ognl/NumericTypes.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; /** * This interface defines some useful constants for describing the various possible diff --git a/src/main/java/org/ognl/NumericValues.java b/src/main/java/ognl/NumericValues.java similarity index 99% rename from src/main/java/org/ognl/NumericValues.java rename to src/main/java/ognl/NumericValues.java index c9f64178..ddc7dea5 100644 --- a/src/main/java/org/ognl/NumericValues.java +++ b/src/main/java/ognl/NumericValues.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/src/main/java/org/ognl/ObjectElementsAccessor.java b/src/main/java/ognl/ObjectElementsAccessor.java similarity index 98% rename from src/main/java/org/ognl/ObjectElementsAccessor.java rename to src/main/java/ognl/ObjectElementsAccessor.java index c52d48c6..9b0cf46e 100644 --- a/src/main/java/org/ognl/ObjectElementsAccessor.java +++ b/src/main/java/ognl/ObjectElementsAccessor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; import java.util.Enumeration; diff --git a/src/main/java/org/ognl/ObjectIndexedPropertyDescriptor.java b/src/main/java/ognl/ObjectIndexedPropertyDescriptor.java similarity index 99% rename from src/main/java/org/ognl/ObjectIndexedPropertyDescriptor.java rename to src/main/java/ognl/ObjectIndexedPropertyDescriptor.java index afc8139f..5f3dd5f3 100644 --- a/src/main/java/org/ognl/ObjectIndexedPropertyDescriptor.java +++ b/src/main/java/ognl/ObjectIndexedPropertyDescriptor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; import java.beans.IntrospectionException; import java.beans.PropertyDescriptor; diff --git a/src/main/java/org/ognl/ObjectMethodAccessor.java b/src/main/java/ognl/ObjectMethodAccessor.java similarity index 98% rename from src/main/java/org/ognl/ObjectMethodAccessor.java rename to src/main/java/ognl/ObjectMethodAccessor.java index bc7ea85b..05dae080 100644 --- a/src/main/java/org/ognl/ObjectMethodAccessor.java +++ b/src/main/java/ognl/ObjectMethodAccessor.java @@ -16,11 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; import java.lang.reflect.Method; import java.util.List; -import java.util.Map; /** * Implementation of PropertyAccessor that uses reflection on the target object's class to find a diff --git a/src/main/java/org/ognl/ObjectNullHandler.java b/src/main/java/ognl/ObjectNullHandler.java similarity index 98% rename from src/main/java/org/ognl/ObjectNullHandler.java rename to src/main/java/ognl/ObjectNullHandler.java index 7e7c8f2d..f2fafaed 100644 --- a/src/main/java/org/ognl/ObjectNullHandler.java +++ b/src/main/java/ognl/ObjectNullHandler.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; /** * Implementation of NullHandler that returns null in all cases, diff --git a/src/main/java/org/ognl/ObjectPropertyAccessor.java b/src/main/java/ognl/ObjectPropertyAccessor.java similarity index 96% rename from src/main/java/org/ognl/ObjectPropertyAccessor.java rename to src/main/java/ognl/ObjectPropertyAccessor.java index 4feea16a..bc9e167c 100644 --- a/src/main/java/org/ognl/ObjectPropertyAccessor.java +++ b/src/main/java/ognl/ObjectPropertyAccessor.java @@ -28,10 +28,10 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. // -------------------------------------------------------------------------- -package org.ognl; +package ognl; -import org.ognl.enhance.ExpressionCompiler; -import org.ognl.enhance.UnsupportedCompilationException; +import ognl.enhance.ExpressionCompiler; +import ognl.enhance.UnsupportedCompilationException; import java.beans.IntrospectionException; import java.lang.reflect.Field; @@ -229,19 +229,19 @@ public String getSourceSetter(OgnlContext context, Object target, Object index) if (param.isPrimitive()) { Class wrapClass = OgnlRuntime.getPrimitiveWrapperClass(param); conversion = OgnlRuntime.getCompiler().createLocalReference(context, - "((" + wrapClass.getName() + ")org.ognl.OgnlOps#convertValue($3," + wrapClass.getName() + "((" + wrapClass.getName() + ")ognl.OgnlOps#convertValue($3," + wrapClass.getName() + ".class, true))." + OgnlRuntime.getNumericValueGetter(wrapClass), param); } else if (param.isArray()) { conversion = OgnlRuntime.getCompiler().createLocalReference(context, - "(" + ExpressionCompiler.getCastString(param) + ")org.ognl.OgnlOps#toArray($3," + "(" + ExpressionCompiler.getCastString(param) + ")ognl.OgnlOps#toArray($3," + param.getComponentType().getName() + ".class)", param); } else { conversion = OgnlRuntime.getCompiler().createLocalReference(context, - "(" + param.getName() + ")org.ognl.OgnlOps#convertValue($3," + "(" + param.getName() + ")ognl.OgnlOps#convertValue($3," + param.getName() + ".class)", param); diff --git a/src/main/java/org/ognl/Ognl.java b/src/main/java/ognl/Ognl.java similarity index 99% rename from src/main/java/org/ognl/Ognl.java rename to src/main/java/ognl/Ognl.java index 093bae25..327879cf 100644 --- a/src/main/java/org/ognl/Ognl.java +++ b/src/main/java/ognl/Ognl.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; -import org.ognl.enhance.ExpressionAccessor; -import org.ognl.enhance.OgnlExpressionCompiler; -import org.ognl.security.OgnlSecurityManager; +import ognl.enhance.ExpressionAccessor; +import ognl.enhance.OgnlExpressionCompiler; +import ognl.security.OgnlSecurityManager; import java.io.StringReader; import java.lang.reflect.Member; diff --git a/src/main/java/org/ognl/OgnlCache.java b/src/main/java/ognl/OgnlCache.java similarity index 92% rename from src/main/java/org/ognl/OgnlCache.java rename to src/main/java/ognl/OgnlCache.java index 38a6080b..d835d052 100644 --- a/src/main/java/org/ognl/OgnlCache.java +++ b/src/main/java/ognl/OgnlCache.java @@ -16,25 +16,25 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; - -import org.ognl.internal.Cache; -import org.ognl.internal.CacheException; -import org.ognl.internal.CacheFactory; -import org.ognl.internal.ClassCache; -import org.ognl.internal.ClassCacheHandler; -import org.ognl.internal.HashMapCacheFactory; -import org.ognl.internal.entry.DeclaredMethodCacheEntry; -import org.ognl.internal.entry.DeclaredMethodCacheEntryFactory; -import org.ognl.internal.entry.FieldCacheEntryFactory; -import org.ognl.internal.entry.GenericMethodParameterTypeCacheEntry; -import org.ognl.internal.entry.GenericMethodParameterTypeFactory; -import org.ognl.internal.entry.MethodAccessCacheEntryFactory; -import org.ognl.internal.entry.MethodAccessEntryValue; -import org.ognl.internal.entry.MethodPermCacheEntryFactory; -import org.ognl.internal.entry.PermissionCacheEntry; -import org.ognl.internal.entry.PermissionCacheEntryFactory; -import org.ognl.internal.entry.PropertyDescriptorCacheEntryFactory; +package ognl; + +import ognl.internal.Cache; +import ognl.internal.CacheException; +import ognl.internal.CacheFactory; +import ognl.internal.ClassCache; +import ognl.internal.ClassCacheHandler; +import ognl.internal.HashMapCacheFactory; +import ognl.internal.entry.DeclaredMethodCacheEntry; +import ognl.internal.entry.DeclaredMethodCacheEntryFactory; +import ognl.internal.entry.FieldCacheEntryFactory; +import ognl.internal.entry.GenericMethodParameterTypeCacheEntry; +import ognl.internal.entry.GenericMethodParameterTypeFactory; +import ognl.internal.entry.MethodAccessCacheEntryFactory; +import ognl.internal.entry.MethodAccessEntryValue; +import ognl.internal.entry.MethodPermCacheEntryFactory; +import ognl.internal.entry.PermissionCacheEntry; +import ognl.internal.entry.PermissionCacheEntryFactory; +import ognl.internal.entry.PropertyDescriptorCacheEntryFactory; import java.beans.PropertyDescriptor; import java.lang.reflect.Constructor; diff --git a/src/main/java/org/ognl/OgnlContext.java b/src/main/java/ognl/OgnlContext.java similarity index 99% rename from src/main/java/org/ognl/OgnlContext.java rename to src/main/java/ognl/OgnlContext.java index d1d8d9aa..fd28aaf6 100644 --- a/src/main/java/org/ognl/OgnlContext.java +++ b/src/main/java/ognl/OgnlContext.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; -import org.ognl.enhance.LocalReference; +import ognl.enhance.LocalReference; import java.util.*; @@ -36,7 +36,7 @@ public class OgnlContext implements Map { @Deprecated public static final String TYPE_CONVERTER_CONTEXT_KEY = "_typeConverter"; - private static final String PROPERTY_KEY_PREFIX = "org.ognl"; + private static final String PROPERTY_KEY_PREFIX = "ognl"; private static boolean DEFAULT_TRACE_EVALUATIONS = false; private static boolean DEFAULT_KEEP_LAST_EVALUATION = false; diff --git a/src/main/java/org/ognl/OgnlException.java b/src/main/java/ognl/OgnlException.java similarity index 99% rename from src/main/java/org/ognl/OgnlException.java rename to src/main/java/ognl/OgnlException.java index d7605be9..8e54ebb3 100644 --- a/src/main/java/org/ognl/OgnlException.java +++ b/src/main/java/ognl/OgnlException.java @@ -28,7 +28,7 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. //-------------------------------------------------------------------------- -package org.ognl; +package ognl; /** * Superclass for OGNL exceptions, incorporating an optional encapsulated exception. diff --git a/src/main/java/org/ognl/OgnlInvokePermission.java b/src/main/java/ognl/OgnlInvokePermission.java similarity index 98% rename from src/main/java/org/ognl/OgnlInvokePermission.java rename to src/main/java/ognl/OgnlInvokePermission.java index 1b8632d3..46a22690 100644 --- a/src/main/java/org/ognl/OgnlInvokePermission.java +++ b/src/main/java/ognl/OgnlInvokePermission.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; import java.security.BasicPermission; diff --git a/src/main/java/org/ognl/OgnlOps.java b/src/main/java/ognl/OgnlOps.java similarity index 99% rename from src/main/java/org/ognl/OgnlOps.java rename to src/main/java/ognl/OgnlOps.java index 6e6d99c6..8c14f2ee 100644 --- a/src/main/java/org/ognl/OgnlOps.java +++ b/src/main/java/ognl/OgnlOps.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; -import org.ognl.enhance.UnsupportedCompilationException; +import ognl.enhance.UnsupportedCompilationException; import java.lang.reflect.Array; import java.math.BigDecimal; diff --git a/src/main/java/org/ognl/OgnlParserTreeConstants.java b/src/main/java/ognl/OgnlParserTreeConstants.java similarity index 99% rename from src/main/java/org/ognl/OgnlParserTreeConstants.java rename to src/main/java/ognl/OgnlParserTreeConstants.java index 8ade2da6..f01affce 100644 --- a/src/main/java/org/ognl/OgnlParserTreeConstants.java +++ b/src/main/java/ognl/OgnlParserTreeConstants.java @@ -1,5 +1,5 @@ /* Generated By:JavaCC: Do not edit this line. OgnlParserTreeConstants.java Version 4.1d1 */ -package org.ognl; +package ognl; public interface OgnlParserTreeConstants { diff --git a/src/main/java/org/ognl/OgnlRuntime.java b/src/main/java/ognl/OgnlRuntime.java similarity index 99% rename from src/main/java/org/ognl/OgnlRuntime.java rename to src/main/java/ognl/OgnlRuntime.java index b7d44c60..0375deaa 100644 --- a/src/main/java/org/ognl/OgnlRuntime.java +++ b/src/main/java/ognl/OgnlRuntime.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; -import org.ognl.enhance.ExpressionCompiler; -import org.ognl.enhance.OgnlExpressionCompiler; -import org.ognl.internal.CacheException; -import org.ognl.internal.entry.DeclaredMethodCacheEntry; -import org.ognl.internal.entry.GenericMethodParameterTypeCacheEntry; -import org.ognl.internal.entry.PermissionCacheEntry; -import org.ognl.security.OgnlSecurityManagerFactory; -import org.ognl.security.UserMethod; +import ognl.enhance.ExpressionCompiler; +import ognl.enhance.OgnlExpressionCompiler; +import ognl.internal.CacheException; +import ognl.internal.entry.DeclaredMethodCacheEntry; +import ognl.internal.entry.GenericMethodParameterTypeCacheEntry; +import ognl.internal.entry.PermissionCacheEntry; +import ognl.security.OgnlSecurityManagerFactory; +import ognl.security.UserMethod; import java.beans.BeanInfo; import java.beans.IndexedPropertyDescriptor; @@ -86,7 +86,7 @@ public class OgnlRuntime { /** * Token returned by TypeConverter for no conversion possible */ - public static final Object NoConversionPossible = "org.ognl.NoConversionPossible"; + public static final Object NoConversionPossible = "ognl.NoConversionPossible"; /** * Not an indexed property @@ -151,7 +151,7 @@ public class OgnlRuntime { * Warning: Users are strongly advised to review their code and confirm they really * need the AccessHandler modifying access levels, looking at alternatives to avoid that need. */ - static final String USE_JDK9PLUS_ACCESS_HANDLER = "org.ognl.UseJDK9PlusAccessHandler"; + static final String USE_JDK9PLUS_ACCESS_HANDLER = "ognl.UseJDK9PlusAccessHandler"; /** * Control usage of "stricter" invocation processing by invokeMethod() using the JVM options: @@ -163,7 +163,7 @@ public class OgnlRuntime { * Using the "false" value reverts to the older "less strict" invocation processing * (in the event the "stricter" processing causes issues for existing applications). */ - static final String USE_STRICTER_INVOCATION = "org.ognl.UseStricterInvocation"; + static final String USE_STRICTER_INVOCATION = "ognl.UseStricterInvocation"; /** * Hold environment flag state associated with USE_JDK9PLUS_ACESS_HANDLER. @@ -301,7 +301,7 @@ public class OgnlRuntime { * sandbox may choose to use the 'forceDisableOnInit' flag option for performance reasons (avoiding overhead * involving the system property security checks - when that feature will not be used). */ - static final String OGNL_SECURITY_MANAGER = "org.ognl.security.manager"; + static final String OGNL_SECURITY_MANAGER = "ognl.security.manager"; static final String OGNL_SM_FORCE_DISABLE_ON_INIT = "forceDisableOnInit"; /** @@ -334,7 +334,7 @@ public class OgnlRuntime { * Using the "true" value reverts to the older "first match" lookup for getters/setters * (in the event the "best match" processing causes issues for existing applications). */ - static final String USE_FIRSTMATCH_GETSET_LOOKUP = "org.ognl.UseFirstMatchGetSetLookup"; + static final String USE_FIRSTMATCH_GETSET_LOOKUP = "ognl.UseFirstMatchGetSetLookup"; /** * Hold environment flag state associated with USE_FIRSTMATCH_GETSET_LOOKUP. @@ -1453,6 +1453,10 @@ private static MatchingMethod findBestMethod(List methods, Class type scoreOther += 100; // current wins... } else if (moClass == argClass) { scoreCurr += 100; // other wins... + } else if (mcClass.isAssignableFrom(moClass)) { + scoreOther += 50; // current wins... + } else if (moClass.isAssignableFrom(moClass)) { + scoreCurr += 50; // other wins... } else { // both items can't be assigned to each other.. // TODO: if this happens we have to put some weight on the inheritance... @@ -2742,7 +2746,7 @@ public static boolean isBoolean(String expression) { || "!(true)".equals(expression) || "(false)".equals(expression) || "!(false)".equals(expression) - || expression.startsWith("org.ognl.OgnlOps"); + || expression.startsWith("ognl.OgnlOps"); } /** diff --git a/src/main/java/org/ognl/PrimitiveDefaults.java b/src/main/java/ognl/PrimitiveDefaults.java similarity index 99% rename from src/main/java/org/ognl/PrimitiveDefaults.java rename to src/main/java/ognl/PrimitiveDefaults.java index 51d370c0..de3bf7af 100644 --- a/src/main/java/org/ognl/PrimitiveDefaults.java +++ b/src/main/java/ognl/PrimitiveDefaults.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/src/main/java/org/ognl/PrimitiveTypes.java b/src/main/java/ognl/PrimitiveTypes.java similarity index 98% rename from src/main/java/org/ognl/PrimitiveTypes.java rename to src/main/java/ognl/PrimitiveTypes.java index 1d57cf34..f95416be 100644 --- a/src/main/java/org/ognl/PrimitiveTypes.java +++ b/src/main/java/ognl/PrimitiveTypes.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/org/ognl/PrimitiveWrapperClasses.java b/src/main/java/ognl/PrimitiveWrapperClasses.java similarity index 99% rename from src/main/java/org/ognl/PrimitiveWrapperClasses.java rename to src/main/java/ognl/PrimitiveWrapperClasses.java index 85472c59..ded94d83 100644 --- a/src/main/java/org/ognl/PrimitiveWrapperClasses.java +++ b/src/main/java/ognl/PrimitiveWrapperClasses.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; import java.util.IdentityHashMap; import java.util.Map; diff --git a/src/main/java/org/ognl/PropertyAccessor.java b/src/main/java/ognl/PropertyAccessor.java similarity index 99% rename from src/main/java/org/ognl/PropertyAccessor.java rename to src/main/java/ognl/PropertyAccessor.java index a4dcf0e7..e8935c0c 100644 --- a/src/main/java/org/ognl/PropertyAccessor.java +++ b/src/main/java/ognl/PropertyAccessor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; /** * This interface defines methods for setting and getting a property from a target object. A diff --git a/src/main/java/org/ognl/SetPropertyAccessor.java b/src/main/java/ognl/SetPropertyAccessor.java similarity index 99% rename from src/main/java/org/ognl/SetPropertyAccessor.java rename to src/main/java/ognl/SetPropertyAccessor.java index ede44d17..38b1104d 100644 --- a/src/main/java/org/ognl/SetPropertyAccessor.java +++ b/src/main/java/ognl/SetPropertyAccessor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; import java.util.Set; diff --git a/src/main/java/org/ognl/SimpleNode.java b/src/main/java/ognl/SimpleNode.java similarity index 99% rename from src/main/java/org/ognl/SimpleNode.java rename to src/main/java/ognl/SimpleNode.java index 807988e9..1ecb1fab 100644 --- a/src/main/java/org/ognl/SimpleNode.java +++ b/src/main/java/ognl/SimpleNode.java @@ -16,9 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; -import org.ognl.enhance.ExpressionAccessor; +import ognl.OgnlParser; +import ognl.enhance.ExpressionAccessor; import java.io.PrintWriter; import java.io.Serializable; diff --git a/src/main/java/org/ognl/TypeConverter.java b/src/main/java/ognl/TypeConverter.java similarity index 99% rename from src/main/java/org/ognl/TypeConverter.java rename to src/main/java/ognl/TypeConverter.java index 6c17b7df..387a1ffd 100644 --- a/src/main/java/org/ognl/TypeConverter.java +++ b/src/main/java/ognl/TypeConverter.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; import java.lang.reflect.Member; diff --git a/src/main/java/org/ognl/enhance/ContextClassLoader.java b/src/main/java/ognl/enhance/ContextClassLoader.java similarity index 96% rename from src/main/java/org/ognl/enhance/ContextClassLoader.java rename to src/main/java/ognl/enhance/ContextClassLoader.java index e5342660..59cc7446 100644 --- a/src/main/java/org/ognl/enhance/ContextClassLoader.java +++ b/src/main/java/ognl/enhance/ContextClassLoader.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl.enhance; +package ognl.enhance; -import org.ognl.OgnlContext; +import ognl.OgnlContext; public class ContextClassLoader extends ClassLoader { diff --git a/src/main/java/org/ognl/enhance/EnhancedClassLoader.java b/src/main/java/ognl/enhance/EnhancedClassLoader.java similarity index 97% rename from src/main/java/org/ognl/enhance/EnhancedClassLoader.java rename to src/main/java/ognl/enhance/EnhancedClassLoader.java index e5d8655d..3abf8c2c 100644 --- a/src/main/java/org/ognl/enhance/EnhancedClassLoader.java +++ b/src/main/java/ognl/enhance/EnhancedClassLoader.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl.enhance; +package ognl.enhance; public class EnhancedClassLoader extends ClassLoader { diff --git a/src/main/java/org/ognl/enhance/ExpressionAccessor.java b/src/main/java/ognl/enhance/ExpressionAccessor.java similarity index 96% rename from src/main/java/org/ognl/enhance/ExpressionAccessor.java rename to src/main/java/ognl/enhance/ExpressionAccessor.java index 1784c34f..ff180021 100644 --- a/src/main/java/org/ognl/enhance/ExpressionAccessor.java +++ b/src/main/java/ognl/enhance/ExpressionAccessor.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl.enhance; +package ognl.enhance; -import org.ognl.Node; -import org.ognl.OgnlContext; +import ognl.Node; +import ognl.OgnlContext; /** * Provides pure java expression paths to get/set values from an ognl expression. This diff --git a/src/main/java/org/ognl/enhance/ExpressionCompiler.java b/src/main/java/ognl/enhance/ExpressionCompiler.java similarity index 98% rename from src/main/java/org/ognl/enhance/ExpressionCompiler.java rename to src/main/java/ognl/enhance/ExpressionCompiler.java index 1da4ad63..fa137a3e 100644 --- a/src/main/java/org/ognl/enhance/ExpressionCompiler.java +++ b/src/main/java/ognl/enhance/ExpressionCompiler.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl.enhance; +package ognl.enhance; import javassist.CannotCompileException; import javassist.ClassPool; @@ -27,23 +27,23 @@ import javassist.CtNewMethod; import javassist.LoaderClassPath; import javassist.NotFoundException; -import org.ognl.ASTAnd; -import org.ognl.ASTChain; -import org.ognl.ASTConst; -import org.ognl.ASTCtor; -import org.ognl.ASTList; -import org.ognl.ASTMethod; -import org.ognl.ASTOr; -import org.ognl.ASTProperty; -import org.ognl.ASTRootVarRef; -import org.ognl.ASTStaticField; -import org.ognl.ASTStaticMethod; -import org.ognl.ASTVarRef; -import org.ognl.ClassResolver; -import org.ognl.ExpressionNode; -import org.ognl.Node; -import org.ognl.OgnlContext; -import org.ognl.OgnlRuntime; +import ognl.ASTAnd; +import ognl.ASTChain; +import ognl.ASTConst; +import ognl.ASTCtor; +import ognl.ASTList; +import ognl.ASTMethod; +import ognl.ASTOr; +import ognl.ASTProperty; +import ognl.ASTRootVarRef; +import ognl.ASTStaticField; +import ognl.ASTStaticMethod; +import ognl.ASTVarRef; +import ognl.ClassResolver; +import ognl.ExpressionNode; +import ognl.Node; +import ognl.OgnlContext; +import ognl.OgnlRuntime; import java.lang.reflect.Method; import java.lang.reflect.Modifier; diff --git a/src/main/java/org/ognl/enhance/LocalReference.java b/src/main/java/ognl/enhance/LocalReference.java similarity index 98% rename from src/main/java/org/ognl/enhance/LocalReference.java rename to src/main/java/ognl/enhance/LocalReference.java index cf229e09..4299407f 100644 --- a/src/main/java/org/ognl/enhance/LocalReference.java +++ b/src/main/java/ognl/enhance/LocalReference.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl.enhance; +package ognl.enhance; /** * Container class for {@link OgnlExpressionCompiler} generated local method diff --git a/src/main/java/org/ognl/enhance/OgnlExpressionCompiler.java b/src/main/java/ognl/enhance/OgnlExpressionCompiler.java similarity index 98% rename from src/main/java/org/ognl/enhance/OgnlExpressionCompiler.java rename to src/main/java/ognl/enhance/OgnlExpressionCompiler.java index 32fb90f2..4b13fbe8 100644 --- a/src/main/java/org/ognl/enhance/OgnlExpressionCompiler.java +++ b/src/main/java/ognl/enhance/OgnlExpressionCompiler.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl.enhance; +package ognl.enhance; -import org.ognl.ASTChain; -import org.ognl.Node; -import org.ognl.OgnlContext; +import ognl.ASTChain; +import ognl.Node; +import ognl.OgnlContext; import java.lang.reflect.Method; diff --git a/src/main/java/org/ognl/enhance/OgnlLocalReference.java b/src/main/java/ognl/enhance/OgnlLocalReference.java similarity index 98% rename from src/main/java/org/ognl/enhance/OgnlLocalReference.java rename to src/main/java/ognl/enhance/OgnlLocalReference.java index ecf30b4f..80f995f5 100644 --- a/src/main/java/org/ognl/enhance/OgnlLocalReference.java +++ b/src/main/java/ognl/enhance/OgnlLocalReference.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl.enhance; +package ognl.enhance; import java.util.Objects; diff --git a/src/main/java/org/ognl/enhance/OrderedReturn.java b/src/main/java/ognl/enhance/OrderedReturn.java similarity index 97% rename from src/main/java/org/ognl/enhance/OrderedReturn.java rename to src/main/java/ognl/enhance/OrderedReturn.java index f22f24b7..473e29f5 100644 --- a/src/main/java/org/ognl/enhance/OrderedReturn.java +++ b/src/main/java/ognl/enhance/OrderedReturn.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl.enhance; +package ognl.enhance; -import org.ognl.Node; +import ognl.Node; /** * Marks an ognl expression {@link Node} as needing to have the return portion of a diff --git a/src/main/java/org/ognl/enhance/UnsupportedCompilationException.java b/src/main/java/ognl/enhance/UnsupportedCompilationException.java similarity index 98% rename from src/main/java/org/ognl/enhance/UnsupportedCompilationException.java rename to src/main/java/ognl/enhance/UnsupportedCompilationException.java index 075ee3c0..1150dd4e 100644 --- a/src/main/java/org/ognl/enhance/UnsupportedCompilationException.java +++ b/src/main/java/ognl/enhance/UnsupportedCompilationException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl.enhance; +package ognl.enhance; /** * Thrown during bytecode enhancement conversions of ognl expressions to indicate diff --git a/src/main/java/org/ognl/internal/Cache.java b/src/main/java/ognl/internal/Cache.java similarity index 97% rename from src/main/java/org/ognl/internal/Cache.java rename to src/main/java/ognl/internal/Cache.java index a7c0472e..e2fe58c5 100644 --- a/src/main/java/org/ognl/internal/Cache.java +++ b/src/main/java/ognl/internal/Cache.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl.internal; +package ognl.internal; public interface Cache { diff --git a/src/main/java/org/ognl/internal/CacheException.java b/src/main/java/ognl/internal/CacheException.java similarity index 97% rename from src/main/java/org/ognl/internal/CacheException.java rename to src/main/java/ognl/internal/CacheException.java index bd014df3..54a906ad 100644 --- a/src/main/java/org/ognl/internal/CacheException.java +++ b/src/main/java/ognl/internal/CacheException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl.internal; +package ognl.internal; public class CacheException extends RuntimeException { diff --git a/src/main/java/org/ognl/internal/CacheFactory.java b/src/main/java/ognl/internal/CacheFactory.java similarity index 88% rename from src/main/java/org/ognl/internal/CacheFactory.java rename to src/main/java/ognl/internal/CacheFactory.java index 86fb2c66..42ad3090 100644 --- a/src/main/java/org/ognl/internal/CacheFactory.java +++ b/src/main/java/ognl/internal/CacheFactory.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl.internal; +package ognl.internal; -import org.ognl.internal.entry.CacheEntryFactory; -import org.ognl.internal.entry.ClassCacheEntryFactory; +import ognl.internal.entry.CacheEntryFactory; +import ognl.internal.entry.ClassCacheEntryFactory; public interface CacheFactory { diff --git a/src/main/java/org/ognl/internal/ClassCache.java b/src/main/java/ognl/internal/ClassCache.java similarity index 94% rename from src/main/java/org/ognl/internal/ClassCache.java rename to src/main/java/ognl/internal/ClassCache.java index 5fd93c84..c0292fd2 100644 --- a/src/main/java/org/ognl/internal/ClassCache.java +++ b/src/main/java/ognl/internal/ClassCache.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl.internal; +package ognl.internal; -import org.ognl.ClassCacheInspector; +import ognl.ClassCacheInspector; /** * This is a highly specialized map for storing values keyed by Class objects. diff --git a/src/main/java/org/ognl/internal/ClassCacheHandler.java b/src/main/java/ognl/internal/ClassCacheHandler.java similarity index 98% rename from src/main/java/org/ognl/internal/ClassCacheHandler.java rename to src/main/java/ognl/internal/ClassCacheHandler.java index 8e91c021..26190a1a 100644 --- a/src/main/java/org/ognl/internal/ClassCacheHandler.java +++ b/src/main/java/ognl/internal/ClassCacheHandler.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl.internal; +package ognl.internal; public class ClassCacheHandler { diff --git a/src/main/java/org/ognl/internal/HashMapCache.java b/src/main/java/ognl/internal/HashMapCache.java similarity index 96% rename from src/main/java/org/ognl/internal/HashMapCache.java rename to src/main/java/ognl/internal/HashMapCache.java index 9485fbca..9e93f14f 100644 --- a/src/main/java/org/ognl/internal/HashMapCache.java +++ b/src/main/java/ognl/internal/HashMapCache.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl.internal; +package ognl.internal; -import org.ognl.internal.entry.CacheEntryFactory; +import ognl.internal.entry.CacheEntryFactory; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/org/ognl/internal/HashMapCacheFactory.java b/src/main/java/ognl/internal/HashMapCacheFactory.java similarity index 90% rename from src/main/java/org/ognl/internal/HashMapCacheFactory.java rename to src/main/java/ognl/internal/HashMapCacheFactory.java index e1949903..9f3964a1 100644 --- a/src/main/java/org/ognl/internal/HashMapCacheFactory.java +++ b/src/main/java/ognl/internal/HashMapCacheFactory.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl.internal; +package ognl.internal; -import org.ognl.internal.entry.CacheEntryFactory; -import org.ognl.internal.entry.ClassCacheEntryFactory; +import ognl.internal.entry.CacheEntryFactory; +import ognl.internal.entry.ClassCacheEntryFactory; public class HashMapCacheFactory implements CacheFactory { diff --git a/src/main/java/org/ognl/internal/HashMapClassCache.java b/src/main/java/ognl/internal/HashMapClassCache.java similarity index 92% rename from src/main/java/org/ognl/internal/HashMapClassCache.java rename to src/main/java/ognl/internal/HashMapClassCache.java index c44a1a00..ac850309 100644 --- a/src/main/java/org/ognl/internal/HashMapClassCache.java +++ b/src/main/java/ognl/internal/HashMapClassCache.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl.internal; +package ognl.internal; -import org.ognl.ClassCacheInspector; -import org.ognl.internal.entry.CacheEntryFactory; +import ognl.ClassCacheInspector; +import ognl.internal.entry.CacheEntryFactory; public class HashMapClassCache extends HashMapCache, T> implements ClassCache { diff --git a/src/main/java/org/ognl/internal/entry/CacheEntry.java b/src/main/java/ognl/internal/entry/CacheEntry.java similarity index 96% rename from src/main/java/org/ognl/internal/entry/CacheEntry.java rename to src/main/java/ognl/internal/entry/CacheEntry.java index d45bb850..6fe27ff6 100644 --- a/src/main/java/org/ognl/internal/entry/CacheEntry.java +++ b/src/main/java/ognl/internal/entry/CacheEntry.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl.internal.entry; +package ognl.internal.entry; public interface CacheEntry { } diff --git a/src/main/java/org/ognl/internal/entry/CacheEntryFactory.java b/src/main/java/ognl/internal/entry/CacheEntryFactory.java similarity index 92% rename from src/main/java/org/ognl/internal/entry/CacheEntryFactory.java rename to src/main/java/ognl/internal/entry/CacheEntryFactory.java index 16343c12..8bcd1db8 100644 --- a/src/main/java/org/ognl/internal/entry/CacheEntryFactory.java +++ b/src/main/java/ognl/internal/entry/CacheEntryFactory.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl.internal.entry; +package ognl.internal.entry; -import org.ognl.internal.CacheException; +import ognl.internal.CacheException; public interface CacheEntryFactory { diff --git a/src/main/java/org/ognl/internal/entry/ClassCacheEntryFactory.java b/src/main/java/ognl/internal/entry/ClassCacheEntryFactory.java similarity index 96% rename from src/main/java/org/ognl/internal/entry/ClassCacheEntryFactory.java rename to src/main/java/ognl/internal/entry/ClassCacheEntryFactory.java index 2c108f25..1b8b391c 100644 --- a/src/main/java/org/ognl/internal/entry/ClassCacheEntryFactory.java +++ b/src/main/java/ognl/internal/entry/ClassCacheEntryFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl.internal.entry; +package ognl.internal.entry; public interface ClassCacheEntryFactory extends CacheEntryFactory, T> { } diff --git a/src/main/java/org/ognl/internal/entry/DeclaredMethodCacheEntry.java b/src/main/java/ognl/internal/entry/DeclaredMethodCacheEntry.java similarity index 98% rename from src/main/java/org/ognl/internal/entry/DeclaredMethodCacheEntry.java rename to src/main/java/ognl/internal/entry/DeclaredMethodCacheEntry.java index 9b1d850f..b4484ab7 100644 --- a/src/main/java/org/ognl/internal/entry/DeclaredMethodCacheEntry.java +++ b/src/main/java/ognl/internal/entry/DeclaredMethodCacheEntry.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl.internal.entry; +package ognl.internal.entry; public class DeclaredMethodCacheEntry extends MethodCacheEntry { diff --git a/src/main/java/org/ognl/internal/entry/DeclaredMethodCacheEntryFactory.java b/src/main/java/ognl/internal/entry/DeclaredMethodCacheEntryFactory.java similarity index 97% rename from src/main/java/org/ognl/internal/entry/DeclaredMethodCacheEntryFactory.java rename to src/main/java/ognl/internal/entry/DeclaredMethodCacheEntryFactory.java index 14ee26c6..6b62f890 100644 --- a/src/main/java/org/ognl/internal/entry/DeclaredMethodCacheEntryFactory.java +++ b/src/main/java/ognl/internal/entry/DeclaredMethodCacheEntryFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl.internal.entry; +package ognl.internal.entry; import java.lang.reflect.Method; import java.lang.reflect.Modifier; diff --git a/src/main/java/org/ognl/internal/entry/FieldCacheEntryFactory.java b/src/main/java/ognl/internal/entry/FieldCacheEntryFactory.java similarity index 94% rename from src/main/java/org/ognl/internal/entry/FieldCacheEntryFactory.java rename to src/main/java/ognl/internal/entry/FieldCacheEntryFactory.java index fff31aa0..33f2b5ac 100644 --- a/src/main/java/org/ognl/internal/entry/FieldCacheEntryFactory.java +++ b/src/main/java/ognl/internal/entry/FieldCacheEntryFactory.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl.internal.entry; +package ognl.internal.entry; -import org.ognl.internal.CacheException; +import ognl.internal.CacheException; import java.lang.reflect.Field; import java.util.HashMap; diff --git a/src/main/java/org/ognl/internal/entry/GenericMethodParameterTypeCacheEntry.java b/src/main/java/ognl/internal/entry/GenericMethodParameterTypeCacheEntry.java similarity index 98% rename from src/main/java/org/ognl/internal/entry/GenericMethodParameterTypeCacheEntry.java rename to src/main/java/ognl/internal/entry/GenericMethodParameterTypeCacheEntry.java index de9b193f..9c28db01 100644 --- a/src/main/java/org/ognl/internal/entry/GenericMethodParameterTypeCacheEntry.java +++ b/src/main/java/ognl/internal/entry/GenericMethodParameterTypeCacheEntry.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl.internal.entry; +package ognl.internal.entry; import java.lang.reflect.Method; diff --git a/src/main/java/org/ognl/internal/entry/GenericMethodParameterTypeFactory.java b/src/main/java/ognl/internal/entry/GenericMethodParameterTypeFactory.java similarity index 97% rename from src/main/java/org/ognl/internal/entry/GenericMethodParameterTypeFactory.java rename to src/main/java/ognl/internal/entry/GenericMethodParameterTypeFactory.java index 0fd1fa32..18edb7fe 100644 --- a/src/main/java/org/ognl/internal/entry/GenericMethodParameterTypeFactory.java +++ b/src/main/java/ognl/internal/entry/GenericMethodParameterTypeFactory.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl.internal.entry; +package ognl.internal.entry; -import org.ognl.internal.CacheException; +import ognl.internal.CacheException; import java.lang.reflect.*; diff --git a/src/main/java/org/ognl/internal/entry/MethodAccessCacheEntryFactory.java b/src/main/java/ognl/internal/entry/MethodAccessCacheEntryFactory.java similarity index 96% rename from src/main/java/org/ognl/internal/entry/MethodAccessCacheEntryFactory.java rename to src/main/java/ognl/internal/entry/MethodAccessCacheEntryFactory.java index ed09ab57..3f90add2 100644 --- a/src/main/java/org/ognl/internal/entry/MethodAccessCacheEntryFactory.java +++ b/src/main/java/ognl/internal/entry/MethodAccessCacheEntryFactory.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl.internal.entry; +package ognl.internal.entry; -import org.ognl.internal.CacheException; +import ognl.internal.CacheException; import java.lang.reflect.Method; import java.lang.reflect.Modifier; diff --git a/src/main/java/org/ognl/internal/entry/MethodAccessEntryValue.java b/src/main/java/ognl/internal/entry/MethodAccessEntryValue.java similarity index 97% rename from src/main/java/org/ognl/internal/entry/MethodAccessEntryValue.java rename to src/main/java/ognl/internal/entry/MethodAccessEntryValue.java index 101789d0..cfa2d0b2 100644 --- a/src/main/java/org/ognl/internal/entry/MethodAccessEntryValue.java +++ b/src/main/java/ognl/internal/entry/MethodAccessEntryValue.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl.internal.entry; +package ognl.internal.entry; public class MethodAccessEntryValue { diff --git a/src/main/java/org/ognl/internal/entry/MethodCacheEntry.java b/src/main/java/ognl/internal/entry/MethodCacheEntry.java similarity index 97% rename from src/main/java/org/ognl/internal/entry/MethodCacheEntry.java rename to src/main/java/ognl/internal/entry/MethodCacheEntry.java index 0878a3cd..24de8d04 100644 --- a/src/main/java/org/ognl/internal/entry/MethodCacheEntry.java +++ b/src/main/java/ognl/internal/entry/MethodCacheEntry.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl.internal.entry; +package ognl.internal.entry; public class MethodCacheEntry implements CacheEntry { diff --git a/src/main/java/org/ognl/internal/entry/MethodCacheEntryFactory.java b/src/main/java/ognl/internal/entry/MethodCacheEntryFactory.java similarity index 95% rename from src/main/java/org/ognl/internal/entry/MethodCacheEntryFactory.java rename to src/main/java/ognl/internal/entry/MethodCacheEntryFactory.java index 0b171f22..358f68a7 100644 --- a/src/main/java/org/ognl/internal/entry/MethodCacheEntryFactory.java +++ b/src/main/java/ognl/internal/entry/MethodCacheEntryFactory.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl.internal.entry; +package ognl.internal.entry; -import org.ognl.OgnlRuntime; -import org.ognl.internal.CacheException; +import ognl.OgnlRuntime; +import ognl.internal.CacheException; import java.lang.reflect.Method; import java.util.*; diff --git a/src/main/java/org/ognl/internal/entry/MethodPermCacheEntryFactory.java b/src/main/java/ognl/internal/entry/MethodPermCacheEntryFactory.java similarity index 93% rename from src/main/java/org/ognl/internal/entry/MethodPermCacheEntryFactory.java rename to src/main/java/ognl/internal/entry/MethodPermCacheEntryFactory.java index 5b62b068..eb6a5f18 100644 --- a/src/main/java/org/ognl/internal/entry/MethodPermCacheEntryFactory.java +++ b/src/main/java/ognl/internal/entry/MethodPermCacheEntryFactory.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl.internal.entry; +package ognl.internal.entry; -import org.ognl.OgnlRuntime; -import org.ognl.internal.CacheException; +import ognl.OgnlRuntime; +import ognl.internal.CacheException; import java.lang.reflect.Method; diff --git a/src/main/java/org/ognl/internal/entry/PermissionCacheEntry.java b/src/main/java/ognl/internal/entry/PermissionCacheEntry.java similarity index 97% rename from src/main/java/org/ognl/internal/entry/PermissionCacheEntry.java rename to src/main/java/ognl/internal/entry/PermissionCacheEntry.java index 33907caa..6689808e 100644 --- a/src/main/java/org/ognl/internal/entry/PermissionCacheEntry.java +++ b/src/main/java/ognl/internal/entry/PermissionCacheEntry.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl.internal.entry; +package ognl.internal.entry; import java.lang.reflect.Method; import java.util.Objects; diff --git a/src/main/java/org/ognl/internal/entry/PermissionCacheEntryFactory.java b/src/main/java/ognl/internal/entry/PermissionCacheEntryFactory.java similarity index 91% rename from src/main/java/org/ognl/internal/entry/PermissionCacheEntryFactory.java rename to src/main/java/ognl/internal/entry/PermissionCacheEntryFactory.java index 7c6924ee..b05f78dd 100644 --- a/src/main/java/org/ognl/internal/entry/PermissionCacheEntryFactory.java +++ b/src/main/java/ognl/internal/entry/PermissionCacheEntryFactory.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl.internal.entry; +package ognl.internal.entry; -import org.ognl.OgnlInvokePermission; -import org.ognl.internal.CacheException; +import ognl.OgnlInvokePermission; +import ognl.internal.CacheException; import java.security.Permission; diff --git a/src/main/java/org/ognl/internal/entry/PropertyDescriptorCacheEntryFactory.java b/src/main/java/ognl/internal/entry/PropertyDescriptorCacheEntryFactory.java similarity index 97% rename from src/main/java/org/ognl/internal/entry/PropertyDescriptorCacheEntryFactory.java rename to src/main/java/ognl/internal/entry/PropertyDescriptorCacheEntryFactory.java index f1a5d5cd..16b15bc5 100644 --- a/src/main/java/org/ognl/internal/entry/PropertyDescriptorCacheEntryFactory.java +++ b/src/main/java/ognl/internal/entry/PropertyDescriptorCacheEntryFactory.java @@ -16,10 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl.internal.entry; +package ognl.internal.entry; -import org.ognl.*; -import org.ognl.internal.CacheException; +import ognl.ObjectIndexedPropertyDescriptor; +import ognl.OgnlException; +import ognl.OgnlRuntime; +import ognl.internal.CacheException; import java.beans.*; import java.lang.reflect.Method; diff --git a/src/main/java/org/ognl/package.html b/src/main/java/ognl/package.html similarity index 100% rename from src/main/java/org/ognl/package.html rename to src/main/java/ognl/package.html diff --git a/src/main/java/org/ognl/security/OgnlSecurityManager.java b/src/main/java/ognl/security/OgnlSecurityManager.java similarity index 97% rename from src/main/java/org/ognl/security/OgnlSecurityManager.java rename to src/main/java/ognl/security/OgnlSecurityManager.java index 68bda4a5..ac219cdd 100644 --- a/src/main/java/org/ognl/security/OgnlSecurityManager.java +++ b/src/main/java/ognl/security/OgnlSecurityManager.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl.security; +package ognl.security; import java.io.FilePermission; import java.security.Permission; @@ -43,7 +43,7 @@ */ public class OgnlSecurityManager extends SecurityManager { - private static final String OGNL_SANDBOX_CLASS_NAME = "org.ognl.security.UserMethod"; + private static final String OGNL_SANDBOX_CLASS_NAME = "ognl.security.UserMethod"; private static final Class CLASS_LOADER_CLASS = ClassLoader.class; private static final Class FILE_PERMISSION_CLASS = FilePermission.class; diff --git a/src/main/java/org/ognl/security/OgnlSecurityManagerFactory.java b/src/main/java/ognl/security/OgnlSecurityManagerFactory.java similarity index 99% rename from src/main/java/org/ognl/security/OgnlSecurityManagerFactory.java rename to src/main/java/ognl/security/OgnlSecurityManagerFactory.java index cbb8d7bd..6e7c510c 100644 --- a/src/main/java/org/ognl/security/OgnlSecurityManagerFactory.java +++ b/src/main/java/ognl/security/OgnlSecurityManagerFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl.security; +package ognl.security; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/main/java/org/ognl/security/UserMethod.java b/src/main/java/ognl/security/UserMethod.java similarity index 98% rename from src/main/java/org/ognl/security/UserMethod.java rename to src/main/java/ognl/security/UserMethod.java index d25915a5..871e0cb7 100644 --- a/src/main/java/org/ognl/security/UserMethod.java +++ b/src/main/java/ognl/security/UserMethod.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl.security; +package ognl.security; import java.lang.reflect.Method; import java.security.PrivilegedExceptionAction; diff --git a/src/main/javacc/ognl.jj b/src/main/javacc/ognl.jj index e231d8ce..76cd8639 100644 --- a/src/main/javacc/ognl.jj +++ b/src/main/javacc/ognl.jj @@ -55,7 +55,7 @@ options { PARSER_BEGIN(OgnlParser) -package org.ognl; +package ognl; import java.math.*; diff --git a/src/main/jjtree/ognl.jjt b/src/main/jjtree/ognl.jjt index 47a67c31..cf452aaf 100644 --- a/src/main/jjtree/ognl.jjt +++ b/src/main/jjtree/ognl.jjt @@ -54,7 +54,7 @@ options { PARSER_BEGIN(OgnlParser) -package org.ognl; +package ognl; import java.math.*; diff --git a/src/test/java/org/ognl/DefaultMemberAccess.java b/src/test/java/ognl/DefaultMemberAccess.java similarity index 96% rename from src/test/java/org/ognl/DefaultMemberAccess.java rename to src/test/java/ognl/DefaultMemberAccess.java index 51ea68d6..d8cedbb3 100644 --- a/src/test/java/org/ognl/DefaultMemberAccess.java +++ b/src/test/java/ognl/DefaultMemberAccess.java @@ -16,7 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl; +package ognl; + +import ognl.AccessibleObjectHandler; +import ognl.AccessibleObjectHandlerJDK9Plus; +import ognl.AccessibleObjectHandlerPreJDK9; +import ognl.MemberAccess; +import ognl.OgnlContext; +import ognl.OgnlRuntime; import java.lang.reflect.AccessibleObject; import java.lang.reflect.Member; diff --git a/src/test/java/org/ognl/OgnlRuntimeTest.java b/src/test/java/ognl/OgnlRuntimeTest.java similarity index 99% rename from src/test/java/org/ognl/OgnlRuntimeTest.java rename to src/test/java/ognl/OgnlRuntimeTest.java index 9624e358..0ab94cb5 100644 --- a/src/test/java/org/ognl/OgnlRuntimeTest.java +++ b/src/test/java/ognl/OgnlRuntimeTest.java @@ -1,4 +1,4 @@ -package org.ognl; +package ognl; import org.hamcrest.core.IsEqual; import org.junit.Assert; @@ -612,12 +612,11 @@ public Long get() { } @Test - public void shouldSameMethodOfDifferentParentsBeCallable() - throws Exception { + public void shouldSameMethodOfDifferentParentsBeCallable() throws Exception { Map root = new HashMap<>(); root.put("d1", java.sql.Date.valueOf("2022-01-01")); root.put("d2", java.sql.Date.valueOf("2022-01-02")); - Assert.assertEquals(-1, - Ognl.getValue("d1.compareTo(d2)", defaultContext, root)); + Assert.assertEquals(-1, Ognl.getValue("d1.compareTo(d2)", defaultContext, root)); } + } diff --git a/src/test/java/org/ognl/TestOgnlRuntime.java b/src/test/java/ognl/TestOgnlRuntime.java similarity index 96% rename from src/test/java/org/ognl/TestOgnlRuntime.java rename to src/test/java/ognl/TestOgnlRuntime.java index c08416c5..81834b9c 100644 --- a/src/test/java/org/ognl/TestOgnlRuntime.java +++ b/src/test/java/ognl/TestOgnlRuntime.java @@ -1,23 +1,23 @@ -package org.ognl; +package ognl; import junit.framework.TestCase; -import org.ognl.test.objects.BaseGeneric; -import org.ognl.test.objects.Bean2; -import org.ognl.test.objects.FormImpl; -import org.ognl.test.objects.GameGeneric; -import org.ognl.test.objects.GameGenericObject; -import org.ognl.test.objects.GenericCracker; -import org.ognl.test.objects.GenericService; -import org.ognl.test.objects.GenericServiceImpl; -import org.ognl.test.objects.GetterMethods; -import org.ognl.test.objects.IComponent; -import org.ognl.test.objects.IForm; -import org.ognl.test.objects.ListSource; -import org.ognl.test.objects.ListSourceImpl; -import org.ognl.test.objects.OtherEnum; -import org.ognl.test.objects.Root; -import org.ognl.test.objects.SetterReturns; -import org.ognl.test.objects.SubclassSyntheticObject; +import ognl.test.objects.BaseGeneric; +import ognl.test.objects.Bean2; +import ognl.test.objects.FormImpl; +import ognl.test.objects.GameGeneric; +import ognl.test.objects.GameGenericObject; +import ognl.test.objects.GenericCracker; +import ognl.test.objects.GenericService; +import ognl.test.objects.GenericServiceImpl; +import ognl.test.objects.GetterMethods; +import ognl.test.objects.IComponent; +import ognl.test.objects.IForm; +import ognl.test.objects.ListSource; +import ognl.test.objects.ListSourceImpl; +import ognl.test.objects.OtherEnum; +import ognl.test.objects.Root; +import ognl.test.objects.SetterReturns; +import ognl.test.objects.SubclassSyntheticObject; import java.beans.PropertyDescriptor; import java.io.Serializable; @@ -563,7 +563,7 @@ public void test_Find_Parameter_Types_Superclass() { public void test_Get_Declared_Methods_With_Synthetic_Methods() { List result = OgnlRuntime.getDeclaredMethods(SubclassSyntheticObject.class, "list", false); - // synthetic method would be "public volatile java.util.List org.ognl.test.objects.SubclassSyntheticObject.getList()", + // synthetic method would be "public volatile java.util.List ognl.test.objects.SubclassSyntheticObject.getList()", // causing method return size to be 3 assertEquals(2, result.size()); @@ -613,19 +613,19 @@ public void testBangOperator() throws Exception { public void testGetStaticField() throws Exception { OgnlContext context = this.context; - Object obj = OgnlRuntime.getStaticField(context, "org.ognl.test.objects.Root", "SIZE_STRING"); + Object obj = OgnlRuntime.getStaticField(context, "ognl.test.objects.Root", "SIZE_STRING"); assertEquals(Root.SIZE_STRING, obj); } public void testGetStaticFieldEnum() throws Exception { OgnlContext context = this.context; - Object obj = OgnlRuntime.getStaticField(context, "org.ognl.test.objects.OtherEnum", "ONE"); + Object obj = OgnlRuntime.getStaticField(context, "ognl.test.objects.OtherEnum", "ONE"); assertEquals(OtherEnum.ONE, obj); } public void testGetStaticFieldEnumStatic() throws Exception { OgnlContext context = this.context; - Object obj = OgnlRuntime.getStaticField(context, "org.ognl.test.objects.OtherEnum", "STATIC_STRING"); + Object obj = OgnlRuntime.getStaticField(context, "ognl.test.objects.OtherEnum", "STATIC_STRING"); assertEquals(OtherEnum.STATIC_STRING, obj); } diff --git a/src/test/java/org/ognl/test/ASTChainTest.java b/src/test/java/ognl/test/ASTChainTest.java similarity index 75% rename from src/test/java/org/ognl/test/ASTChainTest.java rename to src/test/java/ognl/test/ASTChainTest.java index 35a0170d..a86b65a7 100644 --- a/src/test/java/org/ognl/test/ASTChainTest.java +++ b/src/test/java/ognl/test/ASTChainTest.java @@ -1,11 +1,11 @@ -package org.ognl.test; +package ognl.test; import junit.framework.TestCase; -import org.ognl.ASTChain; -import org.ognl.DefaultMemberAccess; -import org.ognl.Ognl; -import org.ognl.OgnlContext; -import org.ognl.test.objects.IndexedSetObject; +import ognl.ASTChain; +import ognl.DefaultMemberAccess; +import ognl.Ognl; +import ognl.OgnlContext; +import ognl.test.objects.IndexedSetObject; /** * Tests for {@link ASTChain}. diff --git a/src/test/java/org/ognl/test/ASTMethodTest.java b/src/test/java/ognl/test/ASTMethodTest.java similarity index 90% rename from src/test/java/org/ognl/test/ASTMethodTest.java rename to src/test/java/ognl/test/ASTMethodTest.java index 5bae1750..ef209521 100644 --- a/src/test/java/org/ognl/test/ASTMethodTest.java +++ b/src/test/java/ognl/test/ASTMethodTest.java @@ -1,11 +1,18 @@ -package org.ognl.test; +package ognl.test; import junit.framework.TestCase; -import org.ognl.*; -import org.ognl.enhance.ExpressionCompiler; -import org.ognl.test.objects.Bean2; -import org.ognl.test.objects.Bean3; -import org.ognl.test.objects.Root; +import ognl.ASTConst; +import ognl.ASTMethod; +import ognl.ASTProperty; +import ognl.DefaultMemberAccess; +import ognl.Ognl; +import ognl.OgnlContext; +import ognl.OgnlRuntime; +import ognl.SimpleNode; +import ognl.enhance.ExpressionCompiler; +import ognl.test.objects.Bean2; +import ognl.test.objects.Bean3; +import ognl.test.objects.Root; import java.util.Map; diff --git a/src/test/java/org/ognl/test/ASTPropertyTest.java b/src/test/java/ognl/test/ASTPropertyTest.java similarity index 85% rename from src/test/java/org/ognl/test/ASTPropertyTest.java rename to src/test/java/ognl/test/ASTPropertyTest.java index 61ae7f70..8352023f 100644 --- a/src/test/java/org/ognl/test/ASTPropertyTest.java +++ b/src/test/java/ognl/test/ASTPropertyTest.java @@ -1,10 +1,17 @@ -package org.ognl.test; +package ognl.test; import junit.framework.TestCase; -import static org.ognl.test.OgnlTestCase.isEqual; - -import org.ognl.*; -import org.ognl.test.objects.*; +import static ognl.test.OgnlTestCase.isEqual; + +import ognl.ASTChain; +import ognl.ASTConst; +import ognl.ASTProperty; +import ognl.DefaultMemberAccess; +import ognl.Ognl; +import ognl.OgnlContext; +import ognl.OgnlRuntime; +import ognl.SimpleNode; +import ognl.test.objects.*; import java.util.List; import java.util.Map; @@ -200,7 +207,7 @@ public void test_Indexed_Object_Type() // test with only getIndex - assertEquals(".get(org.ognl.OgnlOps#getIntValue(((org.ognl.test.objects.Root)$2)..getGenericIndex().toString()))", p.toGetSourceString(context, root.getList())); + assertEquals(".get(ognl.OgnlOps#getIntValue(((ognl.test.objects.Root)$2)..getGenericIndex().toString()))", p.toGetSourceString(context, root.getList())); assertEquals(root.getArray(), context.getCurrentObject()); assertEquals(Object.class, context.getCurrentType()); } @@ -210,17 +217,17 @@ public void test_Complicated_List() throws Exception Root root = new Root(); 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 ognl.test.objects.MenuItem('Home', 'Main', " + + "{ new ognl.test.objects.MenuItem('Help', 'Help'), " + + "new ognl.test.objects.MenuItem('Contact', 'Contact') }), " // end first item + + "new ognl.test.objects.MenuItem('UserList', getMessages().getMessage('menu.members')), " + + "new ognl.test.objects.MenuItem('account/BetSlipList', getMessages().getMessage('menu.account'), " + + "{ new ognl.test.objects.MenuItem('account/BetSlipList', 'My Bets'), " + + "new ognl.test.objects.MenuItem('account/TransactionList', 'My Transactions') }), " + + "new ognl.test.objects.MenuItem('About', 'About'), " + + "new ognl.test.objects.MenuItem('admin/Admin', getMessages().getMessage('menu.admin'), " + + "{ new ognl.test.objects.MenuItem('admin/AddEvent', 'Add event'), " + + "new ognl.test.objects.MenuItem('admin/AddResult', 'Add result') })}"); assertTrue(List.class.isAssignableFrom(node.getAccessor().get(context, root).getClass())); } diff --git a/src/test/java/org/ognl/test/ASTSequenceTest.java b/src/test/java/ognl/test/ASTSequenceTest.java similarity index 80% rename from src/test/java/org/ognl/test/ASTSequenceTest.java rename to src/test/java/ognl/test/ASTSequenceTest.java index 85be9fff..4f8ce5c9 100644 --- a/src/test/java/org/ognl/test/ASTSequenceTest.java +++ b/src/test/java/ognl/test/ASTSequenceTest.java @@ -1,11 +1,11 @@ -package org.ognl.test; +package ognl.test; import junit.framework.TestCase; -import org.ognl.ASTSequence; -import org.ognl.DefaultMemberAccess; -import org.ognl.Ognl; -import org.ognl.OgnlContext; -import org.ognl.SimpleNode; +import ognl.ASTSequence; +import ognl.DefaultMemberAccess; +import ognl.Ognl; +import ognl.OgnlContext; +import ognl.SimpleNode; /** * Tests for {@link ASTSequence}. diff --git a/src/test/java/org/ognl/test/ArithmeticAndLogicalOperatorsTest.java b/src/test/java/ognl/test/ArithmeticAndLogicalOperatorsTest.java similarity index 99% rename from src/test/java/org/ognl/test/ArithmeticAndLogicalOperatorsTest.java rename to src/test/java/ognl/test/ArithmeticAndLogicalOperatorsTest.java index 3546cdf7..1893a177 100644 --- a/src/test/java/org/ognl/test/ArithmeticAndLogicalOperatorsTest.java +++ b/src/test/java/ognl/test/ArithmeticAndLogicalOperatorsTest.java @@ -28,7 +28,7 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. // -------------------------------------------------------------------------- -package org.ognl.test; +package ognl.test; import junit.framework.TestSuite; @@ -39,7 +39,7 @@ public class ArithmeticAndLogicalOperatorsTest extends OgnlTestCase public enum EnumNoBody { ENUM1, ENUM2; }; // Basic enumeration public enum EnumEmptyBody { ENUM1{}, ENUM2{}; }; // Enumeration whose elements have (empty) bodies - public enum EnumBasicBody { ENUM1{ public final Integer value() { return Integer.valueOf(10);} }, + public enum EnumBasicBody { ENUM1{ public final Integer value() { return Integer.valueOf(10);} }, ENUM2{ public final Integer value() { return Integer.valueOf(20);} }; }; // Enumeration whose elements have bodies protected static final String FULLY_QUALIFIED_CLASSNAME = ArithmeticAndLogicalOperatorsTest.class.getName(); @@ -59,7 +59,7 @@ public enum EnumBasicBody { ENUM1{ public final Integer value() { return Integer { "-1b", new Integer(-1) }, { "+1b", new Integer(1) }, { "--1b", new Integer(1) }, - { "2*2.0b", new Double(4.0) }, + { "2*2.0b", new Double(4.0) }, { "5/2.B", new Integer(2) }, { "5.0B/2", new Double(2.5) }, { "5+2b", new Integer(7) }, @@ -202,7 +202,7 @@ public enum EnumBasicBody { ENUM1{ public final Integer value() { return Integer { "@" + FULLY_QUALIFIED_CLASSNAME + "$EnumBasicBody@ENUM2 != @" + FULLY_QUALIFIED_CLASSNAME + "$EnumBasicBody@ENUM1", Boolean.TRUE }, { "@" + FULLY_QUALIFIED_CLASSNAME + "$EnumBasicBody@ENUM2 == @" + FULLY_QUALIFIED_CLASSNAME + "$EnumBasicBody@ENUM1", Boolean.FALSE }, - // As per JDK JavaDocs it is only possible to compare Enum elements of the same type. Attempting to compare different types + // As per JDK JavaDocs it is only possible to compare Enum elements of the same type. Attempting to compare different types // will normally result in ClassCastExceptions. However, OGNL should avoid that and produce an IllegalArgumentException instead. { "@" + FULLY_QUALIFIED_CLASSNAME + "$EnumNoBody@ENUM1 == @" + FULLY_QUALIFIED_CLASSNAME + "$EnumEmptyBody@ENUM1", IllegalArgumentException.class }, { "@" + FULLY_QUALIFIED_CLASSNAME + "$EnumNoBody@ENUM1 != @" + FULLY_QUALIFIED_CLASSNAME + "$EnumEmptyBody@ENUM1", IllegalArgumentException.class }, diff --git a/src/test/java/org/ognl/test/ArrayCreationTest.java b/src/test/java/ognl/test/ArrayCreationTest.java similarity index 85% rename from src/test/java/org/ognl/test/ArrayCreationTest.java rename to src/test/java/ognl/test/ArrayCreationTest.java index e18444fa..627815f5 100644 --- a/src/test/java/org/ognl/test/ArrayCreationTest.java +++ b/src/test/java/ognl/test/ArrayCreationTest.java @@ -28,13 +28,13 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. // -------------------------------------------------------------------------- -package org.ognl.test; +package ognl.test; import junit.framework.TestSuite; -import org.ognl.ExpressionSyntaxException; -import org.ognl.test.objects.Entry; -import org.ognl.test.objects.Root; -import org.ognl.test.objects.Simple; +import ognl.ExpressionSyntaxException; +import ognl.test.objects.Entry; +import ognl.test.objects.Root; +import ognl.test.objects.Simple; public class ArrayCreationTest extends OgnlTestCase { @@ -52,13 +52,13 @@ public class ArrayCreationTest extends OgnlTestCase { 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 ognl.test.objects.Simple[] { new ognl.test.objects.Simple(), new 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 ognl.test.objects.Simple[5]", new Simple[5] }, + { ROOT, "new ognl.test.objects.Simple(new Object[5])", new Simple(new Object[5]) }, + { ROOT, "new ognl.test.objects.Simple(new String[5])", new Simple(new String[5]) }, + { ROOT, "objectIndex ? new ognl.test.objects.Entry[] { new ognl.test.objects.Entry(), new ognl.test.objects.Entry()} " + + ": new ognl.test.objects.Entry[] { new ognl.test.objects.Entry(), new ognl.test.objects.Entry()} ", new Entry[] { new Entry(), new Entry()} } }; diff --git a/src/test/java/org/ognl/test/ArrayElementsTest.java b/src/test/java/ognl/test/ArrayElementsTest.java similarity index 98% rename from src/test/java/org/ognl/test/ArrayElementsTest.java rename to src/test/java/ognl/test/ArrayElementsTest.java index 788d9873..b9da6662 100644 --- a/src/test/java/org/ognl/test/ArrayElementsTest.java +++ b/src/test/java/ognl/test/ArrayElementsTest.java @@ -28,11 +28,11 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. // -------------------------------------------------------------------------- -package org.ognl.test; +package ognl.test; import junit.framework.TestSuite; -import org.ognl.TypeConverter; -import org.ognl.test.objects.Root; +import ognl.TypeConverter; +import ognl.test.objects.Root; import java.util.Arrays; diff --git a/src/test/java/org/ognl/test/ChainTest.java b/src/test/java/ognl/test/ChainTest.java similarity index 92% rename from src/test/java/org/ognl/test/ChainTest.java rename to src/test/java/ognl/test/ChainTest.java index 09a07e95..fcba6297 100644 --- a/src/test/java/org/ognl/test/ChainTest.java +++ b/src/test/java/ognl/test/ChainTest.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.ognl.test; +package ognl.test; import junit.framework.TestCase; -import org.ognl.DefaultMemberAccess; -import org.ognl.Ognl; -import org.ognl.OgnlContext; -import org.ognl.SimpleNode; +import ognl.DefaultMemberAccess; +import ognl.Ognl; +import ognl.OgnlContext; +import ognl.SimpleNode; /** * Tests for {@link SimpleNode#isChain(OgnlContext)}. diff --git a/src/test/java/org/ognl/test/ClassMethodTest.java b/src/test/java/ognl/test/ClassMethodTest.java similarity index 98% rename from src/test/java/org/ognl/test/ClassMethodTest.java rename to src/test/java/ognl/test/ClassMethodTest.java index 9f9c4a4a..1f0de814 100644 --- a/src/test/java/org/ognl/test/ClassMethodTest.java +++ b/src/test/java/ognl/test/ClassMethodTest.java @@ -28,10 +28,10 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. // -------------------------------------------------------------------------- -package org.ognl.test; +package ognl.test; import junit.framework.TestSuite; -import org.ognl.test.objects.CorrectedObject; +import ognl.test.objects.CorrectedObject; public class ClassMethodTest extends OgnlTestCase { diff --git a/src/test/java/org/ognl/test/CollectionDirectPropertyTest.java b/src/test/java/ognl/test/CollectionDirectPropertyTest.java similarity index 98% rename from src/test/java/org/ognl/test/CollectionDirectPropertyTest.java rename to src/test/java/ognl/test/CollectionDirectPropertyTest.java index bb87a300..22d6d5c4 100644 --- a/src/test/java/org/ognl/test/CollectionDirectPropertyTest.java +++ b/src/test/java/ognl/test/CollectionDirectPropertyTest.java @@ -28,10 +28,10 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. // -------------------------------------------------------------------------- -package org.ognl.test; +package ognl.test; import junit.framework.TestSuite; -import org.ognl.test.objects.Root; +import ognl.test.objects.Root; import java.util.Arrays; diff --git a/src/test/java/org/ognl/test/CompilingPropertyAccessor.java b/src/test/java/ognl/test/CompilingPropertyAccessor.java similarity index 96% rename from src/test/java/org/ognl/test/CompilingPropertyAccessor.java rename to src/test/java/ognl/test/CompilingPropertyAccessor.java index 72f4ca68..f1b340f9 100644 --- a/src/test/java/org/ognl/test/CompilingPropertyAccessor.java +++ b/src/test/java/ognl/test/CompilingPropertyAccessor.java @@ -16,20 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl.test; +package ognl.test; import javassist.ClassPool; import javassist.CtClass; import javassist.CtMethod; import javassist.LoaderClassPath; -import org.ognl.ClassResolver; -import org.ognl.ObjectPropertyAccessor; -import org.ognl.OgnlContext; -import org.ognl.OgnlException; -import org.ognl.OgnlRuntime; -import org.ognl.enhance.ContextClassLoader; -import org.ognl.enhance.EnhancedClassLoader; -import org.ognl.test.util.NameFactory; +import ognl.ClassResolver; +import ognl.ObjectPropertyAccessor; +import ognl.OgnlContext; +import ognl.OgnlException; +import ognl.OgnlRuntime; +import ognl.enhance.ContextClassLoader; +import ognl.enhance.EnhancedClassLoader; +import ognl.test.util.NameFactory; import java.lang.reflect.Method; import java.lang.reflect.Modifier; @@ -43,7 +43,7 @@ */ public class CompilingPropertyAccessor extends ObjectPropertyAccessor { - private static final NameFactory NAME_FACTORY = new NameFactory("org.ognl.PropertyAccessor", "v"); + private static final NameFactory NAME_FACTORY = new NameFactory("ognl.PropertyAccessor", "v"); private static final Getter NotFoundGetter = (context, target, propertyName) -> null; private static final Getter DefaultGetter = (context, target, propertyName) -> { try { diff --git a/src/test/java/org/ognl/test/ConstantTest.java b/src/test/java/ognl/test/ConstantTest.java similarity index 98% rename from src/test/java/org/ognl/test/ConstantTest.java rename to src/test/java/ognl/test/ConstantTest.java index 74d55968..cb52e19c 100644 --- a/src/test/java/org/ognl/test/ConstantTest.java +++ b/src/test/java/ognl/test/ConstantTest.java @@ -28,10 +28,10 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. // -------------------------------------------------------------------------- -package org.ognl.test; +package ognl.test; import junit.framework.TestSuite; -import org.ognl.ExpressionSyntaxException; +import ognl.ExpressionSyntaxException; import java.util.Arrays; diff --git a/src/test/java/org/ognl/test/ConstantTreeTest.java b/src/test/java/ognl/test/ConstantTreeTest.java similarity index 95% rename from src/test/java/org/ognl/test/ConstantTreeTest.java rename to src/test/java/ognl/test/ConstantTreeTest.java index 300df596..61108608 100644 --- a/src/test/java/org/ognl/test/ConstantTreeTest.java +++ b/src/test/java/ognl/test/ConstantTreeTest.java @@ -28,10 +28,10 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. // -------------------------------------------------------------------------- -package org.ognl.test; +package ognl.test; import junit.framework.TestSuite; -import org.ognl.Ognl; +import ognl.Ognl; public class ConstantTreeTest extends OgnlTestCase { @@ -42,8 +42,8 @@ public class ConstantTreeTest extends OgnlTestCase { "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 }, + { "@ognl.test.ConstantTreeTest@nonFinalStaticVariable", Boolean.FALSE }, + { "@ognl.test.ConstantTreeTest@nonFinalStaticVariable + 10", Boolean.FALSE }, { "55 + 24 + @java.awt.Event@ALT_MASK", Boolean.TRUE }, { "name", Boolean.FALSE }, { "name[i]", Boolean.FALSE }, diff --git a/src/test/java/org/ognl/test/ContextVariableTest.java b/src/test/java/ognl/test/ContextVariableTest.java similarity index 98% rename from src/test/java/org/ognl/test/ContextVariableTest.java rename to src/test/java/ognl/test/ContextVariableTest.java index 8b460aab..80bdb2fe 100644 --- a/src/test/java/org/ognl/test/ContextVariableTest.java +++ b/src/test/java/ognl/test/ContextVariableTest.java @@ -28,10 +28,10 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. // -------------------------------------------------------------------------- -package org.ognl.test; +package ognl.test; import junit.framework.TestSuite; -import org.ognl.test.objects.Simple; +import ognl.test.objects.Simple; public class ContextVariableTest extends OgnlTestCase { diff --git a/src/test/java/org/ognl/test/CorrectedObjectNullHandler.java b/src/test/java/ognl/test/CorrectedObjectNullHandler.java similarity index 96% rename from src/test/java/org/ognl/test/CorrectedObjectNullHandler.java rename to src/test/java/ognl/test/CorrectedObjectNullHandler.java index 638a87e3..3084de85 100644 --- a/src/test/java/org/ognl/test/CorrectedObjectNullHandler.java +++ b/src/test/java/ognl/test/CorrectedObjectNullHandler.java @@ -28,10 +28,10 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. //-------------------------------------------------------------------------- -package org.ognl.test; +package ognl.test; -import org.ognl.NullHandler; -import org.ognl.OgnlContext; +import ognl.NullHandler; +import ognl.OgnlContext; public class CorrectedObjectNullHandler implements NullHandler { diff --git a/src/test/java/org/ognl/test/DefaultClassResolverTest.java b/src/test/java/ognl/test/DefaultClassResolverTest.java similarity index 92% rename from src/test/java/org/ognl/test/DefaultClassResolverTest.java rename to src/test/java/ognl/test/DefaultClassResolverTest.java index 19ff35af..50faa431 100644 --- a/src/test/java/org/ognl/test/DefaultClassResolverTest.java +++ b/src/test/java/ognl/test/DefaultClassResolverTest.java @@ -1,7 +1,10 @@ -package org.ognl.test; +package ognl.test; import junit.framework.TestCase; -import org.ognl.*; +import ognl.DefaultClassResolver; +import ognl.DefaultMemberAccess; +import ognl.Ognl; +import ognl.OgnlContext; public class DefaultClassResolverTest extends TestCase { diff --git a/src/test/java/org/ognl/test/GenericsTest.java b/src/test/java/ognl/test/GenericsTest.java similarity index 87% rename from src/test/java/org/ognl/test/GenericsTest.java rename to src/test/java/ognl/test/GenericsTest.java index 31e5ee67..ed56ddf1 100644 --- a/src/test/java/org/ognl/test/GenericsTest.java +++ b/src/test/java/ognl/test/GenericsTest.java @@ -1,10 +1,10 @@ -package org.ognl.test; +package 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 ognl.test.objects.BaseGeneric; +import ognl.test.objects.GameGeneric; +import ognl.test.objects.GameGenericObject; +import ognl.test.objects.GenericRoot; /** * Tests java >= 1.5 generics support in ognl. diff --git a/src/test/java/org/ognl/test/InExpressionTest.java b/src/test/java/ognl/test/InExpressionTest.java similarity index 85% rename from src/test/java/org/ognl/test/InExpressionTest.java rename to src/test/java/ognl/test/InExpressionTest.java index d2cf2410..b631ad66 100644 --- a/src/test/java/org/ognl/test/InExpressionTest.java +++ b/src/test/java/ognl/test/InExpressionTest.java @@ -1,7 +1,9 @@ -package org.ognl.test; +package ognl.test; import junit.framework.TestCase; -import org.ognl.*; +import ognl.DefaultMemberAccess; +import ognl.Ognl; +import ognl.OgnlContext; /** * Test for OGNL-118. diff --git a/src/test/java/org/ognl/test/IndexAccessTest.java b/src/test/java/ognl/test/IndexAccessTest.java similarity index 96% rename from src/test/java/org/ognl/test/IndexAccessTest.java rename to src/test/java/ognl/test/IndexAccessTest.java index 4d0c42cd..8dab6af5 100644 --- a/src/test/java/org/ognl/test/IndexAccessTest.java +++ b/src/test/java/ognl/test/IndexAccessTest.java @@ -28,13 +28,13 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. // -------------------------------------------------------------------------- -package org.ognl.test; +package ognl.test; import junit.framework.TestSuite; -import org.ognl.MethodFailedException; -import org.ognl.NoSuchPropertyException; -import org.ognl.test.objects.IndexedSetObject; -import org.ognl.test.objects.Root; +import ognl.MethodFailedException; +import ognl.NoSuchPropertyException; +import ognl.test.objects.IndexedSetObject; +import ognl.test.objects.Root; public class IndexAccessTest extends OgnlTestCase { diff --git a/src/test/java/org/ognl/test/IndexedPropertyTest.java b/src/test/java/ognl/test/IndexedPropertyTest.java similarity index 98% rename from src/test/java/org/ognl/test/IndexedPropertyTest.java rename to src/test/java/ognl/test/IndexedPropertyTest.java index c2dba879..03539f3c 100644 --- a/src/test/java/org/ognl/test/IndexedPropertyTest.java +++ b/src/test/java/ognl/test/IndexedPropertyTest.java @@ -28,11 +28,11 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. // -------------------------------------------------------------------------- -package org.ognl.test; +package ognl.test; import junit.framework.TestSuite; -import org.ognl.test.objects.Indexed; -import org.ognl.test.objects.Root; +import ognl.test.objects.Indexed; +import ognl.test.objects.Root; public class IndexedPropertyTest extends OgnlTestCase { diff --git a/src/test/java/org/ognl/test/InheritedMethodsTest.java b/src/test/java/ognl/test/InheritedMethodsTest.java similarity index 84% rename from src/test/java/org/ognl/test/InheritedMethodsTest.java rename to src/test/java/ognl/test/InheritedMethodsTest.java index 106ddf36..03a225f5 100644 --- a/src/test/java/org/ognl/test/InheritedMethodsTest.java +++ b/src/test/java/ognl/test/InheritedMethodsTest.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl.test; +package ognl.test; import junit.framework.TestCase; -import org.ognl.DefaultMemberAccess; -import org.ognl.Node; -import org.ognl.Ognl; -import org.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 ognl.DefaultMemberAccess; +import ognl.Node; +import ognl.Ognl; +import ognl.OgnlContext; +import ognl.test.objects.BaseBean; +import ognl.test.objects.FirstBean; +import ognl.test.objects.Root; +import ognl.test.objects.SecondBean; /** * Tests functionality of casting inherited method expressions. diff --git a/src/test/java/org/ognl/test/InterfaceInheritanceTest.java b/src/test/java/ognl/test/InterfaceInheritanceTest.java similarity index 98% rename from src/test/java/org/ognl/test/InterfaceInheritanceTest.java rename to src/test/java/ognl/test/InterfaceInheritanceTest.java index fb661818..e7535b67 100644 --- a/src/test/java/org/ognl/test/InterfaceInheritanceTest.java +++ b/src/test/java/ognl/test/InterfaceInheritanceTest.java @@ -28,11 +28,11 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. // -------------------------------------------------------------------------- -package org.ognl.test; +package ognl.test; import junit.framework.TestSuite; -import org.ognl.OgnlRuntime; -import org.ognl.test.objects.*; +import ognl.OgnlRuntime; +import ognl.test.objects.*; import java.util.List; diff --git a/src/test/java/org/ognl/test/IsTruckTest.java b/src/test/java/ognl/test/IsTruckTest.java similarity index 82% rename from src/test/java/org/ognl/test/IsTruckTest.java rename to src/test/java/ognl/test/IsTruckTest.java index 33c94f71..b0270ea0 100644 --- a/src/test/java/org/ognl/test/IsTruckTest.java +++ b/src/test/java/ognl/test/IsTruckTest.java @@ -1,7 +1,9 @@ -package org.ognl.test; +package ognl.test; import junit.framework.TestCase; -import org.ognl.*; +import ognl.DefaultMemberAccess; +import ognl.Ognl; +import ognl.OgnlContext; public class IsTruckTest extends TestCase { diff --git a/src/test/java/org/ognl/test/Java8Test.java b/src/test/java/ognl/test/Java8Test.java similarity index 95% rename from src/test/java/org/ognl/test/Java8Test.java rename to src/test/java/ognl/test/Java8Test.java index 6f5142b9..dde477d2 100644 --- a/src/test/java/org/ognl/test/Java8Test.java +++ b/src/test/java/ognl/test/Java8Test.java @@ -1,12 +1,12 @@ -package org.ognl.test; +package ognl.test; import java.beans.IntrospectionException; import java.lang.reflect.Method; import java.util.List; import junit.framework.TestCase; -import org.ognl.OgnlException; -import org.ognl.OgnlRuntime; +import ognl.OgnlException; +import ognl.OgnlRuntime; public class Java8Test extends TestCase { diff --git a/src/test/java/org/ognl/test/LambdaExpressionTest.java b/src/test/java/ognl/test/LambdaExpressionTest.java similarity index 99% rename from src/test/java/org/ognl/test/LambdaExpressionTest.java rename to src/test/java/ognl/test/LambdaExpressionTest.java index 9a35303e..670e6aa3 100644 --- a/src/test/java/org/ognl/test/LambdaExpressionTest.java +++ b/src/test/java/ognl/test/LambdaExpressionTest.java @@ -28,7 +28,7 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. // -------------------------------------------------------------------------- -package org.ognl.test; +package ognl.test; import junit.framework.TestSuite; diff --git a/src/test/java/org/ognl/test/MapCreationTest.java b/src/test/java/ognl/test/MapCreationTest.java similarity index 98% rename from src/test/java/org/ognl/test/MapCreationTest.java rename to src/test/java/ognl/test/MapCreationTest.java index 6b58d82f..f7a25aaf 100644 --- a/src/test/java/org/ognl/test/MapCreationTest.java +++ b/src/test/java/ognl/test/MapCreationTest.java @@ -28,10 +28,10 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. // -------------------------------------------------------------------------- -package org.ognl.test; +package ognl.test; import junit.framework.TestSuite; -import org.ognl.test.objects.Root; +import ognl.test.objects.Root; import java.util.HashMap; import java.util.LinkedHashMap; diff --git a/src/test/java/org/ognl/test/MemberAccessTest.java b/src/test/java/ognl/test/MemberAccessTest.java similarity index 96% rename from src/test/java/org/ognl/test/MemberAccessTest.java rename to src/test/java/ognl/test/MemberAccessTest.java index 9c1e5394..0baaa515 100644 --- a/src/test/java/org/ognl/test/MemberAccessTest.java +++ b/src/test/java/ognl/test/MemberAccessTest.java @@ -28,14 +28,14 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. // -------------------------------------------------------------------------- -package org.ognl.test; +package ognl.test; import junit.framework.TestSuite; -import org.ognl.DefaultMemberAccess; -import org.ognl.Ognl; -import org.ognl.OgnlContext; -import org.ognl.OgnlException; -import org.ognl.test.objects.Simple; +import ognl.DefaultMemberAccess; +import ognl.Ognl; +import ognl.OgnlContext; +import ognl.OgnlException; +import ognl.test.objects.Simple; import java.lang.reflect.Member; import java.lang.reflect.Method; diff --git a/src/test/java/org/ognl/test/MethodTest.java b/src/test/java/ognl/test/MethodTest.java similarity index 95% rename from src/test/java/org/ognl/test/MethodTest.java rename to src/test/java/ognl/test/MethodTest.java index 0f8fa08f..eb38deae 100644 --- a/src/test/java/org/ognl/test/MethodTest.java +++ b/src/test/java/ognl/test/MethodTest.java @@ -28,18 +28,17 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. // -------------------------------------------------------------------------- -package org.ognl.test; +package ognl.test; import junit.framework.TestSuite; import java.util.Arrays; -import java.util.HashMap; import java.util.List; -import org.ognl.Ognl; -import org.ognl.OgnlContext; -import org.ognl.OgnlException; -import org.ognl.test.objects.*; +import ognl.Ognl; +import ognl.OgnlContext; +import ognl.OgnlException; +import ognl.test.objects.*; public class MethodTest extends OgnlTestCase { @@ -56,8 +55,8 @@ public class MethodTest extends OgnlTestCase { "messages.format('ShowAllCount', {one})", ROOT.getMessages().format("ShowAllCount", new Object[] { ROOT.getOne() }) }, { "messages.format('ShowAllCount', {one, two})", ROOT.getMessages().format("ShowAllCount", new Object[] { ROOT.getOne(), ROOT.getTwo() }) }, { "messages.format('ShowAllCount', one, two)", ROOT.getMessages().format("ShowAllCount", ROOT.getOne(), ROOT.getTwo()) }, - { "getTestValue(@org.ognl.test.objects.SimpleEnum@ONE.value)", new Integer(2)}, - { "@org.ognl.test.MethodTest@getA().isProperty()", Boolean.FALSE}, + { "getTestValue(@ognl.test.objects.SimpleEnum@ONE.value)", new Integer(2)}, + { "@ognl.test.MethodTest@getA().isProperty()", Boolean.FALSE}, { "isDisabled()", Boolean.TRUE}, { "isTruck", Boolean.TRUE}, { "isEditorDisabled()", Boolean.FALSE}, diff --git a/src/test/java/org/ognl/test/MethodWithConversionTest.java b/src/test/java/ognl/test/MethodWithConversionTest.java similarity index 98% rename from src/test/java/org/ognl/test/MethodWithConversionTest.java rename to src/test/java/ognl/test/MethodWithConversionTest.java index 49075b65..4ae93966 100644 --- a/src/test/java/org/ognl/test/MethodWithConversionTest.java +++ b/src/test/java/ognl/test/MethodWithConversionTest.java @@ -28,10 +28,10 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. // -------------------------------------------------------------------------- -package org.ognl.test; +package ognl.test; import junit.framework.TestSuite; -import org.ognl.test.objects.Simple; +import ognl.test.objects.Simple; public class MethodWithConversionTest extends OgnlTestCase { @@ -43,7 +43,7 @@ public class MethodWithConversionTest extends OgnlTestCase { SIMPLE, "setValues(new Integer(10), \"10.56\", new Double(34.225))", null }, { SIMPLE, "stringValue", "10" }, { SIMPLE, "stringValue", "10", new Character('x'), "x" }, - { SIMPLE, "setStringValue('x')", null }, // set by calling setStringValue() directly + { SIMPLE, "setStringValue('x')", null }, // set by calling setStringValue() directly { SIMPLE, "floatValue", new Float(10.56) }, { SIMPLE, "getValueIsTrue(rootValue)", Boolean.TRUE}, { SIMPLE, "messages.format('Testing', one, two, three)", "blah" } diff --git a/src/test/java/org/ognl/test/NestedMethodTest.java b/src/test/java/ognl/test/NestedMethodTest.java similarity index 97% rename from src/test/java/org/ognl/test/NestedMethodTest.java rename to src/test/java/ognl/test/NestedMethodTest.java index 5f31de4d..36dbe792 100644 --- a/src/test/java/org/ognl/test/NestedMethodTest.java +++ b/src/test/java/ognl/test/NestedMethodTest.java @@ -28,10 +28,10 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. // -------------------------------------------------------------------------- -package org.ognl.test; +package ognl.test; import junit.framework.TestSuite; -import org.ognl.test.objects.Component; +import ognl.test.objects.Component; public class NestedMethodTest extends OgnlTestCase { @@ -42,7 +42,7 @@ public class NestedMethodTest extends OgnlTestCase // Expression in a method call argument { COMPONENT, "toDisplay.pictureUrl", COMPONENT.getToDisplay().getPictureUrl() }, { COMPONENT, "page.createRelativeAsset(toDisplay.pictureUrl)", - COMPONENT.getPage().createRelativeAsset(COMPONENT.getToDisplay().getPictureUrl()) }, + COMPONENT.getPage().createRelativeAsset(COMPONENT.getToDisplay().getPictureUrl()) }, }; /* diff --git a/src/test/java/org/ognl/test/NullHandlerTest.java b/src/test/java/ognl/test/NullHandlerTest.java similarity index 98% rename from src/test/java/org/ognl/test/NullHandlerTest.java rename to src/test/java/ognl/test/NullHandlerTest.java index 8d4ad4fa..92f02071 100644 --- a/src/test/java/org/ognl/test/NullHandlerTest.java +++ b/src/test/java/ognl/test/NullHandlerTest.java @@ -28,11 +28,11 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. // -------------------------------------------------------------------------- -package org.ognl.test; +package ognl.test; import junit.framework.TestSuite; -import org.ognl.OgnlRuntime; -import org.ognl.test.objects.CorrectedObject; +import ognl.OgnlRuntime; +import ognl.test.objects.CorrectedObject; public class NullHandlerTest extends OgnlTestCase { diff --git a/src/test/java/org/ognl/test/NullStringCatenationTest.java b/src/test/java/ognl/test/NullStringCatenationTest.java similarity index 96% rename from src/test/java/org/ognl/test/NullStringCatenationTest.java rename to src/test/java/ognl/test/NullStringCatenationTest.java index 371f854e..9e5e4b90 100644 --- a/src/test/java/org/ognl/test/NullStringCatenationTest.java +++ b/src/test/java/ognl/test/NullStringCatenationTest.java @@ -28,10 +28,10 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. // -------------------------------------------------------------------------- -package org.ognl.test; +package ognl.test; import junit.framework.TestSuite; -import org.ognl.test.objects.Root; +import ognl.test.objects.Root; public class NullStringCatenationTest extends OgnlTestCase { @@ -48,7 +48,7 @@ public class NullStringCatenationTest extends OgnlTestCase { {ROOT, "theInt == 0 ? '5%' : theInt + '%'", "6%"}, {ROOT, "'width:' + width + ';'", "width:238px;" }, {ROOT, "theLong + '_' + index", "4_1"}, - {ROOT, "'javascript:' + @org.ognl.test.NullStringCatenationTest@MESSAGE", "javascript:blarney" }, + {ROOT, "'javascript:' + @ognl.test.NullStringCatenationTest@MESSAGE", "javascript:blarney" }, {ROOT, "printDelivery ? '' : 'javascript:deliverySelected(' + property.carrier + ',' + currentDeliveryId + ')'", "" }, {ROOT, "bean2.id + '_' + theInt", "1_6" } }; diff --git a/src/test/java/org/ognl/test/NumberFormatExceptionTest.java b/src/test/java/ognl/test/NumberFormatExceptionTest.java similarity index 98% rename from src/test/java/org/ognl/test/NumberFormatExceptionTest.java rename to src/test/java/ognl/test/NumberFormatExceptionTest.java index 9bbcd1b0..01b89d18 100644 --- a/src/test/java/org/ognl/test/NumberFormatExceptionTest.java +++ b/src/test/java/ognl/test/NumberFormatExceptionTest.java @@ -28,11 +28,11 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. //-------------------------------------------------------------------------- -package org.ognl.test; +package ognl.test; import junit.framework.TestSuite; -import org.ognl.OgnlException; -import org.ognl.test.objects.Simple; +import ognl.OgnlException; +import ognl.test.objects.Simple; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/src/test/java/org/ognl/test/NumericConversionTest.java b/src/test/java/ognl/test/NumericConversionTest.java similarity index 99% rename from src/test/java/org/ognl/test/NumericConversionTest.java rename to src/test/java/ognl/test/NumericConversionTest.java index ecf3660b..bb5b3730 100644 --- a/src/test/java/org/ognl/test/NumericConversionTest.java +++ b/src/test/java/ognl/test/NumericConversionTest.java @@ -28,11 +28,11 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. //-------------------------------------------------------------------------- -package org.ognl.test; +package ognl.test; import junit.framework.TestSuite; -import org.ognl.OgnlException; -import org.ognl.OgnlOps; +import ognl.OgnlException; +import ognl.OgnlOps; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/src/test/java/org/ognl/test/ObjectIndexedPropertyTest.java b/src/test/java/ognl/test/ObjectIndexedPropertyTest.java similarity index 97% rename from src/test/java/org/ognl/test/ObjectIndexedPropertyTest.java rename to src/test/java/ognl/test/ObjectIndexedPropertyTest.java index 622ffce6..895ee4bd 100644 --- a/src/test/java/org/ognl/test/ObjectIndexedPropertyTest.java +++ b/src/test/java/ognl/test/ObjectIndexedPropertyTest.java @@ -28,12 +28,12 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. // -------------------------------------------------------------------------- -package org.ognl.test; +package ognl.test; import junit.framework.TestSuite; -import org.ognl.OgnlException; -import org.ognl.test.objects.Bean1; -import org.ognl.test.objects.ObjectIndexed; +import ognl.OgnlException; +import ognl.test.objects.Bean1; +import ognl.test.objects.ObjectIndexed; public class ObjectIndexedPropertyTest extends OgnlTestCase { diff --git a/src/test/java/org/ognl/test/ObjectIndexedTest.java b/src/test/java/ognl/test/ObjectIndexedTest.java similarity index 96% rename from src/test/java/org/ognl/test/ObjectIndexedTest.java rename to src/test/java/ognl/test/ObjectIndexedTest.java index e31e3ef7..4a44916d 100644 --- a/src/test/java/org/ognl/test/ObjectIndexedTest.java +++ b/src/test/java/ognl/test/ObjectIndexedTest.java @@ -1,13 +1,13 @@ -package org.ognl.test; +package ognl.test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.ognl.DefaultMemberAccess; -import org.ognl.Ognl; -import org.ognl.OgnlContext; -import org.ognl.OgnlException; -import org.ognl.OgnlRuntime; -import org.ognl.SimpleNode; +import ognl.DefaultMemberAccess; +import ognl.Ognl; +import ognl.OgnlContext; +import ognl.OgnlException; +import ognl.OgnlRuntime; +import ognl.SimpleNode; public class ObjectIndexedTest extends TestCase { diff --git a/src/test/java/org/ognl/test/OgnlOpsTest.java b/src/test/java/ognl/test/OgnlOpsTest.java similarity index 98% rename from src/test/java/org/ognl/test/OgnlOpsTest.java rename to src/test/java/ognl/test/OgnlOpsTest.java index cd6a1916..486c859d 100644 --- a/src/test/java/org/ognl/test/OgnlOpsTest.java +++ b/src/test/java/ognl/test/OgnlOpsTest.java @@ -1,7 +1,7 @@ -package org.ognl.test; +package ognl.test; import junit.framework.TestCase; -import org.ognl.OgnlOps; +import ognl.OgnlOps; public class OgnlOpsTest extends TestCase { public void testEqualStringsEqual() throws Exception { diff --git a/src/test/java/org/ognl/test/OgnlTestCase.java b/src/test/java/ognl/test/OgnlTestCase.java similarity index 98% rename from src/test/java/org/ognl/test/OgnlTestCase.java rename to src/test/java/ognl/test/OgnlTestCase.java index 63ef9e5f..c12cc886 100644 --- a/src/test/java/org/ognl/test/OgnlTestCase.java +++ b/src/test/java/ognl/test/OgnlTestCase.java @@ -28,13 +28,13 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. //-------------------------------------------------------------------------- -package org.ognl.test; +package ognl.test; import junit.framework.TestCase; -import org.ognl.DefaultMemberAccess; -import org.ognl.Ognl; -import org.ognl.OgnlContext; -import org.ognl.SimpleNode; +import ognl.DefaultMemberAccess; +import ognl.Ognl; +import ognl.OgnlContext; +import ognl.SimpleNode; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/src/test/java/org/ognl/test/OperationTest.java b/src/test/java/ognl/test/OperationTest.java similarity index 92% rename from src/test/java/org/ognl/test/OperationTest.java rename to src/test/java/ognl/test/OperationTest.java index 9281072b..3a2714cb 100644 --- a/src/test/java/org/ognl/test/OperationTest.java +++ b/src/test/java/ognl/test/OperationTest.java @@ -1,10 +1,10 @@ -package org.ognl.test; +package ognl.test; import junit.framework.TestCase; -import org.ognl.DefaultMemberAccess; -import org.ognl.Ognl; -import org.ognl.OgnlContext; -import org.ognl.SimpleNode; +import ognl.DefaultMemberAccess; +import ognl.Ognl; +import ognl.OgnlContext; +import ognl.SimpleNode; /** * Tests for {@link SimpleNode#isOperation(OgnlContext)}. diff --git a/src/test/java/org/ognl/test/OperatorTest.java b/src/test/java/ognl/test/OperatorTest.java similarity index 99% rename from src/test/java/org/ognl/test/OperatorTest.java rename to src/test/java/ognl/test/OperatorTest.java index f1a0d711..a683d3c9 100644 --- a/src/test/java/org/ognl/test/OperatorTest.java +++ b/src/test/java/ognl/test/OperatorTest.java @@ -28,7 +28,7 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. //-------------------------------------------------------------------------- -package org.ognl.test; +package ognl.test; import junit.framework.TestSuite; diff --git a/src/test/java/org/ognl/test/Performance.java b/src/test/java/ognl/test/Performance.java similarity index 98% rename from src/test/java/org/ognl/test/Performance.java rename to src/test/java/ognl/test/Performance.java index cfa7a568..b9a59bed 100644 --- a/src/test/java/org/ognl/test/Performance.java +++ b/src/test/java/ognl/test/Performance.java @@ -28,14 +28,14 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. // -------------------------------------------------------------------------- -package org.ognl.test; - -import org.ognl.DefaultMemberAccess; -import org.ognl.Ognl; -import org.ognl.OgnlContext; -import org.ognl.OgnlException; -import org.ognl.SimpleNode; -import org.ognl.test.objects.Bean1; +package ognl.test; + +import ognl.DefaultMemberAccess; +import ognl.Ognl; +import ognl.OgnlContext; +import ognl.OgnlException; +import ognl.SimpleNode; +import ognl.test.objects.Bean1; import java.io.Serializable; import java.lang.reflect.Method; diff --git a/src/test/java/org/ognl/test/PrimitiveArrayTest.java b/src/test/java/ognl/test/PrimitiveArrayTest.java similarity index 98% rename from src/test/java/org/ognl/test/PrimitiveArrayTest.java rename to src/test/java/ognl/test/PrimitiveArrayTest.java index e2ca945e..12ca2c00 100644 --- a/src/test/java/org/ognl/test/PrimitiveArrayTest.java +++ b/src/test/java/ognl/test/PrimitiveArrayTest.java @@ -28,10 +28,10 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. //-------------------------------------------------------------------------- -package org.ognl.test; +package ognl.test; import junit.framework.TestSuite; -import org.ognl.test.objects.Root; +import ognl.test.objects.Root; public class PrimitiveArrayTest extends OgnlTestCase { private static Root ROOT = new Root(); diff --git a/src/test/java/org/ognl/test/PrimitiveNullHandlingTest.java b/src/test/java/ognl/test/PrimitiveNullHandlingTest.java similarity index 98% rename from src/test/java/org/ognl/test/PrimitiveNullHandlingTest.java rename to src/test/java/ognl/test/PrimitiveNullHandlingTest.java index 9f148e2c..5381e9a4 100644 --- a/src/test/java/org/ognl/test/PrimitiveNullHandlingTest.java +++ b/src/test/java/ognl/test/PrimitiveNullHandlingTest.java @@ -28,10 +28,10 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. // -------------------------------------------------------------------------- -package org.ognl.test; +package ognl.test; import junit.framework.TestSuite; -import org.ognl.test.objects.Simple; +import ognl.test.objects.Simple; public class PrimitiveNullHandlingTest extends OgnlTestCase { diff --git a/src/test/java/org/ognl/test/PrivateAccessorTest.java b/src/test/java/ognl/test/PrivateAccessorTest.java similarity index 97% rename from src/test/java/org/ognl/test/PrivateAccessorTest.java rename to src/test/java/ognl/test/PrivateAccessorTest.java index 9ddec851..c8597942 100644 --- a/src/test/java/org/ognl/test/PrivateAccessorTest.java +++ b/src/test/java/ognl/test/PrivateAccessorTest.java @@ -28,12 +28,12 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. // -------------------------------------------------------------------------- -package org.ognl.test; +package ognl.test; import junit.framework.TestSuite; -import org.ognl.DefaultMemberAccess; -import org.ognl.OgnlContext; -import org.ognl.test.objects.Root; +import ognl.DefaultMemberAccess; +import ognl.OgnlContext; +import ognl.test.objects.Root; public class PrivateAccessorTest extends OgnlTestCase { diff --git a/src/test/java/org/ognl/test/PrivateMemberTest.java b/src/test/java/ognl/test/PrivateMemberTest.java similarity index 99% rename from src/test/java/org/ognl/test/PrivateMemberTest.java rename to src/test/java/ognl/test/PrivateMemberTest.java index 6022c424..e4c41be8 100644 --- a/src/test/java/org/ognl/test/PrivateMemberTest.java +++ b/src/test/java/ognl/test/PrivateMemberTest.java @@ -28,15 +28,15 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. //-------------------------------------------------------------------------- -package org.ognl.test; +package ognl.test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.ognl.DefaultMemberAccess; -import org.ognl.Ognl; -import org.ognl.OgnlContext; -import org.ognl.OgnlException; -import org.ognl.OgnlRuntime; +import ognl.DefaultMemberAccess; +import ognl.Ognl; +import ognl.OgnlContext; +import ognl.OgnlException; +import ognl.OgnlRuntime; /** * This is a test program for private access in OGNL. diff --git a/src/test/java/org/ognl/test/ProjectionSelectionTest.java b/src/test/java/ognl/test/ProjectionSelectionTest.java similarity index 97% rename from src/test/java/org/ognl/test/ProjectionSelectionTest.java rename to src/test/java/ognl/test/ProjectionSelectionTest.java index c1e31cb7..5220bc5d 100644 --- a/src/test/java/org/ognl/test/ProjectionSelectionTest.java +++ b/src/test/java/ognl/test/ProjectionSelectionTest.java @@ -28,10 +28,10 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. // -------------------------------------------------------------------------- -package org.ognl.test; +package ognl.test; import junit.framework.TestSuite; -import org.ognl.test.objects.Root; +import ognl.test.objects.Root; import java.math.BigInteger; import java.util.Arrays; @@ -39,19 +39,19 @@ public class ProjectionSelectionTest extends OgnlTestCase { private static Root ROOT = new Root(); - + private static Object[][] TESTS = { // Projection, selection { ROOT, "array.{class}", Arrays.asList(new Class[] { Integer.class, Integer.class, Integer.class, Integer.class }) }, { ROOT, "map.array.{? #this > 2 }", Arrays.asList(new Integer[] { new Integer(3), new Integer(4) }) }, { ROOT, "map.array.{^ #this > 2 }", Arrays.asList(new Integer[] { new Integer(3) }) }, - { ROOT, "map.array.{$ #this > 2 }", Arrays.asList(new Integer[] { new Integer(4) }) }, + { ROOT, "map.array.{$ #this > 2 }", Arrays.asList(new Integer[] { new Integer(4) }) }, { ROOT, "map.array[*].{?true} instanceof java.util.Collection", Boolean.TRUE }, { null, "#fact=1, 30H.{? #fact = #fact * (#this+1), false }, #fact", new BigInteger("265252859812191058636308480000000") }, }; - + /* * =================================================================== Public static methods * =================================================================== @@ -59,7 +59,7 @@ public class ProjectionSelectionTest extends OgnlTestCase public static TestSuite suite() { TestSuite result = new TestSuite(); - + for(int i = 0; i < TESTS.length; i++) { result.addTest(new ProjectionSelectionTest((String) TESTS[i][1], TESTS[i][0], (String) TESTS[i][1], TESTS[i][2])); diff --git a/src/test/java/org/ognl/test/PropertyArithmeticAndLogicalOperatorsTest.java b/src/test/java/ognl/test/PropertyArithmeticAndLogicalOperatorsTest.java similarity index 96% rename from src/test/java/org/ognl/test/PropertyArithmeticAndLogicalOperatorsTest.java rename to src/test/java/ognl/test/PropertyArithmeticAndLogicalOperatorsTest.java index 4a0430fd..7f56586f 100644 --- a/src/test/java/org/ognl/test/PropertyArithmeticAndLogicalOperatorsTest.java +++ b/src/test/java/ognl/test/PropertyArithmeticAndLogicalOperatorsTest.java @@ -1,9 +1,9 @@ -package org.ognl.test; +package ognl.test; import junit.framework.TestSuite; -import org.ognl.test.objects.Root; -import org.ognl.test.objects.SimpleNumeric; -import org.ognl.test.objects.TestModel; +import ognl.test.objects.Root; +import ognl.test.objects.SimpleNumeric; +import ognl.test.objects.TestModel; import java.util.Arrays; diff --git a/src/test/java/org/ognl/test/PropertyNotFoundTest.java b/src/test/java/ognl/test/PropertyNotFoundTest.java similarity index 97% rename from src/test/java/org/ognl/test/PropertyNotFoundTest.java rename to src/test/java/ognl/test/PropertyNotFoundTest.java index 5555f065..9efaca80 100644 --- a/src/test/java/org/ognl/test/PropertyNotFoundTest.java +++ b/src/test/java/ognl/test/PropertyNotFoundTest.java @@ -28,13 +28,13 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. //-------------------------------------------------------------------------- -package org.ognl.test; +package ognl.test; import junit.framework.TestSuite; -import org.ognl.OgnlContext; -import org.ognl.OgnlException; -import org.ognl.OgnlRuntime; -import org.ognl.PropertyAccessor; +import ognl.OgnlContext; +import ognl.OgnlException; +import ognl.OgnlRuntime; +import ognl.PropertyAccessor; public class PropertyNotFoundTest extends OgnlTestCase { private static final Blah BLAH = new Blah(); diff --git a/src/test/java/org/ognl/test/PropertySetterTest.java b/src/test/java/ognl/test/PropertySetterTest.java similarity index 93% rename from src/test/java/org/ognl/test/PropertySetterTest.java rename to src/test/java/ognl/test/PropertySetterTest.java index 486f382b..c90fbdbe 100644 --- a/src/test/java/org/ognl/test/PropertySetterTest.java +++ b/src/test/java/ognl/test/PropertySetterTest.java @@ -1,10 +1,10 @@ -package org.ognl.test; +package ognl.test; import junit.framework.TestCase; -import org.ognl.DefaultMemberAccess; -import org.ognl.Node; -import org.ognl.Ognl; -import org.ognl.OgnlContext; +import ognl.DefaultMemberAccess; +import ognl.Node; +import ognl.Ognl; +import ognl.OgnlContext; import java.util.Map; diff --git a/src/test/java/org/ognl/test/PropertyTest.java b/src/test/java/ognl/test/PropertyTest.java similarity index 92% rename from src/test/java/org/ognl/test/PropertyTest.java rename to src/test/java/ognl/test/PropertyTest.java index 610df1ac..4d56cba7 100644 --- a/src/test/java/org/ognl/test/PropertyTest.java +++ b/src/test/java/ognl/test/PropertyTest.java @@ -28,10 +28,10 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. //-------------------------------------------------------------------------- -package org.ognl.test; +package ognl.test; import junit.framework.TestSuite; -import org.ognl.test.objects.*; +import ognl.test.objects.*; import java.text.SimpleDateFormat; import java.util.Arrays; @@ -42,7 +42,7 @@ public class PropertyTest extends OgnlTestCase public static final SimpleDateFormat DATETIME_FORMAT = new SimpleDateFormat("MM/dd/yyyy hh:mm a 'CST'"); public static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("MM/dd/yyyy"); public static final String VALUE = "foo"; - + private static Root ROOT = new Root(); private static BaseBean BEAN = new FirstBean(); private static PropertyHolder PROPERTY = new PropertyHolder(); @@ -57,7 +57,7 @@ public class PropertyTest extends OgnlTestCase { ROOT, "map[\"te\" + \"st\"]", ROOT }, { ROOT, "map[(\"s\" + \"i\") + \"ze\"]", ROOT.getMap().get(Root.SIZE_STRING) }, { ROOT, "map[\"size\"]", ROOT.getMap().get(Root.SIZE_STRING) }, - { ROOT, "map[@org.ognl.test.objects.Root@SIZE_STRING]", ROOT.getMap().get(Root.SIZE_STRING) }, + { ROOT, "map[@ognl.test.objects.Root@SIZE_STRING]", ROOT.getMap().get(Root.SIZE_STRING) }, { ROOT, "stringValue != null && stringValue.length() > 0", Boolean.FALSE}, { ROOT, "indexedStringValue != null && indexedStringValue.length() > 0", Boolean.TRUE}, { ROOT.getMap(), "list", ROOT.getList() }, @@ -98,10 +98,10 @@ public class PropertyTest extends OgnlTestCase { ROOT.getMap(), "get('value').bean3.value", new Integer(((Bean2)ROOT.getMap().get("value")).getBean3().getValue())}, { ROOT.getMap(), "\"Tapestry\".toCharArray()[2]", new Character('p')}, { ROOT.getMap(), "nested.deep.last", Boolean.TRUE}, - { ROOT, "'last ' + getCurrentClass(@org.ognl.test.PropertyTest@VALUE)", "last foo stop"}, - { ROOT, "@org.ognl.test.PropertyTest@formatValue(property.millis, true, true)", formatValue((int)((Bean2)ROOT.getProperty()).getMillis(), true, true) }, + { ROOT, "'last ' + getCurrentClass(@ognl.test.PropertyTest@VALUE)", "last foo stop"}, + { ROOT, "@ognl.test.PropertyTest@formatValue(property.millis, true, true)", formatValue((int)((Bean2)ROOT.getProperty()).getMillis(), true, true) }, { ROOT, "nullObject || !readonly", Boolean.TRUE }, - { ROOT, "testDate == null ? '-' : @org.ognl.test.PropertyTest@DATETIME_FORMAT.format(testDate)", DATETIME_FORMAT.format(ROOT.getTestDate()) }, + { ROOT, "testDate == null ? '-' : @ognl.test.PropertyTest@DATETIME_FORMAT.format(testDate)", DATETIME_FORMAT.format(ROOT.getTestDate()) }, { ROOT, "disabled ? 'disabled' : 'othernot'", "disabled" }, { BEAN, "two.getMessage(active ? 'ACT' : 'INA')", "[ACT]"}, { BEAN, "hasChildren('aaa')", Boolean.TRUE}, @@ -110,7 +110,7 @@ public class PropertyTest extends OgnlTestCase { ROOT, "sorted ? (readonly ? 'currentSortDesc' : 'currentSortAsc') : 'currentSortNone'", "currentSortAsc"}, { ROOT, "getAsset( (width?'Yes':'No')+'Icon' )", "NoIcon"}, { ROOT, "flyingMonkey", Boolean.TRUE}, - { ROOT, "expiration == null ? '' : @org.ognl.test.PropertyTest@DATE_FORMAT.format(expiration)", ""}, + { ROOT, "expiration == null ? '' : @ognl.test.PropertyTest@DATE_FORMAT.format(expiration)", ""}, { ROOT, "printDelivery ? 'javascript:toggle(' + bean2.id + ');' : ''", "javascript:toggle(1);"}, { ROOT, "openTransitionWin", Boolean.FALSE}, { ROOT, "b.methodOfB(a.methodOfA(b)-1)", new Integer(0)}, @@ -139,7 +139,7 @@ public static TestSuite suite() } else result.addTest(new PropertyTest((String)TESTS[i][1], TESTS[i][0], (String)TESTS[i][1], TESTS[i][2])); } - + return result; } diff --git a/src/test/java/org/ognl/test/ProtectedInnerClassTest.java b/src/test/java/ognl/test/ProtectedInnerClassTest.java similarity index 98% rename from src/test/java/org/ognl/test/ProtectedInnerClassTest.java rename to src/test/java/ognl/test/ProtectedInnerClassTest.java index 8949283c..670d8c27 100644 --- a/src/test/java/org/ognl/test/ProtectedInnerClassTest.java +++ b/src/test/java/ognl/test/ProtectedInnerClassTest.java @@ -28,10 +28,10 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. // -------------------------------------------------------------------------- -package org.ognl.test; +package ognl.test; import junit.framework.TestSuite; -import org.ognl.test.objects.Root; +import ognl.test.objects.Root; public class ProtectedInnerClassTest extends OgnlTestCase { @@ -40,7 +40,7 @@ public class ProtectedInnerClassTest extends OgnlTestCase private static Object[][] TESTS = { // member access of inner class (Arrays.asList() returned protected inner class) - { ROOT, "list.size()", new Integer(ROOT.getList().size()) }, + { ROOT, "list.size()", new Integer(ROOT.getList().size()) }, { ROOT, "list[0]", ROOT.getList().get(0) }, }; diff --git a/src/test/java/org/ognl/test/ProtectedMemberTest.java b/src/test/java/ognl/test/ProtectedMemberTest.java similarity index 99% rename from src/test/java/org/ognl/test/ProtectedMemberTest.java rename to src/test/java/ognl/test/ProtectedMemberTest.java index 1c4238ac..c109374c 100644 --- a/src/test/java/org/ognl/test/ProtectedMemberTest.java +++ b/src/test/java/ognl/test/ProtectedMemberTest.java @@ -28,15 +28,15 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. //-------------------------------------------------------------------------- -package org.ognl.test; +package ognl.test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.ognl.DefaultMemberAccess; -import org.ognl.Ognl; -import org.ognl.OgnlContext; -import org.ognl.OgnlException; -import org.ognl.OgnlRuntime; +import ognl.DefaultMemberAccess; +import ognl.Ognl; +import ognl.OgnlContext; +import ognl.OgnlException; +import ognl.OgnlRuntime; /** * This is a test program for protected access in OGNL. diff --git a/src/test/java/org/ognl/test/PublicMemberTest.java b/src/test/java/ognl/test/PublicMemberTest.java similarity index 98% rename from src/test/java/org/ognl/test/PublicMemberTest.java rename to src/test/java/ognl/test/PublicMemberTest.java index 3c6970de..f13e1068 100644 --- a/src/test/java/org/ognl/test/PublicMemberTest.java +++ b/src/test/java/ognl/test/PublicMemberTest.java @@ -28,15 +28,15 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. //-------------------------------------------------------------------------- -package org.ognl.test; +package ognl.test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.ognl.DefaultMemberAccess; -import org.ognl.Ognl; -import org.ognl.OgnlContext; -import org.ognl.OgnlException; -import org.ognl.OgnlRuntime; +import ognl.DefaultMemberAccess; +import ognl.Ognl; +import ognl.OgnlContext; +import ognl.OgnlException; +import ognl.OgnlRuntime; /** * This is a test program for public access in OGNL. diff --git a/src/test/java/org/ognl/test/QuotingTest.java b/src/test/java/ognl/test/QuotingTest.java similarity index 99% rename from src/test/java/org/ognl/test/QuotingTest.java rename to src/test/java/ognl/test/QuotingTest.java index b8f7f463..a70fc899 100644 --- a/src/test/java/org/ognl/test/QuotingTest.java +++ b/src/test/java/ognl/test/QuotingTest.java @@ -28,7 +28,7 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. //-------------------------------------------------------------------------- -package org.ognl.test; +package ognl.test; import junit.framework.TestSuite; diff --git a/src/test/java/org/ognl/test/RaceConditionTest.java b/src/test/java/ognl/test/RaceConditionTest.java similarity index 97% rename from src/test/java/org/ognl/test/RaceConditionTest.java rename to src/test/java/ognl/test/RaceConditionTest.java index 345c87bb..dce3066e 100644 --- a/src/test/java/org/ognl/test/RaceConditionTest.java +++ b/src/test/java/ognl/test/RaceConditionTest.java @@ -1,6 +1,6 @@ -package org.ognl.test; +package ognl.test; -import org.ognl.OgnlRuntime; +import ognl.OgnlRuntime; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/org/ognl/test/SetterTest.java b/src/test/java/ognl/test/SetterTest.java similarity index 97% rename from src/test/java/org/ognl/test/SetterTest.java rename to src/test/java/ognl/test/SetterTest.java index 46ab9f2f..597211a7 100644 --- a/src/test/java/org/ognl/test/SetterTest.java +++ b/src/test/java/ognl/test/SetterTest.java @@ -28,12 +28,12 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. //-------------------------------------------------------------------------- -package org.ognl.test; +package ognl.test; import junit.framework.TestSuite; -import org.ognl.InappropriateExpressionException; -import org.ognl.NoSuchPropertyException; -import org.ognl.test.objects.Root; +import ognl.InappropriateExpressionException; +import ognl.NoSuchPropertyException; +import ognl.test.objects.Root; import java.util.HashMap; import java.util.HashSet; diff --git a/src/test/java/org/ognl/test/SetterWithConversionTest.java b/src/test/java/ognl/test/SetterWithConversionTest.java similarity index 98% rename from src/test/java/org/ognl/test/SetterWithConversionTest.java rename to src/test/java/ognl/test/SetterWithConversionTest.java index 008eaea7..fac9d2af 100644 --- a/src/test/java/org/ognl/test/SetterWithConversionTest.java +++ b/src/test/java/ognl/test/SetterWithConversionTest.java @@ -28,10 +28,10 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. //-------------------------------------------------------------------------- -package org.ognl.test; +package ognl.test; import junit.framework.TestSuite; -import org.ognl.test.objects.Root; +import ognl.test.objects.Root; public class SetterWithConversionTest extends OgnlTestCase { diff --git a/src/test/java/org/ognl/test/ShortCircuitingExpressionTest.java b/src/test/java/ognl/test/ShortCircuitingExpressionTest.java similarity index 97% rename from src/test/java/org/ognl/test/ShortCircuitingExpressionTest.java rename to src/test/java/ognl/test/ShortCircuitingExpressionTest.java index e989366f..8425db77 100644 --- a/src/test/java/org/ognl/test/ShortCircuitingExpressionTest.java +++ b/src/test/java/ognl/test/ShortCircuitingExpressionTest.java @@ -28,11 +28,11 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. //-------------------------------------------------------------------------- -package org.ognl.test; +package ognl.test; import junit.framework.TestSuite; -import org.ognl.NoSuchPropertyException; -import org.ognl.OgnlException; +import ognl.NoSuchPropertyException; +import ognl.OgnlException; public class ShortCircuitingExpressionTest extends OgnlTestCase { diff --git a/src/test/java/org/ognl/test/SimpleNavigationChainTreeTest.java b/src/test/java/ognl/test/SimpleNavigationChainTreeTest.java similarity index 98% rename from src/test/java/org/ognl/test/SimpleNavigationChainTreeTest.java rename to src/test/java/ognl/test/SimpleNavigationChainTreeTest.java index 395f1699..e30e7e1a 100644 --- a/src/test/java/org/ognl/test/SimpleNavigationChainTreeTest.java +++ b/src/test/java/ognl/test/SimpleNavigationChainTreeTest.java @@ -28,10 +28,10 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. //-------------------------------------------------------------------------- -package org.ognl.test; +package ognl.test; import junit.framework.TestSuite; -import org.ognl.Ognl; +import ognl.Ognl; public class SimpleNavigationChainTreeTest extends OgnlTestCase { diff --git a/src/test/java/org/ognl/test/SimplePropertyTreeTest.java b/src/test/java/ognl/test/SimplePropertyTreeTest.java similarity index 98% rename from src/test/java/org/ognl/test/SimplePropertyTreeTest.java rename to src/test/java/ognl/test/SimplePropertyTreeTest.java index 20af578d..fbf192ea 100644 --- a/src/test/java/org/ognl/test/SimplePropertyTreeTest.java +++ b/src/test/java/ognl/test/SimplePropertyTreeTest.java @@ -28,10 +28,10 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. //-------------------------------------------------------------------------- -package org.ognl.test; +package ognl.test; import junit.framework.TestSuite; -import org.ognl.Ognl; +import ognl.Ognl; public class SimplePropertyTreeTest extends OgnlTestCase { diff --git a/src/test/java/org/ognl/test/StaticsAndConstructorsTest.java b/src/test/java/ognl/test/StaticsAndConstructorsTest.java similarity index 81% rename from src/test/java/org/ognl/test/StaticsAndConstructorsTest.java rename to src/test/java/ognl/test/StaticsAndConstructorsTest.java index 22a8d35c..28091452 100644 --- a/src/test/java/org/ognl/test/StaticsAndConstructorsTest.java +++ b/src/test/java/ognl/test/StaticsAndConstructorsTest.java @@ -28,11 +28,11 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. //-------------------------------------------------------------------------- -package org.ognl.test; +package ognl.test; import junit.framework.TestSuite; -import org.ognl.test.objects.Root; -import org.ognl.test.objects.Simple; +import ognl.test.objects.Root; +import ognl.test.objects.Simple; public class StaticsAndConstructorsTest extends OgnlTestCase { @@ -44,23 +44,23 @@ public class StaticsAndConstructorsTest extends OgnlTestCase { "@@max(3,4)", new Integer(4) }, { "new java.lang.StringBuffer().append(55).toString()", "55" }, { "class", ROOT.getClass() }, - { "@org.ognl.test.objects.Root@class", ROOT.getClass() }, + { "@ognl.test.objects.Root@class", ROOT.getClass() }, { "class.getName()", ROOT.getClass().getName() }, - { "@org.ognl.test.objects.Root@class.getName()", ROOT.getClass().getName() }, - { "@org.ognl.test.objects.Root@class.name", ROOT.getClass().getName() }, + { "@ognl.test.objects.Root@class.getName()", ROOT.getClass().getName() }, + { "@ognl.test.objects.Root@class.name", ROOT.getClass().getName() }, { "class.getSuperclass()", ROOT.getClass().getSuperclass() }, { "class.superclass", ROOT.getClass().getSuperclass() }, { "class.name", ROOT.getClass().getName() }, { "getStaticInt()", new Integer(Root.getStaticInt()) }, - { "@org.ognl.test.objects.Root@getStaticInt()", new Integer(Root.getStaticInt()) }, - { "new org.ognl.test.objects.Simple(property).getStringValue()", new Simple().getStringValue() }, - { "new org.ognl.test.objects.Simple(map['test'].property).getStringValue()", new Simple().getStringValue() }, - { "map.test.getCurrentClass(@org.ognl.test.StaticsAndConstructorsTest@KEY.toString())", "size stop"}, - { "new org.ognl.test.StaticsAndConstructorsTest$IntWrapper(index)", new IntWrapper(ROOT.getIndex()) }, - { "new org.ognl.test.StaticsAndConstructorsTest$IntObjectWrapper(index)", new IntObjectWrapper(ROOT.getIndex()) }, - { "new org.ognl.test.StaticsAndConstructorsTest$A(#root)", new A(ROOT)}, - {"@org.ognl.test.StaticsAndConstructorsTest$Animals@values().length != 2", Boolean.TRUE}, - {"isOk(@org.ognl.test.objects.SimpleEnum@ONE, null)", Boolean.TRUE}, + { "@ognl.test.objects.Root@getStaticInt()", new Integer(Root.getStaticInt()) }, + { "new ognl.test.objects.Simple(property).getStringValue()", new Simple().getStringValue() }, + { "new ognl.test.objects.Simple(map['test'].property).getStringValue()", new Simple().getStringValue() }, + { "map.test.getCurrentClass(@ognl.test.StaticsAndConstructorsTest@KEY.toString())", "size stop"}, + { "new ognl.test.StaticsAndConstructorsTest$IntWrapper(index)", new IntWrapper(ROOT.getIndex()) }, + { "new ognl.test.StaticsAndConstructorsTest$IntObjectWrapper(index)", new IntObjectWrapper(ROOT.getIndex()) }, + { "new ognl.test.StaticsAndConstructorsTest$A(#root)", new A(ROOT)}, + {"@ognl.test.StaticsAndConstructorsTest$Animals@values().length != 2", Boolean.TRUE}, + {"isOk(@ognl.test.objects.SimpleEnum@ONE, null)", Boolean.TRUE}, }; public static final String KEY = "size"; diff --git a/src/test/java/org/ognl/test/TestOgnlException.java b/src/test/java/ognl/test/TestOgnlException.java similarity index 91% rename from src/test/java/org/ognl/test/TestOgnlException.java rename to src/test/java/ognl/test/TestOgnlException.java index c67d371e..542df832 100644 --- a/src/test/java/org/ognl/test/TestOgnlException.java +++ b/src/test/java/ognl/test/TestOgnlException.java @@ -1,7 +1,7 @@ -package org.ognl.test; +package ognl.test; import junit.framework.TestCase; -import org.ognl.OgnlException; +import ognl.OgnlException; /** * Tests {@link OgnlException}. diff --git a/src/test/java/org/ognl/test/VarArgsMethodTest.java b/src/test/java/ognl/test/VarArgsMethodTest.java similarity index 94% rename from src/test/java/org/ognl/test/VarArgsMethodTest.java rename to src/test/java/ognl/test/VarArgsMethodTest.java index 3b1e7164..cb6950c7 100644 --- a/src/test/java/org/ognl/test/VarArgsMethodTest.java +++ b/src/test/java/ognl/test/VarArgsMethodTest.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.ognl.test; +package ognl.test; import junit.framework.TestCase; -import org.ognl.Ognl; -import org.ognl.OgnlContext; -import org.ognl.OgnlException; -import org.ognl.test.objects.Simple; +import ognl.Ognl; +import ognl.OgnlContext; +import ognl.OgnlException; +import ognl.test.objects.Simple; public class VarArgsMethodTest extends TestCase { diff --git a/src/test/java/org/ognl/test/accessors/ListPropertyAccessorTest.java b/src/test/java/ognl/test/accessors/ListPropertyAccessorTest.java similarity index 87% rename from src/test/java/org/ognl/test/accessors/ListPropertyAccessorTest.java rename to src/test/java/ognl/test/accessors/ListPropertyAccessorTest.java index 4c7ec04f..2d513a97 100644 --- a/src/test/java/org/ognl/test/accessors/ListPropertyAccessorTest.java +++ b/src/test/java/ognl/test/accessors/ListPropertyAccessorTest.java @@ -1,14 +1,14 @@ -package org.ognl.test.accessors; +package ognl.test.accessors; import junit.framework.TestCase; -import org.ognl.DefaultMemberAccess; -import org.ognl.ListPropertyAccessor; -import org.ognl.Ognl; -import org.ognl.OgnlContext; -import org.ognl.enhance.ExpressionCompiler; -import org.ognl.test.objects.ListSource; -import org.ognl.test.objects.ListSourceImpl; -import org.ognl.test.objects.Root; +import ognl.DefaultMemberAccess; +import ognl.ListPropertyAccessor; +import ognl.Ognl; +import ognl.OgnlContext; +import ognl.enhance.ExpressionCompiler; +import ognl.test.objects.ListSource; +import ognl.test.objects.ListSourceImpl; +import ognl.test.objects.Root; import java.util.List; import java.util.Map; diff --git a/src/test/java/org/ognl/test/accessors/PropertyAccessTest.java b/src/test/java/ognl/test/accessors/PropertyAccessTest.java similarity index 78% rename from src/test/java/org/ognl/test/accessors/PropertyAccessTest.java rename to src/test/java/ognl/test/accessors/PropertyAccessTest.java index 4c6043e3..3c8b2a96 100644 --- a/src/test/java/org/ognl/test/accessors/PropertyAccessTest.java +++ b/src/test/java/ognl/test/accessors/PropertyAccessTest.java @@ -16,19 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl.test.accessors; +package ognl.test.accessors; import junit.framework.TestCase; -import org.ognl.DefaultMemberAccess; -import org.ognl.Ognl; -import org.ognl.OgnlContext; -import org.ognl.OgnlException; -import org.ognl.OgnlRuntime; -import org.ognl.test.OgnlTestCase; -import org.ognl.test.objects.BeanProvider; -import org.ognl.test.objects.BeanProviderAccessor; -import org.ognl.test.objects.EvenOdd; -import org.ognl.test.objects.Root; +import ognl.DefaultMemberAccess; +import ognl.Ognl; +import ognl.OgnlContext; +import ognl.OgnlException; +import ognl.OgnlRuntime; +import ognl.test.objects.BeanProvider; +import ognl.test.objects.BeanProviderAccessor; +import ognl.test.objects.EvenOdd; +import ognl.test.objects.Root; public class PropertyAccessTest extends TestCase { diff --git a/src/test/java/org/ognl/test/enhance/TestExpressionCompiler.java b/src/test/java/ognl/test/enhance/TestExpressionCompiler.java similarity index 98% rename from src/test/java/org/ognl/test/enhance/TestExpressionCompiler.java rename to src/test/java/ognl/test/enhance/TestExpressionCompiler.java index a7930078..08cea1a0 100644 --- a/src/test/java/org/ognl/test/enhance/TestExpressionCompiler.java +++ b/src/test/java/ognl/test/enhance/TestExpressionCompiler.java @@ -1,22 +1,22 @@ /** * */ -package org.ognl.test.enhance; +package ognl.test.enhance; import junit.framework.TestCase; -import org.ognl.DefaultMemberAccess; -import org.ognl.Node; -import org.ognl.Ognl; -import org.ognl.OgnlContext; -import org.ognl.enhance.ExpressionCompiler; -import org.ognl.enhance.OgnlExpressionCompiler; -import org.ognl.test.objects.*; +import ognl.DefaultMemberAccess; +import ognl.Node; +import ognl.Ognl; +import ognl.OgnlContext; +import ognl.enhance.ExpressionCompiler; +import ognl.enhance.OgnlExpressionCompiler; +import ognl.test.objects.*; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.ognl.ExpressionSyntaxException; -import org.ognl.OgnlException; +import ognl.ExpressionSyntaxException; +import ognl.OgnlException; /** diff --git a/src/test/java/org/ognl/test/objects/BaseBean.java b/src/test/java/ognl/test/objects/BaseBean.java similarity index 94% rename from src/test/java/org/ognl/test/objects/BaseBean.java rename to src/test/java/ognl/test/objects/BaseBean.java index 374e1e30..c27aa0b0 100644 --- a/src/test/java/org/ognl/test/objects/BaseBean.java +++ b/src/test/java/ognl/test/objects/BaseBean.java @@ -1,7 +1,7 @@ /** * */ -package org.ognl.test.objects; +package ognl.test.objects; /** diff --git a/src/test/java/org/ognl/test/objects/BaseGeneric.java b/src/test/java/ognl/test/objects/BaseGeneric.java similarity index 95% rename from src/test/java/org/ognl/test/objects/BaseGeneric.java rename to src/test/java/ognl/test/objects/BaseGeneric.java index 0230485b..784bc97c 100644 --- a/src/test/java/org/ognl/test/objects/BaseGeneric.java +++ b/src/test/java/ognl/test/objects/BaseGeneric.java @@ -1,4 +1,4 @@ -package org.ognl.test.objects; +package ognl.test.objects; import java.io.Serializable; diff --git a/src/test/java/org/ognl/test/objects/BaseIndexed.java b/src/test/java/ognl/test/objects/BaseIndexed.java similarity index 83% rename from src/test/java/org/ognl/test/objects/BaseIndexed.java rename to src/test/java/ognl/test/objects/BaseIndexed.java index 3e13e5d8..5d328838 100644 --- a/src/test/java/org/ognl/test/objects/BaseIndexed.java +++ b/src/test/java/ognl/test/objects/BaseIndexed.java @@ -1,4 +1,4 @@ -package org.ognl.test.objects; +package ognl.test.objects; /** * Class used to test inheritance. diff --git a/src/test/java/org/ognl/test/objects/BaseObjectIndexed.java b/src/test/java/ognl/test/objects/BaseObjectIndexed.java similarity index 98% rename from src/test/java/org/ognl/test/objects/BaseObjectIndexed.java rename to src/test/java/ognl/test/objects/BaseObjectIndexed.java index ee6536f7..fe6a6a43 100644 --- a/src/test/java/org/ognl/test/objects/BaseObjectIndexed.java +++ b/src/test/java/ognl/test/objects/BaseObjectIndexed.java @@ -28,7 +28,7 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. //-------------------------------------------------------------------------- -package org.ognl.test.objects; +package ognl.test.objects; import java.util.*; diff --git a/src/test/java/org/ognl/test/objects/BaseSyntheticObject.java b/src/test/java/ognl/test/objects/BaseSyntheticObject.java similarity index 88% rename from src/test/java/org/ognl/test/objects/BaseSyntheticObject.java rename to src/test/java/ognl/test/objects/BaseSyntheticObject.java index 09c0eb2c..6b0e305b 100644 --- a/src/test/java/org/ognl/test/objects/BaseSyntheticObject.java +++ b/src/test/java/ognl/test/objects/BaseSyntheticObject.java @@ -1,4 +1,4 @@ -package org.ognl.test.objects; +package ognl.test.objects; import java.util.ArrayList; import java.util.List; diff --git a/src/test/java/org/ognl/test/objects/Bean1.java b/src/test/java/ognl/test/objects/Bean1.java similarity index 98% rename from src/test/java/org/ognl/test/objects/Bean1.java rename to src/test/java/ognl/test/objects/Bean1.java index 4661b7ac..9b273825 100644 --- a/src/test/java/org/ognl/test/objects/Bean1.java +++ b/src/test/java/ognl/test/objects/Bean1.java @@ -28,7 +28,7 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. //-------------------------------------------------------------------------- -package org.ognl.test.objects; +package ognl.test.objects; public class Bean1 extends Object { diff --git a/src/test/java/org/ognl/test/objects/Bean2.java b/src/test/java/ognl/test/objects/Bean2.java similarity index 98% rename from src/test/java/org/ognl/test/objects/Bean2.java rename to src/test/java/ognl/test/objects/Bean2.java index 0f7f2790..b739c545 100644 --- a/src/test/java/org/ognl/test/objects/Bean2.java +++ b/src/test/java/ognl/test/objects/Bean2.java @@ -28,7 +28,7 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. //-------------------------------------------------------------------------- -package org.ognl.test.objects; +package ognl.test.objects; public class Bean2 extends Object { diff --git a/src/test/java/org/ognl/test/objects/Bean3.java b/src/test/java/ognl/test/objects/Bean3.java similarity index 98% rename from src/test/java/org/ognl/test/objects/Bean3.java rename to src/test/java/ognl/test/objects/Bean3.java index 05ad187e..11e2057b 100644 --- a/src/test/java/org/ognl/test/objects/Bean3.java +++ b/src/test/java/ognl/test/objects/Bean3.java @@ -28,7 +28,7 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. // -------------------------------------------------------------------------- -package org.ognl.test.objects; +package ognl.test.objects; import java.util.HashMap; import java.util.Map; @@ -36,17 +36,17 @@ public class Bean3 extends Object { private int value = 100; - + private Map map; { map = new HashMap(); map.put("foo", "bar"); map.put("bar", "baz"); } - + private String _nullValue; private Object _indexValue; - + public int getValue() { return value; @@ -71,12 +71,12 @@ public Map getMap() { return map; } - + public void setNullValue(String value) { _nullValue = value; } - + public String getNullValue() { return _nullValue; diff --git a/src/test/java/org/ognl/test/objects/BeanProvider.java b/src/test/java/ognl/test/objects/BeanProvider.java similarity index 97% rename from src/test/java/org/ognl/test/objects/BeanProvider.java rename to src/test/java/ognl/test/objects/BeanProvider.java index f22cd87d..9a850a1f 100644 --- a/src/test/java/org/ognl/test/objects/BeanProvider.java +++ b/src/test/java/ognl/test/objects/BeanProvider.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl.test.objects; +package ognl.test.objects; /** * Test interface to be used with a custom property accessor. diff --git a/src/test/java/org/ognl/test/objects/BeanProviderAccessor.java b/src/test/java/ognl/test/objects/BeanProviderAccessor.java similarity index 85% rename from src/test/java/org/ognl/test/objects/BeanProviderAccessor.java rename to src/test/java/ognl/test/objects/BeanProviderAccessor.java index 529c2048..d93dfcb2 100644 --- a/src/test/java/org/ognl/test/objects/BeanProviderAccessor.java +++ b/src/test/java/ognl/test/objects/BeanProviderAccessor.java @@ -1,15 +1,15 @@ /** * */ -package org.ognl.test.objects; - -import org.ognl.ObjectPropertyAccessor; -import org.ognl.OgnlContext; -import org.ognl.OgnlException; -import org.ognl.OgnlRuntime; -import org.ognl.PropertyAccessor; -import org.ognl.enhance.ExpressionCompiler; -import org.ognl.enhance.UnsupportedCompilationException; +package ognl.test.objects; + +import ognl.ObjectPropertyAccessor; +import ognl.OgnlContext; +import ognl.OgnlException; +import ognl.OgnlRuntime; +import ognl.PropertyAccessor; +import ognl.enhance.ExpressionCompiler; +import ognl.enhance.UnsupportedCompilationException; /** * Implementation of provider that works with {@link BeanProvider} instances. diff --git a/src/test/java/org/ognl/test/objects/BeanProviderImpl.java b/src/test/java/ognl/test/objects/BeanProviderImpl.java similarity index 90% rename from src/test/java/org/ognl/test/objects/BeanProviderImpl.java rename to src/test/java/ognl/test/objects/BeanProviderImpl.java index efc06901..26fb38a0 100644 --- a/src/test/java/org/ognl/test/objects/BeanProviderImpl.java +++ b/src/test/java/ognl/test/objects/BeanProviderImpl.java @@ -1,7 +1,7 @@ /** - * + * */ -package org.ognl.test.objects; +package ognl.test.objects; import java.io.Serializable; import java.util.HashMap; @@ -14,14 +14,14 @@ public class BeanProviderImpl implements Serializable, BeanProvider { private Map _map = new HashMap(); - + public BeanProviderImpl() {} - + public Object getBean(String name) { return _map.get(name); } - + public void setBean(String name, Object bean) { _map.put(name, bean); diff --git a/src/test/java/org/ognl/test/objects/Component.java b/src/test/java/ognl/test/objects/Component.java similarity index 98% rename from src/test/java/org/ognl/test/objects/Component.java rename to src/test/java/ognl/test/objects/Component.java index b35cbdb8..db05b2a9 100644 --- a/src/test/java/org/ognl/test/objects/Component.java +++ b/src/test/java/ognl/test/objects/Component.java @@ -28,7 +28,7 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. //-------------------------------------------------------------------------- -package org.ognl.test.objects; +package ognl.test.objects; public class Component extends Object { diff --git a/src/test/java/org/ognl/test/objects/ComponentImpl.java b/src/test/java/ognl/test/objects/ComponentImpl.java similarity index 86% rename from src/test/java/org/ognl/test/objects/ComponentImpl.java rename to src/test/java/ognl/test/objects/ComponentImpl.java index 85bbb871..e1f0eb91 100644 --- a/src/test/java/org/ognl/test/objects/ComponentImpl.java +++ b/src/test/java/ognl/test/objects/ComponentImpl.java @@ -1,4 +1,4 @@ -package org.ognl.test.objects; +package ognl.test.objects; /** * @@ -10,7 +10,7 @@ public class ComponentImpl implements IComponent { public String getClientId() { - return _clientId; + return _clientId; } public void setClientId(String id) diff --git a/src/test/java/org/ognl/test/objects/ComponentSubclass.java b/src/test/java/ognl/test/objects/ComponentSubclass.java similarity index 87% rename from src/test/java/org/ognl/test/objects/ComponentSubclass.java rename to src/test/java/ognl/test/objects/ComponentSubclass.java index 00fcf968..3c7da740 100644 --- a/src/test/java/org/ognl/test/objects/ComponentSubclass.java +++ b/src/test/java/ognl/test/objects/ComponentSubclass.java @@ -1,4 +1,4 @@ -package org.ognl.test.objects; +package ognl.test.objects; /** * diff --git a/src/test/java/org/ognl/test/objects/Copy.java b/src/test/java/ognl/test/objects/Copy.java similarity index 73% rename from src/test/java/org/ognl/test/objects/Copy.java rename to src/test/java/ognl/test/objects/Copy.java index 4c0814a9..0afc9a06 100644 --- a/src/test/java/org/ognl/test/objects/Copy.java +++ b/src/test/java/ognl/test/objects/Copy.java @@ -1,4 +1,4 @@ -package org.ognl.test.objects; +package ognl.test.objects; /** * diff --git a/src/test/java/org/ognl/test/objects/CorrectedObject.java b/src/test/java/ognl/test/objects/CorrectedObject.java similarity index 98% rename from src/test/java/org/ognl/test/objects/CorrectedObject.java rename to src/test/java/ognl/test/objects/CorrectedObject.java index a5f92b0d..bbd24362 100644 --- a/src/test/java/org/ognl/test/objects/CorrectedObject.java +++ b/src/test/java/ognl/test/objects/CorrectedObject.java @@ -28,7 +28,7 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. //-------------------------------------------------------------------------- -package org.ognl.test.objects; +package ognl.test.objects; public class CorrectedObject { diff --git a/src/test/java/org/ognl/test/objects/Cracker.java b/src/test/java/ognl/test/objects/Cracker.java similarity index 81% rename from src/test/java/org/ognl/test/objects/Cracker.java rename to src/test/java/ognl/test/objects/Cracker.java index 18081625..355567c7 100644 --- a/src/test/java/org/ognl/test/objects/Cracker.java +++ b/src/test/java/ognl/test/objects/Cracker.java @@ -1,4 +1,4 @@ -package org.ognl.test.objects; +package ognl.test.objects; import java.io.Serializable; @@ -8,6 +8,6 @@ public interface Cracker{ T getParam(); - + void setParam(T param); } diff --git a/src/test/java/org/ognl/test/objects/Entry.java b/src/test/java/ognl/test/objects/Entry.java similarity index 94% rename from src/test/java/org/ognl/test/objects/Entry.java rename to src/test/java/ognl/test/objects/Entry.java index fbe17908..8b194ea4 100644 --- a/src/test/java/org/ognl/test/objects/Entry.java +++ b/src/test/java/ognl/test/objects/Entry.java @@ -1,4 +1,4 @@ -package org.ognl.test.objects; +package ognl.test.objects; /** * diff --git a/src/test/java/org/ognl/test/objects/EvenOdd.java b/src/test/java/ognl/test/objects/EvenOdd.java similarity index 97% rename from src/test/java/org/ognl/test/objects/EvenOdd.java rename to src/test/java/ognl/test/objects/EvenOdd.java index ca39cbea..cbd41848 100644 --- a/src/test/java/org/ognl/test/objects/EvenOdd.java +++ b/src/test/java/ognl/test/objects/EvenOdd.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.ognl.test.objects; +package ognl.test.objects; public class EvenOdd { diff --git a/src/test/java/org/ognl/test/objects/FirstBean.java b/src/test/java/ognl/test/objects/FirstBean.java similarity index 76% rename from src/test/java/org/ognl/test/objects/FirstBean.java rename to src/test/java/ognl/test/objects/FirstBean.java index bbaeebca..13c453a8 100644 --- a/src/test/java/org/ognl/test/objects/FirstBean.java +++ b/src/test/java/ognl/test/objects/FirstBean.java @@ -1,14 +1,14 @@ /** - * + * */ -package org.ognl.test.objects; +package ognl.test.objects; /** */ public class FirstBean extends BaseBean { - + public String getName() { return "FirstBean"; diff --git a/src/test/java/org/ognl/test/objects/FormComponentImpl.java b/src/test/java/ognl/test/objects/FormComponentImpl.java similarity index 88% rename from src/test/java/org/ognl/test/objects/FormComponentImpl.java rename to src/test/java/ognl/test/objects/FormComponentImpl.java index 74054328..f3367a76 100644 --- a/src/test/java/org/ognl/test/objects/FormComponentImpl.java +++ b/src/test/java/ognl/test/objects/FormComponentImpl.java @@ -1,4 +1,4 @@ -package org.ognl.test.objects; +package ognl.test.objects; /** * diff --git a/src/test/java/org/ognl/test/objects/FormImpl.java b/src/test/java/ognl/test/objects/FormImpl.java similarity index 68% rename from src/test/java/org/ognl/test/objects/FormImpl.java rename to src/test/java/ognl/test/objects/FormImpl.java index d3bace80..8a353468 100644 --- a/src/test/java/org/ognl/test/objects/FormImpl.java +++ b/src/test/java/ognl/test/objects/FormImpl.java @@ -1,8 +1,8 @@ -package org.ognl.test.objects; +package ognl.test.objects; /** * */ public class FormImpl extends ComponentImpl implements IForm { - + } diff --git a/src/test/java/org/ognl/test/objects/GameGeneric.java b/src/test/java/ognl/test/objects/GameGeneric.java similarity index 84% rename from src/test/java/org/ognl/test/objects/GameGeneric.java rename to src/test/java/ognl/test/objects/GameGeneric.java index 22cbe154..bf066784 100644 --- a/src/test/java/org/ognl/test/objects/GameGeneric.java +++ b/src/test/java/ognl/test/objects/GameGeneric.java @@ -1,4 +1,4 @@ -package org.ognl.test.objects; +package ognl.test.objects; /** * diff --git a/src/test/java/org/ognl/test/objects/GameGenericObject.java b/src/test/java/ognl/test/objects/GameGenericObject.java similarity index 91% rename from src/test/java/org/ognl/test/objects/GameGenericObject.java rename to src/test/java/ognl/test/objects/GameGenericObject.java index d580af38..216f16e2 100644 --- a/src/test/java/org/ognl/test/objects/GameGenericObject.java +++ b/src/test/java/ognl/test/objects/GameGenericObject.java @@ -1,4 +1,4 @@ -package org.ognl.test.objects; +package ognl.test.objects; /** * diff --git a/src/test/java/org/ognl/test/objects/GenericCracker.java b/src/test/java/ognl/test/objects/GenericCracker.java similarity index 88% rename from src/test/java/org/ognl/test/objects/GenericCracker.java rename to src/test/java/ognl/test/objects/GenericCracker.java index e171af7c..b36e0613 100644 --- a/src/test/java/org/ognl/test/objects/GenericCracker.java +++ b/src/test/java/ognl/test/objects/GenericCracker.java @@ -1,4 +1,4 @@ -package org.ognl.test.objects; +package ognl.test.objects; /** * diff --git a/src/test/java/org/ognl/test/objects/GenericObject.java b/src/test/java/ognl/test/objects/GenericObject.java similarity index 82% rename from src/test/java/org/ognl/test/objects/GenericObject.java rename to src/test/java/ognl/test/objects/GenericObject.java index 0b504ee7..fbec76ed 100644 --- a/src/test/java/org/ognl/test/objects/GenericObject.java +++ b/src/test/java/ognl/test/objects/GenericObject.java @@ -1,4 +1,4 @@ -package org.ognl.test.objects; +package ognl.test.objects; /** * Used by {@link BaseGeneric} to reference a class type. diff --git a/src/test/java/org/ognl/test/objects/GenericRoot.java b/src/test/java/ognl/test/objects/GenericRoot.java similarity index 93% rename from src/test/java/org/ognl/test/objects/GenericRoot.java rename to src/test/java/ognl/test/objects/GenericRoot.java index 7add0a20..8367de1c 100644 --- a/src/test/java/org/ognl/test/objects/GenericRoot.java +++ b/src/test/java/ognl/test/objects/GenericRoot.java @@ -1,4 +1,4 @@ -package org.ognl.test.objects; +package ognl.test.objects; /** * diff --git a/src/test/java/org/ognl/test/objects/GenericService.java b/src/test/java/ognl/test/objects/GenericService.java similarity index 97% rename from src/test/java/org/ognl/test/objects/GenericService.java rename to src/test/java/ognl/test/objects/GenericService.java index 55db2d3d..aa989b8d 100644 --- a/src/test/java/org/ognl/test/objects/GenericService.java +++ b/src/test/java/ognl/test/objects/GenericService.java @@ -1,4 +1,4 @@ -package org.ognl.test.objects; +package ognl.test.objects; import java.io.IOException; import java.lang.reflect.InvocationTargetException; diff --git a/src/test/java/org/ognl/test/objects/GenericServiceImpl.java b/src/test/java/ognl/test/objects/GenericServiceImpl.java similarity index 96% rename from src/test/java/org/ognl/test/objects/GenericServiceImpl.java rename to src/test/java/ognl/test/objects/GenericServiceImpl.java index a42d166d..c8faea10 100644 --- a/src/test/java/org/ognl/test/objects/GenericServiceImpl.java +++ b/src/test/java/ognl/test/objects/GenericServiceImpl.java @@ -1,6 +1,6 @@ -package org.ognl.test.objects; +package ognl.test.objects; -import org.ognl.security.OgnlSecurityManagerFactory; +import ognl.security.OgnlSecurityManagerFactory; import java.io.IOException; import java.io.InputStream; @@ -9,7 +9,7 @@ import java.lang.reflect.Method; import java.security.*; import java.util.List; -import org.ognl.OgnlRuntime; +import ognl.OgnlRuntime; /** * @@ -43,7 +43,7 @@ public void disableSandboxViaReflectionByProperty() throws IllegalAccessExceptio throw new IllegalStateException("Cannot call test method when OGNL SecurityManager disabled on initialization"); } Method clearPropertyMethod = System.class.getMethod("clearProperty", String.class); - clearPropertyMethod.invoke(null, "org.ognl.security.manager"); + clearPropertyMethod.invoke(null, "ognl.security.manager"); } public void disableSandboxViaReflectionByField() throws IllegalAccessException, NoSuchMethodException, InvocationTargetException, NoSuchFieldException { diff --git a/src/test/java/org/ognl/test/objects/GetterMethods.java b/src/test/java/ognl/test/objects/GetterMethods.java similarity index 90% rename from src/test/java/org/ognl/test/objects/GetterMethods.java rename to src/test/java/ognl/test/objects/GetterMethods.java index 04285852..2a212297 100644 --- a/src/test/java/org/ognl/test/objects/GetterMethods.java +++ b/src/test/java/ognl/test/objects/GetterMethods.java @@ -1,4 +1,4 @@ -package org.ognl.test.objects; +package ognl.test.objects; /** * diff --git a/src/test/java/org/ognl/test/objects/IComponent.java b/src/test/java/ognl/test/objects/IComponent.java similarity index 83% rename from src/test/java/org/ognl/test/objects/IComponent.java rename to src/test/java/ognl/test/objects/IComponent.java index d89be464..0db0d7d9 100644 --- a/src/test/java/org/ognl/test/objects/IComponent.java +++ b/src/test/java/ognl/test/objects/IComponent.java @@ -1,4 +1,4 @@ -package org.ognl.test.objects; +package ognl.test.objects; /** * @@ -10,6 +10,6 @@ public interface IComponent { void setClientId(String id); int getCount(String index); - + void setCount(String index, int count); } diff --git a/src/test/java/org/ognl/test/objects/IContentProvider.java b/src/test/java/ognl/test/objects/IContentProvider.java similarity index 77% rename from src/test/java/org/ognl/test/objects/IContentProvider.java rename to src/test/java/ognl/test/objects/IContentProvider.java index ff8a9947..00a3e3a4 100644 --- a/src/test/java/org/ognl/test/objects/IContentProvider.java +++ b/src/test/java/ognl/test/objects/IContentProvider.java @@ -1,4 +1,4 @@ -package org.ognl.test.objects; +package ognl.test.objects; import java.util.List; diff --git a/src/test/java/org/ognl/test/objects/IForm.java b/src/test/java/ognl/test/objects/IForm.java similarity index 61% rename from src/test/java/org/ognl/test/objects/IForm.java rename to src/test/java/ognl/test/objects/IForm.java index 92bba4ea..8253f5b3 100644 --- a/src/test/java/org/ognl/test/objects/IForm.java +++ b/src/test/java/ognl/test/objects/IForm.java @@ -1,8 +1,8 @@ -package org.ognl.test.objects; +package ognl.test.objects; /** * */ public interface IForm extends IComponent { - + } diff --git a/src/test/java/org/ognl/test/objects/IFormComponent.java b/src/test/java/ognl/test/objects/IFormComponent.java similarity index 77% rename from src/test/java/org/ognl/test/objects/IFormComponent.java rename to src/test/java/ognl/test/objects/IFormComponent.java index b2f2e5c0..91003760 100644 --- a/src/test/java/org/ognl/test/objects/IFormComponent.java +++ b/src/test/java/ognl/test/objects/IFormComponent.java @@ -1,13 +1,13 @@ -package org.ognl.test.objects; +package ognl.test.objects; /** * */ public interface IFormComponent extends IComponent { - + String getClientId(); IForm getForm(); - + void setForm(IForm form); } diff --git a/src/test/java/org/ognl/test/objects/ITreeContentProvider.java b/src/test/java/ognl/test/objects/ITreeContentProvider.java similarity index 87% rename from src/test/java/org/ognl/test/objects/ITreeContentProvider.java rename to src/test/java/ognl/test/objects/ITreeContentProvider.java index 682a5e61..d8d44479 100644 --- a/src/test/java/org/ognl/test/objects/ITreeContentProvider.java +++ b/src/test/java/ognl/test/objects/ITreeContentProvider.java @@ -1,4 +1,4 @@ -package org.ognl.test.objects; +package ognl.test.objects; import java.util.Collection; diff --git a/src/test/java/org/ognl/test/objects/Indexed.java b/src/test/java/ognl/test/objects/Indexed.java similarity index 98% rename from src/test/java/org/ognl/test/objects/Indexed.java rename to src/test/java/ognl/test/objects/Indexed.java index dacf42e6..3a4c9113 100644 --- a/src/test/java/org/ognl/test/objects/Indexed.java +++ b/src/test/java/ognl/test/objects/Indexed.java @@ -28,7 +28,7 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. //-------------------------------------------------------------------------- -package org.ognl.test.objects; +package ognl.test.objects; import java.util.*; @@ -54,13 +54,13 @@ public Indexed(String[] values) { _values = values; } - + /* Indexed property "_values" */ public String[] getValues() { return _values; } - + public void setValues(String[] value) { _values = value; @@ -74,7 +74,7 @@ public String getValues(int index) { return _values[index] + "xxx"; } - + public void setValues(int index, String value) { if (value.endsWith("xxx")) { @@ -93,7 +93,7 @@ public String getTitle(int count) { return "Title count " + count; } - + public ListSource getSource() { return _source; diff --git a/src/test/java/org/ognl/test/objects/IndexedMapObject.java b/src/test/java/ognl/test/objects/IndexedMapObject.java similarity index 90% rename from src/test/java/org/ognl/test/objects/IndexedMapObject.java rename to src/test/java/ognl/test/objects/IndexedMapObject.java index 523ea04e..ef548620 100644 --- a/src/test/java/org/ognl/test/objects/IndexedMapObject.java +++ b/src/test/java/ognl/test/objects/IndexedMapObject.java @@ -1,4 +1,4 @@ -package org.ognl.test.objects; +package ognl.test.objects; /** * Simple object used to test indexed map references using "#this" references. diff --git a/src/test/java/org/ognl/test/objects/IndexedSetObject.java b/src/test/java/ognl/test/objects/IndexedSetObject.java similarity index 95% rename from src/test/java/org/ognl/test/objects/IndexedSetObject.java rename to src/test/java/ognl/test/objects/IndexedSetObject.java index 11aa8b8c..6674fd4c 100644 --- a/src/test/java/org/ognl/test/objects/IndexedSetObject.java +++ b/src/test/java/ognl/test/objects/IndexedSetObject.java @@ -1,4 +1,4 @@ -package org.ognl.test.objects; +package ognl.test.objects; import java.util.HashMap; diff --git a/src/test/java/org/ognl/test/objects/Inherited.java b/src/test/java/ognl/test/objects/Inherited.java similarity index 69% rename from src/test/java/org/ognl/test/objects/Inherited.java rename to src/test/java/ognl/test/objects/Inherited.java index 69946278..e23c0c98 100644 --- a/src/test/java/org/ognl/test/objects/Inherited.java +++ b/src/test/java/ognl/test/objects/Inherited.java @@ -1,4 +1,4 @@ -package org.ognl.test.objects; +package ognl.test.objects; /** * diff --git a/src/test/java/org/ognl/test/objects/ListSource.java b/src/test/java/ognl/test/objects/ListSource.java similarity index 82% rename from src/test/java/org/ognl/test/objects/ListSource.java rename to src/test/java/ognl/test/objects/ListSource.java index f4e1deea..8b775c54 100644 --- a/src/test/java/org/ognl/test/objects/ListSource.java +++ b/src/test/java/ognl/test/objects/ListSource.java @@ -1,4 +1,4 @@ -package org.ognl.test.objects; +package ognl.test.objects; /** * diff --git a/src/test/java/org/ognl/test/objects/ListSourceImpl.java b/src/test/java/ognl/test/objects/ListSourceImpl.java similarity index 92% rename from src/test/java/org/ognl/test/objects/ListSourceImpl.java rename to src/test/java/ognl/test/objects/ListSourceImpl.java index 8892bf00..fd597e5e 100644 --- a/src/test/java/org/ognl/test/objects/ListSourceImpl.java +++ b/src/test/java/ognl/test/objects/ListSourceImpl.java @@ -1,4 +1,4 @@ -package org.ognl.test.objects; +package ognl.test.objects; import java.util.ArrayList; diff --git a/src/test/java/org/ognl/test/objects/MenuItem.java b/src/test/java/ognl/test/objects/MenuItem.java similarity index 96% rename from src/test/java/org/ognl/test/objects/MenuItem.java rename to src/test/java/ognl/test/objects/MenuItem.java index dd83c32f..de4e28a8 100644 --- a/src/test/java/org/ognl/test/objects/MenuItem.java +++ b/src/test/java/ognl/test/objects/MenuItem.java @@ -1,4 +1,4 @@ -package org.ognl.test.objects; +package ognl.test.objects; import java.util.ArrayList; import java.util.List; @@ -33,7 +33,7 @@ public String getLabel() { public String getPage() { return page; } - + public String toString(){ StringBuffer sb = new StringBuffer("MenuItem["); sb.append("page="+getPage()); diff --git a/src/test/java/org/ognl/test/objects/Messages.java b/src/test/java/ognl/test/objects/Messages.java similarity index 94% rename from src/test/java/org/ognl/test/objects/Messages.java rename to src/test/java/ognl/test/objects/Messages.java index 62af597f..6c8f31e6 100644 --- a/src/test/java/org/ognl/test/objects/Messages.java +++ b/src/test/java/ognl/test/objects/Messages.java @@ -1,4 +1,4 @@ -package org.ognl.test.objects; +package ognl.test.objects; import java.util.Map; @@ -13,7 +13,7 @@ public Messages(Map source) { _source = source; } - + public String getMessage(String key) { return (String)_source.get(key); diff --git a/src/test/java/org/ognl/test/objects/MethodTestMethods.java b/src/test/java/ognl/test/objects/MethodTestMethods.java similarity index 99% rename from src/test/java/org/ognl/test/objects/MethodTestMethods.java rename to src/test/java/ognl/test/objects/MethodTestMethods.java index d814140b..edfc6168 100644 --- a/src/test/java/org/ognl/test/objects/MethodTestMethods.java +++ b/src/test/java/ognl/test/objects/MethodTestMethods.java @@ -1,4 +1,4 @@ -package org.ognl.test.objects; +package ognl.test.objects; import java.util.Arrays; import java.util.List; @@ -30,7 +30,7 @@ public Object getBean(String name, Object... args) { //--------------------------------------------------------------------- private String testProperty = "Hello World!"; - + public String testProperty() { return testProperty; } diff --git a/src/test/java/org/ognl/test/objects/Model.java b/src/test/java/ognl/test/objects/Model.java similarity index 75% rename from src/test/java/org/ognl/test/objects/Model.java rename to src/test/java/ognl/test/objects/Model.java index d007207d..0cd1fc0f 100644 --- a/src/test/java/org/ognl/test/objects/Model.java +++ b/src/test/java/ognl/test/objects/Model.java @@ -1,4 +1,4 @@ -package org.ognl.test.objects; +package ognl.test.objects; /** * diff --git a/src/test/java/org/ognl/test/objects/MyMap.java b/src/test/java/ognl/test/objects/MyMap.java similarity index 98% rename from src/test/java/org/ognl/test/objects/MyMap.java rename to src/test/java/ognl/test/objects/MyMap.java index 7b8bf6b8..46b6923d 100644 --- a/src/test/java/org/ognl/test/objects/MyMap.java +++ b/src/test/java/ognl/test/objects/MyMap.java @@ -28,7 +28,7 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. //-------------------------------------------------------------------------- -package org.ognl.test.objects; +package ognl.test.objects; import java.util.*; diff --git a/src/test/java/org/ognl/test/objects/MyMapImpl.java b/src/test/java/ognl/test/objects/MyMapImpl.java similarity index 98% rename from src/test/java/org/ognl/test/objects/MyMapImpl.java rename to src/test/java/ognl/test/objects/MyMapImpl.java index 3cf777ab..e8dae241 100644 --- a/src/test/java/org/ognl/test/objects/MyMapImpl.java +++ b/src/test/java/ognl/test/objects/MyMapImpl.java @@ -28,7 +28,7 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. //-------------------------------------------------------------------------- -package org.ognl.test.objects; +package ognl.test.objects; import java.util.*; diff --git a/src/test/java/org/ognl/test/objects/ObjectIndexed.java b/src/test/java/ognl/test/objects/ObjectIndexed.java similarity index 98% rename from src/test/java/org/ognl/test/objects/ObjectIndexed.java rename to src/test/java/ognl/test/objects/ObjectIndexed.java index f6921e51..11c9ae49 100644 --- a/src/test/java/org/ognl/test/objects/ObjectIndexed.java +++ b/src/test/java/ognl/test/objects/ObjectIndexed.java @@ -28,7 +28,7 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. //-------------------------------------------------------------------------- -package org.ognl.test.objects; +package ognl.test.objects; public class ObjectIndexed extends BaseObjectIndexed { diff --git a/src/test/java/org/ognl/test/objects/OtherEnum.java b/src/test/java/ognl/test/objects/OtherEnum.java similarity index 89% rename from src/test/java/org/ognl/test/objects/OtherEnum.java rename to src/test/java/ognl/test/objects/OtherEnum.java index 416a68e4..171c6b23 100644 --- a/src/test/java/org/ognl/test/objects/OtherEnum.java +++ b/src/test/java/ognl/test/objects/OtherEnum.java @@ -1,4 +1,4 @@ -package org.ognl.test.objects; +package ognl.test.objects; /** * diff --git a/src/test/java/org/ognl/test/objects/OtherObjectIndexed.java b/src/test/java/ognl/test/objects/OtherObjectIndexed.java similarity index 98% rename from src/test/java/org/ognl/test/objects/OtherObjectIndexed.java rename to src/test/java/ognl/test/objects/OtherObjectIndexed.java index af112f6a..afdafcd0 100644 --- a/src/test/java/org/ognl/test/objects/OtherObjectIndexed.java +++ b/src/test/java/ognl/test/objects/OtherObjectIndexed.java @@ -28,7 +28,7 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. //-------------------------------------------------------------------------- -package org.ognl.test.objects; +package ognl.test.objects; public class OtherObjectIndexed extends BaseObjectIndexed { diff --git a/src/test/java/org/ognl/test/objects/PersonGenericObject.java b/src/test/java/ognl/test/objects/PersonGenericObject.java similarity index 87% rename from src/test/java/org/ognl/test/objects/PersonGenericObject.java rename to src/test/java/ognl/test/objects/PersonGenericObject.java index ba0534dc..c810b8d5 100644 --- a/src/test/java/org/ognl/test/objects/PersonGenericObject.java +++ b/src/test/java/ognl/test/objects/PersonGenericObject.java @@ -1,4 +1,4 @@ -package org.ognl.test.objects; +package ognl.test.objects; /** * diff --git a/src/test/java/org/ognl/test/objects/PropertyHolder.java b/src/test/java/ognl/test/objects/PropertyHolder.java similarity index 94% rename from src/test/java/org/ognl/test/objects/PropertyHolder.java rename to src/test/java/ognl/test/objects/PropertyHolder.java index a3e21dfb..223a67e4 100644 --- a/src/test/java/org/ognl/test/objects/PropertyHolder.java +++ b/src/test/java/ognl/test/objects/PropertyHolder.java @@ -1,4 +1,4 @@ -package org.ognl.test.objects; +package ognl.test.objects; /** * Simple class used to test various kind of property resolutions. @@ -17,7 +17,7 @@ public void setValue(String value) { _value = value; } - + public boolean hasValue() { return _value != null && _value.length() > 0; diff --git a/src/test/java/org/ognl/test/objects/Root.java b/src/test/java/ognl/test/objects/Root.java similarity index 99% rename from src/test/java/org/ognl/test/objects/Root.java rename to src/test/java/ognl/test/objects/Root.java index 3c9694c8..a50935be 100644 --- a/src/test/java/org/ognl/test/objects/Root.java +++ b/src/test/java/ognl/test/objects/Root.java @@ -28,9 +28,9 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. //-------------------------------------------------------------------------- -package org.ognl.test.objects; +package ognl.test.objects; -import org.ognl.DynamicSubscript; +import ognl.DynamicSubscript; import java.util.*; diff --git a/src/test/java/org/ognl/test/objects/SearchCriteria.java b/src/test/java/ognl/test/objects/SearchCriteria.java similarity index 88% rename from src/test/java/org/ognl/test/objects/SearchCriteria.java rename to src/test/java/ognl/test/objects/SearchCriteria.java index a6434f36..0220f782 100644 --- a/src/test/java/org/ognl/test/objects/SearchCriteria.java +++ b/src/test/java/ognl/test/objects/SearchCriteria.java @@ -1,4 +1,4 @@ -package org.ognl.test.objects; +package ognl.test.objects; /** * Test for OGNL-131. diff --git a/src/test/java/org/ognl/test/objects/SearchTab.java b/src/test/java/ognl/test/objects/SearchTab.java similarity index 97% rename from src/test/java/org/ognl/test/objects/SearchTab.java rename to src/test/java/ognl/test/objects/SearchTab.java index c959a412..5ef384f8 100644 --- a/src/test/java/org/ognl/test/objects/SearchTab.java +++ b/src/test/java/ognl/test/objects/SearchTab.java @@ -1,4 +1,4 @@ -package org.ognl.test.objects; +package ognl.test.objects; import java.util.ArrayList; import java.util.Arrays; @@ -24,7 +24,7 @@ public List> getSearchCriteriaSelections(){ public void setSearchCriteriaSelections(List> selections){ this.searchCriteriaSelections = selections; } - + /** * Filters that can be applied to this tabs searches */ @@ -52,7 +52,7 @@ public List> getSearchCriteriaOptions() { } public void setSearchCriteriaOptions(List> searchCriteriaOptions) { - + this.searchCriteriaOptions = searchCriteriaOptions; } } diff --git a/src/test/java/org/ognl/test/objects/SecondBean.java b/src/test/java/ognl/test/objects/SecondBean.java similarity index 79% rename from src/test/java/org/ognl/test/objects/SecondBean.java rename to src/test/java/ognl/test/objects/SecondBean.java index 895399f8..670cf4c9 100644 --- a/src/test/java/org/ognl/test/objects/SecondBean.java +++ b/src/test/java/ognl/test/objects/SecondBean.java @@ -1,7 +1,7 @@ /** - * + * */ -package org.ognl.test.objects; +package ognl.test.objects; /** diff --git a/src/test/java/org/ognl/test/objects/SetterReturns.java b/src/test/java/ognl/test/objects/SetterReturns.java similarity index 88% rename from src/test/java/org/ognl/test/objects/SetterReturns.java rename to src/test/java/ognl/test/objects/SetterReturns.java index 54cd5e06..4dacb97c 100644 --- a/src/test/java/org/ognl/test/objects/SetterReturns.java +++ b/src/test/java/ognl/test/objects/SetterReturns.java @@ -1,4 +1,4 @@ -package org.ognl.test.objects; +package ognl.test.objects; /** * diff --git a/src/test/java/org/ognl/test/objects/Simple.java b/src/test/java/ognl/test/objects/Simple.java similarity index 98% rename from src/test/java/org/ognl/test/objects/Simple.java rename to src/test/java/ognl/test/objects/Simple.java index 23147ae3..78eed979 100644 --- a/src/test/java/org/ognl/test/objects/Simple.java +++ b/src/test/java/ognl/test/objects/Simple.java @@ -28,9 +28,9 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. //-------------------------------------------------------------------------- -package org.ognl.test.objects; +package ognl.test.objects; -import org.ognl.test.OgnlTestCase; +import ognl.test.OgnlTestCase; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/src/test/java/org/ognl/test/objects/SimpleEnum.java b/src/test/java/ognl/test/objects/SimpleEnum.java similarity index 87% rename from src/test/java/org/ognl/test/objects/SimpleEnum.java rename to src/test/java/ognl/test/objects/SimpleEnum.java index 801df796..dc9677af 100644 --- a/src/test/java/org/ognl/test/objects/SimpleEnum.java +++ b/src/test/java/ognl/test/objects/SimpleEnum.java @@ -1,4 +1,4 @@ -package org.ognl.test.objects; +package ognl.test.objects; /** * diff --git a/src/test/java/org/ognl/test/objects/SimpleNumeric.java b/src/test/java/ognl/test/objects/SimpleNumeric.java similarity index 68% rename from src/test/java/org/ognl/test/objects/SimpleNumeric.java rename to src/test/java/ognl/test/objects/SimpleNumeric.java index 1182dbde..5bf51d0c 100644 --- a/src/test/java/org/ognl/test/objects/SimpleNumeric.java +++ b/src/test/java/ognl/test/objects/SimpleNumeric.java @@ -1,7 +1,7 @@ -package org.ognl.test.objects; +package ognl.test.objects; /** - * Used for {@link org.ognl.test.PropertyArithmeticAndLogicalOperatorsTest}. + * Used for {@link ognl.test.PropertyArithmeticAndLogicalOperatorsTest}. */ public class SimpleNumeric { diff --git a/src/test/java/org/ognl/test/objects/SubclassSyntheticObject.java b/src/test/java/ognl/test/objects/SubclassSyntheticObject.java similarity index 86% rename from src/test/java/org/ognl/test/objects/SubclassSyntheticObject.java rename to src/test/java/ognl/test/objects/SubclassSyntheticObject.java index 00498ba3..f017cfe5 100644 --- a/src/test/java/org/ognl/test/objects/SubclassSyntheticObject.java +++ b/src/test/java/ognl/test/objects/SubclassSyntheticObject.java @@ -1,4 +1,4 @@ -package org.ognl.test.objects; +package ognl.test.objects; import java.util.ArrayList; diff --git a/src/test/java/org/ognl/test/objects/TestClass.java b/src/test/java/ognl/test/objects/TestClass.java similarity index 61% rename from src/test/java/org/ognl/test/objects/TestClass.java rename to src/test/java/ognl/test/objects/TestClass.java index c519dec9..6eb58dc5 100644 --- a/src/test/java/org/ognl/test/objects/TestClass.java +++ b/src/test/java/ognl/test/objects/TestClass.java @@ -1,4 +1,4 @@ -package org.ognl.test.objects; +package ognl.test.objects; /** * diff --git a/src/test/java/org/ognl/test/objects/TestImpl.java b/src/test/java/ognl/test/objects/TestImpl.java similarity index 89% rename from src/test/java/org/ognl/test/objects/TestImpl.java rename to src/test/java/ognl/test/objects/TestImpl.java index 7dfe74de..fdf47508 100644 --- a/src/test/java/org/ognl/test/objects/TestImpl.java +++ b/src/test/java/ognl/test/objects/TestImpl.java @@ -1,4 +1,4 @@ -package org.ognl.test.objects; +package ognl.test.objects; import java.util.HashMap; import java.util.Map; diff --git a/src/test/java/org/ognl/test/objects/TestInherited1.java b/src/test/java/ognl/test/objects/TestInherited1.java similarity index 81% rename from src/test/java/org/ognl/test/objects/TestInherited1.java rename to src/test/java/ognl/test/objects/TestInherited1.java index 4a1f701d..410886f7 100644 --- a/src/test/java/org/ognl/test/objects/TestInherited1.java +++ b/src/test/java/ognl/test/objects/TestInherited1.java @@ -1,4 +1,4 @@ -package org.ognl.test.objects; +package ognl.test.objects; /** * diff --git a/src/test/java/org/ognl/test/objects/TestInherited2.java b/src/test/java/ognl/test/objects/TestInherited2.java similarity index 81% rename from src/test/java/org/ognl/test/objects/TestInherited2.java rename to src/test/java/ognl/test/objects/TestInherited2.java index d70c5d45..8c24ca18 100644 --- a/src/test/java/org/ognl/test/objects/TestInherited2.java +++ b/src/test/java/ognl/test/objects/TestInherited2.java @@ -1,4 +1,4 @@ -package org.ognl.test.objects; +package ognl.test.objects; /** * diff --git a/src/test/java/org/ognl/test/objects/TestModel.java b/src/test/java/ognl/test/objects/TestModel.java similarity index 91% rename from src/test/java/org/ognl/test/objects/TestModel.java rename to src/test/java/ognl/test/objects/TestModel.java index 31a269be..52f5e7d9 100644 --- a/src/test/java/org/ognl/test/objects/TestModel.java +++ b/src/test/java/ognl/test/objects/TestModel.java @@ -1,4 +1,4 @@ -package org.ognl.test.objects; +package ognl.test.objects; /** * diff --git a/src/test/java/org/ognl/test/objects/TreeContentProvider.java b/src/test/java/ognl/test/objects/TreeContentProvider.java similarity index 93% rename from src/test/java/org/ognl/test/objects/TreeContentProvider.java rename to src/test/java/ognl/test/objects/TreeContentProvider.java index 4ea113d9..a3e075ef 100644 --- a/src/test/java/org/ognl/test/objects/TreeContentProvider.java +++ b/src/test/java/ognl/test/objects/TreeContentProvider.java @@ -1,4 +1,4 @@ -package org.ognl.test.objects; +package ognl.test.objects; import java.util.Collection; import java.util.Collections; diff --git a/src/test/java/org/ognl/test/objects/Two.java b/src/test/java/ognl/test/objects/Two.java similarity index 87% rename from src/test/java/org/ognl/test/objects/Two.java rename to src/test/java/ognl/test/objects/Two.java index f71e1844..3dc9a398 100644 --- a/src/test/java/org/ognl/test/objects/Two.java +++ b/src/test/java/ognl/test/objects/Two.java @@ -1,4 +1,4 @@ -package org.ognl.test.objects; +package ognl.test.objects; /** * diff --git a/src/test/java/org/ognl/test/race/Base.java b/src/test/java/ognl/test/race/Base.java similarity index 86% rename from src/test/java/org/ognl/test/race/Base.java rename to src/test/java/ognl/test/race/Base.java index 3c1e8f68..f0fd7bbd 100644 --- a/src/test/java/org/ognl/test/race/Base.java +++ b/src/test/java/ognl/test/race/Base.java @@ -1,4 +1,4 @@ -package org.ognl.test.race; +package ognl.test.race; /** * diff --git a/src/test/java/org/ognl/test/race/Persion.java b/src/test/java/ognl/test/race/Persion.java similarity index 87% rename from src/test/java/org/ognl/test/race/Persion.java rename to src/test/java/ognl/test/race/Persion.java index 0c76049a..a3edcb9a 100644 --- a/src/test/java/org/ognl/test/race/Persion.java +++ b/src/test/java/ognl/test/race/Persion.java @@ -1,4 +1,4 @@ -package org.ognl.test.race; +package ognl.test.race; public class Persion extends Base{ private String name = "abc"; diff --git a/src/test/java/org/ognl/test/race/RaceTestCase.java b/src/test/java/ognl/test/race/RaceTestCase.java similarity index 93% rename from src/test/java/org/ognl/test/race/RaceTestCase.java rename to src/test/java/ognl/test/race/RaceTestCase.java index b8b7912d..2e7d7ef1 100644 --- a/src/test/java/org/ognl/test/race/RaceTestCase.java +++ b/src/test/java/ognl/test/race/RaceTestCase.java @@ -1,10 +1,10 @@ -package org.ognl.test.race; +package ognl.test.race; -import org.ognl.DefaultMemberAccess; -import org.ognl.Ognl; -import org.ognl.OgnlContext; -import org.ognl.OgnlException; +import ognl.DefaultMemberAccess; +import ognl.Ognl; +import ognl.OgnlContext; +import ognl.OgnlException; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/org/ognl/test/util/ContextClassLoader.java b/src/test/java/ognl/test/util/ContextClassLoader.java similarity index 97% rename from src/test/java/org/ognl/test/util/ContextClassLoader.java rename to src/test/java/ognl/test/util/ContextClassLoader.java index 9b6b9d91..c3d58335 100644 --- a/src/test/java/org/ognl/test/util/ContextClassLoader.java +++ b/src/test/java/ognl/test/util/ContextClassLoader.java @@ -28,9 +28,9 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. //-------------------------------------------------------------------------- -package org.ognl.test.util; +package ognl.test.util; -import org.ognl.OgnlContext; +import ognl.OgnlContext; public class ContextClassLoader extends ClassLoader { diff --git a/src/test/java/org/ognl/test/util/EnhancedClassLoader.java b/src/test/java/ognl/test/util/EnhancedClassLoader.java similarity index 98% rename from src/test/java/org/ognl/test/util/EnhancedClassLoader.java rename to src/test/java/ognl/test/util/EnhancedClassLoader.java index eaef451f..6d4e553b 100644 --- a/src/test/java/org/ognl/test/util/EnhancedClassLoader.java +++ b/src/test/java/ognl/test/util/EnhancedClassLoader.java @@ -28,7 +28,7 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. //-------------------------------------------------------------------------- -package org.ognl.test.util; +package ognl.test.util; public class EnhancedClassLoader extends ClassLoader { diff --git a/src/test/java/org/ognl/test/util/NameFactory.java b/src/test/java/ognl/test/util/NameFactory.java similarity index 98% rename from src/test/java/org/ognl/test/util/NameFactory.java rename to src/test/java/ognl/test/util/NameFactory.java index 2f1bd5ba..3bfc2c7b 100644 --- a/src/test/java/org/ognl/test/util/NameFactory.java +++ b/src/test/java/ognl/test/util/NameFactory.java @@ -28,7 +28,7 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. //-------------------------------------------------------------------------- -package org.ognl.test.util; +package ognl.test.util; public class NameFactory extends Object {