Author: olamy
Date: Thu Dec 6 14:31:05 2012
New Revision: 1417908
URL: http://svn.apache.org/viewvc?rev=1417908&view=rev
Log:
userConfiguration#default bean must be know declared tru an alias to avoid
duplicate bean ids
Modified:
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/test/java/org/apache/archiva/redback/common/ldap/LdapUserMapperTest.java
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/test/resources/spring-context.xml
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java
archiva/redback/redback-core/trunk/redback-configuration/src/main/resources/META-INF/spring-context.xml
archiva/redback/redback-core/trunk/redback-data-management/src/test/resources/spring-context.xml
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/resources/spring-context.xml
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml
archiva/redback/redback-core/trunk/redback-rbac/redback-authorization-rbac/src/test/resources/spring-context.xml
archiva/redback/redback-core/trunk/redback-users/redback-authentication-users/src/test/resources/spring-context.xml
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-cached/src/test/resources/spring-context.xml
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/LdapUserManagerTest.java
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/service/LdapCacheServiceTest.java
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/test/resources/spring-context.xml
Modified:
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/test/java/org/apache/archiva/redback/common/ldap/LdapUserMapperTest.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/test/java/org/apache/archiva/redback/common/ldap/LdapUserMapperTest.java?rev=1417908&r1=1417907&r2=1417908&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/test/java/org/apache/archiva/redback/common/ldap/LdapUserMapperTest.java
(original)
+++
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/test/java/org/apache/archiva/redback/common/ldap/LdapUserMapperTest.java
Thu Dec 6 14:31:05 2012
@@ -30,7 +30,7 @@ import javax.inject.Inject;
import javax.inject.Named;
@RunWith( SpringJUnit4ClassRunner.class )
-@ContextConfiguration( locations = {
"classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } )
+@ContextConfiguration( locations = {
"classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
public class LdapUserMapperTest
extends TestCase
{
Modified:
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/test/resources/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/test/resources/spring-context.xml?rev=1417908&r1=1417907&r2=1417908&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/test/resources/spring-context.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/test/resources/spring-context.xml
Thu Dec 6 14:31:05 2012
@@ -23,12 +23,14 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd";>
- <bean name="userConfiguration#default"
class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
+ <bean name="userConfiguration#redback"
class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
<property name="configs">
<list>
<value>src/test/resources/test.properties</value>
</list>
</property>
</bean>
+
+ <alias name="userConfiguration#redback" alias="userConfiguration#default"/>
</beans>
\ No newline at end of file
Modified:
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java?rev=1417908&r1=1417907&r2=1417908&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java
(original)
+++
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java
Thu Dec 6 14:31:05 2012
@@ -41,7 +41,7 @@ import java.util.List;
* @author <a href="mailto:[email protected]";>Joakim Erdfelt</a>
* @since 2.1
*/
-@Service("userConfiguration#default")
+@Service("userConfiguration#redback")
public class DefaultUserConfiguration
implements UserConfiguration
{
Modified:
archiva/redback/redback-core/trunk/redback-configuration/src/main/resources/META-INF/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-configuration/src/main/resources/META-INF/spring-context.xml?rev=1417908&r1=1417907&r2=1417908&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-configuration/src/main/resources/META-INF/spring-context.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-configuration/src/main/resources/META-INF/spring-context.xml
Thu Dec 6 14:31:05 2012
@@ -29,6 +29,4 @@
<context:annotation-config />
<context:component-scan
base-package="org.apache.archiva.redback.configuration"/>
- <alias name="userConfiguration#default" alias="userConfiguration#redback"/>
-
</beans>
\ No newline at end of file
Modified:
archiva/redback/redback-core/trunk/redback-data-management/src/test/resources/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-data-management/src/test/resources/spring-context.xml?rev=1417908&r1=1417907&r2=1417908&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-data-management/src/test/resources/spring-context.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-data-management/src/test/resources/spring-context.xml
Thu Dec 6 14:31:05 2012
@@ -42,4 +42,6 @@
<property name="password" value=""/>
</bean>
+ <alias name="userConfiguration#redback" alias="userConfiguration#default"/>
+
</beans>
\ No newline at end of file
Modified:
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/resources/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/resources/spring-context.xml?rev=1417908&r1=1417907&r2=1417908&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/resources/spring-context.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/resources/spring-context.xml
Thu Dec 6 14:31:05 2012
@@ -55,4 +55,6 @@
<property name="velocityEngine" ref="velocityEngine#redback"/>
</bean>
+ <alias name="userConfiguration#redback" alias="userConfiguration#default"/>
+
</beans>
\ No newline at end of file
Modified:
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml?rev=1417908&r1=1417907&r2=1417908&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml
Thu Dec 6 14:31:05 2012
@@ -40,4 +40,6 @@
</bean>
+ <alias name="userConfiguration#redback" alias="userConfiguration#default"/>
+
</beans>
\ No newline at end of file
Modified:
archiva/redback/redback-core/trunk/redback-rbac/redback-authorization-rbac/src/test/resources/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-authorization-rbac/src/test/resources/spring-context.xml?rev=1417908&r1=1417907&r2=1417908&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-rbac/redback-authorization-rbac/src/test/resources/spring-context.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-rbac/redback-authorization-rbac/src/test/resources/spring-context.xml
Thu Dec 6 14:31:05 2012
@@ -20,11 +20,8 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns:context="http://www.springframework.org/schema/context";
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
- http://www.springframework.org/schema/context
-
http://www.springframework.org/schema/context/spring-context-3.0.xsd";
+ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd";
default-lazy-init="true">
<bean name="userManager#cached"
class="org.apache.archiva.redback.users.cached.CachedUserManager">
@@ -44,4 +41,7 @@
<property name="timeToIdleSeconds" value="1800"/>
<property name="timeToLiveSeconds" value="14400"/>
</bean>
+
+
+ <alias name="userConfiguration#redback" alias="userConfiguration#default"/>
</beans>
\ No newline at end of file
Modified:
archiva/redback/redback-core/trunk/redback-users/redback-authentication-users/src/test/resources/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-authentication-users/src/test/resources/spring-context.xml?rev=1417908&r1=1417907&r2=1417908&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-users/redback-authentication-users/src/test/resources/spring-context.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-users/redback-authentication-users/src/test/resources/spring-context.xml
Thu Dec 6 14:31:05 2012
@@ -20,11 +20,8 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns:context="http://www.springframework.org/schema/context";
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
- http://www.springframework.org/schema/context
-
http://www.springframework.org/schema/context/spring-context-3.0.xsd";
+ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd";
default-lazy-init="true">
<bean name="authenticator#user-manager"
class="org.apache.archiva.redback.authentication.users.UserManagerAuthenticator">
@@ -34,4 +31,6 @@
<alias name="userManager#memory" alias="userManager#jdo"/>
+ <alias name="userConfiguration#redback" alias="userConfiguration#default"/>
+
</beans>
\ No newline at end of file
Modified:
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-cached/src/test/resources/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-cached/src/test/resources/spring-context.xml?rev=1417908&r1=1417907&r2=1417908&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-cached/src/test/resources/spring-context.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-cached/src/test/resources/spring-context.xml
Thu Dec 6 14:31:05 2012
@@ -42,5 +42,6 @@
<property name="timeToLiveSeconds" value="14400"/>
</bean>
+ <alias name="userConfiguration#redback" alias="userConfiguration#default"/>
</beans>
\ No newline at end of file
Modified:
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/LdapUserManagerTest.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/LdapUserManagerTest.java?rev=1417908&r1=1417907&r2=1417908&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/LdapUserManagerTest.java
(original)
+++
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/LdapUserManagerTest.java
Thu Dec 6 14:31:05 2012
@@ -61,7 +61,7 @@ import java.util.List;
*/
@RunWith( SpringJUnit4ClassRunner.class )
-@ContextConfiguration( locations = {
"classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } )
+@ContextConfiguration( locations = {
"classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
public class LdapUserManagerTest
extends TestCase
{
Modified:
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/service/LdapCacheServiceTest.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/service/LdapCacheServiceTest.java?rev=1417908&r1=1417907&r2=1417908&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/service/LdapCacheServiceTest.java
(original)
+++
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/service/LdapCacheServiceTest.java
Thu Dec 6 14:31:05 2012
@@ -34,7 +34,7 @@ import javax.inject.Inject;
* @version
*/
@RunWith( SpringJUnit4ClassRunner.class )
-@ContextConfiguration( locations = {
"classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } )
+@ContextConfiguration( locations = {
"classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
public class LdapCacheServiceTest
extends TestCase
{
Modified:
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/test/resources/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/test/resources/spring-context.xml?rev=1417908&r1=1417907&r2=1417908&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/test/resources/spring-context.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/test/resources/spring-context.xml
Thu Dec 6 14:31:05 2012
@@ -55,5 +55,6 @@
<property name="userObjectClass" value="inetOrgPerson"/>
<property name="userConf" ref="userConfiguration#default"/>
</bean>
+ <alias name="userConfiguration#redback" alias="userConfiguration#default"/>
</beans>
\ No newline at end of file
