[MRM-1942] Merge branch 'jpa' into master Removing JDO and add JPA backend.
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/acc02bf9 Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/acc02bf9 Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/acc02bf9 Branch: refs/heads/master Commit: acc02bf9620de9e82ae36fbb3867e84a1bd1ccf1 Parents: 0533158 dd31184 Author: Martin Stockhammer <[email protected]> Authored: Thu May 18 21:47:01 2017 +0200 Committer: Martin Stockhammer <[email protected]> Committed: Sat May 20 23:15:10 2017 +0200 ---------------------------------------------------------------------- ...pring-context-cleanup-released-snapshots.xml | 37 +++++++++++- .../spring-context-purge-consumer-test.xml | 37 +++++++++++- .../src/test/resources/spring-context.xml | 37 +++++++++++- .../archiva-base/archiva-indexer/pom.xml | 5 ++ .../src/test/resources/spring-context.xml | 37 +++++++++++- .../archiva-base/archiva-proxy/pom.xml | 6 ++ .../src/test/resources/spring-context.xml | 36 +++++++++++- .../archiva-repository-admin-default/pom.xml | 6 ++ .../src/test/resources/spring-context.xml | 37 +++++++++++- .../archiva-scheduler-indexing/pom.xml | 6 ++ .../src/test/resources/spring-context.xml | 37 +++++++++++- .../archiva-rest/archiva-rest-services/pom.xml | 12 ++++ ...faultRedbackRuntimeConfigurationService.java | 5 +- .../RedbackRuntimeConfigurationServiceTest.java | 8 +-- .../resources/META-INF/spring-context-test.xml | 39 ++++++++++++- .../src/test/resources/spring-context.xml | 36 +++++++++++- .../archiva-web/archiva-web-common/pom.xml | 12 ++++ .../ArchivaConfigurableUsersManager.java | 4 +- .../web/security/ArchivaRbacManager.java | 14 +++++ .../ArchivaUserManagerAuthenticator.java | 1 + .../main/resources/META-INF/spring-context.xml | 2 +- .../org/apache/archiva/i18n/default.properties | 2 +- .../archiva/web/rss/SecuritySystemStub.java | 4 +- .../spring-context-artifacts-download.xml | 1 - .../resources/spring-context-test-common.xml | 38 ++++++++++++- .../test/resources/spring-context-with-jcr.xml | 37 +++++++++++- .../archiva-web/archiva-webapp/pom.xml | 35 ++++++++++++ .../main/resources/META-INF/spring-context.xml | 20 ++++++- .../main/webapp/WEB-INF/applicationContext.xml | 59 +++++++++----------- .../archiva/admin/features/generaladmin/main.js | 12 +++- .../src/main/webapp/js/archiva/main.js | 5 +- .../src/test/tomcat/log4j2-test.xml | 9 ++- .../src/test/tomcat/tomcat-context-archiva.xml | 7 ++- .../archiva-web/archiva-webdav/pom.xml | 5 ++ .../spring-context-servlet-security-test.xml | 38 ++++++++++++- .../src/test/resources/spring-context.xml | 38 ++++++++++++- pom.xml | 13 +++++ 37 files changed, 653 insertions(+), 84 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva/blob/acc02bf9/archiva-modules/archiva-base/archiva-indexer/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva/blob/acc02bf9/archiva-modules/archiva-base/archiva-proxy/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva/blob/acc02bf9/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva/blob/acc02bf9/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva/blob/acc02bf9/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva/blob/acc02bf9/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva/blob/acc02bf9/archiva-modules/archiva-web/archiva-web-common/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva/blob/acc02bf9/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties ---------------------------------------------------------------------- diff --cc archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties index 122db4f,5b8e0c7..eb4dc03 --- a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties @@@ -677,17 -671,9 +677,17 @@@ redback.runtime.ldap.checkServer=Verif redback.runtime.useUsersCache.label=Use a cache for users. redback.runtime.users.cache.title=Users Cache +ldap.config.dn.help.content=The name of the attribute containing the DN +ldap.config.user.attribute.help.content=The name of the RDN attribute in the DN of the user object containing the User-ID (e.g. for cn=usr1,ou=users,ou=tst,ou=org, the value would be cn) +redback.default.role.guest.id.help.content=The User-ID of the guest user +rest.baseUrl.help.content=URL that is used as base url for validating REST requests. If empty, the URL ist determined automatically. +rest.csrffilter.absentorigin.deny.help.content=If true and no Origin/Referer header can be found on REST requests, the requests will be denied. Default: true. +rest.csrffilter.disableTokenValidation.help.content=If true, token based origin validation of REST requests will be omitted. Default: false. +rest.csrffilter.enabled.help.content=If true, validation of REST requests will be validated based on header values, otherwise no validation is done at all. Default: true. + archiva.redback.rbacmanager.ldap=LDAP RBac Manager archiva.redback.rbacmanager.jdo=Database RBac Manager - archiva.redback.rbackmanager.jpa=Database JPA RBac Manager + archiva.redback.rbacmanager.jpa=Database JPA RBac Manager archiva.redback.rbacmanager.cached=Cached RBac Manager redback.runtime.rbac-managers.impls.chose=RbacManager(s) chosen redback.runtime.rbac-managers.impls.available=Available RbacManagers http://git-wip-us.apache.org/repos/asf/archiva/blob/acc02bf9/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/SecuritySystemStub.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva/blob/acc02bf9/archiva-modules/archiva-web/archiva-webapp/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva/blob/acc02bf9/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva/blob/acc02bf9/archiva-modules/archiva-web/archiva-webdav/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva/blob/acc02bf9/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index 92197f8,733184c..9057c53 --- a/pom.xml +++ b/pom.xml @@@ -86,8 -89,9 +86,9 @@@ <httpclient.version>4.5.2</httpclient.version> <httpclient.core.version>4.4.4</httpclient.core.version> <javaxMailVersion>1.4</javaxMailVersion> - <jettyVersion>8.1.14.v20131031</jettyVersion> + <jettyVersion>9.4.5.v20170502</jettyVersion> <guava.version>16.0.1</guava.version> + <openjpaVersion>2.4.1</openjpaVersion> <!-- restore when we will be able to use a derby in memory database --> <redbackTestJdbcUrl>jdbc:derby:memory:users-test;create=true</redbackTestJdbcUrl>
