geoserver#128: jdk11: major modules refactoring

etj · Jan 20, 2020 · f6da23b · f6da23b
1 parent 6afa1d1
commit f6da23b
Show file tree

Hide file tree

Showing 294 changed files with 743 additions and 2,308 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,4 +16,4 @@ src/gui/web/war/geofence/
 **/gwt-unitCache/
 **/geofence_db/
 **/nbproject/
-
+**/nb-configuration.xml
diff --git a/src/services/core/model-external/pom.xml → src/core/model-external/pom.xml b/src/services/core/model-external/pom.xml → src/core/model-external/pom.xml
diff --git a/src/services/core/model/pom.xml → src/core/model/pom.xml b/src/services/core/model/pom.xml → src/core/model/pom.xml
@@ -99,7 +99,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.2.1</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>

diff --git a/...server/geofence/core/model/AdminRule.java → ...server/geofence/core/model/AdminRule.java b/...server/geofence/core/model/AdminRule.java → ...server/geofence/core/model/AdminRule.java
diff --git a/...geoserver/geofence/core/model/GFUser.java → ...geoserver/geofence/core/model/GFUser.java b/...geoserver/geofence/core/model/GFUser.java → ...geoserver/geofence/core/model/GFUser.java
diff --git a/...erver/geofence/core/model/GSInstance.java → ...erver/geofence/core/model/GSInstance.java b/...erver/geofence/core/model/GSInstance.java → ...erver/geofence/core/model/GSInstance.java
diff --git a/...geoserver/geofence/core/model/GSUser.java → ...geoserver/geofence/core/model/GSUser.java b/...geoserver/geofence/core/model/GSUser.java → ...geoserver/geofence/core/model/GSUser.java
diff --git a/...r/geofence/core/model/IPAddressRange.java → ...r/geofence/core/model/IPAddressRange.java b/...r/geofence/core/model/IPAddressRange.java → ...r/geofence/core/model/IPAddressRange.java
diff --git a/.../geofence/core/model/IPRangeProvider.java → .../geofence/core/model/IPRangeProvider.java b/.../geofence/core/model/IPRangeProvider.java → .../geofence/core/model/IPRangeProvider.java
diff --git a/...ver/geofence/core/model/Identifiable.java → ...ver/geofence/core/model/Identifiable.java b/...ver/geofence/core/model/Identifiable.java → ...ver/geofence/core/model/Identifiable.java
diff --git a/...r/geofence/core/model/LayerAttribute.java → ...r/geofence/core/model/LayerAttribute.java b/...r/geofence/core/model/LayerAttribute.java → ...r/geofence/core/model/LayerAttribute.java
diff --git a/...ver/geofence/core/model/LayerDetails.java → ...ver/geofence/core/model/LayerDetails.java b/...ver/geofence/core/model/LayerDetails.java → ...ver/geofence/core/model/LayerDetails.java
diff --git a/...er/geofence/core/model/Prioritizable.java → ...er/geofence/core/model/Prioritizable.java b/...er/geofence/core/model/Prioritizable.java → ...er/geofence/core/model/Prioritizable.java
diff --git a/...g/geoserver/geofence/core/model/Rule.java → ...g/geoserver/geofence/core/model/Rule.java b/...g/geoserver/geofence/core/model/Rule.java → ...g/geoserver/geofence/core/model/Rule.java
diff --git a/...erver/geofence/core/model/RuleLimits.java → ...erver/geofence/core/model/RuleLimits.java b/...erver/geofence/core/model/RuleLimits.java → ...erver/geofence/core/model/RuleLimits.java
diff --git a/...server/geofence/core/model/UserGroup.java → ...server/geofence/core/model/UserGroup.java b/...server/geofence/core/model/UserGroup.java → ...server/geofence/core/model/UserGroup.java
diff --git a/...ce/core/model/adapter/FK2UserAdapter.java → ...ce/core/model/adapter/FK2UserAdapter.java b/...ce/core/model/adapter/FK2UserAdapter.java → ...ce/core/model/adapter/FK2UserAdapter.java
diff --git a/...re/model/adapter/FK2UserGroupAdapter.java → ...re/model/adapter/FK2UserGroupAdapter.java b/...re/model/adapter/FK2UserGroupAdapter.java → ...re/model/adapter/FK2UserGroupAdapter.java
diff --git a/...model/adapter/FK2UserGroupSetAdapter.java → ...model/adapter/FK2UserGroupSetAdapter.java b/...model/adapter/FK2UserGroupSetAdapter.java → ...model/adapter/FK2UserGroupSetAdapter.java
diff --git a/...odel/adapter/FK2UserGroupSetAdapter2.java → ...odel/adapter/FK2UserGroupSetAdapter2.java b/...odel/adapter/FK2UserGroupSetAdapter2.java → ...odel/adapter/FK2UserGroupSetAdapter2.java
diff --git a/...re/model/adapter/FKGSInstanceAdapter.java → ...re/model/adapter/FKGSInstanceAdapter.java b/...re/model/adapter/FKGSInstanceAdapter.java → ...re/model/adapter/FKGSInstanceAdapter.java
diff --git a/...nce/core/model/adapter/FKUserAdapter.java → ...nce/core/model/adapter/FKUserAdapter.java b/...nce/core/model/adapter/FKUserAdapter.java → ...nce/core/model/adapter/FKUserAdapter.java
diff --git a/...ore/model/adapter/FKUserGroupAdapter.java → ...ore/model/adapter/FKUserGroupAdapter.java b/...ore/model/adapter/FKUserGroupAdapter.java → ...ore/model/adapter/FKUserGroupAdapter.java
diff --git a/...e/core/model/adapter/GeometryAdapter.java → ...e/core/model/adapter/GeometryAdapter.java b/...e/core/model/adapter/GeometryAdapter.java → ...e/core/model/adapter/GeometryAdapter.java
diff --git a/...re/model/adapter/IdentifiableAdapter.java → ...re/model/adapter/IdentifiableAdapter.java b/...re/model/adapter/IdentifiableAdapter.java → ...re/model/adapter/IdentifiableAdapter.java
diff --git a/...ofence/core/model/adapter/MapAdapter.java → ...ofence/core/model/adapter/MapAdapter.java b/...ofence/core/model/adapter/MapAdapter.java → ...ofence/core/model/adapter/MapAdapter.java
diff --git a/...re/model/adapter/MultiPolygonAdapter.java → ...re/model/adapter/MultiPolygonAdapter.java b/...re/model/adapter/MultiPolygonAdapter.java → ...re/model/adapter/MultiPolygonAdapter.java
diff --git a/...ce/core/model/adapter/PolygonAdapter.java → ...ce/core/model/adapter/PolygonAdapter.java b/...ce/core/model/adapter/PolygonAdapter.java → ...ce/core/model/adapter/PolygonAdapter.java
diff --git a/...e/model/adapter/XMultiPolygonAdapter.java → ...e/model/adapter/XMultiPolygonAdapter.java b/...e/model/adapter/XMultiPolygonAdapter.java → ...e/model/adapter/XMultiPolygonAdapter.java
diff --git a/...core/model/adapter/dual/IdNameBundle.java → ...core/model/adapter/dual/IdNameBundle.java b/...core/model/adapter/dual/IdNameBundle.java → ...core/model/adapter/dual/IdNameBundle.java
diff --git a/...core/model/adapter/dual/MapEntryType.java → ...core/model/adapter/dual/MapEntryType.java b/...core/model/adapter/dual/MapEntryType.java → ...core/model/adapter/dual/MapEntryType.java
diff --git a/...ence/core/model/adapter/dual/MapType.java → ...ence/core/model/adapter/dual/MapType.java b/...ence/core/model/adapter/dual/MapType.java → ...ence/core/model/adapter/dual/MapType.java
diff --git a/...ence/core/model/adapter/package-info.java → ...ence/core/model/adapter/package-info.java b/...ence/core/model/adapter/package-info.java → ...ence/core/model/adapter/package-info.java
diff --git a/...geofence/core/model/enums/AccessType.java → ...geofence/core/model/enums/AccessType.java b/...geofence/core/model/enums/AccessType.java → ...geofence/core/model/enums/AccessType.java
diff --git a/...ence/core/model/enums/AdminGrantType.java → ...ence/core/model/enums/AdminGrantType.java b/...ence/core/model/enums/AdminGrantType.java → ...ence/core/model/enums/AdminGrantType.java
diff --git a/...eofence/core/model/enums/CatalogMode.java → ...eofence/core/model/enums/CatalogMode.java b/...eofence/core/model/enums/CatalogMode.java → ...eofence/core/model/enums/CatalogMode.java
diff --git a/.../geofence/core/model/enums/GrantType.java → .../geofence/core/model/enums/GrantType.java b/.../geofence/core/model/enums/GrantType.java → .../geofence/core/model/enums/GrantType.java
diff --git a/...ence/core/model/enums/InsertPosition.java → ...ence/core/model/enums/InsertPosition.java b/...ence/core/model/enums/InsertPosition.java → ...ence/core/model/enums/InsertPosition.java
diff --git a/...fence/core/model/enums/KnownServices.java → ...fence/core/model/enums/KnownServices.java b/...fence/core/model/enums/KnownServices.java → ...fence/core/model/enums/KnownServices.java
diff --git a/.../geofence/core/model/enums/LayerType.java → .../geofence/core/model/enums/LayerType.java b/.../geofence/core/model/enums/LayerType.java → .../geofence/core/model/enums/LayerType.java
diff --git a/.../geofence/core/model/enums/ValueType.java → .../geofence/core/model/enums/ValueType.java b/.../geofence/core/model/enums/ValueType.java → .../geofence/core/model/enums/ValueType.java
diff --git a/...ofence/core/model/enums/package-info.java → ...ofence/core/model/enums/package-info.java b/...ofence/core/model/enums/package-info.java → ...ofence/core/model/enums/package-info.java
diff --git a/...ver/geofence/core/model/package-info.java → ...ver/geofence/core/model/package-info.java b/...ver/geofence/core/model/package-info.java → ...ver/geofence/core/model/package-info.java
diff --git a/...r/geofence/core/model/util/PwEncoder.java → ...r/geofence/core/model/util/PwEncoder.java b/...r/geofence/core/model/util/PwEncoder.java → ...r/geofence/core/model/util/PwEncoder.java
diff --git a/...ofence/core/model/util/SubnetV4Utils.java → ...ofence/core/model/util/SubnetV4Utils.java b/...ofence/core/model/util/SubnetV4Utils.java → ...ofence/core/model/util/SubnetV4Utils.java
diff --git a/...eofence/core/model/util/package-info.java → ...eofence/core/model/util/package-info.java b/...eofence/core/model/util/package-info.java → ...eofence/core/model/util/package-info.java
diff --git a/...ofence/core/model/Base64EncodersTest.java → ...ofence/core/model/Base64EncodersTest.java b/...ofence/core/model/Base64EncodersTest.java → ...ofence/core/model/Base64EncodersTest.java
diff --git a/...erver/geofence/core/model/GSUserTest.java → ...erver/geofence/core/model/GSUserTest.java b/...erver/geofence/core/model/GSUserTest.java → ...erver/geofence/core/model/GSUserTest.java
diff --git a/...ofence/core/model/IPAddressRangeTest.java → ...ofence/core/model/IPAddressRangeTest.java b/...ofence/core/model/IPAddressRangeTest.java → ...ofence/core/model/IPAddressRangeTest.java
diff --git a/...ofence/core/model/util/PwEncoderTest.java → ...ofence/core/model/util/PwEncoderTest.java b/...ofence/core/model/util/PwEncoderTest.java → ...ofence/core/model/util/PwEncoderTest.java
diff --git a/src/services/core/persistence/pom.xml → src/core/persistence/pom.xml b/src/services/core/persistence/pom.xml → src/core/persistence/pom.xml
diff --git a/...erver/geofence/core/dao/AdminRuleDAO.java → ...erver/geofence/core/dao/AdminRuleDAO.java b/...erver/geofence/core/dao/AdminRuleDAO.java → ...erver/geofence/core/dao/AdminRuleDAO.java
diff --git a/...fence/core/dao/AllowedStylesProvider.java → ...fence/core/dao/AllowedStylesProvider.java b/...fence/core/dao/AllowedStylesProvider.java → ...fence/core/dao/AllowedStylesProvider.java
diff --git a/...fence/core/dao/DuplicateKeyException.java → ...fence/core/dao/DuplicateKeyException.java b/...fence/core/dao/DuplicateKeyException.java → ...fence/core/dao/DuplicateKeyException.java
diff --git a/...eoserver/geofence/core/dao/GFUserDAO.java → ...eoserver/geofence/core/dao/GFUserDAO.java b/...eoserver/geofence/core/dao/GFUserDAO.java → ...eoserver/geofence/core/dao/GFUserDAO.java
diff --git a/...rver/geofence/core/dao/GSInstanceDAO.java → ...rver/geofence/core/dao/GSInstanceDAO.java b/...rver/geofence/core/dao/GSInstanceDAO.java → ...rver/geofence/core/dao/GSInstanceDAO.java
diff --git a/...eoserver/geofence/core/dao/GSUserDAO.java → ...eoserver/geofence/core/dao/GSUserDAO.java b/...eoserver/geofence/core/dao/GSUserDAO.java → ...eoserver/geofence/core/dao/GSUserDAO.java
diff --git a/...er/geofence/core/dao/LayerDetailsDAO.java → ...er/geofence/core/dao/LayerDetailsDAO.java b/...er/geofence/core/dao/LayerDetailsDAO.java → ...er/geofence/core/dao/LayerDetailsDAO.java
diff --git a/...r/geofence/core/dao/PrioritizableDAO.java → ...r/geofence/core/dao/PrioritizableDAO.java b/...r/geofence/core/dao/PrioritizableDAO.java → ...r/geofence/core/dao/PrioritizableDAO.java
diff --git a/...ver/geofence/core/dao/RegistrableDAO.java → ...ver/geofence/core/dao/RegistrableDAO.java b/...ver/geofence/core/dao/RegistrableDAO.java → ...ver/geofence/core/dao/RegistrableDAO.java
diff --git a/...ofence/core/dao/RestrictedGenericDAO.java → ...ofence/core/dao/RestrictedGenericDAO.java b/...ofence/core/dao/RestrictedGenericDAO.java → ...ofence/core/dao/RestrictedGenericDAO.java
diff --git a/.../geoserver/geofence/core/dao/RuleDAO.java → .../geoserver/geofence/core/dao/RuleDAO.java b/.../geoserver/geofence/core/dao/RuleDAO.java → .../geoserver/geofence/core/dao/RuleDAO.java
diff --git a/...rver/geofence/core/dao/RuleLimitsDAO.java → ...rver/geofence/core/dao/RuleLimitsDAO.java b/...rver/geofence/core/dao/RuleLimitsDAO.java → ...rver/geofence/core/dao/RuleLimitsDAO.java
diff --git a/...rver/geofence/core/dao/SearchableDAO.java → ...rver/geofence/core/dao/SearchableDAO.java b/...rver/geofence/core/dao/SearchableDAO.java → ...rver/geofence/core/dao/SearchableDAO.java
diff --git a/...erver/geofence/core/dao/UserGroupDAO.java → ...erver/geofence/core/dao/UserGroupDAO.java b/...erver/geofence/core/dao/UserGroupDAO.java → ...erver/geofence/core/dao/UserGroupDAO.java
diff --git a/...fence/core/dao/impl/AdminRuleDAOImpl.java → ...fence/core/dao/impl/AdminRuleDAOImpl.java b/...fence/core/dao/impl/AdminRuleDAOImpl.java → ...fence/core/dao/impl/AdminRuleDAOImpl.java
diff --git a/...erver/geofence/core/dao/impl/BaseDAO.java → ...erver/geofence/core/dao/impl/BaseDAO.java b/...erver/geofence/core/dao/impl/BaseDAO.java → ...erver/geofence/core/dao/impl/BaseDAO.java
diff --git a/...geofence/core/dao/impl/GFUserDAOImpl.java → ...geofence/core/dao/impl/GFUserDAOImpl.java b/...geofence/core/dao/impl/GFUserDAOImpl.java → ...geofence/core/dao/impl/GFUserDAOImpl.java
diff --git a/...ence/core/dao/impl/GSInstanceDAOImpl.java → ...ence/core/dao/impl/GSInstanceDAOImpl.java b/...ence/core/dao/impl/GSInstanceDAOImpl.java → ...ence/core/dao/impl/GSInstanceDAOImpl.java
diff --git a/...geofence/core/dao/impl/GSUserDAOImpl.java → ...geofence/core/dao/impl/GSUserDAOImpl.java b/...geofence/core/dao/impl/GSUserDAOImpl.java → ...geofence/core/dao/impl/GSUserDAOImpl.java
diff --git a/...ce/core/dao/impl/LayerDetailsDAOImpl.java → ...ce/core/dao/impl/LayerDetailsDAOImpl.java b/...ce/core/dao/impl/LayerDetailsDAOImpl.java → ...ce/core/dao/impl/LayerDetailsDAOImpl.java
diff --git a/...e/core/dao/impl/PrioritizableDAOImpl.java → ...e/core/dao/impl/PrioritizableDAOImpl.java b/...e/core/dao/impl/PrioritizableDAOImpl.java → ...e/core/dao/impl/PrioritizableDAOImpl.java
diff --git a/...r/geofence/core/dao/impl/RuleDAOImpl.java → ...r/geofence/core/dao/impl/RuleDAOImpl.java b/...r/geofence/core/dao/impl/RuleDAOImpl.java → ...r/geofence/core/dao/impl/RuleDAOImpl.java
diff --git a/...ence/core/dao/impl/RuleLimitsDAOImpl.java → ...ence/core/dao/impl/RuleLimitsDAOImpl.java b/...ence/core/dao/impl/RuleLimitsDAOImpl.java → ...ence/core/dao/impl/RuleLimitsDAOImpl.java
diff --git a/...fence/core/dao/impl/UserGroupDAOImpl.java → ...fence/core/dao/impl/UserGroupDAOImpl.java b/...fence/core/dao/impl/UserGroupDAOImpl.java → ...fence/core/dao/impl/UserGroupDAOImpl.java
diff --git a/...rver/geofence/core/dao/search/Search.java → ...rver/geofence/core/dao/search/Search.java b/...rver/geofence/core/dao/search/Search.java → ...rver/geofence/core/dao/search/Search.java
diff --git a/.../geofence/core/dao/search/SearchUtil.java → .../geofence/core/dao/search/SearchUtil.java b/.../geofence/core/dao/search/SearchUtil.java → .../geofence/core/dao/search/SearchUtil.java
diff --git a/...ce/core/dao/util/GeofenceDaoRegistry.java → ...ce/core/dao/util/GeofenceDaoRegistry.java b/...ce/core/dao/util/GeofenceDaoRegistry.java → ...ce/core/dao/util/GeofenceDaoRegistry.java
diff --git a/...ver/geofence/core/dao/util/PwEncoder.java → ...ver/geofence/core/dao/util/PwEncoder.java b/...ver/geofence/core/dao/util/PwEncoder.java → ...ver/geofence/core/dao/util/PwEncoder.java
diff --git a/...applicationContext-geofenceDatasource.xml → ...applicationContext-geofenceDatasource.xml b/...applicationContext-geofenceDatasource.xml → ...applicationContext-geofenceDatasource.xml
diff --git a/...src/main/resources/applicationContext.xml → ...src/main/resources/applicationContext.xml b/...src/main/resources/applicationContext.xml → ...src/main/resources/applicationContext.xml
diff --git a/...e/src/main/resources/geofence-ehcache.xml → ...e/src/main/resources/geofence-ehcache.xml b/...e/src/main/resources/geofence-ehcache.xml → ...e/src/main/resources/geofence-ehcache.xml
diff --git a/...urces/geofence-externalize-aux.properties → ...urces/geofence-externalize-aux.properties b/...urces/geofence-externalize-aux.properties → ...urces/geofence-externalize-aux.properties
diff --git a/...server/geofence/core/dao/BaseDAOTest.java → ...server/geofence/core/dao/BaseDAOTest.java b/...server/geofence/core/dao/BaseDAOTest.java → ...server/geofence/core/dao/BaseDAOTest.java
diff --git a/...rver/geofence/core/dao/GFUserDAOTest.java → ...rver/geofence/core/dao/GFUserDAOTest.java b/...rver/geofence/core/dao/GFUserDAOTest.java → ...rver/geofence/core/dao/GFUserDAOTest.java
diff --git a/...server/geofence/core/dao/RuleDAOTest.java → ...server/geofence/core/dao/RuleDAOTest.java b/...server/geofence/core/dao/RuleDAOTest.java → ...server/geofence/core/dao/RuleDAOTest.java
diff --git a/...server/geofence/core/dao/UserDAOTest.java → ...server/geofence/core/dao/UserDAOTest.java b/...server/geofence/core/dao/UserDAOTest.java → ...server/geofence/core/dao/UserDAOTest.java
diff --git a/...r/geofence/core/dao/UserGroupDAOTest.java → ...r/geofence/core/dao/UserGroupDAOTest.java b/...r/geofence/core/dao/UserGroupDAOTest.java → ...r/geofence/core/dao/UserGroupDAOTest.java
diff --git a/...ofence/core/dao/util/DaoRegistryTest.java → ...ofence/core/dao/util/DaoRegistryTest.java b/...ofence/core/dao/util/DaoRegistryTest.java → ...ofence/core/dao/util/DaoRegistryTest.java
diff --git a/...geofence/core/dao/util/PwEncoderTest.java → ...geofence/core/dao/util/PwEncoderTest.java b/...geofence/core/dao/util/PwEncoderTest.java → ...geofence/core/dao/util/PwEncoderTest.java
diff --git a/...ources/geofence-datasource-ovr.properties → ...ources/geofence-datasource-ovr.properties b/...ources/geofence-datasource-ovr.properties → ...ources/geofence-datasource-ovr.properties
diff --git a/...tence/src/test/resources/log4j.properties → ...tence/src/test/resources/log4j.properties b/...tence/src/test/resources/log4j.properties → ...tence/src/test/resources/log4j.properties
diff --git a/src/services/core/pom.xml → src/core/pom.xml b/src/services/core/pom.xml → src/core/pom.xml
@@ -13,7 +13,7 @@
 
     <parent>
         <groupId>org.geoserver.geofence</groupId>
