From: Martin Stockhammer <martin_s@apache.org>
Date: Thu, 18 May 2017 19:47:01 +0000 (+0200)
Subject: [MRM-1942] Merge branch 'jpa' into master
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=acc02bf9620de9e82ae36fbb3867e84a1bd1ccf1;p=archiva.git

[MRM-1942] Merge branch 'jpa' into master

Removing JDO and add JPA backend.
---

acc02bf9620de9e82ae36fbb3867e84a1bd1ccf1
diff --cc archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
index 122db4f3d,5b8e0c7b7..eb4dc0351
--- 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
diff --cc pom.xml
index 92197f8aa,733184cc5..9057c531d
--- 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>