Cleanup JDT vs. ECJ:

- Replace "jasper-jdt.jar component" with "Eclipse JDT Java compiler"
  in license texts

- Add JDT version to our ant version filter
  and replace explicit version in release notes file with version tag

- Replace "jasper-jdt.jar" by "ecj-*.jar" in generated documentation.
  I assume people know what we mean by "ecj-*.jar".
  We shouldn't maintain detailed versions in those pages. Alternatively
  running them through the filter means either adding maintenance by
  keeping the file list up-to-date or much overhead by running all of
  them through the filter.
  Renaming the ecj-*.jar to simply ecj.jar or ecj-3.jar would hide
  the full version from the interested observer.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@952919 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 1acfdb1..1c37822 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -107,7 +107,7 @@ for use by web applications (by placing them in "lib"):
 * el-api.jar (EL 2.2 API)
 * jasper.jar (Jasper 2 Compiler and Runtime)
 * jasper-el.jar (Jasper 2 EL implementation)
-* jasper-jdt.jar (Eclipse JDT 3.3 Java compiler)
+* ecj-@JDT_VERSION@.jar (Eclipse JDT Java compiler)
 * jsp-api.jar (JSP 2.2 API)
 * servlet-api.jar (Servlet 3.0 API)
 * tomcat-api.jar (Interfaces shared by Catalina and Jasper)

diff --git a/build.xml b/build.xml
index 26b1b16..f711c7b 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -185,6 +185,7 @@
     <filter token="VERSION_MAJOR" value="${version.major}"/>
     <filter token="VERSION_MAJOR_MINOR" value="${version.major.minor}"/>
     <filter token="VERSION_BUILT" value="${today} ${tstamp}"/>
+    <filter token="JDT_VERSION" value="${jdt.version}"/>
   </filterset>
 
   <!-- Files to change line endings for depending on target platform -->

diff --git a/res/INSTALLLICENSE b/res/INSTALLLICENSE
index 985eb14..affc803 100644 (file)
--- a/res/INSTALLLICENSE
+++ b/res/INSTALLLICENSE
@@ -210,7 +210,7 @@ and license terms. Your use of these subcomponents is subject to the terms and
 conditions of the following licenses. 
 
 
-For the jasper-jdt.jar component:
+For the Eclipse JDT Java compiler:
 
 Eclipse Public License - v 1.0
 
@@ -704,4 +704,4 @@ by name) to the files from the LZMA compression module for NSIS without
 subjecting your linked code to the terms of the Common Public license version
 1.0. Any modifications or additions to files from the LZMA compression module
 for NSIS, however, are subject to the terms of the Common Public License version
-1.0. 
\ No newline at end of file
+1.0. 

diff --git a/res/License.rtf b/res/License.rtf
index 5fd69df..9029eb4 100644 (file)
--- a/res/License.rtf
+++ b/res/License.rtf
@@ -116,7 +116,7 @@ ng permissions and limitations under the License.}
 \par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs18\lang255\ab\ltrch\dbch\af1\langfe255\hich\f1\fs18\lang1033\b\loch\f1\fs18\lang1033\b \r
 \par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs18\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs18\lang1033\loch\f1\fs18\lang1033 {\rtlch \ltrch\loch\f1\fs18\lang1033\i0\b0 Apache Tomcat includes a number of subcomponents with separate copyright notices and license terms. Your use of the source code for the these subcomponents is subject to the terms and conditions of the following licenses. }\r
 \par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs18\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs18\lang1033\loch\f1\fs18\lang1033 \r
-\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs18\lang255\ab\ltrch\dbch\af1\langfe255\hich\f1\fs18\lang1033\b\loch\f1\fs18\lang1033\b {\rtlch \ltrch\loch\f1\fs18\lang1033\i0\b For the jasper-jdt.jar component:}\r
+\par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs18\lang255\ab\ltrch\dbch\af1\langfe255\hich\f1\fs18\lang1033\b\loch\f1\fs18\lang1033\b {\rtlch \ltrch\loch\f1\fs18\lang1033\i0\b For the Eclipse JDT Java compiler:}\r
 \par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs18\lang255\ab\ltrch\dbch\af1\langfe255\hich\f1\fs18\lang1033\b\loch\f1\fs18\lang1033\b \r
 \par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs18\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs18\lang1033\loch\f1\fs18\lang1033 {\rtlch \ltrch\loch\f1\fs18\lang1033\i0\b0 Eclipse Public License - v 1.0}\r
 \par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af1\afs18\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs18\lang1033\loch\f1\fs18\lang1033 \r
@@ -406,4 +406,4 @@ al property of any Contributor under this Agreement, whether expressly, by impli
 \par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\li180\ri0\lin180\rin0\fi0\rtlch\af1\afs18\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs18\lang1033\loch\f1\fs18\lang1033 {\rtlch \ltrch\loch\f1\fs18\lang1033\i0\b0 Igor Pavlov and Amir Szekely, the authors of the LZMA compression module for NSIS, expressly permit you to statically or dynamically link your code (or bind by name) to the files from the LZMA compression module for NSIS without subjecting your linked code\r
  to the terms of the Common Public license version}\r
 \par \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\li180\ri0\lin180\rin0\fi0\rtlch\af1\afs18\lang255\ltrch\dbch\af1\langfe255\hich\f1\fs18\lang1033\loch\f1\fs18\lang1033 {\rtlch \ltrch\loch\f1\fs18\lang1033\i0\b0 1.0. Any modifications or additions to files from the LZMA compression module for NSIS, however, are subject to the terms of the Common Public License version 1.0. }\r
-\par }
\ No newline at end of file
+\par }\r

diff --git a/webapps/docs/class-loader-howto.xml b/webapps/docs/class-loader-howto.xml
index 9564fbd..f2f3f6c 100644 (file)
--- a/webapps/docs/class-loader-howto.xml
+++ b/webapps/docs/class-loader-howto.xml
@@ -114,7 +114,7 @@ loaders as it is initialized:</p>
     <li><em>el-api.jar</em> - EL 2.1 API.</li>
     <li><em>jasper.jar</em> - Jasper 2 Compiler and Runtime.</li>
     <li><em>jasper-el.jar</em> - Jasper 2 EL implementation.</li>
-    <li><em>jasper-jdt.jar</em> - Eclipse JDT 3.2 Java compiler.</li>
+    <li><em>ecj-*.jar</em> - Eclipse JDT Java compiler.</li>
     <li><em>jsp-api.jar</em> - JSP 2.1 API.</li>
     <li><em>servlet-api.jar</em> - Servlet 3.0 API.</li>
     <li><em>tomcat-coyote.jar</em> - Tomcat connectors and utility classes.</li>

diff --git a/webapps/docs/jasper-howto.xml b/webapps/docs/jasper-howto.xml
index 80fb888..ce6f596 100644 (file)
--- a/webapps/docs/jasper-howto.xml
+++ b/webapps/docs/jasper-howto.xml
@@ -198,7 +198,7 @@ tens of JARs. On fast servers, this will allow sub-second recompilation cycles
 for even large JSP  pages.</p>
 
 <p>Apache Ant, which was used in previous Tomcat releases, can be used instead
-of the new compiler by simply removing the <code>lib/jasper-jdt.jar</code> file, 
+of the new compiler by simply removing the <code>lib/ecj-*.jar</code> file, 
 and placing the <code>ant.jar</code> file from the latest Ant distribution in
 the <code>lib</code> folder.  If you do this, you also need to use the "javac"
 argument to catalina.sh.</p>