-        <artifactId>geofence-root</artifactId>
+        <artifactId>geofence</artifactId>
         <version>3.5-SNAPSHOT</version>
     </parent>
 

diff --git a/src/services/core/services-api/pom.xml → src/core/services-api/pom.xml b/src/services/core/services-api/pom.xml → src/core/services-api/pom.xml
diff --git a/...fence/services/AdminRuleAdminService.java → ...fence/services/AdminRuleAdminService.java b/...fence/services/AdminRuleAdminService.java → ...fence/services/AdminRuleAdminService.java
diff --git a/...ofence/services/AuthorizationService.java → ...ofence/services/AuthorizationService.java b/...ofence/services/AuthorizationService.java → ...ofence/services/AuthorizationService.java
diff --git a/...geofence/services/ConfigAdminService.java → ...geofence/services/ConfigAdminService.java b/...geofence/services/ConfigAdminService.java → ...geofence/services/ConfigAdminService.java
diff --git a/...geofence/services/GFUserAdminService.java → ...geofence/services/GFUserAdminService.java b/...geofence/services/GFUserAdminService.java → ...geofence/services/GFUserAdminService.java
diff --git a/...geofence/services/GetProviderService.java → ...geofence/services/GetProviderService.java b/...geofence/services/GetProviderService.java → ...geofence/services/GetProviderService.java
diff --git a/...ofence/services/InstanceAdminService.java → ...ofence/services/InstanceAdminService.java b/...ofence/services/InstanceAdminService.java → ...ofence/services/InstanceAdminService.java
diff --git a/...r/geofence/services/RuleAdminService.java → ...r/geofence/services/RuleAdminService.java b/...r/geofence/services/RuleAdminService.java → ...r/geofence/services/RuleAdminService.java
diff --git a/.../geofence/services/RuleReaderService.java → .../geofence/services/RuleReaderService.java b/.../geofence/services/RuleReaderService.java → .../geofence/services/RuleReaderService.java
diff --git a/...r/geofence/services/UserAdminService.java → ...r/geofence/services/UserAdminService.java b/...r/geofence/services/UserAdminService.java → ...r/geofence/services/UserAdminService.java
diff --git a/...fence/services/UserGroupAdminService.java → ...fence/services/UserGroupAdminService.java b/...fence/services/UserGroupAdminService.java → ...fence/services/UserGroupAdminService.java
diff --git a/...ver/geofence/services/dto/AccessInfo.java → ...ver/geofence/services/dto/AccessInfo.java b/...ver/geofence/services/dto/AccessInfo.java → ...ver/geofence/services/dto/AccessInfo.java
diff --git a/...erver/geofence/services/dto/AuthUser.java → ...erver/geofence/services/dto/AuthUser.java b/...erver/geofence/services/dto/AuthUser.java → ...erver/geofence/services/dto/AuthUser.java
diff --git a/...geofence/services/dto/CatalogModeDTO.java → ...geofence/services/dto/CatalogModeDTO.java b/...geofence/services/dto/CatalogModeDTO.java → ...geofence/services/dto/CatalogModeDTO.java
diff --git a/...ver/geofence/services/dto/RuleFilter.java → ...ver/geofence/services/dto/RuleFilter.java b/...ver/geofence/services/dto/RuleFilter.java → ...ver/geofence/services/dto/RuleFilter.java
diff --git a/...geofence/services/dto/ShortAdminRule.java → ...geofence/services/dto/ShortAdminRule.java b/...geofence/services/dto/ShortAdminRule.java → ...geofence/services/dto/ShortAdminRule.java
diff --git a/...ver/geofence/services/dto/ShortGroup.java → ...ver/geofence/services/dto/ShortGroup.java b/...ver/geofence/services/dto/ShortGroup.java → ...ver/geofence/services/dto/ShortGroup.java
diff --git a/.../geofence/services/dto/ShortInstance.java → .../geofence/services/dto/ShortInstance.java b/.../geofence/services/dto/ShortInstance.java → .../geofence/services/dto/ShortInstance.java
diff --git a/...rver/geofence/services/dto/ShortRule.java → ...rver/geofence/services/dto/ShortRule.java b/...rver/geofence/services/dto/ShortRule.java → ...rver/geofence/services/dto/ShortRule.java
diff --git a/...rver/geofence/services/dto/ShortUser.java → ...rver/geofence/services/dto/ShortUser.java b/...rver/geofence/services/dto/ShortUser.java → ...rver/geofence/services/dto/ShortUser.java
diff --git a/...rvices/exception/BadRequestServiceEx.java → ...rvices/exception/BadRequestServiceEx.java b/...rvices/exception/BadRequestServiceEx.java → ...rvices/exception/BadRequestServiceEx.java
diff --git a/...ces/exception/InternalErrorServiceEx.java → ...ces/exception/InternalErrorServiceEx.java b/...ces/exception/InternalErrorServiceEx.java → ...ces/exception/InternalErrorServiceEx.java
diff --git a/...services/exception/NotFoundServiceEx.java → ...services/exception/NotFoundServiceEx.java b/...services/exception/NotFoundServiceEx.java → ...services/exception/NotFoundServiceEx.java
diff --git a/...es/exception/WebApplicationException.java → ...es/exception/WebApplicationException.java b/...es/exception/WebApplicationException.java → ...es/exception/WebApplicationException.java
diff --git a/...erver/geofence/services/util/IPUtils.java → ...erver/geofence/services/util/IPUtils.java b/...erver/geofence/services/util/IPUtils.java → ...erver/geofence/services/util/IPUtils.java
diff --git a/.../geoserver/geofence/spi/UserResolver.java → .../geoserver/geofence/spi/UserResolver.java b/.../geoserver/geofence/spi/UserResolver.java → .../geoserver/geofence/spi/UserResolver.java
diff --git a/...r/geofence/services/util/IPUtilsTest.java → ...r/geofence/services/util/IPUtilsTest.java b/...r/geofence/services/util/IPUtilsTest.java → ...r/geofence/services/util/IPUtilsTest.java
diff --git a/src/services/core/services-impl/pom.xml → src/core/services-impl/pom.xml b/src/services/core/services-impl/pom.xml → src/core/services-impl/pom.xml
diff --git a/...e/services/AdminRuleAdminServiceImpl.java → ...e/services/AdminRuleAdminServiceImpl.java b/...e/services/AdminRuleAdminServiceImpl.java → ...e/services/AdminRuleAdminServiceImpl.java
diff --git a/...ce/services/AuthorizationServiceImpl.java → ...ce/services/AuthorizationServiceImpl.java b/...ce/services/AuthorizationServiceImpl.java → ...ce/services/AuthorizationServiceImpl.java
diff --git a/...eofence/services/DefaultUserResolver.java → ...eofence/services/DefaultUserResolver.java b/...eofence/services/DefaultUserResolver.java → ...eofence/services/DefaultUserResolver.java
diff --git a/...ence/services/GFUserAdminServiceImpl.java → ...ence/services/GFUserAdminServiceImpl.java b/...ence/services/GFUserAdminServiceImpl.java → ...ence/services/GFUserAdminServiceImpl.java
diff --git a/...ce/services/InstanceAdminServiceImpl.java → ...ce/services/InstanceAdminServiceImpl.java b/...ce/services/InstanceAdminServiceImpl.java → ...ce/services/InstanceAdminServiceImpl.java
diff --git a/...ofence/services/RuleAdminServiceImpl.java → ...ofence/services/RuleAdminServiceImpl.java b/...ofence/services/RuleAdminServiceImpl.java → ...ofence/services/RuleAdminServiceImpl.java
diff --git a/...fence/services/RuleReaderServiceImpl.java → ...fence/services/RuleReaderServiceImpl.java b/...fence/services/RuleReaderServiceImpl.java → ...fence/services/RuleReaderServiceImpl.java
diff --git a/...ofence/services/UserAdminServiceImpl.java → ...ofence/services/UserAdminServiceImpl.java b/...ofence/services/UserAdminServiceImpl.java → ...ofence/services/UserAdminServiceImpl.java
diff --git a/...e/services/UserGroupAdminServiceImpl.java → ...e/services/UserGroupAdminServiceImpl.java b/...e/services/UserGroupAdminServiceImpl.java → ...e/services/UserGroupAdminServiceImpl.java
diff --git a/...nce/services/util/AccessInfoInternal.java → ...nce/services/util/AccessInfoInternal.java b/...nce/services/util/AccessInfoInternal.java → ...nce/services/util/AccessInfoInternal.java
diff --git a/...r/geofence/services/util/FilterUtils.java → ...r/geofence/services/util/FilterUtils.java b/...r/geofence/services/util/FilterUtils.java → ...r/geofence/services/util/FilterUtils.java
diff --git a/...fence/util/CategorizedCircularBuffer.java → ...fence/util/CategorizedCircularBuffer.java b/...fence/util/CategorizedCircularBuffer.java → ...fence/util/CategorizedCircularBuffer.java
diff --git a/...src/main/resources/applicationContext.xml → ...src/main/resources/applicationContext.xml b/...src/main/resources/applicationContext.xml → ...src/main/resources/applicationContext.xml
diff --git a/...rvices/AdminRuleAdminServiceImplTest.java → ...rvices/AdminRuleAdminServiceImplTest.java b/...rvices/AdminRuleAdminServiceImplTest.java → ...rvices/AdminRuleAdminServiceImplTest.java
diff --git a/.../services/GFUserAdminServiceImplTest.java → .../services/GFUserAdminServiceImplTest.java b/.../services/GFUserAdminServiceImplTest.java → .../services/GFUserAdminServiceImplTest.java
diff --git a/...ce/services/RuleAdminServiceImplTest.java → ...ce/services/RuleAdminServiceImplTest.java b/...ce/services/RuleAdminServiceImplTest.java → ...ce/services/RuleAdminServiceImplTest.java
diff --git a/...e/services/RuleReaderCatalogModeTest.java → ...e/services/RuleReaderCatalogModeTest.java b/...e/services/RuleReaderCatalogModeTest.java → ...e/services/RuleReaderCatalogModeTest.java
diff --git a/...e/services/RuleReaderServiceImplTest.java → ...e/services/RuleReaderServiceImplTest.java b/...e/services/RuleReaderServiceImplTest.java → ...e/services/RuleReaderServiceImplTest.java
diff --git a/...er/geofence/services/ServiceTestBase.java → ...er/geofence/services/ServiceTestBase.java b/...er/geofence/services/ServiceTestBase.java → ...er/geofence/services/ServiceTestBase.java
diff --git a/...ce/services/UserAdminServiceImplTest.java → ...ce/services/UserAdminServiceImplTest.java b/...ce/services/UserAdminServiceImplTest.java → ...ce/services/UserAdminServiceImplTest.java
diff --git a/...rvices/UserGroupAdminServiceImplTest.java → ...rvices/UserGroupAdminServiceImplTest.java b/...rvices/UserGroupAdminServiceImplTest.java → ...rvices/UserGroupAdminServiceImplTest.java
diff --git a/...e/util/CategorizedCircularBufferTest.java → ...e/util/CategorizedCircularBufferTest.java b/...e/util/CategorizedCircularBufferTest.java → ...e/util/CategorizedCircularBufferTest.java
diff --git a/...erver/test/AbstractSpringContextTest.java → ...erver/test/AbstractSpringContextTest.java b/...erver/test/AbstractSpringContextTest.java → ...erver/test/AbstractSpringContextTest.java
diff --git a/...ources/geofence-datasource-ovr.properties → ...ources/geofence-datasource-ovr.properties b/...ources/geofence-datasource-ovr.properties → ...ources/geofence-datasource-ovr.properties
diff --git a/...-impl/src/test/resources/log4j.properties → ...-impl/src/test/resources/log4j.properties b/...-impl/src/test/resources/log4j.properties → ...-impl/src/test/resources/log4j.properties
diff --git a/src/services/core/webtest/pom.xml → src/core/webtest/pom.xml b/src/services/core/webtest/pom.xml → src/core/webtest/pom.xml
diff --git a/...server/geofence/servicetest/MainTest.java → ...server/geofence/servicetest/MainTest.java b/...server/geofence/servicetest/MainTest.java → ...server/geofence/servicetest/MainTest.java
diff --git a/...ources/META-INF/cxf/org.apache.cxf.Logger → ...ources/META-INF/cxf/org.apache.cxf.Logger b/...ources/META-INF/cxf/org.apache.cxf.Logger → ...ources/META-INF/cxf/org.apache.cxf.Logger
diff --git a/...src/main/resources/applicationContext.xml → ...src/main/resources/applicationContext.xml b/...src/main/resources/applicationContext.xml → ...src/main/resources/applicationContext.xml
diff --git a/...ources/geofence-datasource-ovr.properties → ...ources/geofence-datasource-ovr.properties b/...ources/geofence-datasource-ovr.properties → ...ources/geofence-datasource-ovr.properties
diff --git a/.../resources/geofence-datasource.properties → .../resources/geofence-datasource.properties b/.../resources/geofence-datasource.properties → .../resources/geofence-datasource.properties
diff --git a/...core/webtest/src/main/resources/log4j.xml → ...core/webtest/src/main/resources/log4j.xml b/...core/webtest/src/main/resources/log4j.xml → ...core/webtest/src/main/resources/log4j.xml
diff --git a/.../main/webapp/WEB-INF/remoting-servlet.xml → .../main/webapp/WEB-INF/remoting-servlet.xml b/.../main/webapp/WEB-INF/remoting-servlet.xml → .../main/webapp/WEB-INF/remoting-servlet.xml
diff --git a/...e/webtest/src/main/webapp/WEB-INF/web.xml → ...e/webtest/src/main/webapp/WEB-INF/web.xml b/...e/webtest/src/main/webapp/WEB-INF/web.xml → ...e/webtest/src/main/webapp/WEB-INF/web.xml
diff --git a/src/services/modules/ldap/pom.xml → src/extension/ldap/pom.xml b/src/services/modules/ldap/pom.xml → src/extension/ldap/pom.xml
@@ -11,14 +11,14 @@
 
     <parent>
         <groupId>org.geoserver.geofence</groupId>
