Commented out all options in provided context.xml files

FraunhoferIOSB · Jan 9, 2023 · 2bb431d · 2bb431d
1 parent 95ef2ea
commit 2bb431d
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 20 deletions.
diff --git a/FROST-Server.HTTP/src/main/webapp/META-INF/context.xml b/FROST-Server.HTTP/src/main/webapp/META-INF/context.xml
@@ -6,6 +6,7 @@
         Override=true means Tomcat uses the value configured in web.xml
     -->
     <!-- service setting -->
+    <!--
     <Parameter override="false" name="serviceRootUrl" value="http://localhost:8080/FROST-Server" />
     <Parameter override="false" name="defaultCount" value="false" />
     <Parameter override="false" name="alwaysOrderbyId" value="true" />
@@ -20,25 +21,30 @@
     <Parameter override="false" name="plugins.actuation.enable" value="false" />
     <Parameter override="false" name="plugins.multiDatastream.enable" value="false" />
     <Parameter override="false" name="plugins.openApi.enable" value="false" />
+    <Parameter override="false" name="plugins.odata.enable" value="false" />
     <Parameter override="false" name="extension.customLinks.enable" value="false" />
     <Parameter override="false" name="extension.customLinks.recurseDepth" value="1" />
+    -->
 
     <!-- authentication/authorisation setting -->
-    <Parameter override="false" name="auth.provider" value="" />
     <!-- All options:
         de.fraunhofer.iosb.ilt.frostserver.auth.basic.BasicAuthProvider
         de.fraunhofer.iosb.ilt.frostserver.auth.keycloak.KeycloakAuthProvider
     -->
+    <!--
+    <Parameter override="false" name="auth.provider" value="" />
     <Parameter override="false" name="auth.allowAnonymousRead" value="false" />
     <Parameter override="false" name="auth.role.read" value="read" />
     <Parameter override="false" name="auth.role.create" value="create" />
     <Parameter override="false" name="auth.role.update" value="update" />
     <Parameter override="false" name="auth.role.delete" value="delete" />
     <Parameter override="false" name="auth.role.admin" value="admin" />
-    <!-- Basic Auth options:
+     -->
+    <!-- Basic Auth options: -->
+    <!--
     <Parameter override="false" name="auth.realmName" value="FROST-Server" />
     <Parameter override="false" name="auth.db_jndi_datasource" value="jdbc/sensorThings" />
-    <Parameter override="false" name="auth.autoUpdateDatabase" value="false" />
+    <Parameter override="false" name="auth.autoUpdateDatabase" value="true" />
     -->
     <!-- Keycloak Auth options:
     <Parameter override="false" name="auth.keycloakConfigFile" value="/path/to/keycloak.json"  />
@@ -47,18 +53,21 @@
     -->
 
     <!-- bus setting -->
+    <!--
     <Parameter override="false" name="bus.busImplementationClass" value="de.fraunhofer.iosb.ilt.frostserver.messagebus.MqttMessageBus" />
     <Parameter override="false" name="bus.mqttBroker" value="tcp://mosquitto:1883" />
+    -->
+
     <!-- persistence setting -->
-    <Parameter override="false" name="persistence.persistenceManagerImplementationClass" value="de.fraunhofer.iosb.ilt.frostserver.persistence.pgjooq.PostgresPersistenceManager" />
-    <Parameter override="false" name="persistence.idGenerationMode" value="ServerGeneratedOnly" />
-    <!-- All options:
+    <!-- All options for persistence.idGenerationMode:
         "ServerGeneratedOnly"       = No client defined ids allowed.
         "ServerAndClientGenerated"  = Both, server and client generated ids, are allowed.
         "ClientGeneratedOnly"       = Client has to provide @iot.id to create entities.
     -->
+    <!--
+    <Parameter override="false" name="persistence.persistenceManagerImplementationClass" value="de.fraunhofer.iosb.ilt.frostserver.persistence.pgjooq.PostgresPersistenceManager" />
+    <Parameter override="false" name="persistence.idGenerationMode" value="ServerGeneratedOnly" />
     <Parameter override="false" name="persistence.autoUpdateDatabase" value="false" />
-    <!-- JNDO Database connection. Does suppport connection pooling. -->
     <Parameter override="false" name="persistence.db_jndi_datasource" value="jdbc/sensorThings" />
     <Resource
         name="jdbc/sensorThings" auth="Container"
@@ -68,4 +77,5 @@
         maxTotal="20" maxIdle="10" maxWaitMillis="-1"
         defaultAutoCommit="false"
     />
+    -->
 </Context>
diff --git a/FROST-Server.MQTTP/src/main/webapp/META-INF/context.xml b/FROST-Server.MQTTP/src/main/webapp/META-INF/context.xml
@@ -6,33 +6,42 @@
         Override=true means Tomcat uses the value configured in web.xml
     -->
     <!-- service setting -->
+    <!--
     <Parameter override="false" name="serviceRootUrl" value="http://localhost:8080/FROST-Server" />
     <Parameter override="false" name="defaultCount" value="false" />
