You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2017/05/21 21:47:21 UTC
[36/40] archiva-redback-core git commit: [MRM-1942] Merge branch
'jpa' into master
[MRM-1942] Merge branch 'jpa' into master
Removing JDO and add JPA backend.
Project: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/commit/3e737623
Tree: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/tree/3e737623
Diff: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/diff/3e737623
Branch: refs/heads/master
Commit: 3e73762394634248190155264e656cdba43d7f34
Parents: de4bdc3 d45870b
Author: Martin Stockhammer <ma...@apache.org>
Authored: Fri May 19 21:47:48 2017 +0200
Committer: Martin Stockhammer <ma...@apache.org>
Committed: Fri May 19 21:47:48 2017 +0200
----------------------------------------------------------------------
pom.xml | 127 +---
.../src/test/resources/spring-context.xml | 30 +-
.../src/test/resources/spring-context.xml | 37 +-
redback-common/pom.xml | 5 +-
redback-common/redback-common-jdo/pom.xml | 116 ---
.../common/jdo/UserConfigurableJdoFactory.java | 132 ----
.../common/jdo/test/StoreManagerDebug.java | 113 ---
.../main/resources/META-INF/spring-context.xml | 35 -
redback-common/redback-common-jpa/pom.xml | 57 ++
.../resources/META-INF/persistence-hsqldb.xml | 44 ++
.../src/main/resources/META-INF/persistence.xml | 40 ++
.../archiva/redback/config-defaults.properties | 2 +-
redback-data-management/pom.xml | 10 +-
.../management/JdoDataManagementTool.java | 307 --------
.../redback/management/DataManagementTest.java | 22 +-
.../src/test/resources/spring-context.xml | 48 +-
.../integration/mail/MailGeneratorTest.java | 40 +-
.../src/test/resources/spring-context.xml | 50 +-
.../redback-rest/redback-rest-services/pom.xml | 4 +
.../rest/services/DefaultLoginService.java | 4 +-
.../services/FakeCreateAdminServiceImpl.java | 4 +-
.../src/test/resources/security.properties | 2 +-
.../src/test/resources/spring-context.xml | 36 +-
redback-keys/redback-keys-providers/pom.xml | 2 +-
.../redback-keys-cached/pom.xml | 6 +-
.../redback/keys/cached/CachedKeyManager.java | 2 +-
.../src/test/resources/spring-context.xml | 44 +-
.../redback-keys-jdo/pom.xml | 170 -----
.../archiva/redback/keys/jdo/JdoKeyManager.java | 187 -----
.../redback-keys-jdo/src/main/mdo/keys.mdo | 89 ---
.../main/resources/META-INF/spring-context.xml | 32 -
.../redback/keys/jdo/JdoKeyManagerTest.java | 102 ---
.../src/test/resources/spring-context.xml | 48 --
.../redback-keys-jpa/pom.xml | 118 +++
.../archiva/redback/keys/jpa/JpaKeyManager.java | 176 +++++
.../keys/jpa/model/JpaAuthenticationKey.java | 108 +++
.../src/main/resources/spring-context.xml | 33 +
.../redback/keys/jpa/JpaKeyManagerTest.java | 65 ++
.../src/test/resources/spring-context.xml | 61 ++
.../redback/keys/KeyManagerTestCase.java | 10 +-
redback-rbac/redback-rbac-providers/pom.xml | 2 +-
.../redback-rbac-cached/pom.xml | 2 +-
.../redback/rbac/cached/CachedRbacManager.java | 2 +-
.../src/test/resources/spring-context.xml | 48 +-
.../redback-rbac-jdo/pom.xml | 156 ----
.../redback/rbac/jdo/JdoRbacManager.java | 711 -------------------
.../archiva/redback/rbac/jdo/JdoTool.java | 500 -------------
.../redback-rbac-jdo/src/main/mdo/rbac-jdo.mdo | 337 ---------
.../main/resources/META-INF/spring-context.xml | 34 -
.../redback/rbac/jdo/JdoRbacManagerTest.java | 219 ------
.../redback/rbac/jdo/RbacJdoModelStaxTest.java | 198 ------
.../src/test/resources/ehcache.xml | 90 ---
.../src/test/resources/spring-context.xml | 53 --
.../redback-rbac-jpa/pom.xml | 107 +++
.../redback/rbac/jpa/JpaRbacManager.java | 488 +++++++++++++
.../redback/rbac/jpa/model/JpaOperation.java | 91 +++
.../redback/rbac/jpa/model/JpaPermission.java | 123 ++++
.../redback/rbac/jpa/model/JpaResource.java | 91 +++
.../archiva/redback/rbac/jpa/model/JpaRole.java | 176 +++++
.../rbac/jpa/model/JpaUserAssignment.java | 121 ++++
.../main/resources/META-INF/spring-context.xml | 30 +
.../redback/rbac/jpa/JpaRbacManagerTest.java | 135 ++++
.../src/test/resources/spring-context.xml | 67 ++
.../src/test/resources/test.properties | 17 +
.../redback-rbac-ldap/pom.xml | 4 -
.../src/test/resources/spring-context.xml | 48 +-
.../src/test/resources/spring-context.xml | 49 +-
redback-rbac/redback-rbac-role-manager/pom.xml | 9 -
.../redback/role/JpoxRoleManagerTest.java | 36 +-
.../src/test/resources/jpox-spring-context.xml | 31 +-
.../src/test/resources/spring-context.xml | 48 +-
.../src/test/resources/spring-context.xml | 40 +-
redback-users/redback-users-providers/pom.xml | 2 +-
.../redback-users-cached/pom.xml | 8 +-
.../src/test/resources/spring-context.xml | 30 +-
.../redback-users-jdo/pom.xml | 176 -----
.../redback/users/jdo/JdoUserManager.java | 466 ------------
.../archiva/redback/users/jdo/JdoUserQuery.java | 136 ----
.../archiva/redback/users/jdo/Messages.java | 94 ---
.../redback-users-jdo/src/main/mdo/user.mdo | 162 -----
.../main/resources/META-INF/spring-context.xml | 33 -
.../redback/users/jdo/messages.properties | 18 -
.../redback/users/jdo/JdoUserManagerTest.java | 117 ---
.../src/test/resources/spring-context.xml | 58 --
.../src/test/resources/test.properties | 17 -
.../redback-users-jpa/pom.xml | 108 +++
.../redback/users/jpa/JpaUserManager.java | 352 +++++++++
.../archiva/redback/users/jpa/JpaUserQuery.java | 123 ++++
.../redback/users/jpa/model/JpaUser.java | 259 +++++++
.../main/resources/META-INF/spring-context.xml | 31 +
.../redback/users/jpa/JpaUserManagerTest.java | 94 +++
.../src/test/resources/spring-context.xml | 80 +++
.../src/test/resources/test.properties | 17 +
.../test/AbstractUserManagerTestCase.java | 2 +
94 files changed, 3692 insertions(+), 5272 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/3e737623/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 8921f5a,c784aa5..db7edcc
--- a/pom.xml
+++ b/pom.xml
@@@ -71,9 -71,9 +71,9 @@@
</distributionManagement>
<properties>
- <springVersion>4.2.1.RELEASE</springVersion>
+ <springVersion>4.3.5.RELEASE</springVersion>
<slf4jVersion>1.7.12</slf4jVersion>
- <log4j2Version>2.7</log4j2Version>
+ <log4j2Version>2.8.2</log4j2Version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<gpg.useagent>true</gpg.useagent>
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/3e737623/redback-common/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/3e737623/redback-configuration/src/main/resources/org/apache/archiva/redback/config-defaults.properties
----------------------------------------------------------------------
diff --cc redback-configuration/src/main/resources/org/apache/archiva/redback/config-defaults.properties
index 8a3a199,78ff047..40c94fd
--- a/redback-configuration/src/main/resources/org/apache/archiva/redback/config-defaults.properties
+++ b/redback-configuration/src/main/resources/org/apache/archiva/redback/config-defaults.properties
@@@ -130,24 -130,7 +130,24 @@@ ldap.bind.authenticator.enabled=fals
#ldap.config.authentication.method=
# config parameter for the ConfigurableUserManager
- user.manager.impl=jdo
+ user.manager.impl=jpa
-
+# REST security settings
+
+# Cross Site Request Forgery (CSRF) Prevention
+# --------------------------------------------
+# Enable/Disable CSRF filtering.
+# Possible values: true, false
+rest.csrffilter.enabled=true
+# Base URL used to verify the origin headers of the requests. If not set or empty
+# it tries to determine the base url automatically
+rest.baseUrl=
+# What to do, if the request contains no Origin or Referer header.
+# If true, requests without Origin or Referer Header are denied, otherwise accepted.
+# Possible values: true, false
+rest.csrffilter.absentorigin.deny=true
+# Enable/Disable the token validation only.
+# If true, the validation of the CSRF tokens will be disabled.
+# Possible values: true, false
+rest.csrffilter.disableTokenValidation=false
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/3e737623/redback-data-management/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/3e737623/redback-integrations/redback-rest/redback-rest-services/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/3e737623/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultLoginService.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/3e737623/redback-integrations/redback-rest/redback-rest-services/src/test/resources/security.properties
----------------------------------------------------------------------
diff --cc redback-integrations/redback-rest/redback-rest-services/src/test/resources/security.properties
index 5f1aedc,aae250b..c16b4c7
--- a/redback-integrations/redback-rest/redback-rest-services/src/test/resources/security.properties
+++ b/redback-integrations/redback-rest/redback-rest-services/src/test/resources/security.properties
@@@ -16,5 -16,4 +16,5 @@@
# specific language governing permissions and limitations
# under the License.
#
- user.manager.impl=jdo
-user.manager.impl=jpa
+rest.csrffilter.disableTokenValidation=true
++user.manager.impl=jpa
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/3e737623/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml
----------------------------------------------------------------------
diff --cc redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml
index 80f585f,a790bf1..8e84dca
--- a/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml
+++ b/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml
@@@ -19,30 -19,28 +19,30 @@@
~ under the License.
-->
<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd">
- <bean name="userConfiguration#default" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration"
- init-method="initialize">
- <property name="configs">
- <list>
- <value>src/test/resources/security.properties</value>
- </list>
- </property>
- <property name="registry" ref="registry#commons-configuration"/>
+ <alias name="userConfiguration#redback" alias="userConfiguration#default"/>
- </bean>
- <bean name="registry#commons-configuration" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry"
+ <bean name="commons-configuration" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry"
init-method="initialize">
-
+ <property name="properties">
+ <value>
+ <![CDATA[
+ <configuration>
+ <system/>
+ <properties fileName="${basedir}/src/test/resources/security.properties" config-optional="true"
+ config-at="org.apache.archiva.redback"/>
+ </configuration>
+ ]]>
+ </value>
+ </property>
</bean>
- <alias name="userConfiguration#redback" alias="userConfiguration#default"/>
+
<alias name="authorizer#rbac" alias="authorizer#default"/>
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/3e737623/redback-keys/redback-keys-providers/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/3e737623/redback-keys/redback-keys-providers/redback-keys-cached/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/3e737623/redback-rbac/redback-rbac-providers/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/3e737623/redback-rbac/redback-rbac-providers/redback-rbac-cached/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/3e737623/redback-rbac/redback-rbac-providers/redback-rbac-ldap/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/3e737623/redback-rbac/redback-rbac-role-manager/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/3e737623/redback-users/redback-users-providers/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/3e737623/redback-users/redback-users-providers/redback-users-cached/pom.xml
----------------------------------------------------------------------