Author: olamy
Date: Thu Dec 20 20:33:35 2012
New Revision: 1424675
URL: http://svn.apache.org/viewvc?rev=1424675&view=rev
Log:
fix name as it is related to Redback and not to Archiva
Added:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/runtime/RedbackRuntimeConfigurationAdmin.java
(contents, props changed)
- copied, changed from r1424674,
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/runtime/ArchivaRuntimeConfigurationAdmin.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java
(contents, props changed)
- copied, changed from r1424674,
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultArchivaRuntimeConfigurationAdmin.java
Removed:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/runtime/ArchivaRuntimeConfigurationAdmin.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultArchivaRuntimeConfigurationAdmin.java
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaRuntimeConfigurationService.java
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/runtime/ldap/ArchivaLdapConnectionFactory.java
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaConfigurableUsersManager.java
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLockedAdminEnvironmentCheck.java
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaUserManagerAuthenticator.java
Copied:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/runtime/RedbackRuntimeConfigurationAdmin.java
(from r1424674,
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/runtime/ArchivaRuntimeConfigurationAdmin.java)
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/runtime/RedbackRuntimeConfigurationAdmin.java?p2=archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/runtime/RedbackRuntimeConfigurationAdmin.java&p1=archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/runtime/ArchivaRuntimeConfigurationAdmin.java&r1=1424674&r2=1424675&rev=1424675&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/runtime/ArchivaRuntimeConfigurationAdmin.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/runtime/RedbackRuntimeConfigurationAdmin.java
Thu Dec 20 20:33:35 2012
@@ -25,12 +25,12 @@ import org.apache.archiva.admin.model.be
* @author Olivier Lamy
* @since 1.4-M4
*/
-public interface ArchivaRuntimeConfigurationAdmin
+public interface RedbackRuntimeConfigurationAdmin
{
- RedbackRuntimeConfiguration getArchivaRuntimeConfiguration()
+ RedbackRuntimeConfiguration getRedbackRuntimeConfiguration()
throws RepositoryAdminException;
- void updateArchivaRuntimeConfiguration( RedbackRuntimeConfiguration
redbackRuntimeConfiguration )
+ void updateRedbackRuntimeConfiguration( RedbackRuntimeConfiguration
redbackRuntimeConfiguration )
throws RepositoryAdminException;
}
Propchange:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/runtime/RedbackRuntimeConfigurationAdmin.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/runtime/RedbackRuntimeConfigurationAdmin.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java
(from r1424674,
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultArchivaRuntimeConfigurationAdmin.java)
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java?p2=archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java&p1=archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultArchivaRuntimeConfigurationAdmin.java&r1=1424674&r2=1424675&rev=1424675&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultArchivaRuntimeConfigurationAdmin.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java
Thu Dec 20 20:33:35 2012
@@ -22,7 +22,7 @@ import net.sf.beanlib.provider.replicato
import org.apache.archiva.admin.model.RepositoryAdminException;
import org.apache.archiva.admin.model.beans.LdapConfiguration;
import org.apache.archiva.admin.model.beans.RedbackRuntimeConfiguration;
-import org.apache.archiva.admin.model.runtime.ArchivaRuntimeConfigurationAdmin;
+import org.apache.archiva.admin.model.runtime.RedbackRuntimeConfigurationAdmin;
import org.apache.archiva.configuration.ArchivaConfiguration;
import org.apache.archiva.configuration.Configuration;
import org.apache.archiva.configuration.IndeterminateConfigurationException;
@@ -45,8 +45,8 @@ import java.util.List;
* @since 1.4-M4
*/
@Service( "userConfiguration#archiva" )
-public class DefaultArchivaRuntimeConfigurationAdmin
- implements ArchivaRuntimeConfigurationAdmin, UserConfiguration
+public class DefaultRedbackRuntimeConfigurationAdmin
+ implements RedbackRuntimeConfigurationAdmin, UserConfiguration
{
protected Logger log = LoggerFactory.getLogger( getClass() );
@@ -64,7 +64,7 @@ public class DefaultArchivaRuntimeConfig
{
try
{
- RedbackRuntimeConfiguration redbackRuntimeConfiguration =
getArchivaRuntimeConfiguration();
+ RedbackRuntimeConfiguration redbackRuntimeConfiguration =
getRedbackRuntimeConfiguration();
// migrate or not data from redback
if (
!redbackRuntimeConfiguration.isMigratedFromRedbackConfiguration() )
{
@@ -101,7 +101,7 @@ public class DefaultArchivaRuntimeConfig
redbackRuntimeConfiguration.setMigratedFromRedbackConfiguration( true );
- updateArchivaRuntimeConfiguration( redbackRuntimeConfiguration
);
+ updateRedbackRuntimeConfiguration( redbackRuntimeConfiguration
);
}
@@ -111,7 +111,7 @@ public class DefaultArchivaRuntimeConfig
log.info(
"redbackRuntimeConfiguration with empty userManagerImpls
so force at least jdo implementation !" );
redbackRuntimeConfiguration.getUserManagerImpls().add( "jdo" );
- updateArchivaRuntimeConfiguration( redbackRuntimeConfiguration
);
+ updateRedbackRuntimeConfiguration( redbackRuntimeConfiguration
);
}
}
@@ -121,12 +121,12 @@ public class DefaultArchivaRuntimeConfig
}
}
- public RedbackRuntimeConfiguration getArchivaRuntimeConfiguration()
+ public RedbackRuntimeConfiguration getRedbackRuntimeConfiguration()
{
return build(
archivaConfiguration.getConfiguration().getRedbackRuntimeConfiguration() );
}
- public void updateArchivaRuntimeConfiguration( RedbackRuntimeConfiguration
redbackRuntimeConfiguration )
+ public void updateRedbackRuntimeConfiguration( RedbackRuntimeConfiguration
redbackRuntimeConfiguration )
throws RepositoryAdminException
{
org.apache.archiva.configuration.RedbackRuntimeConfiguration
@@ -188,10 +188,10 @@ public class DefaultArchivaRuntimeConfig
if ( UserConfigurationKeys.USER_MANAGER_IMPL.equals( key ) )
{
// possible false for others than archiva user manager
- return getArchivaRuntimeConfiguration().getUserManagerImpls().get(
0 );
+ return getRedbackRuntimeConfiguration().getUserManagerImpls().get(
0 );
}
- RedbackRuntimeConfiguration conf = getArchivaRuntimeConfiguration();
+ RedbackRuntimeConfiguration conf = getRedbackRuntimeConfiguration();
if ( conf.getConfigurationProperties().containsKey( key ) )
{
@@ -207,7 +207,7 @@ public class DefaultArchivaRuntimeConfig
try
{
- updateArchivaRuntimeConfiguration( conf );
+ updateRedbackRuntimeConfiguration( conf );
}
catch ( RepositoryAdminException e )
{
@@ -222,22 +222,22 @@ public class DefaultArchivaRuntimeConfig
{
if ( UserConfigurationKeys.LDAP_HOSTNAME.equals( key ) )
{
- return
getArchivaRuntimeConfiguration().getLdapConfiguration().getHostName();
+ return
getRedbackRuntimeConfiguration().getLdapConfiguration().getHostName();
}
if ( UserConfigurationKeys.LDAP_CONTEX_FACTORY.equals( key ) )
{
- return
getArchivaRuntimeConfiguration().getLdapConfiguration().getContextFactory();
+ return
getRedbackRuntimeConfiguration().getLdapConfiguration().getContextFactory();
}
if ( UserConfigurationKeys.LDAP_PASSWORD.equals( key ) )
{
- return
getArchivaRuntimeConfiguration().getLdapConfiguration().getPassword();
+ return
getRedbackRuntimeConfiguration().getLdapConfiguration().getPassword();
}
if ( UserConfigurationKeys.LDAP_AUTHENTICATION_METHOD.equals( key ) )
{
- return
getArchivaRuntimeConfiguration().getLdapConfiguration().getAuthenticationMethod();
+ return
getRedbackRuntimeConfiguration().getLdapConfiguration().getAuthenticationMethod();
}
- RedbackRuntimeConfiguration conf = getArchivaRuntimeConfiguration();
+ RedbackRuntimeConfiguration conf = getRedbackRuntimeConfiguration();
if ( conf.getConfigurationProperties().containsKey( key ) )
{
@@ -254,7 +254,7 @@ public class DefaultArchivaRuntimeConfig
conf.getConfigurationProperties().put( key, value );
try
{
- updateArchivaRuntimeConfiguration( conf );
+ updateRedbackRuntimeConfiguration( conf );
}
catch ( RepositoryAdminException e )
{
@@ -267,7 +267,7 @@ public class DefaultArchivaRuntimeConfig
public int getInt( String key )
{
- RedbackRuntimeConfiguration conf = getArchivaRuntimeConfiguration();
+ RedbackRuntimeConfiguration conf = getRedbackRuntimeConfiguration();
if ( conf.getConfigurationProperties().containsKey( key ) )
{
@@ -279,7 +279,7 @@ public class DefaultArchivaRuntimeConfig
conf.getConfigurationProperties().put( key, Integer.toString( value )
);
try
{
- updateArchivaRuntimeConfiguration( conf );
+ updateRedbackRuntimeConfiguration( conf );
}
catch ( RepositoryAdminException e )
{
@@ -294,10 +294,10 @@ public class DefaultArchivaRuntimeConfig
{
if ( UserConfigurationKeys.LDAP_PORT.equals( key ) )
{
- return
getArchivaRuntimeConfiguration().getLdapConfiguration().getPort();
+ return
getRedbackRuntimeConfiguration().getLdapConfiguration().getPort();
}
- RedbackRuntimeConfiguration conf = getArchivaRuntimeConfiguration();
+ RedbackRuntimeConfiguration conf = getRedbackRuntimeConfiguration();
if ( conf.getConfigurationProperties().containsKey( key ) )
{
@@ -309,7 +309,7 @@ public class DefaultArchivaRuntimeConfig
conf.getConfigurationProperties().put( key, Integer.toString( value )
);
try
{
- updateArchivaRuntimeConfiguration( conf );
+ updateRedbackRuntimeConfiguration( conf );
}
catch ( RepositoryAdminException e )
{
@@ -322,7 +322,7 @@ public class DefaultArchivaRuntimeConfig
public boolean getBoolean( String key )
{
- RedbackRuntimeConfiguration conf = getArchivaRuntimeConfiguration();
+ RedbackRuntimeConfiguration conf = getRedbackRuntimeConfiguration();
if ( conf.getConfigurationProperties().containsKey( key ) )
{
@@ -334,7 +334,7 @@ public class DefaultArchivaRuntimeConfig
conf.getConfigurationProperties().put( key, Boolean.toString( value )
);
try
{
- updateArchivaRuntimeConfiguration( conf );
+ updateRedbackRuntimeConfiguration( conf );
}
catch ( RepositoryAdminException e )
{
@@ -349,10 +349,10 @@ public class DefaultArchivaRuntimeConfig
{
if ( UserConfigurationKeys.LDAP_SSL.equals( key ) )
{
- return
getArchivaRuntimeConfiguration().getLdapConfiguration().isSsl();
+ return
getRedbackRuntimeConfiguration().getLdapConfiguration().isSsl();
}
- RedbackRuntimeConfiguration conf = getArchivaRuntimeConfiguration();
+ RedbackRuntimeConfiguration conf = getRedbackRuntimeConfiguration();
if ( conf.getConfigurationProperties().containsKey( key ) )
{
@@ -364,7 +364,7 @@ public class DefaultArchivaRuntimeConfig
conf.getConfigurationProperties().put( key, Boolean.toString( value )
);
try
{
- updateArchivaRuntimeConfiguration( conf );
+ updateRedbackRuntimeConfiguration( conf );
}
catch ( RepositoryAdminException e )
{
@@ -379,12 +379,12 @@ public class DefaultArchivaRuntimeConfig
{
List<String> value = userConfiguration.getList( key );
- RedbackRuntimeConfiguration conf = getArchivaRuntimeConfiguration();
+ RedbackRuntimeConfiguration conf = getRedbackRuntimeConfiguration();
// TODO concat values
conf.getConfigurationProperties().put( key, "" );
try
{
- updateArchivaRuntimeConfiguration( conf );
+ updateRedbackRuntimeConfiguration( conf );
}
catch ( RepositoryAdminException e )
{
@@ -399,11 +399,11 @@ public class DefaultArchivaRuntimeConfig
{
if ( UserConfigurationKeys.LDAP_BASEDN.equals( key ) )
{
- return
getArchivaRuntimeConfiguration().getLdapConfiguration().getBaseDn();
+ return
getRedbackRuntimeConfiguration().getLdapConfiguration().getBaseDn();
}
if ( UserConfigurationKeys.LDAP_BINDDN.equals( key ) )
{
- return
getArchivaRuntimeConfiguration().getLdapConfiguration().getBindDn();
+ return
getRedbackRuntimeConfiguration().getLdapConfiguration().getBindDn();
}
return userConfiguration.getConcatenatedList( key, defaultValue );
}
Propchange:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaRuntimeConfigurationService.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaRuntimeConfigurationService.java?rev=1424675&r1=1424674&r2=1424675&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaRuntimeConfigurationService.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaRuntimeConfigurationService.java
Thu Dec 20 20:33:35 2012
@@ -21,7 +21,7 @@ package org.apache.archiva.rest.services
import org.apache.archiva.admin.model.RepositoryAdminException;
import org.apache.archiva.admin.model.beans.RedbackRuntimeConfiguration;
import org.apache.archiva.admin.model.beans.LdapConfiguration;
-import org.apache.archiva.admin.model.runtime.ArchivaRuntimeConfigurationAdmin;
+import org.apache.archiva.admin.model.runtime.RedbackRuntimeConfigurationAdmin;
import org.apache.archiva.redback.authentication.AuthenticationException;
import org.apache.archiva.redback.authentication.Authenticator;
import org.apache.archiva.redback.common.ldap.connection.LdapConnection;
@@ -58,7 +58,7 @@ public class DefaultArchivaRuntimeConfig
implements ArchivaRuntimeConfigurationService
{
@Inject
- private ArchivaRuntimeConfigurationAdmin archivaRuntimeConfigurationAdmin;
+ private RedbackRuntimeConfigurationAdmin redbackRuntimeConfigurationAdmin;
@Inject
@Named(value = "userManager#configurable")
@@ -76,7 +76,7 @@ public class DefaultArchivaRuntimeConfig
{
try
{
- return
archivaRuntimeConfigurationAdmin.getArchivaRuntimeConfiguration();
+ return
redbackRuntimeConfigurationAdmin.getRedbackRuntimeConfiguration();
}
catch ( RepositoryAdminException e )
{
@@ -91,13 +91,13 @@ public class DefaultArchivaRuntimeConfig
{
// has user manager impl changed ?
boolean userManagerChanged =
redbackRuntimeConfiguration.getUserManagerImpls().size()
- !=
archivaRuntimeConfigurationAdmin.getArchivaRuntimeConfiguration().getUserManagerImpls().size();
+ !=
redbackRuntimeConfigurationAdmin.getRedbackRuntimeConfiguration().getUserManagerImpls().size();
userManagerChanged =
userManagerChanged || (
redbackRuntimeConfiguration.getUserManagerImpls().toString().hashCode()
- !=
archivaRuntimeConfigurationAdmin.getArchivaRuntimeConfiguration().getUserManagerImpls().toString().hashCode()
);
+ !=
redbackRuntimeConfigurationAdmin.getRedbackRuntimeConfiguration().getUserManagerImpls().toString().hashCode()
);
-
archivaRuntimeConfigurationAdmin.updateArchivaRuntimeConfiguration(
redbackRuntimeConfiguration );
+
redbackRuntimeConfigurationAdmin.updateRedbackRuntimeConfiguration(
redbackRuntimeConfiguration );
if ( userManagerChanged )
{
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/runtime/ldap/ArchivaLdapConnectionFactory.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/runtime/ldap/ArchivaLdapConnectionFactory.java?rev=1424675&r1=1424674&r2=1424675&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/runtime/ldap/ArchivaLdapConnectionFactory.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/runtime/ldap/ArchivaLdapConnectionFactory.java
Thu Dec 20 20:33:35 2012
@@ -20,7 +20,7 @@ package org.apache.archiva.web.runtime.l
import org.apache.archiva.admin.model.RepositoryAdminException;
import org.apache.archiva.admin.model.beans.LdapConfiguration;
-import org.apache.archiva.admin.model.runtime.ArchivaRuntimeConfigurationAdmin;
+import org.apache.archiva.admin.model.runtime.RedbackRuntimeConfigurationAdmin;
import
org.apache.archiva.redback.common.ldap.connection.ConfigurableLdapConnectionFactory;
import
org.apache.archiva.redback.common.ldap.connection.LdapConnectionConfiguration;
import org.springframework.stereotype.Service;
@@ -41,7 +41,7 @@ public class ArchivaLdapConnectionFactor
{
@Inject
- private ArchivaRuntimeConfigurationAdmin archivaRuntimeConfigurationAdmin;
+ private RedbackRuntimeConfigurationAdmin redbackRuntimeConfigurationAdmin;
private LdapConnectionConfiguration ldapConnectionConfiguration;
@@ -51,7 +51,7 @@ public class ArchivaLdapConnectionFactor
try
{
LdapConfiguration ldapConfiguration =
-
archivaRuntimeConfigurationAdmin.getArchivaRuntimeConfiguration().getLdapConfiguration();
+
redbackRuntimeConfigurationAdmin.getRedbackRuntimeConfiguration().getLdapConfiguration();
ldapConnectionConfiguration = new LdapConnectionConfiguration();
ldapConnectionConfiguration.setHostname(
ldapConfiguration.getHostName() );
ldapConnectionConfiguration.setPort( ldapConfiguration.getPort() );
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaConfigurableUsersManager.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaConfigurableUsersManager.java?rev=1424675&r1=1424674&r2=1424675&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaConfigurableUsersManager.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaConfigurableUsersManager.java
Thu Dec 20 20:33:35 2012
@@ -19,7 +19,7 @@ package org.apache.archiva.web.security;
*/
import org.apache.archiva.admin.model.RepositoryAdminException;
-import org.apache.archiva.admin.model.runtime.ArchivaRuntimeConfigurationAdmin;
+import org.apache.archiva.admin.model.runtime.RedbackRuntimeConfigurationAdmin;
import org.apache.archiva.redback.components.cache.Cache;
import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserManager;
@@ -48,7 +48,7 @@ public class ArchivaConfigurableUsersMan
{
@Inject
- private ArchivaRuntimeConfigurationAdmin archivaRuntimeConfigurationAdmin;
+ private RedbackRuntimeConfigurationAdmin redbackRuntimeConfigurationAdmin;
@Inject
private ApplicationContext applicationContext;
@@ -67,7 +67,7 @@ public class ArchivaConfigurableUsersMan
try
{
List<String> userManagerImpls =
-
archivaRuntimeConfigurationAdmin.getArchivaRuntimeConfiguration().getUserManagerImpls();
+
redbackRuntimeConfigurationAdmin.getRedbackRuntimeConfiguration().getUserManagerImpls();
log.info( "use userManagerImpls: '{}'", userManagerImpls );
userManagerPerId = new LinkedHashMap<String, UserManager>(
userManagerImpls.size() );
@@ -90,7 +90,7 @@ public class ArchivaConfigurableUsersMan
{
try
{
- return
archivaRuntimeConfigurationAdmin.getArchivaRuntimeConfiguration().isUseUsersCache();
+ return
redbackRuntimeConfigurationAdmin.getRedbackRuntimeConfiguration().isUseUsersCache();
}
catch ( RepositoryAdminException e )
{
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLockedAdminEnvironmentCheck.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLockedAdminEnvironmentCheck.java?rev=1424675&r1=1424674&r2=1424675&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLockedAdminEnvironmentCheck.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLockedAdminEnvironmentCheck.java
Thu Dec 20 20:33:35 2012
@@ -19,7 +19,7 @@ package org.apache.archiva.web.security;
*/
import org.apache.archiva.admin.model.RepositoryAdminException;
-import org.apache.archiva.admin.model.runtime.ArchivaRuntimeConfigurationAdmin;
+import org.apache.archiva.admin.model.runtime.RedbackRuntimeConfigurationAdmin;
import
org.apache.archiva.redback.integration.security.role.RedbackRoleConstants;
import org.apache.archiva.redback.rbac.RBACManager;
import org.apache.archiva.redback.rbac.RbacManagerException;
@@ -64,7 +64,7 @@ public class ArchivaLockedAdminEnvironme
private ApplicationContext applicationContext;
@Inject
- private ArchivaRuntimeConfigurationAdmin archivaRuntimeConfigurationAdmin;
+ private RedbackRuntimeConfigurationAdmin redbackRuntimeConfigurationAdmin;
private List<UserManager> userManagers;
@@ -73,7 +73,7 @@ public class ArchivaLockedAdminEnvironme
throws RepositoryAdminException
{
List<String> userManagerImpls =
-
archivaRuntimeConfigurationAdmin.getArchivaRuntimeConfiguration().getUserManagerImpls();
+
redbackRuntimeConfigurationAdmin.getRedbackRuntimeConfiguration().getUserManagerImpls();
userManagers = new ArrayList<UserManager>( userManagerImpls.size() );
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaUserManagerAuthenticator.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaUserManagerAuthenticator.java?rev=1424675&r1=1424674&r2=1424675&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaUserManagerAuthenticator.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaUserManagerAuthenticator.java
Thu Dec 20 20:33:35 2012
@@ -19,7 +19,7 @@ package org.apache.archiva.web.security;
*/
import org.apache.archiva.admin.model.RepositoryAdminException;
-import org.apache.archiva.admin.model.runtime.ArchivaRuntimeConfigurationAdmin;
+import org.apache.archiva.admin.model.runtime.RedbackRuntimeConfigurationAdmin;
import org.apache.archiva.redback.authentication.AbstractAuthenticator;
import org.apache.archiva.redback.authentication.AuthenticationConstants;
import org.apache.archiva.redback.authentication.AuthenticationDataSource;
@@ -28,7 +28,6 @@ import org.apache.archiva.redback.authen
import org.apache.archiva.redback.authentication.AuthenticationResult;
import org.apache.archiva.redback.authentication.Authenticator;
import
org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource;
-import
org.apache.archiva.redback.authentication.users.UserManagerAuthenticator;
import org.apache.archiva.redback.policy.AccountLockedException;
import org.apache.archiva.redback.policy.MustChangePasswordException;
import org.apache.archiva.redback.policy.PasswordEncoder;
@@ -44,11 +43,8 @@ import org.springframework.stereotype.Se
import javax.annotation.PostConstruct;
import javax.inject.Inject;
-import javax.inject.Named;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
/**
* @author Olivier Lamy
@@ -68,7 +64,7 @@ public class ArchivaUserManagerAuthentic
private ApplicationContext applicationContext;
@Inject
- private ArchivaRuntimeConfigurationAdmin archivaRuntimeConfigurationAdmin;
+ private RedbackRuntimeConfigurationAdmin redbackRuntimeConfigurationAdmin;
private List<UserManager> userManagers;
@@ -80,7 +76,7 @@ public class ArchivaUserManagerAuthentic
try
{
List<String> userManagerImpls =
-
archivaRuntimeConfigurationAdmin.getArchivaRuntimeConfiguration().getUserManagerImpls();
+
redbackRuntimeConfigurationAdmin.getRedbackRuntimeConfiguration().getUserManagerImpls();
userManagers = new ArrayList<UserManager>( userManagerImpls.size()
);
