diff --git a/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/AdminRuleAdminServiceImpl.java b/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/AdminRuleAdminServiceImpl.java
index f3135e3e..056e5dc5 100644
--- a/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/AdminRuleAdminServiceImpl.java
+++ b/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/AdminRuleAdminServiceImpl.java
@@ -236,36 +236,34 @@ public long count(RuleFilter filter) {
     // =========================================================================
     // Search stuff
 
-    private Search buildRuleSearch(Search searchCriteria, RuleFilter filter) {
+    private Search buildRuleSearch(Search search, RuleFilter filter) {
 
 
         if(filter != null) {
-            addStringCriteria(searchCriteria, "username", filter.getUser());
-            addStringCriteria(searchCriteria, "rolename", filter.getRole());
-            addCriteria(searchCriteria, "instance", filter.getInstance());
+            addStringCriteria(search, "username", filter.getUser());
+            addStringCriteria(search, "rolename", filter.getRole());
+            addCriteria(search, search.addJoin("instance"), filter.getInstance());
 
-            addStringCriteria(searchCriteria, "workspace", filter.getWorkspace());
+            addStringCriteria(search, "workspace", filter.getWorkspace());
         }
 
-        return searchCriteria;
+        return search;
     }
 
-
-
     //=========================================================================
 
     private Search buildFixedRuleSearch(RuleFilter filter) {
-        Search searchCriteria = ruleDAO.createSearch();
+        Search search = ruleDAO.createSearch();
 
         if(filter != null) {
-            addFixedStringCriteria(searchCriteria, "username", filter.getUser());
-            addFixedStringCriteria(searchCriteria, "rolename", filter.getRole());
-            addFixedCriteria(searchCriteria, "instance", filter.getInstance());
+            addFixedStringCriteria(search, "username", filter.getUser());
+            addFixedStringCriteria(search, "rolename", filter.getRole());
+            addFixedCriteria(search, search.addJoin("instance"), filter.getInstance());
 
-            addFixedStringCriteria(searchCriteria, "workspace", filter.getWorkspace());
+            addFixedStringCriteria(search, "workspace", filter.getWorkspace());
         }
 
-        return searchCriteria;
+        return search;
     }
 
     // ==========================================================================
diff --git a/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/RuleAdminServiceImpl.java b/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/RuleAdminServiceImpl.java
index d767e064..355e5c32 100644
--- a/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/RuleAdminServiceImpl.java
+++ b/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/RuleAdminServiceImpl.java
@@ -172,7 +172,8 @@ public void deleteRulesByRole(String rolename) throws NotFoundServiceEx {
     @Override
     public void deleteRulesByInstance(long instanceId) throws NotFoundServiceEx {
         Search searchCriteria = ruleDAO.createSearch();
-        searchCriteria.addFilterEqual("instance.id", instanceId);
+        Search.JoinInfo instance = searchCriteria.addJoin("instance");
+        searchCriteria.addFilterEqual(instance, "id", instanceId);
 
         List<Rule> list = ruleDAO.search(searchCriteria);
         for (Rule rule : list) {
@@ -313,39 +314,39 @@ public long count(RuleFilter filter) {
     // Search stuff
 
     private Search buildRuleSearch(RuleFilter filter) {
-        Search searchCriteria = ruleDAO.createSearch();
+        Search search = ruleDAO.createSearch();
 
         if(filter != null) {
-            addStringCriteria(searchCriteria, "username", filter.getUser());
-            addStringCriteria(searchCriteria, "rolename", filter.getRole());
-            addCriteria(searchCriteria, "instance", filter.getInstance());
-
-            addStringCriteria(searchCriteria, "service", filter.getService()); // see class' javadoc
-            addStringCriteria(searchCriteria, "request", filter.getRequest()); // see class' javadoc
-            addStringCriteria(searchCriteria, "workspace", filter.getWorkspace());
-            addStringCriteria(searchCriteria, "layer", filter.getLayer());
+            addStringCriteria(search, "username", filter.getUser());
+            addStringCriteria(search, "rolename", filter.getRole());
+            addCriteria(search, search.addJoin("instance"), filter.getInstance());
+
+            addStringCriteria(search, "service", filter.getService()); // see class' javadoc
+            addStringCriteria(search, "request", filter.getRequest()); // see class' javadoc
+            addStringCriteria(search, "workspace", filter.getWorkspace());
+            addStringCriteria(search, "layer", filter.getLayer());
         }
 
-        return searchCriteria;
+        return search;
     }
 
     //=========================================================================
 
     private Search buildFixedRuleSearch(RuleFilter filter) {
-        Search searchCriteria = ruleDAO.createSearch();
+        Search search = ruleDAO.createSearch();
 
         if(filter != null) {
-            addFixedStringCriteria(searchCriteria, "username", filter.getUser());
-            addFixedStringCriteria(searchCriteria, "rolename", filter.getRole());
-            addFixedCriteria(searchCriteria, "instance", filter.getInstance());
-
-            addFixedStringCriteria(searchCriteria, "service", filter.getService()); // see class' javadoc
-            addFixedStringCriteria(searchCriteria, "request", filter.getRequest()); // see class' javadoc
-            addFixedStringCriteria(searchCriteria, "workspace", filter.getWorkspace());
-            addFixedStringCriteria(searchCriteria, "layer", filter.getLayer());
+            addFixedStringCriteria(search, "username", filter.getUser());
+            addFixedStringCriteria(search, "rolename", filter.getRole());
+            addFixedCriteria(search, search.addJoin("instance"), filter.getInstance());
+
+            addFixedStringCriteria(search, "service", filter.getService()); // see class' javadoc
+            addFixedStringCriteria(search, "request", filter.getRequest()); // see class' javadoc
+            addFixedStringCriteria(search, "workspace", filter.getWorkspace());
+            addFixedStringCriteria(search, "layer", filter.getLayer());
         }
 
-        return searchCriteria;
+        return search;
     }
 
 
diff --git a/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/util/FilterUtils.java b/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/util/FilterUtils.java
index d8f3f3a0..f03b55e0 100644
--- a/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/util/FilterUtils.java
+++ b/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/util/FilterUtils.java
@@ -98,32 +98,32 @@ List<T> filterByAddress(RuleFilter filter, List<T> rules)
      *
      * We're dealing with IDs here, so <U>we'll suppose that the related object id field is called "id"</U>.
      */
-    public static void addCriteria(Search search, String fieldName, RuleFilter.IdNameFilter filter) {
+    public static void addCriteria(Search search, Search.JoinInfo join, RuleFilter.IdNameFilter filter) {
         switch (filter.getType()) {
             case ANY:
                 break; // no filtering
 
             case DEFAULT:
-                search.addFilterNull(fieldName);
+                search.addFilterNull(join.getField());
                 break;
 
             case IDVALUE:
                 if(filter.isIncludeDefault()) {
                     search.addFilterOr(
-                            search.isNull(fieldName),
-                            search.isEqual(fieldName + ".id", filter.getId()));
+                            search.isNull(join.getField()),
+                            search.isEqual(join, "id", filter.getId()));
                 } else {
-                    search.addFilterEqual(fieldName + ".id", filter.getId());
+                    search.addFilterEqual(join , "id", filter.getId());
                 }
                 break;
 
             case NAMEVALUE:
                 if(filter.isIncludeDefault()) {
                     search.addFilterOr(
-                            search.isNull(fieldName),
-                            search.isEqual(fieldName + ".name", filter.getName()));
+                            search.isNull(join.getField()),
+                            search.isEqual(join, "name", filter.getName()));
                 } else {
-                    search.addFilterEqual(fieldName + ".name", filter.getName());
+                    search.addFilterEqual(join, "name", filter.getName());
                 }
                 break;
 
@@ -173,37 +173,34 @@ public static void addStringCriteria(Search search, String fieldName, RuleFilter
     }
 
 
-
-
-
     /**
      * Add criteria for <B>searching</B>.
      *
      * We're dealing with IDs here, so <U>we'll suppose that the related object id field is called "id"</U>.
      */
-    public static void addFixedCriteria(Search search, String fieldName, RuleFilter.IdNameFilter filter) {
+    public static void addFixedCriteria(Search search, Search.JoinInfo join, RuleFilter.IdNameFilter filter) {
         switch (filter.getType()) {
             case ANY:
-                throw new BadRequestServiceEx(fieldName + " should be a fixed search and can't be ANY");
+                throw new BadRequestServiceEx(join.getField() + " should be a fixed search and can't be ANY");
 
             case DEFAULT:
-                search.addFilterNull(fieldName);
+                search.addFilterNull(join.getField());
                 break;
 
             case IDVALUE:
                 if(filter.isIncludeDefault()) {
-                    throw new BadRequestServiceEx(fieldName + " should be a fixed search");
+                    throw new BadRequestServiceEx(join.getField() + " should be a fixed search");
                 } else {
-                    search.addFilterEqual(fieldName + ".id", filter.getId());
+                    search.addFilterEqual(join, "id", filter.getId());
                 }
                 break;
 
             case NAMEVALUE:
                 if(filter.isIncludeDefault()) {
-                    throw new BadRequestServiceEx(fieldName + " should be a fixed search");
+                    throw new BadRequestServiceEx(join.getField() + " should be a fixed search");
 
                 } else {
-                    search.addFilterEqual(fieldName + ".name", filter.getName());
+                    search.addFilterEqual(join, "name", filter.getName());
                 }
                 break;
 
@@ -213,8 +210,6 @@ public static void addFixedCriteria(Search search, String fieldName, RuleFilter.
     }
 
 
-
-
     public static void addFixedStringCriteria(Search search, String fieldName, RuleFilter.TextFilter filter) {
         switch (filter.getType()) {
             case ANY:
diff --git a/src/services/core/webtest/pom.xml b/src/services/core/webtest/pom.xml
index fe187a47..e90c034c 100644
--- a/src/services/core/webtest/pom.xml
+++ b/src/services/core/webtest/pom.xml
@@ -6,7 +6,7 @@
  */
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.geoserver.geofence</groupId>
@@ -15,24 +15,24 @@
     </parent>
 
     <groupId>org.geoserver.geofence</groupId>
-	<artifactId>geofence-webtest</artifactId>
-	<packaging>war</packaging>
+    <artifactId>geofence-webtest</artifactId>
+    <packaging>war</packaging>
 
-	<name>GeoFence - Core - Web Test Module</name>
+    <name>GeoFence - Core - Web Test Module</name>
 
-	<developers>
-		<developer>
-			<name>Emanuele Tajariol</name>
-			<id>ETj</id>
-			<organization>GeoSolutions</organization>
-		</developer>
-	</developers>
+    <developers>
+        <developer>
+            <name>Emanuele Tajariol</name>
+            <id>ETj</id>
+            <organization>GeoSolutions</organization>
+        </developer>
+    </developers>
 
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	</properties>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
 
-	<dependencies>
+    <dependencies>
         
         <!-- =============================================================== -->
         <!-- Main modules -->
@@ -57,6 +57,14 @@
             <artifactId>geofence-services-impl</artifactId>
         </dependency>
 
+        <!-- =============================================================== -->
+        <!-- =============================================================== -->
+
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-spatial</artifactId>
+        </dependency>
+
         <!-- =============================================================== -->
         <!-- APACHE COMMONS -->
         <!-- =============================================================== -->
@@ -70,7 +78,7 @@
         </dependency>
 
         <!-- =============================================================== -->
-       	<!-- 4J UTILS -->
+        <!-- 4J UTILS -->
         <!-- =============================================================== -->
 
         <dependency>
@@ -79,14 +87,19 @@
         </dependency>
 
         <!-- =============================================================== -->
-	<!-- Logging                                                         -->
-	<!-- =============================================================== -->
+        <!-- Logging                                                         -->
+        <!-- =============================================================== -->
 
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+        </dependency>
+
         <!-- =============================================================== -->
         <!-- HTTP UTILS -->
         <!-- =============================================================== -->
@@ -94,13 +107,21 @@
             <groupId>org.codehaus.jettison</groupId>
             <artifactId>jettison</artifactId>
         </dependency>
-        <dependency>
+
+        <!--        <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
+            <version>2.5</version>
+            <scope>provided</scope>
+        </dependency>-->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
 
-<!--        <dependency>
+        <!--        <dependency>
           <groupId>javax.ws.rs</groupId>
           <artifactId>javax.ws.rs</artifactId>
           <version>1.0</version>
@@ -110,10 +131,11 @@
             <artifactId>jsr311-api</artifactId>
             <version>1.1.1</version>
         </dependency>
+        
         <!-- =============================================================== -->
-		<!-- CXF -->
+        <!-- CXF -->
         <!-- =============================================================== -->
-<!--        <dependency>
+       <!--        <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-bindings-http</artifactId>
         </dependency>-->
@@ -132,7 +154,7 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-<!--            <version>2.2.7</version>-->
+            <!--            <version>2.2.7</version>-->
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
@@ -153,6 +175,13 @@
         <!-- =============================================================== -->
         <!-- =============================================================== -->
 
+        <!-- SPRING -->
+        <!--        <dependency>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring</artifactId>
+                    <version>2.5.6</version>
+                </dependency>
+        -->
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
@@ -165,34 +194,35 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
         </dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-aop</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-tx</artifactId>
-		</dependency>
-<!--		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-asm</artifactId>
-		</dependency>-->
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-orm</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-jdbc</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-web</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-webmvc</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aop</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-tx</artifactId>
+        </dependency>
+        <!--		<dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-asm</artifactId>
+        </dependency>-->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-orm</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-jdbc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+        </dependency>
+
 
         <!-- =============================================================== -->
         <!-- JUnit -->
@@ -203,14 +233,51 @@
 			<scope>test</scope>
 		</dependency>
 
-	</dependencies>
+        <!--		<dependency>
+   <groupId>org.springframework</groupId>
+   <artifactId>org.springframework.web</artifactId>
+   <version>3.1.1.RELEASE</version>
+        </dependency>-->
+
+        <!--		<dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-expression</artifactId>
+        </dependency>-->
+
+        <!-- SCOPE TEST -->
+        <!--		<dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-test</artifactId>
+                <scope>test</scope>
+                <exclusions>
+                        <exclusion>
+                                <groupId>commons-collections</groupId>
+                                <artifactId>commons-collections</artifactId>
+                        </exclusion>
+                        <exclusion>
+                                <groupId>xerces</groupId>
+                                <artifactId>xercesImpl</artifactId>
+                        </exclusion>
+                </exclusions>
+        </dependency>-->
+
+        <!-- =============================================================== -->
+        <!-- JUnit -->
+        <!-- =============================================================== -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
 
         <profiles>
            <profile>
               <id>postgis</id>            
               <dependencies>
                  <dependency>
-                    <groupId>org.hibernatespatial</groupId>
+                    <groupId>org.hibernate</groupId>
                     <artifactId>hibernate-spatial-postgis</artifactId>
                  </dependency>
               </dependencies>
@@ -222,7 +289,7 @@
               </activation>
               <dependencies>
                  <dependency>
-                    <groupId>org.hibernatespatial</groupId>
+                    <groupId>org.hibernate</groupId>
                     <artifactId>hibernate-spatial-h2-geodb</artifactId>
                  </dependency>
                  <dependency>
@@ -242,30 +309,28 @@
               <plugin>
                  <groupId>org.apache.maven.plugins</groupId>
                  <artifactId>maven-war-plugin</artifactId>
-                 <version>2.4</version>
+                 <version>3.2.3</version>
                  <configuration>
                  </configuration>
               </plugin>
 
-              <!-- Run the application using "mvn jetty:run" -->
-              <plugin>
-                 <groupId>org.mortbay.jetty</groupId>
-                 <artifactId>maven-jetty-plugin</artifactId>
-                 <version>6.1.20</version>
-                 <configuration>
-                    <!--	<webAppSourceDirectory>${basedir}/war</webAppSourceDirectory>-->
-                    <webAppConfig>
-                       <contextPath>/geofence</contextPath>
-                    </webAppConfig>
-                    <connectors>
-                       <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
-                          <port>9191</port>
-                          <maxIdleTime>60000</maxIdleTime>
-                       </connector>
-                    </connectors>
-                    <reload>manual</reload>
-                 </configuration>
-              </plugin>
+            <plugin>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-maven-plugin</artifactId>
+                <version>9.4.25.v20191220</version>
+
+                <configuration>
+                    <!--<scanIntervalSeconds>10</scanIntervalSeconds>-->
+                    <webApp>
+                        <contextPath>/geofence</contextPath>
+                    </webApp>
+                    <httpConnector>
+                        <port>9191</port>
+                        <idleTimeout>60000</idleTimeout>
+                    </httpConnector>
+                </configuration>                                    
+            </plugin>                
+
 
            </plugins>
 
diff --git a/src/services/core/webtest/src/main/webapp/WEB-INF/web.xml b/src/services/core/webtest/src/main/webapp/WEB-INF/web.xml
index 2ad4a673..a25ce74e 100755
--- a/src/services/core/webtest/src/main/webapp/WEB-INF/web.xml
+++ b/src/services/core/webtest/src/main/webapp/WEB-INF/web.xml
@@ -15,9 +15,7 @@
 	<!-- pick up all spring application contexts -->
 	<context-param>
 		<param-name>contextConfigLocation</param-name>
-		<param-value>
-            classpath*:applicationContext.xml
-        </param-value>
+		<param-value>classpath*:applicationContext.xml</param-value>
 	</context-param>
 
     <context-param>
diff --git a/src/services/modules/rest/test/pom.xml b/src/services/modules/rest/test/pom.xml
index 4b909b2d..bf6e6a57 100644
--- a/src/services/modules/rest/test/pom.xml
+++ b/src/services/modules/rest/test/pom.xml
@@ -17,23 +17,23 @@
 
     <groupId>org.geoserver.geofence</groupId>
     <artifactId>geofence-rest-test</artifactId>
-	<packaging>war</packaging>
+    <packaging>war</packaging>
 
     <name>GeoFence - Modules - REST services test</name>
 
-	<developers>
-		<developer>
-			<name>Emanuele Tajariol</name>
-			<id>ETj</id>
-			<organization>GeoSolutions</organization>
-		</developer>
-	</developers>
+    <developers>
+        <developer>
+            <name>Emanuele Tajariol</name>
+            <id>ETj</id>
+            <organization>GeoSolutions</organization>
+        </developer>
+    </developers>
 
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	</properties>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
 
-	<dependencies>
+    <dependencies>
         <!-- ================================================================-->
         <!-- GeoStore modules -->
         <!-- ================================================================-->
@@ -68,6 +68,13 @@
             <artifactId>geofence-rest-impl</artifactId>
         </dependency>
 
+        <!-- =============================================================== -->
+        <!-- =============================================================== -->
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-spatial</artifactId>
+        </dependency>
+        
         <!-- =============================================================== -->
         <!-- APACHE COMMONS -->
         <!-- =============================================================== -->
@@ -81,7 +88,7 @@
         </dependency>
 
         <!-- =============================================================== -->
-       	<!-- 4J UTILS -->
+        <!-- 4J UTILS -->
         <!-- =============================================================== -->
 
         <dependency>
@@ -107,11 +114,11 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
-<!--        <dependency>
+        <!--        <dependency>
           <groupId>javax.ws.rs</groupId>
           <artifactId>javax.ws.rs</artifactId>
           <version>1.0</version>
@@ -122,9 +129,14 @@
             <version>1.1.1</version>
         </dependency>
         <!-- =============================================================== -->
-		<!-- CXF -->
+        <!-- CXF -->
         <!-- =============================================================== -->
 <!--        <dependency>
+        <dependency>
+            <groupId>javax.xml.ws</groupId>
+            <artifactId>jaxws-api</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-bindings-http</artifactId>
             <version>${cxf.version}</version>
@@ -164,13 +176,13 @@
         <!-- =============================================================== -->
         <!-- =============================================================== -->
 
-		<!-- SPRING -->
-<!--        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring</artifactId>
-            <version>2.5.6</version>
-        </dependency>
--->
+        <!-- SPRING -->
+        <!--        <dependency>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring</artifactId>
+                    <version>2.5.6</version>
+                </dependency>
+        -->
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
@@ -183,61 +195,60 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
         </dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-aop</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-tx</artifactId>
-		</dependency>
-<!--		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-asm</artifactId>
-		</dependency>-->
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-orm</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-jdbc</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-web</artifactId>
-		</dependency>
-<!--		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-expression</artifactId>
-		</dependency>-->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aop</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-tx</artifactId>
+        </dependency>
+        <!--		<dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-asm</artifactId>
+        </dependency>-->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-orm</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-jdbc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+        </dependency>
+        <!--		<dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-expression</artifactId>
+        </dependency>-->
 
-		<!-- SCOPE TEST -->
-<!--		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-test</artifactId>
-			<scope>test</scope>
-			<exclusions>
-				<exclusion>
-					<groupId>commons-collections</groupId>
-					<artifactId>commons-collections</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>xerces</groupId>
-					<artifactId>xercesImpl</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>-->
+        <!-- SCOPE TEST -->
+        <!--		<dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-test</artifactId>
+                <scope>test</scope>
+                <exclusions>
+                        <exclusion>
+                                <groupId>commons-collections</groupId>
+                                <artifactId>commons-collections</artifactId>
+                        </exclusion>
+                        <exclusion>
+                                <groupId>xerces</groupId>
+                                <artifactId>xercesImpl</artifactId>
+                        </exclusion>
+                </exclusions>
+        </dependency>-->
 
         <!-- =============================================================== -->
         <!-- JUnit -->
         <!-- =============================================================== -->
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.7</version>
-			<scope>test</scope>
-		</dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
 
 	</dependencies>
         
@@ -246,7 +257,7 @@
               <id>postgis</id>            
               <dependencies>
                  <dependency>
-                    <groupId>org.hibernatespatial</groupId>
+                    <groupId>org.hibernate</groupId>
                     <artifactId>hibernate-spatial-postgis</artifactId>
                  </dependency>
               </dependencies>
@@ -258,7 +269,7 @@
               </activation>
               <dependencies>
                  <dependency>
-                    <groupId>org.hibernatespatial</groupId>
+                    <groupId>org.hibernate</groupId>
                     <artifactId>hibernate-spatial-h2-geodb</artifactId>
                  </dependency>
                  <dependency>
@@ -269,46 +280,43 @@
               </dependencies>
            </profile>
         </profiles>
-        
 
-	<build>
 
-		<plugins>
+    <build>
 
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-war-plugin</artifactId>
-                <version>2.4</version>
-				<configuration>
-				</configuration>
-			</plugin>
+        <plugins>
 
-			<!-- Run the application using "mvn jetty:run" -->
-			<plugin>
-				<groupId>org.mortbay.jetty</groupId>
-				<artifactId>maven-jetty-plugin</artifactId>
-				<version>6.1.26</version>
-				<configuration>
-<!--					<webAppSourceDirectory>${basedir}/war</webAppSourceDirectory>-->
-					<webAppConfig>
-						<contextPath>/geofence</contextPath>
-					</webAppConfig>
-					<connectors>
-						<connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
-							<port>9191</port>
-							<maxIdleTime>60000</maxIdleTime>
-						</connector>
-					</connectors>
-					<reload>manual</reload>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>2.4</version>
+                <configuration>
+                </configuration>
+            </plugin>
 
+            <!-- Run the application using "mvn jetty:run" -->
+            <plugin>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-maven-plugin</artifactId>
+                <version>9.4.25.v20191220</version>
+                  
+                <configuration>
+                    <!--<scanIntervalSeconds>10</scanIntervalSeconds>-->
                     <stopPort>9966</stopPort>
                     <stopKey>jetty-stop</stopKey>
                     <scanIntervalSeconds>10</scanIntervalSeconds>
+                    
+                    <webApp>
+                        <contextPath>/geofence</contextPath>
+                    </webApp>
+                    <httpConnector>
+                        <port>9191</port>
+                        <idleTimeout>60000</idleTimeout>
+                    </httpConnector>
+                </configuration>                                    
+            </plugin>                                   
+        </plugins>
 
-				</configuration>
-			</plugin>
-		</plugins>
-
-	</build>
+    </build>
 
 </project>
diff --git a/src/services/modules/rest/test/src/main/webapp/WEB-INF/web.xml b/src/services/modules/rest/test/src/main/webapp/WEB-INF/web.xml
index bfbde363..60112607 100755
--- a/src/services/modules/rest/test/src/main/webapp/WEB-INF/web.xml
+++ b/src/services/modules/rest/test/src/main/webapp/WEB-INF/web.xml
@@ -27,9 +27,9 @@
     </context-param>-->
 
 	<!-- spring context loader -->
-    <listener>
+<!--    <listener>
         <listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
-    </listener>
+    </listener>-->
 
     <listener>
         <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>