yoavs 2005/07/26 17:04:13
Modified: catalina build.xml
webapps/docs changelog.xml
Log:
Minimal, quick, ugly fix for Bugzilla 35880:
http://issues.apache.org/bugzilla/show_bug.cgi?id=35880
Revision Changes Path
1.84 +16 -0 jakarta-tomcat-catalina/catalina/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/build.xml,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- build.xml 26 Jul 2005 12:45:22 -0000 1.83
+++ build.xml 27 Jul 2005 00:04:12 -0000 1.84
@@ -741,6 +741,18 @@
<target name="javadoc" unless="docs.uptodate" >
<delete dir="${catalina.build}/javadoc"/>
<mkdir dir="${catalina.build}/javadoc"/>
+
+ <!-- To fix Bugzilla 35880, we need to ensure files that use J2SE 5.0
+ syntax are not JavaDoc'ed. Even though no other target uses
+ javadoc.sourcepath and I could rewrite the javadoc target below,
+ that might impact users who use javadoc.sourcepath in their own
+ build scripts. Accordingly, let's try this ugly temporary
+ fix. When we start building Tomcat with J2SE 5.0, we can remove
+ this ugliness.
+ -->
+ <move
file="${jtc.home}/util/java/org/apache/tomcat/util/net/jsse/JSSE15SocketFactory.java"
+
tofile="${jtc.home}/util/java/org/apache/tomcat/util/net/jsse/JSSE15SocketFactory.temp"
/>
+
<javadoc packagenames="org.apache.*"
classpathref="catalina.classpath"
sourcepathref="javadoc.sourcepath"
@@ -755,7 +767,11 @@
<excludepackage name="org.apache.coyote.tomcat3" />
<excludepackage name="org.apache.coyote.tomcat4" />
<excludepackage name="org.apache.jk.apr" />
+
</javadoc>
+
+ <move
file="${jtc.home}/util/java/org/apache/tomcat/util/net/jsse/JSSE15SocketFactory.temp"
+
tofile="${jtc.home}/util/java/org/apache/tomcat/util/net/jsse/JSSE15SocketFactory.java"
/>
</target>
1.341 +4 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.340
retrieving revision 1.341
diff -u -r1.340 -r1.341
--- changelog.xml 26 Jul 2005 16:39:14 -0000 1.340
+++ changelog.xml 27 Jul 2005 00:04:13 -0000 1.341
@@ -42,6 +42,10 @@
is not built for Java 5, the valve will have to be compiled from the
sources
using Java 5 (remm)
</add>
+ <fix>
+ <bug>35880</bug>: Ignore JSSE15SocketFactory when generating
JavaDoc, as it breaks
+ the JDK 1.4 JavaDoc tool. (yoavs)
+ </fix>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
