import org.apache.archiva.redback.common.ldap.UserMapper;
import org.apache.archiva.redback.common.ldap.connection.LdapConnectionFactory;
+import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.commons.lang.StringUtils;
import org.apache.archiva.redback.authentication.AuthenticationDataSource;
import org.apache.archiva.redback.authentication.AuthenticationException;
import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource;
import org.apache.archiva.redback.common.ldap.connection.LdapConnection;
import org.apache.archiva.redback.common.ldap.connection.LdapException;
-import org.codehaus.plexus.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.users.ldap.service.LdapCacheService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
<property name="userConf" ref="userConfiguration"/>
</bean>
- <bean name="userConfiguration" class="org.codehaus.plexus.redback.configuration.UserConfiguration"
+ <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.UserConfiguration"
init-method="initialize">
<property name="configs">
<list>
* under the License.
*/
+import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.commons.lang.StringUtils;
import org.codehaus.plexus.interpolation.InterpolationException;
import org.codehaus.plexus.interpolation.PropertiesBasedValueSource;
import org.codehaus.plexus.interpolation.StringSearchInterpolator;
import org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory;
-import org.codehaus.plexus.redback.configuration.UserConfiguration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
* under the License.
*/
+import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.users.User;
-import org.codehaus.plexus.redback.configuration.UserConfiguration;
import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Service;
* under the License.
*/
-import org.codehaus.plexus.redback.configuration.UserConfiguration;
+import org.apache.archiva.redback.configuration.UserConfiguration;
import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
- <bean name="userConfiguration" class="org.codehaus.plexus.redback.configuration.UserConfiguration">
+ <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.UserConfiguration">
<property name="configs">
<list>
<value>src/test/resources/test.properties</value>
--- /dev/null
+package org.apache.archiva.redback.configuration;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.codehaus.plexus.evaluator.DefaultExpressionEvaluator;
+import org.codehaus.plexus.evaluator.EvaluatorException;
+import org.codehaus.plexus.evaluator.ExpressionEvaluator;
+import org.codehaus.plexus.evaluator.sources.SystemPropertyExpressionSource;
+import org.codehaus.plexus.registry.Registry;
+import org.codehaus.plexus.registry.RegistryException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
+import javax.inject.Named;
+import java.io.File;
+import java.util.List;
+
+/**
+ * ConfigurationFactory
+ *
+ * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
+ * @version $Id$
+ */
+@Service( "userConfiguration" )
+public class UserConfiguration
+{
+ private static final String DEFAULT_CONFIG_RESOURCE = "org/apache/archiva/redback/config-defaults.properties";
+
+ protected Logger log = LoggerFactory.getLogger( getClass() );
+
+ /**
+ *
+ *
+ * @deprecated Please configure the Plexus registry instead
+ */
+ private List<String> configs;
+
+ private Registry lookupRegistry;
+
+ private static final String PREFIX = "org.apache.archiva.redback";
+
+ @Inject
+ @Named( value = "commons-configuration" )
+ private Registry registry;
+
+ //TODO move this method call in the constructor
+
+ @PostConstruct
+ public void initialize()
+ throws RegistryException
+ {
+ performLegacyInitialization();
+
+ try
+ {
+ registry.addConfigurationFromResource( DEFAULT_CONFIG_RESOURCE, PREFIX );
+ }
+ catch ( RegistryException e )
+ {
+ // Ok, not found in context classloader; try the one in this jar.
+
+ ClassLoader prevCl = Thread.currentThread().getContextClassLoader();
+ try
+ {
+
+ Thread.currentThread().setContextClassLoader( getClass().getClassLoader() );
+ registry.addConfigurationFromResource( DEFAULT_CONFIG_RESOURCE, PREFIX );
+ }
+ finally
+ {
+ Thread.currentThread().setContextClassLoader( prevCl );
+ }
+ }
+
+ lookupRegistry = registry.getSubset( PREFIX );
+
+ if ( log.isDebugEnabled() )
+ {
+ log.debug( lookupRegistry.dump() );
+ }
+ }
+
+ private void performLegacyInitialization()
+ throws RegistryException
+ {
+ ExpressionEvaluator evaluator = new DefaultExpressionEvaluator();
+ evaluator.addExpressionSource( new SystemPropertyExpressionSource() );
+
+ if ( configs != null )
+ {
+ if ( !configs.isEmpty() )
+ {
+ // TODO: plexus should be able to do this on it's own.
+ log.warn(
+ "DEPRECATED: the <configs> elements is deprecated. Please configure the Plexus registry instead" );
+ }
+
+ for ( String configName : configs )
+ {
+ try
+ {
+ configName = evaluator.expand( configName );
+ }
+ catch ( EvaluatorException e )
+ {
+ log.warn( "Unable to resolve configuration name: " + e.getMessage(), e );
+ }
+ log.info( "Attempting to find configuration [{}] (resolved to [{}])", configName, configName );
+
+ registry.addConfigurationFromFile( new File( configName ), PREFIX );
+ }
+ }
+ }
+
+ public String getString( String key )
+ {
+ return lookupRegistry.getString( key );
+ }
+
+ public String getString( String key, String defaultValue )
+ {
+ String value = lookupRegistry.getString( key, defaultValue );
+ return value;
+ }
+
+ public int getInt( String key )
+ {
+ return lookupRegistry.getInt( key );
+ }
+
+ public int getInt( String key, int defaultValue )
+ {
+ return lookupRegistry.getInt( key, defaultValue );
+ }
+
+ public boolean getBoolean( String key )
+ {
+ return lookupRegistry.getBoolean( key );
+ }
+
+ public boolean getBoolean( String key, boolean defaultValue )
+ {
+ return lookupRegistry.getBoolean( key, defaultValue );
+ }
+
+ @SuppressWarnings( "unchecked" )
+ public List<String> getList( String key )
+ {
+ return lookupRegistry.getList( key );
+ }
+
+ public String getConcatenatedList( String key, String defaultValue )
+ {
+ String concatenatedList;
+ List<String> list = getList( key );
+ if ( !list.isEmpty() )
+ {
+ StringBuilder s = new StringBuilder();
+ for ( String value : list )
+ {
+ if ( s.length() > 0 )
+ {
+ s.append( "," );
+ }
+ s.append( value );
+ }
+ concatenatedList = s.toString();
+ }
+ else
+ {
+ concatenatedList = defaultValue;
+ }
+
+ return concatenatedList;
+ }
+
+ /**
+ * @return
+ * @deprecated
+ */
+ public List<String> getConfigs()
+ {
+ return configs;
+ }
+
+ /**
+ * @param configs
+ * @deprecated
+ */
+ public void setConfigs( List<String> configs )
+ {
+ this.configs = configs;
+ }
+
+ public Registry getRegistry()
+ {
+ return registry;
+ }
+
+ public void setRegistry( Registry registry )
+ {
+ this.registry = registry;
+ }
+}
+++ /dev/null
-package org.codehaus.plexus.redback.configuration;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.codehaus.plexus.evaluator.DefaultExpressionEvaluator;
-import org.codehaus.plexus.evaluator.EvaluatorException;
-import org.codehaus.plexus.evaluator.ExpressionEvaluator;
-import org.codehaus.plexus.evaluator.sources.SystemPropertyExpressionSource;
-import org.codehaus.plexus.registry.Registry;
-import org.codehaus.plexus.registry.RegistryException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-import javax.inject.Named;
-import java.io.File;
-import java.util.List;
-
-/**
- * ConfigurationFactory
- *
- * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
- * @version $Id$
- */
-@Service( "userConfiguration" )
-public class UserConfiguration
-{
- private static final String DEFAULT_CONFIG_RESOURCE = "org/codehaus/plexus/redback/config-defaults.properties";
-
- protected Logger log = LoggerFactory.getLogger( getClass() );
-
- /**
- *
- *
- * @deprecated Please configure the Plexus registry instead
- */
- private List<String> configs;
-
- private Registry lookupRegistry;
-
- private static final String PREFIX = "org.codehaus.plexus.redback";
-
- @Inject
- @Named( value = "commons-configuration" )
- private Registry registry;
-
- //TODO move this method call in the constructor
-
- @PostConstruct
- public void initialize()
- throws RegistryException
- {
- performLegacyInitialization();
-
- try
- {
- registry.addConfigurationFromResource( DEFAULT_CONFIG_RESOURCE, PREFIX );
- }
- catch ( RegistryException e )
- {
- // Ok, not found in context classloader; try the one in this jar.
-
- ClassLoader prevCl = Thread.currentThread().getContextClassLoader();
- try
- {
-
- Thread.currentThread().setContextClassLoader( getClass().getClassLoader() );
- registry.addConfigurationFromResource( DEFAULT_CONFIG_RESOURCE, PREFIX );
- }
- finally
- {
- Thread.currentThread().setContextClassLoader( prevCl );
- }
- }
-
- lookupRegistry = registry.getSubset( PREFIX );
-
- if ( log.isDebugEnabled() )
- {
- log.debug( lookupRegistry.dump() );
- }
- }
-
- private void performLegacyInitialization()
- throws RegistryException
- {
- ExpressionEvaluator evaluator = new DefaultExpressionEvaluator();
- evaluator.addExpressionSource( new SystemPropertyExpressionSource() );
-
- if ( configs != null )
- {
- if ( !configs.isEmpty() )
- {
- // TODO: plexus should be able to do this on it's own.
- log.warn(
- "DEPRECATED: the <configs> elements is deprecated. Please configure the Plexus registry instead" );
- }
-
- for ( String configName : configs )
- {
- try
- {
- configName = evaluator.expand( configName );
- }
- catch ( EvaluatorException e )
- {
- log.warn( "Unable to resolve configuration name: " + e.getMessage(), e );
- }
- log.info( "Attempting to find configuration [{}] (resolved to [{}])", configName, configName );
-
- registry.addConfigurationFromFile( new File( configName ), PREFIX );
- }
- }
- }
-
- public String getString( String key )
- {
- return lookupRegistry.getString( key );
- }
-
- public String getString( String key, String defaultValue )
- {
- String value = lookupRegistry.getString( key, defaultValue );
- return value;
- }
-
- public int getInt( String key )
- {
- return lookupRegistry.getInt( key );
- }
-
- public int getInt( String key, int defaultValue )
- {
- return lookupRegistry.getInt( key, defaultValue );
- }
-
- public boolean getBoolean( String key )
- {
- return lookupRegistry.getBoolean( key );
- }
-
- public boolean getBoolean( String key, boolean defaultValue )
- {
- return lookupRegistry.getBoolean( key, defaultValue );
- }
-
- @SuppressWarnings( "unchecked" )
- public List<String> getList( String key )
- {
- return lookupRegistry.getList( key );
- }
-
- public String getConcatenatedList( String key, String defaultValue )
- {
- String concatenatedList;
- List<String> list = getList( key );
- if ( !list.isEmpty() )
- {
- StringBuilder s = new StringBuilder();
- for ( String value : list )
- {
- if ( s.length() > 0 )
- {
- s.append( "," );
- }
- s.append( value );
- }
- concatenatedList = s.toString();
- }
- else
- {
- concatenatedList = defaultValue;
- }
-
- return concatenatedList;
- }
-
- /**
- * @return
- * @deprecated
- */
- public List<String> getConfigs()
- {
- return configs;
- }
-
- /**
- * @param configs
- * @deprecated
- */
- public void setConfigs( List<String> configs )
- {
- this.configs = configs;
- }
-
- public Registry getRegistry()
- {
- return registry;
- }
-
- public void setRegistry( Registry registry )
- {
- this.registry = registry;
- }
-}
default-lazy-init="true">
<context:annotation-config />
- <context:component-scan base-package="org.codehaus.plexus.redback.configuration"/>
+ <context:component-scan base-package="org.apache.archiva.redback.configuration"/>
</beans>
\ No newline at end of file
--- /dev/null
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# --------------------------------------------------------------------
+# Application Configuration
+
+application.timestamp=EEE d MMM yyyy HH:mm:ss Z
+
+# --------------------------------------------------------------------
+# JDBC Setup
+
+jdbc.driver.name=org.apache.derby.jdbc.EmbeddedDriver
+jdbc.url=jdbc:derby:${plexus.home}/database;create=true
+jdbc.username=sa
+jdbc.password=
+
+# --------------------------------------------------------------------
+# Email Settings
+
+email.jndiSessionName=java:comp/env/mail/Session
+email.smtp.host=localhost
+email.smtp.port=25
+email.smtp.ssl.enabled=false
+email.smtp.tls.enabled=false
+email.smtp.username=
+email.smtp.password=
+
+#TODO: move description elsewhere, remove bad default
+# All emails sent by the system will be from the following address
+#email.from.address=${user.name}@localhost
+# All emails sent by the system will be from the following user name (used in conjunction with address)
+#email.from.name=Unconfigured Username
+
+# If all email addresses (from new user registration) require an account validation email.
+email.validation.required=true
+# Timeout (in minutes) for the key generated for an email validation to remain valid.
+# 2880 minutes = 48 hours
+email.validation.timeout=2880
+# The subject line for the email message.
+email.validation.subject=Welcome
+
+#TODO: move description elsewhere, remove bad default
+# Get the Feedback to use for any outgoing emails.
+# NOTE: if feedback.path starts with a "/" it is appended to the end of the value provided in application.url
+# This value can be in the format/syntax of "/feedback.action" or even "mailto:feedback@application.com"
+#email.feedback.path=/feedback.action
+
+#Set the application base URL. The default is to derive it from the HTTP request
+#application.url=http://myurl.mycompany.com
+
+# --------------------------------------------------------------------
+# Auto Login Settings
+
+security.rememberme.enabled=true
+# Timeout in minutes ( 525600 minutes = 1 year )
+security.rememberme.timeout=525600
+
+# Single Sign On
+# Timeout in minutes
+security.signon.timeout=30
+
+# --------------------------------------------------------------------
+# Default Username Values
+redback.default.admin=admin
+
+# --------------------------------------------------------------------
+# Security Policies
+
+#security.policy.password.encoder=
+security.policy.password.previous.count=6
+security.policy.password.expiration.enabled=true
+security.policy.password.expiration.days=90
+security.policy.password.expiration.notify.days=10
+security.policy.allowed.login.attempt=10
+
+# turn off the perclick enforcement of various security policies, slightly
+# more heavyweight since it will ensure that the User object on each click
+# is up to date
+security.policy.strict.enforcement.enabled=true
+security.policy.strict.force.password.change.enabled=true
+
+# --------------------------------------------------------------------
+# Password Rules
+security.policy.password.rule.alphanumeric.enabled=false
+security.policy.password.rule.alphacount.enabled=true
+security.policy.password.rule.alphacount.minimum=1
+security.policy.password.rule.characterlength.enabled=true
+security.policy.password.rule.characterlength.minimum=1
+security.policy.password.rule.characterlength.maximum=24
+security.policy.password.rule.musthave.enabled=true
+security.policy.password.rule.numericalcount.enabled=true
+security.policy.password.rule.numericalcount.minimum=1
+security.policy.password.rule.reuse.enabled=true
+security.policy.password.rule.nowhitespace.enabled=true
+
+# --------------------------------------------------------------------
+# ldap settings
+#
+ldap.bind.authenticator.enabled=false
+
+# ldap options for configuration via properties file
+#ldap.config.hostname=
+#ldap.config.port=
+#ldap.config.base.dn=
+#ldap.config.context.factory=
+#ldap.config.bind.dn=
+#ldap.config.password=
+#ldap.config.authentication.method=
+
+# config parameter for the ConfigurableUserManager
+user.manager.impl=cached
+
+
+
+++ /dev/null
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-# --------------------------------------------------------------------
-# Application Configuration
-
-application.timestamp=EEE d MMM yyyy HH:mm:ss Z
-
-# --------------------------------------------------------------------
-# JDBC Setup
-
-jdbc.driver.name=org.apache.derby.jdbc.EmbeddedDriver
-jdbc.url=jdbc:derby:${plexus.home}/database;create=true
-jdbc.username=sa
-jdbc.password=
-
-# --------------------------------------------------------------------
-# Email Settings
-
-email.jndiSessionName=java:comp/env/mail/Session
-email.smtp.host=localhost
-email.smtp.port=25
-email.smtp.ssl.enabled=false
-email.smtp.tls.enabled=false
-email.smtp.username=
-email.smtp.password=
-
-#TODO: move description elsewhere, remove bad default
-# All emails sent by the system will be from the following address
-#email.from.address=${user.name}@localhost
-# All emails sent by the system will be from the following user name (used in conjunction with address)
-#email.from.name=Unconfigured Username
-
-# If all email addresses (from new user registration) require an account validation email.
-email.validation.required=true
-# Timeout (in minutes) for the key generated for an email validation to remain valid.
-# 2880 minutes = 48 hours
-email.validation.timeout=2880
-# The subject line for the email message.
-email.validation.subject=Welcome
-
-#TODO: move description elsewhere, remove bad default
-# Get the Feedback to use for any outgoing emails.
-# NOTE: if feedback.path starts with a "/" it is appended to the end of the value provided in application.url
-# This value can be in the format/syntax of "/feedback.action" or even "mailto:feedback@application.com"
-#email.feedback.path=/feedback.action
-
-#Set the application base URL. The default is to derive it from the HTTP request
-#application.url=http://myurl.mycompany.com
-
-# --------------------------------------------------------------------
-# Auto Login Settings
-
-security.rememberme.enabled=true
-# Timeout in minutes ( 525600 minutes = 1 year )
-security.rememberme.timeout=525600
-
-# Single Sign On
-# Timeout in minutes
-security.signon.timeout=30
-
-# --------------------------------------------------------------------
-# Default Username Values
-redback.default.admin=admin
-
-# --------------------------------------------------------------------
-# Security Policies
-
-#security.policy.password.encoder=
-security.policy.password.previous.count=6
-security.policy.password.expiration.enabled=true
-security.policy.password.expiration.days=90
-security.policy.password.expiration.notify.days=10
-security.policy.allowed.login.attempt=10
-
-# turn off the perclick enforcement of various security policies, slightly
-# more heavyweight since it will ensure that the User object on each click
-# is up to date
-security.policy.strict.enforcement.enabled=true
-security.policy.strict.force.password.change.enabled=true
-
-# --------------------------------------------------------------------
-# Password Rules
-security.policy.password.rule.alphanumeric.enabled=false
-security.policy.password.rule.alphacount.enabled=true
-security.policy.password.rule.alphacount.minimum=1
-security.policy.password.rule.characterlength.enabled=true
-security.policy.password.rule.characterlength.minimum=1
-security.policy.password.rule.characterlength.maximum=24
-security.policy.password.rule.musthave.enabled=true
-security.policy.password.rule.numericalcount.enabled=true
-security.policy.password.rule.numericalcount.minimum=1
-security.policy.password.rule.reuse.enabled=true
-security.policy.password.rule.nowhitespace.enabled=true
-
-# --------------------------------------------------------------------
-# ldap settings
-#
-ldap.bind.authenticator.enabled=false
-
-# ldap options for configuration via properties file
-#ldap.config.hostname=
-#ldap.config.port=
-#ldap.config.base.dn=
-#ldap.config.context.factory=
-#ldap.config.bind.dn=
-#ldap.config.password=
-#ldap.config.authentication.method=
-
-# config parameter for the ConfigurableUserManager
-user.manager.impl=cached
-
-
-
*/
import junit.framework.TestCase;
+import org.apache.archiva.redback.configuration.UserConfiguration;
import org.codehaus.plexus.util.StringUtils;
import org.junit.Test;
import org.junit.runner.RunWith;
default-lazy-init="true">
- <bean name="test" class="org.codehaus.plexus.redback.configuration.UserConfiguration">
+ <bean name="test" class="org.apache.archiva.redback.configuration.UserConfiguration">
<property name="configs">
<list>
<value>src/test/resources/props/test-another.properties</value>
import org.apache.archiva.redback.users.UserNotFoundException;
import org.apache.commons.lang.StringUtils;
import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource;
-import org.codehaus.plexus.redback.configuration.UserConfiguration;
+import org.apache.archiva.redback.configuration.UserConfiguration;
import org.codehaus.plexus.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.rbac.Role;
import java.util.Collection;
import java.util.List;
-import javax.annotation.Resource;
import javax.inject.Inject;
import javax.inject.Named;
import javax.mail.Address;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;
-import org.codehaus.plexus.redback.configuration.UserConfiguration;
+import org.apache.archiva.redback.configuration.UserConfiguration;
import org.codehaus.plexus.redback.keys.AuthenticationKey;
import org.codehaus.plexus.redback.policy.UserSecurityPolicy;
import org.codehaus.plexus.redback.policy.UserValidationSettings;
import org.apache.velocity.exception.MethodInvocationException;
import org.apache.velocity.exception.ParseErrorException;
import org.apache.velocity.exception.ResourceNotFoundException;
-import org.codehaus.plexus.redback.configuration.UserConfiguration;
+import org.apache.archiva.redback.configuration.UserConfiguration;
import org.codehaus.plexus.redback.keys.AuthenticationKey;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
* under the License.
*/
-import org.codehaus.plexus.redback.configuration.UserConfiguration;
+import org.apache.archiva.redback.configuration.UserConfiguration;
import org.springframework.context.ApplicationContext;
import org.springframework.web.context.support.WebApplicationContextUtils;
</property>
</bean>
- <bean name="userConfiguration#custom-url" class="org.codehaus.plexus.redback.configuration.UserConfiguration">
+ <bean name="userConfiguration#custom-url" class="org.apache.archiva.redback.configuration.UserConfiguration">
<property name="configs">
<list>
<value>src/test/config/mail.properties</value>
*/
import net.sf.ehcache.CacheManager;
+import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.users.UserManager;
import org.apache.archiva.redback.users.UserNotFoundException;
import org.apache.commons.lang.StringUtils;
import org.codehaus.plexus.cache.Cache;
import org.apache.archiva.redback.authentication.AuthenticationException;
import org.apache.archiva.redback.authentication.TokenBasedAuthenticationDataSource;
-import org.codehaus.plexus.redback.configuration.UserConfiguration;
import org.codehaus.plexus.redback.keys.AuthenticationKey;
import org.codehaus.plexus.redback.keys.KeyManager;
import org.codehaus.plexus.redback.keys.KeyManagerException;
*/
import org.apache.archiva.redback.users.UserManager;
-import org.codehaus.plexus.redback.configuration.UserConfiguration;
+import org.apache.archiva.redback.configuration.UserConfiguration;
import org.codehaus.plexus.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.role.RoleManager;
import org.codehaus.redback.rest.api.services.UserService;
import org.apache.archiva.redback.authentication.AuthenticationResult;
import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource;
import org.apache.archiva.redback.authentication.TokenBasedAuthenticationDataSource;
-import org.codehaus.plexus.redback.configuration.UserConfiguration;
+import org.apache.archiva.redback.configuration.UserConfiguration;
import org.codehaus.plexus.redback.keys.AuthenticationKey;
import org.codehaus.plexus.redback.keys.KeyManagerException;
import org.codehaus.plexus.redback.keys.KeyNotFoundException;
*/
import org.apache.archiva.redback.authentication.AuthenticationException;
+import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.users.UserManager;
import org.apache.struts2.ServletActionContext;
import org.apache.archiva.redback.authentication.AuthenticationConstants;
import org.apache.archiva.redback.authentication.AuthenticationDataSource;
import org.apache.archiva.redback.authentication.AuthenticationResult;
import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource;
-import org.codehaus.plexus.redback.configuration.UserConfiguration;
import org.codehaus.plexus.redback.policy.AccountLockedException;
import org.codehaus.plexus.redback.policy.MustChangePasswordException;
import org.codehaus.plexus.redback.role.RoleManager;
import org.apache.commons.lang.StringUtils;
import org.apache.struts2.ServletActionContext;
import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource;
-import org.codehaus.plexus.redback.configuration.UserConfiguration;
+import org.apache.archiva.redback.configuration.UserConfiguration;
import org.codehaus.plexus.redback.role.RoleManager;
import org.codehaus.plexus.redback.role.RoleManagerException;
import org.codehaus.plexus.redback.system.SecuritySession;
import javax.inject.Inject;
import javax.servlet.http.HttpServletRequest;
+import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.users.UserManager;
import org.apache.struts2.ServletActionContext;
-import org.codehaus.plexus.redback.configuration.UserConfiguration;
import org.codehaus.plexus.redback.policy.UserSecurityPolicy;
import org.codehaus.plexus.redback.system.DefaultSecuritySession;
import org.codehaus.plexus.redback.system.SecuritySession;
</configuration>
<requirements>
<requirement>
- <role>org.codehaus.plexus.redback.configuration.UserConfiguration</role>
+ <role>org.apache.archiva.redback.configuration.UserConfiguration</role>
<field-name>userConf</field-name>
</requirement>
</requirements>
</property>
</bean>
- <bean name="userConfiguration" class="org.codehaus.plexus.redback.configuration.UserConfiguration">
+ <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.UserConfiguration">
<property name="registry" ref="test-conf"/>
</bean>
</property>
</bean>
- <bean name="userConfiguration" class="org.codehaus.plexus.redback.configuration.UserConfiguration">
+ <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.UserConfiguration">
<property name="registry" ref="test-conf"/>
</bean>
* under the License.
*/
-import javax.annotation.Resource;
import javax.inject.Inject;
import javax.inject.Named;
-import org.codehaus.plexus.redback.configuration.UserConfiguration;
+import org.apache.archiva.redback.configuration.UserConfiguration;
/**
* Base class for cookie settings. These will only differ by their configuration keys.
* under the License.
*/
+import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.users.User;
-import org.codehaus.plexus.redback.configuration.UserConfiguration;
import org.codehaus.plexus.redback.policy.rules.MustHavePasswordRule;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
* under the License.
*/
-import org.codehaus.plexus.redback.configuration.UserConfiguration;
+import org.apache.archiva.redback.configuration.UserConfiguration;
import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;
* limitations under the License.
*/
-import org.codehaus.plexus.redback.configuration.UserConfiguration;
+import org.apache.archiva.redback.configuration.UserConfiguration;
import org.codehaus.plexus.redback.policy.PasswordRule;
import javax.inject.Inject;
</property>
</bean>
- <bean name="userConfiguration" class="org.codehaus.plexus.redback.configuration.UserConfiguration">
+ <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.UserConfiguration">
<property name="registry" ref="test-conf"/>
</bean>
</property>
</bean>
- <bean name="userConfiguration" class="org.codehaus.plexus.redback.configuration.UserConfiguration">
+ <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.UserConfiguration">
<property name="registry" ref="test-conf"/>
</bean>
</property>
</bean>
- <bean name="userConfiguration" class="org.codehaus.plexus.redback.configuration.UserConfiguration">
+ <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.UserConfiguration">
<property name="registry" ref="test-conf"/>
</bean>
</property>
</bean>
- <bean name="userConfiguration" class="org.codehaus.plexus.redback.configuration.UserConfiguration">
+ <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.UserConfiguration">
<property name="registry" ref="test-conf"/>
</bean>
</property>
</bean>
- <bean name="userConfiguration" class="org.codehaus.plexus.redback.configuration.UserConfiguration">
+ <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.UserConfiguration">
<property name="registry" ref="test-conf"/>
</bean>
</property>
</bean>
- <bean name="userConfiguration" class="org.codehaus.plexus.redback.configuration.UserConfiguration">
+ <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.UserConfiguration">
<property name="registry" ref="test-conf"/>
</bean>
import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserManager;
import org.apache.archiva.redback.users.UserNotFoundException;
-import org.codehaus.plexus.redback.configuration.UserConfiguration;
+import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.users.UserQuery;
import org.springframework.context.ApplicationContext;
import org.springframework.stereotype.Service;
<property name="password" value=""/>
</bean>
- <bean name="userConfiguration" class="org.codehaus.plexus.redback.configuration.UserConfiguration">
+ <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.UserConfiguration">
<property name="registry" ref="test-conf"/>
</bean>
projects / archiva.git / commitdiff