-        <artifactId>geofence-modules</artifactId>
+        <artifactId>geofence-extension</artifactId>
         <version>3.5-SNAPSHOT</version>
     </parent>
 
     <groupId>org.geoserver.geofence</groupId>
     <artifactId>geofence-ldap</artifactId>
     <packaging>jar</packaging>
-    <name>GeoFence - Module - LDAP Support</name>
+    <name>GeoFence - Extension - LDAP Support</name>
 
    <properties>
        <apacheldap-version>2.0.0.AM25</apacheldap-version>

diff --git a/...r/geofence/ldap/LdapAttributesMapper.java → ...r/geofence/ldap/LdapAttributesMapper.java b/...r/geofence/ldap/LdapAttributesMapper.java → ...r/geofence/ldap/LdapAttributesMapper.java
diff --git a/...e/ldap/dao/impl/BaseAttributesMapper.java → ...e/ldap/dao/impl/BaseAttributesMapper.java b/...e/ldap/dao/impl/BaseAttributesMapper.java → ...e/ldap/dao/impl/BaseAttributesMapper.java
diff --git a/...ldap/dao/impl/GSUserAttributesMapper.java → ...ldap/dao/impl/GSUserAttributesMapper.java b/...ldap/dao/impl/GSUserAttributesMapper.java → ...ldap/dao/impl/GSUserAttributesMapper.java
diff --git a/...ence/ldap/dao/impl/GSUserDAOLdapImpl.java → ...ence/ldap/dao/impl/GSUserDAOLdapImpl.java b/...ence/ldap/dao/impl/GSUserDAOLdapImpl.java → ...ence/ldap/dao/impl/GSUserDAOLdapImpl.java
diff --git a/...r/geofence/ldap/dao/impl/LDAPBaseDAO.java → ...r/geofence/ldap/dao/impl/LDAPBaseDAO.java b/...r/geofence/ldap/dao/impl/LDAPBaseDAO.java → ...r/geofence/ldap/dao/impl/LDAPBaseDAO.java
diff --git a/...p/dao/impl/UserGroupAttributesMapper.java → ...p/dao/impl/UserGroupAttributesMapper.java b/...p/dao/impl/UserGroupAttributesMapper.java → ...p/dao/impl/UserGroupAttributesMapper.java
diff --git a/...e/ldap/dao/impl/UserGroupDAOLdapImpl.java → ...e/ldap/dao/impl/UserGroupDAOLdapImpl.java b/...e/ldap/dao/impl/UserGroupDAOLdapImpl.java → ...e/ldap/dao/impl/UserGroupDAOLdapImpl.java
diff --git a/...server/geofence/ldap/utils/LdapUtils.java → ...server/geofence/ldap/utils/LdapUtils.java b/...server/geofence/ldap/utils/LdapUtils.java → ...server/geofence/ldap/utils/LdapUtils.java
diff --git a/...ationContext-geofence-ldap-datasource.xml → ...ationContext-geofence-ldap-datasource.xml b/...ationContext-geofence-ldap-datasource.xml → ...ationContext-geofence-ldap-datasource.xml
diff --git a/...src/main/resources/applicationContext.xml → ...src/main/resources/applicationContext.xml b/...src/main/resources/applicationContext.xml → ...src/main/resources/applicationContext.xml
diff --git a/...r/geofence/ldap/dao/impl/BaseDAOTest.java → ...r/geofence/ldap/dao/impl/BaseDAOTest.java b/...r/geofence/ldap/dao/impl/BaseDAOTest.java → ...r/geofence/ldap/dao/impl/BaseDAOTest.java
diff --git a/.../ldap/dao/impl/GSUserDAOLdapImplTest.java → .../ldap/dao/impl/GSUserDAOLdapImplTest.java b/.../ldap/dao/impl/GSUserDAOLdapImplTest.java → .../ldap/dao/impl/GSUserDAOLdapImplTest.java
diff --git a/...ap/dao/impl/UserGroupDAOLdapImplTest.java → ...ap/dao/impl/UserGroupDAOLdapImplTest.java b/...ap/dao/impl/UserGroupDAOLdapImplTest.java → ...ap/dao/impl/UserGroupDAOLdapImplTest.java
diff --git a/...modules/ldap/src/test/resources/data.ldif → ...tension/ldap/src/test/resources/data.ldif b/...modules/ldap/src/test/resources/data.ldif → ...tension/ldap/src/test/resources/data.ldif
diff --git a/...ources/geofence-datasource-ovr.properties → ...ources/geofence-datasource-ovr.properties b/...ources/geofence-datasource-ovr.properties → ...ources/geofence-datasource-ovr.properties
diff --git a/.../ldap/src/test/resources/log4j.properties → .../ldap/src/test/resources/log4j.properties b/.../ldap/src/test/resources/log4j.properties → .../ldap/src/test/resources/log4j.properties
diff --git a/src/services/modules/pom.xml → src/extension/pom.xml b/src/services/modules/pom.xml → src/extension/pom.xml
@@ -13,18 +13,16 @@
 
     <parent>
         <groupId>org.geoserver.geofence</groupId>
