diff --git a/doc/amq/Dockerfile b/doc/amq/Dockerfile
new file mode 100644
index 00000000..f855db25
--- /dev/null
+++ b/doc/amq/Dockerfile
@@ -0,0 +1,20 @@
+FROM opensuse/leap:15.5
+ARG AMQ_VERSION=2.31.0
+
+ENV ARTEMIS_USER holarse
+ENV ARTEMIS_PASSWORD geheim
+ENV ANONYMOUS_LOGIN false
+
+RUN zypper ref && zypper in -y java-17-openjdk-headless wget tar gzip libaio
+RUN mkdir -p /opt/
+WORKDIR /opt/
+RUN wget "https://www.apache.org/dyn/closer.cgi?filename=activemq/activemq-artemis/${AMQ_VERSION}/apache-artemis-${AMQ_VERSION}-bin.tar.gz&action=download" -O apache-artemis-${AMQ_VERSION}-bin.tar.gz
+RUN tar xvzf apache-artemis-${AMQ_VERSION}-bin.tar.gz
+RUN /opt/apache-artemis-${AMQ_VERSION}/bin/artemis create --no-amqp-acceptor --no-hornetq-acceptor --no-mqtt-acceptor --no-stomp-acceptor --home /opt/apache-artemis-${AMQ_VERSION}/ --user ${ARTEMIS_USER} --password ${ARTEMIS_PASSWORD} --queues drueckblick,import,mail,searchidx --http-host 0.0.0.0 --relax-jolokia --require-login holaq
+
+EXPOSE 8161
+EXPOSE 61616
+
+VOLUME /opt/holaq/data/journal
+
+CMD /opt/holaq/bin/artemis run --relax-jolokia
diff --git a/doc/docker-compose.yml b/doc/docker-compose.yml
index df234ae9..848dd0e2 100644
--- a/doc/docker-compose.yml
+++ b/doc/docker-compose.yml
@@ -12,8 +12,29 @@ services:
     ports:
       - 5432:5432
     volumes:
-      - my_pgdata:/var/lib/postgresql/data
-
+      - website_my_pgdata:/var/lib/postgresql/data
+  amq:
+      image: holarse/amq:1
+      restart: always
+      ports:
+          - 8161:8161
+          - 61616:61616
+      volumes:
+          - amq_journal_data:/opt/holaq/data
+  app:
+      image: tomcat:11.0-jdk21-openjdk
+      restart: always
+      ports:
+          - 8080:8080
+      volumes:
+          - './tomcat/conf/context.xml:/usr/local/tomcat/conf/context.xml'
+          - './tomcat/conf/server.xml:/usr/local/tomcat/conf/server.xml'
+          - './tomcat/conf/tomcat-users.xml:/usr/local/tomcat/conf/tomcat-users.xml'
+          - './tomcat/lib/postgresql-42.3.1.jar:/usr/local/tomcat/lib/postgresql-42.3.1.jar'
 volumes:
-  my_pgdata: 
+  website_my_pgdata: 
+      external: true
+  amq_journal_data:
+      external: true
+
 
