Author: musachy
Date: Thu Nov 12 18:36:10 2009
New Revision: 835491
URL: http://svn.apache.org/viewvc?rev=835491&view=rev
Log:
rename package
Added:
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/
- copied from r835485,
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/BuiltinFunctionMapper.java
- copied, changed from r835481,
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/BuiltinFunctionMapper.java
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/CompoundRootELContext.java
- copied, changed from r835481,
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/CompoundRootELContext.java
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/ExpressionFactoryHolder.java
- copied, changed from r835481,
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/ExpressionFactoryHolder.java
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/JUELExtensionBuilder.java
- copied, changed from r835481,
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/JUELExtensionBuilder.java
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/UELReflectionContextFactory.java
- copied, changed from r835481,
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/UELReflectionContextFactory.java
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/UELServletContextListener.java
- copied, changed from r835481,
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/UELServletContextListener.java
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/UELValueStack.java
- copied, changed from r835481,
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/UELValueStack.java
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/UELValueStackFactory.java
- copied, changed from r835481,
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/UELValueStackFactory.java
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/elresolvers/
- copied from r835481,
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/reflection/
- copied from r835481,
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/reflection/
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/
- copied from r835485,
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/
struts/sandbox/trunk/struts2-uel-plugin/src/test/resources/org/apache/struts2/uel/
- copied from r835485,
struts/sandbox/trunk/struts2-uel-plugin/src/test/resources/org/apache/struts2/uelplugin/
struts/sandbox/trunk/struts2-uel-plugin/src/test/resources/org/apache/struts2/uel/TestAction.properties
- copied unchanged from r835481,
struts/sandbox/trunk/struts2-uel-plugin/src/test/resources/org/apache/struts2/uelplugin/TestAction.properties
Removed:
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/
struts/sandbox/trunk/struts2-uel-plugin/src/test/resources/org/apache/struts2/uelplugin/
Modified:
struts/sandbox/trunk/struts2-uel-plugin/pom.xml
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/elresolvers/AbstractELResolver.java
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/elresolvers/CompoundRootELResolver.java
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/elresolvers/MethodInvocationGuardELResolver.java
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/elresolvers/ValueStackContextReferenceELResolver.java
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/elresolvers/XWorkArrayELResolver.java
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/elresolvers/XWorkBeanELResolver.java
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/elresolvers/XWorkListELResolver.java
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/elresolvers/XWorkMapELResolver.java
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/reflection/ClassCache.java
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/reflection/ClassCacheImpl.java
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/reflection/ClassCacheInspector.java
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/reflection/DefaultMemberAccess.java
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/reflection/Entry.java
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/reflection/GenericReflectionProvider.java
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/reflection/MemberAccess.java
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/reflection/ObjectIndexedPropertyDescriptor.java
struts/sandbox/trunk/struts2-uel-plugin/src/main/resources/struts-plugin.xml
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/AbstractUELTest.java
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/BuiltinFunctionsTest.java
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/ChildTestAction.java
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/TestAction.java
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/TestObject.java
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/UELMethodInvocationTest.java
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/UELStackReadValueTest.java
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/UELStackSetValueTest.java
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/UELValueStackOtherTests.java
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/VulnerabilityTest.java
struts/sandbox/trunk/struts2-uel-plugin/src/test/resources/struts.xml
Modified: struts/sandbox/trunk/struts2-uel-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/pom.xml?rev=835491&r1=835490&r2=835491&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-uel-plugin/pom.xml (original)
+++ struts/sandbox/trunk/struts2-uel-plugin/pom.xml Thu Nov 12 18:36:10 2009
@@ -6,7 +6,7 @@
<artifactId>struts2-plugins</artifactId>
<version>2.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.struts2.uelplugin</groupId>
+ <groupId>org.apache.struts</groupId>
<artifactId>struts2-uel-plugin</artifactId>
<packaging>jar</packaging>
<name>Struts 2 Unified EL Plugin</name>
Copied:
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/BuiltinFunctionMapper.java
(from r835481,
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/BuiltinFunctionMapper.java)
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/BuiltinFunctionMapper.java?p2=struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/BuiltinFunctionMapper.java&p1=struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/BuiltinFunctionMapper.java&r1=835481&r2=835491&rev=835491&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/BuiltinFunctionMapper.java
(original)
+++
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/BuiltinFunctionMapper.java
Thu Nov 12 18:36:10 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts2.uelplugin;
+package org.apache.struts2.uel;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.LocaleProvider;
Copied:
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/CompoundRootELContext.java
(from r835481,
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/CompoundRootELContext.java)
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/CompoundRootELContext.java?p2=struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/CompoundRootELContext.java&p1=struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/CompoundRootELContext.java&r1=835481&r2=835491&rev=835491&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/CompoundRootELContext.java
(original)
+++
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/CompoundRootELContext.java
Thu Nov 12 18:36:10 2009
@@ -18,11 +18,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts2.uelplugin;
+package org.apache.struts2.uel;
import com.opensymphony.xwork2.inject.Container;
import de.odysseus.el.util.SimpleContext;
-import org.apache.struts2.uelplugin.elresolvers.*;
+import org.apache.struts2.uel.elresolvers.*;
import javax.el.BeanELResolver;
import javax.el.CompositeELResolver;
Copied:
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/ExpressionFactoryHolder.java
(from r835481,
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/ExpressionFactoryHolder.java)
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/ExpressionFactoryHolder.java?p2=struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/ExpressionFactoryHolder.java&p1=struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/ExpressionFactoryHolder.java&r1=835481&r2=835491&rev=835491&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/ExpressionFactoryHolder.java
(original)
+++
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/ExpressionFactoryHolder.java
Thu Nov 12 18:36:10 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts2.uelplugin;
+package org.apache.struts2.uel;
import javax.el.ExpressionFactory;
Copied:
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/JUELExtensionBuilder.java
(from r835481,
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/JUELExtensionBuilder.java)
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/JUELExtensionBuilder.java?p2=struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/JUELExtensionBuilder.java&p1=struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/JUELExtensionBuilder.java&r1=835481&r2=835491&rev=835491&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/JUELExtensionBuilder.java
(original)
+++
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/JUELExtensionBuilder.java
Thu Nov 12 18:36:10 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts2.uelplugin;
+package org.apache.struts2.uel;
import de.odysseus.el.misc.NumberOperations;
import de.odysseus.el.misc.TypeConverter;
Copied:
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/UELReflectionContextFactory.java
(from r835481,
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/UELReflectionContextFactory.java)
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/UELReflectionContextFactory.java?p2=struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/UELReflectionContextFactory.java&p1=struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/UELReflectionContextFactory.java&r1=835481&r2=835491&rev=835491&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/UELReflectionContextFactory.java
(original)
+++
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/UELReflectionContextFactory.java
Thu Nov 12 18:36:10 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts2.uelplugin;
+package org.apache.struts2.uel;
import com.opensymphony.xwork2.util.reflection.ReflectionContextFactory;
Copied:
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/UELServletContextListener.java
(from r835481,
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/UELServletContextListener.java)
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/UELServletContextListener.java?p2=struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/UELServletContextListener.java&p1=struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/UELServletContextListener.java&r1=835481&r2=835491&rev=835491&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/UELServletContextListener.java
(original)
+++
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/UELServletContextListener.java
Thu Nov 12 18:36:10 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts2.uelplugin;
+package org.apache.struts2.uel;
import de.odysseus.el.ExpressionFactoryImpl;
import de.odysseus.el.tree.TreeBuilder;
Copied:
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/UELValueStack.java
(from r835481,
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/UELValueStack.java)
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/UELValueStack.java?p2=struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/UELValueStack.java&p1=struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/UELValueStack.java&r1=835481&r2=835491&rev=835491&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/UELValueStack.java
(original)
+++
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/UELValueStack.java
Thu Nov 12 18:36:10 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts2.uelplugin;
+package org.apache.struts2.uel;
import com.opensymphony.xwork2.XWorkException;
import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
@@ -169,7 +169,7 @@
"Nothing will work until UELServletContextListener is
added as a listener in web.xml.\n" +
"You might need to add the following to web.xml: \n" +
" <listener>\n" +
- "
<listener-class>org.apache.struts2.uelplugin.UELServletContextListener</listener-class>\n"
+
+ "
<listener-class>org.apache.struts2.uel.UELServletContextListener</listener-class>\n"
+
" </listener>";
LOG.fatal(message);
throw new IllegalStateException("Unable to find ExpressionFactory
instance. Make sure that 'UELServletContextListener' " +
Copied:
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/UELValueStackFactory.java
(from r835481,
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/UELValueStackFactory.java)
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/UELValueStackFactory.java?p2=struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/UELValueStackFactory.java&p1=struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/UELValueStackFactory.java&r1=835481&r2=835491&rev=835491&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/UELValueStackFactory.java
(original)
+++
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/UELValueStackFactory.java
Thu Nov 12 18:36:10 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts2.uelplugin;
+package org.apache.struts2.uel;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.inject.Container;
Modified:
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/elresolvers/AbstractELResolver.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/elresolvers/AbstractELResolver.java?rev=835491&r1=835481&r2=835491&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/elresolvers/AbstractELResolver.java
(original)
+++
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/elresolvers/AbstractELResolver.java
Thu Nov 12 18:36:10 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts2.uelplugin.elresolvers;
+package org.apache.struts2.uel.elresolvers;
import com.opensymphony.xwork2.ObjectFactory;
import com.opensymphony.xwork2.conversion.NullHandler;
@@ -26,7 +26,7 @@
import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
import com.opensymphony.xwork2.inject.Container;
import com.opensymphony.xwork2.util.reflection.ReflectionProvider;
-import org.apache.struts2.uelplugin.UELValueStack;
+import org.apache.struts2.uel.UELValueStack;
import javax.el.ELContext;
import javax.el.ELResolver;
Modified:
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/elresolvers/CompoundRootELResolver.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/elresolvers/CompoundRootELResolver.java?rev=835491&r1=835481&r2=835491&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/elresolvers/CompoundRootELResolver.java
(original)
+++
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/elresolvers/CompoundRootELResolver.java
Thu Nov 12 18:36:10 2009
@@ -1,4 +1,4 @@
-package org.apache.struts2.uelplugin.elresolvers;
+package org.apache.struts2.uel.elresolvers;
import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
import com.opensymphony.xwork2.inject.Container;
Modified:
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/elresolvers/MethodInvocationGuardELResolver.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/elresolvers/MethodInvocationGuardELResolver.java?rev=835491&r1=835481&r2=835491&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/elresolvers/MethodInvocationGuardELResolver.java
(original)
+++
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/elresolvers/MethodInvocationGuardELResolver.java
Thu Nov 12 18:36:10 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts2.uelplugin.elresolvers;
+package org.apache.struts2.uel.elresolvers;
import com.opensymphony.xwork2.inject.Container;
import com.opensymphony.xwork2.util.reflection.ReflectionContextState;
Modified:
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/elresolvers/ValueStackContextReferenceELResolver.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/elresolvers/ValueStackContextReferenceELResolver.java?rev=835491&r1=835481&r2=835491&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/elresolvers/ValueStackContextReferenceELResolver.java
(original)
+++
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/elresolvers/ValueStackContextReferenceELResolver.java
Thu Nov 12 18:36:10 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts2.uelplugin.elresolvers;
+package org.apache.struts2.uel.elresolvers;
import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
import com.opensymphony.xwork2.inject.Container;
Modified:
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/elresolvers/XWorkArrayELResolver.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/elresolvers/XWorkArrayELResolver.java?rev=835491&r1=835481&r2=835491&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/elresolvers/XWorkArrayELResolver.java
(original)
+++
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/elresolvers/XWorkArrayELResolver.java
Thu Nov 12 18:36:10 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts2.uelplugin.elresolvers;
+package org.apache.struts2.uel.elresolvers;
import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
import com.opensymphony.xwork2.inject.Container;
Modified:
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/elresolvers/XWorkBeanELResolver.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/elresolvers/XWorkBeanELResolver.java?rev=835491&r1=835481&r2=835491&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/elresolvers/XWorkBeanELResolver.java
(original)
+++
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/elresolvers/XWorkBeanELResolver.java
Thu Nov 12 18:36:10 2009
@@ -1,4 +1,4 @@
-package org.apache.struts2.uelplugin.elresolvers;
+package org.apache.struts2.uel.elresolvers;
import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
import com.opensymphony.xwork2.inject.Container;
Modified:
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/elresolvers/XWorkListELResolver.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/elresolvers/XWorkListELResolver.java?rev=835491&r1=835481&r2=835491&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/elresolvers/XWorkListELResolver.java
(original)
+++
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/elresolvers/XWorkListELResolver.java
Thu Nov 12 18:36:10 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts2.uelplugin.elresolvers;
+package org.apache.struts2.uel.elresolvers;
import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
import com.opensymphony.xwork2.inject.Container;
Modified:
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/elresolvers/XWorkMapELResolver.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/elresolvers/XWorkMapELResolver.java?rev=835491&r1=835481&r2=835491&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/elresolvers/XWorkMapELResolver.java
(original)
+++
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/elresolvers/XWorkMapELResolver.java
Thu Nov 12 18:36:10 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts2.uelplugin.elresolvers;
+package org.apache.struts2.uel.elresolvers;
import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
import com.opensymphony.xwork2.inject.Container;
Modified:
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/reflection/ClassCache.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/reflection/ClassCache.java?rev=835491&r1=835481&r2=835491&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/reflection/ClassCache.java
(original)
+++
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/reflection/ClassCache.java
Thu Nov 12 18:36:10 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts2.uelplugin.reflection;
+package org.apache.struts2.uel.reflection;
public interface ClassCache {
Modified:
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/reflection/ClassCacheImpl.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/reflection/ClassCacheImpl.java?rev=835491&r1=835481&r2=835491&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/reflection/ClassCacheImpl.java
(original)
+++
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/reflection/ClassCacheImpl.java
Thu Nov 12 18:36:10 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts2.uelplugin.reflection;
+package org.apache.struts2.uel.reflection;
import java.util.Arrays;
Modified:
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/reflection/ClassCacheInspector.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/reflection/ClassCacheInspector.java?rev=835491&r1=835481&r2=835491&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/reflection/ClassCacheInspector.java
(original)
+++
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/reflection/ClassCacheInspector.java
Thu Nov 12 18:36:10 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts2.uelplugin.reflection;
+package org.apache.struts2.uel.reflection;
/**
* Taken from OGNL
Modified:
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/reflection/DefaultMemberAccess.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/reflection/DefaultMemberAccess.java?rev=835491&r1=835481&r2=835491&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/reflection/DefaultMemberAccess.java
(original)
+++
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/reflection/DefaultMemberAccess.java
Thu Nov 12 18:36:10 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts2.uelplugin.reflection;
+package org.apache.struts2.uel.reflection;
import java.lang.reflect.AccessibleObject;
import java.lang.reflect.Member;
Modified:
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/reflection/Entry.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/reflection/Entry.java?rev=835491&r1=835481&r2=835491&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/reflection/Entry.java
(original)
+++
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/reflection/Entry.java
Thu Nov 12 18:36:10 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts2.uelplugin.reflection;
+package org.apache.struts2.uel.reflection;
/**
* Taken from OGNL
Modified:
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/reflection/GenericReflectionProvider.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/reflection/GenericReflectionProvider.java?rev=835491&r1=835481&r2=835491&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/reflection/GenericReflectionProvider.java
(original)
+++
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/reflection/GenericReflectionProvider.java
Thu Nov 12 18:36:10 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts2.uelplugin.reflection;
+package org.apache.struts2.uel.reflection;
import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
Modified:
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/reflection/MemberAccess.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/reflection/MemberAccess.java?rev=835491&r1=835481&r2=835491&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/reflection/MemberAccess.java
(original)
+++
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/reflection/MemberAccess.java
Thu Nov 12 18:36:10 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts2.uelplugin.reflection;
+package org.apache.struts2.uel.reflection;
import java.lang.reflect.Member;
import java.util.Map;
Modified:
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/reflection/ObjectIndexedPropertyDescriptor.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/reflection/ObjectIndexedPropertyDescriptor.java?rev=835491&r1=835481&r2=835491&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/reflection/ObjectIndexedPropertyDescriptor.java
(original)
+++
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uel/reflection/ObjectIndexedPropertyDescriptor.java
Thu Nov 12 18:36:10 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts2.uelplugin.reflection;
+package org.apache.struts2.uel.reflection;
import java.beans.IntrospectionException;
import java.beans.PropertyDescriptor;
Modified:
struts/sandbox/trunk/struts2-uel-plugin/src/main/resources/struts-plugin.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/main/resources/struts-plugin.xml?rev=835491&r1=835490&r2=835491&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-uel-plugin/src/main/resources/struts-plugin.xml
(original)
+++
struts/sandbox/trunk/struts2-uel-plugin/src/main/resources/struts-plugin.xml
Thu Nov 12 18:36:10 2009
@@ -5,12 +5,9 @@
"http://struts.apache.org/dtds/struts-2.0.dtd";>
<struts>
- <bean type="com.opensymphony.xwork2.util.ValueStackFactory" name="uel"
- class="org.apache.struts2.uelplugin.UELValueStackFactory"/>
- <bean type="com.opensymphony.xwork2.util.reflection.ReflectionProvider"
name="uel"
-
class="org.apache.struts2.uelplugin.reflection.GenericReflectionProvider"/>
- <bean
type="com.opensymphony.xwork2.util.reflection.ReflectionContextFactory"
name="uel"
- class="org.apache.struts2.uelplugin.UELReflectionContextFactory"/>
+ <bean type="com.opensymphony.xwork2.util.ValueStackFactory" name="uel"
class="org.apache.struts2.uel.UELValueStackFactory"/>
+ <bean type="com.opensymphony.xwork2.util.reflection.ReflectionProvider"
name="uel" class="org.apache.struts2.uel.reflection.GenericReflectionProvider"/>
+ <bean
type="com.opensymphony.xwork2.util.reflection.ReflectionContextFactory"
name="uel" class="org.apache.struts2.uel.UELReflectionContextFactory"/>
<constant name="struts.valueStackFactory" value="uel"/>
<constant name="struts.reflectionProvider" value="uel"/>
Modified:
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/AbstractUELTest.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/AbstractUELTest.java?rev=835491&r1=835485&r2=835491&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/AbstractUELTest.java
(original)
+++
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/AbstractUELTest.java
Thu Nov 12 18:36:10 2009
@@ -19,7 +19,7 @@
* under the License.
*/
-package org.apache.struts2.uelplugin;
+package org.apache.struts2.uel;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.XWorkTestCase;
@@ -33,7 +33,7 @@
import com.opensymphony.xwork2.util.location.LocatableProperties;
import com.opensymphony.xwork2.util.reflection.ReflectionProvider;
import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.uelplugin.reflection.GenericReflectionProvider;
+import org.apache.struts2.uel.reflection.GenericReflectionProvider;
import org.apache.struts2.util.StrutsTypeConverter;
import org.springframework.mock.web.MockServletContext;
Modified:
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/BuiltinFunctionsTest.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/BuiltinFunctionsTest.java?rev=835491&r1=835485&r2=835491&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/BuiltinFunctionsTest.java
(original)
+++
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/BuiltinFunctionsTest.java
Thu Nov 12 18:36:10 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts2.uelplugin;
+package org.apache.struts2.uel;
import org.apache.struts2.views.util.ContextUtil;
Modified:
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/ChildTestAction.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/ChildTestAction.java?rev=835491&r1=835485&r2=835491&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/ChildTestAction.java
(original)
+++
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/ChildTestAction.java
Thu Nov 12 18:36:10 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts2.uelplugin;
+package org.apache.struts2.uel;
public class ChildTestAction extends TestAction {
}
Modified:
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/TestAction.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/TestAction.java?rev=835491&r1=835485&r2=835491&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/TestAction.java
(original)
+++
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/TestAction.java
Thu Nov 12 18:36:10 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts2.uelplugin;
+package org.apache.struts2.uel;
import com.opensymphony.xwork2.ActionSupport;
import com.opensymphony.xwork2.conversion.annotations.Conversion;
Modified:
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/TestObject.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/TestObject.java?rev=835491&r1=835485&r2=835491&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/TestObject.java
(original)
+++
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/TestObject.java
Thu Nov 12 18:36:10 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts2.uelplugin;
+package org.apache.struts2.uel;
import java.util.Date;
import java.util.List;
Modified:
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/UELMethodInvocationTest.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/UELMethodInvocationTest.java?rev=835491&r1=835485&r2=835491&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/UELMethodInvocationTest.java
(original)
+++
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/UELMethodInvocationTest.java
Thu Nov 12 18:36:10 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts2.uelplugin;
+package org.apache.struts2.uel;
import java.lang.reflect.InvocationTargetException;
Modified:
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/UELStackReadValueTest.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/UELStackReadValueTest.java?rev=835491&r1=835485&r2=835491&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/UELStackReadValueTest.java
(original)
+++
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/UELStackReadValueTest.java
Thu Nov 12 18:36:10 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts2.uelplugin;
+package org.apache.struts2.uel;
import java.lang.reflect.InvocationTargetException;
import java.util.*;
Modified:
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/UELStackSetValueTest.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/UELStackSetValueTest.java?rev=835491&r1=835485&r2=835491&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/UELStackSetValueTest.java
(original)
+++
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/UELStackSetValueTest.java
Thu Nov 12 18:36:10 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts2.uelplugin;
+package org.apache.struts2.uel;
import com.opensymphony.xwork2.util.reflection.ReflectionContextState;
Modified:
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/UELValueStackOtherTests.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/UELValueStackOtherTests.java?rev=835491&r1=835485&r2=835491&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/UELValueStackOtherTests.java
(original)
+++
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/UELValueStackOtherTests.java
Thu Nov 12 18:36:10 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts2.uelplugin;
+package org.apache.struts2.uel;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
Modified:
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/VulnerabilityTest.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/VulnerabilityTest.java?rev=835491&r1=835485&r2=835491&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/VulnerabilityTest.java
(original)
+++
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uel/VulnerabilityTest.java
Thu Nov 12 18:36:10 2009
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts2.uelplugin;
+package org.apache.struts2.uel;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.util.CompoundRoot;
Modified: struts/sandbox/trunk/struts2-uel-plugin/src/test/resources/struts.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/test/resources/struts.xml?rev=835491&r1=835490&r2=835491&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-uel-plugin/src/test/resources/struts.xml
(original)
+++ struts/sandbox/trunk/struts2-uel-plugin/src/test/resources/struts.xml Thu
Nov 12 18:36:10 2009
@@ -3,7 +3,7 @@
"http://struts.apache.org/dtds/struts-2.0.dtd";>
<struts>
<package name="test" namespace="/test" extends="struts-default">
- <action name="test" class="org.apache.struts2.uelplugin.TestAction">
+ <action name="test" class="org.apache.struts2.uel.TestAction">
<result>something.jsp</result>
</action>
</package>