-        <artifactId>geofence-root</artifactId>
+        <artifactId>geofence</artifactId>
         <version>3.5-SNAPSHOT</version>
     </parent>
 
     <groupId>org.geoserver.geofence</groupId>
-    <artifactId>geofence-modules</artifactId>
+    <artifactId>geofence-extension</artifactId>
     <packaging>pom</packaging>
-    <name>GeoFence - Modules - 0 Root</name>
+    <name>GeoFence - Extensions</name>
 
     <modules>
-        <module>login</module>
-        <module>generic-api</module>
         <module>rest</module>
         <module>ldap</module>
     </modules>

diff --git a/src/services/modules/rest/api/pom.xml → src/extension/rest/api/pom.xml b/src/services/modules/rest/api/pom.xml → src/extension/rest/api/pom.xml
@@ -18,7 +18,7 @@
     <groupId>org.geoserver.geofence</groupId>
     <artifactId>geofence-rest-api</artifactId>
     <packaging>jar</packaging>
-    <name>GeoFence - Modules - REST API</name>
+    <name>GeoFence - Extension - REST API</name>
 
     <dependencies>
         <!-- ================================================================-->

diff --git a/...e/services/rest/RESTAdminRuleService.java → ...e/services/rest/RESTAdminRuleService.java b/...e/services/rest/RESTAdminRuleService.java → ...e/services/rest/RESTAdminRuleService.java
diff --git a/...fence/services/rest/RESTBatchService.java → ...fence/services/rest/RESTBatchService.java b/...fence/services/rest/RESTBatchService.java → ...fence/services/rest/RESTBatchService.java
diff --git a/...ence/services/rest/RESTConfigService.java → ...ence/services/rest/RESTConfigService.java b/...ence/services/rest/RESTConfigService.java → ...ence/services/rest/RESTConfigService.java
diff --git a/.../services/rest/RESTGSInstanceService.java → .../services/rest/RESTGSInstanceService.java b/.../services/rest/RESTGSInstanceService.java → .../services/rest/RESTGSInstanceService.java
diff --git a/...ofence/services/rest/RESTRuleService.java → ...ofence/services/rest/RESTRuleService.java b/...ofence/services/rest/RESTRuleService.java → ...ofence/services/rest/RESTRuleService.java
diff --git a/...e/services/rest/RESTUserGroupService.java → ...e/services/rest/RESTUserGroupService.java b/...e/services/rest/RESTUserGroupService.java → ...e/services/rest/RESTUserGroupService.java
diff --git a/...ofence/services/rest/RESTUserService.java → ...ofence/services/rest/RESTUserService.java b/...ofence/services/rest/RESTUserService.java → ...ofence/services/rest/RESTUserService.java
diff --git a/...ices/rest/exception/BadRequestRestEx.java → ...ices/rest/exception/BadRequestRestEx.java b/...ices/rest/exception/BadRequestRestEx.java → ...ices/rest/exception/BadRequestRestEx.java
diff --git a/...rvices/rest/exception/ConflictRestEx.java → ...rvices/rest/exception/ConflictRestEx.java b/...rvices/rest/exception/ConflictRestEx.java → ...rvices/rest/exception/ConflictRestEx.java
diff --git a/...rvices/rest/exception/GeoFenceRestEx.java → ...rvices/rest/exception/GeoFenceRestEx.java b/...rvices/rest/exception/GeoFenceRestEx.java → ...rvices/rest/exception/GeoFenceRestEx.java
diff --git a/...s/rest/exception/InternalErrorRestEx.java → ...s/rest/exception/InternalErrorRestEx.java b/...s/rest/exception/InternalErrorRestEx.java → ...s/rest/exception/InternalErrorRestEx.java
diff --git a/...rvices/rest/exception/NotFoundRestEx.java → ...rvices/rest/exception/NotFoundRestEx.java b/...rvices/rest/exception/NotFoundRestEx.java → ...rvices/rest/exception/NotFoundRestEx.java
diff --git a/...vices/rest/model/AbstractRESTPayload.java → ...vices/rest/model/AbstractRESTPayload.java b/...vices/rest/model/AbstractRESTPayload.java → ...vices/rest/model/AbstractRESTPayload.java
diff --git a/...ofence/services/rest/model/RESTBatch.java → ...ofence/services/rest/model/RESTBatch.java b/...ofence/services/rest/model/RESTBatch.java → ...ofence/services/rest/model/RESTBatch.java
diff --git a/...rvices/rest/model/RESTBatchOperation.java → ...rvices/rest/model/RESTBatchOperation.java b/...rvices/rest/model/RESTBatchOperation.java → ...rvices/rest/model/RESTBatchOperation.java
diff --git a/...rvices/rest/model/RESTInputAdminRule.java → ...rvices/rest/model/RESTInputAdminRule.java b/...rvices/rest/model/RESTInputAdminRule.java → ...rvices/rest/model/RESTInputAdminRule.java
diff --git a/...e/services/rest/model/RESTInputGroup.java → ...e/services/rest/model/RESTInputGroup.java b/...e/services/rest/model/RESTInputGroup.java → ...e/services/rest/model/RESTInputGroup.java
diff --git a/...ervices/rest/model/RESTInputInstance.java → ...ervices/rest/model/RESTInputInstance.java b/...ervices/rest/model/RESTInputInstance.java → ...ervices/rest/model/RESTInputInstance.java
diff --git a/...ce/services/rest/model/RESTInputRule.java → ...ce/services/rest/model/RESTInputRule.java b/...ce/services/rest/model/RESTInputRule.java → ...ce/services/rest/model/RESTInputRule.java
diff --git a/...ce/services/rest/model/RESTInputUser.java → ...ce/services/rest/model/RESTInputUser.java b/...ce/services/rest/model/RESTInputUser.java → ...ce/services/rest/model/RESTInputUser.java
diff --git a/...ices/rest/model/RESTLayerConstraints.java → ...ices/rest/model/RESTLayerConstraints.java b/...ices/rest/model/RESTLayerConstraints.java → ...ices/rest/model/RESTLayerConstraints.java
diff --git a/...vices/rest/model/RESTOutputAdminRule.java → ...vices/rest/model/RESTOutputAdminRule.java b/...vices/rest/model/RESTOutputAdminRule.java → ...vices/rest/model/RESTOutputAdminRule.java
diff --git a/...s/rest/model/RESTOutputAdminRuleList.java → ...s/rest/model/RESTOutputAdminRuleList.java b/...s/rest/model/RESTOutputAdminRuleList.java → ...s/rest/model/RESTOutputAdminRuleList.java
diff --git a/.../services/rest/model/RESTOutputGroup.java → .../services/rest/model/RESTOutputGroup.java b/.../services/rest/model/RESTOutputGroup.java → .../services/rest/model/RESTOutputGroup.java
diff --git a/...rvices/rest/model/RESTOutputInstance.java → ...rvices/rest/model/RESTOutputInstance.java b/...rvices/rest/model/RESTOutputInstance.java → ...rvices/rest/model/RESTOutputInstance.java
diff --git a/...e/services/rest/model/RESTOutputRule.java → ...e/services/rest/model/RESTOutputRule.java b/...e/services/rest/model/RESTOutputRule.java → ...e/services/rest/model/RESTOutputRule.java
diff --git a/...rvices/rest/model/RESTOutputRuleList.java → ...rvices/rest/model/RESTOutputRuleList.java b/...rvices/rest/model/RESTOutputRuleList.java → ...rvices/rest/model/RESTOutputRuleList.java
diff --git a/...e/services/rest/model/RESTOutputUser.java → ...e/services/rest/model/RESTOutputUser.java b/...e/services/rest/model/RESTOutputUser.java → ...e/services/rest/model/RESTOutputUser.java
diff --git a/...services/rest/model/RESTRulePosition.java → ...services/rest/model/RESTRulePosition.java b/...services/rest/model/RESTRulePosition.java → ...services/rest/model/RESTRulePosition.java
diff --git a/...ces/rest/model/RESTShortInstanceList.java → ...ces/rest/model/RESTShortInstanceList.java b/...ces/rest/model/RESTShortInstanceList.java → ...ces/rest/model/RESTShortInstanceList.java
diff --git a/...ce/services/rest/model/RESTShortUser.java → ...ce/services/rest/model/RESTShortUser.java b/...ce/services/rest/model/RESTShortUser.java → ...ce/services/rest/model/RESTShortUser.java
diff --git a/...rvices/rest/model/RESTShortUserGroup.java → ...rvices/rest/model/RESTShortUserGroup.java b/...rvices/rest/model/RESTShortUserGroup.java → ...rvices/rest/model/RESTShortUserGroup.java
diff --git a/...es/rest/model/RESTShortUserGroupList.java → ...es/rest/model/RESTShortUserGroupList.java b/...es/rest/model/RESTShortUserGroupList.java → ...es/rest/model/RESTShortUserGroupList.java
diff --git a/...ervices/rest/model/RESTShortUserList.java → ...ervices/rest/model/RESTShortUserList.java b/...ervices/rest/model/RESTShortUserList.java → ...ervices/rest/model/RESTShortUserList.java
diff --git a/...el/config/RESTConfigurationRemapping.java → ...el/config/RESTConfigurationRemapping.java b/...el/config/RESTConfigurationRemapping.java → ...el/config/RESTConfigurationRemapping.java
diff --git a/...t/model/config/RESTFullConfiguration.java → ...t/model/config/RESTFullConfiguration.java b/...t/model/config/RESTFullConfiguration.java → ...t/model/config/RESTFullConfiguration.java
diff --git a/...rest/model/config/RESTFullGRUserList.java → ...rest/model/config/RESTFullGRUserList.java b/...rest/model/config/RESTFullGRUserList.java → ...rest/model/config/RESTFullGRUserList.java
diff --git a/.../model/config/RESTFullGSInstanceList.java → .../model/config/RESTFullGSInstanceList.java b/.../model/config/RESTFullGSInstanceList.java → .../model/config/RESTFullGSInstanceList.java
diff --git a/...s/rest/model/config/RESTFullRuleList.java → ...s/rest/model/config/RESTFullRuleList.java b/...s/rest/model/config/RESTFullRuleList.java → ...s/rest/model/config/RESTFullRuleList.java
diff --git a/...t/model/config/RESTFullUserGroupList.java → ...t/model/config/RESTFullUserGroupList.java b/...t/model/config/RESTFullUserGroupList.java → ...t/model/config/RESTFullUserGroupList.java
diff --git a/...s/rest/model/config/RESTFullUserList.java → ...s/rest/model/config/RESTFullUserList.java b/...s/rest/model/config/RESTFullUserList.java → ...s/rest/model/config/RESTFullUserList.java
diff --git a/...es/rest/model/config/adapter/MapType.java → ...es/rest/model/config/adapter/MapType.java b/...es/rest/model/config/adapter/MapType.java → ...es/rest/model/config/adapter/MapType.java
diff --git a/...st/model/config/adapter/RemappedType.java → ...st/model/config/adapter/RemappedType.java b/...st/model/config/adapter/RemappedType.java → ...st/model/config/adapter/RemappedType.java
diff --git a/...model/config/adapter/RemapperAdapter.java → ...model/config/adapter/RemapperAdapter.java b/...model/config/adapter/RemapperAdapter.java → ...model/config/adapter/RemapperAdapter.java
diff --git a/...ence/services/rest/model/util/IdName.java → ...ence/services/rest/model/util/IdName.java b/...ence/services/rest/model/util/IdName.java → ...ence/services/rest/model/util/IdName.java
diff --git a/...services/rest/model/util/Identifier.java_ → ...services/rest/model/util/Identifier.java_ b/...services/rest/model/util/Identifier.java_ → ...services/rest/model/util/Identifier.java_
diff --git a/...model/util/RESTBatchOperationFactory.java → ...model/util/RESTBatchOperationFactory.java b/...model/util/RESTBatchOperationFactory.java → ...model/util/RESTBatchOperationFactory.java
diff --git a/...ces/rest/model/ModelPrintoutFakeTest.java → ...ces/rest/model/ModelPrintoutFakeTest.java b/...ces/rest/model/ModelPrintoutFakeTest.java → ...ces/rest/model/ModelPrintoutFakeTest.java
diff --git a/...t/api/src/test/resources/log4j.properties → ...t/api/src/test/resources/log4j.properties b/...t/api/src/test/resources/log4j.properties → ...t/api/src/test/resources/log4j.properties
diff --git a/src/services/modules/rest/client/pom.xml → src/extension/rest/client/pom.xml b/src/services/modules/rest/client/pom.xml → src/extension/rest/client/pom.xml
@@ -18,7 +18,7 @@
     <groupId>org.geoserver.geofence</groupId>
     <artifactId>geofence-rest-client</artifactId>
     <packaging>jar</packaging>
