diff options
| author | olivier lamy <olamy@apache.org> | 2017-05-26 12:04:44 +1000 |
|---|---|---|
| committer | olivier lamy <olamy@apache.org> | 2017-05-26 12:04:44 +1000 |
| commit | 4b6131e8bab59139d0558ed6d932d683cdfdbcab (patch) | |
| tree | 451890a6fdedde364915d05828ee21ebe327bbba /archiva-modules/archiva-base | |
| parent | b77921b7c0f544e16e605b55348923cc027a122b (diff) | |
| download | archiva-4b6131e8bab59139d0558ed6d932d683cdfdbcab.tar.gz archiva-4b6131e8bab59139d0558ed6d932d683cdfdbcab.zip | |
take of default now jpa, jdo not exists anymore so handle migration
Signed-off-by: olivier lamy <olamy@apache.org>
Diffstat (limited to 'archiva-modules/archiva-base')
3 files changed, 11 insertions, 3 deletions
diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/resources/org/apache/archiva/configuration/default-archiva.xml b/archiva-modules/archiva-base/archiva-configuration/src/main/resources/org/apache/archiva/configuration/default-archiva.xml index 877b6a59b..88beda2e0 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/resources/org/apache/archiva/configuration/default-archiva.xml +++ b/archiva-modules/archiva-base/archiva-configuration/src/main/resources/org/apache/archiva/configuration/default-archiva.xml @@ -144,7 +144,7 @@ <redbackRuntimeConfiguration> <userManagerImpls> - <userManagerImpl>jdo</userManagerImpl> + <userManagerImpl>jpa</userManagerImpl> </userManagerImpls> <rbacManagerImpls> <rbacManagerImpl>cached</rbacManagerImpl> diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/runtime/RedbackRuntimeConfigurationAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/runtime/RedbackRuntimeConfigurationAdmin.java index 8fae6a66a..c124eacbe 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/runtime/RedbackRuntimeConfigurationAdmin.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/runtime/RedbackRuntimeConfigurationAdmin.java @@ -28,9 +28,9 @@ import org.apache.archiva.admin.model.beans.RedbackRuntimeConfiguration; public interface RedbackRuntimeConfigurationAdmin { - static final String DEFAULT_RBAC_MANAGER_IMPL = "jdo"; + String DEFAULT_RBAC_MANAGER_IMPL = "jpa"; - static final String DEFAULT_USER_MANAGER_IMPL = "jdo"; + String DEFAULT_USER_MANAGER_IMPL = "jpa"; RedbackRuntimeConfiguration getRedbackRuntimeConfiguration() throws RepositoryAdminException; diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java index 3ce727c71..ebd8a64e0 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java @@ -100,6 +100,10 @@ public class DefaultRedbackRuntimeConfigurationAdmin String[] impls = StringUtils.split( userManagerImpl, ',' ); for ( String impl : impls ) { + if (StringUtils.equalsIgnoreCase( "jdo", impl )) + { + impl = DEFAULT_USER_MANAGER_IMPL; + } redbackRuntimeConfiguration.getUserManagerImpls().add( impl ); } } @@ -117,6 +121,10 @@ public class DefaultRedbackRuntimeConfigurationAdmin String[] impls = StringUtils.split( rbacManagerImpls, ',' ); for ( String impl : impls ) { + if (StringUtils.equalsIgnoreCase( "jdo", impl )) + { + impl = DEFAULT_RBAC_MANAGER_IMPL; + } redbackRuntimeConfiguration.getRbacManagerImpls().add( impl ); } } |