CLK-306
git-svn-id: https://svn.apache.org/repos/asf/click/trunk/click@1197512 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/documentation/xdocs/src/docbook/click/chapter-configuration.xml b/documentation/xdocs/src/docbook/click/chapter-configuration.xml
index 801eb8a..174f641 100644
--- a/documentation/xdocs/src/docbook/click/chapter-configuration.xml
+++ b/documentation/xdocs/src/docbook/click/chapter-configuration.xml
@@ -118,7 +118,7 @@
<sect2 id="type-converter-class" remap="h3">
<title>Type Converter Class</title>
- <para>The ClickServlet uses the OGNL library for type coercion when binding
+ <para>The ClickServlet uses the MVEL library for type coercion when binding
request parameters to bindable variables. The default type converter class
used is <ulink url="click-api/org/apache/click/util/RequestTypeConverter.html">RequestTypeConverter</ulink>.
To specify your own type converter configure a <literal>type-converter-class</literal>
diff --git a/extras/src/org/apache/click/extras/control/FieldColumn.java b/extras/src/org/apache/click/extras/control/FieldColumn.java
index efb873f..4a6172a 100644
--- a/extras/src/org/apache/click/extras/control/FieldColumn.java
+++ b/extras/src/org/apache/click/extras/control/FieldColumn.java
@@ -150,7 +150,7 @@
* Set a row value based on the given property name and value. The given row
* can either be a Java Object or a Map instance.
* <p/>
- * If the row is a Java Object this method uses OGNL to set the value of the
+ * If the row is a Java Object this method uses MVEL to set the value of the
* row based on the property name. Property names can be specified using a
* path expression e.g: "person.address.city".
* <p/>
diff --git a/extras/src/org/apache/click/extras/gae/GoogleAppEngineListener.java b/extras/src/org/apache/click/extras/gae/GoogleAppEngineListener.java
index db45c5d..9a23218 100644
--- a/extras/src/org/apache/click/extras/gae/GoogleAppEngineListener.java
+++ b/extras/src/org/apache/click/extras/gae/GoogleAppEngineListener.java
@@ -227,11 +227,7 @@
}
/**
- * Sets the Ognl Runtime SecurityManager to <tt>null</tt> so as not to
- * interfere with Google App Engine (GAE).
- *
- * <pre class="prettyprint">
- * OgnlRuntime.setSecurityManager(null); </pre>
+ * This method does nothing.
*
* @param servletContextEvent the event class for notifications about
* changes to the servlet context
diff --git a/framework/src/org/apache/click/PageInterceptor.java b/framework/src/org/apache/click/PageInterceptor.java
index 10b2625..901f4af 100644
--- a/framework/src/org/apache/click/PageInterceptor.java
+++ b/framework/src/org/apache/click/PageInterceptor.java
@@ -60,7 +60,7 @@
* <p/>
* Page interceptors can have multiple properties configured with their XML
* definition which are set after the constructor has been called. Properties
- * are set using OGNL via {@link org.apache.click.util.PropertyUtils}.
+ * are set using MVEL via {@link org.apache.click.util.PropertyUtils}.
* <p/>
* An example configuration is provided below:
*
diff --git a/framework/src/org/apache/click/control/Form.java b/framework/src/org/apache/click/control/Form.java
index 7aabd93..7fbcd48 100644
--- a/framework/src/org/apache/click/control/Form.java
+++ b/framework/src/org/apache/click/control/Form.java
@@ -137,7 +137,7 @@
* "<tt>debug</tt>" or use the debug copy methods.
* <p/>
* Binding of nested data objects is supported using the
- * <a target="blank" href="http://www.ognl.org">OGNL</a> library. To use
+ * <a target="blank" href="http://mvel.codehaus.org/">MVEL</a> library. To use
* nested objects in your form, simply specify the object path as the Field
* name. Note in the object path you exclude the root object, so the path
* <tt>customer.address.state</tt> is specified as <tt>address.state</tt>.
