From f6da23b85b80f827d91c02021122827d8673e69b Mon Sep 17 00:00:00 2001 From: etj Date: Mon, 20 Jan 2020 11:17:47 +0100 Subject: [PATCH] #128: jdk11: major modules refactoring --- .gitignore | 2 +- .../core/model-external/pom.xml | 0 src/{services => }/core/model/pom.xml | 2 +- .../geofence/core/model/AdminRule.java | 0 .../geoserver/geofence/core/model/GFUser.java | 0 .../geofence/core/model/GSInstance.java | 0 .../geoserver/geofence/core/model/GSUser.java | 0 .../geofence/core/model/IPAddressRange.java | 0 .../geofence/core/model/IPRangeProvider.java | 0 .../geofence/core/model/Identifiable.java | 0 .../geofence/core/model/LayerAttribute.java | 0 .../geofence/core/model/LayerDetails.java | 0 .../geofence/core/model/Prioritizable.java | 0 .../geoserver/geofence/core/model/Rule.java | 0 .../geofence/core/model/RuleLimits.java | 0 .../geofence/core/model/UserGroup.java | 0 .../core/model/adapter/FK2UserAdapter.java | 0 .../model/adapter/FK2UserGroupAdapter.java | 0 .../model/adapter/FK2UserGroupSetAdapter.java | 0 .../adapter/FK2UserGroupSetAdapter2.java | 0 .../model/adapter/FKGSInstanceAdapter.java | 0 .../core/model/adapter/FKUserAdapter.java | 0 .../model/adapter/FKUserGroupAdapter.java | 0 .../core/model/adapter/GeometryAdapter.java | 0 .../model/adapter/IdentifiableAdapter.java | 0 .../core/model/adapter/MapAdapter.java | 0 .../model/adapter/MultiPolygonAdapter.java | 0 .../core/model/adapter/PolygonAdapter.java | 0 .../model/adapter/XMultiPolygonAdapter.java | 0 .../core/model/adapter/dual/IdNameBundle.java | 0 .../core/model/adapter/dual/MapEntryType.java | 0 .../core/model/adapter/dual/MapType.java | 0 .../core/model/adapter/package-info.java | 0 .../geofence/core/model/enums/AccessType.java | 0 .../core/model/enums/AdminGrantType.java | 0 .../core/model/enums/CatalogMode.java | 0 .../geofence/core/model/enums/GrantType.java | 0 .../core/model/enums/InsertPosition.java | 0 .../core/model/enums/KnownServices.java | 0 .../geofence/core/model/enums/LayerType.java | 0 .../geofence/core/model/enums/ValueType.java | 0 .../core/model/enums/package-info.java | 0 .../geofence/core/model/package-info.java | 0 .../geofence/core/model/util/PwEncoder.java | 0 .../core/model/util/SubnetV4Utils.java | 0 .../core/model/util/package-info.java | 0 .../core/model/Base64EncodersTest.java | 0 .../geofence/core/model/GSUserTest.java | 0 .../core/model/IPAddressRangeTest.java | 0 .../core/model/util/PwEncoderTest.java | 0 src/{services => }/core/persistence/pom.xml | 0 .../geofence/core/dao/AdminRuleDAO.java | 0 .../core/dao/AllowedStylesProvider.java | 0 .../core/dao/DuplicateKeyException.java | 0 .../geofence/core/dao/GFUserDAO.java | 0 .../geofence/core/dao/GSInstanceDAO.java | 0 .../geofence/core/dao/GSUserDAO.java | 0 .../geofence/core/dao/LayerDetailsDAO.java | 0 .../geofence/core/dao/PrioritizableDAO.java | 0 .../geofence/core/dao/RegistrableDAO.java | 0 .../core/dao/RestrictedGenericDAO.java | 0 .../geoserver/geofence/core/dao/RuleDAO.java | 0 .../geofence/core/dao/RuleLimitsDAO.java | 0 .../geofence/core/dao/SearchableDAO.java | 0 .../geofence/core/dao/UserGroupDAO.java | 0 .../core/dao/impl/AdminRuleDAOImpl.java | 0 .../geofence/core/dao/impl/BaseDAO.java | 0 .../geofence/core/dao/impl/GFUserDAOImpl.java | 0 .../core/dao/impl/GSInstanceDAOImpl.java | 0 .../geofence/core/dao/impl/GSUserDAOImpl.java | 0 .../core/dao/impl/LayerDetailsDAOImpl.java | 0 .../core/dao/impl/PrioritizableDAOImpl.java | 0 .../geofence/core/dao/impl/RuleDAOImpl.java | 0 .../core/dao/impl/RuleLimitsDAOImpl.java | 0 .../core/dao/impl/UserGroupDAOImpl.java | 0 .../geofence/core/dao/search/Search.java | 0 .../geofence/core/dao/search/SearchUtil.java | 0 .../core/dao/util/GeofenceDaoRegistry.java | 0 .../geofence/core/dao/util/PwEncoder.java | 0 .../applicationContext-geofenceDatasource.xml | 0 .../src/main/resources/applicationContext.xml | 0 .../src/main/resources/geofence-ehcache.xml | 0 .../geofence-externalize-aux.properties | 0 .../geofence/core/dao/BaseDAOTest.java | 0 .../geofence/core/dao/GFUserDAOTest.java | 0 .../geofence/core/dao/RuleDAOTest.java | 0 .../geofence/core/dao/UserDAOTest.java | 0 .../geofence/core/dao/UserGroupDAOTest.java | 0 .../core/dao/util/DaoRegistryTest.java | 0 .../geofence/core/dao/util/PwEncoderTest.java | 0 .../geofence-datasource-ovr.properties | 0 .../src/test/resources/log4j.properties | 0 src/{services => }/core/pom.xml | 2 +- src/{services => }/core/services-api/pom.xml | 0 .../services/AdminRuleAdminService.java | 0 .../services/AuthorizationService.java | 0 .../geofence/services/ConfigAdminService.java | 0 .../geofence/services/GFUserAdminService.java | 0 .../geofence/services/GetProviderService.java | 0 .../services/InstanceAdminService.java | 0 .../geofence/services/RuleAdminService.java | 0 .../geofence/services/RuleReaderService.java | 0 .../geofence/services/UserAdminService.java | 0 .../services/UserGroupAdminService.java | 0 .../geofence/services/dto/AccessInfo.java | 0 .../geofence/services/dto/AuthUser.java | 0 .../geofence/services/dto/CatalogModeDTO.java | 0 .../geofence/services/dto/RuleFilter.java | 0 .../geofence/services/dto/ShortAdminRule.java | 0 .../geofence/services/dto/ShortGroup.java | 0 .../geofence/services/dto/ShortInstance.java | 0 .../geofence/services/dto/ShortRule.java | 0 .../geofence/services/dto/ShortUser.java | 0 .../exception/BadRequestServiceEx.java | 0 .../exception/InternalErrorServiceEx.java | 0 .../services/exception/NotFoundServiceEx.java | 0 .../exception/WebApplicationException.java | 0 .../geofence/services/util/IPUtils.java | 0 .../geoserver/geofence/spi/UserResolver.java | 0 .../geofence/services/util/IPUtilsTest.java | 0 src/{services => }/core/services-impl/pom.xml | 0 .../services/AdminRuleAdminServiceImpl.java | 0 .../services/AuthorizationServiceImpl.java | 0 .../services/DefaultUserResolver.java | 0 .../services/GFUserAdminServiceImpl.java | 0 .../services/InstanceAdminServiceImpl.java | 0 .../services/RuleAdminServiceImpl.java | 0 .../services/RuleReaderServiceImpl.java | 0 .../services/UserAdminServiceImpl.java | 0 .../services/UserGroupAdminServiceImpl.java | 0 .../services/util/AccessInfoInternal.java | 0 .../geofence/services/util/FilterUtils.java | 0 .../util/CategorizedCircularBuffer.java | 0 .../src/main/resources/applicationContext.xml | 0 .../AdminRuleAdminServiceImplTest.java | 0 .../services/GFUserAdminServiceImplTest.java | 0 .../services/RuleAdminServiceImplTest.java | 0 .../services/RuleReaderCatalogModeTest.java | 0 .../services/RuleReaderServiceImplTest.java | 0 .../geofence/services/ServiceTestBase.java | 0 .../services/UserAdminServiceImplTest.java | 0 .../UserGroupAdminServiceImplTest.java | 0 .../util/CategorizedCircularBufferTest.java | 0 .../test/AbstractSpringContextTest.java | 0 .../geofence-datasource-ovr.properties | 0 .../src/test/resources/log4j.properties | 0 src/{services => }/core/webtest/pom.xml | 0 .../geofence/servicetest/MainTest.java | 0 .../META-INF/cxf/org.apache.cxf.Logger | 0 .../src/main/resources/applicationContext.xml | 0 .../geofence-datasource-ovr.properties | 0 .../resources/geofence-datasource.properties | 0 .../core/webtest/src/main/resources/log4j.xml | 0 .../main/webapp/WEB-INF/remoting-servlet.xml | 0 .../webtest/src/main/webapp/WEB-INF/web.xml | 0 .../modules => extension}/ldap/pom.xml | 4 +- .../geofence/ldap/LdapAttributesMapper.java | 0 .../ldap/dao/impl/BaseAttributesMapper.java | 0 .../ldap/dao/impl/GSUserAttributesMapper.java | 0 .../ldap/dao/impl/GSUserDAOLdapImpl.java | 0 .../geofence/ldap/dao/impl/LDAPBaseDAO.java | 0 .../dao/impl/UserGroupAttributesMapper.java | 0 .../ldap/dao/impl/UserGroupDAOLdapImpl.java | 0 .../geofence/ldap/utils/LdapUtils.java | 0 ...cationContext-geofence-ldap-datasource.xml | 0 .../src/main/resources/applicationContext.xml | 0 .../geofence/ldap/dao/impl/BaseDAOTest.java | 0 .../ldap/dao/impl/GSUserDAOLdapImplTest.java | 0 .../dao/impl/UserGroupDAOLdapImplTest.java | 0 .../ldap/src/test/resources/data.ldif | 0 .../geofence-datasource-ovr.properties | 0 .../ldap/src/test/resources/log4j.properties | 0 src/{services/modules => extension}/pom.xml | 8 +- .../modules => extension}/rest/api/pom.xml | 2 +- .../services/rest/RESTAdminRuleService.java | 0 .../services/rest/RESTBatchService.java | 0 .../services/rest/RESTConfigService.java | 0 .../services/rest/RESTGSInstanceService.java | 0 .../services/rest/RESTRuleService.java | 0 .../services/rest/RESTUserGroupService.java | 0 .../services/rest/RESTUserService.java | 0 .../rest/exception/BadRequestRestEx.java | 0 .../rest/exception/ConflictRestEx.java | 0 .../rest/exception/GeoFenceRestEx.java | 0 .../rest/exception/InternalErrorRestEx.java | 0 .../rest/exception/NotFoundRestEx.java | 0 .../rest/model/AbstractRESTPayload.java | 0 .../services/rest/model/RESTBatch.java | 0 .../rest/model/RESTBatchOperation.java | 0 .../rest/model/RESTInputAdminRule.java | 0 .../services/rest/model/RESTInputGroup.java | 0 .../rest/model/RESTInputInstance.java | 0 .../services/rest/model/RESTInputRule.java | 0 .../services/rest/model/RESTInputUser.java | 0 .../rest/model/RESTLayerConstraints.java | 0 .../rest/model/RESTOutputAdminRule.java | 0 .../rest/model/RESTOutputAdminRuleList.java | 0 .../services/rest/model/RESTOutputGroup.java | 0 .../rest/model/RESTOutputInstance.java | 0 .../services/rest/model/RESTOutputRule.java | 0 .../rest/model/RESTOutputRuleList.java | 0 .../services/rest/model/RESTOutputUser.java | 0 .../services/rest/model/RESTRulePosition.java | 0 .../rest/model/RESTShortInstanceList.java | 0 .../services/rest/model/RESTShortUser.java | 0 .../rest/model/RESTShortUserGroup.java | 0 .../rest/model/RESTShortUserGroupList.java | 0 .../rest/model/RESTShortUserList.java | 0 .../config/RESTConfigurationRemapping.java | 0 .../model/config/RESTFullConfiguration.java | 0 .../rest/model/config/RESTFullGRUserList.java | 0 .../model/config/RESTFullGSInstanceList.java | 0 .../rest/model/config/RESTFullRuleList.java | 0 .../model/config/RESTFullUserGroupList.java | 0 .../rest/model/config/RESTFullUserList.java | 0 .../rest/model/config/adapter/MapType.java | 0 .../model/config/adapter/RemappedType.java | 0 .../model/config/adapter/RemapperAdapter.java | 0 .../services/rest/model/util/IdName.java | 0 .../services/rest/model/util/Identifier.java_ | 0 .../model/util/RESTBatchOperationFactory.java | 0 .../rest/model/ModelPrintoutFakeTest.java | 0 .../api/src/test/resources/log4j.properties | 0 .../modules => extension}/rest/client/pom.xml | 2 +- .../services/rest/GeoFenceClient.java | 0 .../services/rest/RuleServiceHelper.java | 0 .../services/rest/GeoFenceClientTest.java | 0 .../src/test/resources/log4j.properties | 0 .../modules => extension}/rest/impl/pom.xml | 2 +- .../geofence/services/rest/auth/AuthUser.java | 0 .../rest/auth/AuthenticationHandler.java | 0 .../rest/auth/AuthorizationHandler.java | 0 .../GeofenceAuthenticationInterceptor.java | 0 .../services/rest/auth/GeofencePrincipal.java | 0 .../rest/auth/GeofenceSecurityContext.java | 0 .../rest/auth/JAXBContextResolver.java | 0 .../rest/impl/BaseRESTServiceImpl.java | 0 .../rest/impl/RESTAdminRuleServiceImpl.java | 0 .../rest/impl/RESTBatchServiceImpl.java | 0 .../rest/impl/RESTConfigServiceImpl.java | 0 .../rest/impl/RESTInstanceServiceImpl.java | 0 .../rest/impl/RESTRuleServiceImpl.java | 0 .../rest/impl/RESTUserGroupServiceImpl.java | 0 .../rest/impl/RESTUserServiceImpl.java | 0 .../services/rest/utils/InstanceCleaner.java | 0 .../rest/utils/MultiPolygonUtils.java | 0 .../src/main/resources/applicationContext.xml | 0 .../services/rest/impl/RESTBaseTest.java | 0 .../rest/impl/RESTRuleServiceImplTest.java | 0 .../impl/RESTUserGroupServiceImplTest.java | 0 .../rest/impl/RESTUserServiceImplTest.java | 0 .../rest/model/ModelPrintoutFakeTest.java | 0 .../src/test/resources/applicationContext.xml | 0 .../geofence-datasource-ovr.properties | 0 .../impl/src/test/resources/log4j.properties | 0 .../impl/src/test/resources/xsl/rules.xsl | 0 .../modules => extension}/rest/pom.xml | 4 +- .../modules => extension}/rest/test/pom.xml | 2 +- .../services/servicetest/MainTest.java | 0 .../META-INF/cxf/org.apache.cxf.Logger | 0 .../src/main/resources/applicationContext.xml | 0 .../geofence-datasource-ovr.properties | 0 .../test/src/main/resources/log4j.properties | 0 .../rest/test/src/main/webapp/WEB-INF/web.xml | 0 .../rest/test/src/test/resources/batch01.xml | 0 .../rest/test/src/test/resources/batch02.xml | 0 .../test/resources/batch_empty_payload.xml | 0 .../rest/test/src/test/resources/group01.xml | 0 .../test/src/test/resources/instance01.xml | 0 .../rest/test/src/test/resources/rule01.xml | 0 .../rest/test/src/test/resources/user0101.xml | 0 .../test/src/test/resources/user0_update.xml | 0 src/pom.xml | 845 ++++++++++++--- src/services/modules/generic-api/pom.xml | 92 -- .../geoserver/geofence/api/AuthProvider.java | 21 - .../geoserver/geofence/api/UserRegistry.java | 22 - .../geoserver/geofence/api/dto/Authority.java | 23 - .../geofence/api/dto/GrantedAuths.java | 39 - .../geofence/api/dto/RegisteredUser.java | 38 - .../geofence/api/exception/AuthException.java | 32 - src/services/modules/login/api/pom.xml | 90 -- .../geofence/login/LoginService.java | 29 - src/services/modules/login/impl/pom.xml | 105 -- .../geofence/login/LoginServiceImpl.java | 142 --- .../login/cxf/BasicAuthInterceptor.java | 157 --- .../geofence/login/util/GrantAll.java | 56 - .../geofence/login/util/MD5Util.java | 49 - .../geofence/login/util/SessionManager.java | 110 -- .../geofence/login/util/TokenEncoder.java | 101 -- .../src/main/resources/applicationContext.xml | 29 - .../geofence/login/util/MD5UtilTest.java | 28 - .../resources/applicationContext-test.xml | 18 - src/services/modules/login/pom.xml | 30 - src/services/pom.xml | 965 ------------------ 294 files changed, 743 insertions(+), 2308 deletions(-) rename src/{services => }/core/model-external/pom.xml (100%) rename src/{services => }/core/model/pom.xml (98%) rename src/{services => }/core/model/src/main/java/org/geoserver/geofence/core/model/AdminRule.java (100%) rename src/{services => }/core/model/src/main/java/org/geoserver/geofence/core/model/GFUser.java (100%) rename src/{services => }/core/model/src/main/java/org/geoserver/geofence/core/model/GSInstance.java (100%) rename src/{services => }/core/model/src/main/java/org/geoserver/geofence/core/model/GSUser.java (100%) rename src/{services => }/core/model/src/main/java/org/geoserver/geofence/core/model/IPAddressRange.java (100%) rename src/{services => }/core/model/src/main/java/org/geoserver/geofence/core/model/IPRangeProvider.java (100%) rename src/{services => }/core/model/src/main/java/org/geoserver/geofence/core/model/Identifiable.java (100%) rename src/{services => }/core/model/src/main/java/org/geoserver/geofence/core/model/LayerAttribute.java (100%) rename src/{services => }/core/model/src/main/java/org/geoserver/geofence/core/model/LayerDetails.java (100%) rename src/{services => }/core/model/src/main/java/org/geoserver/geofence/core/model/Prioritizable.java (100%) rename src/{services => }/core/model/src/main/java/org/geoserver/geofence/core/model/Rule.java (100%) rename src/{services => }/core/model/src/main/java/org/geoserver/geofence/core/model/RuleLimits.java (100%) rename src/{services => }/core/model/src/main/java/org/geoserver/geofence/core/model/UserGroup.java (100%) rename src/{services => }/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/FK2UserAdapter.java (100%) rename src/{services => }/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/FK2UserGroupAdapter.java (100%) rename src/{services => }/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/FK2UserGroupSetAdapter.java (100%) rename src/{services => }/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/FK2UserGroupSetAdapter2.java (100%) rename src/{services => }/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/FKGSInstanceAdapter.java (100%) rename src/{services => }/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/FKUserAdapter.java (100%) rename src/{services => }/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/FKUserGroupAdapter.java (100%) rename src/{services => }/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/GeometryAdapter.java (100%) rename src/{services => }/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/IdentifiableAdapter.java (100%) rename src/{services => }/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/MapAdapter.java (100%) rename src/{services => }/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/MultiPolygonAdapter.java (100%) rename src/{services => }/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/PolygonAdapter.java (100%) rename src/{services => }/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/XMultiPolygonAdapter.java (100%) rename src/{services => }/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/dual/IdNameBundle.java (100%) rename src/{services => }/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/dual/MapEntryType.java (100%) rename src/{services => }/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/dual/MapType.java (100%) rename src/{services => }/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/package-info.java (100%) rename src/{services => }/core/model/src/main/java/org/geoserver/geofence/core/model/enums/AccessType.java (100%) rename src/{services => }/core/model/src/main/java/org/geoserver/geofence/core/model/enums/AdminGrantType.java (100%) rename src/{services => }/core/model/src/main/java/org/geoserver/geofence/core/model/enums/CatalogMode.java (100%) rename src/{services => }/core/model/src/main/java/org/geoserver/geofence/core/model/enums/GrantType.java (100%) rename src/{services => }/core/model/src/main/java/org/geoserver/geofence/core/model/enums/InsertPosition.java (100%) rename src/{services => }/core/model/src/main/java/org/geoserver/geofence/core/model/enums/KnownServices.java (100%) rename src/{services => }/core/model/src/main/java/org/geoserver/geofence/core/model/enums/LayerType.java (100%) rename src/{services => }/core/model/src/main/java/org/geoserver/geofence/core/model/enums/ValueType.java (100%) rename src/{services => }/core/model/src/main/java/org/geoserver/geofence/core/model/enums/package-info.java (100%) rename src/{services => }/core/model/src/main/java/org/geoserver/geofence/core/model/package-info.java (100%) rename src/{services => }/core/model/src/main/java/org/geoserver/geofence/core/model/util/PwEncoder.java (100%) rename src/{services => }/core/model/src/main/java/org/geoserver/geofence/core/model/util/SubnetV4Utils.java (100%) rename src/{services => }/core/model/src/main/java/org/geoserver/geofence/core/model/util/package-info.java (100%) rename src/{services => }/core/model/src/test/java/org/geoserver/geofence/core/model/Base64EncodersTest.java (100%) rename src/{services => }/core/model/src/test/java/org/geoserver/geofence/core/model/GSUserTest.java (100%) rename src/{services => }/core/model/src/test/java/org/geoserver/geofence/core/model/IPAddressRangeTest.java (100%) rename src/{services => }/core/model/src/test/java/org/geoserver/geofence/core/model/util/PwEncoderTest.java (100%) rename src/{services => }/core/persistence/pom.xml (100%) rename src/{services => }/core/persistence/src/main/java/org/geoserver/geofence/core/dao/AdminRuleDAO.java (100%) rename src/{services => }/core/persistence/src/main/java/org/geoserver/geofence/core/dao/AllowedStylesProvider.java (100%) rename src/{services => }/core/persistence/src/main/java/org/geoserver/geofence/core/dao/DuplicateKeyException.java (100%) rename src/{services => }/core/persistence/src/main/java/org/geoserver/geofence/core/dao/GFUserDAO.java (100%) rename src/{services => }/core/persistence/src/main/java/org/geoserver/geofence/core/dao/GSInstanceDAO.java (100%) rename src/{services => }/core/persistence/src/main/java/org/geoserver/geofence/core/dao/GSUserDAO.java (100%) rename src/{services => }/core/persistence/src/main/java/org/geoserver/geofence/core/dao/LayerDetailsDAO.java (100%) rename src/{services => }/core/persistence/src/main/java/org/geoserver/geofence/core/dao/PrioritizableDAO.java (100%) rename src/{services => }/core/persistence/src/main/java/org/geoserver/geofence/core/dao/RegistrableDAO.java (100%) rename src/{services => }/core/persistence/src/main/java/org/geoserver/geofence/core/dao/RestrictedGenericDAO.java (100%) rename src/{services => }/core/persistence/src/main/java/org/geoserver/geofence/core/dao/RuleDAO.java (100%) rename src/{services => }/core/persistence/src/main/java/org/geoserver/geofence/core/dao/RuleLimitsDAO.java (100%) rename src/{services => }/core/persistence/src/main/java/org/geoserver/geofence/core/dao/SearchableDAO.java (100%) rename src/{services => }/core/persistence/src/main/java/org/geoserver/geofence/core/dao/UserGroupDAO.java (100%) rename src/{services => }/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/AdminRuleDAOImpl.java (100%) rename src/{services => }/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/BaseDAO.java (100%) rename src/{services => }/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/GFUserDAOImpl.java (100%) rename src/{services => }/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/GSInstanceDAOImpl.java (100%) rename src/{services => }/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/GSUserDAOImpl.java (100%) rename src/{services => }/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/LayerDetailsDAOImpl.java (100%) rename src/{services => }/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/PrioritizableDAOImpl.java (100%) rename src/{services => }/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/RuleDAOImpl.java (100%) rename src/{services => }/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/RuleLimitsDAOImpl.java (100%) rename src/{services => }/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/UserGroupDAOImpl.java (100%) rename src/{services => }/core/persistence/src/main/java/org/geoserver/geofence/core/dao/search/Search.java (100%) rename src/{services => }/core/persistence/src/main/java/org/geoserver/geofence/core/dao/search/SearchUtil.java (100%) rename src/{services => }/core/persistence/src/main/java/org/geoserver/geofence/core/dao/util/GeofenceDaoRegistry.java (100%) rename src/{services => }/core/persistence/src/main/java/org/geoserver/geofence/core/dao/util/PwEncoder.java (100%) rename src/{services => }/core/persistence/src/main/resources/applicationContext-geofenceDatasource.xml (100%) rename src/{services => }/core/persistence/src/main/resources/applicationContext.xml (100%) rename src/{services => }/core/persistence/src/main/resources/geofence-ehcache.xml (100%) rename src/{services => }/core/persistence/src/main/resources/geofence-externalize-aux.properties (100%) rename src/{services => }/core/persistence/src/test/java/org/geoserver/geofence/core/dao/BaseDAOTest.java (100%) rename src/{services => }/core/persistence/src/test/java/org/geoserver/geofence/core/dao/GFUserDAOTest.java (100%) rename src/{services => }/core/persistence/src/test/java/org/geoserver/geofence/core/dao/RuleDAOTest.java (100%) rename src/{services => }/core/persistence/src/test/java/org/geoserver/geofence/core/dao/UserDAOTest.java (100%) rename src/{services => }/core/persistence/src/test/java/org/geoserver/geofence/core/dao/UserGroupDAOTest.java (100%) rename src/{services => }/core/persistence/src/test/java/org/geoserver/geofence/core/dao/util/DaoRegistryTest.java (100%) rename src/{services => }/core/persistence/src/test/java/org/geoserver/geofence/core/dao/util/PwEncoderTest.java (100%) rename src/{services => }/core/persistence/src/test/resources/geofence-datasource-ovr.properties (100%) rename src/{services => }/core/persistence/src/test/resources/log4j.properties (100%) rename src/{services => }/core/pom.xml (95%) rename src/{services => }/core/services-api/pom.xml (100%) rename src/{services => }/core/services-api/src/main/java/org/geoserver/geofence/services/AdminRuleAdminService.java (100%) rename src/{services => }/core/services-api/src/main/java/org/geoserver/geofence/services/AuthorizationService.java (100%) rename src/{services => }/core/services-api/src/main/java/org/geoserver/geofence/services/ConfigAdminService.java (100%) rename src/{services => }/core/services-api/src/main/java/org/geoserver/geofence/services/GFUserAdminService.java (100%) rename src/{services => }/core/services-api/src/main/java/org/geoserver/geofence/services/GetProviderService.java (100%) rename src/{services => }/core/services-api/src/main/java/org/geoserver/geofence/services/InstanceAdminService.java (100%) rename src/{services => }/core/services-api/src/main/java/org/geoserver/geofence/services/RuleAdminService.java (100%) rename src/{services => }/core/services-api/src/main/java/org/geoserver/geofence/services/RuleReaderService.java (100%) rename src/{services => }/core/services-api/src/main/java/org/geoserver/geofence/services/UserAdminService.java (100%) rename src/{services => }/core/services-api/src/main/java/org/geoserver/geofence/services/UserGroupAdminService.java (100%) rename src/{services => }/core/services-api/src/main/java/org/geoserver/geofence/services/dto/AccessInfo.java (100%) rename src/{services => }/core/services-api/src/main/java/org/geoserver/geofence/services/dto/AuthUser.java (100%) rename src/{services => }/core/services-api/src/main/java/org/geoserver/geofence/services/dto/CatalogModeDTO.java (100%) rename src/{services => }/core/services-api/src/main/java/org/geoserver/geofence/services/dto/RuleFilter.java (100%) rename src/{services => }/core/services-api/src/main/java/org/geoserver/geofence/services/dto/ShortAdminRule.java (100%) rename src/{services => }/core/services-api/src/main/java/org/geoserver/geofence/services/dto/ShortGroup.java (100%) rename src/{services => }/core/services-api/src/main/java/org/geoserver/geofence/services/dto/ShortInstance.java (100%) rename src/{services => }/core/services-api/src/main/java/org/geoserver/geofence/services/dto/ShortRule.java (100%) rename src/{services => }/core/services-api/src/main/java/org/geoserver/geofence/services/dto/ShortUser.java (100%) rename src/{services => }/core/services-api/src/main/java/org/geoserver/geofence/services/exception/BadRequestServiceEx.java (100%) rename src/{services => }/core/services-api/src/main/java/org/geoserver/geofence/services/exception/InternalErrorServiceEx.java (100%) rename src/{services => }/core/services-api/src/main/java/org/geoserver/geofence/services/exception/NotFoundServiceEx.java (100%) rename src/{services => }/core/services-api/src/main/java/org/geoserver/geofence/services/exception/WebApplicationException.java (100%) rename src/{services => }/core/services-api/src/main/java/org/geoserver/geofence/services/util/IPUtils.java (100%) rename src/{services => }/core/services-api/src/main/java/org/geoserver/geofence/spi/UserResolver.java (100%) rename src/{services => }/core/services-api/src/test/java/org/geoserver/geofence/services/util/IPUtilsTest.java (100%) rename src/{services => }/core/services-impl/pom.xml (100%) rename src/{services => }/core/services-impl/src/main/java/org/geoserver/geofence/services/AdminRuleAdminServiceImpl.java (100%) rename src/{services => }/core/services-impl/src/main/java/org/geoserver/geofence/services/AuthorizationServiceImpl.java (100%) rename src/{services => }/core/services-impl/src/main/java/org/geoserver/geofence/services/DefaultUserResolver.java (100%) rename src/{services => }/core/services-impl/src/main/java/org/geoserver/geofence/services/GFUserAdminServiceImpl.java (100%) rename src/{services => }/core/services-impl/src/main/java/org/geoserver/geofence/services/InstanceAdminServiceImpl.java (100%) rename src/{services => }/core/services-impl/src/main/java/org/geoserver/geofence/services/RuleAdminServiceImpl.java (100%) rename src/{services => }/core/services-impl/src/main/java/org/geoserver/geofence/services/RuleReaderServiceImpl.java (100%) rename src/{services => }/core/services-impl/src/main/java/org/geoserver/geofence/services/UserAdminServiceImpl.java (100%) rename src/{services => }/core/services-impl/src/main/java/org/geoserver/geofence/services/UserGroupAdminServiceImpl.java (100%) rename src/{services => }/core/services-impl/src/main/java/org/geoserver/geofence/services/util/AccessInfoInternal.java (100%) rename src/{services => }/core/services-impl/src/main/java/org/geoserver/geofence/services/util/FilterUtils.java (100%) rename src/{services => }/core/services-impl/src/main/java/org/geoserver/geofence/util/CategorizedCircularBuffer.java (100%) rename src/{services => }/core/services-impl/src/main/resources/applicationContext.xml (100%) rename src/{services => }/core/services-impl/src/test/java/org/geoserver/geofence/services/AdminRuleAdminServiceImplTest.java (100%) rename src/{services => }/core/services-impl/src/test/java/org/geoserver/geofence/services/GFUserAdminServiceImplTest.java (100%) rename src/{services => }/core/services-impl/src/test/java/org/geoserver/geofence/services/RuleAdminServiceImplTest.java (100%) rename src/{services => }/core/services-impl/src/test/java/org/geoserver/geofence/services/RuleReaderCatalogModeTest.java (100%) rename src/{services => }/core/services-impl/src/test/java/org/geoserver/geofence/services/RuleReaderServiceImplTest.java (100%) rename src/{services => }/core/services-impl/src/test/java/org/geoserver/geofence/services/ServiceTestBase.java (100%) rename src/{services => }/core/services-impl/src/test/java/org/geoserver/geofence/services/UserAdminServiceImplTest.java (100%) rename src/{services => }/core/services-impl/src/test/java/org/geoserver/geofence/services/UserGroupAdminServiceImplTest.java (100%) rename src/{services => }/core/services-impl/src/test/java/org/geoserver/geofence/util/CategorizedCircularBufferTest.java (100%) rename src/{services => }/core/services-impl/src/test/java/org/geoserver/test/AbstractSpringContextTest.java (100%) rename src/{services => }/core/services-impl/src/test/resources/geofence-datasource-ovr.properties (100%) rename src/{services => }/core/services-impl/src/test/resources/log4j.properties (100%) rename src/{services => }/core/webtest/pom.xml (100%) rename src/{services => }/core/webtest/src/main/java/org/geoserver/geofence/servicetest/MainTest.java (100%) rename src/{services => }/core/webtest/src/main/resources/META-INF/cxf/org.apache.cxf.Logger (100%) rename src/{services => }/core/webtest/src/main/resources/applicationContext.xml (100%) rename src/{services => }/core/webtest/src/main/resources/geofence-datasource-ovr.properties (100%) rename src/{services => }/core/webtest/src/main/resources/geofence-datasource.properties (100%) rename src/{services => }/core/webtest/src/main/resources/log4j.xml (100%) rename src/{services => }/core/webtest/src/main/webapp/WEB-INF/remoting-servlet.xml (100%) rename src/{services => }/core/webtest/src/main/webapp/WEB-INF/web.xml (100%) rename src/{services/modules => extension}/ldap/pom.xml (98%) rename src/{services/modules => extension}/ldap/src/main/java/org/geoserver/geofence/ldap/LdapAttributesMapper.java (100%) rename src/{services/modules => extension}/ldap/src/main/java/org/geoserver/geofence/ldap/dao/impl/BaseAttributesMapper.java (100%) rename src/{services/modules => extension}/ldap/src/main/java/org/geoserver/geofence/ldap/dao/impl/GSUserAttributesMapper.java (100%) rename src/{services/modules => extension}/ldap/src/main/java/org/geoserver/geofence/ldap/dao/impl/GSUserDAOLdapImpl.java (100%) rename src/{services/modules => extension}/ldap/src/main/java/org/geoserver/geofence/ldap/dao/impl/LDAPBaseDAO.java (100%) rename src/{services/modules => extension}/ldap/src/main/java/org/geoserver/geofence/ldap/dao/impl/UserGroupAttributesMapper.java (100%) rename src/{services/modules => extension}/ldap/src/main/java/org/geoserver/geofence/ldap/dao/impl/UserGroupDAOLdapImpl.java (100%) rename src/{services/modules => extension}/ldap/src/main/java/org/geoserver/geofence/ldap/utils/LdapUtils.java (100%) rename src/{services/modules => extension}/ldap/src/main/resources/applicationContext-geofence-ldap-datasource.xml (100%) rename src/{services/modules => extension}/ldap/src/main/resources/applicationContext.xml (100%) rename src/{services/modules => extension}/ldap/src/test/java/org/geoserver/geofence/ldap/dao/impl/BaseDAOTest.java (100%) rename src/{services/modules => extension}/ldap/src/test/java/org/geoserver/geofence/ldap/dao/impl/GSUserDAOLdapImplTest.java (100%) rename src/{services/modules => extension}/ldap/src/test/java/org/geoserver/geofence/ldap/dao/impl/UserGroupDAOLdapImplTest.java (100%) rename src/{services/modules => extension}/ldap/src/test/resources/data.ldif (100%) rename src/{services/modules => extension}/ldap/src/test/resources/geofence-datasource-ovr.properties (100%) rename src/{services/modules => extension}/ldap/src/test/resources/log4j.properties (100%) rename src/{services/modules => extension}/pom.xml (78%) rename src/{services/modules => extension}/rest/api/pom.xml (98%) rename src/{services/modules => extension}/rest/api/src/main/java/org/geoserver/geofence/services/rest/RESTAdminRuleService.java (100%) rename src/{services/modules => extension}/rest/api/src/main/java/org/geoserver/geofence/services/rest/RESTBatchService.java (100%) rename src/{services/modules => extension}/rest/api/src/main/java/org/geoserver/geofence/services/rest/RESTConfigService.java (100%) rename src/{services/modules => extension}/rest/api/src/main/java/org/geoserver/geofence/services/rest/RESTGSInstanceService.java (100%) rename src/{services/modules => extension}/rest/api/src/main/java/org/geoserver/geofence/services/rest/RESTRuleService.java (100%) rename src/{services/modules => extension}/rest/api/src/main/java/org/geoserver/geofence/services/rest/RESTUserGroupService.java (100%) rename src/{services/modules => extension}/rest/api/src/main/java/org/geoserver/geofence/services/rest/RESTUserService.java (100%) rename src/{services/modules => extension}/rest/api/src/main/java/org/geoserver/geofence/services/rest/exception/BadRequestRestEx.java (100%) rename src/{services/modules => extension}/rest/api/src/main/java/org/geoserver/geofence/services/rest/exception/ConflictRestEx.java (100%) rename src/{services/modules => extension}/rest/api/src/main/java/org/geoserver/geofence/services/rest/exception/GeoFenceRestEx.java (100%) rename src/{services/modules => extension}/rest/api/src/main/java/org/geoserver/geofence/services/rest/exception/InternalErrorRestEx.java (100%) rename src/{services/modules => extension}/rest/api/src/main/java/org/geoserver/geofence/services/rest/exception/NotFoundRestEx.java (100%) rename src/{services/modules => extension}/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/AbstractRESTPayload.java (100%) rename src/{services/modules => extension}/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTBatch.java (100%) rename src/{services/modules => extension}/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTBatchOperation.java (100%) rename src/{services/modules => extension}/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTInputAdminRule.java (100%) rename src/{services/modules => extension}/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTInputGroup.java (100%) rename src/{services/modules => extension}/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTInputInstance.java (100%) rename src/{services/modules => extension}/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTInputRule.java (100%) rename src/{services/modules => extension}/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTInputUser.java (100%) rename src/{services/modules => extension}/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTLayerConstraints.java (100%) rename src/{services/modules => extension}/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTOutputAdminRule.java (100%) rename src/{services/modules => extension}/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTOutputAdminRuleList.java (100%) rename src/{services/modules => extension}/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTOutputGroup.java (100%) rename src/{services/modules => extension}/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTOutputInstance.java (100%) rename src/{services/modules => extension}/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTOutputRule.java (100%) rename src/{services/modules => extension}/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTOutputRuleList.java (100%) rename src/{services/modules => extension}/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTOutputUser.java (100%) rename src/{services/modules => extension}/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTRulePosition.java (100%) rename src/{services/modules => extension}/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTShortInstanceList.java (100%) rename src/{services/modules => extension}/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTShortUser.java (100%) rename src/{services/modules => extension}/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTShortUserGroup.java (100%) rename src/{services/modules => extension}/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTShortUserGroupList.java (100%) rename src/{services/modules => extension}/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTShortUserList.java (100%) rename src/{services/modules => extension}/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/config/RESTConfigurationRemapping.java (100%) rename src/{services/modules => extension}/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/config/RESTFullConfiguration.java (100%) rename src/{services/modules => extension}/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/config/RESTFullGRUserList.java (100%) rename src/{services/modules => extension}/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/config/RESTFullGSInstanceList.java (100%) rename src/{services/modules => extension}/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/config/RESTFullRuleList.java (100%) rename src/{services/modules => extension}/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/config/RESTFullUserGroupList.java (100%) rename src/{services/modules => extension}/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/config/RESTFullUserList.java (100%) rename src/{services/modules => extension}/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/config/adapter/MapType.java (100%) rename src/{services/modules => extension}/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/config/adapter/RemappedType.java (100%) rename src/{services/modules => extension}/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/config/adapter/RemapperAdapter.java (100%) rename src/{services/modules => extension}/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/util/IdName.java (100%) rename src/{services/modules => extension}/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/util/Identifier.java_ (100%) rename src/{services/modules => extension}/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/util/RESTBatchOperationFactory.java (100%) rename src/{services/modules => extension}/rest/api/src/test/java/org/geoserver/geofence/services/rest/model/ModelPrintoutFakeTest.java (100%) rename src/{services/modules => extension}/rest/api/src/test/resources/log4j.properties (100%) rename src/{services/modules => extension}/rest/client/pom.xml (98%) rename src/{services/modules => extension}/rest/client/src/main/java/org/geoserver/geofence/services/rest/GeoFenceClient.java (100%) rename src/{services/modules => extension}/rest/client/src/main/java/org/geoserver/geofence/services/rest/RuleServiceHelper.java (100%) rename src/{services/modules => extension}/rest/client/src/test/java/org/geoserver/geofence/services/rest/GeoFenceClientTest.java (100%) rename src/{services/modules => extension}/rest/client/src/test/resources/log4j.properties (100%) rename src/{services/modules => extension}/rest/impl/pom.xml (99%) rename src/{services/modules => extension}/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/AuthUser.java (100%) rename src/{services/modules => extension}/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/AuthenticationHandler.java (100%) rename src/{services/modules => extension}/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/AuthorizationHandler.java (100%) rename src/{services/modules => extension}/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/GeofenceAuthenticationInterceptor.java (100%) rename src/{services/modules => extension}/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/GeofencePrincipal.java (100%) rename src/{services/modules => extension}/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/GeofenceSecurityContext.java (100%) rename src/{services/modules => extension}/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/JAXBContextResolver.java (100%) rename src/{services/modules => extension}/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/BaseRESTServiceImpl.java (100%) rename src/{services/modules => extension}/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTAdminRuleServiceImpl.java (100%) rename src/{services/modules => extension}/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTBatchServiceImpl.java (100%) rename src/{services/modules => extension}/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTConfigServiceImpl.java (100%) rename src/{services/modules => extension}/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTInstanceServiceImpl.java (100%) rename src/{services/modules => extension}/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTRuleServiceImpl.java (100%) rename src/{services/modules => extension}/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTUserGroupServiceImpl.java (100%) rename src/{services/modules => extension}/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTUserServiceImpl.java (100%) rename src/{services/modules => extension}/rest/impl/src/main/java/org/geoserver/geofence/services/rest/utils/InstanceCleaner.java (100%) rename src/{services/modules => extension}/rest/impl/src/main/java/org/geoserver/geofence/services/rest/utils/MultiPolygonUtils.java (100%) rename src/{services/modules => extension}/rest/impl/src/main/resources/applicationContext.xml (100%) rename src/{services/modules => extension}/rest/impl/src/test/java/org/geoserver/geofence/services/rest/impl/RESTBaseTest.java (100%) rename src/{services/modules => extension}/rest/impl/src/test/java/org/geoserver/geofence/services/rest/impl/RESTRuleServiceImplTest.java (100%) rename src/{services/modules => extension}/rest/impl/src/test/java/org/geoserver/geofence/services/rest/impl/RESTUserGroupServiceImplTest.java (100%) rename src/{services/modules => extension}/rest/impl/src/test/java/org/geoserver/geofence/services/rest/impl/RESTUserServiceImplTest.java (100%) rename src/{services/modules => extension}/rest/impl/src/test/java/org/geoserver/geofence/services/rest/model/ModelPrintoutFakeTest.java (100%) rename src/{services/modules => extension}/rest/impl/src/test/resources/applicationContext.xml (100%) rename src/{services/modules => extension}/rest/impl/src/test/resources/geofence-datasource-ovr.properties (100%) rename src/{services/modules => extension}/rest/impl/src/test/resources/log4j.properties (100%) rename src/{services/modules => extension}/rest/impl/src/test/resources/xsl/rules.xsl (100%) rename src/{services/modules => extension}/rest/pom.xml (89%) rename src/{services/modules => extension}/rest/test/pom.xml (99%) rename src/{services/modules => extension}/rest/test/src/main/java/org/geoserver/geofence/services/servicetest/MainTest.java (100%) rename src/{services/modules => extension}/rest/test/src/main/resources/META-INF/cxf/org.apache.cxf.Logger (100%) rename src/{services/modules => extension}/rest/test/src/main/resources/applicationContext.xml (100%) rename src/{services/modules => extension}/rest/test/src/main/resources/geofence-datasource-ovr.properties (100%) rename src/{services/modules => extension}/rest/test/src/main/resources/log4j.properties (100%) rename src/{services/modules => extension}/rest/test/src/main/webapp/WEB-INF/web.xml (100%) rename src/{services/modules => extension}/rest/test/src/test/resources/batch01.xml (100%) rename src/{services/modules => extension}/rest/test/src/test/resources/batch02.xml (100%) rename src/{services/modules => extension}/rest/test/src/test/resources/batch_empty_payload.xml (100%) rename src/{services/modules => extension}/rest/test/src/test/resources/group01.xml (100%) rename src/{services/modules => extension}/rest/test/src/test/resources/instance01.xml (100%) rename src/{services/modules => extension}/rest/test/src/test/resources/rule01.xml (100%) rename src/{services/modules => extension}/rest/test/src/test/resources/user0101.xml (100%) rename src/{services/modules => extension}/rest/test/src/test/resources/user0_update.xml (100%) delete mode 100644 src/services/modules/generic-api/pom.xml delete mode 100644 src/services/modules/generic-api/src/main/java/org/geoserver/geofence/api/AuthProvider.java delete mode 100644 src/services/modules/generic-api/src/main/java/org/geoserver/geofence/api/UserRegistry.java delete mode 100644 src/services/modules/generic-api/src/main/java/org/geoserver/geofence/api/dto/Authority.java delete mode 100644 src/services/modules/generic-api/src/main/java/org/geoserver/geofence/api/dto/GrantedAuths.java delete mode 100644 src/services/modules/generic-api/src/main/java/org/geoserver/geofence/api/dto/RegisteredUser.java delete mode 100644 src/services/modules/generic-api/src/main/java/org/geoserver/geofence/api/exception/AuthException.java delete mode 100644 src/services/modules/login/api/pom.xml delete mode 100644 src/services/modules/login/api/src/main/java/org/geoserver/geofence/login/LoginService.java delete mode 100644 src/services/modules/login/impl/pom.xml delete mode 100644 src/services/modules/login/impl/src/main/java/org/geoserver/geofence/login/LoginServiceImpl.java delete mode 100644 src/services/modules/login/impl/src/main/java/org/geoserver/geofence/login/cxf/BasicAuthInterceptor.java delete mode 100644 src/services/modules/login/impl/src/main/java/org/geoserver/geofence/login/util/GrantAll.java delete mode 100644 src/services/modules/login/impl/src/main/java/org/geoserver/geofence/login/util/MD5Util.java delete mode 100644 src/services/modules/login/impl/src/main/java/org/geoserver/geofence/login/util/SessionManager.java delete mode 100644 src/services/modules/login/impl/src/main/java/org/geoserver/geofence/login/util/TokenEncoder.java delete mode 100644 src/services/modules/login/impl/src/main/resources/applicationContext.xml delete mode 100644 src/services/modules/login/impl/src/test/java/org/geoserver/geofence/login/util/MD5UtilTest.java delete mode 100644 src/services/modules/login/impl/src/test/resources/applicationContext-test.xml delete mode 100644 src/services/modules/login/pom.xml delete mode 100644 src/services/pom.xml diff --git a/.gitignore b/.gitignore index 62f65a87..f681fa41 100644 --- 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 b/src/core/model-external/pom.xml similarity index 100% rename from src/services/core/model-external/pom.xml rename to src/core/model-external/pom.xml diff --git a/src/services/core/model/pom.xml b/src/core/model/pom.xml similarity index 98% rename from src/services/core/model/pom.xml rename to src/core/model/pom.xml index c0c5003c..838956d0 100644 --- a/src/services/core/model/pom.xml +++ b/src/core/model/pom.xml @@ -99,7 +99,7 @@ org.apache.maven.plugins maven-source-plugin - 3.1.0 + 3.2.1 attach-sources diff --git a/src/services/core/model/src/main/java/org/geoserver/geofence/core/model/AdminRule.java b/src/core/model/src/main/java/org/geoserver/geofence/core/model/AdminRule.java similarity index 100% rename from src/services/core/model/src/main/java/org/geoserver/geofence/core/model/AdminRule.java rename to src/core/model/src/main/java/org/geoserver/geofence/core/model/AdminRule.java diff --git a/src/services/core/model/src/main/java/org/geoserver/geofence/core/model/GFUser.java b/src/core/model/src/main/java/org/geoserver/geofence/core/model/GFUser.java similarity index 100% rename from src/services/core/model/src/main/java/org/geoserver/geofence/core/model/GFUser.java rename to src/core/model/src/main/java/org/geoserver/geofence/core/model/GFUser.java diff --git a/src/services/core/model/src/main/java/org/geoserver/geofence/core/model/GSInstance.java b/src/core/model/src/main/java/org/geoserver/geofence/core/model/GSInstance.java similarity index 100% rename from src/services/core/model/src/main/java/org/geoserver/geofence/core/model/GSInstance.java rename to src/core/model/src/main/java/org/geoserver/geofence/core/model/GSInstance.java diff --git a/src/services/core/model/src/main/java/org/geoserver/geofence/core/model/GSUser.java b/src/core/model/src/main/java/org/geoserver/geofence/core/model/GSUser.java similarity index 100% rename from src/services/core/model/src/main/java/org/geoserver/geofence/core/model/GSUser.java rename to src/core/model/src/main/java/org/geoserver/geofence/core/model/GSUser.java diff --git a/src/services/core/model/src/main/java/org/geoserver/geofence/core/model/IPAddressRange.java b/src/core/model/src/main/java/org/geoserver/geofence/core/model/IPAddressRange.java similarity index 100% rename from src/services/core/model/src/main/java/org/geoserver/geofence/core/model/IPAddressRange.java rename to src/core/model/src/main/java/org/geoserver/geofence/core/model/IPAddressRange.java diff --git a/src/services/core/model/src/main/java/org/geoserver/geofence/core/model/IPRangeProvider.java b/src/core/model/src/main/java/org/geoserver/geofence/core/model/IPRangeProvider.java similarity index 100% rename from src/services/core/model/src/main/java/org/geoserver/geofence/core/model/IPRangeProvider.java rename to src/core/model/src/main/java/org/geoserver/geofence/core/model/IPRangeProvider.java diff --git a/src/services/core/model/src/main/java/org/geoserver/geofence/core/model/Identifiable.java b/src/core/model/src/main/java/org/geoserver/geofence/core/model/Identifiable.java similarity index 100% rename from src/services/core/model/src/main/java/org/geoserver/geofence/core/model/Identifiable.java rename to src/core/model/src/main/java/org/geoserver/geofence/core/model/Identifiable.java diff --git a/src/services/core/model/src/main/java/org/geoserver/geofence/core/model/LayerAttribute.java b/src/core/model/src/main/java/org/geoserver/geofence/core/model/LayerAttribute.java similarity index 100% rename from src/services/core/model/src/main/java/org/geoserver/geofence/core/model/LayerAttribute.java rename to src/core/model/src/main/java/org/geoserver/geofence/core/model/LayerAttribute.java diff --git a/src/services/core/model/src/main/java/org/geoserver/geofence/core/model/LayerDetails.java b/src/core/model/src/main/java/org/geoserver/geofence/core/model/LayerDetails.java similarity index 100% rename from src/services/core/model/src/main/java/org/geoserver/geofence/core/model/LayerDetails.java rename to src/core/model/src/main/java/org/geoserver/geofence/core/model/LayerDetails.java diff --git a/src/services/core/model/src/main/java/org/geoserver/geofence/core/model/Prioritizable.java b/src/core/model/src/main/java/org/geoserver/geofence/core/model/Prioritizable.java similarity index 100% rename from src/services/core/model/src/main/java/org/geoserver/geofence/core/model/Prioritizable.java rename to src/core/model/src/main/java/org/geoserver/geofence/core/model/Prioritizable.java diff --git a/src/services/core/model/src/main/java/org/geoserver/geofence/core/model/Rule.java b/src/core/model/src/main/java/org/geoserver/geofence/core/model/Rule.java similarity index 100% rename from src/services/core/model/src/main/java/org/geoserver/geofence/core/model/Rule.java rename to src/core/model/src/main/java/org/geoserver/geofence/core/model/Rule.java diff --git a/src/services/core/model/src/main/java/org/geoserver/geofence/core/model/RuleLimits.java b/src/core/model/src/main/java/org/geoserver/geofence/core/model/RuleLimits.java similarity index 100% rename from src/services/core/model/src/main/java/org/geoserver/geofence/core/model/RuleLimits.java rename to src/core/model/src/main/java/org/geoserver/geofence/core/model/RuleLimits.java diff --git a/src/services/core/model/src/main/java/org/geoserver/geofence/core/model/UserGroup.java b/src/core/model/src/main/java/org/geoserver/geofence/core/model/UserGroup.java similarity index 100% rename from src/services/core/model/src/main/java/org/geoserver/geofence/core/model/UserGroup.java rename to src/core/model/src/main/java/org/geoserver/geofence/core/model/UserGroup.java diff --git a/src/services/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/FK2UserAdapter.java b/src/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/FK2UserAdapter.java similarity index 100% rename from src/services/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/FK2UserAdapter.java rename to src/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/FK2UserAdapter.java diff --git a/src/services/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/FK2UserGroupAdapter.java b/src/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/FK2UserGroupAdapter.java similarity index 100% rename from src/services/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/FK2UserGroupAdapter.java rename to src/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/FK2UserGroupAdapter.java diff --git a/src/services/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/FK2UserGroupSetAdapter.java b/src/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/FK2UserGroupSetAdapter.java similarity index 100% rename from src/services/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/FK2UserGroupSetAdapter.java rename to src/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/FK2UserGroupSetAdapter.java diff --git a/src/services/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/FK2UserGroupSetAdapter2.java b/src/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/FK2UserGroupSetAdapter2.java similarity index 100% rename from src/services/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/FK2UserGroupSetAdapter2.java rename to src/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/FK2UserGroupSetAdapter2.java diff --git a/src/services/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/FKGSInstanceAdapter.java b/src/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/FKGSInstanceAdapter.java similarity index 100% rename from src/services/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/FKGSInstanceAdapter.java rename to src/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/FKGSInstanceAdapter.java diff --git a/src/services/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/FKUserAdapter.java b/src/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/FKUserAdapter.java similarity index 100% rename from src/services/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/FKUserAdapter.java rename to src/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/FKUserAdapter.java diff --git a/src/services/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/FKUserGroupAdapter.java b/src/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/FKUserGroupAdapter.java similarity index 100% rename from src/services/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/FKUserGroupAdapter.java rename to src/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/FKUserGroupAdapter.java diff --git a/src/services/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/GeometryAdapter.java b/src/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/GeometryAdapter.java similarity index 100% rename from src/services/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/GeometryAdapter.java rename to src/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/GeometryAdapter.java diff --git a/src/services/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/IdentifiableAdapter.java b/src/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/IdentifiableAdapter.java similarity index 100% rename from src/services/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/IdentifiableAdapter.java rename to src/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/IdentifiableAdapter.java diff --git a/src/services/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/MapAdapter.java b/src/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/MapAdapter.java similarity index 100% rename from src/services/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/MapAdapter.java rename to src/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/MapAdapter.java diff --git a/src/services/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/MultiPolygonAdapter.java b/src/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/MultiPolygonAdapter.java similarity index 100% rename from src/services/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/MultiPolygonAdapter.java rename to src/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/MultiPolygonAdapter.java diff --git a/src/services/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/PolygonAdapter.java b/src/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/PolygonAdapter.java similarity index 100% rename from src/services/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/PolygonAdapter.java rename to src/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/PolygonAdapter.java diff --git a/src/services/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/XMultiPolygonAdapter.java b/src/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/XMultiPolygonAdapter.java similarity index 100% rename from src/services/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/XMultiPolygonAdapter.java rename to src/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/XMultiPolygonAdapter.java diff --git a/src/services/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/dual/IdNameBundle.java b/src/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/dual/IdNameBundle.java similarity index 100% rename from src/services/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/dual/IdNameBundle.java rename to src/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/dual/IdNameBundle.java diff --git a/src/services/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/dual/MapEntryType.java b/src/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/dual/MapEntryType.java similarity index 100% rename from src/services/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/dual/MapEntryType.java rename to src/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/dual/MapEntryType.java diff --git a/src/services/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/dual/MapType.java b/src/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/dual/MapType.java similarity index 100% rename from src/services/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/dual/MapType.java rename to src/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/dual/MapType.java diff --git a/src/services/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/package-info.java b/src/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/package-info.java similarity index 100% rename from src/services/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/package-info.java rename to src/core/model/src/main/java/org/geoserver/geofence/core/model/adapter/package-info.java diff --git a/src/services/core/model/src/main/java/org/geoserver/geofence/core/model/enums/AccessType.java b/src/core/model/src/main/java/org/geoserver/geofence/core/model/enums/AccessType.java similarity index 100% rename from src/services/core/model/src/main/java/org/geoserver/geofence/core/model/enums/AccessType.java rename to src/core/model/src/main/java/org/geoserver/geofence/core/model/enums/AccessType.java diff --git a/src/services/core/model/src/main/java/org/geoserver/geofence/core/model/enums/AdminGrantType.java b/src/core/model/src/main/java/org/geoserver/geofence/core/model/enums/AdminGrantType.java similarity index 100% rename from src/services/core/model/src/main/java/org/geoserver/geofence/core/model/enums/AdminGrantType.java rename to src/core/model/src/main/java/org/geoserver/geofence/core/model/enums/AdminGrantType.java diff --git a/src/services/core/model/src/main/java/org/geoserver/geofence/core/model/enums/CatalogMode.java b/src/core/model/src/main/java/org/geoserver/geofence/core/model/enums/CatalogMode.java similarity index 100% rename from src/services/core/model/src/main/java/org/geoserver/geofence/core/model/enums/CatalogMode.java rename to src/core/model/src/main/java/org/geoserver/geofence/core/model/enums/CatalogMode.java diff --git a/src/services/core/model/src/main/java/org/geoserver/geofence/core/model/enums/GrantType.java b/src/core/model/src/main/java/org/geoserver/geofence/core/model/enums/GrantType.java similarity index 100% rename from src/services/core/model/src/main/java/org/geoserver/geofence/core/model/enums/GrantType.java rename to src/core/model/src/main/java/org/geoserver/geofence/core/model/enums/GrantType.java diff --git a/src/services/core/model/src/main/java/org/geoserver/geofence/core/model/enums/InsertPosition.java b/src/core/model/src/main/java/org/geoserver/geofence/core/model/enums/InsertPosition.java similarity index 100% rename from src/services/core/model/src/main/java/org/geoserver/geofence/core/model/enums/InsertPosition.java rename to src/core/model/src/main/java/org/geoserver/geofence/core/model/enums/InsertPosition.java diff --git a/src/services/core/model/src/main/java/org/geoserver/geofence/core/model/enums/KnownServices.java b/src/core/model/src/main/java/org/geoserver/geofence/core/model/enums/KnownServices.java similarity index 100% rename from src/services/core/model/src/main/java/org/geoserver/geofence/core/model/enums/KnownServices.java rename to src/core/model/src/main/java/org/geoserver/geofence/core/model/enums/KnownServices.java diff --git a/src/services/core/model/src/main/java/org/geoserver/geofence/core/model/enums/LayerType.java b/src/core/model/src/main/java/org/geoserver/geofence/core/model/enums/LayerType.java similarity index 100% rename from src/services/core/model/src/main/java/org/geoserver/geofence/core/model/enums/LayerType.java rename to src/core/model/src/main/java/org/geoserver/geofence/core/model/enums/LayerType.java diff --git a/src/services/core/model/src/main/java/org/geoserver/geofence/core/model/enums/ValueType.java b/src/core/model/src/main/java/org/geoserver/geofence/core/model/enums/ValueType.java similarity index 100% rename from src/services/core/model/src/main/java/org/geoserver/geofence/core/model/enums/ValueType.java rename to src/core/model/src/main/java/org/geoserver/geofence/core/model/enums/ValueType.java diff --git a/src/services/core/model/src/main/java/org/geoserver/geofence/core/model/enums/package-info.java b/src/core/model/src/main/java/org/geoserver/geofence/core/model/enums/package-info.java similarity index 100% rename from src/services/core/model/src/main/java/org/geoserver/geofence/core/model/enums/package-info.java rename to src/core/model/src/main/java/org/geoserver/geofence/core/model/enums/package-info.java diff --git a/src/services/core/model/src/main/java/org/geoserver/geofence/core/model/package-info.java b/src/core/model/src/main/java/org/geoserver/geofence/core/model/package-info.java similarity index 100% rename from src/services/core/model/src/main/java/org/geoserver/geofence/core/model/package-info.java rename to src/core/model/src/main/java/org/geoserver/geofence/core/model/package-info.java diff --git a/src/services/core/model/src/main/java/org/geoserver/geofence/core/model/util/PwEncoder.java b/src/core/model/src/main/java/org/geoserver/geofence/core/model/util/PwEncoder.java similarity index 100% rename from src/services/core/model/src/main/java/org/geoserver/geofence/core/model/util/PwEncoder.java rename to src/core/model/src/main/java/org/geoserver/geofence/core/model/util/PwEncoder.java diff --git a/src/services/core/model/src/main/java/org/geoserver/geofence/core/model/util/SubnetV4Utils.java b/src/core/model/src/main/java/org/geoserver/geofence/core/model/util/SubnetV4Utils.java similarity index 100% rename from src/services/core/model/src/main/java/org/geoserver/geofence/core/model/util/SubnetV4Utils.java rename to src/core/model/src/main/java/org/geoserver/geofence/core/model/util/SubnetV4Utils.java diff --git a/src/services/core/model/src/main/java/org/geoserver/geofence/core/model/util/package-info.java b/src/core/model/src/main/java/org/geoserver/geofence/core/model/util/package-info.java similarity index 100% rename from src/services/core/model/src/main/java/org/geoserver/geofence/core/model/util/package-info.java rename to src/core/model/src/main/java/org/geoserver/geofence/core/model/util/package-info.java diff --git a/src/services/core/model/src/test/java/org/geoserver/geofence/core/model/Base64EncodersTest.java b/src/core/model/src/test/java/org/geoserver/geofence/core/model/Base64EncodersTest.java similarity index 100% rename from src/services/core/model/src/test/java/org/geoserver/geofence/core/model/Base64EncodersTest.java rename to src/core/model/src/test/java/org/geoserver/geofence/core/model/Base64EncodersTest.java diff --git a/src/services/core/model/src/test/java/org/geoserver/geofence/core/model/GSUserTest.java b/src/core/model/src/test/java/org/geoserver/geofence/core/model/GSUserTest.java similarity index 100% rename from src/services/core/model/src/test/java/org/geoserver/geofence/core/model/GSUserTest.java rename to src/core/model/src/test/java/org/geoserver/geofence/core/model/GSUserTest.java diff --git a/src/services/core/model/src/test/java/org/geoserver/geofence/core/model/IPAddressRangeTest.java b/src/core/model/src/test/java/org/geoserver/geofence/core/model/IPAddressRangeTest.java similarity index 100% rename from src/services/core/model/src/test/java/org/geoserver/geofence/core/model/IPAddressRangeTest.java rename to src/core/model/src/test/java/org/geoserver/geofence/core/model/IPAddressRangeTest.java diff --git a/src/services/core/model/src/test/java/org/geoserver/geofence/core/model/util/PwEncoderTest.java b/src/core/model/src/test/java/org/geoserver/geofence/core/model/util/PwEncoderTest.java similarity index 100% rename from src/services/core/model/src/test/java/org/geoserver/geofence/core/model/util/PwEncoderTest.java rename to src/core/model/src/test/java/org/geoserver/geofence/core/model/util/PwEncoderTest.java diff --git a/src/services/core/persistence/pom.xml b/src/core/persistence/pom.xml similarity index 100% rename from src/services/core/persistence/pom.xml rename to src/core/persistence/pom.xml diff --git a/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/AdminRuleDAO.java b/src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/AdminRuleDAO.java similarity index 100% rename from src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/AdminRuleDAO.java rename to src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/AdminRuleDAO.java diff --git a/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/AllowedStylesProvider.java b/src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/AllowedStylesProvider.java similarity index 100% rename from src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/AllowedStylesProvider.java rename to src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/AllowedStylesProvider.java diff --git a/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/DuplicateKeyException.java b/src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/DuplicateKeyException.java similarity index 100% rename from src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/DuplicateKeyException.java rename to src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/DuplicateKeyException.java diff --git a/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/GFUserDAO.java b/src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/GFUserDAO.java similarity index 100% rename from src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/GFUserDAO.java rename to src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/GFUserDAO.java diff --git a/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/GSInstanceDAO.java b/src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/GSInstanceDAO.java similarity index 100% rename from src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/GSInstanceDAO.java rename to src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/GSInstanceDAO.java diff --git a/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/GSUserDAO.java b/src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/GSUserDAO.java similarity index 100% rename from src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/GSUserDAO.java rename to src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/GSUserDAO.java diff --git a/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/LayerDetailsDAO.java b/src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/LayerDetailsDAO.java similarity index 100% rename from src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/LayerDetailsDAO.java rename to src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/LayerDetailsDAO.java diff --git a/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/PrioritizableDAO.java b/src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/PrioritizableDAO.java similarity index 100% rename from src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/PrioritizableDAO.java rename to src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/PrioritizableDAO.java diff --git a/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/RegistrableDAO.java b/src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/RegistrableDAO.java similarity index 100% rename from src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/RegistrableDAO.java rename to src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/RegistrableDAO.java diff --git a/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/RestrictedGenericDAO.java b/src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/RestrictedGenericDAO.java similarity index 100% rename from src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/RestrictedGenericDAO.java rename to src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/RestrictedGenericDAO.java diff --git a/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/RuleDAO.java b/src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/RuleDAO.java similarity index 100% rename from src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/RuleDAO.java rename to src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/RuleDAO.java diff --git a/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/RuleLimitsDAO.java b/src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/RuleLimitsDAO.java similarity index 100% rename from src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/RuleLimitsDAO.java rename to src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/RuleLimitsDAO.java diff --git a/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/SearchableDAO.java b/src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/SearchableDAO.java similarity index 100% rename from src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/SearchableDAO.java rename to src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/SearchableDAO.java diff --git a/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/UserGroupDAO.java b/src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/UserGroupDAO.java similarity index 100% rename from src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/UserGroupDAO.java rename to src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/UserGroupDAO.java diff --git a/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/AdminRuleDAOImpl.java b/src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/AdminRuleDAOImpl.java similarity index 100% rename from src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/AdminRuleDAOImpl.java rename to src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/AdminRuleDAOImpl.java diff --git a/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/BaseDAO.java b/src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/BaseDAO.java similarity index 100% rename from src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/BaseDAO.java rename to src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/BaseDAO.java diff --git a/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/GFUserDAOImpl.java b/src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/GFUserDAOImpl.java similarity index 100% rename from src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/GFUserDAOImpl.java rename to src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/GFUserDAOImpl.java diff --git a/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/GSInstanceDAOImpl.java b/src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/GSInstanceDAOImpl.java similarity index 100% rename from src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/GSInstanceDAOImpl.java rename to src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/GSInstanceDAOImpl.java diff --git a/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/GSUserDAOImpl.java b/src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/GSUserDAOImpl.java similarity index 100% rename from src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/GSUserDAOImpl.java rename to src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/GSUserDAOImpl.java diff --git a/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/LayerDetailsDAOImpl.java b/src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/LayerDetailsDAOImpl.java similarity index 100% rename from src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/LayerDetailsDAOImpl.java rename to src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/LayerDetailsDAOImpl.java diff --git a/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/PrioritizableDAOImpl.java b/src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/PrioritizableDAOImpl.java similarity index 100% rename from src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/PrioritizableDAOImpl.java rename to src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/PrioritizableDAOImpl.java diff --git a/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/RuleDAOImpl.java b/src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/RuleDAOImpl.java similarity index 100% rename from src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/RuleDAOImpl.java rename to src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/RuleDAOImpl.java diff --git a/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/RuleLimitsDAOImpl.java b/src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/RuleLimitsDAOImpl.java similarity index 100% rename from src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/RuleLimitsDAOImpl.java rename to src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/RuleLimitsDAOImpl.java diff --git a/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/UserGroupDAOImpl.java b/src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/UserGroupDAOImpl.java similarity index 100% rename from src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/UserGroupDAOImpl.java rename to src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/impl/UserGroupDAOImpl.java diff --git a/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/search/Search.java b/src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/search/Search.java similarity index 100% rename from src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/search/Search.java rename to src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/search/Search.java diff --git a/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/search/SearchUtil.java b/src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/search/SearchUtil.java similarity index 100% rename from src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/search/SearchUtil.java rename to src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/search/SearchUtil.java diff --git a/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/util/GeofenceDaoRegistry.java b/src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/util/GeofenceDaoRegistry.java similarity index 100% rename from src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/util/GeofenceDaoRegistry.java rename to src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/util/GeofenceDaoRegistry.java diff --git a/src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/util/PwEncoder.java b/src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/util/PwEncoder.java similarity index 100% rename from src/services/core/persistence/src/main/java/org/geoserver/geofence/core/dao/util/PwEncoder.java rename to src/core/persistence/src/main/java/org/geoserver/geofence/core/dao/util/PwEncoder.java diff --git a/src/services/core/persistence/src/main/resources/applicationContext-geofenceDatasource.xml b/src/core/persistence/src/main/resources/applicationContext-geofenceDatasource.xml similarity index 100% rename from src/services/core/persistence/src/main/resources/applicationContext-geofenceDatasource.xml rename to src/core/persistence/src/main/resources/applicationContext-geofenceDatasource.xml diff --git a/src/services/core/persistence/src/main/resources/applicationContext.xml b/src/core/persistence/src/main/resources/applicationContext.xml similarity index 100% rename from src/services/core/persistence/src/main/resources/applicationContext.xml rename to src/core/persistence/src/main/resources/applicationContext.xml diff --git a/src/services/core/persistence/src/main/resources/geofence-ehcache.xml b/src/core/persistence/src/main/resources/geofence-ehcache.xml similarity index 100% rename from src/services/core/persistence/src/main/resources/geofence-ehcache.xml rename to src/core/persistence/src/main/resources/geofence-ehcache.xml diff --git a/src/services/core/persistence/src/main/resources/geofence-externalize-aux.properties b/src/core/persistence/src/main/resources/geofence-externalize-aux.properties similarity index 100% rename from src/services/core/persistence/src/main/resources/geofence-externalize-aux.properties rename to src/core/persistence/src/main/resources/geofence-externalize-aux.properties diff --git a/src/services/core/persistence/src/test/java/org/geoserver/geofence/core/dao/BaseDAOTest.java b/src/core/persistence/src/test/java/org/geoserver/geofence/core/dao/BaseDAOTest.java similarity index 100% rename from src/services/core/persistence/src/test/java/org/geoserver/geofence/core/dao/BaseDAOTest.java rename to src/core/persistence/src/test/java/org/geoserver/geofence/core/dao/BaseDAOTest.java diff --git a/src/services/core/persistence/src/test/java/org/geoserver/geofence/core/dao/GFUserDAOTest.java b/src/core/persistence/src/test/java/org/geoserver/geofence/core/dao/GFUserDAOTest.java similarity index 100% rename from src/services/core/persistence/src/test/java/org/geoserver/geofence/core/dao/GFUserDAOTest.java rename to src/core/persistence/src/test/java/org/geoserver/geofence/core/dao/GFUserDAOTest.java diff --git a/src/services/core/persistence/src/test/java/org/geoserver/geofence/core/dao/RuleDAOTest.java b/src/core/persistence/src/test/java/org/geoserver/geofence/core/dao/RuleDAOTest.java similarity index 100% rename from src/services/core/persistence/src/test/java/org/geoserver/geofence/core/dao/RuleDAOTest.java rename to src/core/persistence/src/test/java/org/geoserver/geofence/core/dao/RuleDAOTest.java diff --git a/src/services/core/persistence/src/test/java/org/geoserver/geofence/core/dao/UserDAOTest.java b/src/core/persistence/src/test/java/org/geoserver/geofence/core/dao/UserDAOTest.java similarity index 100% rename from src/services/core/persistence/src/test/java/org/geoserver/geofence/core/dao/UserDAOTest.java rename to src/core/persistence/src/test/java/org/geoserver/geofence/core/dao/UserDAOTest.java diff --git a/src/services/core/persistence/src/test/java/org/geoserver/geofence/core/dao/UserGroupDAOTest.java b/src/core/persistence/src/test/java/org/geoserver/geofence/core/dao/UserGroupDAOTest.java similarity index 100% rename from src/services/core/persistence/src/test/java/org/geoserver/geofence/core/dao/UserGroupDAOTest.java rename to src/core/persistence/src/test/java/org/geoserver/geofence/core/dao/UserGroupDAOTest.java diff --git a/src/services/core/persistence/src/test/java/org/geoserver/geofence/core/dao/util/DaoRegistryTest.java b/src/core/persistence/src/test/java/org/geoserver/geofence/core/dao/util/DaoRegistryTest.java similarity index 100% rename from src/services/core/persistence/src/test/java/org/geoserver/geofence/core/dao/util/DaoRegistryTest.java rename to src/core/persistence/src/test/java/org/geoserver/geofence/core/dao/util/DaoRegistryTest.java diff --git a/src/services/core/persistence/src/test/java/org/geoserver/geofence/core/dao/util/PwEncoderTest.java b/src/core/persistence/src/test/java/org/geoserver/geofence/core/dao/util/PwEncoderTest.java similarity index 100% rename from src/services/core/persistence/src/test/java/org/geoserver/geofence/core/dao/util/PwEncoderTest.java rename to src/core/persistence/src/test/java/org/geoserver/geofence/core/dao/util/PwEncoderTest.java diff --git a/src/services/core/persistence/src/test/resources/geofence-datasource-ovr.properties b/src/core/persistence/src/test/resources/geofence-datasource-ovr.properties similarity index 100% rename from src/services/core/persistence/src/test/resources/geofence-datasource-ovr.properties rename to src/core/persistence/src/test/resources/geofence-datasource-ovr.properties diff --git a/src/services/core/persistence/src/test/resources/log4j.properties b/src/core/persistence/src/test/resources/log4j.properties similarity index 100% rename from src/services/core/persistence/src/test/resources/log4j.properties rename to src/core/persistence/src/test/resources/log4j.properties diff --git a/src/services/core/pom.xml b/src/core/pom.xml similarity index 95% rename from src/services/core/pom.xml rename to src/core/pom.xml index 2e932535..e485b388 100644 --- a/src/services/core/pom.xml +++ b/src/core/pom.xml @@ -13,7 +13,7 @@ org.geoserver.geofence - geofence-root + geofence 3.5-SNAPSHOT diff --git a/src/services/core/services-api/pom.xml b/src/core/services-api/pom.xml similarity index 100% rename from src/services/core/services-api/pom.xml rename to src/core/services-api/pom.xml diff --git a/src/services/core/services-api/src/main/java/org/geoserver/geofence/services/AdminRuleAdminService.java b/src/core/services-api/src/main/java/org/geoserver/geofence/services/AdminRuleAdminService.java similarity index 100% rename from src/services/core/services-api/src/main/java/org/geoserver/geofence/services/AdminRuleAdminService.java rename to src/core/services-api/src/main/java/org/geoserver/geofence/services/AdminRuleAdminService.java diff --git a/src/services/core/services-api/src/main/java/org/geoserver/geofence/services/AuthorizationService.java b/src/core/services-api/src/main/java/org/geoserver/geofence/services/AuthorizationService.java similarity index 100% rename from src/services/core/services-api/src/main/java/org/geoserver/geofence/services/AuthorizationService.java rename to src/core/services-api/src/main/java/org/geoserver/geofence/services/AuthorizationService.java diff --git a/src/services/core/services-api/src/main/java/org/geoserver/geofence/services/ConfigAdminService.java b/src/core/services-api/src/main/java/org/geoserver/geofence/services/ConfigAdminService.java similarity index 100% rename from src/services/core/services-api/src/main/java/org/geoserver/geofence/services/ConfigAdminService.java rename to src/core/services-api/src/main/java/org/geoserver/geofence/services/ConfigAdminService.java diff --git a/src/services/core/services-api/src/main/java/org/geoserver/geofence/services/GFUserAdminService.java b/src/core/services-api/src/main/java/org/geoserver/geofence/services/GFUserAdminService.java similarity index 100% rename from src/services/core/services-api/src/main/java/org/geoserver/geofence/services/GFUserAdminService.java rename to src/core/services-api/src/main/java/org/geoserver/geofence/services/GFUserAdminService.java diff --git a/src/services/core/services-api/src/main/java/org/geoserver/geofence/services/GetProviderService.java b/src/core/services-api/src/main/java/org/geoserver/geofence/services/GetProviderService.java similarity index 100% rename from src/services/core/services-api/src/main/java/org/geoserver/geofence/services/GetProviderService.java rename to src/core/services-api/src/main/java/org/geoserver/geofence/services/GetProviderService.java diff --git a/src/services/core/services-api/src/main/java/org/geoserver/geofence/services/InstanceAdminService.java b/src/core/services-api/src/main/java/org/geoserver/geofence/services/InstanceAdminService.java similarity index 100% rename from src/services/core/services-api/src/main/java/org/geoserver/geofence/services/InstanceAdminService.java rename to src/core/services-api/src/main/java/org/geoserver/geofence/services/InstanceAdminService.java diff --git a/src/services/core/services-api/src/main/java/org/geoserver/geofence/services/RuleAdminService.java b/src/core/services-api/src/main/java/org/geoserver/geofence/services/RuleAdminService.java similarity index 100% rename from src/services/core/services-api/src/main/java/org/geoserver/geofence/services/RuleAdminService.java rename to src/core/services-api/src/main/java/org/geoserver/geofence/services/RuleAdminService.java diff --git a/src/services/core/services-api/src/main/java/org/geoserver/geofence/services/RuleReaderService.java b/src/core/services-api/src/main/java/org/geoserver/geofence/services/RuleReaderService.java similarity index 100% rename from src/services/core/services-api/src/main/java/org/geoserver/geofence/services/RuleReaderService.java rename to src/core/services-api/src/main/java/org/geoserver/geofence/services/RuleReaderService.java diff --git a/src/services/core/services-api/src/main/java/org/geoserver/geofence/services/UserAdminService.java b/src/core/services-api/src/main/java/org/geoserver/geofence/services/UserAdminService.java similarity index 100% rename from src/services/core/services-api/src/main/java/org/geoserver/geofence/services/UserAdminService.java rename to src/core/services-api/src/main/java/org/geoserver/geofence/services/UserAdminService.java diff --git a/src/services/core/services-api/src/main/java/org/geoserver/geofence/services/UserGroupAdminService.java b/src/core/services-api/src/main/java/org/geoserver/geofence/services/UserGroupAdminService.java similarity index 100% rename from src/services/core/services-api/src/main/java/org/geoserver/geofence/services/UserGroupAdminService.java rename to src/core/services-api/src/main/java/org/geoserver/geofence/services/UserGroupAdminService.java diff --git a/src/services/core/services-api/src/main/java/org/geoserver/geofence/services/dto/AccessInfo.java b/src/core/services-api/src/main/java/org/geoserver/geofence/services/dto/AccessInfo.java similarity index 100% rename from src/services/core/services-api/src/main/java/org/geoserver/geofence/services/dto/AccessInfo.java rename to src/core/services-api/src/main/java/org/geoserver/geofence/services/dto/AccessInfo.java diff --git a/src/services/core/services-api/src/main/java/org/geoserver/geofence/services/dto/AuthUser.java b/src/core/services-api/src/main/java/org/geoserver/geofence/services/dto/AuthUser.java similarity index 100% rename from src/services/core/services-api/src/main/java/org/geoserver/geofence/services/dto/AuthUser.java rename to src/core/services-api/src/main/java/org/geoserver/geofence/services/dto/AuthUser.java diff --git a/src/services/core/services-api/src/main/java/org/geoserver/geofence/services/dto/CatalogModeDTO.java b/src/core/services-api/src/main/java/org/geoserver/geofence/services/dto/CatalogModeDTO.java similarity index 100% rename from src/services/core/services-api/src/main/java/org/geoserver/geofence/services/dto/CatalogModeDTO.java rename to src/core/services-api/src/main/java/org/geoserver/geofence/services/dto/CatalogModeDTO.java diff --git a/src/services/core/services-api/src/main/java/org/geoserver/geofence/services/dto/RuleFilter.java b/src/core/services-api/src/main/java/org/geoserver/geofence/services/dto/RuleFilter.java similarity index 100% rename from src/services/core/services-api/src/main/java/org/geoserver/geofence/services/dto/RuleFilter.java rename to src/core/services-api/src/main/java/org/geoserver/geofence/services/dto/RuleFilter.java diff --git a/src/services/core/services-api/src/main/java/org/geoserver/geofence/services/dto/ShortAdminRule.java b/src/core/services-api/src/main/java/org/geoserver/geofence/services/dto/ShortAdminRule.java similarity index 100% rename from src/services/core/services-api/src/main/java/org/geoserver/geofence/services/dto/ShortAdminRule.java rename to src/core/services-api/src/main/java/org/geoserver/geofence/services/dto/ShortAdminRule.java diff --git a/src/services/core/services-api/src/main/java/org/geoserver/geofence/services/dto/ShortGroup.java b/src/core/services-api/src/main/java/org/geoserver/geofence/services/dto/ShortGroup.java similarity index 100% rename from src/services/core/services-api/src/main/java/org/geoserver/geofence/services/dto/ShortGroup.java rename to src/core/services-api/src/main/java/org/geoserver/geofence/services/dto/ShortGroup.java diff --git a/src/services/core/services-api/src/main/java/org/geoserver/geofence/services/dto/ShortInstance.java b/src/core/services-api/src/main/java/org/geoserver/geofence/services/dto/ShortInstance.java similarity index 100% rename from src/services/core/services-api/src/main/java/org/geoserver/geofence/services/dto/ShortInstance.java rename to src/core/services-api/src/main/java/org/geoserver/geofence/services/dto/ShortInstance.java diff --git a/src/services/core/services-api/src/main/java/org/geoserver/geofence/services/dto/ShortRule.java b/src/core/services-api/src/main/java/org/geoserver/geofence/services/dto/ShortRule.java similarity index 100% rename from src/services/core/services-api/src/main/java/org/geoserver/geofence/services/dto/ShortRule.java rename to src/core/services-api/src/main/java/org/geoserver/geofence/services/dto/ShortRule.java diff --git a/src/services/core/services-api/src/main/java/org/geoserver/geofence/services/dto/ShortUser.java b/src/core/services-api/src/main/java/org/geoserver/geofence/services/dto/ShortUser.java similarity index 100% rename from src/services/core/services-api/src/main/java/org/geoserver/geofence/services/dto/ShortUser.java rename to src/core/services-api/src/main/java/org/geoserver/geofence/services/dto/ShortUser.java diff --git a/src/services/core/services-api/src/main/java/org/geoserver/geofence/services/exception/BadRequestServiceEx.java b/src/core/services-api/src/main/java/org/geoserver/geofence/services/exception/BadRequestServiceEx.java similarity index 100% rename from src/services/core/services-api/src/main/java/org/geoserver/geofence/services/exception/BadRequestServiceEx.java rename to src/core/services-api/src/main/java/org/geoserver/geofence/services/exception/BadRequestServiceEx.java diff --git a/src/services/core/services-api/src/main/java/org/geoserver/geofence/services/exception/InternalErrorServiceEx.java b/src/core/services-api/src/main/java/org/geoserver/geofence/services/exception/InternalErrorServiceEx.java similarity index 100% rename from src/services/core/services-api/src/main/java/org/geoserver/geofence/services/exception/InternalErrorServiceEx.java rename to src/core/services-api/src/main/java/org/geoserver/geofence/services/exception/InternalErrorServiceEx.java diff --git a/src/services/core/services-api/src/main/java/org/geoserver/geofence/services/exception/NotFoundServiceEx.java b/src/core/services-api/src/main/java/org/geoserver/geofence/services/exception/NotFoundServiceEx.java similarity index 100% rename from src/services/core/services-api/src/main/java/org/geoserver/geofence/services/exception/NotFoundServiceEx.java rename to src/core/services-api/src/main/java/org/geoserver/geofence/services/exception/NotFoundServiceEx.java diff --git a/src/services/core/services-api/src/main/java/org/geoserver/geofence/services/exception/WebApplicationException.java b/src/core/services-api/src/main/java/org/geoserver/geofence/services/exception/WebApplicationException.java similarity index 100% rename from src/services/core/services-api/src/main/java/org/geoserver/geofence/services/exception/WebApplicationException.java rename to src/core/services-api/src/main/java/org/geoserver/geofence/services/exception/WebApplicationException.java diff --git a/src/services/core/services-api/src/main/java/org/geoserver/geofence/services/util/IPUtils.java b/src/core/services-api/src/main/java/org/geoserver/geofence/services/util/IPUtils.java similarity index 100% rename from src/services/core/services-api/src/main/java/org/geoserver/geofence/services/util/IPUtils.java rename to src/core/services-api/src/main/java/org/geoserver/geofence/services/util/IPUtils.java diff --git a/src/services/core/services-api/src/main/java/org/geoserver/geofence/spi/UserResolver.java b/src/core/services-api/src/main/java/org/geoserver/geofence/spi/UserResolver.java similarity index 100% rename from src/services/core/services-api/src/main/java/org/geoserver/geofence/spi/UserResolver.java rename to src/core/services-api/src/main/java/org/geoserver/geofence/spi/UserResolver.java diff --git a/src/services/core/services-api/src/test/java/org/geoserver/geofence/services/util/IPUtilsTest.java b/src/core/services-api/src/test/java/org/geoserver/geofence/services/util/IPUtilsTest.java similarity index 100% rename from src/services/core/services-api/src/test/java/org/geoserver/geofence/services/util/IPUtilsTest.java rename to src/core/services-api/src/test/java/org/geoserver/geofence/services/util/IPUtilsTest.java diff --git a/src/services/core/services-impl/pom.xml b/src/core/services-impl/pom.xml similarity index 100% rename from src/services/core/services-impl/pom.xml rename to src/core/services-impl/pom.xml diff --git a/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/AdminRuleAdminServiceImpl.java b/src/core/services-impl/src/main/java/org/geoserver/geofence/services/AdminRuleAdminServiceImpl.java similarity index 100% rename from src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/AdminRuleAdminServiceImpl.java rename to src/core/services-impl/src/main/java/org/geoserver/geofence/services/AdminRuleAdminServiceImpl.java diff --git a/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/AuthorizationServiceImpl.java b/src/core/services-impl/src/main/java/org/geoserver/geofence/services/AuthorizationServiceImpl.java similarity index 100% rename from src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/AuthorizationServiceImpl.java rename to src/core/services-impl/src/main/java/org/geoserver/geofence/services/AuthorizationServiceImpl.java diff --git a/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/DefaultUserResolver.java b/src/core/services-impl/src/main/java/org/geoserver/geofence/services/DefaultUserResolver.java similarity index 100% rename from src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/DefaultUserResolver.java rename to src/core/services-impl/src/main/java/org/geoserver/geofence/services/DefaultUserResolver.java diff --git a/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/GFUserAdminServiceImpl.java b/src/core/services-impl/src/main/java/org/geoserver/geofence/services/GFUserAdminServiceImpl.java similarity index 100% rename from src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/GFUserAdminServiceImpl.java rename to src/core/services-impl/src/main/java/org/geoserver/geofence/services/GFUserAdminServiceImpl.java diff --git a/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/InstanceAdminServiceImpl.java b/src/core/services-impl/src/main/java/org/geoserver/geofence/services/InstanceAdminServiceImpl.java similarity index 100% rename from src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/InstanceAdminServiceImpl.java rename to src/core/services-impl/src/main/java/org/geoserver/geofence/services/InstanceAdminServiceImpl.java diff --git a/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/RuleAdminServiceImpl.java b/src/core/services-impl/src/main/java/org/geoserver/geofence/services/RuleAdminServiceImpl.java similarity index 100% rename from src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/RuleAdminServiceImpl.java rename to src/core/services-impl/src/main/java/org/geoserver/geofence/services/RuleAdminServiceImpl.java diff --git a/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/RuleReaderServiceImpl.java b/src/core/services-impl/src/main/java/org/geoserver/geofence/services/RuleReaderServiceImpl.java similarity index 100% rename from src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/RuleReaderServiceImpl.java rename to src/core/services-impl/src/main/java/org/geoserver/geofence/services/RuleReaderServiceImpl.java diff --git a/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/UserAdminServiceImpl.java b/src/core/services-impl/src/main/java/org/geoserver/geofence/services/UserAdminServiceImpl.java similarity index 100% rename from src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/UserAdminServiceImpl.java rename to src/core/services-impl/src/main/java/org/geoserver/geofence/services/UserAdminServiceImpl.java diff --git a/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/UserGroupAdminServiceImpl.java b/src/core/services-impl/src/main/java/org/geoserver/geofence/services/UserGroupAdminServiceImpl.java similarity index 100% rename from src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/UserGroupAdminServiceImpl.java rename to src/core/services-impl/src/main/java/org/geoserver/geofence/services/UserGroupAdminServiceImpl.java diff --git a/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/util/AccessInfoInternal.java b/src/core/services-impl/src/main/java/org/geoserver/geofence/services/util/AccessInfoInternal.java similarity index 100% rename from src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/util/AccessInfoInternal.java rename to src/core/services-impl/src/main/java/org/geoserver/geofence/services/util/AccessInfoInternal.java diff --git a/src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/util/FilterUtils.java b/src/core/services-impl/src/main/java/org/geoserver/geofence/services/util/FilterUtils.java similarity index 100% rename from src/services/core/services-impl/src/main/java/org/geoserver/geofence/services/util/FilterUtils.java rename to src/core/services-impl/src/main/java/org/geoserver/geofence/services/util/FilterUtils.java diff --git a/src/services/core/services-impl/src/main/java/org/geoserver/geofence/util/CategorizedCircularBuffer.java b/src/core/services-impl/src/main/java/org/geoserver/geofence/util/CategorizedCircularBuffer.java similarity index 100% rename from src/services/core/services-impl/src/main/java/org/geoserver/geofence/util/CategorizedCircularBuffer.java rename to src/core/services-impl/src/main/java/org/geoserver/geofence/util/CategorizedCircularBuffer.java diff --git a/src/services/core/services-impl/src/main/resources/applicationContext.xml b/src/core/services-impl/src/main/resources/applicationContext.xml similarity index 100% rename from src/services/core/services-impl/src/main/resources/applicationContext.xml rename to src/core/services-impl/src/main/resources/applicationContext.xml diff --git a/src/services/core/services-impl/src/test/java/org/geoserver/geofence/services/AdminRuleAdminServiceImplTest.java b/src/core/services-impl/src/test/java/org/geoserver/geofence/services/AdminRuleAdminServiceImplTest.java similarity index 100% rename from src/services/core/services-impl/src/test/java/org/geoserver/geofence/services/AdminRuleAdminServiceImplTest.java rename to src/core/services-impl/src/test/java/org/geoserver/geofence/services/AdminRuleAdminServiceImplTest.java diff --git a/src/services/core/services-impl/src/test/java/org/geoserver/geofence/services/GFUserAdminServiceImplTest.java b/src/core/services-impl/src/test/java/org/geoserver/geofence/services/GFUserAdminServiceImplTest.java similarity index 100% rename from src/services/core/services-impl/src/test/java/org/geoserver/geofence/services/GFUserAdminServiceImplTest.java rename to src/core/services-impl/src/test/java/org/geoserver/geofence/services/GFUserAdminServiceImplTest.java diff --git a/src/services/core/services-impl/src/test/java/org/geoserver/geofence/services/RuleAdminServiceImplTest.java b/src/core/services-impl/src/test/java/org/geoserver/geofence/services/RuleAdminServiceImplTest.java similarity index 100% rename from src/services/core/services-impl/src/test/java/org/geoserver/geofence/services/RuleAdminServiceImplTest.java rename to src/core/services-impl/src/test/java/org/geoserver/geofence/services/RuleAdminServiceImplTest.java diff --git a/src/services/core/services-impl/src/test/java/org/geoserver/geofence/services/RuleReaderCatalogModeTest.java b/src/core/services-impl/src/test/java/org/geoserver/geofence/services/RuleReaderCatalogModeTest.java similarity index 100% rename from src/services/core/services-impl/src/test/java/org/geoserver/geofence/services/RuleReaderCatalogModeTest.java rename to src/core/services-impl/src/test/java/org/geoserver/geofence/services/RuleReaderCatalogModeTest.java diff --git a/src/services/core/services-impl/src/test/java/org/geoserver/geofence/services/RuleReaderServiceImplTest.java b/src/core/services-impl/src/test/java/org/geoserver/geofence/services/RuleReaderServiceImplTest.java similarity index 100% rename from src/services/core/services-impl/src/test/java/org/geoserver/geofence/services/RuleReaderServiceImplTest.java rename to src/core/services-impl/src/test/java/org/geoserver/geofence/services/RuleReaderServiceImplTest.java diff --git a/src/services/core/services-impl/src/test/java/org/geoserver/geofence/services/ServiceTestBase.java b/src/core/services-impl/src/test/java/org/geoserver/geofence/services/ServiceTestBase.java similarity index 100% rename from src/services/core/services-impl/src/test/java/org/geoserver/geofence/services/ServiceTestBase.java rename to src/core/services-impl/src/test/java/org/geoserver/geofence/services/ServiceTestBase.java diff --git a/src/services/core/services-impl/src/test/java/org/geoserver/geofence/services/UserAdminServiceImplTest.java b/src/core/services-impl/src/test/java/org/geoserver/geofence/services/UserAdminServiceImplTest.java similarity index 100% rename from src/services/core/services-impl/src/test/java/org/geoserver/geofence/services/UserAdminServiceImplTest.java rename to src/core/services-impl/src/test/java/org/geoserver/geofence/services/UserAdminServiceImplTest.java diff --git a/src/services/core/services-impl/src/test/java/org/geoserver/geofence/services/UserGroupAdminServiceImplTest.java b/src/core/services-impl/src/test/java/org/geoserver/geofence/services/UserGroupAdminServiceImplTest.java similarity index 100% rename from src/services/core/services-impl/src/test/java/org/geoserver/geofence/services/UserGroupAdminServiceImplTest.java rename to src/core/services-impl/src/test/java/org/geoserver/geofence/services/UserGroupAdminServiceImplTest.java diff --git a/src/services/core/services-impl/src/test/java/org/geoserver/geofence/util/CategorizedCircularBufferTest.java b/src/core/services-impl/src/test/java/org/geoserver/geofence/util/CategorizedCircularBufferTest.java similarity index 100% rename from src/services/core/services-impl/src/test/java/org/geoserver/geofence/util/CategorizedCircularBufferTest.java rename to src/core/services-impl/src/test/java/org/geoserver/geofence/util/CategorizedCircularBufferTest.java diff --git a/src/services/core/services-impl/src/test/java/org/geoserver/test/AbstractSpringContextTest.java b/src/core/services-impl/src/test/java/org/geoserver/test/AbstractSpringContextTest.java similarity index 100% rename from src/services/core/services-impl/src/test/java/org/geoserver/test/AbstractSpringContextTest.java rename to src/core/services-impl/src/test/java/org/geoserver/test/AbstractSpringContextTest.java diff --git a/src/services/core/services-impl/src/test/resources/geofence-datasource-ovr.properties b/src/core/services-impl/src/test/resources/geofence-datasource-ovr.properties similarity index 100% rename from src/services/core/services-impl/src/test/resources/geofence-datasource-ovr.properties rename to src/core/services-impl/src/test/resources/geofence-datasource-ovr.properties diff --git a/src/services/core/services-impl/src/test/resources/log4j.properties b/src/core/services-impl/src/test/resources/log4j.properties similarity index 100% rename from src/services/core/services-impl/src/test/resources/log4j.properties rename to src/core/services-impl/src/test/resources/log4j.properties diff --git a/src/services/core/webtest/pom.xml b/src/core/webtest/pom.xml similarity index 100% rename from src/services/core/webtest/pom.xml rename to src/core/webtest/pom.xml diff --git a/src/services/core/webtest/src/main/java/org/geoserver/geofence/servicetest/MainTest.java b/src/core/webtest/src/main/java/org/geoserver/geofence/servicetest/MainTest.java similarity index 100% rename from src/services/core/webtest/src/main/java/org/geoserver/geofence/servicetest/MainTest.java rename to src/core/webtest/src/main/java/org/geoserver/geofence/servicetest/MainTest.java diff --git a/src/services/core/webtest/src/main/resources/META-INF/cxf/org.apache.cxf.Logger b/src/core/webtest/src/main/resources/META-INF/cxf/org.apache.cxf.Logger similarity index 100% rename from src/services/core/webtest/src/main/resources/META-INF/cxf/org.apache.cxf.Logger rename to src/core/webtest/src/main/resources/META-INF/cxf/org.apache.cxf.Logger diff --git a/src/services/core/webtest/src/main/resources/applicationContext.xml b/src/core/webtest/src/main/resources/applicationContext.xml similarity index 100% rename from src/services/core/webtest/src/main/resources/applicationContext.xml rename to src/core/webtest/src/main/resources/applicationContext.xml diff --git a/src/services/core/webtest/src/main/resources/geofence-datasource-ovr.properties b/src/core/webtest/src/main/resources/geofence-datasource-ovr.properties similarity index 100% rename from src/services/core/webtest/src/main/resources/geofence-datasource-ovr.properties rename to src/core/webtest/src/main/resources/geofence-datasource-ovr.properties diff --git a/src/services/core/webtest/src/main/resources/geofence-datasource.properties b/src/core/webtest/src/main/resources/geofence-datasource.properties similarity index 100% rename from src/services/core/webtest/src/main/resources/geofence-datasource.properties rename to src/core/webtest/src/main/resources/geofence-datasource.properties diff --git a/src/services/core/webtest/src/main/resources/log4j.xml b/src/core/webtest/src/main/resources/log4j.xml similarity index 100% rename from src/services/core/webtest/src/main/resources/log4j.xml rename to src/core/webtest/src/main/resources/log4j.xml diff --git a/src/services/core/webtest/src/main/webapp/WEB-INF/remoting-servlet.xml b/src/core/webtest/src/main/webapp/WEB-INF/remoting-servlet.xml similarity index 100% rename from src/services/core/webtest/src/main/webapp/WEB-INF/remoting-servlet.xml rename to src/core/webtest/src/main/webapp/WEB-INF/remoting-servlet.xml diff --git a/src/services/core/webtest/src/main/webapp/WEB-INF/web.xml b/src/core/webtest/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from src/services/core/webtest/src/main/webapp/WEB-INF/web.xml rename to src/core/webtest/src/main/webapp/WEB-INF/web.xml diff --git a/src/services/modules/ldap/pom.xml b/src/extension/ldap/pom.xml similarity index 98% rename from src/services/modules/ldap/pom.xml rename to src/extension/ldap/pom.xml index 1bd6d567..2741771c 100644 --- a/src/services/modules/ldap/pom.xml +++ b/src/extension/ldap/pom.xml @@ -11,14 +11,14 @@ org.geoserver.geofence - geofence-modules + geofence-extension 3.5-SNAPSHOT org.geoserver.geofence geofence-ldap jar - GeoFence - Module - LDAP Support + GeoFence - Extension - LDAP Support 2.0.0.AM25 diff --git a/src/services/modules/ldap/src/main/java/org/geoserver/geofence/ldap/LdapAttributesMapper.java b/src/extension/ldap/src/main/java/org/geoserver/geofence/ldap/LdapAttributesMapper.java similarity index 100% rename from src/services/modules/ldap/src/main/java/org/geoserver/geofence/ldap/LdapAttributesMapper.java rename to src/extension/ldap/src/main/java/org/geoserver/geofence/ldap/LdapAttributesMapper.java diff --git a/src/services/modules/ldap/src/main/java/org/geoserver/geofence/ldap/dao/impl/BaseAttributesMapper.java b/src/extension/ldap/src/main/java/org/geoserver/geofence/ldap/dao/impl/BaseAttributesMapper.java similarity index 100% rename from src/services/modules/ldap/src/main/java/org/geoserver/geofence/ldap/dao/impl/BaseAttributesMapper.java rename to src/extension/ldap/src/main/java/org/geoserver/geofence/ldap/dao/impl/BaseAttributesMapper.java diff --git a/src/services/modules/ldap/src/main/java/org/geoserver/geofence/ldap/dao/impl/GSUserAttributesMapper.java b/src/extension/ldap/src/main/java/org/geoserver/geofence/ldap/dao/impl/GSUserAttributesMapper.java similarity index 100% rename from src/services/modules/ldap/src/main/java/org/geoserver/geofence/ldap/dao/impl/GSUserAttributesMapper.java rename to src/extension/ldap/src/main/java/org/geoserver/geofence/ldap/dao/impl/GSUserAttributesMapper.java diff --git a/src/services/modules/ldap/src/main/java/org/geoserver/geofence/ldap/dao/impl/GSUserDAOLdapImpl.java b/src/extension/ldap/src/main/java/org/geoserver/geofence/ldap/dao/impl/GSUserDAOLdapImpl.java similarity index 100% rename from src/services/modules/ldap/src/main/java/org/geoserver/geofence/ldap/dao/impl/GSUserDAOLdapImpl.java rename to src/extension/ldap/src/main/java/org/geoserver/geofence/ldap/dao/impl/GSUserDAOLdapImpl.java diff --git a/src/services/modules/ldap/src/main/java/org/geoserver/geofence/ldap/dao/impl/LDAPBaseDAO.java b/src/extension/ldap/src/main/java/org/geoserver/geofence/ldap/dao/impl/LDAPBaseDAO.java similarity index 100% rename from src/services/modules/ldap/src/main/java/org/geoserver/geofence/ldap/dao/impl/LDAPBaseDAO.java rename to src/extension/ldap/src/main/java/org/geoserver/geofence/ldap/dao/impl/LDAPBaseDAO.java diff --git a/src/services/modules/ldap/src/main/java/org/geoserver/geofence/ldap/dao/impl/UserGroupAttributesMapper.java b/src/extension/ldap/src/main/java/org/geoserver/geofence/ldap/dao/impl/UserGroupAttributesMapper.java similarity index 100% rename from src/services/modules/ldap/src/main/java/org/geoserver/geofence/ldap/dao/impl/UserGroupAttributesMapper.java rename to src/extension/ldap/src/main/java/org/geoserver/geofence/ldap/dao/impl/UserGroupAttributesMapper.java diff --git a/src/services/modules/ldap/src/main/java/org/geoserver/geofence/ldap/dao/impl/UserGroupDAOLdapImpl.java b/src/extension/ldap/src/main/java/org/geoserver/geofence/ldap/dao/impl/UserGroupDAOLdapImpl.java similarity index 100% rename from src/services/modules/ldap/src/main/java/org/geoserver/geofence/ldap/dao/impl/UserGroupDAOLdapImpl.java rename to src/extension/ldap/src/main/java/org/geoserver/geofence/ldap/dao/impl/UserGroupDAOLdapImpl.java diff --git a/src/services/modules/ldap/src/main/java/org/geoserver/geofence/ldap/utils/LdapUtils.java b/src/extension/ldap/src/main/java/org/geoserver/geofence/ldap/utils/LdapUtils.java similarity index 100% rename from src/services/modules/ldap/src/main/java/org/geoserver/geofence/ldap/utils/LdapUtils.java rename to src/extension/ldap/src/main/java/org/geoserver/geofence/ldap/utils/LdapUtils.java diff --git a/src/services/modules/ldap/src/main/resources/applicationContext-geofence-ldap-datasource.xml b/src/extension/ldap/src/main/resources/applicationContext-geofence-ldap-datasource.xml similarity index 100% rename from src/services/modules/ldap/src/main/resources/applicationContext-geofence-ldap-datasource.xml rename to src/extension/ldap/src/main/resources/applicationContext-geofence-ldap-datasource.xml diff --git a/src/services/modules/ldap/src/main/resources/applicationContext.xml b/src/extension/ldap/src/main/resources/applicationContext.xml similarity index 100% rename from src/services/modules/ldap/src/main/resources/applicationContext.xml rename to src/extension/ldap/src/main/resources/applicationContext.xml diff --git a/src/services/modules/ldap/src/test/java/org/geoserver/geofence/ldap/dao/impl/BaseDAOTest.java b/src/extension/ldap/src/test/java/org/geoserver/geofence/ldap/dao/impl/BaseDAOTest.java similarity index 100% rename from src/services/modules/ldap/src/test/java/org/geoserver/geofence/ldap/dao/impl/BaseDAOTest.java rename to src/extension/ldap/src/test/java/org/geoserver/geofence/ldap/dao/impl/BaseDAOTest.java diff --git a/src/services/modules/ldap/src/test/java/org/geoserver/geofence/ldap/dao/impl/GSUserDAOLdapImplTest.java b/src/extension/ldap/src/test/java/org/geoserver/geofence/ldap/dao/impl/GSUserDAOLdapImplTest.java similarity index 100% rename from src/services/modules/ldap/src/test/java/org/geoserver/geofence/ldap/dao/impl/GSUserDAOLdapImplTest.java rename to src/extension/ldap/src/test/java/org/geoserver/geofence/ldap/dao/impl/GSUserDAOLdapImplTest.java diff --git a/src/services/modules/ldap/src/test/java/org/geoserver/geofence/ldap/dao/impl/UserGroupDAOLdapImplTest.java b/src/extension/ldap/src/test/java/org/geoserver/geofence/ldap/dao/impl/UserGroupDAOLdapImplTest.java similarity index 100% rename from src/services/modules/ldap/src/test/java/org/geoserver/geofence/ldap/dao/impl/UserGroupDAOLdapImplTest.java rename to src/extension/ldap/src/test/java/org/geoserver/geofence/ldap/dao/impl/UserGroupDAOLdapImplTest.java diff --git a/src/services/modules/ldap/src/test/resources/data.ldif b/src/extension/ldap/src/test/resources/data.ldif similarity index 100% rename from src/services/modules/ldap/src/test/resources/data.ldif rename to src/extension/ldap/src/test/resources/data.ldif diff --git a/src/services/modules/ldap/src/test/resources/geofence-datasource-ovr.properties b/src/extension/ldap/src/test/resources/geofence-datasource-ovr.properties similarity index 100% rename from src/services/modules/ldap/src/test/resources/geofence-datasource-ovr.properties rename to src/extension/ldap/src/test/resources/geofence-datasource-ovr.properties diff --git a/src/services/modules/ldap/src/test/resources/log4j.properties b/src/extension/ldap/src/test/resources/log4j.properties similarity index 100% rename from src/services/modules/ldap/src/test/resources/log4j.properties rename to src/extension/ldap/src/test/resources/log4j.properties diff --git a/src/services/modules/pom.xml b/src/extension/pom.xml similarity index 78% rename from src/services/modules/pom.xml rename to src/extension/pom.xml index 3eec5536..7e41da0f 100644 --- a/src/services/modules/pom.xml +++ b/src/extension/pom.xml @@ -13,18 +13,16 @@ org.geoserver.geofence - geofence-root + geofence 3.5-SNAPSHOT org.geoserver.geofence - geofence-modules + geofence-extension pom - GeoFence - Modules - 0 Root + GeoFence - Extensions - login - generic-api rest ldap diff --git a/src/services/modules/rest/api/pom.xml b/src/extension/rest/api/pom.xml similarity index 98% rename from src/services/modules/rest/api/pom.xml rename to src/extension/rest/api/pom.xml index ee2b9a29..55a9bd5f 100644 --- a/src/services/modules/rest/api/pom.xml +++ b/src/extension/rest/api/pom.xml @@ -18,7 +18,7 @@ org.geoserver.geofence geofence-rest-api jar - GeoFence - Modules - REST API + GeoFence - Extension - REST API diff --git a/src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/RESTAdminRuleService.java b/src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/RESTAdminRuleService.java similarity index 100% rename from src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/RESTAdminRuleService.java rename to src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/RESTAdminRuleService.java diff --git a/src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/RESTBatchService.java b/src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/RESTBatchService.java similarity index 100% rename from src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/RESTBatchService.java rename to src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/RESTBatchService.java diff --git a/src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/RESTConfigService.java b/src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/RESTConfigService.java similarity index 100% rename from src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/RESTConfigService.java rename to src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/RESTConfigService.java diff --git a/src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/RESTGSInstanceService.java b/src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/RESTGSInstanceService.java similarity index 100% rename from src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/RESTGSInstanceService.java rename to src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/RESTGSInstanceService.java diff --git a/src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/RESTRuleService.java b/src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/RESTRuleService.java similarity index 100% rename from src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/RESTRuleService.java rename to src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/RESTRuleService.java diff --git a/src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/RESTUserGroupService.java b/src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/RESTUserGroupService.java similarity index 100% rename from src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/RESTUserGroupService.java rename to src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/RESTUserGroupService.java diff --git a/src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/RESTUserService.java b/src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/RESTUserService.java similarity index 100% rename from src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/RESTUserService.java rename to src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/RESTUserService.java diff --git a/src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/exception/BadRequestRestEx.java b/src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/exception/BadRequestRestEx.java similarity index 100% rename from src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/exception/BadRequestRestEx.java rename to src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/exception/BadRequestRestEx.java diff --git a/src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/exception/ConflictRestEx.java b/src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/exception/ConflictRestEx.java similarity index 100% rename from src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/exception/ConflictRestEx.java rename to src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/exception/ConflictRestEx.java diff --git a/src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/exception/GeoFenceRestEx.java b/src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/exception/GeoFenceRestEx.java similarity index 100% rename from src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/exception/GeoFenceRestEx.java rename to src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/exception/GeoFenceRestEx.java diff --git a/src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/exception/InternalErrorRestEx.java b/src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/exception/InternalErrorRestEx.java similarity index 100% rename from src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/exception/InternalErrorRestEx.java rename to src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/exception/InternalErrorRestEx.java diff --git a/src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/exception/NotFoundRestEx.java b/src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/exception/NotFoundRestEx.java similarity index 100% rename from src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/exception/NotFoundRestEx.java rename to src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/exception/NotFoundRestEx.java diff --git a/src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/AbstractRESTPayload.java b/src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/AbstractRESTPayload.java similarity index 100% rename from src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/AbstractRESTPayload.java rename to src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/AbstractRESTPayload.java diff --git a/src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTBatch.java b/src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTBatch.java similarity index 100% rename from src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTBatch.java rename to src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTBatch.java diff --git a/src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTBatchOperation.java b/src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTBatchOperation.java similarity index 100% rename from src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTBatchOperation.java rename to src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTBatchOperation.java diff --git a/src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTInputAdminRule.java b/src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTInputAdminRule.java similarity index 100% rename from src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTInputAdminRule.java rename to src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTInputAdminRule.java diff --git a/src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTInputGroup.java b/src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTInputGroup.java similarity index 100% rename from src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTInputGroup.java rename to src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTInputGroup.java diff --git a/src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTInputInstance.java b/src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTInputInstance.java similarity index 100% rename from src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTInputInstance.java rename to src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTInputInstance.java diff --git a/src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTInputRule.java b/src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTInputRule.java similarity index 100% rename from src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTInputRule.java rename to src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTInputRule.java diff --git a/src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTInputUser.java b/src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTInputUser.java similarity index 100% rename from src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTInputUser.java rename to src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTInputUser.java diff --git a/src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTLayerConstraints.java b/src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTLayerConstraints.java similarity index 100% rename from src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTLayerConstraints.java rename to src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTLayerConstraints.java diff --git a/src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTOutputAdminRule.java b/src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTOutputAdminRule.java similarity index 100% rename from src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTOutputAdminRule.java rename to src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTOutputAdminRule.java diff --git a/src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTOutputAdminRuleList.java b/src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTOutputAdminRuleList.java similarity index 100% rename from src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTOutputAdminRuleList.java rename to src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTOutputAdminRuleList.java diff --git a/src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTOutputGroup.java b/src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTOutputGroup.java similarity index 100% rename from src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTOutputGroup.java rename to src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTOutputGroup.java diff --git a/src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTOutputInstance.java b/src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTOutputInstance.java similarity index 100% rename from src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTOutputInstance.java rename to src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTOutputInstance.java diff --git a/src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTOutputRule.java b/src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTOutputRule.java similarity index 100% rename from src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTOutputRule.java rename to src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTOutputRule.java diff --git a/src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTOutputRuleList.java b/src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTOutputRuleList.java similarity index 100% rename from src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTOutputRuleList.java rename to src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTOutputRuleList.java diff --git a/src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTOutputUser.java b/src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTOutputUser.java similarity index 100% rename from src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTOutputUser.java rename to src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTOutputUser.java diff --git a/src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTRulePosition.java b/src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTRulePosition.java similarity index 100% rename from src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTRulePosition.java rename to src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTRulePosition.java diff --git a/src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTShortInstanceList.java b/src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTShortInstanceList.java similarity index 100% rename from src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTShortInstanceList.java rename to src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTShortInstanceList.java diff --git a/src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTShortUser.java b/src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTShortUser.java similarity index 100% rename from src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTShortUser.java rename to src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTShortUser.java diff --git a/src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTShortUserGroup.java b/src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTShortUserGroup.java similarity index 100% rename from src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTShortUserGroup.java rename to src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTShortUserGroup.java diff --git a/src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTShortUserGroupList.java b/src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTShortUserGroupList.java similarity index 100% rename from src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTShortUserGroupList.java rename to src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTShortUserGroupList.java diff --git a/src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTShortUserList.java b/src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTShortUserList.java similarity index 100% rename from src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTShortUserList.java rename to src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/RESTShortUserList.java diff --git a/src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/config/RESTConfigurationRemapping.java b/src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/config/RESTConfigurationRemapping.java similarity index 100% rename from src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/config/RESTConfigurationRemapping.java rename to src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/config/RESTConfigurationRemapping.java diff --git a/src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/config/RESTFullConfiguration.java b/src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/config/RESTFullConfiguration.java similarity index 100% rename from src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/config/RESTFullConfiguration.java rename to src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/config/RESTFullConfiguration.java diff --git a/src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/config/RESTFullGRUserList.java b/src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/config/RESTFullGRUserList.java similarity index 100% rename from src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/config/RESTFullGRUserList.java rename to src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/config/RESTFullGRUserList.java diff --git a/src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/config/RESTFullGSInstanceList.java b/src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/config/RESTFullGSInstanceList.java similarity index 100% rename from src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/config/RESTFullGSInstanceList.java rename to src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/config/RESTFullGSInstanceList.java diff --git a/src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/config/RESTFullRuleList.java b/src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/config/RESTFullRuleList.java similarity index 100% rename from src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/config/RESTFullRuleList.java rename to src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/config/RESTFullRuleList.java diff --git a/src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/config/RESTFullUserGroupList.java b/src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/config/RESTFullUserGroupList.java similarity index 100% rename from src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/config/RESTFullUserGroupList.java rename to src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/config/RESTFullUserGroupList.java diff --git a/src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/config/RESTFullUserList.java b/src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/config/RESTFullUserList.java similarity index 100% rename from src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/config/RESTFullUserList.java rename to src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/config/RESTFullUserList.java diff --git a/src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/config/adapter/MapType.java b/src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/config/adapter/MapType.java similarity index 100% rename from src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/config/adapter/MapType.java rename to src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/config/adapter/MapType.java diff --git a/src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/config/adapter/RemappedType.java b/src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/config/adapter/RemappedType.java similarity index 100% rename from src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/config/adapter/RemappedType.java rename to src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/config/adapter/RemappedType.java diff --git a/src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/config/adapter/RemapperAdapter.java b/src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/config/adapter/RemapperAdapter.java similarity index 100% rename from src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/config/adapter/RemapperAdapter.java rename to src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/config/adapter/RemapperAdapter.java diff --git a/src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/util/IdName.java b/src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/util/IdName.java similarity index 100% rename from src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/util/IdName.java rename to src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/util/IdName.java diff --git a/src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/util/Identifier.java_ b/src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/util/Identifier.java_ similarity index 100% rename from src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/util/Identifier.java_ rename to src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/util/Identifier.java_ diff --git a/src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/util/RESTBatchOperationFactory.java b/src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/util/RESTBatchOperationFactory.java similarity index 100% rename from src/services/modules/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/util/RESTBatchOperationFactory.java rename to src/extension/rest/api/src/main/java/org/geoserver/geofence/services/rest/model/util/RESTBatchOperationFactory.java diff --git a/src/services/modules/rest/api/src/test/java/org/geoserver/geofence/services/rest/model/ModelPrintoutFakeTest.java b/src/extension/rest/api/src/test/java/org/geoserver/geofence/services/rest/model/ModelPrintoutFakeTest.java similarity index 100% rename from src/services/modules/rest/api/src/test/java/org/geoserver/geofence/services/rest/model/ModelPrintoutFakeTest.java rename to src/extension/rest/api/src/test/java/org/geoserver/geofence/services/rest/model/ModelPrintoutFakeTest.java diff --git a/src/services/modules/rest/api/src/test/resources/log4j.properties b/src/extension/rest/api/src/test/resources/log4j.properties similarity index 100% rename from src/services/modules/rest/api/src/test/resources/log4j.properties rename to src/extension/rest/api/src/test/resources/log4j.properties diff --git a/src/services/modules/rest/client/pom.xml b/src/extension/rest/client/pom.xml similarity index 98% rename from src/services/modules/rest/client/pom.xml rename to src/extension/rest/client/pom.xml index e881044f..e8bd7a6b 100644 --- a/src/services/modules/rest/client/pom.xml +++ b/src/extension/rest/client/pom.xml @@ -18,7 +18,7 @@ org.geoserver.geofence geofence-rest-client jar - GeoFence - Modules - REST client + GeoFence - Extension - REST client diff --git a/src/services/modules/rest/client/src/main/java/org/geoserver/geofence/services/rest/GeoFenceClient.java b/src/extension/rest/client/src/main/java/org/geoserver/geofence/services/rest/GeoFenceClient.java similarity index 100% rename from src/services/modules/rest/client/src/main/java/org/geoserver/geofence/services/rest/GeoFenceClient.java rename to src/extension/rest/client/src/main/java/org/geoserver/geofence/services/rest/GeoFenceClient.java diff --git a/src/services/modules/rest/client/src/main/java/org/geoserver/geofence/services/rest/RuleServiceHelper.java b/src/extension/rest/client/src/main/java/org/geoserver/geofence/services/rest/RuleServiceHelper.java similarity index 100% rename from src/services/modules/rest/client/src/main/java/org/geoserver/geofence/services/rest/RuleServiceHelper.java rename to src/extension/rest/client/src/main/java/org/geoserver/geofence/services/rest/RuleServiceHelper.java diff --git a/src/services/modules/rest/client/src/test/java/org/geoserver/geofence/services/rest/GeoFenceClientTest.java b/src/extension/rest/client/src/test/java/org/geoserver/geofence/services/rest/GeoFenceClientTest.java similarity index 100% rename from src/services/modules/rest/client/src/test/java/org/geoserver/geofence/services/rest/GeoFenceClientTest.java rename to src/extension/rest/client/src/test/java/org/geoserver/geofence/services/rest/GeoFenceClientTest.java diff --git a/src/services/modules/rest/client/src/test/resources/log4j.properties b/src/extension/rest/client/src/test/resources/log4j.properties similarity index 100% rename from src/services/modules/rest/client/src/test/resources/log4j.properties rename to src/extension/rest/client/src/test/resources/log4j.properties diff --git a/src/services/modules/rest/impl/pom.xml b/src/extension/rest/impl/pom.xml similarity index 99% rename from src/services/modules/rest/impl/pom.xml rename to src/extension/rest/impl/pom.xml index 30569009..84fba5c0 100644 --- a/src/services/modules/rest/impl/pom.xml +++ b/src/extension/rest/impl/pom.xml @@ -21,7 +21,7 @@ geofence-rest-impl jar - GeoFence - Modules - REST services implementation + GeoFence - Extension - REST services implementation diff --git a/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/AuthUser.java b/src/extension/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/AuthUser.java similarity index 100% rename from src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/AuthUser.java rename to src/extension/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/AuthUser.java diff --git a/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/AuthenticationHandler.java b/src/extension/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/AuthenticationHandler.java similarity index 100% rename from src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/AuthenticationHandler.java rename to src/extension/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/AuthenticationHandler.java diff --git a/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/AuthorizationHandler.java b/src/extension/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/AuthorizationHandler.java similarity index 100% rename from src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/AuthorizationHandler.java rename to src/extension/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/AuthorizationHandler.java diff --git a/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/GeofenceAuthenticationInterceptor.java b/src/extension/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/GeofenceAuthenticationInterceptor.java similarity index 100% rename from src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/GeofenceAuthenticationInterceptor.java rename to src/extension/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/GeofenceAuthenticationInterceptor.java diff --git a/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/GeofencePrincipal.java b/src/extension/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/GeofencePrincipal.java similarity index 100% rename from src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/GeofencePrincipal.java rename to src/extension/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/GeofencePrincipal.java diff --git a/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/GeofenceSecurityContext.java b/src/extension/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/GeofenceSecurityContext.java similarity index 100% rename from src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/GeofenceSecurityContext.java rename to src/extension/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/GeofenceSecurityContext.java diff --git a/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/JAXBContextResolver.java b/src/extension/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/JAXBContextResolver.java similarity index 100% rename from src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/JAXBContextResolver.java rename to src/extension/rest/impl/src/main/java/org/geoserver/geofence/services/rest/auth/JAXBContextResolver.java diff --git a/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/BaseRESTServiceImpl.java b/src/extension/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/BaseRESTServiceImpl.java similarity index 100% rename from src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/BaseRESTServiceImpl.java rename to src/extension/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/BaseRESTServiceImpl.java diff --git a/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTAdminRuleServiceImpl.java b/src/extension/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTAdminRuleServiceImpl.java similarity index 100% rename from src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTAdminRuleServiceImpl.java rename to src/extension/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTAdminRuleServiceImpl.java diff --git a/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTBatchServiceImpl.java b/src/extension/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTBatchServiceImpl.java similarity index 100% rename from src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTBatchServiceImpl.java rename to src/extension/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTBatchServiceImpl.java diff --git a/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTConfigServiceImpl.java b/src/extension/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTConfigServiceImpl.java similarity index 100% rename from src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTConfigServiceImpl.java rename to src/extension/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTConfigServiceImpl.java diff --git a/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTInstanceServiceImpl.java b/src/extension/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTInstanceServiceImpl.java similarity index 100% rename from src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTInstanceServiceImpl.java rename to src/extension/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTInstanceServiceImpl.java diff --git a/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTRuleServiceImpl.java b/src/extension/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTRuleServiceImpl.java similarity index 100% rename from src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTRuleServiceImpl.java rename to src/extension/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTRuleServiceImpl.java diff --git a/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTUserGroupServiceImpl.java b/src/extension/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTUserGroupServiceImpl.java similarity index 100% rename from src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTUserGroupServiceImpl.java rename to src/extension/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTUserGroupServiceImpl.java diff --git a/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTUserServiceImpl.java b/src/extension/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTUserServiceImpl.java similarity index 100% rename from src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTUserServiceImpl.java rename to src/extension/rest/impl/src/main/java/org/geoserver/geofence/services/rest/impl/RESTUserServiceImpl.java diff --git a/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/utils/InstanceCleaner.java b/src/extension/rest/impl/src/main/java/org/geoserver/geofence/services/rest/utils/InstanceCleaner.java similarity index 100% rename from src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/utils/InstanceCleaner.java rename to src/extension/rest/impl/src/main/java/org/geoserver/geofence/services/rest/utils/InstanceCleaner.java diff --git a/src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/utils/MultiPolygonUtils.java b/src/extension/rest/impl/src/main/java/org/geoserver/geofence/services/rest/utils/MultiPolygonUtils.java similarity index 100% rename from src/services/modules/rest/impl/src/main/java/org/geoserver/geofence/services/rest/utils/MultiPolygonUtils.java rename to src/extension/rest/impl/src/main/java/org/geoserver/geofence/services/rest/utils/MultiPolygonUtils.java diff --git a/src/services/modules/rest/impl/src/main/resources/applicationContext.xml b/src/extension/rest/impl/src/main/resources/applicationContext.xml similarity index 100% rename from src/services/modules/rest/impl/src/main/resources/applicationContext.xml rename to src/extension/rest/impl/src/main/resources/applicationContext.xml diff --git a/src/services/modules/rest/impl/src/test/java/org/geoserver/geofence/services/rest/impl/RESTBaseTest.java b/src/extension/rest/impl/src/test/java/org/geoserver/geofence/services/rest/impl/RESTBaseTest.java similarity index 100% rename from src/services/modules/rest/impl/src/test/java/org/geoserver/geofence/services/rest/impl/RESTBaseTest.java rename to src/extension/rest/impl/src/test/java/org/geoserver/geofence/services/rest/impl/RESTBaseTest.java diff --git a/src/services/modules/rest/impl/src/test/java/org/geoserver/geofence/services/rest/impl/RESTRuleServiceImplTest.java b/src/extension/rest/impl/src/test/java/org/geoserver/geofence/services/rest/impl/RESTRuleServiceImplTest.java similarity index 100% rename from src/services/modules/rest/impl/src/test/java/org/geoserver/geofence/services/rest/impl/RESTRuleServiceImplTest.java rename to src/extension/rest/impl/src/test/java/org/geoserver/geofence/services/rest/impl/RESTRuleServiceImplTest.java diff --git a/src/services/modules/rest/impl/src/test/java/org/geoserver/geofence/services/rest/impl/RESTUserGroupServiceImplTest.java b/src/extension/rest/impl/src/test/java/org/geoserver/geofence/services/rest/impl/RESTUserGroupServiceImplTest.java similarity index 100% rename from src/services/modules/rest/impl/src/test/java/org/geoserver/geofence/services/rest/impl/RESTUserGroupServiceImplTest.java rename to src/extension/rest/impl/src/test/java/org/geoserver/geofence/services/rest/impl/RESTUserGroupServiceImplTest.java diff --git a/src/services/modules/rest/impl/src/test/java/org/geoserver/geofence/services/rest/impl/RESTUserServiceImplTest.java b/src/extension/rest/impl/src/test/java/org/geoserver/geofence/services/rest/impl/RESTUserServiceImplTest.java similarity index 100% rename from src/services/modules/rest/impl/src/test/java/org/geoserver/geofence/services/rest/impl/RESTUserServiceImplTest.java rename to src/extension/rest/impl/src/test/java/org/geoserver/geofence/services/rest/impl/RESTUserServiceImplTest.java diff --git a/src/services/modules/rest/impl/src/test/java/org/geoserver/geofence/services/rest/model/ModelPrintoutFakeTest.java b/src/extension/rest/impl/src/test/java/org/geoserver/geofence/services/rest/model/ModelPrintoutFakeTest.java similarity index 100% rename from src/services/modules/rest/impl/src/test/java/org/geoserver/geofence/services/rest/model/ModelPrintoutFakeTest.java rename to src/extension/rest/impl/src/test/java/org/geoserver/geofence/services/rest/model/ModelPrintoutFakeTest.java diff --git a/src/services/modules/rest/impl/src/test/resources/applicationContext.xml b/src/extension/rest/impl/src/test/resources/applicationContext.xml similarity index 100% rename from src/services/modules/rest/impl/src/test/resources/applicationContext.xml rename to src/extension/rest/impl/src/test/resources/applicationContext.xml diff --git a/src/services/modules/rest/impl/src/test/resources/geofence-datasource-ovr.properties b/src/extension/rest/impl/src/test/resources/geofence-datasource-ovr.properties similarity index 100% rename from src/services/modules/rest/impl/src/test/resources/geofence-datasource-ovr.properties rename to src/extension/rest/impl/src/test/resources/geofence-datasource-ovr.properties diff --git a/src/services/modules/rest/impl/src/test/resources/log4j.properties b/src/extension/rest/impl/src/test/resources/log4j.properties similarity index 100% rename from src/services/modules/rest/impl/src/test/resources/log4j.properties rename to src/extension/rest/impl/src/test/resources/log4j.properties diff --git a/src/services/modules/rest/impl/src/test/resources/xsl/rules.xsl b/src/extension/rest/impl/src/test/resources/xsl/rules.xsl similarity index 100% rename from src/services/modules/rest/impl/src/test/resources/xsl/rules.xsl rename to src/extension/rest/impl/src/test/resources/xsl/rules.xsl diff --git a/src/services/modules/rest/pom.xml b/src/extension/rest/pom.xml similarity index 89% rename from src/services/modules/rest/pom.xml rename to src/extension/rest/pom.xml index 480fff20..8dab098b 100644 --- a/src/services/modules/rest/pom.xml +++ b/src/extension/rest/pom.xml @@ -13,13 +13,13 @@ org.geoserver.geofence - geofence-modules + geofence-extension 3.5-SNAPSHOT org.geoserver.geofence geofence-rest-root - GeoFence - Modules - REST root + GeoFence - Extension - REST root pom diff --git a/src/services/modules/rest/test/pom.xml b/src/extension/rest/test/pom.xml similarity index 99% rename from src/services/modules/rest/test/pom.xml rename to src/extension/rest/test/pom.xml index 9aaeff89..bc84681d 100644 --- a/src/services/modules/rest/test/pom.xml +++ b/src/extension/rest/test/pom.xml @@ -19,7 +19,7 @@ geofence-rest-test war - GeoFence - Modules - REST services test + GeoFence - Extension - REST services test diff --git a/src/services/modules/rest/test/src/main/java/org/geoserver/geofence/services/servicetest/MainTest.java b/src/extension/rest/test/src/main/java/org/geoserver/geofence/services/servicetest/MainTest.java similarity index 100% rename from src/services/modules/rest/test/src/main/java/org/geoserver/geofence/services/servicetest/MainTest.java rename to src/extension/rest/test/src/main/java/org/geoserver/geofence/services/servicetest/MainTest.java diff --git a/src/services/modules/rest/test/src/main/resources/META-INF/cxf/org.apache.cxf.Logger b/src/extension/rest/test/src/main/resources/META-INF/cxf/org.apache.cxf.Logger similarity index 100% rename from src/services/modules/rest/test/src/main/resources/META-INF/cxf/org.apache.cxf.Logger rename to src/extension/rest/test/src/main/resources/META-INF/cxf/org.apache.cxf.Logger diff --git a/src/services/modules/rest/test/src/main/resources/applicationContext.xml b/src/extension/rest/test/src/main/resources/applicationContext.xml similarity index 100% rename from src/services/modules/rest/test/src/main/resources/applicationContext.xml rename to src/extension/rest/test/src/main/resources/applicationContext.xml diff --git a/src/services/modules/rest/test/src/main/resources/geofence-datasource-ovr.properties b/src/extension/rest/test/src/main/resources/geofence-datasource-ovr.properties similarity index 100% rename from src/services/modules/rest/test/src/main/resources/geofence-datasource-ovr.properties rename to src/extension/rest/test/src/main/resources/geofence-datasource-ovr.properties diff --git a/src/services/modules/rest/test/src/main/resources/log4j.properties b/src/extension/rest/test/src/main/resources/log4j.properties similarity index 100% rename from src/services/modules/rest/test/src/main/resources/log4j.properties rename to src/extension/rest/test/src/main/resources/log4j.properties diff --git a/src/services/modules/rest/test/src/main/webapp/WEB-INF/web.xml b/src/extension/rest/test/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from src/services/modules/rest/test/src/main/webapp/WEB-INF/web.xml rename to src/extension/rest/test/src/main/webapp/WEB-INF/web.xml diff --git a/src/services/modules/rest/test/src/test/resources/batch01.xml b/src/extension/rest/test/src/test/resources/batch01.xml similarity index 100% rename from src/services/modules/rest/test/src/test/resources/batch01.xml rename to src/extension/rest/test/src/test/resources/batch01.xml diff --git a/src/services/modules/rest/test/src/test/resources/batch02.xml b/src/extension/rest/test/src/test/resources/batch02.xml similarity index 100% rename from src/services/modules/rest/test/src/test/resources/batch02.xml rename to src/extension/rest/test/src/test/resources/batch02.xml diff --git a/src/services/modules/rest/test/src/test/resources/batch_empty_payload.xml b/src/extension/rest/test/src/test/resources/batch_empty_payload.xml similarity index 100% rename from src/services/modules/rest/test/src/test/resources/batch_empty_payload.xml rename to src/extension/rest/test/src/test/resources/batch_empty_payload.xml diff --git a/src/services/modules/rest/test/src/test/resources/group01.xml b/src/extension/rest/test/src/test/resources/group01.xml similarity index 100% rename from src/services/modules/rest/test/src/test/resources/group01.xml rename to src/extension/rest/test/src/test/resources/group01.xml diff --git a/src/services/modules/rest/test/src/test/resources/instance01.xml b/src/extension/rest/test/src/test/resources/instance01.xml similarity index 100% rename from src/services/modules/rest/test/src/test/resources/instance01.xml rename to src/extension/rest/test/src/test/resources/instance01.xml diff --git a/src/services/modules/rest/test/src/test/resources/rule01.xml b/src/extension/rest/test/src/test/resources/rule01.xml similarity index 100% rename from src/services/modules/rest/test/src/test/resources/rule01.xml rename to src/extension/rest/test/src/test/resources/rule01.xml diff --git a/src/services/modules/rest/test/src/test/resources/user0101.xml b/src/extension/rest/test/src/test/resources/user0101.xml similarity index 100% rename from src/services/modules/rest/test/src/test/resources/user0101.xml rename to src/extension/rest/test/src/test/resources/user0101.xml diff --git a/src/services/modules/rest/test/src/test/resources/user0_update.xml b/src/extension/rest/test/src/test/resources/user0_update.xml similarity index 100% rename from src/services/modules/rest/test/src/test/resources/user0_update.xml rename to src/extension/rest/test/src/test/resources/user0_update.xml diff --git a/src/pom.xml b/src/pom.xml index b583ec2c..49941985 100644 --- a/src/pom.xml +++ b/src/pom.xml @@ -6,132 +6,745 @@ */ --> - 4.0.0 - - org.geoserver.geofence - geofence - 3.5-SNAPSHOT - pom - - - 3.6.9.Final - 1.1.0 - 1.1.3.1 - 1.1.3.1 - 42.1.1 - 1.3.3 - + 4.0.0 + + org.geoserver.geofence + geofence + 3.5-SNAPSHOT + pom - Master GeoFence POM - GeoFence is a java web application that handles authorization rules, integrating with GeoServer using the interface described in GSIP 57. + Master GeoFence POM + GeoFence is a java web application that handles authorization rules, integrating with GeoServer using the interface described in GSIP 57. - https://github.com/geoserver/geofence - 2011 + https://github.com/geoserver/geofence + 2011 - - GeoSolutions - http://www.geo-solutions.it - + + GeoSolutions + http://www.geo-solutions.it + - - - etj - Emanuele Tajariol - GeoSolutions - - architect - developer - - +1 - - - afabiani - Alessio Fabiani - GeoSolutions - - developer - - +1 - - + + + etj + Emanuele Tajariol + GeoSolutions + + architect + developer + + +1 + + - - github - https://github.com/geoserver/geofence/issues - + + github + https://github.com/geoserver/geofence/issues + - - scm:git:git@github.com:geoserver/geofence.git - master - https://github.com/geoserver/geofence - + + scm:git:git@github.com:geoserver/geofence.git + master + https://github.com/geoserver/geofence + - - jenkins - https://build.geoserver.org - + + jenkins + https://build.geoserver.org + - - - - boundless - Boundless Maven Repository - https://repo.boundlessgeo.com/main - - true - - - - - osgeo - Open Source Geospatial Foundation Repository - http://download.osgeo.org/webdav/geotools/ - - true - - - - - - - boundless - Boundless Release Repository - https://repo.boundlessgeo.com/release/ - false - - - boundless - false - Boundless Snapshot Repository - https://repo.boundlessgeo.com/snapshot/ - - + + + + boundless + Boundless Maven Repository + https://repo.boundlessgeo.com/main + + true + + + + + osgeo + Open Source Geospatial Foundation Repository + http://download.osgeo.org/webdav/geotools/ + + true + + + + + + + boundless + Boundless Release Repository + https://repo.boundlessgeo.com/release/ + false + + + boundless + false + Boundless Snapshot Repository + https://repo.boundlessgeo.com/snapshot/ + + - - services - + + core + extension + - + - - - org.codehaus.mojo - versions-maven-plugin - 2.7 - - false - - - - - + + + org.codehaus.mojo + versions-maven-plugin + 2.7 + + false + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 3.8.1 + + 11 + true + UTF-8 + true + + + + + org.apache.maven.plugins + maven-resources-plugin + 3.1.0 + + UTF-8 + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.22.2 + + + + + + + - + + + org.apache.maven.wagon + wagon-ftp + 3.3.3 + + + + + + + + + + + + + + 3.5-SNAPSHOT + geofence + + 22-SNAPSHOT + + 3.3.2 + + 5.1.1.RELEASE + 5.1.5.RELEASE + + 2.7.0 + 2.8.1 + 1.3.03 + 2.1 + + 5.4.3.Final + + + + 42.1.1 + 1.3.3 + + 1.1 + 4.0 + + 1.6.1 + + + + 3.1.0.2-fuse + + 1.5.4 + 2.0 + 9.2.13.v20150730 + + 2.2.3 + 2.2 + + 3.8.0.GA + + + + + + + + + + + + + + + + + + org.geoserver.geofence + geofence-model-internal + ${geofence-version} + + + + org.geoserver.geofence + geofence-model + ${geofence-version} + + + + org.geoserver.geofence + geofence-persistence + ${geofence-version} + + + + org.geoserver.geofence + geofence-services-api + ${geofence-version} + + + + org.geoserver.geofence + geofence-services-impl + ${geofence-version} + + + + + + + org.geoserver.geofence + geofence-modules + ${geofence-version} + + + + org.geoserver.geofence + geofence-rest-root + ${geofence-version} + + + + org.geoserver.geofence + geofence-rest + ${geofence-version} + + + + org.geoserver.geofence + geofence-rest-api + ${geofence-version} + + + + org.geoserver.geofence + geofence-rest-impl + ${geofence-version} + + + + org.geoserver.geofence + geofence-rest-test + ${geofence-version} + + + + org.geoserver.geofence + geofence-ldap + ${geofence-version} + + + + + + + it.geosolutions + geoserver-manager + 1.3.3-SNAPSHOT + + + + + + + quartz + quartz + 1.5.2 + + + javassist + javassist + ${javassist-version} + runtime + + + + + + + + + + log4j + log4j + 1.2.17 + + + + + + + + dom4j + dom4j + ${dom4j-version} + + + + org.jdom + jdom + 1.1.3 + + + + + + + + commons-lang + commons-lang + 2.6 + + + commons-io + commons-io + 2.6 + + + commons-httpclient + commons-httpclient + 3.1 + + + commons-dbcp + commons-dbcp + 1.4 + + + commons-beanutils + commons-beanutils + 1.9.3 + + + commons-collections + commons-collections + 3.2.2 + + + commons-codec + commons-codec + 1.12 + + + + commons-logging + commons-logging + 1.2 + + + + + + + javax.xml.ws + jaxws-api + ${jaxws-version} + + + javax.jws + jsr181-api + + + + + + org.apache.cxf + cxf-rt-transports-http + ${cxf-version} + + + org.apache.cxf + cxf-rt-transports-http-jetty + ${cxf-version} + + + org.apache.cxf + cxf-rt-frontend-jaxws + ${cxf-version} + + + org.apache.geronimo.specs + geronimo-annotation_1.0_spec + + + org.apache.geronimo.specs + geronimo-javamail_1.4_spec + + + + + org.apache.cxf + cxf-rt-bindings-soap + ${cxf-version} + + + org.apache.geronimo.specs + geronimo-javamail_1.4_spec + + + + + org.apache.cxf + cxf-rt-databinding-aegis + ${cxf-version} + + + org.apache.cxf + cxf-rt-frontend-jaxrs + ${cxf-version} + + + org.apache.cxf + cxf-rt-ws-security + ${cxf-version} + + + org.apache.cxf + cxf-core + ${cxf-version} + + + org.apache.cxf + cxf-rt-rs-client + ${cxf-version} + + + org.apache.cxf + cxf-rt-rs-extension-providers + ${cxf-version} + + + + + + + + + javax.xml.bind + jaxb-api + 2.4.0-b180830.0359 + + + org.glassfish.jaxb + jaxb-runtime + 2.4.0-b180830.0438 + + + + + com.sun.xml.ws + jaxws-rt + 2.3.2 + pom + + + com.sun.xml.ws + jaxws-ri + 2.3.2 + pom + + + com.sun.xml.ws + rt + 2.3.2 + + + + javax.annotation + javax.annotation-api + 1.3.2 + + + + + + + + org.springframework + spring-framework-bom + ${spring-version} + pom + import + + + + + + + + org.springframework.security + spring-security-bom + ${spring-security-version} + pom + import + + + + org.springframework.ldap + spring-ldap-core + 2.3.2.RELEASE + + + org.springframework.ldap + spring-ldap-test + 2.3.2.RELEASE + + + + + + + javax.servlet + servlet-api + 2.3 + provided + + + + + + + asm + asm + 3.3.1 + + + cglib + cglib + 3.2.12 + + + cglib + cglib-nodep + 3.2.12 + + + + + + + + org.codehaus.jettison + jettison + 1.4.0 + + + + org.aspectj + aspectjrt + ${aspectj-version} + + + org.aspectj + aspectjweaver + ${aspectj-version} + + + + + + + junit + junit + 4.13 + test + + + + + + + + org.hibernate + hibernate-core + ${hibernate-version} + + + + org.hibernate + hibernate-jcache + ${hibernate-version} + + + + org.hibernate + hibernate-spatial + ${hibernate-version} + + + + + + + org.postgis + postgis-jdbc + ${postgis.jdbc.version} + + + org.postgis + postgis-stubs + + + + + org.postgresql + postgresql + ${postgresql.jdbc.version} + + + + + + com.h2database + h2 + 1.4.200 + + + + + + + + org.locationtech.jts + jts-core + 1.16.1 + + + + + + + org.geotools + gt-main + ${gt-version} + + + org.geotools + gt-api + ${gt-version} + + + org.geotools + gt-referencing + ${gt-version} + + + org.geotools + gt-metadata + ${gt-version} + + + org.geotools + gt-epsg-hsql + ${gt-version} + + + org.geotools + gt-epsg-h2 + ${gt-version} + + + org.geotools + gt-epsg-extension + ${gt-version} + + + org.geotools + gt-geotiff + ${gt-version} + + + org.geotools + gt-coveragetools + ${gt-version} + + + org.geotools + gt-shapefile + ${gt-version} + + + org.geotools.jdbc + gt-jdbc-postgis + ${gt-version} + + + org.geotools.jdbc + gt-jdbc-oracle + ${gt-version} + + + org.geotools + gt-epsg-wkt + ${gt-version} + + + + diff --git a/src/services/modules/generic-api/pom.xml b/src/services/modules/generic-api/pom.xml deleted file mode 100644 index 6480c829..00000000 --- a/src/services/modules/generic-api/pom.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - 4.0.0 - - - org.geoserver.geofence - geofence-modules - 3.5-SNAPSHOT - - - org.geoserver.geofence - geofence-generic-api - jar - GeoFence - Module - Generic API - - - - - - - - - - - - - com.sun.xml.ws - jaxws-ri - 2.3.2 - pom - - - javassist - javassist - runtime - - - org.springframework - spring-beans - - - org.codehaus.jra - jra - 1.0-alpha-4 - jar - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - - - - true - org.apache.maven.plugins - maven-source-plugin - 2.3 - - true - - - - attach-sources - - jar - - - - - - - - - - diff --git a/src/services/modules/generic-api/src/main/java/org/geoserver/geofence/api/AuthProvider.java b/src/services/modules/generic-api/src/main/java/org/geoserver/geofence/api/AuthProvider.java deleted file mode 100644 index 658ae5f8..00000000 --- a/src/services/modules/generic-api/src/main/java/org/geoserver/geofence/api/AuthProvider.java +++ /dev/null @@ -1,21 +0,0 @@ -/* (c) 2014 Open Source Geospatial Foundation - all rights reserved - * This code is licensed under the GPL 2.0 license, available at the root - * application directory. - */ - -package org.geoserver.geofence.api; - -import org.geoserver.geofence.api.dto.GrantedAuths; -import org.geoserver.geofence.api.exception.AuthException; - -/** - * This interface should be provided by classes that bridges toward and external auth source.
- * Let's say we have and external LDAP service, we may want to forward login requests to it. - * - * @author Emanuele Tajariol (etj at geo-solutions.it) - */ -public interface AuthProvider { - GrantedAuths login(String username, String password, String pwFromDB) throws AuthException; - - void logout(String token); -} diff --git a/src/services/modules/generic-api/src/main/java/org/geoserver/geofence/api/UserRegistry.java b/src/services/modules/generic-api/src/main/java/org/geoserver/geofence/api/UserRegistry.java deleted file mode 100644 index 28fc2654..00000000 --- a/src/services/modules/generic-api/src/main/java/org/geoserver/geofence/api/UserRegistry.java +++ /dev/null @@ -1,22 +0,0 @@ -/* (c) 2014 Open Source Geospatial Foundation - all rights reserved - * This code is licensed under the GPL 2.0 license, available at the root - * application directory. - */ - -package org.geoserver.geofence.api; - -import org.geoserver.geofence.api.dto.RegisteredUser; - -import java.util.List; - -/** - * - * @author Emanuele Tajariol (etj at geo-solutions.it) - */ -public interface UserRegistry { - - List getUsers(String nameLike, int page, int entries); - - long getUsersCount(String nameLike); - -} diff --git a/src/services/modules/generic-api/src/main/java/org/geoserver/geofence/api/dto/Authority.java b/src/services/modules/generic-api/src/main/java/org/geoserver/geofence/api/dto/Authority.java deleted file mode 100644 index 28b91936..00000000 --- a/src/services/modules/generic-api/src/main/java/org/geoserver/geofence/api/dto/Authority.java +++ /dev/null @@ -1,23 +0,0 @@ -/* (c) 2014 Open Source Geospatial Foundation - all rights reserved - * This code is licensed under the GPL 2.0 license, available at the root - * application directory. - */ - -package org.geoserver.geofence.api.dto; - -/** - * @author etj - */ -public enum Authority { - /** - * Authorization to log into the application - */ - LOGIN - - /** - * Authorization to perform remote calls - */ - , REMOTE - - ; -} diff --git a/src/services/modules/generic-api/src/main/java/org/geoserver/geofence/api/dto/GrantedAuths.java b/src/services/modules/generic-api/src/main/java/org/geoserver/geofence/api/dto/GrantedAuths.java deleted file mode 100644 index 320ac391..00000000 --- a/src/services/modules/generic-api/src/main/java/org/geoserver/geofence/api/dto/GrantedAuths.java +++ /dev/null @@ -1,39 +0,0 @@ -/* (c) 2014 Open Source Geospatial Foundation - all rights reserved - * This code is licensed under the GPL 2.0 license, available at the root - * application directory. - */ - -package org.geoserver.geofence.api.dto; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; - -/** - * @author - * - */ -public class GrantedAuths implements Serializable { - - private List auths; - - public GrantedAuths() { - if (auths == null) - auths = new ArrayList(); - } - - /** - * @param authorities - * the authorities to set - */ - public void setAuthorities(List authorities) { - this.auths = authorities; - } - - /** - * @return the authorities - */ - public List getAuthorities() { - return auths; - } -} diff --git a/src/services/modules/generic-api/src/main/java/org/geoserver/geofence/api/dto/RegisteredUser.java b/src/services/modules/generic-api/src/main/java/org/geoserver/geofence/api/dto/RegisteredUser.java deleted file mode 100644 index 8fc39f12..00000000 --- a/src/services/modules/generic-api/src/main/java/org/geoserver/geofence/api/dto/RegisteredUser.java +++ /dev/null @@ -1,38 +0,0 @@ -/* (c) 2014 Open Source Geospatial Foundation - all rights reserved - * This code is licensed under the GPL 2.0 license, available at the root - * application directory. - */ - -package org.geoserver.geofence.api.dto; - -/** - * - * @author ETj (etj at geo-solutions.it) - */ -public class RegisteredUser { - - protected String id; - - protected String username; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - @Override - public String toString() { - return getClass().getSimpleName() + "[" + "id:" + id + " userName:" + username + ']'; - } -} diff --git a/src/services/modules/generic-api/src/main/java/org/geoserver/geofence/api/exception/AuthException.java b/src/services/modules/generic-api/src/main/java/org/geoserver/geofence/api/exception/AuthException.java deleted file mode 100644 index 243745a8..00000000 --- a/src/services/modules/generic-api/src/main/java/org/geoserver/geofence/api/exception/AuthException.java +++ /dev/null @@ -1,32 +0,0 @@ -/* (c) 2014 Open Source Geospatial Foundation - all rights reserved - * This code is licensed under the GPL 2.0 license, available at the root - * application directory. - */ - -package org.geoserver.geofence.api.exception; - -import javax.xml.ws.WebFault; - -/** - * - * @author ETj (etj at geo-solutions.it) - */ -@WebFault(name = "AuthFault", faultBean = "org.geoserver.geofence.login.exception.AuthException") -public class AuthException extends RuntimeException { - - public AuthException(Throwable cause) { - super(cause); - } - - public AuthException(String message, Throwable cause) { - super(message, cause); - } - - public AuthException(String message) { - super(message); - } - - public AuthException() { - } - -} diff --git a/src/services/modules/login/api/pom.xml b/src/services/modules/login/api/pom.xml deleted file mode 100644 index d5ca263f..00000000 --- a/src/services/modules/login/api/pom.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - 4.0.0 - - - org.geoserver.geofence - geofence-login-parent - 3.5-SNAPSHOT - - - org.geoserver.geofence - geofence-login-api - jar - GeoFence - Modules - Login - API - - - - - - - - org.geoserver.geofence - geofence-generic-api - - - - - - - - javassist - javassist - runtime - - - org.springframework - spring-beans - - - org.codehaus.jra - jra - 1.0-alpha-4 - jar - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - - - - true - org.apache.maven.plugins - maven-source-plugin - 2.3 - - true - - - - attach-sources - - jar - - - - - - - - - - diff --git a/src/services/modules/login/api/src/main/java/org/geoserver/geofence/login/LoginService.java b/src/services/modules/login/api/src/main/java/org/geoserver/geofence/login/LoginService.java deleted file mode 100644 index 5827652b..00000000 --- a/src/services/modules/login/api/src/main/java/org/geoserver/geofence/login/LoginService.java +++ /dev/null @@ -1,29 +0,0 @@ -/* (c) 2014 Open Source Geospatial Foundation - all rights reserved - * This code is licensed under the GPL 2.0 license, available at the root - * application directory. - */ - -package org.geoserver.geofence.login; - -import org.geoserver.geofence.api.dto.GrantedAuths; -import org.geoserver.geofence.api.exception.AuthException; - -import javax.jws.WebParam; -import javax.jws.WebResult; -import javax.jws.WebService; - -/** - * - * @author Emanuele Tajariol (etj at geo-solutions.it) - */ -@WebService(name = "LoginService", targetNamespace = "http://www.geo-solutions.it/org.geoserver.geofence.login") -public interface LoginService { - - @WebResult(name = "token") - String login(@WebParam(name = "username") String username, - @WebParam(name = "password") String password, String pwFromDb) throws AuthException; - - GrantedAuths getGrantedAuthorities(@WebParam(name = "token") String token); - - void logout(@WebParam(name = "token") String token); -} diff --git a/src/services/modules/login/impl/pom.xml b/src/services/modules/login/impl/pom.xml deleted file mode 100644 index 88c30379..00000000 --- a/src/services/modules/login/impl/pom.xml +++ /dev/null @@ -1,105 +0,0 @@ - - - - - 4.0.0 - - - org.geoserver.geofence - geofence-login-parent - 3.5-SNAPSHOT - - - org.geoserver.geofence - geofence-login-impl - jar - GeoFence - Modules - Login - Impl - - - - - - - - - org.geoserver.geofence - geofence-generic-api - - - - org.geoserver.geofence - geofence-login-api - - - - - - - - - - - - javassist - javassist - runtime - - - org.springframework - spring-beans - - - - log4j - log4j - - - - commons-httpclient - commons-httpclient - - - - org.apache.cxf - cxf-core - - - - - - - - junit - junit - test - - - - - - - src/main/resources - - **/* - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - - - - diff --git a/src/services/modules/login/impl/src/main/java/org/geoserver/geofence/login/LoginServiceImpl.java b/src/services/modules/login/impl/src/main/java/org/geoserver/geofence/login/LoginServiceImpl.java deleted file mode 100644 index 57617cee..00000000 --- a/src/services/modules/login/impl/src/main/java/org/geoserver/geofence/login/LoginServiceImpl.java +++ /dev/null @@ -1,142 +0,0 @@ -/* (c) 2014 - 2017 Open Source Geospatial Foundation - all rights reserved - * This code is licensed under the GPL 2.0 license, available at the root - * application directory. - */ - -package org.geoserver.geofence.login; - -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; - -import org.geoserver.geofence.api.AuthProvider; -import org.geoserver.geofence.api.dto.Authority; -import org.geoserver.geofence.api.dto.GrantedAuths; -import org.geoserver.geofence.api.exception.AuthException; -import org.geoserver.geofence.login.util.GrantAll; -import org.geoserver.geofence.login.util.SessionManager; - -import org.apache.log4j.LogManager; -import org.apache.log4j.Logger; - -import org.springframework.beans.factory.DisposableBean; -import org.springframework.beans.factory.InitializingBean; - - -/** - * @author ETj (etj at geo-solutions.it) - */ -public class LoginServiceImpl implements LoginService, InitializingBean, DisposableBean -{ - - private static final Logger LOGGER = LogManager.getLogger(LoginServiceImpl.class); - - // private List authorizedRoles; - - private AuthProvider authProvider = new GrantAll(); // this provider should be overridden by - // injecting a true implementation. - - private SessionManager sessionManager; - - public LoginServiceImpl() - { - LOGGER.info("Creating " + getClass().getSimpleName() + " instance"); - } - - @Override - public void afterPropertiesSet() - { - LOGGER.debug("afterPropertiesSet()"); - } - - @Override - public void destroy() throws Exception - { - LOGGER.debug("destroy()"); - } - - @PostConstruct - public void postConstruct() - { - LOGGER.debug("postConstruct()"); - } - - @PreDestroy - public void preDestroy() - { - LOGGER.debug("preDestroy()"); - - } - - // ========================================================================== - // Service methods - // ========================================================================== - - @Override - public String login(String username, String password, String pwFromDb) throws AuthException - { - LOGGER.info("LOGIN REQUEST FOR " + username); - - // MessageContext msgCtxt = webServiceContext.getMessageContext(); - // HttpServletRequest req = (HttpServletRequest)msgCtxt.get(MessageContext.SERVLET_REQUEST); - // String clientIP = req.getRemoteAddr(); - // - // LOGGER.info("LOGIN REQUEST FOR " + username + " @ " + clientIP); - - if (username == null) - { - throw new AuthException("Null username"); - } - else - { - try - { - GrantedAuths ga = authProvider.login(username, password, pwFromDb); - if (!ga.getAuthorities().contains(Authority.LOGIN)) - { - LOGGER.warn("Login not granted to user [" + username + "]"); - throw new AuthException("User " + username + " can't log in"); - } - - String token = sessionManager.createSession(username, ga); - - return token; - } - catch (AuthException ex) - { - LOGGER.warn("Authentication Failed for user [" + username + "]: " + - ex.getLocalizedMessage()); - throw new AuthException("Authentication error", ex); - } - } - } - - @Override - public void logout(String token) - { - LOGGER.info("LOGOUT:" + token); - sessionManager.closeSession(token); - } - - @Override - public GrantedAuths getGrantedAuthorities(String token) - { - LOGGER.info("getGrantedAuthorities:" + token); - - return sessionManager.getGrantedAuthorities(token); - } - - // ========================================================================== - // Setters - // ========================================================================== - - public void setAuthProvider(AuthProvider authProvider) - { - LOGGER.info("Setting AuthProvider: " + authProvider.getClass()); - this.authProvider = authProvider; - } - - public void setSessionManager(SessionManager sessionManager) - { - this.sessionManager = sessionManager; - } -} diff --git a/src/services/modules/login/impl/src/main/java/org/geoserver/geofence/login/cxf/BasicAuthInterceptor.java b/src/services/modules/login/impl/src/main/java/org/geoserver/geofence/login/cxf/BasicAuthInterceptor.java deleted file mode 100644 index 009df473..00000000 --- a/src/services/modules/login/impl/src/main/java/org/geoserver/geofence/login/cxf/BasicAuthInterceptor.java +++ /dev/null @@ -1,157 +0,0 @@ -/* (c) 2014 - 2017 Open Source Geospatial Foundation - all rights reserved - * This code is licensed under the GPL 2.0 license, available at the root - * application directory. - */ - -package org.geoserver.geofence.login.cxf; - -import org.geoserver.geofence.api.AuthProvider; -import org.geoserver.geofence.api.dto.Authority; -import org.geoserver.geofence.api.dto.GrantedAuths; -import org.geoserver.geofence.login.util.GrantAll; - -import java.io.IOException; -import java.io.OutputStream; -import java.net.HttpURLConnection; -import java.util.Arrays; -import java.util.Map; - -import org.apache.cxf.configuration.security.AuthorizationPolicy; -import org.apache.cxf.endpoint.Endpoint; -import org.apache.cxf.interceptor.AbstractInDatabindingInterceptor; -import org.apache.cxf.interceptor.Fault; -import org.apache.cxf.message.Exchange; -import org.apache.cxf.message.Message; -import org.apache.cxf.phase.Phase; -import org.apache.log4j.LogManager; -import org.apache.log4j.Logger; - - -/** - * - * Adds basic authentication to CXF services by using login operation. - * - * @author ETj (etj at geo-solutions.it) - * - * @see http://chrisdail.com/2008/03/31/apache-cxf-with-http-basic-authentication/ - */ -public class BasicAuthInterceptor extends AbstractInDatabindingInterceptor { - - protected Logger LOGGER = LogManager.getLogger(getClass()); - - private AuthProvider authProvider = new GrantAll(); // reassign this, maybe by injection - - private String realm = "Geofence"; - - public BasicAuthInterceptor() { - super(Phase.UNMARSHAL); - // addAfter(BareInInterceptor.class.getName()); - // addAfter(RPCInInterceptor.class.getName()); - // addAfter(DocLiteralInInterceptor.class.getName()); - } - - @Override - public void handleMessage(Message message) throws Fault { - // This is set by CXF - AuthorizationPolicy policy = message.get(AuthorizationPolicy.class); - - // If the policy is not set, the user did not specify - // credentials. A 401 is sent to the client to indicate - // that authentication is required - if (policy == null) { - sendErrorResponse(message, HttpURLConnection.HTTP_UNAUTHORIZED); - return; - } - - // // allow auth to anybody - // GrantedAuths ga = new GrantedAuths(); - // ga.setAuthorities(Arrays.asList(Authority.LOGIN, Authority.REMOTE)); - // message.put("grantedAuths", ga); - // return; - - GrantedAuths ga = null; - - try { - ga = authProvider.login(policy.getUserName(), policy.getPassword(), ""); - } catch (Exception ex) { - LOGGER.warn("Login failed:" + ex.getMessage()); - sendErrorResponse(message, HttpURLConnection.HTTP_FORBIDDEN); - return; - } - - if (!ga.getAuthorities().contains(Authority.REMOTE)) { - sendErrorResponse(message, HttpURLConnection.HTTP_FORBIDDEN); - return; - } - - message.put("grantedAuths", ga); - - // sendErrorResponse(message, HttpURLConnection.HTTP_FORBIDDEN); - // connectid is not set, the called method should issue an Auth error - } - - private void sendErrorResponse(Message message, int responseCode) { - - Message outMessage = getOutMessage(message); - outMessage.put(Message.RESPONSE_CODE, responseCode); - // Set the response headers - Map responseHeaders = (Map) message.get(Message.PROTOCOL_HEADERS); - - if (responseHeaders != null) { - responseHeaders.put("WWW-Authenticate", Arrays.asList("Basic realm=\"" + realm + "\"")); - responseHeaders.put("Content-Length", Arrays.asList("0")); - } - - message.getInterceptorChain().abort(); - try { -// getConduit(message).prepare(outMessage); - message.getExchange().getConduit(message).prepare(outMessage); // TEST ME - - OutputStream os = outMessage.getContent(OutputStream.class); - String errmsg = "Error " + responseCode + ": "; - os.write(errmsg.getBytes()); - LOGGER.info("Sending error " + responseCode); - - close(outMessage); - } catch (IOException e) { - LOGGER.warn(e.getMessage(), e); - } - } - - private Message getOutMessage(Message inMessage) { - Exchange exchange = inMessage.getExchange(); - Message outMessage = exchange.getOutMessage(); - if (outMessage == null) { - Endpoint endpoint = exchange.get(Endpoint.class); - outMessage = endpoint.getBinding().createMessage(); - exchange.setOutMessage(outMessage); - } - outMessage.putAll(inMessage); - return outMessage; - } - -// private Conduit getConduit(Message inMessage) throws IOException { -// Exchange exchange = inMessage.getExchange(); -// EndpointReferenceType target = exchange.get(EndpointReferenceType.class); -// Conduit conduit = exchange.getDestination().getBackChannel(inMessage, null, target); -// exchange.setConduit(conduit); -// return conduit; -// } - - private void close(Message outMessage) throws IOException { - OutputStream os = outMessage.getContent(OutputStream.class); - os.flush(); - os.close(); - } - - // ========================================================================== - - public void setRealm(String realm) { - this.realm = realm; - } - - public void setAuthProvider(AuthProvider authProvider) { - this.authProvider = authProvider; - } - -} \ No newline at end of file diff --git a/src/services/modules/login/impl/src/main/java/org/geoserver/geofence/login/util/GrantAll.java b/src/services/modules/login/impl/src/main/java/org/geoserver/geofence/login/util/GrantAll.java deleted file mode 100644 index 5f345370..00000000 --- a/src/services/modules/login/impl/src/main/java/org/geoserver/geofence/login/util/GrantAll.java +++ /dev/null @@ -1,56 +0,0 @@ -/* (c) 2014 - 2017 Open Source Geospatial Foundation - all rights reserved - * This code is licensed under the GPL 2.0 license, available at the root - * application directory. - */ - -package org.geoserver.geofence.login.util; - -import java.util.Arrays; - -import org.geoserver.geofence.api.AuthProvider; -import org.geoserver.geofence.api.dto.Authority; -import org.geoserver.geofence.api.dto.GrantedAuths; -import org.geoserver.geofence.api.exception.AuthException; - -import org.apache.log4j.LogManager; -import org.apache.log4j.Logger; - - -/** - * A dummy AuthProvider which grants all auths to every request. - * - * TODO: this class used to provide a GrantAll grant, but since long an MD5 check - * was implemented here. Naming should be fixed - * - * @author ETj (etj at geo-solutions.it) - */ -public class GrantAll implements AuthProvider { - - private static final Logger LOGGER = LogManager.getLogger(GrantAll.class); - - @Override - public GrantedAuths login(String username, String password, String pwFromDb) throws AuthException { - // allow auth to anybody - LOGGER.warn("Login request from '" + username + "'"); - - GrantedAuths ga = new GrantedAuths(); - String hashedPw = MD5Util.getHash(password); - - LOGGER.info("hashedPw: " + hashedPw); - - if (hashedPw.equals(pwFromDb)) { - ga.setAuthorities(Arrays.asList(Authority.values())); - } else { - ga.setAuthorities(Arrays.asList(Authority.REMOTE)); - } - - return ga; - } - - @Override - public void logout(String token) { - // nothing to do - } - - -} diff --git a/src/services/modules/login/impl/src/main/java/org/geoserver/geofence/login/util/MD5Util.java b/src/services/modules/login/impl/src/main/java/org/geoserver/geofence/login/util/MD5Util.java deleted file mode 100644 index d6e8e502..00000000 --- a/src/services/modules/login/impl/src/main/java/org/geoserver/geofence/login/util/MD5Util.java +++ /dev/null @@ -1,49 +0,0 @@ -/* (c) 2014 - 2017 Open Source Geospatial Foundation - all rights reserved - * This code is licensed under the GPL 2.0 license, available at the root - * application directory. - */ - -package org.geoserver.geofence.login.util; - -import org.geoserver.geofence.api.exception.AuthException; -import java.io.UnsupportedEncodingException; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import org.apache.log4j.LogManager; -import org.apache.log4j.Logger; - -/** - * - * @author ETj (etj at geo-solutions.it) - */ -public class MD5Util { - private static final Logger LOGGER = LogManager.getLogger(MD5Util.class); - - public static String getHash(String password) throws AuthException { - byte[] passwordByteArr; - try { - passwordByteArr = password.getBytes("UTF-8"); - } catch (UnsupportedEncodingException e) { - LOGGER.error(e.getLocalizedMessage(), e); - throw new AuthException(e.getLocalizedMessage(), e); - } - MessageDigest md; - try { - md = MessageDigest.getInstance("MD5"); - md.reset(); - } catch (NoSuchAlgorithmException e) { - LOGGER.error(e.getLocalizedMessage(), e); - throw new AuthException(e.getLocalizedMessage(), e); - } - byte[] thedigest = md.digest(passwordByteArr); - StringBuilder hexString = new StringBuilder(); - for (int i = 0; i < thedigest.length; i++) { - String hexByte = Integer.toHexString(0xFF & thedigest[i]); - if(hexByte.length()==1) { - hexString.append('0'); - } - hexString.append(hexByte); - } - return hexString.toString(); - } -} diff --git a/src/services/modules/login/impl/src/main/java/org/geoserver/geofence/login/util/SessionManager.java b/src/services/modules/login/impl/src/main/java/org/geoserver/geofence/login/util/SessionManager.java deleted file mode 100644 index 64fe6417..00000000 --- a/src/services/modules/login/impl/src/main/java/org/geoserver/geofence/login/util/SessionManager.java +++ /dev/null @@ -1,110 +0,0 @@ -/* (c) 2014 - 2017 Open Source Geospatial Foundation - all rights reserved - * This code is licensed under the GPL 2.0 license, available at the root - * application directory. - */ - -package org.geoserver.geofence.login.util; - -import java.util.LinkedHashMap; -import java.util.Map; - -import org.geoserver.geofence.api.dto.GrantedAuths; -import org.geoserver.geofence.api.exception.AuthException; - -import org.apache.log4j.LogManager; -import org.apache.log4j.Logger; - -/** - * - * @author etj - */ -public class SessionManager -{ - - private static final Logger LOGGER = LogManager.getLogger(SessionManager.class); - - private static final int MAXSESSIONS = 100; - - private final SessionMap activeSessions = new SessionMap(MAXSESSIONS); - - public String createSession(String username, GrantedAuths grantedAuths) - { - - String token = TokenEncoder.encode(username + grantedAuths.hashCode(), ("" + - System.nanoTime() + "" + System.currentTimeMillis()).substring(0, 16)); - - LoggedInMember loggedInMember = new LoggedInMember(); - loggedInMember.grantedAuths = grantedAuths; - loggedInMember.username = username; - activeSessions.put(token, loggedInMember); - - return token; - } - - public void closeSession(String token) - { - LoggedInMember member = activeSessions.remove(token); - if (member == null) - { - LOGGER.warn("Tried to close non existent session. Token " + token); - } - else - { - LOGGER.info("Closing session for user [" + member.username + "] token " + token); - } - } - - public GrantedAuths getGrantedAuthorities(String token) throws AuthException - { - LoggedInMember loggedInMember = activeSessions.get(token); - if (loggedInMember != null) - { - return loggedInMember.grantedAuths; - } - else - { - throw new AuthException("No active session for token " + token); - } - } - - private static class LoggedInMember - { - public GrantedAuths grantedAuths; - - public String username; - } - - /** - * If too many sessions, throw away the older ones. Todo: has to be improved and made - * customizable. - */ - class SessionMap extends LinkedHashMap - { - - private final int MAX_ENTRIES; - - public SessionMap(int maxEntries) - { - this.MAX_ENTRIES = maxEntries; - } - - @Override - protected boolean removeEldestEntry(Map.Entry eldest) - { - if (size() > MAX_ENTRIES) - { - LoggedInMember member = (LoggedInMember) eldest.getValue(); - LOGGER.info("Removing stale token " + eldest.getKey() + " for member " + - member.username); - - // todo: have to logout related member? - return true; - } - else - { - return false; - } - } - } - -} diff --git a/src/services/modules/login/impl/src/main/java/org/geoserver/geofence/login/util/TokenEncoder.java b/src/services/modules/login/impl/src/main/java/org/geoserver/geofence/login/util/TokenEncoder.java deleted file mode 100644 index 4808730b..00000000 --- a/src/services/modules/login/impl/src/main/java/org/geoserver/geofence/login/util/TokenEncoder.java +++ /dev/null @@ -1,101 +0,0 @@ -/* (c) 2014 Open Source Geospatial Foundation - all rights reserved - * This code is licensed under the GPL 2.0 license, available at the root - * application directory. - */ - -package org.geoserver.geofence.login.util; - -import java.security.InvalidKeyException; -import java.security.NoSuchAlgorithmException; - -import javax.crypto.BadPaddingException; -import javax.crypto.Cipher; -import javax.crypto.IllegalBlockSizeException; -import javax.crypto.NoSuchPaddingException; -import javax.crypto.spec.SecretKeySpec; - -import org.apache.commons.codec.binary.Base64; - - -/** - * - * @author ETj (etj at geo-solutions.it) - */ -public class TokenEncoder -{ - - // // 123456789 123456789 123456789 12 - // private static final byte[] KEY = - // "installation dependant key needed".substring(0,16).getBytes(); - - public static String encode(String msg, String key) - { - try - { - SecretKeySpec keySpec = new SecretKeySpec(key.getBytes(), "AES"); - Cipher cipher = Cipher.getInstance("AES"); - cipher.init(Cipher.ENCRYPT_MODE, keySpec); - - byte[] input = msg.getBytes(); - byte[] encrypted = cipher.doFinal(input); - byte[] output = Base64.encodeBase64(encrypted); - - return new String(output); - } - catch (NoSuchAlgorithmException ex) - { - throw new RuntimeException("Error while encoding", ex); - } - catch (NoSuchPaddingException ex) - { - throw new RuntimeException("Error while encoding", ex); - } - catch (IllegalBlockSizeException ex) - { - throw new RuntimeException("Error while encoding", ex); - } - catch (BadPaddingException ex) - { - throw new RuntimeException("Error while encoding", ex); - } - catch (InvalidKeyException ex) - { - throw new RuntimeException("Error while encoding", ex); - } - } - - public static String decode(String msg, String key) - { - try - { - SecretKeySpec keySpec = new SecretKeySpec(key.getBytes(), "AES"); - Cipher cipher = Cipher.getInstance("AES"); - cipher.init(Cipher.DECRYPT_MODE, keySpec); - - byte[] de64 = Base64.decodeBase64(msg); - byte[] decrypted = cipher.doFinal(de64); - - return new String(decrypted); - } - catch (NoSuchAlgorithmException ex) - { - throw new RuntimeException("Error while encoding", ex); - } - catch (NoSuchPaddingException ex) - { - throw new RuntimeException("Error while encoding", ex); - } - catch (IllegalBlockSizeException ex) - { - throw new RuntimeException("Error while encoding", ex); - } - catch (BadPaddingException ex) - { - throw new RuntimeException("Error while encoding", ex); - } - catch (InvalidKeyException ex) - { - throw new RuntimeException("Error while encoding", ex); - } - } -} diff --git a/src/services/modules/login/impl/src/main/resources/applicationContext.xml b/src/services/modules/login/impl/src/main/resources/applicationContext.xml deleted file mode 100644 index a267f1ab..00000000 --- a/src/services/modules/login/impl/src/main/resources/applicationContext.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/src/services/modules/login/impl/src/test/java/org/geoserver/geofence/login/util/MD5UtilTest.java b/src/services/modules/login/impl/src/test/java/org/geoserver/geofence/login/util/MD5UtilTest.java deleted file mode 100644 index e46ce035..00000000 --- a/src/services/modules/login/impl/src/test/java/org/geoserver/geofence/login/util/MD5UtilTest.java +++ /dev/null @@ -1,28 +0,0 @@ -/* (c) 2015 Open Source Geospatial Foundation - all rights reserved - * This code is licensed under the GPL 2.0 license, available at the root - * application directory. - */ -package org.geoserver.geofence.login.util; - -import org.junit.Test; -import static org.junit.Assert.*; - -/** - * - * @author ETj (etj at geo-solutions.it) - */ -public class MD5UtilTest { - - /** - * Test of getHash method, of class MD5Util. - */ - @Test - public void testGetHash() { - System.out.println("getHash"); - String password = "test"; - String expResult = "098f6bcd4621d373cade4e832627b4f6"; - String result = MD5Util.getHash(password); - assertEquals(expResult, result); - } - -} diff --git a/src/services/modules/login/impl/src/test/resources/applicationContext-test.xml b/src/services/modules/login/impl/src/test/resources/applicationContext-test.xml deleted file mode 100644 index f12d4e91..00000000 --- a/src/services/modules/login/impl/src/test/resources/applicationContext-test.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - diff --git a/src/services/modules/login/pom.xml b/src/services/modules/login/pom.xml deleted file mode 100644 index c6579227..00000000 --- a/src/services/modules/login/pom.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - 4.0.0 - - - org.geoserver.geofence - geofence-modules - 3.5-SNAPSHOT - - - org.geoserver.geofence - geofence-login-parent - pom - GeoFence - Modules - Login - - - api - impl - - - diff --git a/src/services/pom.xml b/src/services/pom.xml deleted file mode 100644 index 57e673b5..00000000 --- a/src/services/pom.xml +++ /dev/null @@ -1,965 +0,0 @@ - - - - 4.0.0 - - - org.geoserver.geofence - geofence - 3.5-SNAPSHOT - - - org.geoserver.geofence - geofence-root - 3.5-SNAPSHOT - pom - - GeoFence - 0 Services - - - core - modules - - - - 3.5-SNAPSHOT - geofence - - 22-SNAPSHOT - - 3.3.2 - - - 5.1.1.RELEASE - 5.1.5.RELEASE - - - - - - - - - - - 2.7.0 - 2.8.1 - 1.3.03 - 2.1 - - 5.4.3.Final - - 1.1.0 - - 42.1.1 - 1.3.3 - - - 1.1 - 4.0 - - 1.6.1 - - - - 3.1.0.2-fuse - - 1.5.4 - 2.0 - 9.2.13.v20150730 - - - 2.2.3 - 2.2 - - 3.8.0.GA - - - - - - - - - - - - - - - - - org.geoserver.geofence - geofence-model-internal - ${geofence-version} - - - - org.geoserver.geofence - geofence-model - ${geofence-version} - - - - org.geoserver.geofence - geofence-persistence - ${geofence-version} - - - - org.geoserver.geofence - geofence-services-api - ${geofence-version} - - - - org.geoserver.geofence - geofence-services-impl - ${geofence-version} - - - - - - - org.geoserver.geofence - geofence-modules - ${geofence-version} - - - - org.geoserver.geofence - geofence-generic-api - ${geofence-version} - - - - org.geoserver.geofence - geofence-login-parent - ${geofence-version} - - - - org.geoserver.geofence - geofence-login-api - ${geofence-version} - - - - org.geoserver.geofence - geofence-login-impl - ${geofence-version} - - - - org.geoserver.geofence - geofence-rest-root - ${geofence-version} - - - - org.geoserver.geofence - geofence-rest - ${geofence-version} - - - - org.geoserver.geofence - geofence-rest-api - ${geofence-version} - - - - org.geoserver.geofence - geofence-rest-impl - ${geofence-version} - - - - org.geoserver.geofence - geofence-rest-test - ${geofence-version} - - - - org.geoserver.geofence - geofence-ldap - ${geofence-version} - - - - - - - it.geosolutions - geoserver-manager - 1.3.3-SNAPSHOT - - - - - - - quartz - quartz - 1.5.2 - - - javassist - javassist - ${javassist-version} - runtime - - - - - - - - - - - log4j - log4j - 1.2.17 - - - - - - - - - - dom4j - dom4j - ${dom4j-version} - - - - org.jdom - jdom - 1.1.3 - - - - - - - - commons-lang - commons-lang - 2.6 - - - commons-io - commons-io - 2.6 - - - commons-httpclient - commons-httpclient - 3.1 - - - commons-dbcp - commons-dbcp - 1.4 - - - commons-beanutils - commons-beanutils - 1.9.3 - - - commons-collections - commons-collections - 3.2.2 - - - commons-codec - commons-codec - 1.12 - - - - commons-logging - commons-logging - 1.2 - - - - - - - javax.xml.ws - jaxws-api - ${jaxws-version} - - - javax.jws - jsr181-api - - - - - - org.apache.cxf - cxf-rt-transports-http - ${cxf-version} - - - org.apache.cxf - cxf-rt-transports-http-jetty - ${cxf-version} - - - org.apache.cxf - cxf-rt-frontend-jaxws - ${cxf-version} - - - org.apache.geronimo.specs - geronimo-annotation_1.0_spec - - - org.apache.geronimo.specs - geronimo-javamail_1.4_spec - - - - - org.apache.cxf - cxf-rt-bindings-soap - ${cxf-version} - - - org.apache.geronimo.specs - geronimo-javamail_1.4_spec - - - - - org.apache.cxf - cxf-rt-databinding-aegis - ${cxf-version} - - - org.apache.cxf - cxf-rt-frontend-jaxrs - ${cxf-version} - - - org.apache.cxf - cxf-rt-ws-security - ${cxf-version} - - - org.apache.cxf - cxf-core - ${cxf-version} - - - org.apache.cxf - cxf-rt-rs-client - ${cxf-version} - - - org.apache.cxf - cxf-rt-rs-extension-providers - ${cxf-version} - - - - - - - - - - - - - - - - javax.xml.bind - jaxb-api - 2.4.0-b180830.0359 - - - org.glassfish.jaxb - jaxb-runtime - 2.4.0-b180830.0438 - - - - - com.sun.xml.ws - jaxws-rt - 2.3.2 - pom - - - com.sun.xml.ws - jaxws-ri - 2.3.2 - pom - - - com.sun.xml.ws - rt - 2.3.2 - - - - javax.annotation - javax.annotation-api - 1.3.2 - - - - - - - - org.springframework - spring-framework-bom - ${spring-version} - pom - import - - - - - - - - - org.springframework.security - spring-security-bom - ${spring-security-version} - pom - import - - - - org.springframework.ldap - spring-ldap-core - 2.3.2.RELEASE - - - org.springframework.ldap - spring-ldap-test - 2.3.2.RELEASE - - - - - - - javax.servlet - servlet-api - 2.3 - provided - - - - - - - asm - asm - 3.3.1 - - - cglib - cglib - 3.2.12 - - - cglib - cglib-nodep - 3.2.12 - - - - - - - - org.codehaus.jettison - jettison - 1.4.0 - - - - org.aspectj - aspectjrt - ${aspectj-version} - - - org.aspectj - aspectjweaver - ${aspectj-version} - - - - - - - junit - junit - 4.13 - test - - - - - - - - - - - - - - org.hibernate - hibernate-core - ${hibernate-version} - - - - org.hibernate - hibernate-jcache - ${hibernate-version} - - - - org.hibernate - hibernate-spatial - ${hibernate-version} - - - - - - - - - - - org.postgis - postgis-jdbc - ${postgis.jdbc.version} - - - org.postgis - postgis-stubs - - - - - org.postgresql - postgresql - ${postgresql.jdbc.version} - - - - - - com.h2database - h2 - 1.4.200 - - - - - - - - org.locationtech.jts - jts-core - 1.16.1 - - - - - - - - - - - - org.geotools - gt-main - ${gt-version} - - - org.geotools - gt-api - ${gt-version} - - - org.geotools - gt-referencing - ${gt-version} - - - org.geotools - gt-metadata - ${gt-version} - - - org.geotools - gt-epsg-hsql - ${gt-version} - - - org.geotools - gt-epsg-h2 - ${gt-version} - - - org.geotools - gt-epsg-extension - ${gt-version} - - - org.geotools - gt-geotiff - ${gt-version} - - - org.geotools - gt-coveragetools - ${gt-version} - - - org.geotools - gt-shapefile - ${gt-version} - - - org.geotools.jdbc - gt-jdbc-postgis - ${gt-version} - - - org.geotools.jdbc - gt-jdbc-oracle - ${gt-version} - - - org.geotools - gt-epsg-wkt - ${gt-version} - - - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 3.8.1 - - 11 - true - UTF-8 - true - - - - - org.apache.maven.plugins - maven-resources-plugin - 3.1.0 - - UTF-8 - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.22.2 - - - - - - - - - org.apache.maven.wagon - wagon-ftp - 3.3.3 - - - - - - - - - geosolutions - GeoSolutions Repository - http://maven.geo-solutions.it - - - - - - - - - - - - - - spring-release - Spring Portfolio Release Repository - http://maven.springframework.org/release - - false - - - - spring-external - Spring Portfolio External Repository - http://maven.springframework.org/external - - false - - - - - - - - - boundless - Boundless Maven Repository - http://repo.boundlessgeo.com/main/ - - true - - - - - osgeo - Open Source Geospatial Foundation Repository - http://download.osgeo.org/webdav/geotools/ - - true - - - - - - - - apache.snapshots - Apache Snapshots Repository - http://people.apache.org/repo/m2-snapshot-repository - - true - - - false - - - - - apache.incubating - Apache Incubating Repository - http://people.apache.org/repo/m2-incubating-repository - - false - - - true - - - - - - - - - - - - -