You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2018/11/30 10:51:54 UTC

svn commit: r1847799 - in /tomcat/trunk: java/org/apache/catalina/storeconfig/StoreLoader.java webapps/docs/changelog.xml

Author: remm
Date: Fri Nov 30 10:51:54 2018
New Revision: 1847799

URL: http://svn.apache.org/viewvc?rev=1847799&view=rev
Log:
Fix javadoc and update changelog

Modified:
    tomcat/trunk/java/org/apache/catalina/storeconfig/StoreLoader.java
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/StoreLoader.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StoreLoader.java?rev=1847799&r1=1847798&r2=1847799&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/StoreLoader.java (original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/StoreLoader.java Fri Nov 30 10:51:54 2018
@@ -135,6 +135,7 @@ public class StoreLoader {
      *
      * @param path Path to the configuration file, may be null to use the default
      *  name server-registry.xml
+     * @throws Exception when the configuration file isn't found or a parse error occurs
      */
     public void load(String path) throws Exception {
         try (Resource resource = (path == null) ?

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1847799&r1=1847798&r2=1847799&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Nov 30 10:51:54 2018
@@ -81,9 +81,11 @@
         source, which will allow processing of core configuration. (remm)
       </update>
       <update>
-        Refactor processing of server.xml, web.xml, context.xml and context
-        configuration files using the ConfigurationSource API. JASPIC and
-        storeconfig remain file based. (remm)
+        Refactor processing of server.xml, web.xml, context.xml, other
+        configuration files and resources using the ConfigurationSource API.
+        JASPIC persistent providers load and store remains file based.
+        StoreConfig Tomcat configuration files storing remains file based
+        at their previous default locations. (remm)
       </update>
       <add>
         <bug>62897</bug>: Provide a property



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org