Nabble - Struts - Dev

[CONF] Confluence Changes in the last 24 hours

2009-11-08T16:01:00Z

svn commit: r833846 - in /struts/sandbox/trunk/struts2-uel-plugin: ./ src/main/java/org/apache/struts2/uelplugin/ src/main/java/org/apache/struts2/uelplugin/elresolvers/ src/main/java/org/apache/struts2/uelplugin/reflection/ src/main/resources/ src/tes...

2009-11-08T00:19:00Z

Author: musachy
Date: Sun Nov 8 08:18:59 2009
New Revision: 833846

URL: http://svn.apache.org/viewvc?rev=833846&view=rev
Log:
add test, prevent method evaluation, organize classes

Added:
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/AbstractELResolver.java
- copied, changed from r833776, struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/AbstractResolver.java
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/MethodInvocationGuardELResolver.java
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/ValueStackContextReferenceELResolver.java
- copied, changed from r833776, struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/ValueStackContextResolver.java
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/XWorkValueStackContext.java
- copied, changed from r833776, struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/AccessorsContextKey.java
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/VulnerabilityTest.java
struts/sandbox/trunk/struts2-uel-plugin/src/test/resources/struts.xml
Removed:
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/AbstractResolver.java
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/AccessorsContextKey.java
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/ValueStackContextResolver.java
Modified:
struts/sandbox/trunk/struts2-uel-plugin/pom.xml
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/uelplugin/CompoundRootELContext.java
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/uelplugin/UELServletContextListener.java
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/uelplugin/elresolvers/CompoundRootELResolver.java
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/XWorkArrayELResolver.java
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/XWorkBeanELResolver.java
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/XWorkListELResolver.java
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/XWorkMapELResolver.java
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/reflection/ClassCacheInspector.java
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/reflection/DefaultMemberAccess.java
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/reflection/Entry.java
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/reflection/MemberAccess.java
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/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/uelplugin/AbstractUELTest.java
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/BuiltinFunctionsTest.java
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/TestAction.java
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/TestObject.java
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/UELMethodInvocationTest.java
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/UELStackReadValueTest.java
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/UELStackSetValueTest.java
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/UELValueStackOtherTests.java

Modified: struts/sandbox/trunk/struts2-uel-plugin/pom.xml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/pom.xml?rev=833846&r1=833845&r2=833846&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-uel-plugin/pom.xml (original)
+++ struts/sandbox/trunk/struts2-uel-plugin/pom.xml Sun Nov 8 08:18:59 2009
@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.struts</groupId>
@@ -56,6 +55,12 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-junit-plugin</artifactId>
+ <version>2.2.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>${struts2.springPlatformVersion}</version>
@@ -85,10 +90,10 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jsp-2.1</artifactId>
- <version>6.1.3</version>
- <scope>provided</scope>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>2.4</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
@@ -111,5 +116,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file

Modified: 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/uelplugin/BuiltinFunctionMapper.java?rev=833846&r1=833845&r2=833846&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/uelplugin/BuiltinFunctionMapper.java Sun Nov 8 08:18:59 2009
@@ -1,18 +1,16 @@
package org.apache.struts2.uelplugin;

import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.TextProviderFactory;
-import com.opensymphony.xwork2.TextProvider;
import com.opensymphony.xwork2.LocaleProvider;
-import com.opensymphony.xwork2.util.CompoundRoot;
+import com.opensymphony.xwork2.TextProvider;
+import com.opensymphony.xwork2.TextProviderFactory;
import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.commons.lang.xwork.StringUtils;

import javax.el.FunctionMapper;
import java.lang.reflect.Method;
-import java.util.Map;
import java.util.HashMap;
-
-import org.apache.commons.lang.xwork.StringUtils;
+import java.util.Map;