-    <name>GeoFence - Modules - REST client</name>
+    <name>GeoFence - Extension - REST client</name>
 
     <dependencies>
         <!-- ================================================================-->

diff --git a/...eofence/services/rest/GeoFenceClient.java → ...eofence/services/rest/GeoFenceClient.java b/...eofence/services/rest/GeoFenceClient.java → ...eofence/services/rest/GeoFenceClient.java
diff --git a/...ence/services/rest/RuleServiceHelper.java → ...ence/services/rest/RuleServiceHelper.java b/...ence/services/rest/RuleServiceHelper.java → ...ence/services/rest/RuleServiceHelper.java
diff --git a/...nce/services/rest/GeoFenceClientTest.java → ...nce/services/rest/GeoFenceClientTest.java b/...nce/services/rest/GeoFenceClientTest.java → ...nce/services/rest/GeoFenceClientTest.java
diff --git a/...lient/src/test/resources/log4j.properties → ...lient/src/test/resources/log4j.properties b/...lient/src/test/resources/log4j.properties → ...lient/src/test/resources/log4j.properties
diff --git a/src/services/modules/rest/impl/pom.xml → src/extension/rest/impl/pom.xml b/src/services/modules/rest/impl/pom.xml → src/extension/rest/impl/pom.xml
@@ -21,7 +21,7 @@
     <artifactId>geofence-rest-impl</artifactId>
     <packaging>jar</packaging>
 
