Author: bwallace
Date: Mon Apr 24 23:09:08 2006
New Revision: 396779
URL: http://svn.apache.org/viewcvs?rev=396779&view=rev
Log:
[TAPESTRY-617] Added context class loader parameter to Ognl.getValue call
Added:
tapestry/tapestry4/branches/branch-3-0/framework/src/org/apache/tapestry/util/prop/OgnlClassResolver.java
Modified:
tapestry/tapestry4/branches/branch-3-0/contrib/src/org/apache/tapestry/contrib/table/model/ognl/OgnlTableColumnEvaluator.java
Modified:
tapestry/tapestry4/branches/branch-3-0/contrib/src/org/apache/tapestry/contrib/table/model/ognl/OgnlTableColumnEvaluator.java
URL:
http://svn.apache.org/viewcvs/tapestry/tapestry4/branches/branch-3-0/contrib/src/org/apache/tapestry/contrib/table/model/ognl/OgnlTableColumnEvaluator.java?rev=396779&r1=396778&r2=396779&view=diff
==============================================================================
---
tapestry/tapestry4/branches/branch-3-0/contrib/src/org/apache/tapestry/contrib/table/model/ognl/OgnlTableColumnEvaluator.java
(original)
+++
tapestry/tapestry4/branches/branch-3-0/contrib/src/org/apache/tapestry/contrib/table/model/ognl/OgnlTableColumnEvaluator.java
Mon Apr 24 23:09:08 2006
@@ -14,6 +14,9 @@
package org.apache.tapestry.contrib.table.model.ognl;
+import java.util.Map;
+
+import ognl.ClassResolver;
import ognl.Ognl;
import ognl.OgnlException;
@@ -21,6 +24,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.tapestry.contrib.table.model.ITableColumn;
import org.apache.tapestry.contrib.table.model.simple.ITableColumnEvaluator;
+import org.apache.tapestry.util.prop.OgnlClassResolver;
import org.apache.tapestry.util.prop.OgnlUtils;
/**
@@ -32,6 +36,8 @@
private static final Log LOG =
LogFactory.getLog(ExpressionTableColumn.class);
+ private final ClassResolver _ognlResolver = new OgnlClassResolver();
+
private String m_strExpression;
transient private Object m_objParsedExpression = null;
@@ -58,7 +64,8 @@
try
{
- Object objValue = Ognl.getValue(m_objParsedExpression,
objRow);
+ Map context = Ognl.createDefaultContext(objRow, _ognlResolver);
+ Object objValue = Ognl.getValue(m_objParsedExpression,
context, objRow);
return objValue;
}
catch (OgnlException e)
Added:
tapestry/tapestry4/branches/branch-3-0/framework/src/org/apache/tapestry/util/prop/OgnlClassResolver.java
URL:
http://svn.apache.org/viewcvs/tapestry/tapestry4/branches/branch-3-0/framework/src/org/apache/tapestry/util/prop/OgnlClassResolver.java?rev=396779&view=auto
==============================================================================
---
tapestry/tapestry4/branches/branch-3-0/framework/src/org/apache/tapestry/util/prop/OgnlClassResolver.java
(added)
+++
tapestry/tapestry4/branches/branch-3-0/framework/src/org/apache/tapestry/util/prop/OgnlClassResolver.java
Mon Apr 24 23:09:08 2006
@@ -0,0 +1,58 @@
+// Copyright 2004, 2005 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.apache.tapestry.util.prop;
+
+import java.util.Map;
+
+import ognl.ClassResolver;
+
+/**
+ * Implementation of OGNL's ClassResolver (which is unfortunately, named
+ * the same as HiveMind's ClassResolver).
+ *
+ * @author Howard Lewis Ship
+ */
+public class OgnlClassResolver implements ClassResolver
+{
+ private ClassLoader _loader;
+
+ /**
+ * Creates a new ClassResolver with the current thread's context class
loader
+ *
+ */
+ public OgnlClassResolver()
+ {
+ this(Thread.currentThread().getContextClassLoader());
+ }
+
+ /**
+ * Creates a new ClassResolver with the specified class loader
+ * @param loader ClassLoader to use for class resolution
+ */
+ public OgnlClassResolver(ClassLoader loader)
+ {
+ _loader = loader;
+ }
+
+ /**
+ *
+ * @see ognl.ClassResolver#classForName(java.lang.String, java.util.Map)
+ */
+ public Class classForName(String name, Map context) throws
ClassNotFoundException
+ {
+ return Class.forName(name, true, _loader);
+ }
+
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
