Renamed Java 1.5/1.6 to Java 5/6

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/bsf/trunk@1508767 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/TODO.txt b/TODO.txt
index de8c213..8f52c84 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -10,7 +10,7 @@
 
         - add new BSF engines for BSF 2.4
 
-        - create a new BSF 3.0 which complies to JSR-223 (which is part of Java 1.6),
+        - create a new BSF 3.0 which complies to JSR-223 (which is part of Java 6),
           some features being
 
           - BSF 3.0 will be available as FOSS for earlier version of Java
diff --git a/docs/index.html b/docs/index.html
index e736de2..e2d54a6 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -138,10 +138,10 @@
 <br />
 The new version of Apache BSF is represent by the 3.x releases.
 The 3.x version uses the API defined as part of JSR-223 (javax.script),
-which is included in Java 1.6 onwards.
+which is included in Java 6 onwards.
 However BSF 3.x will run on Java 1.4+, allowing access to JSR-223 scripting
-for Java 1.4 and Java 1.5.
-Apache BSF 3.x is also useful for Java 1.6 as it contains a command-line utility for
+for Java 1.4 and Java 5.
+Apache BSF 3.x is also useful for Java 6 as it contains a command-line utility for
 testing JSR-223 scripts as well as some utility classes for working with XML.
 </p>
                     </blockquote>
@@ -258,13 +258,13 @@
 The following references describe the standard API (javax.script) which is implemented by BSF 3.x:
 <ul>
 <li><a href="http://jcp.org/aboutJava/communityprocess/final/jsr223/index.html">JSR-223 Scripting for the Java Platform</a> - specification (PDF)</li>
-<li><a href="http://java.sun.com/javase/6/docs/api/javax/script/package-summary.html">Javadoc for javax.script classes</a> in Java 1.6</li>
+<li><a href="http://java.sun.com/javase/6/docs/api/javax/script/package-summary.html">Javadoc for javax.script classes</a> in Java 6</li>
 <li><a href="http://java.sun.com/developer/technicalArticles/J2SE/Desktop/scripting/">Scripting for the Java platform (Sun technical article)</a></li>
 </ul>
 </p>
                                 <p>
-Apache BSF 3.x includes an implementation of JSR-223 (javax.script) and runs on Java 1.4 and Java 1.5.
-(Java 1.6 includes javax.script as standard.)
+Apache BSF 3.x includes an implementation of JSR-223 (javax.script) and runs on Java 1.4 and Java 5.
+(Java 6 includes javax.script as standard.)
 Note that although the implementation follows the JSR-223 specification, it has not been tested against
 the JSR-223 TCK. 
 Apache BSF 3.x can therefore not strictly be described as a compatible implementation of JSR-223,
@@ -272,7 +272,7 @@
 </p>
                                 <p>
 Apache BSF 3.x also includes some utility classes for working with XML.
-These can be used with any used with any implementation of the javax.scripting package, including the one in Java 1.6+.
+These can be used with any used with any implementation of the javax.scripting package, including the one in Java 6+.
 </p>
                                 <p>
 There is also a command-line utility which can be used to run scripts in any language engine which supports JSR-223.
@@ -287,11 +287,11 @@
 it may be difficult or impossible to choose which version is loaded. 
 <br />
 If the language implementation is not present, the factory class may fail to load;
-with some implementations of javax.script (e.g. Sun Java 1.6) this may prevent any factories from loading.
+with some implementations of javax.script (e.g. Sun Java 6) this may prevent any factories from loading.
 </p>
                                 <p>
 An example language which includes the necessary engine factory is:
-<a href="http://commons.apache.org/jexl/">Apache Jexl 2.0</a> (requires Java 1.5).
+<a href="http://commons.apache.org/jexl/">Apache Jexl 2.0</a> (requires Java 5).
 Some other scripting languages also come with their own factories already included.
 For example <a href="http://groovy.codehaus.org/">Groovy</a> and <a href="http://jruby.org/">JRuby</a>.  
 </p>
diff --git a/pom.xml b/pom.xml
index a822595..4971f2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,7 @@
       <commons.release.desc></commons.release.desc>
 
       <commons.release.2.version>3.1</commons.release.2.version>
-      <commons.release.2.desc>(Requires Java 1.5 or later)</commons.release.2.desc>
+      <commons.release.2.desc>(Requires Java 5 or later)</commons.release.2.desc>
       
       <commons.jira.id>BSF</commons.jira.id>
       <commons.jira.pid>12310621</commons.jira.pid>
diff --git a/samples/xsl/TableFiller.jrexx b/samples/xsl/TableFiller.jrexx
index 222edf7..913c6e1 100644
--- a/samples/xsl/TableFiller.jrexx
+++ b/samples/xsl/TableFiller.jrexx
@@ -4,15 +4,15 @@
    purpose:    demonstrate how to use the xsl-BSF-engine from ooRexx, modelled after

                "TableFiller.java"

 

-   needs:      Java 4.x *or*

+   needs:      Java 1.4.x *or*

 

-               Note on using Java 1.5, Java 1.6 or higher:

+               Note on using Java 5, Java 6 or higher:

 

                - if the sample does not work in these environments then, copy the Xalan-jars from

                  "http://xml.apache.org/xalan-j/downloads.html" distribution into the "endorsed"

                  directory of these Java versions (e.g. "JAVA_JRE_HOME /jre/lib/endorsed/"); make

                  sure that the archive "xalan.jar" (from the xalan-tool jar) is available as well;