-    <name>GeoFence - Modules - REST services implementation</name>
+    <name>GeoFence - Extension - REST services implementation</name>
 
     <dependencies>
         <!-- ================================================================-->

diff --git a/...geofence/services/rest/auth/AuthUser.java → ...geofence/services/rest/auth/AuthUser.java b/...geofence/services/rest/auth/AuthUser.java → ...geofence/services/rest/auth/AuthUser.java
diff --git a/...ices/rest/auth/AuthenticationHandler.java → ...ices/rest/auth/AuthenticationHandler.java b/...ices/rest/auth/AuthenticationHandler.java → ...ices/rest/auth/AuthenticationHandler.java
diff --git a/...vices/rest/auth/AuthorizationHandler.java → ...vices/rest/auth/AuthorizationHandler.java b/...vices/rest/auth/AuthorizationHandler.java → ...vices/rest/auth/AuthorizationHandler.java
diff --git a/...th/GeofenceAuthenticationInterceptor.java → ...th/GeofenceAuthenticationInterceptor.java b/...th/GeofenceAuthenticationInterceptor.java → ...th/GeofenceAuthenticationInterceptor.java
diff --git a/...services/rest/auth/GeofencePrincipal.java → ...services/rest/auth/GeofencePrincipal.java b/...services/rest/auth/GeofencePrincipal.java → ...services/rest/auth/GeofencePrincipal.java
diff --git a/...es/rest/auth/GeofenceSecurityContext.java → ...es/rest/auth/GeofenceSecurityContext.java b/...es/rest/auth/GeofenceSecurityContext.java → ...es/rest/auth/GeofenceSecurityContext.java
diff --git a/...rvices/rest/auth/JAXBContextResolver.java → ...rvices/rest/auth/JAXBContextResolver.java b/...rvices/rest/auth/JAXBContextResolver.java → ...rvices/rest/auth/JAXBContextResolver.java
diff --git a/...rvices/rest/impl/BaseRESTServiceImpl.java → ...rvices/rest/impl/BaseRESTServiceImpl.java b/...rvices/rest/impl/BaseRESTServiceImpl.java → ...rvices/rest/impl/BaseRESTServiceImpl.java
diff --git a/...s/rest/impl/RESTAdminRuleServiceImpl.java → ...s/rest/impl/RESTAdminRuleServiceImpl.java b/...s/rest/impl/RESTAdminRuleServiceImpl.java → ...s/rest/impl/RESTAdminRuleServiceImpl.java
diff --git a/...vices/rest/impl/RESTBatchServiceImpl.java → ...vices/rest/impl/RESTBatchServiceImpl.java b/...vices/rest/impl/RESTBatchServiceImpl.java → ...vices/rest/impl/RESTBatchServiceImpl.java
diff --git a/...ices/rest/impl/RESTConfigServiceImpl.java → ...ices/rest/impl/RESTConfigServiceImpl.java b/...ices/rest/impl/RESTConfigServiceImpl.java → ...ices/rest/impl/RESTConfigServiceImpl.java
diff --git a/...es/rest/impl/RESTInstanceServiceImpl.java → ...es/rest/impl/RESTInstanceServiceImpl.java b/...es/rest/impl/RESTInstanceServiceImpl.java → ...es/rest/impl/RESTInstanceServiceImpl.java
diff --git a/...rvices/rest/impl/RESTRuleServiceImpl.java → ...rvices/rest/impl/RESTRuleServiceImpl.java b/...rvices/rest/impl/RESTRuleServiceImpl.java → ...rvices/rest/impl/RESTRuleServiceImpl.java
diff --git a/...s/rest/impl/RESTUserGroupServiceImpl.java → ...s/rest/impl/RESTUserGroupServiceImpl.java b/...s/rest/impl/RESTUserGroupServiceImpl.java → ...s/rest/impl/RESTUserGroupServiceImpl.java
diff --git a/...rvices/rest/impl/RESTUserServiceImpl.java → ...rvices/rest/impl/RESTUserServiceImpl.java b/...rvices/rest/impl/RESTUserServiceImpl.java → ...rvices/rest/impl/RESTUserServiceImpl.java
diff --git a/.../services/rest/utils/InstanceCleaner.java → .../services/rest/utils/InstanceCleaner.java b/.../services/rest/utils/InstanceCleaner.java → .../services/rest/utils/InstanceCleaner.java
diff --git a/...ervices/rest/utils/MultiPolygonUtils.java → ...ervices/rest/utils/MultiPolygonUtils.java b/...ervices/rest/utils/MultiPolygonUtils.java → ...ervices/rest/utils/MultiPolygonUtils.java
diff --git a/...src/main/resources/applicationContext.xml → ...src/main/resources/applicationContext.xml b/...src/main/resources/applicationContext.xml → ...src/main/resources/applicationContext.xml
diff --git a/...ence/services/rest/impl/RESTBaseTest.java → ...ence/services/rest/impl/RESTBaseTest.java b/...ence/services/rest/impl/RESTBaseTest.java → ...ence/services/rest/impl/RESTBaseTest.java
diff --git a/...es/rest/impl/RESTRuleServiceImplTest.java → ...es/rest/impl/RESTRuleServiceImplTest.java b/...es/rest/impl/RESTRuleServiceImplTest.java → ...es/rest/impl/RESTRuleServiceImplTest.java
diff --git a/...st/impl/RESTUserGroupServiceImplTest.java → ...st/impl/RESTUserGroupServiceImplTest.java b/...st/impl/RESTUserGroupServiceImplTest.java → ...st/impl/RESTUserGroupServiceImplTest.java
diff --git a/...es/rest/impl/RESTUserServiceImplTest.java → ...es/rest/impl/RESTUserServiceImplTest.java b/...es/rest/impl/RESTUserServiceImplTest.java → ...es/rest/impl/RESTUserServiceImplTest.java
diff --git a/...ces/rest/model/ModelPrintoutFakeTest.java → ...ces/rest/model/ModelPrintoutFakeTest.java b/...ces/rest/model/ModelPrintoutFakeTest.java → ...ces/rest/model/ModelPrintoutFakeTest.java
diff --git a/...src/test/resources/applicationContext.xml → ...src/test/resources/applicationContext.xml b/...src/test/resources/applicationContext.xml → ...src/test/resources/applicationContext.xml
diff --git a/...ources/geofence-datasource-ovr.properties → ...ources/geofence-datasource-ovr.properties b/...ources/geofence-datasource-ovr.properties → ...ources/geofence-datasource-ovr.properties
diff --git a/.../impl/src/test/resources/log4j.properties → .../impl/src/test/resources/log4j.properties b/.../impl/src/test/resources/log4j.properties → .../impl/src/test/resources/log4j.properties
diff --git a/...est/impl/src/test/resources/xsl/rules.xsl → ...est/impl/src/test/resources/xsl/rules.xsl b/...est/impl/src/test/resources/xsl/rules.xsl → ...est/impl/src/test/resources/xsl/rules.xsl
diff --git a/src/services/modules/rest/pom.xml → src/extension/rest/pom.xml b/src/services/modules/rest/pom.xml → src/extension/rest/pom.xml
@@ -13,13 +13,13 @@
 
     <parent>
         <groupId>org.geoserver.geofence</groupId>
