Skip to content

Commit ab52db4

Browse files
committed
[bugfix] Reduce startup logging from XmlLibraryChecker
1 parent 461045c commit ab52db4

File tree

4 files changed

+146
-80
lines changed

4 files changed

+146
-80
lines changed

exist-core/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -859,6 +859,7 @@
859859
<include>src/main/java/org/exist/http/RESTServer.java</include>
860860
<include>src/test/java/org/exist/http/RESTServiceTest.java</include>
861861
<include>src/main/java/org/exist/http/servlets/AbstractExistHttpServlet.java</include>
862+
<include>src/main/java/org/exist/http/servlets/EXistServlet.java</include>
862863
<include>src/main/java/org/exist/http/servlets/RedirectorServlet.java</include>
863864
<include>src/main/java/org/exist/http/servlets/XQueryServlet.java</include>
864865
<include>src/main/java/org/exist/http/servlets/XSLTServlet.java</include>
@@ -1007,6 +1008,7 @@
10071008
<include>src/test/java/org/exist/util/sorters/SortTestNodeId.java</include>
10081009
<include>src/test/resources/org/exist/validation/catalog.xml</include>
10091010
<include>src/test/java/org/exist/validation/CollectionConfigurationValidationModeTest.java</include>
1011+
<include>src/main/java/org/exist/validation/XmlLibraryChecker.java</include>
10101012
<include>src/main/java/org/exist/validation/internal/DatabaseResources.java</include>
10111013
<include>src/main/resources/org/exist/validation/internal/query/find_catalogs_with_dtd.xq</include>
10121014
<include>src/main/resources/org/exist/validation/internal/query/find_schema_by_targetNamespace.xq</include>
@@ -1437,6 +1439,7 @@
14371439
<exclude>src/main/java/org/exist/http/RESTServer.java</exclude>
14381440
<exclude>src/test/java/org/exist/http/RESTServiceTest.java</exclude>
14391441
<exclude>src/main/java/org/exist/http/servlets/AbstractExistHttpServlet.java</exclude>
1442+
<exclude>src/main/java/org/exist/http/servlets/EXistServlet.java</exclude>
14401443
<exclude>src/main/java/org/exist/http/servlets/RedirectorServlet.java</exclude>
14411444
<exclude>src/main/java/org/exist/http/servlets/XQueryServlet.java</exclude>
14421445
<exclude>src/main/java/org/exist/http/servlets/XSLTServlet.java</exclude>
@@ -1653,6 +1656,7 @@
16531656
<exclude>src/test/java/org/exist/util/sorters/SortTestNodeId.java</exclude>
16541657
<exclude>src/test/resources/org/exist/validation/catalog.xml</exclude>
16551658
<exclude>src/test/java/org/exist/validation/CollectionConfigurationValidationModeTest.java</exclude>
1659+
<exclude>src/main/java/org/exist/validation/XmlLibraryChecker.java</exclude>
16561660
<exclude>src/main/java/org/exist/validation/internal/DatabaseResources.java</exclude>
16571661
<exclude>src/main/resources/org/exist/validation/internal/query/find_catalogs_with_dtd.xq</exclude>
16581662
<exclude>src/main/resources/org/exist/validation/internal/query/find_schema_by_targetNamespace.xq</exclude>

exist-core/src/main/java/org/exist/http/servlets/EXistServlet.java

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,28 @@
11
/*
2+
* Elemental
3+
* Copyright (C) 2024, Evolved Binary Ltd
4+
*
5+
6+
* https://www.evolvedbinary.com | https://www.elemental.xyz
7+
*
8+
* This library is free software; you can redistribute it and/or
9+
* modify it under the terms of the GNU Lesser General Public
10+
* License as published by the Free Software Foundation; version 2.1.
11+
*
12+
* This library is distributed in the hope that it will be useful,
13+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
14+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15+
* Lesser General Public License for more details.
16+
*
17+
* You should have received a copy of the GNU Lesser General Public
18+
* License along with this library; if not, write to the Free Software
19+
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20+
*
21+
* NOTE: Parts of this file contain code from 'The eXist-db Authors'.
22+
* The original license header is included below.
23+
*
24+
* =====================================================================
25+
*
226
* eXist-db Open Source Native XML Database
327
* Copyright (C) 2001 The eXist-db Authors
428
*
@@ -86,9 +110,6 @@ public void init(final ServletConfig config) throws ServletException {
86110
// Instantiate REST Server
87111
srvREST = new RESTServer(getPool(), getFormEncoding(), getContainerEncoding(), useDynamicContentType.equalsIgnoreCase("yes")
88112
|| useDynamicContentType.equalsIgnoreCase("true"), isInternalOnly(), xquerySubmission, xupdateSubmission);
89-
90-
// XML lib checks....
91-
XmlLibraryChecker.check();
92113
}
93114

94115
private FeatureEnabled parseFeatureEnabled(final ServletConfig config, final String paramName, final FeatureEnabled defaultValue) {

exist-core/src/main/java/org/exist/util/StringUtil.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@
3030
*/
3131
public class StringUtil {
3232

33+
/**
34+
* The platform specific separator to use for line separation.
35+
* Just a static constant for {@code System.getProperty("line.separator")}.
36+
*/
37+
public static final String LINE_SEPARATOR = System.getProperty("line.separator");
38+
3339
/**
3440
* Determines if a String is null or empty.
3541
*

0 commit comments

Comments
 (0)