WapBasePath renamed to WapBaseUrl

Author: GGoetzelmann

howtos/configuration.md

@@ -30,5 +30,5 @@ absorb: true
 | MultipleAnnotationPost                | Is posting multiple annotations in one request possible.                                                                                                                                                                                                                                                                                                      | true                                                                  |
 | WapPort                               | The port under which the WAP service is reachable. This port is used for HTTP and HTTPS service. When 80 is set and a http service is used, the port is omitted. The same applies to HTTPS and port 443. This setting has influence on the root IRI and cannot be changed after a database has been created. For details refer to the Root Container section. | 80                                                                    |
 | RdfBackendImplementation              | The qualifier of the used RDF backend implementation. The default backend is 'jena'.                                                                                                                                                                                                                                                                          | jena                                                                  |
-| WapBasePath                           | An override for the base URL. Only use to run behind proxy or in a container.                                                                                                                                                                                                                                                                                 |                                                                   |
+| WapBaseUrl                           | An override for the base URL. Only use to run behind proxy or in a container.                                                                                                                                                                                                                                                                                 |                                                                   |
 

howtos/root_container.md

@@ -29,7 +29,7 @@ Example 4: Hostname=host1.example.org, EnableHttps=true, WapPort=443
 When using the installer (via --install or by starting the jar in an empty folder) it asks for this base configuration
 and shows its consequences on the root container IRI.
 
-All of the above can be overwritten by using the `WapBasePath` property.
+All of the above can be overwritten by using the `WapBaseUrl` property.
 This property is intended to be used only in scenarios where the server is reachable from a different URL
 and if this should or must be reflected in the database (reverse proxy, docker container).
 

src/main/java/edu/kit/scc/dem/wapsrv/app/WapServerConfig.java

@@ -250,7 +250,7 @@ public class WapServerConfig extends WebMvcConfigurationSupport{
   @Value("${server.servlet.context-path:" + CONTEXT_PATH_DEFAULT + "}")
   private String contextPath = CONTEXT_PATH_DEFAULT;
 
-  @Value("${WapBasePath:" + PROXYBASEPATH_DEFAULT + "}")
+  @Value("${WapBaseUrl:" + PROXYBASEPATH_DEFAULT + "}")
   private String proxiedBasePath;
 
   /**

src/test/java/edu/kit/scc/dem/wapsrv/app/WapServerConfigTest.java

@@ -462,13 +462,13 @@ final void testGetBaseUrl() {
         assertNotNull(actual, "Could not get base url from WapServerConfig after setting context path.");
         expected = "https://localhost/context";
         assertEquals(expected, actual);
-        // test WapBasePath = http://example.com
+        // test WapBaseUrl = http://example.com
         paramProperties.setProperty(ConfigurationKeys.ProxiedBasePath.toString(), "http://example.com");
         objWapServerConfig.updateConfig(paramProperties);
 
         actual = null;
         actual = objWapServerConfig.getBaseUrl();
-        assertNotNull(actual, "Could not get base url from WapServerConfig after setting WapBasePath.");
+        assertNotNull(actual, "Could not get base url from WapServerConfig after setting WapBaseUrl.");
         expected = "http://example.com";
         assertEquals(expected, actual);
     }