commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hen...@apache.org
Subject svn commit: r1718616 - in /commons/proper/jexl/trunk/src/site/xdoc/reference: examples.xml jsr223.xml
Date Tue, 08 Dec 2015 14:14:28 GMT
Author: henrib
Date: Tue Dec  8 14:14:28 2015
New Revision: 1718616

URL: http://svn.apache.org/viewvc?rev=1718616&view=rev
Log:
JEXL:
Removed reference to Java 1.5;

Modified:
    commons/proper/jexl/trunk/src/site/xdoc/reference/examples.xml
    commons/proper/jexl/trunk/src/site/xdoc/reference/jsr223.xml

Modified: commons/proper/jexl/trunk/src/site/xdoc/reference/examples.xml
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/site/xdoc/reference/examples.xml?rev=1718616&r1=1718615&r2=1718616&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/site/xdoc/reference/examples.xml (original)
+++ commons/proper/jexl/trunk/src/site/xdoc/reference/examples.xml Tue Dec  8 14:14:28 2015
@@ -69,7 +69,7 @@
         The easiest way of obtaining a a context is to use the
         <a href="http://commons.apache.org/jexl/apidocs/org/apache/commons/jexl3/MapContext.html#MapContext()">new
MapContext()</a>
         statement. This creates a context implemented using an underlying
-        <a href="http://java.sun.com/j2se/1.5.0/docs/api/java/util/HashMap.html">HashMap</a>
+        <a href="https://docs.oracle.com/javase/6/docs/api/java/util/HashMap.html">HashMap</a>
       </p>
       <p>
         <a href="http://commons.apache.org/jexl/apidocs/org/apache/commons/jexl3/Expression.html">Expressions</a>
are

Modified: commons/proper/jexl/trunk/src/site/xdoc/reference/jsr223.xml
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/site/xdoc/reference/jsr223.xml?rev=1718616&r1=1718615&r2=1718616&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/site/xdoc/reference/jsr223.xml (original)
+++ commons/proper/jexl/trunk/src/site/xdoc/reference/jsr223.xml Tue Dec  8 14:14:28 2015
@@ -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.
@@ -26,7 +26,7 @@
       <p>
       Commons JEXL includes JSR-223 (javax.script) support.
       The binary jar includes the scripting factory
-      and the services definition javax.script.ScriptEngineFactory, 
+      and the services definition javax.script.ScriptEngineFactory,
       so no special configuration is needed.
       </p>
     </section>
@@ -38,15 +38,15 @@
       <li>Extensions: ".jexl"</li>
       <li>Mime-types: "application/x-jexl"</li>
       </ul>
-      Script Engine versions from "2.0" also implement the following:
+      Script Engine versions from "3.0" also implement the following:
       <ul>
-      <li>Language names: "JEXL2", "Jexl2", "jexl2"</li>
-      <li>Extensions: ".jexl2"</li>
-      <li>Mime-types: "application/x-jexl2"</li>
+      <li>Language names:  "JEXL2", "Jexl2", "jexl2", "JEXL3", "Jexl3", "jexl3"</li>
+      <li>Extensions: ".jexl2", ".jexl3"</li>
+      <li>Mime-types: "application/x-jexl2", "application/x-jexl3"</li>
       </ul>
-      The implementation adds an instance of 
+      The implementation adds an instance of
       <a href="http://commons.apache.org/jexl/apidocs/org/apache/commons/jexl/scripting/JexlScriptObject.html">JexlScriptObject</a>
-      to the engine context as the variable "JEXL". 
+      to the engine context as the variable "JEXL".
       This gives scripts easier access to various items such as System.out and a logger.
       </p>
     </section>
@@ -54,26 +54,14 @@
         <p>
         The binary release includes a command-line application which can be used to exercise
the JSR-223 script engine.
         For example:
-        <source>java -cp commons-jexl-2.0.1.jar;commons-logging-1.1.1.jar[;bsf-api-3.0.jar]
+        <source>java -cp commons-jexl-3.0.jar;commons-logging-1.2.jar
             org.apache.commons.jexl3.scripting.Main script.jexl</source>
         If a single argument is provided, then that is assumed to be the name of a script
file;
         otherwise, the application prompts for script input to be evaluated.
         In both cases, the variable "args" contains the command-line arguments.
-        [Note that Java 1.5 does not include javax.script support; you will need to use the
Apache BSF API jar as indicated.]
         </p>
     </section>
-    <section name="Using JEXL with JSR-223 on Java 1.5">
-      <p>
-      In order to use JEXL via JSR-223 on Java 1.5, you need to add Apache BSF-API 3.0 jar
to the classpath.
-      JEXL also requires Commons Logging on the classpath.
-      </p>
-    </section>
-    <section name="Using JEXL with JSR-223 on Java 1.6+">
-      <p>
-      JSR-223 support is included with Java 1.6+. 
-      JEXL requires Commons Logging, which needs to be included in the path.
-      </p>
-    </section>
+
     <section name="JSR-223 support classes">
       <p>
         The classes used to support JSR-223 scripting access are:
@@ -86,4 +74,4 @@
     </section>
   </body>
 </document>
-    
+



Mime
View raw message