/**
* <p>Builtin function availabe from UEL. Available functions are</p>

Modified: 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/uelplugin/CompoundRootELContext.java?rev=833846&r1=833845&r2=833846&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/uelplugin/CompoundRootELContext.java Sun Nov 8 08:18:59 2009
@@ -4,7 +4,10 @@
import de.odysseus.el.util.SimpleContext;
import org.apache.struts2.uelplugin.elresolvers.*;

-import javax.el.*;
+import javax.el.BeanELResolver;
+import javax.el.CompositeELResolver;
+import javax.el.FunctionMapper;
+import javax.el.VariableMapper;

/**
@@ -13,11 +16,13 @@
*/
public class CompoundRootELContext extends SimpleContext {
private final static BuiltinFunctionMapper BUILTIN_FUNCTION_MAPPER = new BuiltinFunctionMapper();
+
public CompoundRootELContext(final Container container) {
super(new CompositeELResolver() {
{
+ add(new MethodInvocationGuardELResolver(container));
add(new CompoundRootELResolver(container));
- add(new ValueStackContextResolver());
+ add(new ValueStackContextReferenceELResolver(container));
add(new XWorkBeanELResolver(container));
add(new XWorkListELResolver(container));
add(new XWorkMapELResolver(container));

Modified: 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/uelplugin/JUELExtensionBuilder.java?rev=833846&r1=833845&r2=833846&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/uelplugin/JUELExtensionBuilder.java Sun Nov 8 08:18:59 2009
@@ -1,16 +1,21 @@
package org.apache.struts2.uelplugin;

-import de.odysseus.el.misc.TypeConverter;
import de.odysseus.el.misc.NumberOperations;
+import de.odysseus.el.misc.TypeConverter;
+import de.odysseus.el.tree.Bindings;
+import de.odysseus.el.tree.Node;
import de.odysseus.el.tree.impl.Builder;
import de.odysseus.el.tree.impl.Parser;
import de.odysseus.el.tree.impl.Scanner;
import de.odysseus.el.tree.impl.ast.AstBinary;
import de.odysseus.el.tree.impl.ast.AstNode;
import de.odysseus.el.tree.impl.ast.AstUnary;
-import de.odysseus.el.tree.impl.ast.AstIdentifier;
import org.apache.commons.lang.xwork.StringUtils;

+import javax.el.ELContext;
+import javax.el.MethodInfo;
+import javax.el.ValueReference;
+
/**
* Plugs into JUEL parser to supper expressions like "#obj", to provide some level
* of backward compatibility with OGNL
@@ -54,9 +59,7 @@
*/
static Parser.ExtensionHandler SHARP_HANDLER = new Parser.ExtensionHandler(Parser.ExtensionPoint.UNARY) {
public AstNode createAstNode(AstNode... children) {
- //AstIdentifier astIdentifier = (AstIdentifier) children[0];
- //ValueStackAstIdentifier valueStackAstIdentifier = new ValueStackAstIdentifier(astIdentifier.getName(), astIdentifier.getIndex());
- return new AstUnary(children[0], SHARP_OPERATOR);
+ return new DelegateAstNode(children[0]);
}
};

@@ -123,3 +126,59 @@
return new ExtendedParser(this, expression);
}
}
+
+class DelegateAstNode extends AstNode {
+ private final AstNode child;
+
+ public DelegateAstNode(AstNode child) {
+ this.child = child;
+ }
+
+ public void appendStructure(StringBuilder builder, Bindings bindings) {
+ child.appendStructure(builder, bindings);
+ }
+
+ public Object eval(Bindings bindings, ELContext context) {
+ return child.eval(bindings, context);
+ }
+
+ public int getCardinality() {
+ return child.getCardinality();
+ }
+
+ public Node getChild(int i) {
+ return child.getChild(i);
+ }
+
+ public MethodInfo getMethodInfo(Bindings bindings, ELContext context, Class<?> returnType, Class<?>[] paramTypes) {
+ return child.getMethodInfo(bindings, context, returnType, paramTypes);
+ }
+
+ public Class<?> getType(Bindings bindings, ELContext context) {
+ return child.getType(bindings, context);
+ }
+
+ public ValueReference getValueReference(Bindings bindings, ELContext context) {
+ return child.getValueReference(bindings, context);
+ }
+
+ public Object invoke(Bindings bindings, ELContext context, Class<?> returnType, Class<?>[] paramTypes, Object[] paramValues) {
+ return child.invoke(bindings, context, returnType, paramTypes, paramValues);
+ }
+
+ public boolean isLeftValue() {
+ return child.isLeftValue();
+ }
+
+ public boolean isLiteralText() {
+ return child.isLiteralText();
+ }
+
+ public boolean isReadOnly(Bindings bindings, ELContext context) {
+ return child.isReadOnly(bindings, context);
+ }
+
+ public void setValue(Bindings bindings, ELContext context, Object value) {
+ child.setValue(bindings, context, value);
+ }
+}

Modified: 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/uelplugin/UELServletContextListener.java?rev=833846&r1=833845&r2=833846&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/uelplugin/UELServletContextListener.java Sun Nov 8 08:18:59 2009
@@ -4,13 +4,10 @@
import de.odysseus.el.tree.TreeBuilder;

import javax.el.ExpressionFactory;
-import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
import java.util.Properties;

-import org.apache.struts2.uelplugin.ExpressionFactoryHolder;
-
/**
* Responsible for creating the ExpressionFactory that will be used by the
* UelValueStack

Modified: 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/uelplugin/UELValueStack.java?rev=833846&r1=833845&r2=833846&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/uelplugin/UELValueStack.java Sun Nov 8 08:18:59 2009
@@ -9,15 +9,15 @@
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
-import org.apache.struts2.uelplugin.elresolvers.AccessorsContextKey;
+import org.apache.struts2.uelplugin.elresolvers.XWorkValueStackContext;

import javax.el.ELContext;
import javax.el.ExpressionFactory;
import javax.el.PropertyNotFoundException;
import javax.el.ValueExpression;
+import java.io.Serializable;
import java.util.Map;
import java.util.TreeMap;
-import java.io.Serializable;

/**
* A ValueStack that uses Unified EL as the underlying Expression Language.
@@ -95,7 +95,7 @@
expr = "#{" + expr + "}";
}

- elContext.putContext(AccessorsContextKey.class, context);
+ elContext.putContext(XWorkValueStackContext.class, context);
elContext.putContext(XWorkConverter.class, xworkConverter);
elContext.putContext(CompoundRoot.class, root);

@@ -195,7 +195,7 @@
if (expr != null && !expr.startsWith("${") && !expr.startsWith("#{")) {
expr = "#{" + expr + "}";
}
- elContext.putContext(AccessorsContextKey.class, context);
+ elContext.putContext(XWorkValueStackContext.class, context);
elContext.putContext(XWorkConverter.class, xworkConverter);
elContext.putContext(CompoundRoot.class, root);

Copied: struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/AbstractELResolver.java (from r833776, struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/AbstractResolver.java)
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/AbstractELResolver.java?p2=struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/AbstractELResolver.java&p1=struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/AbstractResolver.java&r1=833776&r2=833846&rev=833846&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/AbstractResolver.java (original)
+++ struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/AbstractELResolver.java Sun Nov 8 08:18:59 2009
@@ -1,26 +1,26 @@
package org.apache.struts2.uelplugin.elresolvers;

-import com.opensymphony.xwork2.util.reflection.ReflectionProvider;
-import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
+import com.opensymphony.xwork2.ObjectFactory;
import com.opensymphony.xwork2.conversion.NullHandler;
import com.opensymphony.xwork2.conversion.ObjectTypeDeterminer;
+import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
import com.opensymphony.xwork2.inject.Container;
-import com.opensymphony.xwork2.ObjectFactory;
+import com.opensymphony.xwork2.util.reflection.ReflectionProvider;

-import javax.el.ELResolver;
import javax.el.ELContext;
-import java.util.Iterator;
+import javax.el.ELResolver;
import java.beans.FeatureDescriptor;
+import java.util.Iterator;

-public abstract class AbstractResolver extends ELResolver {
- protected ReflectionProvider reflectionProvider;
- protected XWorkConverter xworkConverter;
- protected NullHandler nullHandler;
- protected ObjectTypeDeterminer objectTypeDeterminer;
- protected ObjectFactory objectFactory;
+public abstract class AbstractELResolver extends ELResolver {
+ protected final ReflectionProvider reflectionProvider;
+ protected final XWorkConverter xworkConverter;
+ protected final NullHandler nullHandler;
+ protected final ObjectTypeDeterminer objectTypeDeterminer;
+ protected final ObjectFactory objectFactory;

- public AbstractResolver(Container container) {
+ public AbstractELResolver(Container container) {
this.reflectionProvider = container.getInstance(ReflectionProvider.class);
this.xworkConverter = container.getInstance(XWorkConverter.class);
this.nullHandler = container.getInstance(NullHandler.class, "java.lang.Object");

Modified: struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/CompoundRootELResolver.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/CompoundRootELResolver.java?rev=833846&r1=833845&r2=833846&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/CompoundRootELResolver.java (original)
+++ struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/CompoundRootELResolver.java Sun Nov 8 08:18:59 2009
@@ -1,9 +1,9 @@
package org.apache.struts2.uelplugin.elresolvers;

import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
+import com.opensymphony.xwork2.inject.Container;
import com.opensymphony.xwork2.util.CompoundRoot;
import com.opensymphony.xwork2.util.reflection.ReflectionContextState;
-import com.opensymphony.xwork2.inject.Container;
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.lang.xwork.StringUtils;
@@ -16,7 +16,7 @@
* An ELResolver that is capable of resolving properties against the
* CompoundRoot if available in the ELContext.
*/
-public class CompoundRootELResolver extends AbstractResolver {
+public class CompoundRootELResolver extends AbstractELResolver {

public CompoundRootELResolver(Container container) {
super(container);
@@ -48,7 +48,7 @@
return root.get(0);
}

- Map<String, Object> reflectionContext = (Map) elContext.getContext(AccessorsContextKey.class);
+ Map<String, Object> reflectionContext = (Map) elContext.getContext(XWorkValueStackContext.class);

Object bean = findObjectForProperty(root, propertyName);
if (bean != null) {
@@ -86,7 +86,7 @@
}

CompoundRoot root = (CompoundRoot) context.getContext(CompoundRoot.class);
- Map<String, Object> reflectionContext = (Map) context.getContext(AccessorsContextKey.class);
+ Map<String, Object> reflectionContext = (Map) context.getContext(XWorkValueStackContext.class);
String propertyName = (String) property;
try {
if (base == null && property != null && root != null) {

Added: struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/MethodInvocationGuardELResolver.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/MethodInvocationGuardELResolver.java?rev=833846&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/MethodInvocationGuardELResolver.java (added)
+++ struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/MethodInvocationGuardELResolver.java Sun Nov 8 08:18:59 2009
@@ -0,0 +1,34 @@
+package org.apache.struts2.uelplugin.elresolvers;
+
+import com.opensymphony.xwork2.inject.Container;
+import com.opensymphony.xwork2.util.reflection.ReflectionContextState;
+
+import javax.el.ELContext;
+import javax.el.ELException;
+import java.util.Map;
+
+/**
+ * Will throw an exception if invoke is called and method invocation is not allowed
+ */
+public class MethodInvocationGuardELResolver extends AbstractELResolver {
+ public MethodInvocationGuardELResolver(Container container) {
+ super(container);
+ }
+
+ public Object getValue(ELContext context, Object base, Object property) {
+ return null;
+ }
+
+ public void setValue(ELContext context, Object base, Object property, Object value) {
+ }
+
+ @Override
+ public Object invoke(ELContext elContext, Object base, Object method, Class<?>[] paramTypes, Object[] params) {
+ Map<String, Object> context = (Map) elContext.getContext(XWorkValueStackContext.class);
+ if (ReflectionContextState.isDenyMethodExecution(context)) {
+ //you aint invoking this
+ throw new ELException("Method ivocations are disabled");
+ } else
+ return null;
+ }
+}

Copied: struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/ValueStackContextReferenceELResolver.java (from r833776, struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/ValueStackContextResolver.java)
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/ValueStackContextReferenceELResolver.java?p2=struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/ValueStackContextReferenceELResolver.java&p1=struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/ValueStackContextResolver.java&r1=833776&r2=833846&rev=833846&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/ValueStackContextResolver.java (original)
+++ struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/ValueStackContextReferenceELResolver.java Sun Nov 8 08:18:59 2009
@@ -1,29 +1,38 @@
package org.apache.struts2.uelplugin.elresolvers;

import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
+import com.opensymphony.xwork2.inject.Container;
import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.commons.lang.xwork.StringUtils;

-import javax.el.ELResolver;
import javax.el.ELContext;
-import java.util.Iterator;
import java.beans.FeatureDescriptor;
+import java.util.Iterator;
+import java.util.Map;

-import org.apache.commons.lang.xwork.StringUtils;

+public class ValueStackContextReferenceELResolver extends AbstractELResolver {
+ public ValueStackContextReferenceELResolver(Container container) {
+ super(container);
+ }

-public class ValueStackContextResolver extends ELResolver {
- public Object getValue(ELContext context, Object base, Object property) {
+ public Object getValue(ELContext elContext, Object base, Object property) {
String objectName = property.toString();
if (StringUtils.startsWith(objectName, "#")) {
objectName = StringUtils.removeStart(property.toString(), "#");

ActionContext actionContext = ActionContext.getContext();
- if (context != null) {
+ if (elContext != null) {
ValueStack valueStack = actionContext.getValueStack();
if (valueStack != null) {
Object obj = valueStack.getContext().get(objectName);
if (obj != null) {
- context.setPropertyResolved(true);
+ Map<String, Object> reflectionContext = (Map) elContext.getContext(XWorkValueStackContext.class);
+
+ reflectionContext.put(XWorkConverter.LAST_BEAN_CLASS_ACCESSED, obj.getClass());
+ reflectionContext.put(XWorkConverter.LAST_BEAN_PROPERTY_ACCESSED, objectName);
+ elContext.setPropertyResolved(true);
return obj;
}
}

Modified: struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/XWorkArrayELResolver.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/XWorkArrayELResolver.java?rev=833846&r1=833845&r2=833846&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/XWorkArrayELResolver.java (original)
+++ struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/XWorkArrayELResolver.java Sun Nov 8 08:18:59 2009
@@ -1,17 +1,16 @@
package org.apache.struts2.uelplugin.elresolvers;

-import com.opensymphony.xwork2.inject.Container;
import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
+import com.opensymphony.xwork2.inject.Container;
import com.opensymphony.xwork2.util.reflection.ReflectionContextState;

import javax.el.ELContext;
import javax.el.ELException;
-import java.util.List;
-import java.util.Map;
import java.lang.reflect.Array;
+import java.util.Map;

-public class XWorkArrayELResolver extends AbstractResolver {
+public class XWorkArrayELResolver extends AbstractELResolver {
public XWorkArrayELResolver(Container container) {
super(container);
}
@@ -19,7 +18,7 @@
public Object getValue(ELContext elContext, Object target, Object property) {
if (target != null && property != null && target.getClass().isArray()) {

- Map<String, Object> context = (Map) elContext.getContext(AccessorsContextKey.class);
+ Map<String, Object> context = (Map) elContext.getContext(XWorkValueStackContext.class);

Class lastClass = (Class) context.get(XWorkConverter.LAST_BEAN_CLASS_ACCESSED);
String lastProperty = (String) context.get(XWorkConverter.LAST_BEAN_PROPERTY_ACCESSED);
@@ -74,7 +73,7 @@
public void setValue(ELContext elContext, Object target, Object property, Object value) {
if (target != null && property != null && target.getClass().isArray()) {

- Map<String, Object> context = (Map) elContext.getContext(AccessorsContextKey.class);
+ Map<String, Object> context = (Map) elContext.getContext(XWorkValueStackContext.class);

Class lastClass = (Class) context.get(XWorkConverter.LAST_BEAN_CLASS_ACCESSED);
String lastProperty = (String) context.get(XWorkConverter.LAST_BEAN_PROPERTY_ACCESSED);

Modified: struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/XWorkBeanELResolver.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/XWorkBeanELResolver.java?rev=833846&r1=833845&r2=833846&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/XWorkBeanELResolver.java (original)
+++ struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/XWorkBeanELResolver.java Sun Nov 8 08:18:59 2009
@@ -9,14 +9,14 @@
import javax.el.ELContext;
import java.util.Map;

-public class XWorkBeanELResolver extends AbstractResolver {
+public class XWorkBeanELResolver extends AbstractELResolver {
public XWorkBeanELResolver(Container container) {
super(container);
}

public Object getValue(ELContext elContext, Object target, Object property) {
if (target != null && property != null) {
- Map<String, Object> reflectionContext = (Map<String, Object>) elContext.getContext(AccessorsContextKey.class);
+ Map<String, Object> reflectionContext = (Map<String, Object>) elContext.getContext(XWorkValueStackContext.class);
String propertyName = property.toString();
Class targetType = target.getClass();

@@ -48,7 +48,7 @@
public void setValue(ELContext elContext, Object target, Object property, Object value) {
if (target != null && property != null) {
try {
- Map<String, Object> reflectionContext = (Map<String, Object>) elContext.getContext(AccessorsContextKey.class);
+ Map<String, Object> reflectionContext = (Map<String, Object>) elContext.getContext(XWorkValueStackContext.class);
String propertyName = property.toString();
Class targetType = target.getClass();

Modified: struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/XWorkListELResolver.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/XWorkListELResolver.java?rev=833846&r1=833845&r2=833846&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/XWorkListELResolver.java (original)
+++ struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/XWorkListELResolver.java Sun Nov 8 08:18:59 2009
@@ -1,16 +1,16 @@
package org.apache.struts2.uelplugin.elresolvers;

-import com.opensymphony.xwork2.inject.Container;
+import com.opensymphony.xwork2.XWorkException;
import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
+import com.opensymphony.xwork2.inject.Container;
import com.opensymphony.xwork2.util.reflection.ReflectionContextState;
-import com.opensymphony.xwork2.XWorkException;

import javax.el.ELContext;
+import java.util.Collection;
import java.util.List;
import java.util.Map;
-import java.util.Collection;

-public class XWorkListELResolver extends AbstractResolver {
+public class XWorkListELResolver extends AbstractELResolver {
public XWorkListELResolver(Container container) {
super(container);
}
@@ -18,7 +18,7 @@
public Object getValue(ELContext elContext, Object target, Object property) {
if (target != null && property != null && target instanceof List) {

- Map<String, Object> context = (Map) elContext.getContext(AccessorsContextKey.class);
+ Map<String, Object> context = (Map) elContext.getContext(XWorkValueStackContext.class);
List list = (List) target;

Class lastClass = (Class) context.get(XWorkConverter.LAST_BEAN_CLASS_ACCESSED);
@@ -82,7 +82,7 @@
}

public void setValue(ELContext elContext, Object target, Object property, Object value) {
- Map<String, Object> context = (Map) elContext.getContext(AccessorsContextKey.class);
+ Map<String, Object> context = (Map) elContext.getContext(XWorkValueStackContext.class);
if (target != null && property != null && target instanceof List) {
Class lastClass = (Class) context.get(XWorkConverter.LAST_BEAN_CLASS_ACCESSED);
String lastProperty = (String) context.get(XWorkConverter.LAST_BEAN_PROPERTY_ACCESSED);

Modified: struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/XWorkMapELResolver.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/XWorkMapELResolver.java?rev=833846&r1=833845&r2=833846&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/XWorkMapELResolver.java (original)
+++ struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/XWorkMapELResolver.java Sun Nov 8 08:18:59 2009
@@ -1,15 +1,14 @@
package org.apache.struts2.uelplugin.elresolvers;

-import com.opensymphony.xwork2.util.reflection.ReflectionContextState;
import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
import com.opensymphony.xwork2.inject.Container;
+import com.opensymphony.xwork2.util.reflection.ReflectionContextState;

import javax.el.ELContext;
import java.util.Map;
-import java.util.List;
import java.util.WeakHashMap;

-public class XWorkMapELResolver extends AbstractResolver {
+public class XWorkMapELResolver extends AbstractELResolver {
private final Map<Key, Class> keyClassCache = new WeakHashMap<Key, Class>();

public XWorkMapELResolver(Container container) {
@@ -17,7 +16,7 @@
}

public Object getValue(ELContext elContext, Object target, Object property) {
- Map<String, Object> context = (Map) elContext.getContext(AccessorsContextKey.class);
+ Map<String, Object> context = (Map) elContext.getContext(XWorkValueStackContext.class);

if (target != null && property != null && target instanceof Map) {
Object result = null;
@@ -84,12 +83,13 @@
}

public void setValue(ELContext elContext, Object target, Object property, Object value) {
- Map<String, Object> context = (Map) elContext.getContext(AccessorsContextKey.class);
+ Map<String, Object> context = (Map) elContext.getContext(XWorkValueStackContext.class);

if (target != null && property != null && target instanceof Map) {
Object key = getKey(context, property);
Map map = (Map) target;
- map.put(key, getValue(context, value));
+ map.put(key, value);
+ elContext.setPropertyResolved(true);
}
}

Copied: struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/XWorkValueStackContext.java (from r833776, struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/AccessorsContextKey.java)
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/XWorkValueStackContext.java?p2=struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/XWorkValueStackContext.java&p1=struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/AccessorsContextKey.java&r1=833776&r2=833846&rev=833846&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/AccessorsContextKey.java (original)
+++ struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/XWorkValueStackContext.java Sun Nov 8 08:18:59 2009
@@ -1,5 +1,7 @@
package org.apache.struts2.uelplugin.elresolvers;

+import java.util.Map;

-public interface AccessorsContextKey {
+
+public interface XWorkValueStackContext extends Map {
}

Modified: struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/reflection/ClassCacheInspector.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/reflection/ClassCacheInspector.java?rev=833846&r1=833845&r2=833846&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/reflection/ClassCacheInspector.java (original)
+++ struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/reflection/ClassCacheInspector.java Sun Nov 8 08:18:59 2009
@@ -8,9 +8,7 @@
/**
* Invoked just before storing a class type within a cache instance.
*
- * @param type
- * The class that is to be stored.
- *
+ * @param type The class that is to be stored.
* @return True if the class can be cached, false otherwise.
*/
boolean shouldCache(Class type);

Modified: struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/reflection/DefaultMemberAccess.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/reflection/DefaultMemberAccess.java?rev=833846&r1=833845&r2=833846&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/reflection/DefaultMemberAccess.java (original)
+++ struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/reflection/DefaultMemberAccess.java Sun Nov 8 08:18:59 2009
@@ -1,78 +1,68 @@
package org.apache.struts2.uelplugin.reflection;

-import java.util.Map;
-import java.lang.reflect.Member;
import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.Member;
import java.lang.reflect.Modifier;
+import java.util.Map;

/**
* Taken from OGNL
*/
-public class DefaultMemberAccess implements MemberAccess
-{
- public boolean allowPrivateAccess = false;
- public boolean allowProtectedAccess = false;
- public boolean allowPackageProtectedAccess = false;
-
- /*===================================================================
- Constructors
- ===================================================================*/
- public DefaultMemberAccess(boolean allowAllAccess)
- {
- this(allowAllAccess, allowAllAccess, allowAllAccess);
- }
+public class DefaultMemberAccess implements MemberAccess {
+ public boolean allowPrivateAccess = false;
+ public boolean allowProtectedAccess = false;
+ public boolean allowPackageProtectedAccess = false;
+
+ /*===================================================================
+ Constructors
+ ===================================================================*/
+ public DefaultMemberAccess(boolean allowAllAccess) {
+ this(allowAllAccess, allowAllAccess, allowAllAccess);
+ }

- public DefaultMemberAccess(boolean allowPrivateAccess, boolean allowProtectedAccess, boolean allowPackageProtectedAccess)
- {
- super();
- this.allowPrivateAccess = allowPrivateAccess;
- this.allowProtectedAccess = allowProtectedAccess;
- this.allowPackageProtectedAccess = allowPackageProtectedAccess;
- }
+ public DefaultMemberAccess(boolean allowPrivateAccess, boolean allowProtectedAccess, boolean allowPackageProtectedAccess) {
+ super();
+ this.allowPrivateAccess = allowPrivateAccess;
+ this.allowProtectedAccess = allowProtectedAccess;
+ this.allowPackageProtectedAccess = allowPackageProtectedAccess;
+ }

- /*===================================================================
- Public methods
- ===================================================================*/
- public boolean getAllowPrivateAccess()
- {
- return allowPrivateAccess;
- }
+ /*===================================================================
+ Public methods
+ ===================================================================*/
+ public boolean getAllowPrivateAccess() {
+ return allowPrivateAccess;
+ }

- public void setAllowPrivateAccess(boolean value)
- {
- allowPrivateAccess = value;
- }
+ public void setAllowPrivateAccess(boolean value) {
+ allowPrivateAccess = value;
+ }

- public boolean getAllowProtectedAccess()
- {
- return allowProtectedAccess;
- }
+ public boolean getAllowProtectedAccess() {
+ return allowProtectedAccess;
+ }

- public void setAllowProtectedAccess(boolean value)
- {
- allowProtectedAccess = value;
- }
+ public void setAllowProtectedAccess(boolean value) {
+ allowProtectedAccess = value;
+ }

- public boolean getAllowPackageProtectedAccess()
- {
- return allowPackageProtectedAccess;
- }
+ public boolean getAllowPackageProtectedAccess() {
+ return allowPackageProtectedAccess;
+ }

- public void setAllowPackageProtectedAccess(boolean value)
- {
- allowPackageProtectedAccess = value;
- }
+ public void setAllowPackageProtectedAccess(boolean value) {
+ allowPackageProtectedAccess = value;
+ }

- /*===================================================================
- MemberAccess interface
- ===================================================================*/
- public Object setup(Map context, Object target, Member member, String propertyName)
- {
- Object result = null;
+ /*===================================================================
+ MemberAccess interface
+ ===================================================================*/
+ public Object setup(Map context, Object target, Member member, String propertyName) {
+ Object result = null;

if (isAccessible(context, target, member, propertyName)) {
- AccessibleObject accessible = (AccessibleObject)member;
+ AccessibleObject accessible = (AccessibleObject) member;

if (!accessible.isAccessible()) {
result = Boolean.TRUE;
@@ -82,33 +72,31 @@
return result;
}

- public void restore(Map context, Object target, Member member, String propertyName, Object state)
- {
+ public void restore(Map context, Object target, Member member, String propertyName, Object state) {
if (state != null) {
- ((AccessibleObject)member).setAccessible(((Boolean)state).booleanValue());
+ ((AccessibleObject) member).setAccessible(((Boolean) state).booleanValue());
}
}

/**
- Returns true if the given member is accessible or can be made accessible
- by this object.
+ * Returns true if the given member is accessible or can be made accessible
+ * by this object.
*/
- public boolean isAccessible(Map context, Object target, Member member, String propertyName)
- {
- int modifiers = member.getModifiers();
- boolean result = Modifier.isPublic(modifiers);
-
- if (!result) {
- if (Modifier.isPrivate(modifiers)) {
- result = getAllowPrivateAccess();
- } else {
- if (Modifier.isProtected(modifiers)) {
- result = getAllowProtectedAccess();
- } else {
- result = getAllowPackageProtectedAccess();
- }
- }
- }
- return result;
+ public boolean isAccessible(Map context, Object target, Member member, String propertyName) {
+ int modifiers = member.getModifiers();
+ boolean result = Modifier.isPublic(modifiers);
+
+ if (!result) {
+ if (Modifier.isPrivate(modifiers)) {
+ result = getAllowPrivateAccess();
+ } else {
+ if (Modifier.isProtected(modifiers)) {
+ result = getAllowProtectedAccess();
+ } else {
+ result = getAllowPackageProtectedAccess();
+ }
+ }
+ }
+ return result;
}
}

Modified: struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/reflection/Entry.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/reflection/Entry.java?rev=833846&r1=833845&r2=833846&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/reflection/Entry.java (original)
+++ struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/reflection/Entry.java Sun Nov 8 08:18:59 2009
@@ -9,21 +9,19 @@
Class key;
Object value;

- public Entry(Class key, Object value)
- {
+ public Entry(Class key, Object value) {
this.key = key;
this.value = value;
}

- public String toString()
- {
+ public String toString() {
return "Entry[" +
- "next=" + next +
- '\n' +
- ", key=" + key +
- '\n' +
- ", value=" + value +
- '\n' +
- ']';
+ "next=" + next +
+ '\n' +
+ ", key=" + key +
+ '\n' +
+ ", value=" + value +
+ '\n' +
+ ']';
}
}
\ No newline at end of file

Modified: struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/reflection/MemberAccess.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/reflection/MemberAccess.java?rev=833846&r1=833845&r2=833846&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/reflection/MemberAccess.java (original)
+++ struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/reflection/MemberAccess.java Sun Nov 8 08:18:59 2009
@@ -1,26 +1,25 @@
package org.apache.struts2.uelplugin.reflection;

-import java.util.Map;
import java.lang.reflect.Member;
+import java.util.Map;

/**
* Taken from OGNL
*/
-public interface MemberAccess
-{
+public interface MemberAccess {
/**
- Sets the member up for accessibility
+ * Sets the member up for accessibility
*/
public Object setup(Map context, Object target, Member member, String propertyName);

/**
- Restores the member from the previous setup call.
+ * Restores the member from the previous setup call.
*/
public void restore(Map context, Object target, Member member, String propertyName, Object state);

/**
- Returns true if the given member is accessible or can be made accessible
- by this object.
+ * Returns true if the given member is accessible or can be made accessible
+ * by this object.
*/
- public boolean isAccessible(Map context, Object target, Member member, String propertyName);
+ public boolean isAccessible(Map context, Object target, Member member, String propertyName);
}

Modified: struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/reflection/ObjectIndexedPropertyDescriptor.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/reflection/ObjectIndexedPropertyDescriptor.java?rev=833846&r1=833845&r2=833846&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/reflection/ObjectIndexedPropertyDescriptor.java (original)
+++ struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/reflection/ObjectIndexedPropertyDescriptor.java Sun Nov 8 08:18:59 2009
@@ -1,38 +1,33 @@
package org.apache.struts2.uelplugin.reflection;

-import java.beans.PropertyDescriptor;
import java.beans.IntrospectionException;
+import java.beans.PropertyDescriptor;
import java.lang.reflect.Method;

/**
* Taken from OGNL
*/
-public class ObjectIndexedPropertyDescriptor extends PropertyDescriptor
-{
+public class ObjectIndexedPropertyDescriptor extends PropertyDescriptor {
private Method indexedReadMethod;
- private Method indexedWriteMethod;
- private Class propertyType;
+ private Method indexedWriteMethod;
+ private Class propertyType;

- public ObjectIndexedPropertyDescriptor(String propertyName, Class propertyType, Method indexedReadMethod, Method indexedWriteMethod) throws IntrospectionException
- {
+ public ObjectIndexedPropertyDescriptor(String propertyName, Class propertyType, Method indexedReadMethod, Method indexedWriteMethod) throws IntrospectionException {
super(propertyName, null, null);
this.propertyType = propertyType;
this.indexedReadMethod = indexedReadMethod;
this.indexedWriteMethod = indexedWriteMethod;
}

- public Method getIndexedReadMethod()
- {
+ public Method getIndexedReadMethod() {
return indexedReadMethod;
}

- public Method getIndexedWriteMethod()
- {
+ public Method getIndexedWriteMethod() {
return indexedWriteMethod;
}

- public Class getPropertyType()
- {
+ public Class getPropertyType() {
return propertyType;
}
}

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=833846&r1=833845&r2=833846&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 Sun Nov 8 08:18:59 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.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"/>

<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/uelplugin/AbstractUELTest.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/AbstractUELTest.java?rev=833846&r1=833845&r2=833846&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/AbstractUELTest.java (original)
+++ struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/AbstractUELTest.java Sun Nov 8 08:18:59 2009
@@ -1,26 +1,26 @@
package org.apache.struts2.uelplugin;

-import com.opensymphony.xwork2.XWorkTestCase;
import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.XWorkTestCase;
+import com.opensymphony.xwork2.config.ConfigurationException;
+import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
import com.opensymphony.xwork2.inject.ContainerBuilder;
import com.opensymphony.xwork2.test.StubConfigurationProvider;
-import com.opensymphony.xwork2.config.ConfigurationException;
import com.opensymphony.xwork2.util.CompoundRoot;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.ValueStackFactory;
import com.opensymphony.xwork2.util.location.LocatableProperties;
import com.opensymphony.xwork2.util.reflection.ReflectionProvider;
-import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
-import org.springframework.mock.web.MockServletContext;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.uelplugin.reflection.GenericReflectionProvider;
import org.apache.struts2.util.StrutsTypeConverter;
+import org.springframework.mock.web.MockServletContext;

-import javax.servlet.ServletContextEvent;
import javax.el.ExpressionFactory;
-import java.util.Map;
-import java.text.ParseException;
+import javax.servlet.ServletContextEvent;
import java.text.DateFormat;
+import java.text.ParseException;
+import java.util.Map;

public abstract class AbstractUELTest extends XWorkTestCase {

Modified: struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/BuiltinFunctionsTest.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/BuiltinFunctionsTest.java?rev=833846&r1=833845&r2=833846&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/BuiltinFunctionsTest.java (original)
+++ struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/BuiltinFunctionsTest.java Sun Nov 8 08:18:59 2009
@@ -1,9 +1,9 @@
package org.apache.struts2.uelplugin;

-import java.lang.reflect.InvocationTargetException;
-
import org.apache.struts2.views.util.ContextUtil;

+import java.lang.reflect.InvocationTargetException;
+

public class BuiltinFunctionsTest extends AbstractUELTest {
public void testGetText() throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {

Modified: struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/TestAction.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/TestAction.java?rev=833846&r1=833845&r2=833846&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/TestAction.java (original)
+++ struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/TestAction.java Sun Nov 8 08:18:59 2009
@@ -2,8 +2,6 @@

import com.opensymphony.xwork2.ActionSupport;
import com.opensymphony.xwork2.conversion.annotations.Conversion;
-import com.opensymphony.xwork2.conversion.annotations.ConversionType;
-import com.opensymphony.xwork2.conversion.annotations.TypeConversion;

@Conversion
public class TestAction extends ActionSupport {

Modified: struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/TestObject.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/TestObject.java?rev=833846&r1=833845&r2=833846&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/TestObject.java (original)
+++ struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/TestObject.java Sun Nov 8 08:18:59 2009
@@ -1,8 +1,8 @@
package org.apache.struts2.uelplugin;

import java.util.Date;
-import java.util.Map;
import java.util.List;
+import java.util.Map;
import java.util.Set;

@@ -23,6 +23,11 @@
private Set set;

private ChildTestAction childTestAction;
+ private boolean invoked;
+
+ public boolean wasInvoked() {
+ return invoked;
+ }

public ChildTestAction getChildTestAction() {
return childTestAction;
@@ -32,6 +37,10 @@
this.childTestAction = childTestAction;
}

+ public void invoke() {
+ this.invoked = true;
+ }
+
public Object getFail() {
throw new RuntimeException("kaboom");
}

Modified: struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/UELMethodInvocationTest.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/UELMethodInvocationTest.java?rev=833846&r1=833845&r2=833846&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/UELMethodInvocationTest.java (original)
+++ struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/UELMethodInvocationTest.java Sun Nov 8 08:18:59 2009
@@ -20,7 +20,7 @@
assertEquals("Lex Luthor", stack.findValue("${#s0.concat(' ').concat(#s1)}"));
}

- public void testCallMethodsOnCompundRoot() {
+ public void testCallMethodsOnCompundRoot() {
//this shuld not fail as the property is defined on a parent class
TestObject obj = new TestObject();
root.push(obj);

Modified: struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/UELStackReadValueTest.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/UELStackReadValueTest.java?rev=833846&r1=833845&r2=833846&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/UELStackReadValueTest.java (original)
+++ struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/UELStackReadValueTest.java Sun Nov 8 08:18:59 2009
@@ -9,7 +9,7 @@
TestObject obj = new TestObject();
obj.setValue("0");
root.push(obj);
-
+
obj = new TestObject();
obj.setValue("1");
root.push(obj);

Modified: struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/UELStackSetValueTest.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/UELStackSetValueTest.java?rev=833846&r1=833845&r2=833846&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/UELStackSetValueTest.java (original)
+++ struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/UELStackSetValueTest.java Sun Nov 8 08:18:59 2009
@@ -2,8 +2,8 @@

import com.opensymphony.xwork2.util.reflection.ReflectionContextState;

-import java.util.*;
import java.lang.reflect.InvocationTargetException;
+import java.util.*;

public class UELStackSetValueTest extends AbstractUELTest {
@@ -46,6 +46,13 @@
stack.setValue("typedList[1].value", "val");
assertEquals(2, obj.getTypedList().size());
assertEquals("val", obj.getTypedList().get(1).getValue());
+
+ //context ref
+ list = new ArrayList();
+ stack.getContext().put("theTypedList", list);
+ stack.setValue("#theTypedList[0]", "val");
+ assertEquals(1, list.size());
+ assertEquals("val", list.get(0));
}

public void testWriteArray() throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
@@ -85,6 +92,13 @@
stack.setValue("typedMap[1].value", "val");
assertEquals(1, obj.getTypedMap().size());
assertEquals("val", obj.getTypedMap().get(1).getValue());
+
+ //context ref
+ map = new HashMap();
+ stack.getContext().put("themap", map);
+ stack.setValue("#themap['str']", "val");
+ assertEquals(1, map.size());
+ assertEquals("val", map.get("str"));
}

public void testSetPropertiesOnNestedNullObject() {

Modified: struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/UELValueStackOtherTests.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/UELValueStackOtherTests.java?rev=833846&r1=833845&r2=833846&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/UELValueStackOtherTests.java (original)
+++ struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/UELValueStackOtherTests.java Sun Nov 8 08:18:59 2009
@@ -1,10 +1,10 @@
package org.apache.struts2.uelplugin;

-import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.conversion.impl.XWorkConverter;

-import java.util.Map;
import java.util.LinkedHashMap;
+import java.util.Map;

public class UELValueStackOtherTests extends AbstractUELTest {
@@ -56,7 +56,7 @@
}
}

- public void testFailsOnMissingNestedPropertyWithThrowException() {
+ public void testFailsOnMissingNestedPropertyWithThrowException() {
TestObject obj = new TestObject();
root.push(obj);
try {
@@ -123,7 +123,7 @@
}
}

- public void testPrimitiveSettingWithInvalidValueAddsFieldErrorInNonDevMode() {
+ public void testPrimitiveSettingWithInvalidValueAddsFieldErrorInNonDevMode() {
TestAction action = new TestAction();
stack.getContext().put(XWorkConverter.REPORT_CONVERSION_ERRORS, Boolean.TRUE);
stack.setDevMode("false");
@@ -134,7 +134,7 @@
assertTrue(conversionErrors.containsKey("bar"));
}

- public void testPrimitiveSettingWithInvalidValueAddsFieldErrorInDevMode() {
+ public void testPrimitiveSettingWithInvalidValueAddsFieldErrorInDevMode() {
TestAction action = new TestAction();
stack.getContext().put(XWorkConverter.REPORT_CONVERSION_ERRORS, Boolean.TRUE);
stack.setDevMode("true");

Added: struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/VulnerabilityTest.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/VulnerabilityTest.java?rev=833846&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/VulnerabilityTest.java (added)
+++ struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/VulnerabilityTest.java Sun Nov 8 08:18:59 2009
@@ -0,0 +1,80 @@
+package org.apache.struts2.uelplugin;
+
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.util.CompoundRoot;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.reflection.ReflectionContextState;
+import org.apache.struts2.StrutsTestCase;
+
+import javax.servlet.ServletContextEvent;
+import java.util.HashMap;
+import java.util.Map;
+
+public class VulnerabilityTest extends StrutsTestCase {
+
+ public void testMethodsAreNotInvokedUnlessDenyMethodExecutionIsTrue() {
+ CompoundRoot root = new CompoundRoot();
+ ValueStack stack = new UELValueStack(container);
+ TestObject obj = new TestObject();
+ root.push(obj);
+
+ Map contextMap = stack.getContext();
+ ReflectionContextState.setCreatingNullObjects(contextMap, true);
+ ReflectionContextState.setDenyMethodExecution(contextMap, true);
+ ReflectionContextState.setReportingConversionErrors(contextMap, true);
+
+ //simple
+ stack.findValue("top.invoke()");
+ assertFalse(obj.wasInvoked());
+
+ //nested
+ TestObject nested = new TestObject();
+ obj.setInner(nested);
+ stack.findValue("top.inner.invoke()");
+ assertFalse(nested.wasInvoked());
+ }
+
+ public void testParametersDoesNotAffectSession() throws Exception {
+ HashMap<String, Object> session = new HashMap<String, Object>();
+ ValueStack stack = ActionContext.getContext().getValueStack();
+ stack.getContext().put("session", session);
+ assertSame(session, stack.findValue("#session"));
+
+ //make sure that values can tb set in session
+ stack.setValue("#session['clean']", "clean");
+ assertEquals("clean", stack.findValue("#session['clean']"));
+
+ Map<String, Object> params = new HashMap<String, Object>();
+ params.put("bar", "123");
+ params.put("#session.foo", "Foo");
+ params.put("\u0023session[\'user\']", "0wn3d");
+ params.put("\\u0023session[\'user\']", "0wn3d");
+ params.put("\u0023session.user2", "0wn3d");
+ params.put("\\u0023session.user2", "0wn3d");
+ params.put("('\u0023'%20%2b%20'session[\'user3\']')(unused)", "0wn3d");
+ params.put("('\\u0023' + 'session[\\'user4\\']')(unused)", "0wn3d");
+ params.put("('\u0023'%2b'session[\'user5\']')(unused)", "0wn3d");
+ params.put("('\\u0023'%2b'session[\'user5\']')(unused)", "0wn3d");
+ request.setParameters(params);
+
+ executeAction("/test/test.action");
+
+ assertEquals(123, findValueAfterExecute("top.bar"));
+ assertNull(session.get("foo"));
+ assertNull(session.get("user"));
+ assertNull(session.get("user2"));
+ assertNull(session.get("user3"));
+ assertNull(session.get("user4"));
+ assertNull(session.get("user5"));
+ }
+
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+
+ //simulate start up
+ UELServletContextListener listener = new UELServletContextListener();
+ listener.contextInitialized(new ServletContextEvent(servletContext));
+ }
+}

Added: 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=833846&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-uel-plugin/src/test/resources/struts.xml (added)
+++ struts/sandbox/trunk/struts2-uel-plugin/src/test/resources/struts.xml Sun Nov 8 08:18:59 2009
@@ -0,0 +1,10 @@
+<!DOCTYPE struts PUBLIC
+ "-//Apache Software Foundation//DTD Struts Configuration 2.1.7//EN"
+ "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">
+ <result>something.jsp</result>
+ </action>
+ </package>
+</struts>
\ No newline at end of file

[CONF] Confluence Changes in the last 24 hours

2009-11-07T16:01:00Z

This is a daily summary of all recent changes in Confluence.

---------------------------------------------------------------------
Updated Spaces:
---------------------------------------------------------------------

Apache Directory Studio (http://cwiki.apache.org/confluence/display/DIRxSTUDIO)

Pages
---------------------------------------------------------------------
ACI Editor Plugin edited by seelmann (10:07 PM)
http://cwiki.apache.org/confluence/display/DIRxSTUDIO/ACI+Editor+Plugin

Index edited by seelmann (10:04 PM)
http://cwiki.apache.org/confluence/display/DIRxSTUDIO/Index

Features edited by seelmann (10:03 PM)
http://cwiki.apache.org/confluence/display/DIRxSTUDIO/Features

ApacheDS Configuration Plugin edited by seelmann (09:58 PM)
http://cwiki.apache.org/confluence/display/DIRxSTUDIO/ApacheDS+Configuration+Plugin

Apache Directory Studio 1.0.0 released edited by seelmann (09:58 PM)
http://cwiki.apache.org/confluence/display/DIRxSTUDIO/2007/09/04/Apache+Directory+Studio+1.0.0+released

LDAP Studio 0.8.0 released edited by seelmann (09:58 PM)
http://cwiki.apache.org/confluence/display/DIRxSTUDIO/2007/05/04/LDAP+Studio+0.8.0+released

Schema Editor Plugin edited by seelmann (09:53 PM)
http://cwiki.apache.org/confluence/display/DIRxSTUDIO/Schema+Editor+Plugin

LDAP Browser Plugin edited by seelmann (09:49 PM)
http://cwiki.apache.org/confluence/display/DIRxSTUDIO/LDAP+Browser+Plugin

LDIF Editor Plugin edited by seelmann (09:48 PM)
http://cwiki.apache.org/confluence/display/DIRxSTUDIO/LDIF+Editor+Plugin

Screenshots edited by seelmann (09:31 PM)
http://cwiki.apache.org/confluence/display/DIRxSTUDIO/Screenshots

ApacheDS Plugin edited by seelmann (08:47 PM)
http://cwiki.apache.org/confluence/display/DIRxSTUDIO/ApacheDS+Plugin

Source repository edited by seelmann (02:08 PM)
http://cwiki.apache.org/confluence/display/DIRxSTUDIO/Source+repository

Studio Plugin Source Repository created by seelmann (02:04 PM)
http://cwiki.apache.org/confluence/display/DIRxSTUDIO/Studio+Plugin+Source+Repository

Developer's Guide edited by seelmann (02:00 PM)
http://cwiki.apache.org/confluence/display/DIRxSTUDIO/Developer%27s+Guide

ChangeLog edited by seelmann (11:47 AM)
http://cwiki.apache.org/confluence/display/DIRxSTUDIO/ChangeLog

Apache Geronimo v2.2 (http://cwiki.apache.org/confluence/display/GMOxDOC22)

Pages
---------------------------------------------------------------------
Substituting one module with another edited by chirunhua@... (02:35 AM)
http://cwiki.apache.org/confluence/display/GMOxDOC22/Substituting+one+module+with+another

Apache Lucene Mahout (http://cwiki.apache.org/confluence/display/MAHOUT)

Pages
---------------------------------------------------------------------
ClusteringYourData edited by drew.farris (03:13 AM)
http://cwiki.apache.org/confluence/display/MAHOUT/ClusteringYourData

k-means-commandline created by drew.farris (03:03 AM)
http://cwiki.apache.org/confluence/display/MAHOUT/k-means-commandline

Apache Maven (http://cwiki.apache.org/confluence/display/MAVEN)

Pages
---------------------------------------------------------------------
InternalErrorException created by bentmann (06:01 PM)
http://cwiki.apache.org/confluence/display/MAVEN/InternalErrorException

Apache Open Relevance (http://cwiki.apache.org/confluence/display/ORP)

Pages
---------------------------------------------------------------------
ExistingCollections created by rcmuir (08:29 AM)
http://cwiki.apache.org/confluence/display/ORP/ExistingCollections

Apache Sling (http://cwiki.apache.org/confluence/display/SLING)

Pages
---------------------------------------------------------------------
FAQ edited by fmeschbe (01:01 AM)
http://cwiki.apache.org/confluence/display/SLING/FAQ

Apache Wicket (http://cwiki.apache.org/confluence/display/WICKET)

Pages
---------------------------------------------------------------------
Wicket and localized URLs edited by jo@... (04:26 PM)
http://cwiki.apache.org/confluence/display/WICKET/Wicket+and+localized+URLs

Change your notification preferences: http://cwiki.apache.org/confluence/users/viewnotifications.action

svn commit: r833776 - in /struts/sandbox/trunk/struts2-uel-plugin/src: main/java/org/apache/struts2/uelplugin/ main/java/org/apache/struts2/uelplugin/contextlistener/ main/java/org/apache/struts2/uelplugin/elresolvers/ main/resources/ test/java/org/apa...

2009-11-07T15:14:32Z

Author: musachy
Date: Sat Nov 7 23:14:32 2009
New Revision: 833776

URL: http://svn.apache.org/viewvc?rev=833776&view=rev
Log:
rename classes, add more tests

Added:
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/uelplugin/UELServletContextListener.java
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/uelplugin/UELValueStackFactory.java
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/AbstractUELTest.java
- copied, changed from r833650, struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/AbstractUelBaseTest.java
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/ChildTestAction.java
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/UELMethodInvocationTest.java
- copied, changed from r833650, struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/JuelMethodInvocationTest.java
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/UELStackReadValueTest.java
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/UELStackSetValueTest.java
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/UELValueStackOtherTests.java
Removed:
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/contextlistener/
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/AbstractUelBaseTest.java
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/JuelMethodInvocationTest.java
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/ParametersTest.java
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/UelTest.java
Modified:
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/CompoundRootELResolver.java
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/XWorkBeanELResolver.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/uelplugin/BuiltinFunctionsTest.java
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/TestAction.java
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/TestObject.java

Added: 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/uelplugin/UELReflectionContextFactory.java?rev=833776&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/UELReflectionContextFactory.java (added)
+++ struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/UELReflectionContextFactory.java Sat Nov 7 23:14:32 2009
@@ -0,0 +1,15 @@
+package org.apache.struts2.uelplugin;
+
+import com.opensymphony.xwork2.util.reflection.ReflectionContextFactory;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * ReflectionContextFactory for Unified EL.
+ */
+public class UELReflectionContextFactory implements ReflectionContextFactory {
+ public Map createDefaultContext(Object root) {
+ return new HashMap();
+ }
+}

Added: 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/uelplugin/UELServletContextListener.java?rev=833776&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/UELServletContextListener.java (added)
+++ struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/UELServletContextListener.java Sat Nov 7 23:14:32 2009
@@ -0,0 +1,33 @@
+package org.apache.struts2.uelplugin;
+
+import de.odysseus.el.ExpressionFactoryImpl;
+import de.odysseus.el.tree.TreeBuilder;
+
+import javax.el.ExpressionFactory;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import java.util.Properties;
+
+import org.apache.struts2.uelplugin.ExpressionFactoryHolder;
+
+/**
+ * Responsible for creating the ExpressionFactory that will be used by the
+ * UelValueStack
+ */
+public class UELServletContextListener implements ServletContextListener {
+ public void contextInitialized(ServletContextEvent contextEvent) {
+ Properties juelProperties = new Properties();
+ juelProperties.setProperty("javax.el.methodInvocations", "true");
+
+ //custom parser
+ juelProperties.setProperty(TreeBuilder.class.getName(), JUELExtensionBuilder.class.getName());
+
+ ExpressionFactory factory = new ExpressionFactoryImpl(juelProperties);
+
+ ExpressionFactoryHolder.setExpressionFactory(factory);
+ }
+
+ public void contextDestroyed(ServletContextEvent contextEvent) {
+ }
+}

Added: 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/uelplugin/UELValueStack.java?rev=833776&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/UELValueStack.java (added)
+++ struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/UELValueStack.java Sat Nov 7 23:14:32 2009
@@ -0,0 +1,229 @@
+package org.apache.struts2.uelplugin;
+
+import com.opensymphony.xwork2.XWorkException;
+import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
+import com.opensymphony.xwork2.inject.Container;
+import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.util.ClearableValueStack;
+import com.opensymphony.xwork2.util.CompoundRoot;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.uelplugin.elresolvers.AccessorsContextKey;
+
+import javax.el.ELContext;
+import javax.el.ExpressionFactory;
+import javax.el.PropertyNotFoundException;
+import javax.el.ValueExpression;
+import java.util.Map;
+import java.util.TreeMap;
+import java.io.Serializable;
+
+/**
+ * A ValueStack that uses Unified EL as the underlying Expression Language.
+ */
+public class UELValueStack implements ValueStack, ClearableValueStack, Serializable {
+ private static final Logger LOG = LoggerFactory.getLogger(UELValueStack.class);
+
+ private CompoundRoot root = new CompoundRoot();
+ private transient Map context;
+ private Class defaultType;
+ private Map overrides;
+
+ private ELContext elContext;
+ private Container container;
+ private XWorkConverter xworkConverter;
+
+ private boolean logMissingProperties;
+ private boolean devMode;
+
+ public UELValueStack(Container container) {
+ this(container, new CompoundRoot());
+ }
+
+ public UELValueStack(Container container, ValueStack vs) {
+ this(container, new CompoundRoot(vs.getRoot()));
+ }
+
+ public UELValueStack(Container container, CompoundRoot root) {
+ this.container = container;
+ this.xworkConverter = container.getInstance(XWorkConverter.class);
+ setRoot(new CompoundRoot(root));
+ }
+
+ @Inject("devMode")
+ public void setDevMode(String mode) {
+ devMode = "true".equalsIgnoreCase(mode);
+ }
+
+ @Inject(value = "logMissingProperties", required = false)
+ public void setLogMissingProperties(String logMissingProperties) {
+ this.logMissingProperties = "true".equalsIgnoreCase(logMissingProperties);
+ }
+
+ public String findString(String expr, boolean throwException) {
+ return (String) findValue(expr, String.class);
+ }
+
+ public String findString(String expr) {
+ return findString(expr, false);
+ }
+
+ public Object findValue(String expr) {
+ return findValue(expr, Object.class, false);
+ }
+
+ public Object findValue(String expr, boolean throwException) {
+ return findValue(expr, Object.class, throwException);
+ }
+
+ public Object findValue(String expr, Class asType) {
+ return findValue(expr, asType, false);
+ }
+
+ public Object findValue(String expr, Class asType, boolean throwException) {
+ String originalExpression = expr;
+ try {
+ if ((overrides != null) && overrides.containsKey(expr)) {
+ expr = (String) overrides.get(expr);
+ }
+ if (expr != null && expr.startsWith("%{")) {
+ // replace %{ with ${
+ expr = "#" + expr.substring(1);
+ }
+ if (expr != null && !expr.startsWith("${") && !expr.startsWith("#{")) {
+ expr = "#{" + expr + "}";
+ }
+
+ elContext.putContext(AccessorsContextKey.class, context);
+ elContext.putContext(XWorkConverter.class, xworkConverter);
+ elContext.putContext(CompoundRoot.class, root);
+
+ // parse our expression
+ ExpressionFactory factory = getExpressionFactory();
+ ValueExpression valueExpr = factory.createValueExpression(elContext, expr, Object.class);
+ Object retVal = valueExpr.getValue(elContext);
+ if (!Object.class.equals(asType)) {
+ retVal = xworkConverter.convertValue(context, root, null, null, retVal, asType);
+ }
+ return retVal;
+ } catch (Exception e) {
+ return handleException(e, originalExpression, throwException);
+ }
+ }
+
+ private Object handleException(Exception exception, String expression, boolean throwException) {
+ Object ret = context.get(expression);
+
+ if (ret != null)
+ return ret;
+ else {
+ if (exception instanceof PropertyNotFoundException && devMode && logMissingProperties)
+ LOG.warn(exception.getMessage());
+
+ if (throwException)
+ throw new XWorkException(exception);
+ else
+ return null;
+ }
+
+ }
+
+ protected ExpressionFactory getExpressionFactory() {
+ ExpressionFactory factory = ExpressionFactoryHolder.getExpressionFactory();
+ if (factory == null) {
+ String message = "********** FATAL ERROR STARTING UP STRUTS-UEL INTEGRATION **********\n" +
+ "Looks like the UEL listener was not configured for your web app! \n" +
+ "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>";
+ LOG.fatal(message);
+ throw new IllegalStateException("Unable to find ExpressionFactory instance. Make sure that 'UELServletContextListener' " +
+ "is configured in web.xml as a listener");
+ } else
+ return factory;
+ }
+
+ public Map getContext() {
+ return context;
+ }
+
+ public Map getExprOverrides() {
+ return overrides;
+ }
+
+ public CompoundRoot getRoot() {
+ return root;
+ }
+
+ public Object peek() {
+ return root.peek();
+ }
+
+ public Object pop() {
+ return root.pop();
+ }
+
+ public void push(Object o) {
+ root.push(o);
+ }
+
+ public void setDefaultType(Class defaultType) {
+ this.defaultType = defaultType;
+ }
+
+ public void setExprOverrides(Map overrides) {
+ if (this.overrides == null) {
+ this.overrides = overrides;
+ } else {
+ this.overrides.putAll(overrides);
+ }
+ }
+
+ public void set(String key, Object o) {
+ overrides.put(key, o);
+ }
+
+ public void setValue(String expr, Object value) {
+ setValue(expr, value, false);
+ }
+
+ public void setValue(String expr, Object value, boolean throwExceptionOnFailure) {
+ try {
+ if (expr != null && !expr.startsWith("${") && !expr.startsWith("#{")) {
+ expr = "#{" + expr + "}";
+ }
+ elContext.putContext(AccessorsContextKey.class, context);
+ elContext.putContext(XWorkConverter.class, xworkConverter);
+ elContext.putContext(CompoundRoot.class, root);
+
+ // parse our expression
+ ExpressionFactory factory = getExpressionFactory();
+ ValueExpression valueExpr = factory.createValueExpression(elContext, expr, Object.class);
+ valueExpr.setValue(elContext, value);
+ } catch (Exception e) {
+ if (e instanceof PropertyNotFoundException && devMode && logMissingProperties)
+ LOG.warn("Could not find property [" + ((PropertyNotFoundException) e).getMessage() + "]");
+
+ if (throwExceptionOnFailure)
+ throw new XWorkException(e);
+ }
+ }
+
+ public int size() {
+ return root.size();
+ }
+
+ protected void setRoot(CompoundRoot root) {
+ this.context = new TreeMap();
+ context.put(VALUE_STACK, this);
+ this.root = root;
+ elContext = new CompoundRootELContext(container);
+ }
+
+ public void clearContextValues() {
+ getContext().clear();
+ }
+}

Added: 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/uelplugin/UELValueStackFactory.java?rev=833776&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/UELValueStackFactory.java (added)
+++ struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/UELValueStackFactory.java Sat Nov 7 23:14:32 2009
@@ -0,0 +1,45 @@
+package org.apache.struts2.uelplugin;
+
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
+import com.opensymphony.xwork2.inject.Container;
+import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStackFactory;
+
+import javax.el.ExpressionFactory;
+
+/**
+ * Creates UelValueStacks.
+ */
+public class UELValueStackFactory implements ValueStackFactory {
+ private ExpressionFactory factory;
+
+ private XWorkConverter xworkConverter;
+
+ private Container container;
+
+ @Inject
+ public void setXWorkConverter(XWorkConverter conv) {
+ this.xworkConverter = conv;
+ }
+
+ @Inject
+ public void setContainer(Container container) throws ClassNotFoundException {
+ this.container = container;
+ }
+
+
+ public ValueStack createValueStack() {
+ ValueStack results = new UELValueStack(container);
+ results.getContext().put(ActionContext.CONTAINER, container);
+ return results;
+ }
+
+ public ValueStack createValueStack(ValueStack stack) {
+ ValueStack results = new UELValueStack(container, stack);
+ container.inject(results);
+ results.getContext().put(ActionContext.CONTAINER, container);
+ return results;
+ }
+}

Modified: struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/CompoundRootELResolver.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/CompoundRootELResolver.java?rev=833776&r1=833775&r2=833776&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/CompoundRootELResolver.java (original)
+++ struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/CompoundRootELResolver.java Sat Nov 7 23:14:32 2009
@@ -1,7 +1,6 @@
package org.apache.struts2.uelplugin.elresolvers;

import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
-import com.opensymphony.xwork2.conversion.NullHandler;
import com.opensymphony.xwork2.util.CompoundRoot;
import com.opensymphony.xwork2.util.reflection.ReflectionContextState;
import com.opensymphony.xwork2.inject.Container;
@@ -10,14 +9,7 @@
import org.apache.commons.lang.xwork.StringUtils;

import javax.el.ELContext;
-import javax.el.ELResolver;
-import java.beans.BeanInfo;
-import java.beans.FeatureDescriptor;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Iterator;
import java.util.Map;

/**
@@ -31,8 +23,8 @@
}

@Override
- public Object getValue(ELContext context, Object base, Object property) {
- if (context == null) {
+ public Object getValue(ELContext elContext, Object base, Object property) {
+ if (elContext == null) {
throw new IllegalArgumentException("ElContext cannot be null");
}

@@ -46,16 +38,17 @@
return null;
}

- CompoundRoot root = (CompoundRoot) context.getContext(CompoundRoot.class);
+ CompoundRoot root = (CompoundRoot) elContext.getContext(CompoundRoot.class);
if (root == null) {
return null;
}

if ("top".equals(propertyName) && root.size() > 0) {
+ elContext.setPropertyResolved(true);
return root.get(0);
}

- Map<String, Object> reflectionContext = (Map) context.getContext(AccessorsContextKey.class);
+ Map<String, Object> reflectionContext = (Map) elContext.getContext(AccessorsContextKey.class);

Object bean = findObjectForProperty(root, propertyName);
if (bean != null) {
@@ -70,10 +63,10 @@
reflectionProvider.setValue(propertyName, reflectionContext, bean, retVal);
}

- context.setPropertyResolved(true);
+ elContext.setPropertyResolved(true);
return retVal;
}
-
+
return null;
}

@@ -93,15 +86,20 @@
}

CompoundRoot root = (CompoundRoot) context.getContext(CompoundRoot.class);
+ Map<String, Object> reflectionContext = (Map) context.getContext(AccessorsContextKey.class);
String propertyName = (String) property;
try {
if (base == null && property != null && root != null) {
Object bean = findObjectForProperty(root, propertyName);
if (bean != null) {
+ reflectionContext.put(XWorkConverter.LAST_BEAN_CLASS_ACCESSED, bean.getClass());
+ reflectionContext.put(XWorkConverter.LAST_BEAN_PROPERTY_ACCESSED, propertyName);
+
+
XWorkConverter converter = (XWorkConverter) context.getContext(XWorkConverter.class);
if (converter != null && root != null) {
Class propType = determineType(bean, propertyName);
- value = converter.convertValue(null, value, propType);
+ value = converter.convertValue(reflectionContext, bean, null, propertyName, value, propType);
}
BeanUtils.setProperty(bean, propertyName, value);
context.setPropertyResolved(true);

Modified: struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/XWorkBeanELResolver.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/XWorkBeanELResolver.java?rev=833776&r1=833775&r2=833776&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/XWorkBeanELResolver.java (original)
+++ struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/XWorkBeanELResolver.java Sat Nov 7 23:14:32 2009
@@ -18,14 +18,15 @@
if (target != null && property != null) {
Map<String, Object> reflectionContext = (Map<String, Object>) elContext.getContext(AccessorsContextKey.class);
String propertyName = property.toString();
+ Class targetType = target.getClass();

//only handle this if there is such a property
if (PropertyUtils.isReadable(target, propertyName)) {
try {
Object obj = reflectionProvider.getValue(propertyName, reflectionContext, target);

- reflectionContext.put(XWorkConverter.LAST_BEAN_CLASS_ACCESSED, target.getClass());
- reflectionContext.put(XWorkConverter.LAST_BEAN_PROPERTY_ACCESSED, property.toString());
+ reflectionContext.put(XWorkConverter.LAST_BEAN_CLASS_ACCESSED, targetType);
+ reflectionContext.put(XWorkConverter.LAST_BEAN_PROPERTY_ACCESSED, propertyName);

//if object is null, and create objects is enabled, lets do it
if (obj == null && ReflectionContextState.isCreatingNullObjects(reflectionContext)) {

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=833776&r1=833775&r2=833776&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 Sat Nov 7 23:14:32 2009
@@ -6,11 +6,11 @@

<struts>
<bean type="com.opensymphony.xwork2.util.ValueStackFactory" name="uel"
- class="org.apache.struts2.uelplugin.UelValueStackFactory"/>
+ 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"/>
+ class="org.apache.struts2.uelplugin.UELReflectionContextFactory"/>

<constant name="struts.valueStackFactory" value="uel"/>
<constant name="struts.reflectionProvider" value="uel"/>

Copied: struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/AbstractUELTest.java (from r833650, struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/AbstractUelBaseTest.java)
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/AbstractUELTest.java?p2=struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/AbstractUELTest.java&p1=struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/AbstractUelBaseTest.java&r1=833650&r2=833776&rev=833776&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/AbstractUelBaseTest.java (original)
+++ struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/AbstractUELTest.java Sat Nov 7 23:14:32 2009
@@ -2,19 +2,12 @@

import com.opensymphony.xwork2.XWorkTestCase;
import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionProxyFactory;
import com.opensymphony.xwork2.inject.ContainerBuilder;
-import com.opensymphony.xwork2.inject.Factory;
-import com.opensymphony.xwork2.inject.Context;
-import com.opensymphony.xwork2.inject.Scope;
import com.opensymphony.xwork2.test.StubConfigurationProvider;
-import com.opensymphony.xwork2.config.ConfigurationManager;
-import com.opensymphony.xwork2.config.Configuration;
import com.opensymphony.xwork2.config.ConfigurationException;
import com.opensymphony.xwork2.util.CompoundRoot;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.ValueStackFactory;
-import com.opensymphony.xwork2.util.LocalizedTextUtil;
import com.opensymphony.xwork2.util.location.LocatableProperties;
import com.opensymphony.xwork2.util.reflection.ReflectionProvider;
import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
@@ -22,7 +15,6 @@
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.uelplugin.reflection.GenericReflectionProvider;
import org.apache.struts2.util.StrutsTypeConverter;
-import org.apache.commons.beanutils.converters.DateConverter;

import javax.servlet.ServletContextEvent;
import javax.el.ExpressionFactory;
@@ -31,11 +23,11 @@
import java.text.DateFormat;

-public abstract class AbstractUelBaseTest extends XWorkTestCase {
+public abstract class AbstractUELTest extends XWorkTestCase {
private ExpressionFactory factory = ExpressionFactory.newInstance();
protected XWorkConverter converter;
protected CompoundRoot root;
- protected UelValueStack stack;
+ protected UELValueStack stack;
protected DateFormat format = DateFormat.getDateInstance();
protected ReflectionProvider reflectionProvider;

@@ -63,8 +55,8 @@

loadConfigurationProviders(new StubConfigurationProvider() {
public void register(ContainerBuilder builder, LocatableProperties props) throws ConfigurationException {
- builder.factory(ValueStack.class, UelValueStack.class);
- builder.factory(ValueStackFactory.class, UelValueStackFactory.class);
+ builder.factory(ValueStack.class, UELValueStack.class);
+ builder.factory(ValueStackFactory.class, UELValueStackFactory.class);
builder.factory(ReflectionProvider.class, GenericReflectionProvider.class);
//builder.factory(StrutsTypeConverter)
}
@@ -74,7 +66,7 @@
reflectionProvider = container.getInstance(ReflectionProvider.class);
converter.registerConverter("java.util.Date", new DateConverter());
this.root = new CompoundRoot();
- this.stack = new UelValueStack(container);
+ this.stack = new UELValueStack(container);
stack.setRoot(root);
stack.getContext().put(ActionContext.CONTAINER, container);

@@ -84,7 +76,7 @@
ServletActionContext.setServletContext(servletContext);

//simulate start up
- UelServletContextListener listener = new UelServletContextListener();
+ UELServletContextListener listener = new UELServletContextListener();
listener.contextInitialized(new ServletContextEvent(servletContext));
}
}

Modified: struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/BuiltinFunctionsTest.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/BuiltinFunctionsTest.java?rev=833776&r1=833775&r2=833776&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/BuiltinFunctionsTest.java (original)
+++ struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/BuiltinFunctionsTest.java Sat Nov 7 23:14:32 2009
@@ -1,21 +1,11 @@
package org.apache.struts2.uelplugin;

-import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.util.CompoundRoot;
-import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
-
import java.lang.reflect.InvocationTargetException;

-import org.springframework.mock.web.MockServletContext;
-import org.apache.struts2.ServletActionContext;
import org.apache.struts2.views.util.ContextUtil;
-import org.apache.struts2.uelplugin.UelServletContextListener;
-
-import javax.servlet.ServletContextEvent;

-public class BuiltinFunctionsTest extends AbstractUelBaseTest {
+public class BuiltinFunctionsTest extends AbstractUELTest {
public void testGetText() throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
TestAction action = new TestAction();
stack.push(action);

Added: struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/ChildTestAction.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/ChildTestAction.java?rev=833776&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/ChildTestAction.java (added)
+++ struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/ChildTestAction.java Sat Nov 7 23:14:32 2009
@@ -0,0 +1,4 @@
+package org.apache.struts2.uelplugin;
+
+public class ChildTestAction extends TestAction {
+}

Modified: struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/TestAction.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/TestAction.java?rev=833776&r1=833775&r2=833776&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/TestAction.java (original)
+++ struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/TestAction.java Sat Nov 7 23:14:32 2009
@@ -8,10 +8,18 @@
@Conversion
public class TestAction extends ActionSupport {
private TestObject object;
+ private int bar;
+
+ public int getBar() {
+ return bar;
+ }
+
+ public void setBar(int bar) {
+ this.bar = bar;
+ }

private String converted;

- @TypeConversion(type = ConversionType.APPLICATION, converter = "org.apache.struts2.uelplugin.DummyTypeConverter")
public String getConverted() {
return converted;
}

Modified: struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/TestObject.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/TestObject.java?rev=833776&r1=833775&r2=833776&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/TestObject.java (original)
+++ struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/TestObject.java Sat Nov 7 23:14:32 2009
@@ -18,9 +18,32 @@
private Map map;
private Map<Integer, TestObject> typedMap;
private Object[] objectArray;
- private Integer[] typedArray;
+ private int[] typedArray;
+ private TestObject[] typedArray2;
private Set set;

+ private ChildTestAction childTestAction;
+
+ public ChildTestAction getChildTestAction() {
+ return childTestAction;
+ }
+
+ public void setChildTestAction(ChildTestAction childTestAction) {
+ this.childTestAction = childTestAction;
+ }
+
+ public Object getFail() {
+ throw new RuntimeException("kaboom");
+ }
+
+ public TestObject[] getTypedArray2() {
+ return typedArray2;
+ }
+
+ public void setTypedArray2(TestObject[] typedArray2) {
+ this.typedArray2 = typedArray2;
+ }
+
public Set getSet() {
return set;
}
@@ -37,11 +60,11 @@
this.objectArray = objectArray;
}

- public Integer[] getTypedArray() {
+ public int[] getTypedArray() {
return typedArray;
}

- public void setTypedArray(Integer[] typedArray) {
+ public void setTypedArray(int[] typedArray) {
this.typedArray = typedArray;
}

Copied: struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/UELMethodInvocationTest.java (from r833650, struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/JuelMethodInvocationTest.java)
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/UELMethodInvocationTest.java?p2=struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/UELMethodInvocationTest.java&p1=struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/JuelMethodInvocationTest.java&r1=833650&r2=833776&rev=833776&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/JuelMethodInvocationTest.java (original)
+++ struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/UELMethodInvocationTest.java Sat Nov 7 23:14:32 2009
@@ -1,19 +1,9 @@
package org.apache.struts2.uelplugin;

-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
-import com.opensymphony.xwork2.util.CompoundRoot;
-import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.uelplugin.UelServletContextListener;
-import org.springframework.mock.web.MockServletContext;
-
-import javax.servlet.ServletContextEvent;
import java.lang.reflect.InvocationTargetException;
-import java.util.HashMap;

-public class JuelMethodInvocationTest extends AbstractUelBaseTest {
+public class UELMethodInvocationTest extends AbstractUELTest {
public void testBasicMethods() throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
assertEquals("text", stack.findValue("${' text '.trim()}"));
assertEquals(3, stack.findValue("${'123'.length()}"));
@@ -29,4 +19,14 @@
stack.getContext().put("s1", "Luthor");
assertEquals("Lex Luthor", stack.findValue("${#s0.concat(' ').concat(#s1)}"));
}
+
+ public void testCallMethodsOnCompundRoot() {
+ //this shuld not fail as the property is defined on a parent class
+ TestObject obj = new TestObject();
+ root.push(obj);
+ ChildTestAction childTestAction = new ChildTestAction();
+ obj.setChildTestAction(childTestAction);
+
+ assertSame(childTestAction, stack.findValue("top.getChildTestAction()", true));
+ }
}

Added: struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/UELStackReadValueTest.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/UELStackReadValueTest.java?rev=833776&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/UELStackReadValueTest.java (added)
+++ struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/UELStackReadValueTest.java Sat Nov 7 23:14:32 2009
@@ -0,0 +1,198 @@
+package org.apache.struts2.uelplugin;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.*;
+
+public class UELStackReadValueTest extends AbstractUELTest {
+
+ public void testTop() throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
+ TestObject obj = new TestObject();
+ obj.setValue("0");
+ root.push(obj);
+
+ obj = new TestObject();
+ obj.setValue("1");
+ root.push(obj);
+
+ assertEquals("1", stack.findValue("top.value"));
+ }
+
+ public void testReadList() throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
+ TestObject obj = new TestObject();
+ root.push(obj);
+
+ //list
+ List someList = new ArrayList(3);
+ obj.setObject(someList);
+ someList.add(10);
+ assertEquals(10, stack.findValue("object[0]"));
+ }
+
+ public void testReadArray() throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
+ TestObject obj = new TestObject();
+ int[] ints = {10, 20};
+ obj.setTypedArray(ints);
+ root.push(obj);
+
+ //list
+ assertEquals(20, stack.findValue("typedArray[1]"));
+ }
+
+
+ public void testReadMap() throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
+ HashMap map = new HashMap();
+ map.put("nameValue", "Lex");
+ TestObject obj = new TestObject();
+ obj.setParameters(map);
+ root.add(obj);
+
+ assertEquals("Lex", stack.findValue("parameters.nameValue"));
+ assertEquals("Lex", stack.findValue("parameters['nameValue']"));
+ }
+
+
+ public void testContextReferencesWithSameObjectInStack() throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
+ //if there as object in the stack with the property "X" and there is an object in the
+ //stack context under the key "X" then:
+ //${X} : should return the value of X from object in stack
+ //${#X} : should return object from the stack context
+
+ TestObject obj = new TestObject();
+ obj.setValue("ref");
+ stack.push(obj);
+
+ TestObject obj2 = new TestObject();
+ stack.getContext().put("value", obj2);
+
+ //simple
+ assertEquals("ref", stack.findValue("value"));
+ assertSame(obj2, stack.findValue("#value"));
+
+ }
+
+ public void testExpressionSyntax() throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
+ TestObject obj = new TestObject();
+ obj.setValue("val");
+ obj.setAge(1);
+ stack.getContext().put("obj", obj);
+
+ assertEquals("val", stack.findValue("${#obj.value}"));
+ assertEquals("val", stack.findValue("%{#obj.value}"));
+ assertEquals("val", stack.findValue("#{#obj.value}"));
+ }
+
+ public void testSuperNested() throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
+ TestObject obj0 = new TestObject("0");
+ root.push(obj0);
+
+ TestObject obj1 = new TestObject("1");
+ obj0.setInner(obj1);
+
+ TestObject obj2 = new TestObject("2");
+ Map map = new HashMap();
+ map.put("key0", obj2);
+ obj1.setParameters(map);
+
+ TestObject obj3 = new TestObject("3");
+ List list = new ArrayList();
+ list.add(obj3);
+ obj2.setObject(obj3);
+
+ TestObject obj4 = new TestObject("4");
+ TestObject[] array = new TestObject[]{obj4};
+ obj3.setObject(array);
+
+ stack.getContext().put("obj", obj0);
+
+ assertEquals("4", stack.findValue("${inner.parameters['key0'].object.object[0].value}"));
+ }
+
+ public void testContextReferences() throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
+ TestObject obj = new TestObject();
+ obj.setValue("val");
+ obj.setAge(1);
+ stack.getContext().put("obj", obj);
+
+ //simple
+ assertSame(obj, stack.findValue("#obj"));
+ assertEquals("val", stack.findValue("#obj.value"));
+
+ //more expressions
+ TestObject obj2 = new TestObject();
+ obj2.setValue("val2");
+ obj2.setAge(2);
+ stack.getContext().put("obj2", obj2);
+
+ //addition
+ assertSame(3L, stack.findValue("#obj.age + #obj2.age"));
+
+ //string addition
+ assertEquals("valval2", stack.findValue("#obj.value + #obj2.value"));
+ assertEquals("1val2", stack.findValue("#obj.age + #obj2.value"));
+
+ //map
+ Map someMap = new HashMap();
+ obj.setInner(obj2);
+ someMap.put("val", obj);
+ stack.getContext().put("map", someMap);
+ assertEquals("val", stack.findValue("#map[#obj.value].value"));
+
+ //list
+ List someList = new ArrayList(3);
+ obj.setAge(0);
+ someList.add(obj);
+ stack.getContext().put("list", someList);
+ assertEquals("val", stack.findValue("#list[#obj.age].value"));
+ }
+
+ public void testBasicFind() throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
+ TestObject obj = new TestObject();
+ root.add(obj);
+ stack.setValue("${value}", "Hello World");
+ String value = stack.findString("${value}");
+ assertEquals("Hello World", value);
+
+ stack.setValue("${age}", "56");
+ Integer age = (Integer) stack.findValue("${age}");
+ assertEquals(56, (int) age);
+ }
+
+ public void testNestedFind() throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
+ TestObject obj = new TestObject();
+ TestObject obj2 = new TestObject();
+ obj2.setAge(100);
+ obj.setInner(obj2);
+ root.add(obj);
+
+ assertSame(obj2, stack.findValue("${inner}"));
+ assertEquals(100, stack.findValue("${inner.age}"));
+ }
+
+ public void testDeferredFind() throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
+ TestObject obj = new TestObject();
+ root.add(obj);
+
+ stack.setValue("#{value}", "Hello World");
+ String value = stack.findString("#{value}");
+ assertEquals("Hello World", value);
+
+ stack.setValue("#{age}", "56");
+ String age = stack.findString("#{age}");
+ assertEquals("56", age);
+
+ stack.setValue("#{date}", new Date());
+ assertEquals(stack.findString("#{date}"), format.format(obj.getDate()));
+ }
+
+ public void testNotFound() throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
+ TestObject obj = new TestObject();
+ root.add(obj);
+
+ stack.setValue("${value}", "Hello World");
+ String value = stack.findString("${VALUENOTHERE}");
+ assertNull(value);
+
+ value = stack.findString("VALUENOTHERE");
+ assertNull(value);
+ }
+}

Added: struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/UELStackSetValueTest.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/UELStackSetValueTest.java?rev=833776&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/UELStackSetValueTest.java (added)
+++ struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/UELStackSetValueTest.java Sat Nov 7 23:14:32 2009
@@ -0,0 +1,159 @@
+package org.apache.struts2.uelplugin;
+
+import com.opensymphony.xwork2.util.reflection.ReflectionContextState;
+
+import java.util.*;
+import java.lang.reflect.InvocationTargetException;
+
+
+public class UELStackSetValueTest extends AbstractUELTest {
+ public void testSuperNested() {
+ TestObject obj = new TestObject();
+ root.push(obj);
+
+ stack.setValue("inner.typedMap[10].inner.typedList[2].typedMap[1].value", "whoa");
+ assertEquals("whoa", obj.getInner().getTypedMap().get(10).getInner().getTypedList().get(2).getTypedMap().get(1).getValue());
+ }
+
+
+ public void testWriteList() throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
+ //not null
+ List list = new ArrayList();
+ TestObject obj = new TestObject();
+ obj.setList(list);
+ assertNotNull(obj.getList());
+ root.push(obj);
+
+ stack.setValue("list[0]", "val");
+ assertEquals(1, list.size());
+ assertEquals("val", list.get(0));
+
+ //null list
+ obj.setList(null);
+ assertNull(obj.getList());
+ stack.setValue("list[0]", "val");
+ assertNotNull(obj.getList());
+ assertEquals("val", stack.findValue("list[0]"));
+
+ //test out of index
+ obj.setList(null);
+ stack.setValue("list[3]", "val");
+ assertEquals(4, obj.getList().size());
+ assertEquals("val", obj.getList().get(3));
+
+ //test type determiner
+ obj.setTypedList(null);
+ stack.setValue("typedList[1].value", "val");
+ assertEquals(2, obj.getTypedList().size());
+ assertEquals("val", obj.getTypedList().get(1).getValue());
+ }
+
+ public void testWriteArray() throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
+ //not null
+ TestObject[] array = new TestObject[2];
+ TestObject obj = new TestObject();
+ obj.setTypedArray2(array);
+ assertNotNull(obj.getTypedArray2());
+ root.push(obj);
+
+ stack.setValue("typedArray2[0].value", "val");
+ assertNotNull(array[0]);
+ assertEquals("val", ((TestObject) array[0]).getValue());
+ }
+
+ public void testWriteMap() throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
+ //not null
+ Map map = new HashMap();
+ TestObject obj = new TestObject();
+ obj.setMap(map);
+ assertNotNull(obj.getMap());
+ root.push(obj);
+
+ stack.setValue("map['str']", "val");
+ assertEquals(1, map.size());
+ assertEquals("val", map.get("str"));
+
+ //null list
+ obj.setMap(null);
+ assertNull(obj.getMap());
+ stack.setValue("map['str']", "val");
+ assertNotNull(obj.getMap());
+ assertEquals("val", stack.findValue("map['str']"));
+
+ //test type determiner
+ obj.setTypedMap(null);
+ stack.setValue("typedMap[1].value", "val");
+ assertEquals(1, obj.getTypedMap().size());
+ assertEquals("val", obj.getTypedMap().get(1).getValue());
+ }
+
+ public void testSetPropertiesOnNestedNullObject() {
+ TestObject obj = new TestObject();
+ assertNull(obj.getInner());
+ root.push(obj);
+
+ //inner is null, it will be catched bye the CompoundRoolELResolver
+ stack.setValue("inner.value", "val");
+ assertNotNull(obj.getInner());
+ assertEquals("val", obj.getInner().getValue());
+
+
+ //second nested property null
+ stack.setValue("inner.inner.value", "val");
+ assertNotNull(obj.getInner().getInner());
+ assertEquals("val", obj.getInner().getInner().getValue());
+ }
+
+ public void testSetStringArray() throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
+ TestObject obj = new TestObject();
+ root.add(obj);
+
+ stack.setValue("${value}", new String[]{"Hello World"});
+ String value = stack.findString("${value}");
+ assertEquals("Hello World", value);
+
+ stack.setValue("${age}", new String[]{"67"});
+ assertEquals(new Integer(67), stack.findValue("${age}"));
+ }
+
+ public void test2LevelSet() throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
+ TestObject obj = new TestObject();
+ TestObject nestedObj = new TestObject();
+ obj.setInner(nestedObj);
+ root.add(obj);
+
+ stack.setValue("${inner.age}", "66");
+ assertEquals(66, obj.getInner().getAge());
+ }
+
+ public void testTypeConversion() throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
+ TestObject obj = new TestObject();
+ TestObject inner = new TestObject();
+ obj.setInner(inner);
+ root.add(obj);
+
+ stack.setValue("${age}", "22");
+ assertEquals(stack.findValue("${age}"), obj.getAge());
+
+ stack.setValue("${inner.value}", "George");
+ assertEquals(stack.findValue("${inner.value}"), obj.getInner().getValue());
+
+ stack.setValue("${inner.age}", "44");
+ assertEquals(stack.findValue("${inner.age}"), obj.getInner().getAge());
+
+ stack.setValue("${date}", new Date());
+ assertEquals(stack.findString("${date}"), format.format(obj.getDate()));
+ }
+
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+
+ Map context = stack.getContext();
+
+ ReflectionContextState.setCreatingNullObjects(context, true);
+ ReflectionContextState.setDenyMethodExecution(context, true);
+ ReflectionContextState.setReportingConversionErrors(context, true);
+ }
+}

Added: struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/UELValueStackOtherTests.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/UELValueStackOtherTests.java?rev=833776&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/UELValueStackOtherTests.java (added)
+++ struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/UELValueStackOtherTests.java Sat Nov 7 23:14:32 2009
@@ -0,0 +1,159 @@
+package org.apache.struts2.uelplugin;
+
+import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
+import com.opensymphony.xwork2.ActionContext;
+
+import java.util.Map;
+import java.util.LinkedHashMap;
+
+
+public class UELValueStackOtherTests extends AbstractUELTest {
+
+ public void testExpOverridesCanStackExpUp() throws Exception {
+ Map expr1 = new LinkedHashMap();
+ expr1.put("expr1", "'expr1value'");
+
+ stack.setExprOverrides(expr1);
+
+ assertEquals(stack.findValue("expr1"), "expr1value");
+
+ Map expr2 = new LinkedHashMap();
+ expr2.put("expr2", "'expr2value'");
+ expr2.put("expr3", "'expr3value'");
+ stack.setExprOverrides(expr2);
+
+ assertEquals(stack.findValue("expr2"), "expr2value");
+ assertEquals(stack.findValue("expr3"), "expr3value");
+ }
+
+ public void testArrayAsString() {
+ TestObject obj = new TestObject();
+ obj.setTypedArray(new int[]{1, 2});
+ root.push(obj);
+
+ assertEquals("1, 2", stack.findValue("typedArray", String.class));
+ }
+
+ public void testFailsOnExceptionWithThrowException() {
+ TestObject obj = new TestObject();
+ root.push(obj);
+ try {
+ stack.findValue("fail", true);
+ fail("Failed to throw exception on EL error");
+ } catch (Exception ex) {
+ //ok
+ }
+ }
+
+ public void testFailsOnMissingPropertyWithThrowException() {
+ TestObject obj = new TestObject();
+ root.push(obj);
+ try {
+ stack.findValue("someprop12", true);
+ fail("Failed to throw exception on EL error");
+ } catch (Exception ex) {
+ //ok
+ }
+ }
+
+ public void testFailsOnMissingNestedPropertyWithThrowException() {
+ TestObject obj = new TestObject();
+ root.push(obj);
+ try {
+ stack.findValue("top.someprop12", true);
+ fail("Failed to throw exception on EL error");
+ } catch (Exception ex) {
+ //ok
+ }
+ }
+
+ public void testFailsOnMissingMethodWithThrowException() {
+ TestObject obj = new TestObject();
+ root.push(obj);
+ try {
+ stack.findValue("top.somethingweird()", true);
+ fail("Failed to throw exception on EL error");
+ } catch (Exception ex) {
+ //ok
+ }
+ }
+
+ public void testDoesNotFailOnExceptionWithoutThrowException() {
+ TestObject obj = new TestObject();
+ root.push(obj);
+ stack.findValue("fail", false);
+ stack.findValue("fail");
+ }
+
+ public void testDoesNotFailOnInheritedPropertiesWithThrowException() {
+ //this shuld not fail as the property is defined on a parent class
+ TestObject obj = new TestObject();
+ root.push(obj);
+ ChildTestAction childTestAction = new ChildTestAction();
+ obj.setChildTestAction(childTestAction);
+
+ assertNull(childTestAction.getConverted());
+ stack.findValue("childTestAction.converted", true);
+ }
+
+ public void testDoesNotFailOnInheritedMethodsWithThrowException() {
+ //this shuld not fail as the property is defined on a parent class
+ TestObject obj = new TestObject();
+ root.push(obj);
+ ChildTestAction childTestAction = new ChildTestAction();
+ obj.setChildTestAction(childTestAction);
+
+ assertNull(childTestAction.getConverted());
+ stack.findValue("top.getChildTestAction().converted", true);
+ }
+
+ public void testFailsOnInheritedMethodsWithThrowException() {
+ //this shuld not fail as the property is defined on a parent class
+ TestObject obj = new TestObject();
+ root.push(obj);
+ ChildTestAction childTestAction = new ChildTestAction();
+ obj.setChildTestAction(childTestAction);
+
+ assertNull(childTestAction.getConverted());
+
+ try {
+ stack.findValue("top.getChildTestAction().converted2", true);
+ fail("should have failed because of missing property");
+ } catch (Exception e) {
+ }
+ }
+
+ public void testPrimitiveSettingWithInvalidValueAddsFieldErrorInNonDevMode() {
+ TestAction action = new TestAction();
+ stack.getContext().put(XWorkConverter.REPORT_CONVERSION_ERRORS, Boolean.TRUE);
+ stack.setDevMode("false");
+ stack.push(action);
+ stack.setValue("bar", "3x");
+
+ Map conversionErrors = (Map) stack.getContext().get(ActionContext.CONVERSION_ERRORS);
+ assertTrue(conversionErrors.containsKey("bar"));
+ }
+
+ public void testPrimitiveSettingWithInvalidValueAddsFieldErrorInDevMode() {
+ TestAction action = new TestAction();
+ stack.getContext().put(XWorkConverter.REPORT_CONVERSION_ERRORS, Boolean.TRUE);
+ stack.setDevMode("true");
+ stack.push(action);
+ stack.setValue("bar", "3x");
+
+ Map conversionErrors = (Map) stack.getContext().get(ActionContext.CONVERSION_ERRORS);
+ assertTrue(conversionErrors.containsKey("bar"));
+ }
+
+ public void testObjectSettingWithInvalidValueDoesNotCauseSetCalledWithNull() {
+ TestObject obj = new TestObject();
+ root.push(obj);
+ ChildTestAction obj2 = new ChildTestAction();
+ obj.setChildTestAction(obj2);
+
+ stack.setValue("childTestAction", "whoa");
+ assertNotNull(obj.getChildTestAction());
+ assertSame(obj2, obj.getChildTestAction());
+ }
+
+}

Re: WW-3291. Checkin and moving forward...

2009-11-07T10:07:00Z

I am sorry, I was to excited about the JUEL plugin and totally forgot
about it. If you have additional changes, create a new patch and I
will merge that one.

musachy

On Fri, Nov 6, 2009 at 9:40 AM, Christian Stone <xtian@...> wrote:

> I was wondering if you had a chance to commit the patch I submitted with
> this bug [WW-3291]. I did more work in the project with another issue
> (using freemarker and velocity templates interchangeably as decorators with
> the same *full* value stack) and wish to push that. Since both bugs take
> place in the same codebase, I am wondering if I should just send you a
> single patch for both, or wait until the one is closed before creating a
> patch for the other issue.
>
> On a side note, I moved the changes I made into several production clients.
> I have websites with more than a dozen decorators and hundreds of view
> files. I am _finally_ able to start the migration to Freemarker from
> Velocity that I wasn't able to do before. I converted 4 of the files to
> Freemarker without having the overhead of needing to convert all of them in
> one sitting. It is glorious. Also, I am able to access all the statics and
> whatnot that I couldn't before, so using static keys is a huge blessing for
> readability. Also, the enhanced error reporting has already helped me
> several times diagnose issues on the server.
>
> Anyways, congrats on the work you just accomplished. Two of the biggest
> complaints on Struts 2 are speed and error reporting. Any steps to mitigate
> either of these issues is a huge win!
>
> -- Christian Stone
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@...
> For additional commands, e-mail: dev-help@...
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

svn commit: r833708 - /struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/result/PortletResultHelperJSR286.java

2009-11-07T08:34:04Z

Author: rgielen
Date: Sat Nov 7 16:34:04 2009
New Revision: 833708

URL: http://svn.apache.org/viewvc?rev=833708&view=rev
Log:
Documentation updates

Modified:
struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/result/PortletResultHelperJSR286.java

Modified: struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/result/PortletResultHelperJSR286.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/result/PortletResultHelperJSR286.java?rev=833708&r1=833707&r2=833708&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/result/PortletResultHelperJSR286.java (original)
+++ struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/result/PortletResultHelperJSR286.java Sat Nov 7 16:34:04 2009
@@ -11,7 +11,8 @@
public class PortletResultHelperJSR286 implements PortletResultHelper {

/**
- * Set a render parameter, abstracted from the used Portlet API version
+ * Set a render parameter, abstracted from the used Portlet API version. This implementation assumes that the given
+ * response is a {@link javax.portlet.StateAwareResponse}, as JSR286 implies.
*
* @param response The response to set the parameter on.
* @param key The parameter key to set.
@@ -22,7 +23,8 @@
}

/**
- * Set a portlet mode, abstracted from the used Portlet API version
+ * Set a portlet mode, abstracted from the used Portlet API version. This implementation assumes that the given
+ * response is a {@link javax.portlet.StateAwareResponse}, as JSR286 implies.
*
* @param response The response to set the portlet mode on.
* @param portletMode The portlet mode to set.
@@ -32,7 +34,8 @@
}

/**
- * Call a dispatcher's include method, abstracted from the used Portlet API version.
+ * Call a dispatcher's include method, abstracted from the used Portlet API version. This implementation assumes
+ * that the response is a {@link javax.portlet.MimeResponse}, as JSR286 implies.
*
* @param dispatcher The dispatcher to call the include method on.
* @param contentType The content type to set for the response.

svn commit: r833701 - in /struts/sandbox/trunk/struts2-portlet2-plugin/src: main/java/org/apache/struts2/components/ main/java/org/apache/struts2/portlet/context/ main/java/org/apache/struts2/portlet/dispatcher/ main/java/org/apache/struts2/portlet/res...

2009-11-07T07:58:34Z

Author: rgielen
Date: Sat Nov 7 15:58:33 2009
New Revision: 833701

URL: http://svn.apache.org/viewvc?rev=833701&view=rev
Log:
SB-110:
Seperated pure JSR168 functionality from additional JSR286 stuff, using different Dispatcher portlet and automatic API level detection to support both Portlet 1.0 and 2.0 applications from the same plugin

Added:
struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/result/PortletResultHelper.java
struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/result/PortletResultHelperJSR168.java
struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/result/PortletResultHelperJSR286.java
struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/servlet/PortletServletResponseJSR286.java
struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelperJSR286.java
Modified:
struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/components/PortletUrlRenderer.java
struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/context/PortletActionContext.java
struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java
struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr286Dispatcher.java
struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/result/PortletResult.java
struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/servlet/PortletServletResponse.java
struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java
struts/sandbox/trunk/struts2-portlet2-plugin/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java
struts/sandbox/trunk/struts2-portlet2-plugin/src/test/java/org/apache/struts2/portlet/util/PortletUrlHelperTest.java
struts/sandbox/trunk/struts2-portlet2-plugin/src/test/java/org/apache/struts2/views/jsp/PortletUrlTagTest.java

Modified: struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/components/PortletUrlRenderer.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/components/PortletUrlRenderer.java?rev=833701&r1=833700&r2=833701&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/components/PortletUrlRenderer.java (original)
+++ struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/components/PortletUrlRenderer.java Sat Nov 7 15:58:33 2009
@@ -22,10 +22,13 @@

import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
import com.opensymphony.xwork2.inject.Inject;
import org.apache.struts2.StrutsException;
import org.apache.struts2.dispatcher.mapper.ActionMapper;
import org.apache.struts2.portlet.util.PortletUrlHelper;
+import org.apache.struts2.portlet.util.PortletUrlHelperJSR286;
import org.apache.struts2.portlet.context.PortletActionContext;
import org.apache.commons.lang.xwork.StringUtils;

@@ -40,13 +43,22 @@
*/
public class PortletUrlRenderer implements UrlRenderer {

+ private static final Logger LOG = LoggerFactory.getLogger(PortletUrlRenderer.class);
+
/**
* The servlet renderer used when not executing in a portlet context.
*/
private UrlRenderer servletRenderer = null;
+ private PortletUrlHelper portletUrlHelper = null;

public PortletUrlRenderer() {
this.servletRenderer = new ServletUrlRenderer();
+
+ if (PortletActionContext.isJSR268Supported()) {
+ this.portletUrlHelper = new PortletUrlHelperJSR286();
+ } else {
+ this.portletUrlHelper = new PortletUrlHelper();
+ }
}

@Inject
@@ -66,9 +78,9 @@

String result;
if (onlyActionSpecified(urlComponent)) {
- result = PortletUrlHelper.buildUrl(urlComponent.getAction(), urlComponent.getNamespace(), urlComponent.getMethod(), urlComponent.getParameters(), urlComponent.getPortletUrlType(), urlComponent.getPortletMode(), urlComponent.getWindowState());
+ result = portletUrlHelper.buildUrl(urlComponent.getAction(), urlComponent.getNamespace(), urlComponent.getMethod(), urlComponent.getParameters(), urlComponent.getPortletUrlType(), urlComponent.getPortletMode(), urlComponent.getWindowState());
} else if(onlyValueSpecified(urlComponent)){
- result = PortletUrlHelper.buildResourceUrl(urlComponent.getValue(), urlComponent.getParameters());
+ result = portletUrlHelper.buildResourceUrl(urlComponent.getValue(), urlComponent.getParameters());
}
else {
result = createDefaultUrl(urlComponent);
@@ -99,7 +111,7 @@
ActionInvocation ai = (ActionInvocation)urlComponent.getStack().getContext().get(
ActionContext.ACTION_INVOCATION);
String action = ai.getProxy().getActionName();
- result = PortletUrlHelper.buildUrl(action, urlComponent.getNamespace(), urlComponent.getMethod(), urlComponent.getParameters(),
+ result = portletUrlHelper.buildUrl(action, urlComponent.getNamespace(), urlComponent.getMethod(), urlComponent.getParameters(),
urlComponent.getPortletUrlType(), urlComponent.getPortletMode(), urlComponent.getWindowState());
return result;
}
@@ -138,7 +150,7 @@
}
}
if (action != null) {
- String result = PortletUrlHelper.buildUrl(action, namespace, null,
+ String result = portletUrlHelper.buildUrl(action, namespace, null,
formComponent.getParameters(), type, formComponent.portletMode, formComponent.windowState);
formComponent.addParameter("action", result);

Modified: struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/context/PortletActionContext.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/context/PortletActionContext.java?rev=833701&r1=833700&r2=833701&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/context/PortletActionContext.java (original)
+++ struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/context/PortletActionContext.java Sat Nov 7 15:58:33 2009
@@ -216,4 +216,13 @@
return EVENT_PHASE.equals(getPhase());
}

+ /**
+ * Whether JSR286 features are supported.
+ *
+ * @return <code>true</code> if {@link javax.portlet.PortletContext#getMajorVersion()} returns a value greater than 1
+ */
+ public static boolean isJSR268Supported() {
+ return getPortletContext().getMajorVersion() > 1;
+ }
+
}

Modified: struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java?rev=833701&r1=833700&r2=833701&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java (original)
+++ struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java Sat Nov 7 15:58:33 2009
@@ -412,7 +412,7 @@
try {
ServletContext servletContext = new PortletServletContext(getPortletContext());
HttpServletRequest servletRequest = new PortletServletRequest(request, getPortletContext());
- HttpServletResponse servletResponse = new PortletServletResponse(response);
+ HttpServletResponse servletResponse = createPortletServletResponse(response);
if(EVENT_PHASE.equals(phase)) {
servletRequest = dispatcherUtils.wrapRequest(servletRequest, servletContext);
if(servletRequest instanceof MultiPartRequestWrapper) {
@@ -448,7 +448,7 @@
}
}

- /**
+ /**
* Returns a Map of all application attributes. Copies all attributes from
* the {@link PortletActionContext}into an {@link ApplicationMap}.
*
@@ -613,4 +613,15 @@
this.actionMapper = actionMapper;
}

+ /**
+ * Method to create a PortletServletResponse matching the used Portlet API, to be overridden for JSR286 Dispatcher.
+ *
+ * @param response The Response used for building the wrapper.
+ *
+ * @return The wrapper response for Servlet bound usage.
+ */
+ protected PortletServletResponse createPortletServletResponse( PortletResponse response ) {
+ return new PortletServletResponse(response);
+ }
+
}

Modified: struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr286Dispatcher.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr286Dispatcher.java?rev=833701&r1=833700&r2=833701&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr286Dispatcher.java (original)
+++ struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr286Dispatcher.java Sat Nov 7 15:58:33 2009
@@ -4,6 +4,8 @@
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import static org.apache.struts2.portlet.PortletContstants.SERVE_RESOURCE_PHASE;
+import org.apache.struts2.portlet.servlet.PortletServletResponse;
+import org.apache.struts2.portlet.servlet.PortletServletResponseJSR286;

import javax.portlet.*;
import java.io.IOException;
@@ -54,4 +56,8 @@
return super.getDefaultActionPath(portletRequest);
}

+ @Override
+ protected PortletServletResponse createPortletServletResponse( PortletResponse response ) {
+ return new PortletServletResponseJSR286(response);
+ }
}

Modified: struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/result/PortletResult.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/result/PortletResult.java?rev=833701&r1=833700&r2=833701&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/result/PortletResult.java (original)
+++ struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/result/PortletResult.java Sat Nov 7 15:58:33 2009
@@ -24,14 +24,7 @@
import java.util.Map;
import java.util.StringTokenizer;

-import javax.portlet.PortletContext;
-import javax.portlet.PortletException;
-import javax.portlet.PortletMode;
-import javax.portlet.PortletRequestDispatcher;
-import javax.portlet.PortletRequest;
-import javax.portlet.MimeResponse;
-import javax.portlet.RenderResponse;
-import javax.portlet.StateAwareResponse;
+import javax.portlet.*;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
@@ -71,14 +64,26 @@

protected PortletMode portletMode;

+ PortletResultHelper resultHelper;
+
public PortletResult() {
super();
+ determineResultHelper();
}

public PortletResult(String location) {
super(location);
+ determineResultHelper();
}

+ private void determineResultHelper() {
+ if (PortletActionContext.isJSR268Supported()) {
+ this.resultHelper = new PortletResultHelperJSR286();
+ } else {
+ this.resultHelper = new PortletResultHelperJSR168();
+ }
+ }
+
/**
* Execute the result. Obtains the
* {@link javax.portlet.PortletRequestDispatcher}from the
@@ -128,28 +133,28 @@
protected void executeActionResult(String finalLocation, ActionInvocation invocation) throws Exception {
String phase = (PortletActionContext.isEvent()) ? "Event" : "Action";
if (LOG.isDebugEnabled()) LOG.debug("Executing result in "+phase+" phase");
- StateAwareResponse res = (StateAwareResponse)PortletActionContext.getResponse();
Map sessionMap = invocation.getInvocationContext().getSession();
if (LOG.isDebugEnabled()) LOG.debug("Setting event render parameter: " + finalLocation);
if (finalLocation.indexOf('?') != -1) {
- convertQueryParamsToRenderParams(res, finalLocation.substring(finalLocation.indexOf('?') + 1));
+ convertQueryParamsToRenderParams(finalLocation.substring(finalLocation.indexOf('?') + 1));
finalLocation = finalLocation.substring(0, finalLocation.indexOf('?'));
}
+ PortletResponse response = PortletActionContext.getResponse();
if (finalLocation.endsWith(".action")) {
// View is rendered with a view action...luckily...
finalLocation = finalLocation.substring(0, finalLocation.lastIndexOf("."));
- res.setRenderParameter(ACTION_PARAM, finalLocation);
+ resultHelper.setRenderParameter(response, ACTION_PARAM, finalLocation);
} else {
// View is rendered outside an action...uh oh...
- res.setRenderParameter(ACTION_PARAM, "renderDirect");
+ resultHelper.setRenderParameter(response, ACTION_PARAM, "renderDirect");
sessionMap.put(RENDER_DIRECT_LOCATION, finalLocation);
}
if(portletMode != null) {
- res.setPortletMode(portletMode);
- res.setRenderParameter(PortletActionConstants.MODE_PARAM, portletMode.toString());
+ resultHelper.setPortletMode(response, portletMode);
+ resultHelper.setRenderParameter(response, PortletActionConstants.MODE_PARAM, portletMode.toString());
}
else {
- res.setRenderParameter(PortletActionConstants.MODE_PARAM, PortletActionContext.getRequest().getPortletMode()
+ resultHelper.setRenderParameter(response, PortletActionConstants.MODE_PARAM, PortletActionContext.getRequest().getPortletMode()
.toString());
}
}
@@ -160,13 +165,13 @@
* @param response
* @param queryParams
*/
- protected static void convertQueryParamsToRenderParams(StateAwareResponse response, String queryParams) {
+ protected void convertQueryParamsToRenderParams(String queryParams) {
StringTokenizer tok = new StringTokenizer(queryParams, "&");
while (tok.hasMoreTokens()) {
String token = tok.nextToken();
String key = token.substring(0, token.indexOf('='));
String value = token.substring(token.indexOf('=') + 1);
- response.setRenderParameter(key, value);
+ resultHelper.setRenderParameter(PortletActionContext.getResponse(), key, value);
}
}

@@ -181,26 +186,26 @@
if (LOG.isDebugEnabled()) LOG.debug("Executing mime result");
PortletContext ctx = PortletActionContext.getPortletContext();
PortletRequest req = PortletActionContext.getRequest();
- MimeResponse res = (MimeResponse)PortletActionContext.getResponse();
- res.setContentType(contentType);
+ PortletResponse res = PortletActionContext.getResponse();
+
if (StringUtils.isNotEmpty(title) && res instanceof RenderResponse) {
((RenderResponse)res).setTitle(title);
}
if (LOG.isDebugEnabled()) LOG.debug("Location: " + finalLocation);
+ PortletRequestDispatcher dispatcher;
if (useDispatcherServlet) {
req.setAttribute(DISPATCH_TO, finalLocation);
- PortletRequestDispatcher dispatcher = ctx.getNamedDispatcher(dispatcherServletName);
+ dispatcher = ctx.getNamedDispatcher(dispatcherServletName);
if(dispatcher == null) {
throw new PortletException("Could not locate dispatcher servlet \"" + dispatcherServletName + "\". Please configure it in your web.xml file");
}
- dispatcher.include(req, res);
} else {
- PortletRequestDispatcher dispatcher = ctx.getRequestDispatcher(finalLocation);
+ dispatcher = ctx.getRequestDispatcher(finalLocation);
if (dispatcher == null) {
throw new PortletException("Could not locate dispatcher for '" + finalLocation + "'");
}
- dispatcher.include(req, res);
}
+ resultHelper.include( dispatcher, contentType, req, res );
}

/**

Added: struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/result/PortletResultHelper.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/result/PortletResultHelper.java?rev=833701&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/result/PortletResultHelper.java (added)
+++ struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/result/PortletResultHelper.java Sat Nov 7 15:58:33 2009
@@ -0,0 +1,41 @@
+package org.apache.struts2.portlet.result;
+
+import javax.portlet.*;
+import java.io.IOException;
+
+/**
+ * PortletResultHelper abstracts Portlet API result functions specific to the used API spec version.
+ *
+ * @author Rene Gielen
+ */
+
+public interface PortletResultHelper {
+
+ /**
+ * Set a render parameter, abstracted from the used Portlet API version
+ *
+ * @param response The response to set the parameter on.
+ * @param key The parameter key to set.
+ * @param value The parameter value to set.
+ */
+ void setRenderParameter( PortletResponse response, String key, String value );
+
+ /**
+ * Set a portlet mode, abstracted from the used Portlet API version
+ *
+ * @param response The response to set the portlet mode on.
+ * @param portletMode The portlet mode to set.
+ */
+ void setPortletMode( PortletResponse response, PortletMode portletMode ) throws PortletModeException;
+
+ /**
+ * Call a dispatcher's include method, abstracted from the used Portlet API version.
+ *
+ * @param dispatcher The dispatcher to call the include method on.
+ * @param contentType The content type to set for the response.
+ * @param request The request to use for including
+ * @param response The response to use for including
+ */
+ void include( PortletRequestDispatcher dispatcher, String contentType, PortletRequest request,
+ PortletResponse response ) throws IOException, PortletException;
+}

Added: struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/result/PortletResultHelperJSR168.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/result/PortletResultHelperJSR168.java?rev=833701&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/result/PortletResultHelperJSR168.java (added)
+++ struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/result/PortletResultHelperJSR168.java Sat Nov 7 15:58:33 2009
@@ -0,0 +1,54 @@
+package org.apache.struts2.portlet.result;
+
+import javax.portlet.*;
+import java.io.IOException;
+
+/**
+ * PortletResultHelperJSR168 implements PortletResultHelper for Portlet 1.0 API (JSR168).
+ *
+ * @author Rene Gielen
+ */
+public class PortletResultHelperJSR168 implements PortletResultHelper {
+
+ /**
+ * Set a render parameter, abstracted from the used Portlet API version. This implementation assumes that the given
+ * response must be a {@link javax.portlet.ActionResponse}, as JSR168 implies.
+ *
+ * @param response The response to set the parameter on.
+ * @param key The parameter key to set.
+ * @param value The parameter value to set.
+ */
+ public void setRenderParameter( PortletResponse response, String key, String value ) {
+ ((ActionResponse) response).setRenderParameter(key, value);
+ }
+
+ /**
+ * Set a portlet mode, abstracted from the used Portlet API version. This implementation assumes that the given
+ * response must be a {@link javax.portlet.ActionResponse}, as JSR168 implies.
+ *
+ * @param response The response to set the portlet mode on.
+ * @param portletMode The portlet mode to set.
+ */
+ public void setPortletMode( PortletResponse response, PortletMode portletMode ) throws PortletModeException {
+ ((ActionResponse) response).setPortletMode(portletMode);
+ }
+
+ /**
+ * Call a dispatcher's include method, abstracted from the used Portlet API version. This implementation assumes
+ * that the given the request must be a {@link javax.portlet.RenderRequest} and the response must be a {@link
+ * javax.portlet.RenderResponse}, as JSR168 implies.
+ *
+ * @param dispatcher The dispatcher to call the include method on.
+ * @param contentType The content type to set for the response.
+ * @param request The request to use for including
+ * @param response The response to use for including
+ */
+ public void include( PortletRequestDispatcher dispatcher, String contentType, PortletRequest request,
+ PortletResponse response ) throws IOException, PortletException {
+ RenderRequest req = (RenderRequest) request;
+ RenderResponse res = (RenderResponse) response;
+ res.setContentType(contentType);
+ dispatcher.include(req, res);
+ }
+
+}
\ No newline at end of file

Added: struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/result/PortletResultHelperJSR286.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/result/PortletResultHelperJSR286.java?rev=833701&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/result/PortletResultHelperJSR286.java (added)
+++ struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/result/PortletResultHelperJSR286.java Sat Nov 7 15:58:33 2009
@@ -0,0 +1,49 @@
+package org.apache.struts2.portlet.result;
+
+import javax.portlet.*;
+import java.io.IOException;
+
+/**
+ * PortletResultHelperJSR286 implements PortletResultHelper for Portlet 2.0 API (JSR286).
+ *
+ * @author Rene Gielen
+ */
+public class PortletResultHelperJSR286 implements PortletResultHelper {
+
+ /**
+ * Set a render parameter, abstracted from the used Portlet API version
+ *
+ * @param response The response to set the parameter on.
+ * @param key The parameter key to set.
+ * @param value The parameter value to set.
+ */
+ public void setRenderParameter( PortletResponse response, String key, String value ) {
+ ((StateAwareResponse) response).setRenderParameter(key, value);
+ }
+
+ /**
+ * Set a portlet mode, abstracted from the used Portlet API version
+ *
+ * @param response The response to set the portlet mode on.
+ * @param portletMode The portlet mode to set.
+ */
+ public void setPortletMode( PortletResponse response, PortletMode portletMode ) throws PortletModeException {
+ ((StateAwareResponse) response).setPortletMode(portletMode);
+ }
+
+ /**
+ * Call a dispatcher's include method, abstracted from the used Portlet API version.
+ *
+ * @param dispatcher The dispatcher to call the include method on.
+ * @param contentType The content type to set for the response.
+ * @param request The request to use for including
+ * @param response The response to use for including
+ */
+ public void include( PortletRequestDispatcher dispatcher, String contentType, PortletRequest request,
+ PortletResponse response ) throws IOException, PortletException {
+ MimeResponse res = (MimeResponse) response;
+ res.setContentType(contentType);
+ dispatcher.include(request, res);
+ }
+
+}

Modified: struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/servlet/PortletServletResponse.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/servlet/PortletServletResponse.java?rev=833701&r1=833700&r2=833701&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/servlet/PortletServletResponse.java (original)
+++ struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/servlet/PortletServletResponse.java Sat Nov 7 15:58:33 2009
@@ -24,17 +24,15 @@
import java.io.PrintWriter;
import java.util.Locale;

-import javax.portlet.MimeResponse;
import javax.portlet.PortletResponse;
import javax.portlet.RenderResponse;
-import javax.portlet.ResourceResponse;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletResponse;

public class PortletServletResponse implements HttpServletResponse {

- private PortletResponse portletResponse;
+ protected PortletResponse portletResponse;

public PortletServletResponse(PortletResponse portletResponse) {
this.portletResponse = portletResponse;
@@ -108,134 +106,125 @@
throw new IllegalStateException("Not allowed in a portlet");
}

- public void flushBuffer() throws IOException {
- if(portletResponse instanceof MimeResponse) {
- ((MimeResponse)portletResponse).flushBuffer();
- }
- else {
- throw new IllegalStateException("Only allowed in render or resource phase");
- }
- }
-
- public int getBufferSize() {
- if(portletResponse instanceof MimeResponse) {
- return ((MimeResponse)portletResponse).getBufferSize();
- }
- else {
- throw new IllegalStateException("Only allowed in render or resource phase");
- }
- }
-
- public String getCharacterEncoding() {
- if(portletResponse instanceof MimeResponse) {
- return ((MimeResponse)portletResponse).getCharacterEncoding();
- }
- else {
- throw new IllegalStateException("Only allowed in render or resource phase");
- }
- }
-
- public String getContentType() {
- if(portletResponse instanceof MimeResponse) {
- return ((MimeResponse)portletResponse).getContentType();
- }
- else {
- throw new IllegalStateException("Only allowed in render or resource phase");
- }
- }
-
- public Locale getLocale() {
- if(portletResponse instanceof MimeResponse) {
- return ((MimeResponse)portletResponse).getLocale();
- }
- else {
- throw new IllegalStateException("Only allowed in render or resource phase");
- }
- }
-
- public ServletOutputStream getOutputStream() throws IOException {
- if(portletResponse instanceof MimeResponse) {
- return new PortletServletOutputStream(((MimeResponse)portletResponse).getPortletOutputStream());
- }
- else {
- throw new IllegalStateException("Only allowed in render or resource phase");
- }
- }
-
- public PrintWriter getWriter() throws IOException {
- if(portletResponse instanceof MimeResponse) {
- return ((MimeResponse)portletResponse).getWriter();
- }
- else {
- throw new IllegalStateException("Only allowed in render or resource phase");
- }
- }
-
- public boolean isCommitted() {
- if(portletResponse instanceof MimeResponse) {
- return ((MimeResponse)portletResponse).isCommitted();
- }
- else {
- throw new IllegalStateException("Only allowed in render or resource phase");
- }
- }
-
- public void reset() {
- if(portletResponse instanceof MimeResponse) {
- ((MimeResponse)portletResponse).reset();
- }
- else {
- throw new IllegalStateException("Only allowed in render or resource phase");
- }
- }
-
- public void resetBuffer() {
- if(portletResponse instanceof MimeResponse) {
- ((MimeResponse)portletResponse).resetBuffer();
- }
- else {
- throw new IllegalStateException("Only allowed in render or resource phase");
- }
- }
-
- public void setBufferSize(int size) {
- if(portletResponse instanceof MimeResponse) {
- ((MimeResponse)portletResponse).setBufferSize(size);
- }
- else {
- throw new IllegalStateException("Only allowed in render or resource phase");
- }
- }
-
- public void setCharacterEncoding(String charset) {
- if(portletResponse instanceof ResourceResponse) {
- ((ResourceResponse)portletResponse).setCharacterEncoding(charset);
- }
- throw new IllegalStateException("Only allowed in resource phase");
- }
-
- public void setContentLength(int len) {
- if(portletResponse instanceof ResourceResponse) {
- ((ResourceResponse)portletResponse).setContentLength(len);
- }
- throw new IllegalStateException("Only allowed in resource phase");
- }
-
- public void setContentType(String type) {
- if(portletResponse instanceof MimeResponse) {
- ((MimeResponse)portletResponse).setContentType(type);
- }
- else {
- throw new IllegalStateException("Only allowed in render or resource phase");
- }
- }
-
- public void setLocale(Locale loc) {
- if(portletResponse instanceof ResourceResponse) {
- ((ResourceResponse)portletResponse).setLocale(loc);
- }
- throw new IllegalStateException("Only allowed in resource phase");
- }
+ public void flushBuffer() throws IOException {
+ if(portletResponse instanceof RenderResponse) {
+ ((RenderResponse)portletResponse).flushBuffer();
+ }
+ else {
+ throw new IllegalStateException("Not allowed in event phase");
+ }
+ }
+
+ public int getBufferSize() {
+ if(portletResponse instanceof RenderResponse) {
+ return ((RenderResponse)portletResponse).getBufferSize();
+ }
+ else {
+ throw new IllegalStateException("Not allowed in event phase");
+ }
+ }
+
+ public String getCharacterEncoding() {
+ if(portletResponse instanceof RenderResponse) {
+ return ((RenderResponse)portletResponse).getCharacterEncoding();
+ }
+ else {
+ throw new IllegalStateException("Not allowed in event phase");
+ }
+ }
+
+ public String getContentType() {
+ if(portletResponse instanceof RenderResponse) {
+ return ((RenderResponse)portletResponse).getContentType();
+ }
+ else {
+ throw new IllegalStateException("Not allowed in event phase");
+ }
+ }
+
+ public Locale getLocale() {
+ if(portletResponse instanceof RenderResponse) {
+ return ((RenderResponse)portletResponse).getLocale();
+ }
+ else {
+ throw new IllegalStateException("Not allowed in event phase");
+ }
+ }
+
+ public ServletOutputStream getOutputStream() throws IOException {
+ if(portletResponse instanceof RenderResponse) {
+ return new PortletServletOutputStream(((RenderResponse)portletResponse).getPortletOutputStream());
+ }
+ else {
+ throw new IllegalStateException("Not allowed in event phase");
+ }
+ }
+
+ public PrintWriter getWriter() throws IOException {
+ if(portletResponse instanceof RenderResponse) {
+ return ((RenderResponse)portletResponse).getWriter();
+ }
+ else {
+ throw new IllegalStateException("Not allowed in event phase");
+ }
+ }
+
+ public boolean isCommitted() {
+ if(portletResponse instanceof RenderResponse) {
+ return ((RenderResponse)portletResponse).isCommitted();
+ }
+ else {
+ throw new IllegalStateException("Not allowed in event phase");
+ }
+ }
+
+ public void reset() {
+ if(portletResponse instanceof RenderResponse) {
+ ((RenderResponse)portletResponse).reset();
+ }
+ else {
+ throw new IllegalStateException("Not allowed in event phase");
+ }
+ }
+
+ public void resetBuffer() {
+ if(portletResponse instanceof RenderResponse) {
+ ((RenderResponse)portletResponse).resetBuffer();
+ }
+ else {
+ throw new IllegalStateException("Not allowed in event phase");
+ }
+ }
+
+ public void setBufferSize(int size) {
+ if(portletResponse instanceof RenderResponse) {
+ ((RenderResponse)portletResponse).setBufferSize(size);
+ }
+ else {
+ throw new IllegalStateException("Not allowed in event phase");
+ }
+ }
+
+ public void setCharacterEncoding(String charset) {
+ throw new IllegalStateException("Not allowed in a portlet");
+ }
+
+ public void setContentLength(int len) {
+ throw new IllegalStateException("Not allowed in a portlet");
+ }
+
+ public void setContentType(String type) {
+ if(portletResponse instanceof RenderResponse) {
+ ((RenderResponse)portletResponse).setContentType(type);
+ }
+ else {
+ throw new IllegalStateException("Not allowed in event phase");
+ }
+ }
+
+ public void setLocale(Locale loc) {
+ throw new IllegalStateException("Not allowed in a portlet");
+ }

public PortletResponse getPortletResponse() {
return portletResponse;

Added: struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/servlet/PortletServletResponseJSR286.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/servlet/PortletServletResponseJSR286.java?rev=833701&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/servlet/PortletServletResponseJSR286.java (added)
+++ struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/servlet/PortletServletResponseJSR286.java Sat Nov 7 15:58:33 2009
@@ -0,0 +1,152 @@
+package org.apache.struts2.portlet.servlet;
+
+import javax.servlet.ServletOutputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Locale;
+import javax.portlet.ResourceResponse;
+import javax.portlet.MimeResponse;
+import javax.portlet.PortletResponse;
+
+/**
+ * PortletServletResponseJSR286.
+ *
+ * @author Rene Gielen
+ */
+public class PortletServletResponseJSR286 extends PortletServletResponse {
+
+ public PortletServletResponseJSR286( PortletResponse portletResponse ) {
+ super(portletResponse);
+ }
+
+
+ public void flushBuffer() throws IOException {
+ if(portletResponse instanceof MimeResponse) {
+ ((MimeResponse)portletResponse).flushBuffer();
+ }
+ else {
+ throw new IllegalStateException("Only allowed in render or resource phase");
+ }
+ }
+
+ public int getBufferSize() {
+ if(portletResponse instanceof MimeResponse) {
+ return ((MimeResponse)portletResponse).getBufferSize();
+ }
+ else {
+ throw new IllegalStateException("Only allowed in render or resource phase");
+ }
+ }
+
+ public String getCharacterEncoding() {
+ if(portletResponse instanceof MimeResponse) {
+ return ((MimeResponse)portletResponse).getCharacterEncoding();
+ }
+ else {
+ throw new IllegalStateException("Only allowed in render or resource phase");
+ }
+ }
+
+ public String getContentType() {
+ if(portletResponse instanceof MimeResponse) {
+ return ((MimeResponse)portletResponse).getContentType();
+ }
+ else {
+ throw new IllegalStateException("Only allowed in render or resource phase");
+ }
+ }
+
+ public Locale getLocale() {
+ if(portletResponse instanceof MimeResponse) {
+ return ((MimeResponse)portletResponse).getLocale();
+ }
+ else {
+ throw new IllegalStateException("Only allowed in render or resource phase");
+ }
+ }
+
+ public ServletOutputStream getOutputStream() throws IOException {
+ if(portletResponse instanceof MimeResponse) {
+ return new PortletServletOutputStream(((MimeResponse)portletResponse).getPortletOutputStream());
+ }
+ else {
+ throw new IllegalStateException("Only allowed in render or resource phase");
+ }
+ }
+
+ public PrintWriter getWriter() throws IOException {
+ if(portletResponse instanceof MimeResponse) {
+ return ((MimeResponse)portletResponse).getWriter();
+ }
+ else {
+ throw new IllegalStateException("Only allowed in render or resource phase");
+ }
+ }
+
+ public boolean isCommitted() {
+ if(portletResponse instanceof MimeResponse) {
+ return ((MimeResponse)portletResponse).isCommitted();
+ }
+ else {
+ throw new IllegalStateException("Only allowed in render or resource phase");
+ }
+ }
+
+ public void reset() {
+ if(portletResponse instanceof MimeResponse) {
+ ((MimeResponse)portletResponse).reset();
+ }
+ else {
+ throw new IllegalStateException("Only allowed in render or resource phase");
+ }
+ }
+
+ public void resetBuffer() {
+ if(portletResponse instanceof MimeResponse) {
+ ((MimeResponse)portletResponse).resetBuffer();
+ }
+ else {
+ throw new IllegalStateException("Only allowed in render or resource phase");
+ }
+ }
+
+ public void setBufferSize(int size) {
+ if(portletResponse instanceof MimeResponse) {
+ ((MimeResponse)portletResponse).setBufferSize(size);
+ }
+ else {
+ throw new IllegalStateException("Only allowed in render or resource phase");
+ }
+ }
+
+ public void setCharacterEncoding(String charset) {
+ if(portletResponse instanceof ResourceResponse) {
+ ((ResourceResponse)portletResponse).setCharacterEncoding(charset);
+ }
+ throw new IllegalStateException("Only allowed in resource phase");
+ }
+
+ public void setContentLength(int len) {
+ if(portletResponse instanceof ResourceResponse) {
+ ((ResourceResponse)portletResponse).setContentLength(len);
+ }
+ throw new IllegalStateException("Only allowed in resource phase");
+ }
+
+ public void setContentType(String type) {
+ if(portletResponse instanceof MimeResponse) {
+ ((MimeResponse)portletResponse).setContentType(type);
+ }
+ else {
+ throw new IllegalStateException("Only allowed in render or resource phase");
+ }
+ }
+
+ public void setLocale(Locale loc) {
+ if(portletResponse instanceof ResourceResponse) {
+ ((ResourceResponse)portletResponse).setLocale(loc);
+ }
+ throw new IllegalStateException("Only allowed in resource phase");
+ }
+
+}

Modified: struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java?rev=833701&r1=833700&r2=833701&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java (original)
+++ struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java Sat Nov 7 15:58:33 2009
@@ -29,13 +29,7 @@
import java.util.Map;
import java.util.StringTokenizer;

-import javax.portlet.BaseURL;
-import javax.portlet.PortletMode;
-import javax.portlet.PortletSecurityException;
-import javax.portlet.PortletURL;
-import javax.portlet.PortletRequest;
-import javax.portlet.MimeResponse;
-import javax.portlet.WindowState;
+import javax.portlet.*;

import org.apache.struts2.StrutsException;
import org.apache.struts2.portlet.context.PortletActionContext;
@@ -43,6 +37,7 @@

import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
+
/**
* Helper class for creating Portlet URLs. Portlet URLs are fundamentally different from regular
* servlet URLs since they never target the application itself; all requests go through the portlet
@@ -68,7 +63,7 @@
* @param state The WindowState of the URL.
* @return The URL String.
*/
- public static String buildUrl(String action, String namespace, String method, Map<String, Object> params,
+ public String buildUrl(String action, String namespace, String method, Map<String, Object> params,
String type, String mode, String state) {
return buildUrl(action, namespace, method, params, null, type, mode, state,
true, true);
@@ -77,21 +72,19 @@
/**
* Create a portlet URL with for the specified action and namespace.
*
- * @see #buildUrl(String, String, Map, String, String, String)
+ * @see #buildUrl(String, String, String, java.util.Map, String, String, String)
*/
- public static String buildUrl(String action, String namespace, String method, Map<String, Object> params,
+ public String buildUrl(String action, String namespace, String method, Map<String, Object> params,
String scheme, String type, String portletMode, String windowState,
boolean includeContext, boolean encodeResult) {
StringBuffer resultingAction = new StringBuffer();
PortletRequest request = PortletActionContext.getRequest();
- MimeResponse response = (MimeResponse)PortletActionContext.getResponse();
LOG.debug("Creating url. Action = " + action + ", Namespace = "
+ namespace + ", Type = " + type);
namespace = prependNamespace(namespace, portletMode);
if (StringUtils.isEmpty(portletMode)) {
portletMode = PortletActionContext.getRequest().getPortletMode().toString();
}
- String result = null;
int paramStartIndex = action.indexOf('?');
if (paramStartIndex > 0) {
String value = action;
@@ -117,31 +110,10 @@
}
if (LOG.isDebugEnabled()) LOG.debug("Resulting actionPath: " + resultingAction);
params.put(ACTION_PARAM, new String[] { resultingAction.toString() });
-
- BaseURL url = null;
- if ("action".equalsIgnoreCase(type)) {
- if (LOG.isDebugEnabled()) LOG.debug("Creating action url");
- url = response.createActionURL();
- }
- else if("resource".equalsIgnoreCase(type)) {
- if (LOG.isDebugEnabled()) LOG.debug("Creating resource url");
- url = response.createResourceURL();
- }
- else {
- if (LOG.isDebugEnabled()) LOG.debug("Creating render url");
- url = response.createRenderURL();
- }
-
params.put(MODE_PARAM, new String[]{portletMode});
- url.setParameters(ensureParamsAreStringArrays(params));
+ final Map<String, String[]> portletParams = ensureParamsAreStringArrays(params);

- if ("HTTPS".equalsIgnoreCase(scheme)) {
- try {
- url.setSecure(true);
- } catch (PortletSecurityException e) {
- LOG.error("Cannot set scheme to https", e);
- }
- }
+ Object url = createUrl(scheme, type, portletParams);
if(url instanceof PortletURL) {
try {
final PortletURL portletUrl = (PortletURL) url;
@@ -151,7 +123,8 @@
LOG.error("Unable to set mode or state:" + e.getMessage(), e);
}
}
- result = url.toString();
+
+ String result = url.toString();
// TEMP BUG-WORKAROUND FOR DOUBLE ESCAPING OF AMPERSAND
if(result.indexOf("&") >= 0) {
result = result.replace("&", "&");
@@ -160,6 +133,30 @@

}

+ protected Object createUrl( String scheme, String type, Map<String, String[]> portletParams ) {
+ RenderResponse response = PortletActionContext.getRenderResponse();
+ PortletURL url;
+ if ("action".equalsIgnoreCase(type)) {
+ if (LOG.isDebugEnabled()) LOG.debug("Creating action url");
+ url = response.createActionURL();
+ }
+ else {
+ if (LOG.isDebugEnabled()) LOG.debug("Creating render url");
+ url = response.createRenderURL();
+ }
+
+ url.setParameters(portletParams);
+
+ if ("HTTPS".equalsIgnoreCase(scheme)) {
+ try {
+ url.setSecure(true);
+ } catch ( PortletSecurityException e) {
+ LOG.error("Cannot set scheme to https", e);
+ }
+ }
+ return url;
+ }
+
/**
*
* Prepend the namespace configuration for the specified namespace and PortletMode.
@@ -169,7 +166,7 @@
*
* @return prepended namespace.
*/
- private static String prependNamespace(String namespace, String portletMode) {
+ private String prependNamespace(String namespace, String portletMode) {
StringBuffer sb = new StringBuffer();
PortletMode mode = PortletActionContext.getRequest().getPortletMode();
if(StringUtils.isNotEmpty(portletMode)) {
@@ -204,7 +201,7 @@
* @param value
* @return encoded url to non Struts action resources.
*/
- public static String buildResourceUrl(String value, Map params) {
+ public String buildResourceUrl(String value, Map params) {
StringBuffer sb = new StringBuffer();
// Relative URLs are not allowed in a portlet
if (!value.startsWith("/")) {
@@ -229,8 +226,12 @@
throw new StrutsException("Encoding "+ENCODING+" not found");
}
}
- MimeResponse resp = (MimeResponse)PortletActionContext.getResponse();
PortletRequest req = PortletActionContext.getRequest();
+ return encodeUrl(sb, req);
+ }
+
+ protected String encodeUrl( StringBuffer sb, PortletRequest req ) {
+ RenderResponse resp = PortletActionContext.getRenderResponse();
return resp.encodeURL(req.getContextPath() + sb.toString());
}

@@ -245,14 +246,12 @@
Map<String, String[]> result = null;
if (params != null) {
result = new LinkedHashMap<String, String[]>(params.size());
- Iterator<String> it = params.keySet().iterator();
- while (it.hasNext()) {
- String key = it.next();
+ for ( String key : params.keySet() ) {
Object val = params.get(key);
if (val instanceof String[]) {
- result.put(key, (String[])val);
+ result.put(key, (String[]) val);
} else {
- result.put(key, new String[] { val.toString() });
+ result.put(key, new String[]{val.toString()});
}
}
}
@@ -267,7 +266,7 @@
* @return The WindowState that mathces the <tt>windowState</tt> String, or if
* the String is blank, the current WindowState.
*/
- private static WindowState getWindowState(PortletRequest portletReq,
+ private WindowState getWindowState(PortletRequest portletReq,
String windowState) {
WindowState state = portletReq.getWindowState();
if (StringUtils.isNotEmpty(windowState)) {
@@ -293,7 +292,7 @@
* @return The PortletMode that mathces the <tt>portletMode</tt> String, or if
* the String is blank, the current PortletMode.
*/
- private static PortletMode getPortletMode(PortletRequest portletReq,
+ private PortletMode getPortletMode(PortletRequest portletReq,
String portletMode) {
PortletMode mode = portletReq.getPortletMode();

Added: struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelperJSR286.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelperJSR286.java?rev=833701&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelperJSR286.java (added)
+++ struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelperJSR286.java Sat Nov 7 15:58:33 2009
@@ -0,0 +1,55 @@
+package org.apache.struts2.portlet.util;
+
+import org.apache.struts2.portlet.context.PortletActionContext;
+import javax.portlet.PortletRequest;
+import javax.portlet.MimeResponse;
+import javax.portlet.BaseURL;
+import javax.portlet.PortletSecurityException;
+import java.util.Map;
+
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
+
+/**
+ * PortletUrlJSR286Helper.
+ *
+ * @author Rene Gielen
+ */
+public class PortletUrlHelperJSR286 extends PortletUrlHelper {
+
+ private static final Logger LOG = LoggerFactory.getLogger(PortletUrlHelperJSR286.class);
+
+ protected String encodeUrl( StringBuffer sb, PortletRequest req ) {
+ MimeResponse resp = (MimeResponse) PortletActionContext.getResponse();
+ return resp.encodeURL(req.getContextPath() + sb.toString());
+ }
+
+ protected Object createUrl( String scheme, String type, Map<String, String[]> portletParams ) {
+ MimeResponse response = (MimeResponse) PortletActionContext.getResponse();
+ BaseURL url;
+ if ("action".equalsIgnoreCase(type)) {
+ if (LOG.isDebugEnabled()) LOG.debug("Creating action url");
+ url = response.createActionURL();
+ }
+ else if("resource".equalsIgnoreCase(type)) {
+ if (LOG.isDebugEnabled()) LOG.debug("Creating resource url");
+ url = response.createResourceURL();
+ }
+ else {
+ if (LOG.isDebugEnabled()) LOG.debug("Creating render url");
+ url = response.createRenderURL();
+ }
+
+ url.setParameters(portletParams);
+
+ if ("HTTPS".equalsIgnoreCase(scheme)) {
+ try {
+ url.setSecure(true);
+ } catch ( PortletSecurityException e) {
+ LOG.error("Cannot set scheme to https", e);
+ }
+ }
+ return url;
+ }
+
+}

Modified: struts/sandbox/trunk/struts2-portlet2-plugin/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-portlet2-plugin/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java?rev=833701&r1=833700&r2=833701&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-portlet2-plugin/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java (original)
+++ struts/sandbox/trunk/struts2-portlet2-plugin/src/test/java/org/apache/struts2/portlet/result/PortletResultTest.java Sat Nov 7 15:58:33 2009
@@ -87,6 +87,7 @@
Constraint[] params = new Constraint[]{same(req), same(res)};
mockRd.expects(once()).method("include").with(params);
mockCtx.expects(once()).method("getRequestDispatcher").with(eq("/WEB-INF/pages/testPage.jsp")).will(returnValue(rd));
+ mockCtx.expects(atLeastOnce()).method("getMajorVersion").will(returnValue(1));
mockResponse.expects(once()).method("setContentType").with(eq("text/html"));

mockRequest.stubs().method("getPortletMode").will(returnValue(PortletMode.VIEW));
@@ -118,6 +119,7 @@
params = new Constraint[]{eq(MODE_PARAM), eq(PortletMode.VIEW.toString())};
mockResponse.expects(once()).method("setRenderParameter").with(params);
mockRequest.stubs().method("getPortletMode").will(returnValue(PortletMode.VIEW));
+ mockCtx.expects(atLeastOnce()).method("getMajorVersion").will(returnValue(1));
ActionContext ctx = ActionContext.getContext();

ctx.put(REQUEST, mockRequest.proxy());
@@ -144,7 +146,8 @@
params = new Constraint[]{eq(MODE_PARAM), eq(PortletMode.VIEW.toString())};
mockResponse.expects(once()).method("setRenderParameter").with(params);
mockRequest.stubs().method("getPortletMode").will(returnValue(PortletMode.VIEW));
-
+ mockCtx.expects(atLeastOnce()).method("getMajorVersion").will(returnValue(1));
+
ActionContext ctx = ActionContext.getContext();

Map session = new HashMap();
@@ -178,6 +181,7 @@
params = new Constraint[]{eq(MODE_PARAM), eq(PortletMode.VIEW.toString())};
mockResponse.expects(once()).method("setRenderParameter").with(params);
mockRequest.stubs().method("getPortletMode").will(returnValue(PortletMode.VIEW));
+ mockCtx.expects(atLeastOnce()).method("getMajorVersion").will(returnValue(1));

ActionContext ctx = ActionContext.getContext();

@@ -208,6 +212,7 @@
Constraint[] params = new Constraint[]{same(req), same(res)};
mockRd.expects(once()).method("include").with(params);
mockCtx.expects(once()).method("getRequestDispatcher").with(eq("/WEB-INF/pages/testPage.jsp")).will(returnValue(rd));
+ mockCtx.expects(atLeastOnce()).method("getMajorVersion").will(returnValue(1));

mockRequest.stubs().method("getPortletMode").will(returnValue(PortletMode.VIEW));

Modified: struts/sandbox/trunk/struts2-portlet2-plugin/src/test/java/org/apache/struts2/portlet/util/PortletUrlHelperTest.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-portlet2-plugin/src/test/java/org/apache/struts2/portlet/util/PortletUrlHelperTest.java?rev=833701&r1=833700&r2=833701&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-portlet2-plugin/src/test/java/org/apache/struts2/portlet/util/PortletUrlHelperTest.java (original)
+++ struts/sandbox/trunk/struts2-portlet2-plugin/src/test/java/org/apache/struts2/portlet/util/PortletUrlHelperTest.java Sat Nov 7 15:58:33 2009
@@ -83,7 +83,7 @@
EasyMock.replay(renderRequest);
EasyMock.replay(renderResponse);

- PortletUrlHelper.buildUrl("testAction", null, null,
+ (new PortletUrlHelper()).buildUrl("testAction", null, null,
new HashMap(), null, null, null);
assertEquals(PortletMode.VIEW, url.getPortletMode());
assertEquals(WindowState.NORMAL, url.getWindowState());
@@ -97,7 +97,7 @@
EasyMock.replay(renderRequest);
EasyMock.replay(renderResponse);

- PortletUrlHelper.buildUrl("testAction", null, null,
+ (new PortletUrlHelper()).buildUrl("testAction", null, null,
new HashMap(), null, "edit", null);

assertEquals(PortletMode.EDIT, url.getPortletMode());
@@ -112,7 +112,7 @@
EasyMock.replay(renderRequest);
EasyMock.replay(renderResponse);

- PortletUrlHelper.buildUrl("testAction", null, null,
+ (new PortletUrlHelper()).buildUrl("testAction", null, null,
new HashMap(), null, null, "maximized");

assertEquals(PortletMode.VIEW, url.getPortletMode());
@@ -127,7 +127,7 @@
EasyMock.replay(renderResponse);
EasyMock.replay(renderRequest);

- PortletUrlHelper.buildUrl("testAction", null, null,
+ (new PortletUrlHelper()).buildUrl("testAction", null, null,
new HashMap(), "action", null, null);

assertEquals(PortletMode.VIEW, url.getPortletMode());

Modified: struts/sandbox/trunk/struts2-portlet2-plugin/src/test/java/org/apache/struts2/views/jsp/PortletUrlTagTest.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-portlet2-plugin/src/test/java/org/apache/struts2/views/jsp/PortletUrlTagTest.java?rev=833701&r1=833700&r2=833701&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-portlet2-plugin/src/test/java/org/apache/struts2/views/jsp/PortletUrlTagTest.java (original)
+++ struts/sandbox/trunk/struts2-portlet2-plugin/src/test/java/org/apache/struts2/views/jsp/PortletUrlTagTest.java Sat Nov 7 15:58:33 2009
@@ -25,13 +25,7 @@
import java.util.Iterator;
import java.util.Map;

-import javax.portlet.PortletMode;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.portlet.WindowState;
+import javax.portlet.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.jsp.PageContext;
@@ -41,6 +35,8 @@
import org.apache.struts2.dispatcher.Dispatcher;
import org.apache.struts2.portlet.PortletActionConstants;
import org.apache.struts2.portlet.util.PortletUrlHelper;
+import org.apache.struts2.StrutsStatics;
+import static org.apache.struts2.StrutsStatics.*;
import org.jmock.Mock;
import org.jmock.cglib.MockObjectTestCase;
import org.jmock.core.Constraint;
@@ -49,6 +45,8 @@
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.ActionProxy;
+import static com.opensymphony.xwork2.ActionContext.SESSION;
+import static com.opensymphony.xwork2.ActionContext.PARAMETERS;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.ValueStackFactory;

@@ -73,12 +71,15 @@

MockJspWriter mockJspWriter = null;

+ Mock mockCtx = null;
+
ValueStack stack = null;

public static void main(String[] args) {
TestRunner.run(PortletUrlTagTest.class);
}

+
public void setUp() throws Exception {
super.setUp();

@@ -99,6 +100,7 @@
mockPageCtx = mock(PageContext.class);
mockPortletUrl = mock(PortletURL.class);
mockJspWriter = new MockJspWriter();
+ mockCtx = mock(PortletContext.class);

mockPageCtx.stubs().method("getRequest").will(
returnValue((HttpServletRequest) mockHttpReq.proxy()));
@@ -133,6 +135,7 @@
contextMap.put(PortletActionConstants.RESPONSE, mockPortletRes.proxy());
contextMap.put(PortletActionConstants.PHASE, PortletActionConstants.RENDER_PHASE);
contextMap.put(PortletActionConstants.MODE_NAMESPACE_MAP, modeMap);
+ contextMap.put(STRUTS_PORTLET_CONTEXT, mockCtx.proxy());
ActionContext ctx = new ActionContext(contextMap);
ctx.setValueStack(stack);
ActionContext.setContext(ctx);
@@ -156,6 +159,7 @@

mockPortletRes.expects(once()).method("createRenderURL").will(
returnValue((PortletURL) mockPortletUrl.proxy()));
+ mockCtx.expects(atLeastOnce()).method("getMajorVersion").will(returnValue(1));

Map paramMap = new HashMap();
paramMap.put(PortletActionConstants.ACTION_PARAM, new String[]{"/view/testAction"});
@@ -180,6 +184,7 @@

mockPortletRes.expects(once()).method("createRenderURL").will(
returnValue((PortletURL) mockPortletUrl.proxy()));
+ mockCtx.expects(atLeastOnce()).method("getMajorVersion").will(returnValue(1));

Map paramMap = new HashMap();
paramMap.put(PortletActionConstants.ACTION_PARAM, new String[]{"/help/testAction"});
@@ -203,6 +208,7 @@

mockPortletRes.expects(once()).method("createRenderURL").will(
returnValue((PortletURL) mockPortletUrl.proxy()));
+ mockCtx.expects(atLeastOnce()).method("getMajorVersion").will(returnValue(1));

Map paramMap = new HashMap();
paramMap.put(PortletActionConstants.ACTION_PARAM, new String[]{"/view/testAction"});
@@ -226,6 +232,7 @@

mockPortletRes.expects(once()).method("createActionURL").will(
returnValue((PortletURL) mockPortletUrl.proxy()));
+ mockCtx.expects(atLeastOnce()).method("getMajorVersion").will(returnValue(1));

Map paramMap = new HashMap();
paramMap.put(PortletActionConstants.ACTION_PARAM, new String[]{"/view/testAction"});
@@ -245,6 +252,7 @@
mockHttpReq.stubs().method("getQueryString").will(returnValue(""));
mockPortletRes.expects(once()).method("encodeURL").will(returnValue("/contextPath/image.gif"));
mockJspWriter.setExpectedData("/contextPath/image.gif");
+ mockCtx.expects(atLeastOnce()).method("getMajorVersion").will(returnValue(1));
tag.setValue("image.gif");
tag.doStartTag();
tag.doEndTag();
@@ -255,6 +263,7 @@
mockHttpReq.stubs().method("getQueryString").will(returnValue(""));
mockPortletRes.expects(once()).method("encodeURL").with(eq("/contextPath/image.gif?testParam1=testValue1")).will(returnValue("/contextPath/image.gif?testParam1=testValue1"));
mockJspWriter.setExpectedData("/contextPath/image.gif?testParam1=testValue1");
+ mockCtx.expects(atLeastOnce()).method("getMajorVersion").will(returnValue(1));

ParamTag paramTag = new ParamTag();
paramTag.setPageContext((PageContext)mockPageCtx.proxy());
@@ -273,6 +282,7 @@
mockHttpReq.stubs().method("getQueryString").will(returnValue(""));
mockPortletRes.expects(once()).method("encodeURL").with(eq("/contextPath/image.gif?testParam1=testValue1&testParam2=testValue2")).will(returnValue("/contextPath/image.gif?testParam1=testValue1&testParam2=testValue2"));
mockJspWriter.setExpectedData("/contextPath/image.gif?testParam1=testValue1&testParam2=testValue2");
+ mockCtx.expects(atLeastOnce()).method("getMajorVersion").will(returnValue(1));

ParamTag paramTag = new ParamTag();
paramTag.setPageContext((PageContext)mockPageCtx.proxy());
@@ -299,6 +309,7 @@
mockHttpReq.stubs().method("getQueryString").will(returnValue(""));
mockPortletRes.expects(once()).method("createRenderURL").will(
returnValue((PortletURL) mockPortletUrl.proxy()));
+ mockCtx.expects(atLeastOnce()).method("getMajorVersion").will(returnValue(1));
tag.setAction("testAction");
Map paramMap = new HashMap();
paramMap.put(PortletActionConstants.ACTION_PARAM, new String[]{"/view/testAction!input"});
@@ -316,6 +327,7 @@
mockHttpReq.stubs().method("getQueryString").will(returnValue(""));
mockPortletRes.expects(once()).method("createRenderURL").will(
returnValue((PortletURL) mockPortletUrl.proxy()));
+ mockCtx.expects(atLeastOnce()).method("getMajorVersion").will(returnValue(1));
Map paramMap = new HashMap();

Mock mockActionProxy = mock(ActionProxy.class);

[jira] Created: (SB-110) Refactor Portlet 2.0 Plugin to seperate JSR286 functionionality, in order to both serve JSR168 and JSR286 portlets depending on container API provided

2009-11-07T07:57:14Z

Refactor Portlet 2.0 Plugin to seperate JSR286 functionionality, in order to both serve JSR168 and JSR286 portlets depending on container API provided
-------------------------------------------------------------------------------------------------------------------------------------------------------

Key: SB-110
URL: https://issues.apache.org/struts/browse/SB-110
Project: Struts Sandbox
Issue Type: Improvement
Reporter: Rene Gielen
Assignee: Rene Gielen

Seperate pure JSR168 functionality from additional JSR286 stuff, using different Dispatcher portlet and automatic API level detection to support both Portlet 1.0 and 2.0 applications from the same plugin

--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.

[OSS Bamboo] Struts 2 SVN - Main Build (Java 6) build 1007 has FAILED (1 tests failed, no failures were new)

2009-11-07T01:21:48Z

STRUTS-MAINJ6-1007 failed.
This build occured because it is a dependant of XWORK-MAIN-436.
1/1133 tests failed.

Code Changes

This build does not have any commits.

Tests

See full test details

Failed Tests (1)
	EmbeddedJSPResultTest : Key in context (Existing)

Error Summary

See full build log

                    [INFO] ------------------------------------------------------------------------

                

                    [ERROR] BUILD FAILURE

                

                    [INFO] ------------------------------------------------------------------------

                

                    [INFO] Compilation failure

                

                    Failure executing javac, but could not parse the error:

                

                    The system is out of resources.

                

                    Consult the following stack trace for details.

                

                    java.lang.OutOfMemoryError: PermGen space

                

                            at java.lang.ClassLoader.defineClass1(Native Method)

                

                            at java.lang.ClassLoader.defineClass(ClassLoader.java:621)

                

                            at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:124)

                

                            at java.net.URLClassLoader.defineClass(URLClassLoader.java:260)

                

                            at java.net.URLClassLoader.access$000(URLClassLoader.java:56)

                

                            at java.net.URLClassLoader$1.run(URLClassLoader.java:195)

                

                            at java.security.AccessController.doPrivileged(Native Method)

                

                            at java.net.URLClassLoader.findClass(URLClassLoader.java:188)

                

                            at org.codehaus.plexus.compiler.javac.IsolatedClassLoader.loadClass(IsolatedClassLoader.java:56)

                

                            at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:320)

                

                            at com.sun.tools.javac.main.JavaCompiler.<init>(JavaCompiler.java:314)

                

                            at com.sun.tools.javac.main.JavaCompiler.instance(JavaCompiler.java:72)

                

                            at com.sun.tools.javac.main.Main.compile(Main.java:340)

                

                            at com.sun.tools.javac.main.Main.compile(Main.java:279)

                

                            at com.sun.tools.javac.main.Main.compile(Main.java:270)

                

                            at com.sun.tools.javac.Main.compile(Main.java:87)

                

                            at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)

                

                            at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)

                

                            at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)

                

                            at java.lang.reflect.Method.invoke(Method.java:597)

                

                            at org.codehaus.plexus.compiler.javac.JavacCompiler.compileInProcess(JavacCompiler.java:420)

                

                            at org.codehaus.plexus.compiler.javac.JavacCompiler.compile(JavacCompiler.java:141)

                

                            at org.apache.maven.plugin.AbstractCompilerMojo.execute(AbstractCompilerMojo.java:493)

                

                            at org.apache.maven.plugin.TestCompilerMojo.execute(TestCompilerMojo.java:102)

                

                            at org.apache.maven.plugin.DefaultPluginManager.executeMojo(DefaultPluginManager.java:483)

                

                            at org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoals(DefaultLifecycleExecutor.java:678)

                

                            at org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoalWithLifecycle(DefaultLifecycleExecutor.java:540)

                

                            at org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoal(DefaultLifecycleExecutor.java:519)

                

                            at org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoalAndHandleFailures(DefaultLifecycleExecutor.java:371)

                

                            at org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeTaskSegments(DefaultLifecycleExecutor.java:332)

                

                            at org.apache.maven.lifecycle.DefaultLifecycleExecutor.execute(DefaultLifecycleExecutor.java:181)

                

                            at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:356)

                

                    [INFO] ------------------------------------------------------------------------

                

                    [INFO] For more information, run Maven with the -e switch

                

Email generated by Atlassian Bamboo - if you wish to stop receiving these emails edit your user profile or notify your administrator
Want this information in your IDE?

Actions

View Online
Add Comments
View Artifacts
Download Logs

Re: ognl 2.7.3 performance

2009-11-06T23:54:00Z

in 2.1.6 I think.

On Fri, Nov 6, 2009 at 11:47 PM, Chris Pratt <thechrispratt@...> wrote:

> Good to know, thanks. When was that changed? I use 2.1.6 in my personal
> project, but we're still stuck on 2.0.14 at work.
> (*Chris*)
>
> On Fri, Nov 6, 2009 at 11:33 PM, Dale Newfield <dale@...> wrote:
>
>> Chris Pratt wrote:
>>
>>> In the struts.xml file you can use ${} to run an OGNL expression and
>>> access
>>> things from the Action (actually the value stack, but we're trying to keep
>>> it simple here)
>>>
>>
>> JSYK, %{} now works as expected in struts.xml.
>>
>> -Dale
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@...
>> For additional commands, e-mail: dev-help@...
>>
>>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

Re: ognl 2.7.3 performance

2009-11-06T23:47:58Z

Good to know, thanks. When was that changed? I use 2.1.6 in my personal
project, but we're still stuck on 2.0.14 at work.
(*Chris*)

On Fri, Nov 6, 2009 at 11:33 PM, Dale Newfield <dale@...> wrote:

> Chris Pratt wrote:
>
>> In the struts.xml file you can use ${} to run an OGNL expression and
>> access
>> things from the Action (actually the value stack, but we're trying to keep
>> it simple here)
>>
>
> JSYK, %{} now works as expected in struts.xml.
>
> -Dale
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@...
> For additional commands, e-mail: dev-help@...
>
>

Re: ognl 2.7.3 performance

2009-11-06T23:33:19Z

Chris Pratt wrote:
> In the struts.xml file you can use ${} to run an OGNL expression and access
> things from the Action (actually the value stack, but we're trying to keep
> it simple here)

JSYK, %{} now works as expected in struts.xml.

-Dale

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

Re: ognl 2.7.3 performance

2009-11-06T20:51:31Z

What Chris said. Plus, adopting a standard is a good idea, UEL could
even be the default EL for Struts 3, and OGNL a plugin by that time :)

musachy

On Fri, Nov 6, 2009 at 6:25 PM, Chris Pratt <thechrispratt@...> wrote:

> It's slow and confusing. The slow part is pretty self explanatory, but the
> confusing part might take more explanation.
>
> This is what I have to try to get across to my junior developers that are
> trying to grasp not only Struts, but Spring, Tiles and our own code as well.
>
> In the struts.xml file you can use ${} to run an OGNL expression and access
> things from the Action (actually the value stack, but we're trying to keep
> it simple here)
>
> If you see ${} in a .jsp file, that's no longer OGNL, it's JSTL EL and that
> can be used anywhere in JSP, except within the Struts tags. For them, and
> them only, you have to use %{} to execute the same OGNL you saw in the
> struts.xml (I know you don't always have to, but it's easier then explaining
> when you do and when you don't).
>
> And then it gets more confusing when you try to describe how to format
> values like dates and currencies, and on and on...
>
> For me, I've never needed anything that good old JSTL EL didn't provide. In
> fact, I LIKE the fact that JSTL EL prevents me from accessing anything but
> bean properties. I think it opens up a whole world of security hurt when
> you have an interpreted language that potentially allows accessing any Java
> method remotely.
>
> That's just my 2 cents, but I'm very glad to see Musachy take up this
> mantle!
> (*Chris*)
>
> On Fri, Nov 6, 2009 at 6:14 PM, Alex Siman <aleksandr.siman@...>wrote:
>
>>
>> What was the reason(s) to get rid of OGNL? Just interesting.
>>
>> Musachy Barroso wrote:
>> >
>> > Cool news. So I have been playing with the JUEL plugin (JUEL is pretty
>> > nice, we can talk about that later.), and here are a few things I got
>> > working so far:
>> >
>> > 1. Value stack operations (get/set)
>> > 2. I18n (there is a custom 'getText()' that works like it does now)
>> > 3. Parameter population
>> > 4. Most of Showcase
>> > 5. Method invocation in expressions
>> >
>> > yeah, you read #3 right. My new parameter binder stuff is useless(3
>> > days in trunk and already getting deleted whoa) and I will remove it
>> > from xwork. I handled to implement the parameter binding with the JUEL
>> > plugin, and it seems to be working nicely, population of null elements
>> > and type conversion. On top of that I extended JUEL to support a "#"
>> > operator, so an OGNL expression like
>> >
>> > ${#obj.x} or #{#obj.x}
>> >
>> > does what you would expect it to do(no standard compliant but handy).
>> > This enables us to run a rather large number of existing OGNL
>> > expressions without changes. I gave it a try on showcase and it seems
>> > to run most of it. I will be adding more test and cleanup the code and
>> > commit it. I also "implemented" (more like "copied", merging code from
>> > xwork and OGNL) a ReflectionProvider which does not need OGNL.
>> >
>> > //all hail our new UEL overlord
>> >
>> > musachy
>> >
>> > On Sat, Jul 18, 2009 at 3:06 PM, Musachy Barroso <musachy@...>
>> > wrote:
>> >> Due to this fix: http://jira.opensymphony.com/browse/OGNL-141
>> >>
>> >> Ognl 2.7.3 performance is a lot better than 2.6.11, on my rough test,
>> >> the avg time spent in OgnlRuntime.invokeMethod(...) dropped from
>> >> 630,726 ms (2.6.11) to 117,108 (2.7.3) ms, (100 threads, 2s ramp-up
>> >> period, 100 iterations) . If we are not going to use the new bycode
>> >> stuff, then the upgrade doesn't seem that risky. Should we upgrade, do
>> >> some testing, and release 2.1.8 (delay release a bit), or leave that
>> >> for 2.1.9? With the bytecode stuff out the way I am inclined to just
>> >> upgrade to 2.7.3 at once, and upgrade freemarker also.
>> >>
>> >> musachy
>> >>
>> >> --
>> >> "Hey you! Would you help me to carry the stone?" Pink Floyd
>> >>
>> >
>> > ---------------------------------------------------------------------
>> > To unsubscribe, e-mail: dev-unsubscribe@...
>> > For additional commands, e-mail: dev-help@...
>> >
>> >
>> >
>>
>> --
>> View this message in context:
>> http://old.nabble.com/ognl-2.7.3-performance-tp24552642p26234947.html
>> Sent from the Struts - Dev mailing list archive at Nabble.com.
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@...
>> For additional commands, e-mail: dev-help@...
>>
>>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

Re: ognl 2.7.3 performance

2009-11-06T18:25:08Z

It's slow and confusing. The slow part is pretty self explanatory, but the
confusing part might take more explanation.

This is what I have to try to get across to my junior developers that are
trying to grasp not only Struts, but Spring, Tiles and our own code as well.

In the struts.xml file you can use ${} to run an OGNL expression and access
things from the Action (actually the value stack, but we're trying to keep
it simple here)

If you see ${} in a .jsp file, that's no longer OGNL, it's JSTL EL and that
can be used anywhere in JSP, except within the Struts tags. For them, and
them only, you have to use %{} to execute the same OGNL you saw in the
struts.xml (I know you don't always have to, but it's easier then explaining
when you do and when you don't).

And then it gets more confusing when you try to describe how to format
values like dates and currencies, and on and on...

For me, I've never needed anything that good old JSTL EL didn't provide. In
fact, I LIKE the fact that JSTL EL prevents me from accessing anything but
bean properties. I think it opens up a whole world of security hurt when
you have an interpreted language that potentially allows accessing any Java
method remotely.

That's just my 2 cents, but I'm very glad to see Musachy take up this
mantle!
(*Chris*)

On Fri, Nov 6, 2009 at 6:14 PM, Alex Siman <aleksandr.siman@...>wrote:

>
> What was the reason(s) to get rid of OGNL? Just interesting.
>
> Musachy Barroso wrote:
> >
> > Cool news. So I have been playing with the JUEL plugin (JUEL is pretty
> > nice, we can talk about that later.), and here are a few things I got
> > working so far:
> >
> > 1. Value stack operations (get/set)
> > 2. I18n (there is a custom 'getText()' that works like it does now)
> > 3. Parameter population
> > 4. Most of Showcase
> > 5. Method invocation in expressions
> >
> > yeah, you read #3 right. My new parameter binder stuff is useless(3
> > days in trunk and already getting deleted whoa) and I will remove it
> > from xwork. I handled to implement the parameter binding with the JUEL
> > plugin, and it seems to be working nicely, population of null elements
> > and type conversion. On top of that I extended JUEL to support a "#"
> > operator, so an OGNL expression like
> >
> > ${#obj.x} or #{#obj.x}
> >
> > does what you would expect it to do(no standard compliant but handy).
> > This enables us to run a rather large number of existing OGNL
> > expressions without changes. I gave it a try on showcase and it seems
> > to run most of it. I will be adding more test and cleanup the code and
> > commit it. I also "implemented" (more like "copied", merging code from
> > xwork and OGNL) a ReflectionProvider which does not need OGNL.
> >
> > //all hail our new UEL overlord
> >
> > musachy
> >
> > On Sat, Jul 18, 2009 at 3:06 PM, Musachy Barroso <musachy@...>
> > wrote:
> >> Due to this fix: http://jira.opensymphony.com/browse/OGNL-141
> >>
> >> Ognl 2.7.3 performance is a lot better than 2.6.11, on my rough test,
> >> the avg time spent in OgnlRuntime.invokeMethod(...) dropped from
> >> 630,726 ms (2.6.11) to 117,108 (2.7.3) ms, (100 threads, 2s ramp-up
> >> period, 100 iterations) . If we are not going to use the new bycode
> >> stuff, then the upgrade doesn't seem that risky. Should we upgrade, do
> >> some testing, and release 2.1.8 (delay release a bit), or leave that
> >> for 2.1.9? With the bytecode stuff out the way I am inclined to just
> >> upgrade to 2.7.3 at once, and upgrade freemarker also.
> >>
> >> musachy
> >>
> >> --
> >> "Hey you! Would you help me to carry the stone?" Pink Floyd
> >>
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: dev-unsubscribe@...
> > For additional commands, e-mail: dev-help@...
> >
> >
> >
>
> --
> View this message in context:
> http://old.nabble.com/ognl-2.7.3-performance-tp24552642p26234947.html
> Sent from the Struts - Dev mailing list archive at Nabble.com.
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@...
> For additional commands, e-mail: dev-help@...
>
>

Re: ognl 2.7.3 performance

2009-11-06T18:14:13Z

What was the reason(s) to get rid of OGNL? Just interesting.

Musachy Barroso wrote:

Cool news. So I have been playing with the JUEL plugin (JUEL is pretty
nice, we can talk about that later.), and here are a few things I got
working so far:

1. Value stack operations (get/set)
2. I18n (there is a custom 'getText()' that works like it does now)
3. Parameter population
4. Most of Showcase
5. Method invocation in expressions

yeah, you read #3 right. My new parameter binder stuff is useless(3
days in trunk and already getting deleted whoa) and I will remove it
from xwork. I handled to implement the parameter binding with the JUEL
plugin, and it seems to be working nicely, population of null elements
and type conversion. On top of that I extended JUEL to support a "#"
operator, so an OGNL expression like

${#obj.x} or #{#obj.x}

does what you would expect it to do(no standard compliant but handy).
This enables us to run a rather large number of existing OGNL
expressions without changes. I gave it a try on showcase and it seems
to run most of it. I will be adding more test and cleanup the code and
commit it. I also "implemented" (more like "copied", merging code from
xwork and OGNL) a ReflectionProvider which does not need OGNL.

//all hail our new UEL overlord

musachy

On Sat, Jul 18, 2009 at 3:06 PM, Musachy Barroso <musachy@gmail.com> wrote:
> Due to this fix: http://jira.opensymphony.com/browse/OGNL-141
>
> Ognl 2.7.3 performance is a lot better than 2.6.11, on my rough test,
> the avg time spent in OgnlRuntime.invokeMethod(...) dropped from
> 630,726 ms (2.6.11) to 117,108 (2.7.3) ms, (100 threads, 2s ramp-up
> period, 100 iterations) . If we are not going to use the new bycode
> stuff, then the upgrade doesn't seem that risky. Should we upgrade, do
> some testing, and release 2.1.8 (delay release a bit), or leave that
> for 2.1.9? With the bytecode stuff out the way I am inclined to just
> upgrade to 2.7.3 at once, and upgrade freemarker also.
>
> musachy
>
> --
> "Hey you! Would you help me to carry the stone?" Pink Floyd
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org

svn commit: r833625 - in /struts/sandbox/trunk/struts2-uel-plugin/src: main/java/org/apache/struts2/uelplugin/ main/java/org/apache/struts2/uelplugin/elresolvers/ test/java/org/apache/struts2/uelplugin/

2009-11-06T17:18:16Z

Author: musachy
Date: Sat Nov 7 01:18:15 2009
New Revision: 833625

URL: http://svn.apache.org/viewvc?rev=833625&view=rev
Log:
add tests, and array el resolver

Added:
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/XWorkArrayELResolver.java
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/XWorkMapELResolver.java
Removed:
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/DummyTypeConverter.java
Modified:
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/uelplugin/elresolvers/XWorkBeanELResolver.java
struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/XWorkListELResolver.java
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/AbstractUelBaseTest.java
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/ParametersTest.java
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/TestObject.java
struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/UelTest.java

Modified: 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/uelplugin/CompoundRootELContext.java?rev=833625&r1=833624&r2=833625&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/uelplugin/CompoundRootELContext.java Sat Nov 7 01:18:15 2009
@@ -2,10 +2,7 @@

import com.opensymphony.xwork2.inject.Container;
import de.odysseus.el.util.SimpleContext;
-import org.apache.struts2.uelplugin.elresolvers.CompoundRootELResolver;
-import org.apache.struts2.uelplugin.elresolvers.ValueStackContextResolver;
-import org.apache.struts2.uelplugin.elresolvers.XWorkBeanELResolver;
-import org.apache.struts2.uelplugin.elresolvers.XWorkListELResolver;
+import org.apache.struts2.uelplugin.elresolvers.*;

import javax.el.*;

@@ -19,13 +16,12 @@
public CompoundRootELContext(final Container container) {
super(new CompositeELResolver() {
{
- add(new ValueStackContextResolver());
- add(new XWorkListELResolver(container));
add(new CompoundRootELResolver(container));
- add(new ArrayELResolver(false));
- add(new MapELResolver(false));
- add(new ResourceBundleELResolver());
+ add(new ValueStackContextResolver());
add(new XWorkBeanELResolver(container));
+ add(new XWorkListELResolver(container));
+ add(new XWorkMapELResolver(container));
+ add(new XWorkArrayELResolver(container));
add(new BeanELResolver());
}});
}

Added: struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/XWorkArrayELResolver.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/XWorkArrayELResolver.java?rev=833625&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/XWorkArrayELResolver.java (added)
+++ struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/XWorkArrayELResolver.java Sat Nov 7 01:18:15 2009
@@ -0,0 +1,119 @@
+package org.apache.struts2.uelplugin.elresolvers;
+
+import com.opensymphony.xwork2.inject.Container;
+import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
+import com.opensymphony.xwork2.util.reflection.ReflectionContextState;
+
+import javax.el.ELContext;
+import javax.el.ELException;
+import java.util.List;
+import java.util.Map;
+import java.lang.reflect.Array;
+
+
+public class XWorkArrayELResolver extends AbstractResolver {
+ public XWorkArrayELResolver(Container container) {
+ super(container);
+ }
+
+ public Object getValue(ELContext elContext, Object target, Object property) {
+ if (target != null && property != null && target.getClass().isArray()) {
+
+ Map<String, Object> context = (Map) elContext.getContext(AccessorsContextKey.class);
+
+ Class lastClass = (Class) context.get(XWorkConverter.LAST_BEAN_CLASS_ACCESSED);
+ String lastProperty = (String) context.get(XWorkConverter.LAST_BEAN_PROPERTY_ACCESSED);
+
+ Integer index = null;
+
+ if (property instanceof Number)
+ index = ((Number) property).intValue();
+ else {
+ try {
+ index = Integer.valueOf(property.toString());
+ } catch (NumberFormatException e) {
+ //ignore
+ }
+ }
+
+ if (index != null) {
+ if (ReflectionContextState.isCreatingNullObjects(context) && objectTypeDeterminer.shouldCreateIfNew(lastClass, lastProperty, target, null, true)) {
+ Class clazz = target.getClass().getComponentType();
+
+ if (index < 0 || index >= Array.getLength(target)) {
+ //nothing to do here, as we cannot set a new array
+ throw new ELException("Index [" + index + "] is out of bounds");
+ } else {
+ //valid index
+ Object obj = Array.get(target, index);
+ if (obj == null) {
+ try {
+ obj = objectFactory.buildBean(clazz, context);
+ Array.set(target, index, obj);
+ } catch (Exception e) {
+ throw new ELException("unable to instantiate a new object for property [" + lastProperty + "]", e);
+ }
+ }
+
+ elContext.setPropertyResolved(true);
+ return obj;
+ }
+ } else {
+ //try normal list
+ if (index < Array.getLength(target)) {
+ elContext.setPropertyResolved(true);
+ return Array.get(target, index);
+ }
+ }
+ }
+ }
+
+ return null;
+ }
+
+ public void setValue(ELContext elContext, Object target, Object property, Object value) {
+ if (target != null && property != null && target.getClass().isArray()) {
+
+ Map<String, Object> context = (Map) elContext.getContext(AccessorsContextKey.class);
+
+ Class lastClass = (Class) context.get(XWorkConverter.LAST_BEAN_CLASS_ACCESSED);
+ String lastProperty = (String) context.get(XWorkConverter.LAST_BEAN_PROPERTY_ACCESSED);
+
+ Integer index = null;
+
+ if (property instanceof Number)
+ index = ((Number) property).intValue();
+ else {
+ try {
+ index = Integer.valueOf(property.toString());
+ } catch (NumberFormatException e) {
+ //ignore
+ }
+ }
+
+ Class clazz = target.getClass().getComponentType();
+
+ if (index != null) {
+ if (ReflectionContextState.isCreatingNullObjects(context) && objectTypeDeterminer.shouldCreateIfNew(lastClass, lastProperty, target, null, true)) {
+
+ if (index < 0 || index >= Array.getLength(target)) {
+ //nothing to do here, as we cannot set a new array
+ throw new ELException("Index [" + index + "] is out of bounds");
+ } else {
+ //valid index
+ Object convertedValue = xworkConverter.convertValue(context, value, clazz);
+ Array.set(target, index, convertedValue);
+ elContext.setPropertyResolved(true);
+ }
+ }
+ } else {
+ //try normal list
+ if (index < Array.getLength(target)) {
+ Object convertedValue = xworkConverter.convertValue(context, value, clazz);
+ Array.set(target, index, convertedValue);
+ elContext.setPropertyResolved(true);
+ }
+ }
+ }
+ }
+}

Modified: struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/XWorkBeanELResolver.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/XWorkBeanELResolver.java?rev=833625&r1=833624&r2=833625&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/XWorkBeanELResolver.java (original)
+++ struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/XWorkBeanELResolver.java Sat Nov 7 01:18:15 2009
@@ -1,16 +1,12 @@
package org.apache.struts2.uelplugin.elresolvers;

import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
-import com.opensymphony.xwork2.parameters.accessor.ParametersPropertyAccessor;
-import com.opensymphony.xwork2.util.reflection.ReflectionProvider;
-import com.opensymphony.xwork2.util.reflection.ReflectionContextState;
import com.opensymphony.xwork2.inject.Container;
+import com.opensymphony.xwork2.util.reflection.ReflectionContextState;
import org.apache.commons.beanutils.PropertyUtils;
import org.apache.struts2.StrutsException;

-import javax.el.BeanELResolver;
import javax.el.ELContext;
-import java.lang.reflect.InvocationTargetException;
import java.util.Map;

public class XWorkBeanELResolver extends AbstractResolver {

Modified: struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/XWorkListELResolver.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/XWorkListELResolver.java?rev=833625&r1=833624&r2=833625&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/XWorkListELResolver.java (original)
+++ struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/XWorkListELResolver.java Sat Nov 7 01:18:15 2009
@@ -16,9 +16,9 @@
}

public Object getValue(ELContext elContext, Object target, Object property) {
- Map<String, Object> context = (Map) elContext.getContext(AccessorsContextKey.class);
-
if (target != null && property != null && target instanceof List) {
+
+ Map<String, Object> context = (Map) elContext.getContext(AccessorsContextKey.class);
List list = (List) target;

Class lastClass = (Class) context.get(XWorkConverter.LAST_BEAN_CLASS_ACCESSED);
@@ -31,49 +31,49 @@
//ignore
}

- if (numericValue != null
- && ReflectionContextState.isCreatingNullObjects(context)
- && objectTypeDeterminer.shouldCreateIfNew(lastClass, lastProperty, target, null, true)) {
- int index = numericValue.intValue();
- int listSize = list.size();
-
- /*if (lastClass == null || lastProperty == null) {
- return super.getProperty(context, target, name);
- }*/
- Class beanClass = objectTypeDeterminer.getElementClass(lastClass, lastProperty, property);
- if (listSize <= index) {
- Object result = null;
-
- for (int i = listSize; i < index; i++) {
- list.add(null);
+ if (numericValue != null) {
+ if (ReflectionContextState.isCreatingNullObjects(context) && objectTypeDeterminer.shouldCreateIfNew(lastClass, lastProperty, target, null, true)) {
+ int index = numericValue.intValue();
+ int listSize = list.size();
+
+ /*if (lastClass == null || lastProperty == null) {
+ return super.getProperty(context, target, name);
+ }*/
+ Class beanClass = objectTypeDeterminer.getElementClass(lastClass, lastProperty, property);
+ if (listSize <= index) {
+ Object result = null;
+
+ for (int i = listSize; i < index; i++) {
+ list.add(null);
+ }
+ try {
+ list.add(index, result = objectFactory.buildBean(beanClass, context));
+ } catch (Exception exc) {
+ throw new XWorkException(exc);
+ }
+
+ elContext.setPropertyResolved(true);
+ return result;
+ } else if (list.get(index) == null) {
+ Object result = null;
+ try {
+ list.set(index, result = objectFactory.buildBean(beanClass, context));
+ } catch (Exception exc) {
+ throw new XWorkException(exc);
+ }
+
+ elContext.setPropertyResolved(true);
+ return result;
+ } else {
+ elContext.setPropertyResolved(true);
+ return list.get(index);
}
- try {
- list.add(index, result = objectFactory.buildBean(beanClass, context));
- } catch (Exception exc) {
- throw new XWorkException(exc);
- }
-
- elContext.setPropertyResolved(true);
- return result;
- } else if (list.get(index) == null) {
- Object result = null;
- try {
- list.set(index, result = objectFactory.buildBean(beanClass, context));
- } catch (Exception exc) {
- throw new XWorkException(exc);
- }
-
- elContext.setPropertyResolved(true);
- return result;
} else {
- elContext.setPropertyResolved(true);
- return list.get(index);
- }
- } else {
- //try normal list
- if (numericValue < list.size()) {
- elContext.setPropertyResolved(true);
- return list.get(numericValue);
+ //try normal list
+ if (numericValue < list.size()) {
+ elContext.setPropertyResolved(true);
+ return list.get(numericValue);
+ }
}
}
}

Added: struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/XWorkMapELResolver.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/XWorkMapELResolver.java?rev=833625&view=auto
==============================================================================
--- struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/XWorkMapELResolver.java (added)
+++ struts/sandbox/trunk/struts2-uel-plugin/src/main/java/org/apache/struts2/uelplugin/elresolvers/XWorkMapELResolver.java Sat Nov 7 01:18:15 2009
@@ -0,0 +1,137 @@
+package org.apache.struts2.uelplugin.elresolvers;
+
+import com.opensymphony.xwork2.util.reflection.ReflectionContextState;
+import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
+import com.opensymphony.xwork2.inject.Container;
+
+import javax.el.ELContext;
+import java.util.Map;
+import java.util.List;
+import java.util.WeakHashMap;
+
+public class XWorkMapELResolver extends AbstractResolver {
+ private final Map<Key, Class> keyClassCache = new WeakHashMap<Key, Class>();
+
+ public XWorkMapELResolver(Container container) {
+ super(container);
+ }
+
+ public Object getValue(ELContext elContext, Object target, Object property) {
+ Map<String, Object> context = (Map) elContext.getContext(AccessorsContextKey.class);
+
+ if (target != null && property != null && target instanceof Map) {
+ Object result = null;
+
+ //find the key class and convert the name to that class
+ Class lastClass = (Class) context.get(XWorkConverter.LAST_BEAN_CLASS_ACCESSED);
+ String lastProperty = (String) context.get(XWorkConverter.LAST_BEAN_PROPERTY_ACCESSED);
+
+ Class keyClass = objectTypeDeterminer.getKeyClass(lastClass, lastProperty);
+
+ if (keyClass == null)
+ keyClass = String.class;
+
+ Object key = getKey(context, property);
+ Map map = (Map) target;
+ result = map.get(key);
+
+ if (result == null &&
+ context.get(ReflectionContextState.CREATE_NULL_OBJECTS) != null
+ && objectTypeDeterminer.shouldCreateIfNew(lastClass, lastProperty, target, null, false)) {
+ Class valueClass = objectTypeDeterminer.getElementClass(lastClass, lastProperty, key);
+
+ try {
+ result = objectFactory.buildBean(valueClass, context);
+ map.put(key, result);
+ } catch (Exception exc) {
+ }
+
+ }
+
+ elContext.setPropertyResolved(true);
+ return result;
+ }
+ return null;
+ }
+
+ private Object getKey(Map context, Object name) {
+ Class lastClass = (Class) context.get(XWorkConverter.LAST_BEAN_CLASS_ACCESSED);
+ String lastProperty = (String) context.get(XWorkConverter.LAST_BEAN_PROPERTY_ACCESSED);
+ if (lastClass == null || lastProperty == null) {
+ // return java.lang.String.class;
+ // commented out the above -- it makes absolutely no sense for when setting basic maps!
+ return name;
+ }
+
+ Key key = new Key(lastClass, lastProperty);
+ //lookup in the cache first
+ Class keyClass = keyClassCache.get(key);
+
+ if (keyClass == null) {
+ keyClass = objectTypeDeterminer.getKeyClass(lastClass, lastProperty);
+
+ if (keyClass != null)
+ keyClassCache.put(key, keyClass);
+ }
+
+ if (keyClass == null) {
+ keyClass = String.class;
+ keyClassCache.put(key, String.class);
+ }
+
+ return xworkConverter.convertValue(context, name, keyClass);
+
+ }
+
+ public void setValue(ELContext elContext, Object target, Object property, Object value) {
+ Map<String, Object> context = (Map) elContext.getContext(AccessorsContextKey.class);
+
+ if (target != null && property != null && target instanceof Map) {
+ Object key = getKey(context, property);
+ Map map = (Map) target;
+ map.put(key, getValue(context, value));
+ }
+ }
+
+ private Object getValue(Map context, Object value) {
+ Class lastClass = (Class) context.get(XWorkConverter.LAST_BEAN_CLASS_ACCESSED);
+ String lastProperty = (String) context.get(XWorkConverter.LAST_BEAN_PROPERTY_ACCESSED);
+ if (lastClass == null || lastProperty == null) {
+ return value;
+ }
+ Class elementClass = objectTypeDeterminer.getElementClass(lastClass, lastProperty, null);
+ if (elementClass == null) {
+ return value; // nothing is specified, we assume it will be the value passed in.
+ }
+ return xworkConverter.convertValue(context, value, elementClass);
+ }
+}
+
+class Key {
+ Class clazz;
+ String property;
+
+ Key(Class clazz, String property) {
+ this.clazz = clazz;
+ this.property = property;
+ }
+
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+
+ Key key = (Key) o;
+
+ if (clazz != null ? !clazz.equals(key.clazz) : key.clazz != null) return false;
+ if (property != null ? !property.equals(key.property) : key.property != null) return false;
+
+ return true;
+ }
+
+ public int hashCode() {
+ int result = clazz != null ? clazz.hashCode() : 0;
+ result = 31 * result + (property != null ? property.hashCode() : 0);
+ return result;
+ }
+}
+

Modified: struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/AbstractUelBaseTest.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/AbstractUelBaseTest.java?rev=833625&r1=833624&r2=833625&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/AbstractUelBaseTest.java (original)
+++ struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/AbstractUelBaseTest.java Sat Nov 7 01:18:15 2009
@@ -66,6 +66,7 @@
builder.factory(ValueStack.class, UelValueStack.class);
builder.factory(ValueStackFactory.class, UelValueStackFactory.class);
builder.factory(ReflectionProvider.class, GenericReflectionProvider.class);
+ //builder.factory(StrutsTypeConverter)
}
});

Modified: struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/ParametersTest.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/ParametersTest.java?rev=833625&r1=833624&r2=833625&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/ParametersTest.java (original)
+++ struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/ParametersTest.java Sat Nov 7 01:18:15 2009
@@ -8,6 +8,7 @@
import java.util.Map;
import java.util.List;
import java.util.ArrayList;
+import java.util.HashMap;
import java.lang.reflect.InvocationTargetException;

@@ -44,15 +45,43 @@
assertEquals("val", obj.getTypedList().get(1).getValue());
}

- public void testAnnotatedTypeConverter() {
- TestAction action = new TestAction();
- assertNull(action.getConverted());
- root.push(action);
+ public void testWriteArray() throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
+ //not null
+ Object[] array = new Object[2];
+ TestObject obj = new TestObject();
+ //obj.setObjectArray(array);
+ //assertNotNull(obj.getObjectArray());
+ root.push(obj);

- stack.setValue("converted", "someval");
- assertEquals("converted", action.getConverted());
+ stack.setValue("objectArray[0].value", "val");
+ assertEquals("val", ((TestObject)array[0]).getValue());
}

+ public void testWriteMap() throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
+ //not null
+ Map map = new HashMap();
+ TestObject obj = new TestObject();
+ obj.setMap(map);
+ assertNotNull(obj.getMap());
+ root.push(obj);
+
+ stack.setValue("map['str']", "val");
+ assertEquals(1, map.size());
+ assertEquals("val", map.get("str"));
+
+ //null list
+ obj.setMap(null);
+ assertNull(obj.getMap());
+ stack.setValue("map['str']", "val");
+ assertNotNull(obj.getMap());
+ assertEquals("val", stack.findValue("map['str']"));
+
+ //test type determiner
+ obj.setTypedMap(null);
+ stack.setValue("typedMap[1].value", "val");
+ assertEquals(1, obj.getTypedMap().size());
+ assertEquals("val", obj.getTypedMap().get(1).getValue());
+ }

public void testSetPropertiesOnNestedNullObject() {
TestObject obj = new TestObject();

Modified: struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/TestObject.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/TestObject.java?rev=833625&r1=833624&r2=833625&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/TestObject.java (original)
+++ struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/TestObject.java Sat Nov 7 01:18:15 2009
@@ -3,6 +3,7 @@
import java.util.Date;
import java.util.Map;
import java.util.List;
+import java.util.Set;

public class TestObject {
@@ -14,6 +15,51 @@
private Object object;
private List list;
private List<TestObject> typedList;
+ private Map map;
+ private Map<Integer, TestObject> typedMap;
+ private Object[] objectArray;
+ private Integer[] typedArray;
+ private Set set;
+
+ public Set getSet() {
+ return set;
+ }
+
+ public void setSet(Set set) {
+ this.set = set;
+ }
+
+ public Object[] getObjectArray() {
+ return objectArray;
+ }
+
+ public void setObjectArray(Object[] objectArray) {
+ this.objectArray = objectArray;
+ }
+
+ public Integer[] getTypedArray() {
+ return typedArray;
+ }
+
+ public void setTypedArray(Integer[] typedArray) {
+ this.typedArray = typedArray;
+ }
+
+ public Map getMap() {
+ return map;
+ }
+
+ public void setMap(Map map) {
+ this.map = map;
+ }
+
+ public Map<Integer, TestObject> getTypedMap() {
+ return typedMap;
+ }
+
+ public void setTypedMap(Map<Integer, TestObject> typedMap) {
+ this.typedMap = typedMap;
+ }

public List<TestObject> getTypedList() {
return typedList;

Modified: struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/UelTest.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/UelTest.java?rev=833625&r1=833624&r2=833625&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/UelTest.java (original)
+++ struts/sandbox/trunk/struts2-uel-plugin/src/test/java/org/apache/struts2/uelplugin/UelTest.java Sat Nov 7 01:18:15 2009
@@ -43,6 +43,28 @@
assertEquals(10, stack.findValue("object[0]"));
}

+ public void testReadArray() throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
+ TestObject obj = new TestObject();
+ Integer[] ints = {10, 20};
+ obj.setTypedArray(ints);
+ root.push(obj);
+
+ //list
+ assertEquals(20, stack.findValue("typedArray[1]"));
+ }
+
+
+ public void testMap() throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
+ HashMap map = new HashMap();
+ map.put("nameValue", "Lex");
+ TestObject obj = new TestObject();
+ obj.setParameters(map);
+ root.add(obj);
+
+ assertEquals("Lex", stack.findValue("parameters.nameValue"));
+ assertEquals("Lex", stack.findValue("parameters['nameValue']"));
+ }
+

public void testContextReferencesWithSameObjectInStack() throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
//if there as object in the stack with the property "X" and there is an object in the
@@ -189,17 +211,6 @@
assertEquals(stack.findString("#{date}"), format.format(obj.getDate()));
}

- public void testMap() throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
- HashMap map = new HashMap();
- map.put("nameValue", "Lex");
- TestObject obj = new TestObject();
- obj.setParameters(map);
- root.add(obj);
-
- String value = (String) stack.findValue("parameters.nameValue", String.class);
- assertEquals("Lex", value);
- }
-
public void test2LevelSet() throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
TestObject obj = new TestObject();
TestObject nestedObj = new TestObject();

[CONF] Confluence Changes in the last 24 hours

2009-11-06T16:01:02Z

This is a daily summary of all recent changes in Confluence.

---------------------------------------------------------------------
Updated Spaces:
---------------------------------------------------------------------

Apache Aries (http://cwiki.apache.org/confluence/display/ARIES)

Pages
---------------------------------------------------------------------
Tutorials edited by zoe (08:13 AM)
http://cwiki.apache.org/confluence/display/ARIES/Tutorials

Apache Camel (http://cwiki.apache.org/confluence/display/CAMEL)

Pages
---------------------------------------------------------------------
Camel Transport for CXF edited by njiang (12:28 PM)
http://cwiki.apache.org/confluence/display/CAMEL/Camel+Transport+for+CXF

Log edited by davsclaus (11:48 AM)
http://cwiki.apache.org/confluence/display/CAMEL/Log

HTTP edited by davsclaus (09:39 AM)
http://cwiki.apache.org/confluence/display/CAMEL/HTTP

Camel 2.1.0 Release edited by davsclaus (05:14 AM)
http://cwiki.apache.org/confluence/display/CAMEL/Camel+2.1.0+Release

Apache Directory Server v1.0 (http://cwiki.apache.org/confluence/display/DIRxSRVx10)

Pages
---------------------------------------------------------------------
Downloads edited by pamarcelot (09:10 AM)
http://cwiki.apache.org/confluence/display/DIRxSRVx10/Downloads

Empire DB (http://cwiki.apache.org/confluence/display/empiredb)

Pages
---------------------------------------------------------------------
Index edited by francisdb (07:30 PM)
http://cwiki.apache.org/confluence/display/empiredb/Index

Similar Projects created by francisdb (07:22 PM)
http://cwiki.apache.org/confluence/display/empiredb/Similar+Projects

Apache Felix (http://cwiki.apache.org/confluence/display/FELIX)

Pages
---------------------------------------------------------------------
news edited by fmeschbe (01:06 AM)
http://cwiki.apache.org/confluence/display/FELIX/news

downloads edited by fmeschbe (01:04 AM)
http://cwiki.apache.org/confluence/display/FELIX/downloads

Apache Geronimo v2.2 (http://cwiki.apache.org/confluence/display/GMOxDOC22)

Pages
---------------------------------------------------------------------
Building Geronimo with Maven edited by chirunhua@... (09:58 AM)
http://cwiki.apache.org/confluence/display/GMOxDOC22/Building+Geronimo+with+Maven

Apache Ivy (Apache Ant subproject) (http://cwiki.apache.org/confluence/display/IVY)

Pages
---------------------------------------------------------------------
Ivy Resources edited by dszuksztul (02:12 PM)
http://cwiki.apache.org/confluence/display/IVY/Ivy+Resources

Apache Maven (http://cwiki.apache.org/confluence/display/MAVEN)

Pages
---------------------------------------------------------------------
Maven 3.x Compatibility Notes edited by bentmann (03:47 PM)
http://cwiki.apache.org/confluence/display/MAVEN/Maven+3.x+Compatibility+Notes

Apache Qpid (http://cwiki.apache.org/confluence/display/qpid)

Pages
---------------------------------------------------------------------
Download edited by jonathan.robie@... (07:59 PM)
http://cwiki.apache.org/confluence/display/qpid/Download

Apache Struts 2 Plugin Registry (http://cwiki.apache.org/confluence/display/S2PLUGINS)

Pages
---------------------------------------------------------------------
viewpage.action?spaceKey=S2PLUGINS&title=jQuery%20plugin created by leandrodias.silva (11:47 AM)
http://cwiki.apache.org/confluence/pages/viewpage.action?pageId=5963932

Apache ServiceMix NMR (http://cwiki.apache.org/confluence/display/SMX4NMR)

Pages
---------------------------------------------------------------------
10. Events edited by slewis (03:13 PM)
http://cwiki.apache.org/confluence/display/SMX4NMR/10.+Events

Apache Stonehenge (http://cwiki.apache.org/confluence/display/STONEHENGE)

Pages
---------------------------------------------------------------------
November 2009 Report created by nickh (07:08 PM)
http://cwiki.apache.org/confluence/display/STONEHENGE/November+2009+Report

Index edited by nickh (07:09 PM)
http://cwiki.apache.org/confluence/display/STONEHENGE/Index

Tuscany Wiki (http://cwiki.apache.org/confluence/display/TUSCANYWIKI)

Pages
---------------------------------------------------------------------
Conformance Testing edited by ramkumar.rj (11:42 AM)
http://cwiki.apache.org/confluence/display/TUSCANYWIKI/Conformance+Testing

Apache VCL (http://cwiki.apache.org/confluence/display/VCL)

Pages
---------------------------------------------------------------------
Management Node Installation edited by arkurth (08:51 PM)
http://cwiki.apache.org/confluence/display/VCL/Management+Node+Installation

---------------------------------------------------------------------
Users
---------------------------------------------------------------------

gbpanchal
http://cwiki.apache.org/confluence/display/~gbpanchal

Change your notification preferences: http://cwiki.apache.org/confluence/users/viewnotifications.action