diff options
Diffstat (limited to 'archiva-modules/archiva-web/archiva-rest/archiva-rest-services')
3 files changed, 17 insertions, 5 deletions
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml index 39bafe6e7..3436e6af6 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml @@ -315,6 +315,12 @@ <scope>test</scope> <version>${redback.version}</version> </dependency> + <dependency> + <groupId>org.apache.archiva.redback</groupId> + <artifactId>redback-keys-jpa</artifactId> + <scope>test</scope> + <version>${redback.version}</version> + </dependency> <dependency> <groupId>org.apache.archiva</groupId> @@ -323,6 +329,12 @@ </dependency> <dependency> + <groupId>org.hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <scope>test</scope> + </dependency> + + <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-core</artifactId> <scope>test</scope> diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RedbackRuntimeConfigurationServiceTest.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RedbackRuntimeConfigurationServiceTest.java index 42d99a59e..bddb302ec 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RedbackRuntimeConfigurationServiceTest.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RedbackRuntimeConfigurationServiceTest.java @@ -40,7 +40,7 @@ public class RedbackRuntimeConfigurationServiceTest { RedbackRuntimeConfiguration redbackRuntimeConfiguration = getRedbackRuntimeConfigurationService().getRedbackRuntimeConfiguration(); - assertEquals( "jdo", redbackRuntimeConfiguration.getUserManagerImpls().get( 0 ) ); + assertEquals( "jpa", redbackRuntimeConfiguration.getUserManagerImpls().get( 0 ) ); } @Test @@ -49,7 +49,7 @@ public class RedbackRuntimeConfigurationServiceTest { RedbackRuntimeConfiguration redbackRuntimeConfiguration = getRedbackRuntimeConfigurationService().getRedbackRuntimeConfiguration(); - assertEquals( "jdo", redbackRuntimeConfiguration.getUserManagerImpls().get( 0 ) ); + assertEquals( "jpa", redbackRuntimeConfiguration.getUserManagerImpls().get( 0 ) ); redbackRuntimeConfiguration.setUserManagerImpls( Arrays.asList( "foo" ) ); @@ -68,7 +68,7 @@ public class RedbackRuntimeConfigurationServiceTest RedbackRuntimeConfigurationService service = getRedbackRuntimeConfigurationService(); List<UserManagerImplementationInformation> infos = service.getUserManagerImplementationInformations(); assertThat( infos ).isNotNull().isNotEmpty().contains( - new UserManagerImplementationInformation( "jdo", null, false ) ); + new UserManagerImplementationInformation( "jpa", null, false ) ); } @@ -79,7 +79,7 @@ public class RedbackRuntimeConfigurationServiceTest RedbackRuntimeConfigurationService service = getRedbackRuntimeConfigurationService(); List<RBACManagerImplementationInformation> infos = service.getRbacManagerImplementationInformations(); assertThat( infos ).isNotNull().isNotEmpty().contains( - new RBACManagerImplementationInformation( "jdo", null, false ) ); + new RBACManagerImplementationInformation( "jpa", null, false ) ); } diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml index 951ced8f4..27d764d58 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml @@ -32,7 +32,7 @@ <context:annotation-config/> <context:component-scan - base-package="org.apache.archiva.rest.services.utils"/> + base-package="org.apache.archiva.redback.keys,org.apache.archiva.rest.services.utils"/> <bean name="scheduler" class="org.apache.archiva.redback.components.scheduler.DefaultScheduler"> <property name="properties"> |