felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vvalc...@apache.org
Subject svn commit: r1703753 - in /felix/trunk/webconsole: ./ src/main/java/org/apache/felix/webconsole/
Date Fri, 18 Sep 2015 07:29:25 GMT
Author: vvalchev
Date: Fri Sep 18 07:29:25 2015
New Revision: 1703753

URL: http://svn.apache.org/viewvc?rev=1703753&view=rev
Log:
Fixed FELIX-5041 : Cannot build web console with JDK 1.8 due to javadoc problems
https://issues.apache.org/jira/browse/FELIX-5041

Modified:
    felix/trunk/webconsole/changelog.txt
    felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/AbstractWebConsolePlugin.java
    felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/DefaultBrandingPlugin.java
    felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/DefaultVariableResolver.java
    felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/WebConsoleConstants.java
    felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/WebConsoleUtil.java

Modified: felix/trunk/webconsole/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/changelog.txt?rev=1703753&r1=1703752&r2=1703753&view=diff
==============================================================================
--- felix/trunk/webconsole/changelog.txt (original)
+++ felix/trunk/webconsole/changelog.txt Fri Sep 18 07:29:25 2015
@@ -7,6 +7,7 @@ Changes from 4.2.10 to 4.2.12
     * [FELIX-4995] - NPE when updating Apache Felix OSGi Management Console configuration
without a password
     * [FELIX-5004] - Null is passed to BundleInfoProvider if plugin root is null
     * [FELIX-5031] - NPE in Web Console configuration plugin when metatype service is missing
+    * [FELIX-5041] - Cannot build web console with JDK 1.8 due to javadoc problems
 
 ** Improvement
     * [FELIX-5018] - [webconsole] "create factory configuration" link for config screen

Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/AbstractWebConsolePlugin.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/AbstractWebConsolePlugin.java?rev=1703753&r1=1703752&r2=1703753&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/AbstractWebConsolePlugin.java
(original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/AbstractWebConsolePlugin.java
Fri Sep 18 07:29:25 2015
@@ -207,7 +207,7 @@ public abstract class AbstractWebConsole
     /**
      * Detects whether this request is intended to have the headers and
      * footers of this plugin be rendered or not. This method always returns
-     * <code>true</true> and may be overwritten by plugins to detect
+     * <code>true</code> and may be overwritten by plugins to detect
      * from the actual request, whether or not to render the header and
      * footer.
      *

Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/DefaultBrandingPlugin.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/DefaultBrandingPlugin.java?rev=1703753&r1=1703752&r2=1703753&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/DefaultBrandingPlugin.java
(original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/DefaultBrandingPlugin.java
Fri Sep 18 07:29:25 2015
@@ -34,7 +34,7 @@ import org.apache.commons.io.IOUtils;
  * <p>
  * This default implementation provides Apache Felix based default branding
  * as follows:
- * <table>
+ * <table summary="Web Console Branding Properties">
  * <tr><th>Name</th><th>Property Name</th><th>Default
Value</th></tr>
  * <tr>
  *  <td>Brand Name</td>

Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/DefaultVariableResolver.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/DefaultVariableResolver.java?rev=1703753&r1=1703752&r2=1703753&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/DefaultVariableResolver.java
(original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/DefaultVariableResolver.java
Fri Sep 18 07:29:25 2015
@@ -47,7 +47,7 @@ public class DefaultVariableResolver ext
 
 
     /**
-     * Creates a new variable resolver and initializes both - capacity & load factor
+     * Creates a new variable resolver and initializes both - capacity &amp; load factor
      * 
      * @param initialCapacity  the initial capacity of the variable container
      * @param loadFactor the load factor of the variable container

Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/WebConsoleConstants.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/WebConsoleConstants.java?rev=1703753&r1=1703752&r2=1703753&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/WebConsoleConstants.java
(original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/WebConsoleConstants.java
Fri Sep 18 07:29:25 2015
@@ -161,7 +161,7 @@ public interface WebConsoleConstants
      * {@link AbstractWebConsolePlugin#renderTopNavigation(javax.servlet.http.HttpServletRequest,
java.io.PrintWriter)}
      * method does.
      * <p>
-     * The type of this request attribute is <code>Map<String, String></code>.
+     * The type of this request attribute is <code>Map&lt;String, String&gt;</code>.
      *
      * @since 2.0.0
      */

Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/WebConsoleUtil.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/WebConsoleUtil.java?rev=1703753&r1=1703752&r2=1703753&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/WebConsoleUtil.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/WebConsoleUtil.java Fri
Sep 18 07:29:25 2015
@@ -251,7 +251,7 @@ public final class WebConsoleUtil
     }
 
     /**
-     * Escapes HTML special chars like: <>&\r\n and space
+     * Escapes HTML special chars like: &lt;&gt;&amp;\r\n and space
      *
      *
      * @param text the text to escape



Mime
View raw message