Merge pull request #257 from guusdk/html5-tomcat-log-errors

Html5 tomcat log errors
igniterealtime · Sep 16, 2024 · 6b4a3cd · 6b4a3cd
2 parents e77342a + 13d1907
commit 6b4a3cd
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 3 deletions.
diff --git a/src/main/webapp/downloads/nightly_openfire.jsp b/src/main/webapp/downloads/nightly_openfire.jsp
@@ -90,6 +90,7 @@
         final SortedMap<String, List<File>> filesByDate = new TreeMap<>( Collections.reverseOrder() );
         filesByDate.putAll(
             Arrays.stream( allFiles )
+                .filter(File::isFile)
                 .sorted( new FileComparator() )
                 .collect( Collectors.groupingBy(file -> {
                     final Matcher matcher = datePattern.matcher( file.getName() );

diff --git a/src/main/webapp/downloads/nightly_smack.jsp b/src/main/webapp/downloads/nightly_smack.jsp
@@ -70,6 +70,7 @@
                         final SortedMap<Date, File> filesByDate = new TreeMap<>(Collections.reverseOrder());
                         filesByDate.putAll(
                             Arrays.stream(allFiles)
+                                .filter(File::isFile)
                                 .collect(Collectors.toMap(file -> {
                                     final Matcher matcher = datePattern.matcher(file.getName());
                                     if (matcher.find()) {

diff --git a/src/main/webapp/downloads/nightly_spark.jsp b/src/main/webapp/downloads/nightly_spark.jsp
@@ -86,6 +86,7 @@
         final SortedMap<String, List<File>> filesByDate = new TreeMap<>( Collections.reverseOrder() );
         filesByDate.putAll(
             Arrays.stream( allFiles )
+                .filter(File::isFile)
                 .sorted( new FileComparator() )
                 .collect( Collectors.groupingBy(file -> {
                     final Matcher matcher = datePattern.matcher( file.getName() );

diff --git a/src/main/webapp/downloads/nightly_xiff.jsp b/src/main/webapp/downloads/nightly_xiff.jsp
@@ -70,6 +70,7 @@
                         final SortedMap<Date, File> filesByDate = new TreeMap<>(Collections.reverseOrder());
                         filesByDate.putAll(
                             Arrays.stream(allFiles)
+                                .filter(File::isFile)
                                 .collect(Collectors.toMap(file -> {
                                     final Matcher matcher = datePattern.matcher(file.getName());
                                     if (matcher.find()) {

diff --git a/src/main/webapp/projects/openfire/connection_manager.jsp b/src/main/webapp/projects/openfire/connection_manager.jsp
@@ -44,8 +44,8 @@
 </head>
 <body>
 
-        <jsp:param name="project" value="openfire"/>
     <jsp:include page="/includes/navigation.jspf">
+        <jsp:param name="project" value="openfire"/>
     </jsp:include>
 
 <section id="ignite_body">

diff --git a/src/main/webapp/projects/openfire/plugin-archive.jsp b/src/main/webapp/projects/openfire/plugin-archive.jsp
@@ -177,7 +177,7 @@
                                     </td>
                                     <td class="c4" style="white-space: nowrap; text-align: center">
                                         <c:out value="${not empty plugin.minimumRequiredOpenfireVersion ? plugin.minimumRequiredOpenfireVersion : ''}"/>
-                                        <c:out value="${not empty plugin.priorToOpenfireVersion ? '<br>- ' + plugin.priorToOpenfireVersion : '+'}"/>
+                                        <c:out value="${not empty plugin.priorToOpenfireVersion ? '- '.concat(plugin.priorToOpenfireVersion) : '+'}"/>
                                     </td>
                                 </tr>
                             </c:forEach>
@@ -264,7 +264,7 @@
                                     </td>
                                     <td class="c4" style="white-space: nowrap; text-align: center">
                                         <c:out value="${not empty plugin.minimumRequiredOpenfireVersion ? plugin.minimumRequiredOpenfireVersion : ''}"/>
-                                        <c:out value="${not empty plugin.priorToOpenfireVersion ? '<br>- ' + plugin.priorToOpenfireVersion : '+'}"/>
+                                        <c:out value="${not empty plugin.priorToOpenfireVersion ? '- '.concat(plugin.priorToOpenfireVersion) : '+'}"/>
                                     </td>
                                 </tr>