-        <artifactId>geofence-modules</artifactId>
+        <artifactId>geofence-extension</artifactId>
         <version>3.5-SNAPSHOT</version>
     </parent>
 
     <groupId>org.geoserver.geofence</groupId>
     <artifactId>geofence-rest-root</artifactId>
-    <name>GeoFence - Modules - REST root</name>
+    <name>GeoFence - Extension - REST root</name>
     <packaging>pom</packaging>
 
     <modules>

diff --git a/src/services/modules/rest/test/pom.xml → src/extension/rest/test/pom.xml b/src/services/modules/rest/test/pom.xml → src/extension/rest/test/pom.xml
@@ -19,7 +19,7 @@
     <artifactId>geofence-rest-test</artifactId>
     <packaging>war</packaging>
 
-    <name>GeoFence - Modules - REST services test</name>
+    <name>GeoFence - Extension - REST services test</name>
 
     <developers>
         <developer>

diff --git a/...ofence/services/servicetest/MainTest.java → ...ofence/services/servicetest/MainTest.java b/...ofence/services/servicetest/MainTest.java → ...ofence/services/servicetest/MainTest.java
diff --git a/...ources/META-INF/cxf/org.apache.cxf.Logger → ...ources/META-INF/cxf/org.apache.cxf.Logger b/...ources/META-INF/cxf/org.apache.cxf.Logger → ...ources/META-INF/cxf/org.apache.cxf.Logger
diff --git a/...src/main/resources/applicationContext.xml → ...src/main/resources/applicationContext.xml b/...src/main/resources/applicationContext.xml → ...src/main/resources/applicationContext.xml
diff --git a/...ources/geofence-datasource-ovr.properties → ...ources/geofence-datasource-ovr.properties b/...ources/geofence-datasource-ovr.properties → ...ources/geofence-datasource-ovr.properties
diff --git a/.../test/src/main/resources/log4j.properties → .../test/src/main/resources/log4j.properties b/.../test/src/main/resources/log4j.properties → .../test/src/main/resources/log4j.properties
diff --git a/...rest/test/src/main/webapp/WEB-INF/web.xml → ...rest/test/src/main/webapp/WEB-INF/web.xml b/...rest/test/src/main/webapp/WEB-INF/web.xml → ...rest/test/src/main/webapp/WEB-INF/web.xml
diff --git a/.../rest/test/src/test/resources/batch01.xml → .../rest/test/src/test/resources/batch01.xml b/.../rest/test/src/test/resources/batch01.xml → .../rest/test/src/test/resources/batch01.xml
diff --git a/.../rest/test/src/test/resources/batch02.xml → .../rest/test/src/test/resources/batch02.xml b/.../rest/test/src/test/resources/batch02.xml → .../rest/test/src/test/resources/batch02.xml
diff --git a/...rc/test/resources/batch_empty_payload.xml → ...rc/test/resources/batch_empty_payload.xml b/...rc/test/resources/batch_empty_payload.xml → ...rc/test/resources/batch_empty_payload.xml
diff --git a/.../rest/test/src/test/resources/group01.xml → .../rest/test/src/test/resources/group01.xml b/.../rest/test/src/test/resources/group01.xml → .../rest/test/src/test/resources/group01.xml
diff --git a/...st/test/src/test/resources/instance01.xml → ...st/test/src/test/resources/instance01.xml b/...st/test/src/test/resources/instance01.xml → ...st/test/src/test/resources/instance01.xml
diff --git a/...s/rest/test/src/test/resources/rule01.xml → ...n/rest/test/src/test/resources/rule01.xml b/...s/rest/test/src/test/resources/rule01.xml → ...n/rest/test/src/test/resources/rule01.xml
diff --git a/...rest/test/src/test/resources/user0101.xml → ...rest/test/src/test/resources/user0101.xml b/...rest/test/src/test/resources/user0101.xml → ...rest/test/src/test/resources/user0101.xml
diff --git a/.../test/src/test/resources/user0_update.xml → .../test/src/test/resources/user0_update.xml b/.../test/src/test/resources/user0_update.xml → .../test/src/test/resources/user0_update.xml