Author: kkolinko
Date: Tue Apr 29 00:05:03 2014
New Revision: 1590845
URL: http://svn.apache.org/r1590845
Log:
Merged r1590646 from tomcat/trunk:
Fix Javadoc warnings
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/SSL.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1590646
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?rev=1590845&r1=1590844&r2=1590845&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
Tue Apr 29 00:05:03 2014
@@ -83,8 +83,8 @@ public class AprLifecycleListener
* non-zero "FIPS" modes that specify different allowed subsets of ciphers
* or whatever, but nowadays only "1" is the supported value.
* </p>
- * @see "OpenSSL method <a
href="http://wiki.openssl.org/index.php/FIPS_mode_set%28%29";>FIPS_mode_set()</a>"
- * @see "OpenSSL method <a
href="http://wiki.openssl.org/index.php/FIPS_mode%28%29";>FIPS_mode()</a>"
+ * @see <a
href="http://wiki.openssl.org/index.php/FIPS_mode_set%28%29";>OpenSSL method
FIPS_mode_set()</a>
+ * @see <a
href="http://wiki.openssl.org/index.php/FIPS_mode%28%29";>OpenSSL method
FIPS_mode()</a>
*/
private static final int FIPS_ON = 1;
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/SSL.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/SSL.java?rev=1590845&r1=1590844&r2=1590845&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/SSL.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/SSL.java Tue Apr 29
00:05:03 2014
@@ -236,7 +236,7 @@ public final class SSL {
* @return FIPS_mode return code. It is <code>0</code> if OpenSSL is not
* in FIPS mode, <code>1</code> if OpenSSL is in FIPS Mode.
* @throws Exception If tcnative was not compiled with FIPS Mode available.
- * @see "OpenSSL method <a
href="http://wiki.openssl.org/index.php/FIPS_mode%28%29";>FIPS_mode()</a>"
+ * @see <a
href="http://wiki.openssl.org/index.php/FIPS_mode%28%29";>OpenSSL method
FIPS_mode()</a>
*/
public static native int fipsModeGet() throws Exception;
@@ -248,7 +248,7 @@ public final class SSL {
* @return FIPS_mode_set return code
* @throws Exception If tcnative was not compiled with FIPS Mode available,
* or if {@code FIPS_mode_set()} call returned an error value.
- * @see "OpenSSL method <a
href="http://wiki.openssl.org/index.php/FIPS_mode_set%28%29";>FIPS_mode_set()</a>"
+ * @see <a
href="http://wiki.openssl.org/index.php/FIPS_mode_set%28%29";>OpenSSL method
FIPS_mode_set()</a>
*/
public static native int fipsModeSet(int mode) throws Exception;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
