Author: henrib
Date: Tue Aug  7 17:08:50 2012
New Revision: 1370369

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

Modified:
    commons/proper/jexl/trunk/RELEASE-NOTES.txt
    commons/proper/jexl/trunk/pom.xml
    commons/proper/jexl/trunk/src/site/xdoc/changes.xml
    commons/proper/jexl/trunk/src/site/xdoc/index.xml

Modified: commons/proper/jexl/trunk/RELEASE-NOTES.txt
URL: 
http://svn.apache.org/viewvc/commons/proper/jexl/trunk/RELEASE-NOTES.txt?rev=1370369&r1=1370368&r2=1370369&view=diff
==============================================================================
--- commons/proper/jexl/trunk/RELEASE-NOTES.txt (original)
+++ commons/proper/jexl/trunk/RELEASE-NOTES.txt Tue Aug  7 17:08:50 2012
@@ -63,14 +63,6 @@ New features in 3.0:
 * JEXL-127:     Allow the creation of functions
 * JEXL-123:     Redesign API for stability
 * JEXL-122:     Move JEXL from org.apache.comms.jexl2 to 
org.apache.commons.jexl3
-
-
-========================================================================================================================
-Release 2.1.2:
-========================================================================================================================
-
-Version 2.1.2 is a micro release to fix issues reported in 2.1.1:
-
 * JEXL-136:     Script calls within scripts may fail with number arguments
 * JEXL-135:     Using map as script parameter or local variable
 * JEXL-134:     Issue with evaluation of concat of variables : \r + \n gives 0

Modified: commons/proper/jexl/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/jexl/trunk/pom.xml?rev=1370369&r1=1370368&r2=1370369&view=diff
==============================================================================
--- commons/proper/jexl/trunk/pom.xml (original)
+++ commons/proper/jexl/trunk/pom.xml Tue Aug  7 17:08:50 2012
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-parent</artifactId>
-        <version>24</version>
+        <version>25</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.commons</groupId>

Modified: commons/proper/jexl/trunk/src/site/xdoc/changes.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/site/xdoc/changes.xml?rev=1370369&r1=1370368&r2=1370369&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/site/xdoc/changes.xml (original)
+++ commons/proper/jexl/trunk/src/site/xdoc/changes.xml Tue Aug  7 17:08:50 2012
@@ -44,8 +44,6 @@
             <action dev="henrib" type="add" issue="JEXL-122">
                 Move JEXL from org.apache.comms.jexl2 to 
org.apache.commons.jexl3
             </action>
-        </release>
-        <release version="2.1.2" date="2012-08-30">
             <action dev="henrib" type="fix" issue="JEXL-136">
                 Script calls within scripts may fail with number arguments
             </action>

Modified: commons/proper/jexl/trunk/src/site/xdoc/index.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/site/xdoc/index.xml?rev=1370369&r1=1370368&r2=1370369&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/site/xdoc/index.xml (original)
+++ commons/proper/jexl/trunk/src/site/xdoc/index.xml Tue Aug  7 17:08:50 2012
@@ -6,9 +6,9 @@
    The ASF licenses this file to You 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.
@@ -93,11 +93,13 @@ working with enterprise platforms.
             these specifications, see the <a 
href="http://commons.apache.org/el";>Commons EL</a> project.
             </p>
         </section>
-    
+
         <section name="A Brief Example">
             <p>
             When evaluating expressions, JEXL merges an
-                <a 
href="apidocs/org/apache/commons/jexl3/Expression.html">Expression</a>
+                <a 
href="apidocs/org/apache/commons/jexl3/JexlExpression.html">JexlExpression</a>
+                or a
+                <a 
href="apidocs/org/apache/commons/jexl3/JexlScript.html">JexlScript</a>
             with a
                 <a 
href="apidocs/org/apache/commons/jexl3/JexlContext.html">JexlContext</a>.
             An Expression is created using
@@ -109,11 +111,12 @@ working with enterprise platforms.
             </p>
 
             <source><![CDATA[
-            // Create or retrieve a JexlEngine
-            JexlEngine jexl = new JexlEngine();
-            // Create an expression object
+            // Create or retrieve an engine
+            JexlEngine jexl = new JexlBuilder().create();
+
+            // Create an expression
             String jexlExp = "foo.innerFoo.bar()";
-            Expression e = jexl.createExpression( jexlExp );
+            JexlExpression e = jexl.createExpression( jexlExp );
 
             // Create a context and add data
             JexlContext jc = new MapContext();
@@ -133,6 +136,7 @@ working with enterprise platforms.
             <ul>
                 <li>Support for invocation of any accessible method (see 
example above).</li>
                 <li>Support for setting/getting any accessible public 
field.</li>
+                <li>A general <span class="literal">new()</span> method 
allowing to instantiate objects.</li>
                 <li>A general <span class="literal">size()</span> method, 
which works on:
                     <ul>
                         <li><span class="literal">String</span> - returns 
length</li>
@@ -141,9 +145,10 @@ working with enterprise platforms.
                     </ul>
                 </li>
                 <li>A general <span class="literal">empty()</span> method, 
which works on Collections and Strings.</li>
-                <li>A general <span class="literal">new()</span> method 
allowing to instantiate objects.</li>
                 <li>Support for the ternary operator 'a ? b : c' - and its 
GNU-C / "Elvis" variant 'a ?: c'.</li>
                 <li>Support for the Perl-like regex matching operators '=~' 
and '!~'</li>
+                <li>Support for the CSS3-inspired 'startsWith' and 'endsWith' 
operators '=^' and '=$'</li>
+                <li>Support for user-defined functions.</li>
                 <li>Misc : '+' has been overloaded to be use as a String 
concatenation operator</li>
             </ul>
 
@@ -158,7 +163,7 @@ working with enterprise platforms.
             <ul>
                 <li>
                     <a href="http://java.sun.com/products/jsp/index.jsp";>JSP 
2.0</a> is covered
-            by Java Specification Requests (JSR) 
+            by Java Specification Requests (JSR)
                     <a href="http://www.jcp.org/en/jsr/detail?id=152";>JSR-152: 
JavaServer
             Pages 2.0 Specification</a>.
                 </li>
@@ -177,7 +182,7 @@ working with enterprise platforms.
             <subsection name="Velocity">
                 <p>
                     <a href="http://velocity.apache.org/";>Apache Velocity</a> 
implements
-            a similar expression language. 
+            a similar expression language.
                 </p>
                 <p>
             In particular the <a 
href="http://velocity.apache.org/engine/devel/user-guide.html#References";>References</a>


Reply via email to