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 2019/12/21 16:10:47 UTC
[archiva-redback-core] branch master updated (2ec4862 -> 65a390b)
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-core.git.
from 2ec4862 Merge pull request #15 from lzf971107/patch-1
new adbc0e5 Using runtime scope for openjpa
new 65a390b Cleaning up dependencies for rbac
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 12 ++++
.../redback-authorization-rbac/pom.xml | 7 ++-
redback-common/redback-common-jpa/pom.xml | 1 +
.../redback/management/DataManagementTest.java | 3 +-
.../redback-rest/redback-rest-services/pom.xml | 5 ++
.../redback-rbac-cached/pom.xml | 44 ++++++++------
.../src/test/resources/log4j2-test.xml | 6 +-
.../redback-rbac-jpa/pom.xml | 55 +++++++++++++----
.../archiva/redback/rbac/jpa/JpaRbacManager.java | 29 ++++++---
.../src/test/resources/log4j2-test.xml | 6 +-
.../redback-rbac-ldap/pom.xml | 71 ++++++++++++++++------
.../archiva/redback/rbac/ldap/LdapRbacManager.java | 2 +-
.../src/test/resources/log4j2-test.xml | 6 +-
.../redback-rbac-memory/pom.xml | 48 ++++++++++++---
.../redback/rbac/memory/MemoryRbacManager.java | 2 +-
.../src/test/resources/log4j2-test.xml | 6 +-
redback-rbac/redback-rbac-role-manager/pom.xml | 49 +++++++++------
...oleManagerTest.java => JpaRoleManagerTest.java} | 6 +-
...x-spring-context.xml => jpa-spring-context.xml} | 2 +-
.../src/test/resources/log4j2-test.xml | 27 ++++----
redback-rbac/redback-rbac-tests/pom.xml | 13 ++--
.../redback-users-ldap/pom.xml | 2 +-
22 files changed, 279 insertions(+), 123 deletions(-)
copy {redback-common/redback-common-ldap => redback-rbac/redback-rbac-providers/redback-rbac-cached}/src/test/resources/log4j2-test.xml (80%)
copy {redback-common/redback-common-ldap => redback-rbac/redback-rbac-providers/redback-rbac-jpa}/src/test/resources/log4j2-test.xml (80%)
copy {redback-common/redback-common-ldap => redback-rbac/redback-rbac-providers/redback-rbac-ldap}/src/test/resources/log4j2-test.xml (80%)
copy {redback-common/redback-common-ldap => redback-rbac/redback-rbac-providers/redback-rbac-memory}/src/test/resources/log4j2-test.xml (80%)
rename redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/{JpoxRoleManagerTest.java => JpaRoleManagerTest.java} (93%)
rename redback-rbac/redback-rbac-role-manager/src/test/resources/{jpox-spring-context.xml => jpa-spring-context.xml} (97%)
[archiva-redback-core] 02/02: Cleaning up dependencies for rbac
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-core.git
commit 65a390be75b23a9bb5228d2faf20a32a2425300e
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Sat Dec 21 14:55:21 2019 +0100
Cleaning up dependencies for rbac
---
pom.xml | 12 ++++
.../redback-authorization-rbac/pom.xml | 7 ++-
.../redback/management/DataManagementTest.java | 3 +-
.../redback-rest/redback-rest-services/pom.xml | 5 ++
.../redback-rbac-cached/pom.xml | 44 ++++++++------
.../src/test/resources/log4j2-test.xml | 27 ++++----
.../redback-rbac-jpa/pom.xml | 55 +++++++++++++----
.../archiva/redback/rbac/jpa/JpaRbacManager.java | 29 ++++++---
.../src/test/resources/log4j2-test.xml | 27 ++++----
.../redback-rbac-ldap/pom.xml | 71 ++++++++++++++++------
.../archiva/redback/rbac/ldap/LdapRbacManager.java | 2 +-
.../src/test/resources/log4j2-test.xml | 27 ++++----
.../redback-rbac-memory/pom.xml | 48 ++++++++++++---
.../redback/rbac/memory/MemoryRbacManager.java | 2 +-
.../src/test/resources/log4j2-test.xml | 27 ++++----
redback-rbac/redback-rbac-role-manager/pom.xml | 49 +++++++++------
...oleManagerTest.java => JpaRoleManagerTest.java} | 6 +-
...x-spring-context.xml => jpa-spring-context.xml} | 2 +-
.../src/test/resources/log4j2-test.xml | 27 ++++----
redback-rbac/redback-rbac-tests/pom.xml | 13 ++--
.../redback-users-ldap/pom.xml | 2 +-
21 files changed, 318 insertions(+), 167 deletions(-)
diff --git a/pom.xml b/pom.xml
index bb153ac..f11444f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -388,6 +388,11 @@
<artifactId>archiva-components-spring-registry-commons</artifactId>
<version>${archiva.comp.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.archiva.components</groupId>
+ <artifactId>archiva-components-graph</artifactId>
+ <version>${archiva.comp.version}</version>
+ </dependency>
<!-- Other -->
<dependency>
<groupId>org.apache.commons</groupId>
@@ -712,6 +717,12 @@
<artifactId>log4j-jcl</artifactId>
<version>2.9.1</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa</artifactId>
+ <version>${openjpa.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -843,6 +854,7 @@
<configuration>
<argLine>-Xmx256m -Xms256m</argLine>
<runOrder>alphabetical</runOrder>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration>
</plugin>
<plugin>
diff --git a/redback-authorization/redback-authorization-providers/redback-authorization-rbac/pom.xml b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/pom.xml
index d942833..4de7eb4 100644
--- a/redback-authorization/redback-authorization-providers/redback-authorization-rbac/pom.xml
+++ b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/pom.xml
@@ -77,9 +77,14 @@
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
- </dependency>
+ </dependency>
<dependency>
+ <groupId>org.apache.archiva.redback</groupId>
+ <artifactId>redback-users-cached</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-launcher</artifactId>
<scope>test</scope>
diff --git a/redback-data-management/src/test/java/org/apache/archiva/redback/management/DataManagementTest.java b/redback-data-management/src/test/java/org/apache/archiva/redback/management/DataManagementTest.java
index 08bee69..4d3d87d 100644
--- a/redback-data-management/src/test/java/org/apache/archiva/redback/management/DataManagementTest.java
+++ b/redback-data-management/src/test/java/org/apache/archiva/redback/management/DataManagementTest.java
@@ -30,7 +30,6 @@ import org.apache.archiva.redback.users.UserManager;
import org.apache.archiva.redback.users.UserManagerException;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.SystemUtils;
import org.custommonkey.xmlunit.XMLAssert;
import org.junit.Before;
import org.junit.Ignore;
@@ -450,7 +449,7 @@ public class DataManagementTest
private static Path createBackupDirectory() throws IOException {
String timestamp = new SimpleDateFormat( "yyyyMMdd.HHmmss", Locale.US ).format( new Date() );
- Path targetDirectory = Paths.get( SystemUtils.getJavaIoTmpDir().toString(), "./target/backups/" + timestamp );
+ Path targetDirectory = Files.createTempDirectory( "redback-test" ).resolve( "./target/backups/" + timestamp );
Files.createDirectories(targetDirectory);
return targetDirectory;
diff --git a/redback-integrations/redback-rest/redback-rest-services/pom.xml b/redback-integrations/redback-rest/redback-rest-services/pom.xml
index 562332f..c17952f 100644
--- a/redback-integrations/redback-rest/redback-rest-services/pom.xml
+++ b/redback-integrations/redback-rest/redback-rest-services/pom.xml
@@ -112,6 +112,11 @@
</dependency>
<dependency>
+ <groupId>org.apache.archiva.redback</groupId>
+ <artifactId>redback-rbac-jpa</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-launcher</artifactId>
<scope>test</scope>
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-cached/pom.xml b/redback-rbac/redback-rbac-providers/redback-rbac-cached/pom.xml
index 07a7cfd..062c052 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-cached/pom.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-cached/pom.xml
@@ -36,44 +36,52 @@
<dependencies>
<dependency>
<groupId>org.apache.archiva.redback</groupId>
- <artifactId>redback-system</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.archiva.redback</groupId>
- <artifactId>redback-authorization-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-rbac-model</artifactId>
</dependency>
<dependency>
<groupId>org.apache.archiva.components.cache</groupId>
<artifactId>archiva-components-spring-cache-api</artifactId>
</dependency>
+
+
<dependency>
- <groupId>org.apache.archiva.components.cache</groupId>
- <artifactId>archiva-components-spring-cache-ehcache</artifactId>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.archiva.components.registry</groupId>
<artifactId>archiva-components-spring-registry-commons</artifactId>
- <scope>test</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache</artifactId>
- </dependency>
+ <groupId>org.apache.archiva.components.cache</groupId>
+ <artifactId>archiva-components-spring-cache-ehcache</artifactId>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
- </dependency>
+ <scope>runtime</scope>
+ </dependency>
+
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- </dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-rbac-jpa</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.archiva.redback</groupId>
diff --git a/redback-rbac/redback-rbac-role-manager/src/test/resources/log4j2-test.xml b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/log4j2-test.xml
similarity index 60%
copy from redback-rbac/redback-rbac-role-manager/src/test/resources/log4j2-test.xml
copy to redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/log4j2-test.xml
index d54f360..a7f2723 100644
--- a/redback-rbac/redback-rbac-role-manager/src/test/resources/log4j2-test.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/log4j2-test.xml
@@ -18,19 +18,20 @@
~ under the License.
-->
<configuration>
- <appenders>
- <Console name="console" target="SYSTEM_OUT">
- <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
- </Console>
- </appenders>
- <loggers>
- <logger name="org.apache.archiva.redback.role" level="info" />
- <logger name="org.apache.archiva.components.graph" level="info" />
-
- <root level="error" includeLocation="true">
- <appender-ref ref="console"/>
- </root>
- </loggers>
+ <appenders>
+ <Console name="console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d{ISO8601_PERIOD} [%L] [%t] %-5level %logger{3} - %msg%n"/>
+ </Console>
+ <RandomAccessFile name="LogFile" fileName="target/test.log">
+ <PatternLayout pattern="%d{ISO8601_PERIOD} [%L] [%t] %-5level %logger{3} - %msg%n"/>
+ </RandomAccessFile>
+ </appenders>
+ <loggers>
+ <logger name="org.apache.archiva" level="info"/>
+ <root level="error" includeLocation="true">
+ <appender-ref ref="console"/>
+ </root>
+ </loggers>
</configuration>
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-jpa/pom.xml b/redback-rbac/redback-rbac-providers/redback-rbac-jpa/pom.xml
index b3f6f7e..c8710b6 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-jpa/pom.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-jpa/pom.xml
@@ -41,39 +41,68 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-context-support</artifactId>
+ <artifactId>spring-context</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.archiva.components.registry</groupId>
- <artifactId>archiva-components-spring-registry-commons</artifactId>
- <scope>test</scope>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva.redback</groupId>
+ <artifactId>redback-common-jpa</artifactId>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
+ <artifactId>javax.annotation-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.archiva.redback</groupId>
- <artifactId>redback-rbac-tests</artifactId>
- <scope>test</scope>
+ <groupId>javax.transaction</groupId>
+ <artifactId>javax.transaction-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>javax.persistence-api</artifactId>
</dependency>
+
+
<dependency>
<groupId>org.apache.archiva.redback</groupId>
- <artifactId>redback-common-jpa</artifactId>
+ <artifactId>redback-configuration</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa</artifactId>
+ <version>${openjpa.version}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
+ <scope>runtime</scope>
</dependency>
+
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-orm</artifactId>
+ <artifactId>spring-test</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <version>${openjpa.version}</version>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context-support</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva.components.registry</groupId>
+ <artifactId>archiva-components-spring-registry-commons</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva.redback</groupId>
+ <artifactId>redback-rbac-tests</artifactId>
+ <scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/main/java/org/apache/archiva/redback/rbac/jpa/JpaRbacManager.java b/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/main/java/org/apache/archiva/redback/rbac/jpa/JpaRbacManager.java
index 726c151..c423370 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/main/java/org/apache/archiva/redback/rbac/jpa/JpaRbacManager.java
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/main/java/org/apache/archiva/redback/rbac/jpa/JpaRbacManager.java
@@ -19,15 +19,30 @@ package org.apache.archiva.redback.rbac.jpa;
* under the License.
*/
-import org.apache.archiva.redback.rbac.*;
-import org.apache.archiva.redback.rbac.jpa.model.*;
-import org.apache.openjpa.persistence.Type;
+import org.apache.archiva.redback.rbac.AbstractRBACManager;
+import org.apache.archiva.redback.rbac.Operation;
+import org.apache.archiva.redback.rbac.Permission;
+import org.apache.archiva.redback.rbac.RBACObjectAssertions;
+import org.apache.archiva.redback.rbac.RbacManagerException;
+import org.apache.archiva.redback.rbac.RbacObjectInvalidException;
+import org.apache.archiva.redback.rbac.RbacObjectNotFoundException;
+import org.apache.archiva.redback.rbac.RbacPermanentException;
+import org.apache.archiva.redback.rbac.Resource;
+import org.apache.archiva.redback.rbac.Role;
+import org.apache.archiva.redback.rbac.UserAssignment;
+import org.apache.archiva.redback.rbac.jpa.model.JpaOperation;
+import org.apache.archiva.redback.rbac.jpa.model.JpaPermission;
+import org.apache.archiva.redback.rbac.jpa.model.JpaResource;
+import org.apache.archiva.redback.rbac.jpa.model.JpaRole;
+import org.apache.archiva.redback.rbac.jpa.model.JpaUserAssignment;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-import javax.persistence.*;
+import javax.persistence.EntityManager;
+import javax.persistence.NoResultException;
+import javax.persistence.PersistenceContext;
+import javax.persistence.Query;
+import javax.persistence.TypedQuery;
+import javax.transaction.Transactional;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
diff --git a/redback-rbac/redback-rbac-role-manager/src/test/resources/log4j2-test.xml b/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/test/resources/log4j2-test.xml
similarity index 60%
copy from redback-rbac/redback-rbac-role-manager/src/test/resources/log4j2-test.xml
copy to redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/test/resources/log4j2-test.xml
index d54f360..a7f2723 100644
--- a/redback-rbac/redback-rbac-role-manager/src/test/resources/log4j2-test.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/test/resources/log4j2-test.xml
@@ -18,19 +18,20 @@
~ under the License.
-->
<configuration>
- <appenders>
- <Console name="console" target="SYSTEM_OUT">
- <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
- </Console>
- </appenders>
- <loggers>
- <logger name="org.apache.archiva.redback.role" level="info" />
- <logger name="org.apache.archiva.components.graph" level="info" />
-
- <root level="error" includeLocation="true">
- <appender-ref ref="console"/>
- </root>
- </loggers>
+ <appenders>
+ <Console name="console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d{ISO8601_PERIOD} [%L] [%t] %-5level %logger{3} - %msg%n"/>
+ </Console>
+ <RandomAccessFile name="LogFile" fileName="target/test.log">
+ <PatternLayout pattern="%d{ISO8601_PERIOD} [%L] [%t] %-5level %logger{3} - %msg%n"/>
+ </RandomAccessFile>
+ </appenders>
+ <loggers>
+ <logger name="org.apache.archiva" level="info"/>
+ <root level="error" includeLocation="true">
+ <appender-ref ref="console"/>
+ </root>
+ </loggers>
</configuration>
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-ldap/pom.xml b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/pom.xml
index 624a1de..75f479c 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-ldap/pom.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/pom.xml
@@ -36,47 +36,82 @@
<dependencies>
<dependency>
<groupId>org.apache.archiva.redback</groupId>
- <artifactId>redback-system</artifactId>
+ <artifactId>redback-rbac-model</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva.components.cache</groupId>
+ <artifactId>archiva-components-spring-cache-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.archiva.redback</groupId>
- <artifactId>redback-authorization-api</artifactId>
+ <artifactId>redback-users-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.archiva.redback</groupId>
- <artifactId>redback-rbac-model</artifactId>
+ <artifactId>redback-policy</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.archiva.components.cache</groupId>
- <artifactId>archiva-components-spring-cache-api</artifactId>
+ <groupId>org.apache.archiva.redback</groupId>
+ <artifactId>redback-configuration</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.archiva.components.cache</groupId>
- <artifactId>archiva-components-spring-cache-ehcache</artifactId>
+ <groupId>org.apache.archiva.redback</groupId>
+ <artifactId>redback-common-ldap</artifactId>
</dependency>
<dependency>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache</artifactId>
- </dependency>
+ <groupId>org.apache.archiva.redback</groupId>
+ <artifactId>redback-users-ldap</artifactId>
+ </dependency>
+
+
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context-support</artifactId>
- </dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ </dependency>
<dependency>
<groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
+ <artifactId>javax.annotation-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.archiva.redback</groupId>
- <artifactId>redback-common-ldap</artifactId>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.archiva.redback</groupId>
- <artifactId>redback-users-ldap</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
+
+
<dependency>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-rbac-cached</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva.components.cache</groupId>
+ <artifactId>archiva-components-spring-cache-ehcache</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context-support</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva.redback</groupId>
+ <artifactId>redback-rbac-jpa</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.archiva.redback</groupId>
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java
index f31d00c..3fdbe59 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java
@@ -47,7 +47,7 @@ import org.apache.archiva.redback.users.UserManager;
import org.apache.archiva.redback.users.UserManagerException;
import org.apache.archiva.redback.users.ldap.ctl.LdapController;
import org.apache.archiva.redback.users.ldap.ctl.LdapControllerException;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
diff --git a/redback-rbac/redback-rbac-role-manager/src/test/resources/log4j2-test.xml b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/resources/log4j2-test.xml
similarity index 60%
copy from redback-rbac/redback-rbac-role-manager/src/test/resources/log4j2-test.xml
copy to redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/resources/log4j2-test.xml
index d54f360..a7f2723 100644
--- a/redback-rbac/redback-rbac-role-manager/src/test/resources/log4j2-test.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/resources/log4j2-test.xml
@@ -18,19 +18,20 @@
~ under the License.
-->
<configuration>
- <appenders>
- <Console name="console" target="SYSTEM_OUT">
- <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
- </Console>
- </appenders>
- <loggers>
- <logger name="org.apache.archiva.redback.role" level="info" />
- <logger name="org.apache.archiva.components.graph" level="info" />
-
- <root level="error" includeLocation="true">
- <appender-ref ref="console"/>
- </root>
- </loggers>
+ <appenders>
+ <Console name="console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d{ISO8601_PERIOD} [%L] [%t] %-5level %logger{3} - %msg%n"/>
+ </Console>
+ <RandomAccessFile name="LogFile" fileName="target/test.log">
+ <PatternLayout pattern="%d{ISO8601_PERIOD} [%L] [%t] %-5level %logger{3} - %msg%n"/>
+ </RandomAccessFile>
+ </appenders>
+ <loggers>
+ <logger name="org.apache.archiva" level="info"/>
+ <root level="error" includeLocation="true">
+ <appender-ref ref="console"/>
+ </root>
+ </loggers>
</configuration>
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-memory/pom.xml b/redback-rbac/redback-rbac-providers/redback-rbac-memory/pom.xml
index 0d0fe55..8554eb1 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-memory/pom.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-memory/pom.xml
@@ -36,29 +36,61 @@
<dependencies>
<dependency>
<groupId>org.apache.archiva.redback</groupId>
- <artifactId>redback-system</artifactId>
+ <artifactId>redback-authorization-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.archiva.redback</groupId>
- <artifactId>redback-authorization-api</artifactId>
+ <artifactId>redback-rbac-model</artifactId>
</dependency>
<dependency>
<groupId>org.apache.archiva.redback</groupId>
- <artifactId>redback-rbac-model</artifactId>
+ <artifactId>redback-users-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.archiva.redback</groupId>
+ <artifactId>redback-configuration</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.archiva.components.registry</groupId>
<artifactId>archiva-components-spring-registry-commons</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.archiva.redback</groupId>
+ <artifactId>redback-rbac-jpa</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-context-support</artifactId>
- </dependency>
+ <artifactId>spring-test</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- </dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context-support</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-rbac-tests</artifactId>
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryRbacManager.java b/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryRbacManager.java
index 9fb9e08..1c743b0 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryRbacManager.java
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryRbacManager.java
@@ -31,7 +31,7 @@ import org.apache.archiva.redback.rbac.Resource;
import org.apache.archiva.redback.rbac.Role;
import org.apache.archiva.redback.rbac.UserAssignment;
import org.apache.archiva.redback.rbac.RbacPermanentException;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
diff --git a/redback-rbac/redback-rbac-role-manager/src/test/resources/log4j2-test.xml b/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/resources/log4j2-test.xml
similarity index 60%
copy from redback-rbac/redback-rbac-role-manager/src/test/resources/log4j2-test.xml
copy to redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/resources/log4j2-test.xml
index d54f360..a7f2723 100644
--- a/redback-rbac/redback-rbac-role-manager/src/test/resources/log4j2-test.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/resources/log4j2-test.xml
@@ -18,19 +18,20 @@
~ under the License.
-->
<configuration>
- <appenders>
- <Console name="console" target="SYSTEM_OUT">
- <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
- </Console>
- </appenders>
- <loggers>
- <logger name="org.apache.archiva.redback.role" level="info" />
- <logger name="org.apache.archiva.components.graph" level="info" />
-
- <root level="error" includeLocation="true">
- <appender-ref ref="console"/>
- </root>
- </loggers>
+ <appenders>
+ <Console name="console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d{ISO8601_PERIOD} [%L] [%t] %-5level %logger{3} - %msg%n"/>
+ </Console>
+ <RandomAccessFile name="LogFile" fileName="target/test.log">
+ <PatternLayout pattern="%d{ISO8601_PERIOD} [%L] [%t] %-5level %logger{3} - %msg%n"/>
+ </RandomAccessFile>
+ </appenders>
+ <loggers>
+ <logger name="org.apache.archiva" level="info"/>
+ <root level="error" includeLocation="true">
+ <appender-ref ref="console"/>
+ </root>
+ </loggers>
</configuration>
diff --git a/redback-rbac/redback-rbac-role-manager/pom.xml b/redback-rbac/redback-rbac-role-manager/pom.xml
index f28aa3c..9ab7ffc 100644
--- a/redback-rbac/redback-rbac-role-manager/pom.xml
+++ b/redback-rbac/redback-rbac-role-manager/pom.xml
@@ -37,33 +37,29 @@
<dependency>
<groupId>org.apache.archiva.components</groupId>
<artifactId>archiva-components-graph</artifactId>
- <version>3.0-SNAPSHOT</version>
</dependency>
<dependency>
+ <groupId>org.apache.archiva.redback</groupId>
+ <artifactId>redback-rbac-model</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.archiva.components.registry</groupId>
<artifactId>archiva-components-spring-registry-commons</artifactId>
- <scope>test</scope>
+ <scope>runtime</scope>
</dependency>
+
<dependency>
- <groupId>net.java.dev.stax-utils</groupId>
- <artifactId>stax-utils</artifactId>
- <version>20060502</version>
- <exclusions>
- <!-- Can't use BEA's proprietary java.xml.stream provider.
- Using woodstox provider instead (see below) -->
- <exclusion>
- <groupId>com.bea.xml</groupId>
- <artifactId>jsr173-ri</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-context-support</artifactId>
+ <artifactId>spring-context</artifactId>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
+ <artifactId>javax.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@@ -73,22 +69,35 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
+
<dependency>
- <artifactId>redback-rbac-memory</artifactId>
- <groupId>org.apache.archiva.redback</groupId>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context-support</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.archiva.redback</groupId>
- <artifactId>redback-rbac-model</artifactId>
+ <artifactId>redback-rbac-jpa</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
+ <artifactId>redback-rbac-memory</artifactId>
<groupId>org.apache.archiva.redback</groupId>
- <artifactId>redback-rbac-cached</artifactId>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.archiva.redback</groupId>
+ <artifactId>redback-rbac-cached</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
@@ -134,7 +143,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <forkMode>always</forkMode>
+ <forkCount>1</forkCount>
<systemPropertyVariables>
<basedir>${basedir}</basedir>
<openjpa.Log>${openjpa.Log}</openjpa.Log>
diff --git a/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/JpoxRoleManagerTest.java b/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/JpaRoleManagerTest.java
similarity index 93%
rename from redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/JpoxRoleManagerTest.java
rename to redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/JpaRoleManagerTest.java
index 3ebbe02..ea17fad 100644
--- a/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/JpoxRoleManagerTest.java
+++ b/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/JpaRoleManagerTest.java
@@ -34,12 +34,12 @@ import javax.inject.Named;
* @author: Jesse McConnell
*/
@RunWith( SpringJUnit4ClassRunner.class )
-@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/jpox-spring-context.xml" } )
-public class JpoxRoleManagerTest
+@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/jpa-spring-context.xml" } )
+public class JpaRoleManagerTest
extends AbstractRoleManagerTest
{
- @Inject @Named(value = "roleManager#jpox")
+ @Inject @Named(value = "roleManager#jpa")
DefaultRoleManager roleManagerInjected;
@Inject
diff --git a/redback-rbac/redback-rbac-role-manager/src/test/resources/jpox-spring-context.xml b/redback-rbac/redback-rbac-role-manager/src/test/resources/jpa-spring-context.xml
similarity index 97%
rename from redback-rbac/redback-rbac-role-manager/src/test/resources/jpox-spring-context.xml
rename to redback-rbac/redback-rbac-role-manager/src/test/resources/jpa-spring-context.xml
index 4422a76..b2e9650 100644
--- a/redback-rbac/redback-rbac-role-manager/src/test/resources/jpox-spring-context.xml
+++ b/redback-rbac/redback-rbac-role-manager/src/test/resources/jpa-spring-context.xml
@@ -43,7 +43,7 @@
<property name="templateProcessor" ref="roleTemplateProcessor#jpox"/>
<property name="rbacManager" ref="rbacManager#jpa"/>
</bean>
- <alias name="roleManager" alias="roleManager#jpox"/>
+ <alias name="roleManager" alias="roleManager#jpa"/>
<bean name="userConfiguration#default" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
<property name="registry" ref="test-conf"/>
diff --git a/redback-rbac/redback-rbac-role-manager/src/test/resources/log4j2-test.xml b/redback-rbac/redback-rbac-role-manager/src/test/resources/log4j2-test.xml
index d54f360..a7f2723 100644
--- a/redback-rbac/redback-rbac-role-manager/src/test/resources/log4j2-test.xml
+++ b/redback-rbac/redback-rbac-role-manager/src/test/resources/log4j2-test.xml
@@ -18,19 +18,20 @@
~ under the License.
-->
<configuration>
- <appenders>
- <Console name="console" target="SYSTEM_OUT">
- <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
- </Console>
- </appenders>
- <loggers>
- <logger name="org.apache.archiva.redback.role" level="info" />
- <logger name="org.apache.archiva.components.graph" level="info" />
-
- <root level="error" includeLocation="true">
- <appender-ref ref="console"/>
- </root>
- </loggers>
+ <appenders>
+ <Console name="console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d{ISO8601_PERIOD} [%L] [%t] %-5level %logger{3} - %msg%n"/>
+ </Console>
+ <RandomAccessFile name="LogFile" fileName="target/test.log">
+ <PatternLayout pattern="%d{ISO8601_PERIOD} [%L] [%t] %-5level %logger{3} - %msg%n"/>
+ </RandomAccessFile>
+ </appenders>
+ <loggers>
+ <logger name="org.apache.archiva" level="info"/>
+ <root level="error" includeLocation="true">
+ <appender-ref ref="console"/>
+ </root>
+ </loggers>
</configuration>
diff --git a/redback-rbac/redback-rbac-tests/pom.xml b/redback-rbac/redback-rbac-tests/pom.xml
index 8bf42c1..66b6b58 100644
--- a/redback-rbac/redback-rbac-tests/pom.xml
+++ b/redback-rbac/redback-rbac-tests/pom.xml
@@ -32,14 +32,6 @@
<dependencies>
<dependency>
<groupId>org.apache.archiva.redback</groupId>
- <artifactId>redback-system</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.archiva.redback</groupId>
- <artifactId>redback-authorization-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-rbac-model</artifactId>
</dependency>
@@ -53,6 +45,11 @@
</dependency>
<dependency>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-launcher</artifactId>
<scope>compile</scope>
diff --git a/redback-users/redback-users-providers/redback-users-ldap/pom.xml b/redback-users/redback-users-providers/redback-users-ldap/pom.xml
index 134134b..6bd6dbb 100644
--- a/redback-users/redback-users-providers/redback-users-ldap/pom.xml
+++ b/redback-users/redback-users-providers/redback-users-ldap/pom.xml
@@ -61,7 +61,7 @@
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
+ <artifactId>javax.annotation-api</artifactId>
</dependency>
<dependency>
[archiva-redback-core] 01/02: Using runtime scope for openjpa
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-core.git
commit adbc0e5b7ebf535f75c131a7e220da098390e1e0
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Sat Dec 21 11:40:52 2019 +0100
Using runtime scope for openjpa
---
redback-common/redback-common-jpa/pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/redback-common/redback-common-jpa/pom.xml b/redback-common/redback-common-jpa/pom.xml
index deccc5a..7dbac5f 100644
--- a/redback-common/redback-common-jpa/pom.xml
+++ b/redback-common/redback-common-jpa/pom.xml
@@ -71,6 +71,7 @@
<artifactId>geronimo-jta_1.1_spec</artifactId>
</exclusion>
</exclusions>
+ <scope>runtime</scope>
</dependency>
<dependency>