+    <Parameter override="false" name="alwaysOrderbyId" value="true" />
     <Parameter override="false" name="defaultTop" value="100" />
     <Parameter override="false" name="maxTop" value="1000" />
     <Parameter override="false" name="maxDataSize" value="25000000" />
     <Parameter override="false" name="useAbsoluteNavigationLinks" value="true" />
     <Parameter override="false" name="http.cors.enable" value="false" />
     <Parameter override="false" name="plugins.plugins" value="" />
+    <Parameter override="false" name="plugins.coreModel.enable" value="true" />
+    <Parameter override="false" name="plugins.coreModel.idType" value="LONG" />
     <Parameter override="false" name="plugins.actuation.enable" value="false" />
     <Parameter override="false" name="plugins.multiDatastream.enable" value="false" />
     <Parameter override="false" name="plugins.openApi.enable" value="false" />
+    <Parameter override="false" name="plugins.odata.enable" value="false" />
     <Parameter override="false" name="extension.customLinks.enable" value="false" />
     <Parameter override="false" name="extension.customLinks.recurseDepth" value="1" />
+    -->
 
     <!-- authentication/authorisation setting -->
-    <Parameter override="false" name="auth.provider" value="" />
     <!-- All options:
         de.fraunhofer.iosb.ilt.frostserver.auth.basic.BasicAuthProvider
         de.fraunhofer.iosb.ilt.frostserver.auth.keycloak.KeycloakAuthProvider
     -->
+    <!--
+    <Parameter override="false" name="auth.provider" value="" />
     <Parameter override="false" name="auth.allowAnonymousRead" value="false" />
     <Parameter override="false" name="auth.role.read" value="read" />
     <Parameter override="false" name="auth.role.create" value="create" />
     <Parameter override="false" name="auth.role.update" value="update" />
     <Parameter override="false" name="auth.role.delete" value="delete" />
     <Parameter override="false" name="auth.role.admin" value="admin" />
-    <!-- Basic Auth options:
+     -->
+    <!-- Basic Auth options: -->
+    <!--
     <Parameter override="false" name="auth.realmName" value="FROST-Server" />
     <Parameter override="false" name="auth.db_jndi_datasource" value="jdbc/sensorThings" />
     <Parameter override="false" name="auth.autoUpdateDatabase" value="false" />
@@ -44,6 +53,7 @@
     -->
 
     <!-- MQTT setting -->
+    <!--
     <Parameter override="false" name="mqtt.mqttServerImplementationClass" value="de.fraunhofer.iosb.ilt.sensorthingsserver.mqtt.moquette.MoquetteMqttServer" />
     <Parameter override="false" name="mqtt.Enabled" value="true" />
     <Parameter override="false" name="mqtt.Port" value="1883" />
@@ -55,32 +65,29 @@
     <Parameter override="false" name="mqtt.Host" value="0.0.0.0" />
     <Parameter override="false" name="mqtt.internalHost" value="localhost" />
     <Parameter override="false" name="mqtt.WebsocketPort" value="9876" />
+    -->
 
     <!-- bus setting -->
     <Parameter override="false" name="bus.busImplementationClass" value="de.fraunhofer.iosb.ilt.frostserver.messagebus.InternalMessageBus" />
+
     <!-- persistence setting -->
-    <Parameter override="false" name="persistence.persistenceManagerImplementationClass" value="de.fraunhofer.iosb.ilt.frostserver.persistence.pgjooq.imp.PostgresPersistenceManagerLong" />
-    <!-- All options:
-        de.fraunhofer.iosb.ilt.frostserver.persistence.pgjooq.imp.PostgresPersistenceManagerLong
-        de.fraunhofer.iosb.ilt.frostserver.persistence.pgjooq.imp.PostgresPersistenceManagerString
-        de.fraunhofer.iosb.ilt.frostserver.persistence.pgjooq.imp.PostgresPersistenceManagerUuid
-    -->
-    <Parameter override="false" name="persistence.idGenerationMode" value="ServerGeneratedOnly" />
-    <!-- All options:
+    <!-- All options for persistence.idGenerationMode:
         "ServerGeneratedOnly"       = No client defined ids allowed.
         "ServerAndClientGenerated"  = Both, server and client generated ids, are allowed.
         "ClientGeneratedOnly"       = Client has to provide @iot.id to create entities.
     -->
+    <!--
+    <Parameter override="false" name="persistence.persistenceManagerImplementationClass" value="de.fraunhofer.iosb.ilt.frostserver.persistence.pgjooq.PostgresPersistenceManager" />
+    <Parameter override="false" name="persistence.idGenerationMode" value="ServerGeneratedOnly" />
     <Parameter override="false" name="persistence.autoUpdateDatabase" value="false" />
-    <Parameter override="false" name="persistence.alwaysOrderbyId" value="false" />
-    <!-- JNDO Database connection. Does suppport connection pooling. -->
     <Parameter override="false" name="persistence.db_jndi_datasource" value="jdbc/sensorThings" />
     <Resource
         name="jdbc/sensorThings" auth="Container"
         type="javax.sql.DataSource" driverClassName="org.postgresql.Driver"
-        url="jdbc:postgresql://database:5432/sensorthings"
+        url="jdbc:postgresql://localhost:5432/sensorthings"
         username="sensorthings" password="ChangeMe"
         maxTotal="20" maxIdle="10" maxWaitMillis="-1"
         defaultAutoCommit="false"
     />
+    -->
 </Context>