-                 tested with Xalan 2.7 and 2.8 on Java 1.5 and beta-version of Java 1.6

+                 tested with Xalan 2.7 and 2.8 on Java 5 and beta-version of Java 6

 

    usage:      rexxj TableFiller.rex style1.xsl table-data.xml

                rexxj TableFiller.rex style2.xsl table-data.xml

diff --git a/samples/xsl/readme b/samples/xsl/readme
index 8160a4d..ec824d7 100644
--- a/samples/xsl/readme
+++ b/samples/xsl/readme
@@ -10,13 +10,13 @@
 or
 	java TableFiller style2.xsl table-data.xml
 
-        Note on using Java 1.5, Java 1.6 or higher:
+        Note on using Java 5, Java 6 or higher:
 
         - if the sample does not work in these environments then, copy the Xalan-jars from
           "http://xml.apache.org/xalan-j/downloads.html" distribution into the "endorsed"
           directory of these Java versions (e.g. "JAVA_JRE_HOME /jre/lib/endorsed/"); make
           sure that the archive "xalan.jar" (from the xalan-tool jar) is available as well;
-          tested with Xalan 2.7 and 2.8 on Java 1.5 and beta-version of Java 1.6
+          tested with Xalan 2.7 and 2.8 on Java 5 and beta-version of Java 6
 
 Be impressed and have fun!
 ;-)
diff --git a/src/site/xdoc/download_bsf.xml b/src/site/xdoc/download_bsf.xml
index f5f82f9..bf91275 100644
--- a/src/site/xdoc/download_bsf.xml
+++ b/src/site/xdoc/download_bsf.xml
@@ -125,7 +125,7 @@
         </table>
       </subsection>
     </section>
-    <section name="Apache Commons BSF (Bean Scripting Framework) 3.1 (Requires Java 1.5 or later)">
+    <section name="Apache Commons BSF (Bean Scripting Framework) 3.1 (Requires Java 5 or later)">
       <subsection name="Binaries">
         <table>
           <tr>
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index c35f57f..95e924b 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -51,10 +51,10 @@
 <br />
 The new version of Apache BSF is represent by the 3.x releases.
 The 3.x version uses the API defined as part of JSR-223 (javax.script),
-which is included in Java 1.6 onwards.
+which is included in Java 6 onwards.
 However BSF 3.x will run on Java 1.4+, allowing access to JSR-223 scripting
-for Java 1.4 and Java 1.5.
-Apache BSF 3.x is also useful for Java 1.6 as it contains a command-line utility for
+for Java 1.4 and Java 5.
+Apache BSF 3.x is also useful for Java 6 as it contains a command-line utility for
 testing JSR-223 scripts as well as some utility classes for working with XML.
 </p>
   </section>
@@ -155,13 +155,13 @@
 The following references describe the standard API (javax.script) which is implemented by BSF 3.x:
 <ul>
 <li><a href="http://jcp.org/aboutJava/communityprocess/final/jsr223/index.html">JSR-223 Scripting for the Java Platform</a> - specification (PDF)</li>
-<li><a href="http://java.sun.com/javase/6/docs/api/javax/script/package-summary.html">Javadoc for javax.script classes</a> in Java 1.6</li>
+<li><a href="http://java.sun.com/javase/6/docs/api/javax/script/package-summary.html">Javadoc for javax.script classes</a> in Java 6</li>
 <li><a href="http://java.sun.com/developer/technicalArticles/J2SE/Desktop/scripting/">Scripting for the Java platform (Sun technical article)</a></li>
 </ul>
 </p>
 <p>
-Apache BSF 3.x includes an implementation of JSR-223 (javax.script) and runs on Java 1.4 and Java 1.5.
-(Java 1.6 includes javax.script as standard.)
+Apache BSF 3.x includes an implementation of JSR-223 (javax.script) and runs on Java 1.4 and Java 5.
+(Java 6 includes javax.script as standard.)
 Note that although the implementation follows the JSR-223 specification, it has not been tested against
 the JSR-223 TCK. 
 Apache BSF 3.x can therefore not strictly be described as a compatible implementation of JSR-223,
@@ -169,7 +169,7 @@
 </p>
 <p>
 Apache BSF 3.x also includes some utility classes for working with XML.
-These can be used with any used with any implementation of the javax.scripting package, including the one in Java 1.6+.
+These can be used with any used with any implementation of the javax.scripting package, including the one in Java 6+.
 </p>
 <p>
 There is also a command-line utility which can be used to run scripts in any language engine which supports JSR-223.
@@ -184,11 +184,11 @@
 it may be difficult or impossible to choose which version is loaded. 
 <br/>
 If the language implementation is not present, the factory class may fail to load;
-with some implementations of javax.script (e.g. Sun Java 1.6) this may prevent any factories from loading.
+with some implementations of javax.script (e.g. Sun Java 6) this may prevent any factories from loading.
 </p>
 <p>
 An example language which includes the necessary engine factory is:
-<a href="http://commons.apache.org/jexl/">Apache Jexl 2.0</a> (requires Java 1.5).
+<a href="http://commons.apache.org/jexl/">Apache Jexl 2.0</a> (requires Java 5).
 Some other scripting languages also come with their own factories already included.
 For example <a href="http://groovy.codehaus.org/">Groovy</a> and <a href="http://jruby.org/">JRuby</a>.  
 </p>