Author: rjung
Date: Wed Jun 9 09:22:32 2010
New Revision: 952919
URL: http://svn.apache.org/viewvc?rev=952919&view=rev
Log:
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.
Modified:
tomcat/trunk/RELEASE-NOTES
tomcat/trunk/build.xml
tomcat/trunk/res/INSTALLLICENSE
tomcat/trunk/res/License.rtf
tomcat/trunk/webapps/docs/class-loader-howto.xml
tomcat/trunk/webapps/docs/jasper-howto.xml
Modified: tomcat/trunk/RELEASE-NOTES
URL:
http://svn.apache.org/viewvc/tomcat/trunk/RELEASE-NOTES?rev=952919&r1=952918&r2=952919&view=diff
==============================================================================
--- tomcat/trunk/RELEASE-NOTES (original)
+++ tomcat/trunk/RELEASE-NOTES Wed Jun 9 09:22:32 2010
@@ -107,7 +107,7 @@ for use by web applications (by placing
* 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)
+* e...@[email protected] (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)
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=952919&r1=952918&r2=952919&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Wed Jun 9 09:22:32 2010
@@ -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 -->
Modified: tomcat/trunk/res/INSTALLLICENSE
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/INSTALLLICENSE?rev=952919&r1=952918&r2=952919&view=diff
==============================================================================
--- tomcat/trunk/res/INSTALLLICENSE (original)
+++ tomcat/trunk/res/INSTALLLICENSE Wed Jun 9 09:22:32 2010
@@ -210,7 +210,7 @@ and license terms. Your use of these sub
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 comp
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.
Modified: tomcat/trunk/res/License.rtf
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/License.rtf?rev=952919&r1=952918&r2=952919&view=diff
==============================================================================
Binary files - no diff available.
Modified: tomcat/trunk/webapps/docs/class-loader-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/class-loader-howto.xml?rev=952919&r1=952918&r2=952919&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/class-loader-howto.xml (original)
+++ tomcat/trunk/webapps/docs/class-loader-howto.xml Wed Jun 9 09:22:32 2010
@@ -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>
Modified: tomcat/trunk/webapps/docs/jasper-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/jasper-howto.xml?rev=952919&r1=952918&r2=952919&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/jasper-howto.xml (original)
+++ tomcat/trunk/webapps/docs/jasper-howto.xml Wed Jun 9 09:22:32 2010
@@ -198,7 +198,7 @@ tens of JARs. On fast servers, this will
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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