diff --git a/doc/tomcat/README.md b/doc/tomcat/README.md
deleted file mode 100644
index 290fbd2f..00000000
--- a/doc/tomcat/README.md
+++ /dev/null
@@ -1,51 +0,0 @@
-# Application Server Setup
-
-## Apache Tomcat 9.x 
-```
-wget https://artfiles.org/apache.org/tomcat/tomcat-9/v9.0.46/bin/apache-tomcat-9.0.46.tar.gz
-tar xfvz apache-tomcat-9.0.46.tar.gz
-```
-
-## PostgreSQL-JDBC-Treiber
-```
-wget https://jdbc.postgresql.org/download/postgresql-42.2.20.jar -O apache-tomcat-9.0.46/lib/postgresql-42.2.20.jar
-```
-
-## Konfiguration
-### Benutzer
-In der Datei `conf/tomcat-users.xml` im Abschnitt `<tomcat-users>` folgende Rolle und Benutzer anlegen:
-```
-<role rolename="tomcat"/>
-
-<user password="geheim" roles="tomcat,manager-script,admin" username="admin"/>
-```
-
-### Resource
-In der Datei `conf/server.xml` im Abschnitt `<GlobalNamingResources>` folgende Resource anlegen:
-
-```
-<Resource name="jdbc/holarse" 
- factory="org.apache.tomcat.jdbc.pool.DataSourceFactory"
- auth="Container"
- type="javax.sql.DataSource"
- username="holarse"
- password="geheim"
- url="jdbc:postgresql://luna/holarse"
- driverClassName="org.postgresql.Driver"
- initialSize="20"
- maxWaitMillis="15000"
- maxTotal="75"
- maxIdle="20"
- maxAge="7200000"
- testOnBorrow="true"
- validationQuery="select 1"
-/>      
-```
-
-### JNDI-Resource
-In der Datei `conf/context.xml` im Abschnitt `<Context>` die JNDI-Resource definieren:
-
-```
-<ResourceLink name="jdbc/holarse" global="jdbc/holarse" type="javax.sql.DataSource"/>
-```
-
diff --git a/doc/tomcat/conf/context.xml b/doc/tomcat/conf/context.xml
new file mode 100644
index 00000000..472d1db2
--- /dev/null
+++ b/doc/tomcat/conf/context.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- The contents of this file will be loaded for each web application -->
+<Context>
+
+    <!-- Default set of monitored resources. If one of these changes, the    -->
+    <!-- web application will be reloaded.                                   -->
+    <WatchedResource>WEB-INF/web.xml</WatchedResource>
+    <WatchedResource>WEB-INF/tomcat-web.xml</WatchedResource>
+    <WatchedResource>${catalina.base}/conf/web.xml</WatchedResource>
+
+    <!-- Uncomment this to enable session persistence across Tomcat restarts -->
+    <!--
+    <Manager pathname="SESSIONS.ser" />
+    -->
+
+    <ResourceLink name="jdbc/holarse" global="jdbc/holarse" type="javax.sql.DataSource"/>
+</Context>
diff --git a/doc/tomcat/conf/server.xml b/doc/tomcat/conf/server.xml
new file mode 100644
index 00000000..fa1219be
--- /dev/null
+++ b/doc/tomcat/conf/server.xml
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- Note:  A "Server" is not itself a "Container", so you may not
+     define subcomponents such as "Valves" at this level.
+     Documentation at /docs/config/server.html
+ -->
+<Server port="8005" shutdown="SHUTDOWN">
+  <Listener className="org.apache.catalina.startup.VersionLoggerListener" />
+  <!-- Security listener. Documentation at /docs/config/listeners.html
+  <Listener className="org.apache.catalina.security.SecurityListener" />
+  -->
+  <!-- APR library loader. Documentation at /docs/apr.html -->
+  <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
+  <!-- Prevent memory leaks due to use of particular java/javax APIs-->
+  <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
+  <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
+  <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
+
+  <!-- Global JNDI resources
+       Documentation at /docs/jndi-resources-howto.html
+  -->
+  <GlobalNamingResources>
+    <!-- Editable user database that can also be used by
+         UserDatabaseRealm to authenticate users
+    -->
+    <Resource name="UserDatabase" auth="Container"
+              type="org.apache.catalina.UserDatabase"
+              description="User database that can be updated and saved"
+              factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
+              pathname="conf/tomcat-users.xml" />
+
+    <!-- Datenbank -->
+    <Resource name="jdbc/holarse"
+              factory="org.apache.tomcat.jdbc.pool.DataSourceFactory"
+              auth="Container"
+              type="javax.sql.DataSource"
+              username="holarse"
+              password="geheim"
+              url="jdbc:postgresql://db/holarse"
+              driverClassName="org.postgresql.Driver"
+              initialSize="20"
+              maxWaitMillis="15000"
+              maxTotal="75"
+              maxIdle="20"
+              maxAge="7200000"
+              testOnBorrow="true"
+              validationQuery="select 1" />
+
+  </GlobalNamingResources>
+
+  <!-- A "Service" is a collection of one or more "Connectors" that share
+       a single "Container" Note:  A "Service" is not itself a "Container",
+       so you may not define subcomponents such as "Valves" at this level.
+       Documentation at /docs/config/service.html
+   -->
+  <Service name="Catalina">
+
+    <!--The connectors can use a shared executor, you can define one or more named thread pools-->
+    <!--
+    <Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
+        maxThreads="150" minSpareThreads="4"/>
+    -->
+
+
+    <!-- A "Connector" represents an endpoint by which requests are received
+         and responses are returned. Documentation at :
+         HTTP Connector: /docs/config/http.html
+         AJP  Connector: /docs/config/ajp.html
+         Define a non-SSL/TLS HTTP/1.1 Connector on port 8080
+    -->
+    <Connector port="8080" protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               redirectPort="8443" />
+    <!-- A "Connector" using the shared thread pool-->
+    <!--
+    <Connector executor="tomcatThreadPool"
+               port="8080" protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               redirectPort="8443" />
+    -->
+    <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2
+         This connector uses the NIO implementation. The default
+         SSLImplementation will depend on the presence of the APR/native
+         library and the useOpenSSL attribute of the AprLifecycleListener.
+         Either JSSE or OpenSSL style configuration may be used regardless of
+         the SSLImplementation selected. JSSE style configuration is used below.
+    -->
+    <!--
+    <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
+               maxThreads="150" SSLEnabled="true">
+        <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
+        <SSLHostConfig>
+            <Certificate certificateKeystoreFile="conf/localhost-rsa.jks"
+                         type="RSA" />
+        </SSLHostConfig>
+    </Connector>
+    -->
+
+    <!-- Define an AJP 1.3 Connector on port 8009 -->
+    <!--
+    <Connector protocol="AJP/1.3"
+               address="::1"
+               port="8009"
+               redirectPort="8443" />
+    -->
+
+    <!-- An Engine represents the entry point (within Catalina) that processes
+         every request.  The Engine implementation for Tomcat stand alone
+         analyzes the HTTP headers included with the request, and passes them
+         on to the appropriate Host (virtual host).
+         Documentation at /docs/config/engine.html -->
+
+    <!-- You should set jvmRoute to support load-balancing via AJP ie :
+    <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
+    -->
+    <Engine name="Catalina" defaultHost="localhost">
+
+      <!--For clustering, please take a look at documentation at:
+          /docs/cluster-howto.html  (simple how to)
+          /docs/config/cluster.html (reference documentation) -->
+      <!--
+      <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
+      -->
+
+      <!-- Use the LockOutRealm to prevent attempts to guess user passwords
+           via a brute-force attack -->
+      <Realm className="org.apache.catalina.realm.LockOutRealm">
+        <!-- This Realm uses the UserDatabase configured in the global JNDI
+             resources under the key "UserDatabase".  Any edits
+             that are performed against this UserDatabase are immediately
+             available for use by the Realm.  -->
+        <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+               resourceName="UserDatabase"/>
+      </Realm>
+
+      <Host name="localhost"  appBase="webapps"
+            unpackWARs="true" autoDeploy="true">
+
+        <!-- SingleSignOn valve, share authentication between web applications
+             Documentation at: /docs/config/valve.html -->
+        <!--
+        <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+        -->
+
+        <!-- Access log processes all example.
+             Documentation at: /docs/config/valve.html
+             Note: The pattern used is equivalent to using pattern="common" -->
+        <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
+               prefix="localhost_access_log" suffix=".txt"
+               pattern="%h %l %u %t &quot;%r&quot; %s %b" />
+
+      </Host>
+    </Engine>
+  </Service>
+</Server>
diff --git a/doc/tomcat/conf/tomcat-users.xml b/doc/tomcat/conf/tomcat-users.xml
new file mode 100644
index 00000000..74ec076e
--- /dev/null
+++ b/doc/tomcat/conf/tomcat-users.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<tomcat-users xmlns="http://tomcat.apache.org/xml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0" xsi:schemaLocation="http://tomcat.apache.org/xml tomcat-users.xsd">
+    <!--
+  By default, no user is included in the "manager-gui" role required
+  to operate the "/manager/html" web application.  If you wish to use this app,
+  you must define such a user - the username and password are arbitrary.
+
+  Built-in Tomcat manager roles:
+    - manager-gui    - allows access to the HTML GUI and the status pages
+    - manager-script - allows access to the HTTP API and the status pages
+    - manager-jmx    - allows access to the JMX proxy and the status pages
+    - manager-status - allows access to the status pages only
+
+  The users below are wrapped in a comment and are therefore ignored. If you
+  wish to configure one or more of these users for use with the manager web
+  application, do not forget to remove the <!.. ..> that surrounds them. You
+  will also need to set the passwords to something appropriate.
+-->
+    <!--
+  <user username="admin" password="<must-be-changed>" roles="manager-gui"/>
+  <user username="robot" password="<must-be-changed>" roles="manager-script"/>
+-->
+    <!--
+  The sample user and role entries below are intended for use with the
+  examples web application. They are wrapped in a comment and thus are ignored
+  when reading this file. If you wish to configure these users for use with the
+  examples web application, do not forget to remove the <!.. ..> that surrounds
+  them. You will also need to set the passwords to something appropriate.
+-->
+    <!--
+  <role rolename="tomcat"/>
+  <role rolename="role1"/>
+  <user username="tomcat" password="<must-be-changed>" roles="tomcat"/>
+  <user username="both" password="<must-be-changed>" roles="tomcat,role1"/>
+  <user username="role1" password="<must-be-changed>" roles="role1"/>
+-->
+    <user password="geheim" roles="manager-script,admin" username="admin"/>
+</tomcat-users>
diff --git a/doc/tomcat/lib/postgresql-42.3.1.jar b/doc/tomcat/lib/postgresql-42.3.1.jar
new file mode 100644
index 00000000..17af3fcd
Binary files /dev/null and b/doc/tomcat/lib/postgresql-42.3.1.jar differ
diff --git a/holarse-domain.xml b/holarse-domain.xml
deleted file mode 100644
index ac537eb6..00000000
--- a/holarse-domain.xml
+++ /dev/null
@@ -1,209 +0,0 @@
-<!--
-
-    DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-    Copyright (c) 2010-2013 Oracle and/or its affiliates. All rights reserved.
-
-    The contents of this file are subject to the terms of either the GNU
-    General Public License Version 2 only ("GPL") or the Common Development
-    and Distribution License("CDDL") (collectively, the "License").  You
-    may not use this file except in compliance with the License.  You can
-    obtain a copy of the License at
-    https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
-    or packager/legal/LICENSE.txt.  See the License for the specific
-    language governing permissions and limitations under the License.
-
-    When distributing the software, include this License Header Notice in each
-    file and include the License file at packager/legal/LICENSE.txt.
-
-    GPL Classpath Exception:
-    Oracle designates this particular file as subject to the "Classpath"
-    exception as provided by Oracle in the GPL Version 2 section of the License
-    file that accompanied this code.
-
-    Modifications:
-    If applicable, add the following below the License Header, with the fields
-    enclosed by brackets [] replaced by your own identifying information:
-    "Portions Copyright [year] [name of copyright owner]"
-
-    Contributor(s):
-    If you wish your version of this file to be governed by only the CDDL or
-    only the GPL Version 2, indicate your decision by adding "[Contributor]
-    elects to include this software in this distribution under the [CDDL or GPL
-    Version 2] license."  If you don't indicate a single choice of license, a
-    recipient has the option to distribute your version of this file under
-    either the CDDL, the GPL Version 2 or to extend the choice of license to
-    its licensees as provided above.  However, if you add GPL Version 2 code
-    and therefore, elected the GPL Version 2 license, then the option applies
-    only if the new code is made subject to such option by the copyright
-    holder.
-Portions Copyright [2016-2018] [Payara Foundation and/or its affiliates]
--->
-
-<domain log-root="${com.sun.aas.instanceRoot}/logs" application-root="${com.sun.aas.instanceRoot}/applications" version="10.0">
-    <security-configurations>
-        <authorization-service default="true" name="authorizationService">
-            <security-provider name="simpleAuthorization" type="Simple" provider-name="simpleAuthorizationProvider">
-                <authorization-provider-config support-policy-deploy="false" name="simpleAuthorizationProviderConfig"></authorization-provider-config>
-            </security-provider>
-        </authorization-service>
-    </security-configurations>
-    <system-applications />
-    <applications />
-    <resources>
-        <jdbc-resource pool-name="HolarsePool" jndi-name="jdbc/holarse" />
-        <jdbc-connection-pool is-isolation-level-guaranteed="false" name="HolarsePool" datasource-classname="org.postgresql.ds.PGSimpleDataSource" res-type="javax.sql.DataSource">
-	    <property name="URL" value="jdbc:postgresql://localhost/holarse"></property>
-	    <property name="User" value="holarse"></property>
-	    <property name="Password" value="geheim"></property>
-        </jdbc-connection-pool>
-        <context-service description="context service" jndi-name="concurrent/__defaultContextService" object-type="system-all"></context-service>
-        <managed-executor-service maximum-pool-size="200" core-pool-size="2" long-running-tasks="true" keep-alive-seconds="300" hung-after-seconds="300" task-queue-capacity="20000" jndi-name="concurrent/__defaultManagedExecutorService" object-type="system-all"></managed-executor-service>
-        <managed-scheduled-executor-service core-pool-size="2" long-running-tasks="true" keep-alive-seconds="300" hung-after-seconds="300" jndi-name="concurrent/__defaultManagedScheduledExecutorService" object-type="system-all"></managed-scheduled-executor-service>
-        <managed-thread-factory description="thread factory" jndi-name="concurrent/__defaultManagedThreadFactory" object-type="system-all"></managed-thread-factory>
-        <jdbc-resource pool-name="DerbyPool" jndi-name="jdbc/__default" object-type="system-all" />
-        <jdbc-connection-pool is-isolation-level-guaranteed="false" name="DerbyPool" datasource-classname="org.apache.derby.jdbc.EmbeddedDataSource" res-type="javax.sql.DataSource">
-            <property name="databaseName" value="${com.sun.aas.instanceRoot}/lib/databases/embedded_default" />
-            <property name="connectionAttributes" value=";create=true" />
-        </jdbc-connection-pool>
-    </resources>
-    <servers>
-        <server name="server" config-ref="server-config">
-            <resource-ref ref="jdbc/__default" />
-            <resource-ref ref="jdbc/holarse" />
-        </server>
-    </servers>
-    <configs>
-        <config name="server-config">
-            <health-check-service-configuration enabled="false">
-                <log-notifier enabled="true"/>
-                <eventbus-notifier enabled="false"/>
-                <cpu-usage-checker unit="MINUTES" name="CPU" time="1" enabled="true" />
-                <machine-memory-usage-checker unit="MINUTES" name="MMEM" time="3" enabled="true" />
-                <heap-memory-usage-checker unit="MINUTES" name="HEAP" time="3" enabled="true" />
-                <hogging-threads-checker unit="MINUTES" name="HT" time="5" enabled="true" />
-                <garbage-collector-checker unit="MINUTES" name="GC" time="5" enabled="true" />
-            </health-check-service-configuration>
-            <http-service access-logging-enabled="false">
-                <access-log format="%client.name% %auth-user-name% %datetime% %request% %status% %response.length%" rotation-interval-in-minutes="15" rotation-suffix="yyyy-MM-dd"></access-log>
-                <virtual-server id="server" access-logging-enabled="false" access-log="" network-listeners="http-listener, https-listener"></virtual-server>
-            </http-service>
-            <iiop-service>
-                <orb use-thread-pool-ids="thread-pool-1"></orb>
-                <iiop-listener id="orb-listener-1" enabled="false" address="0.0.0.0"></iiop-listener>
-            </iiop-service>    
-            <admin-service system-jmx-connector-name="system" type="das-and-server">
-                <jmx-connector port="8686" address="0.0.0.0" security-enabled="false" auth-realm-name="admin-realm" name="system" enabled="false"></jmx-connector>
-                <das-config></das-config>
-            </admin-service>     
-            <connector-service class-loading-policy="global" shutdown-timeout-in-seconds="30">
-            </connector-service>
-            <ejb-container steady-pool-size="0" max-pool-size="32" session-store="${com.sun.aas.instanceRoot}/session-store" pool-resize-quantity="8">
-                <ejb-timer-service ejb-timer-service="Hazelcast"></ejb-timer-service>
-            </ejb-container>
-            <log-service file="${com.sun.aas.instanceRoot}/logs/server.log" log-rotation-limit-in-bytes="2000000">
-                <module-log-levels />
-            </log-service>
-            <monitoring-service-configuration amx="false" enabled="false" log-frequency="30">
-        	<log-notifier></log-notifier>
-        	<eventbus-notifier></eventbus-notifier>
-            </monitoring-service-configuration>
-            <security-service activate-default-principal-to-role-mapping="true" jacc="simple">
-                <auth-realm classname="com.sun.enterprise.security.auth.realm.file.FileRealm" name="admin-realm">
-                    <property value="${com.sun.aas.instanceRoot}/config/admin-keyfile" name="file" />
-                    <property value="fileRealm" name="jaas-context" />
-                </auth-realm>
-                <auth-realm classname="com.sun.enterprise.security.auth.realm.file.FileRealm" name="file">
-                    <property value="${com.sun.aas.instanceRoot}/config/keyfile" name="file" />
-                    <property value="fileRealm" name="jaas-context" />
-                </auth-realm>
-                <auth-realm classname="com.sun.enterprise.security.auth.realm.certificate.CertificateRealm" name="certificate" />
-                <jacc-provider policy-configuration-factory-provider="com.sun.enterprise.security.provider.PolicyConfigurationFactoryImpl" policy-provider="com.sun.enterprise.security.provider.PolicyWrapper" name="default">
-                    <property value="${com.sun.aas.instanceRoot}/generated/policy" name="repository" />
-                </jacc-provider>
-                <jacc-provider policy-configuration-factory-provider="com.sun.enterprise.security.jacc.provider.SimplePolicyConfigurationFactory" policy-provider="com.sun.enterprise.security.jacc.provider.SimplePolicyProvider" name="simple" />
-                <audit-module classname="com.sun.enterprise.security.ee.Audit" name="default">
-                    <property value="false" name="auditOn" />
-                </audit-module>
-                <message-security-config auth-layer="SOAP">
-                    <provider-config provider-id="XWS_ClientProvider" class-name="com.sun.xml.wss.provider.ClientSecurityAuthModule" provider-type="client">
-                        <request-policy auth-source="content" />
-                        <response-policy auth-source="content" />
-                        <property value="s1as" name="encryption.key.alias" />
-                        <property value="s1as" name="signature.key.alias" />
-                        <property value="false" name="dynamic.username.password" />
-                        <property value="false" name="debug" />
-                    </provider-config>
-                    <provider-config provider-id="ClientProvider" class-name="com.sun.xml.wss.provider.ClientSecurityAuthModule" provider-type="client">
-                        <request-policy auth-source="content" />
-                        <response-policy auth-source="content" />
-                        <property value="s1as" name="encryption.key.alias" />
-                        <property value="s1as" name="signature.key.alias" />
-                        <property value="false" name="dynamic.username.password" />
-                        <property value="false" name="debug" />
-                        <property value="${com.sun.aas.instanceRoot}/config/wss-server-config-1.0.xml" name="security.config" />
-                    </provider-config>
-                    <provider-config provider-id="XWS_ServerProvider" class-name="com.sun.xml.wss.provider.ServerSecurityAuthModule" provider-type="server">
-                        <request-policy auth-source="content" />
-                        <response-policy auth-source="content" />
-                        <property value="s1as" name="encryption.key.alias" />
-                        <property value="s1as" name="signature.key.alias" />
-                        <property value="false" name="debug" />
-                    </provider-config>
-                    <provider-config provider-id="ServerProvider" class-name="com.sun.xml.wss.provider.ServerSecurityAuthModule" provider-type="server">
-                        <request-policy auth-source="content" />
-                        <response-policy auth-source="content" />
-                        <property value="s1as" name="encryption.key.alias" />
-                        <property value="s1as" name="signature.key.alias" />
-                        <property value="false" name="debug" />
-                        <property value="${com.sun.aas.instanceRoot}/config/wss-server-config-1.0.xml" name="security.config" />
-                    </provider-config>
-                </message-security-config>
-                <property value="SHA-256" name="default-digest-algorithm" />
-            </security-service>
-            <transaction-service tx-log-dir="${com.sun.aas.instanceRoot}/logs" >
-            </transaction-service>
-            <hazelcast-runtime-configuration enabled="false" multicastGroup="224.2.2.4" multicastPort="2904" generate-names="true"></hazelcast-runtime-configuration>
-            <phone-home-runtime-configuration></phone-home-runtime-configuration>
-            <request-tracing-service-configuration>
-                <log-notifier enabled="true"></log-notifier>
-            </request-tracing-service-configuration>
-            <notification-service-configuration enabled="false">
-                <log-notifier-configuration enabled="true"></log-notifier-configuration>
-                <eventbus-notifier-configuration enabled="false"></eventbus-notifier-configuration>
-            </notification-service-configuration>
-            <availability-service availability-enabled="false" >
-                <web-container-availability availability-enabled="true" persistence-scope="modified-session" sso-failover-enabled="true" persistence-type="hazelcast"></web-container-availability>
-                <ejb-container-availability sfsb-ha-persistence-type="hazelcast" sfsb-persistence-type="hazelcast" ></ejb-container-availability>
-            </availability-service>
-            <network-config>
-                <protocols>
-                    <protocol name="http-listener">
-                        <http default-virtual-server="server" xpowered-by="false" max-connections="250"  comet-support-enabled="true">
-                            <file-cache enabled="false"></file-cache>
-                        </http>       
-                    </protocol>
-                    <protocol security-enabled="true" name="https-listener">
-                        <http default-virtual-server="server" xpowered-by="false" comet-support-enabled="true" max-connections="250">
-                            <file-cache enabled="false"></file-cache>
-                        </http>
-                        <ssl classname="com.sun.enterprise.security.ssl.GlassfishSSLImpl" ssl3-enabled="false" cert-nickname="s1as"></ssl>
-                    </protocol>
-                </protocols>
-                <network-listeners>
-                    <network-listener port="8080" protocol="http-listener" transport="tcp" name="http-listener" thread-pool="http-thread-pool" enabled="true" />
-                    <network-listener port="8443" protocol="https-listener" transport="tcp" name="https-listener" thread-pool="http-thread-pool" enabled="false" />
-                </network-listeners>
-                <transports>
-                    <transport byte-buffer-type="HEAP" name="tcp" acceptor-threads="-1"></transport>
-                </transports>
-            </network-config>
-            <thread-pools>
-                <thread-pool name="http-thread-pool" min-thread-pool-size="10" max-thread-pool-size="200" max-queue-size="4096"></thread-pool>
-                <thread-pool name="thread-pool-1" min-thread-pool-size="2" max-thread-pool-size="200"/>
-            </thread-pools>
-            <microprofile-config/>
-        </config> 
-    </configs>
-    <property name="administrative.domain.name" value="domain1"/>
-</domain>
diff --git a/nb-configuration.xml b/nb-configuration.xml
deleted file mode 100644
index d9e80591..00000000
--- a/nb-configuration.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-shared-configuration>
-    <!--
-This file contains additional configuration written by modules in the NetBeans IDE.
-The configuration is intended to be shared among all the users of project and
-therefore it is assumed to be part of version control checkout.
-Without this configuration present, some functionality in the IDE may be limited or fail altogether.
--->
-    <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
-        <!--
-Properties that influence various parts of the IDE, especially code formatting and the like. 
-You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
-That way multiple projects can share the same settings (useful for formatting rules for example).
-Any value defined here will override the pom.xml file value but is only applicable to the current project.
--->
-        <org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server>Tomcat</org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server>
-        <org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>ide</org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>
-        <netbeans.hint.license>gpl30</netbeans.hint.license>
-        <org-netbeans-modules-css-prep.less_2e_mappings>/less:/css</org-netbeans-modules-css-prep.less_2e_mappings>
-        <org-netbeans-modules-css-prep.less_2e_enabled>false</org-netbeans-modules-css-prep.less_2e_enabled>
-        <org-netbeans-modules-css-prep.sass_2e_enabled>false</org-netbeans-modules-css-prep.sass_2e_enabled>
-        <org-netbeans-modules-css-prep.sass_2e_compiler_2e_options/>
-        <org-netbeans-modules-css-prep.less_2e_compiler_2e_options/>
-        <org-netbeans-modules-css-prep.sass_2e_mappings>/scss:/css</org-netbeans-modules-css-prep.sass_2e_mappings>
-        <org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_j2eeVersion>10-web</org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_j2eeVersion>
-    </properties>
-</project-shared-configuration>