svn commit: r1412335 - in /archiva/redback/redback-core/trunk: redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/ redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redba...

[ol...@apache.org]

Author: olamy
Date: Wed Nov 21 22:29:59 2012
New Revision: 1412335

URL: http://svn.apache.org/viewvc?rev=1412335&view=rev
Log:
remove some system.out

Modified:
    archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/AbstractRestServicesTest.java
    archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/AbstractRoleManagerTest.java
    archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-tests/src/main/java/org/apache/archiva/redback/tests/AbstractRbacManagerPerformanceTestCase.java
    archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-tests/src/main/java/org/apache/archiva/redback/tests/RbacManagerEventTracker.java
    archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-configurable/src/main/java/org/apache/archiva/redback/users/configurable/ConfigurableUserManager.java
    archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/LdapUserManagerTest.java

Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/AbstractRestServicesTest.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/AbstractRestServicesTest.java?rev=1412335&r1=1412334&r2=1412335&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/AbstractRestServicesTest.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/AbstractRestServicesTest.java Wed Nov 21 22:29:59 2012
@@ -78,7 +78,7 @@ public abstract class AbstractRestServic
 
     protected String getSpringConfigLocation()
     {
-        return "classpath*:META-INF/spring-context.xml";
+        return "classpath*:spring-context.xml,classpath*:META-INF/spring-context.xml";
     }
 
 

Modified: archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/AbstractRoleManagerTest.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/AbstractRoleManagerTest.java?rev=1412335&r1=1412334&r2=1412335&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/AbstractRoleManagerTest.java (original)
+++ archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/AbstractRoleManagerTest.java Wed Nov 21 22:29:59 2012
@@ -30,6 +30,8 @@ import org.apache.archiva.redback.role.m
 import org.apache.archiva.redback.role.util.RoleModelUtils;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
@@ -47,6 +49,8 @@ public abstract class AbstractRoleManage
     extends TestCase
 {
 
+    protected Logger logger = LoggerFactory.getLogger( getClass() );
+
     protected RBACManager rbacManager;
 
     protected RoleManager roleManager;
@@ -112,7 +116,7 @@ public abstract class AbstractRoleManage
 
         for ( String roleName : assignments )
         {
-            System.out.println( roleName );
+            logger.info( roleName );
             assertTrue( "Test Role".equals( roleName ) || "Foo 2 - frigid".equals( roleName ) || "Test Role 1".equals( roleName ) );
         }
     }

Modified: archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-tests/src/main/java/org/apache/archiva/redback/tests/AbstractRbacManagerPerformanceTestCase.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-tests/src/main/java/org/apache/archiva/redback/tests/AbstractRbacManagerPerformanceTestCase.java?rev=1412335&r1=1412334&r2=1412335&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-tests/src/main/java/org/apache/archiva/redback/tests/AbstractRbacManagerPerformanceTestCase.java (original)
+++ archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-tests/src/main/java/org/apache/archiva/redback/tests/AbstractRbacManagerPerformanceTestCase.java Wed Nov 21 22:29:59 2012
@@ -29,6 +29,8 @@ import org.apache.archiva.redback.rbac.O
 import org.apache.archiva.redback.tests.utils.RBACDefaults;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
@@ -43,6 +45,8 @@ public class AbstractRbacManagerPerforma
 
     private RBACDefaults rbacDefaults;
 
+    protected Logger logger = LoggerFactory.getLogger( getClass() );
+
     public void setRbacManager( RBACManager store )
     {
         this.rbacManager = store;
@@ -92,7 +96,7 @@ public class AbstractRbacManagerPerforma
         double ratio = (double) elapsed / (double) ONESECOND; // ratio of time to 1 second.
         double opsPerSecond = (double) iterations / ratio;
 
-        System.out.println( "Performance " + msg + ": " + opsPerSecond + " operations per second. (effective)" );
+        logger.info( "Performance {}: {} operations per second. (effective)", msg, opsPerSecond );
 
         if ( opsPerSecond < threshold )
         {
@@ -107,7 +111,7 @@ public class AbstractRbacManagerPerforma
             stats.append( "\nRatio          : " ).append( Double.toString( ratio ) );
             stats.append( "\nOps per second : " ).append( Double.toString( opsPerSecond ) );
 
-            System.out.println( stats.toString() );
+            logger.info( stats.toString() );
 
             fail( "Performance Error: " + msg + " expecting greater than [" + threshold + "], actual [" + opsPerSecond
                 + "]" );

Modified: archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-tests/src/main/java/org/apache/archiva/redback/tests/RbacManagerEventTracker.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-tests/src/main/java/org/apache/archiva/redback/tests/RbacManagerEventTracker.java?rev=1412335&r1=1412334&r2=1412335&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-tests/src/main/java/org/apache/archiva/redback/tests/RbacManagerEventTracker.java (original)
+++ archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-tests/src/main/java/org/apache/archiva/redback/tests/RbacManagerEventTracker.java Wed Nov 21 22:29:59 2012
@@ -23,6 +23,8 @@ import org.apache.archiva.redback.rbac.R
 import org.apache.archiva.redback.rbac.Permission;
 import org.apache.archiva.redback.rbac.Role;
 import org.apache.archiva.redback.rbac.UserAssignment;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -48,6 +50,8 @@ public class RbacManagerEventTracker
 
     public List<String> removedPermissionNames = new ArrayList<String>();
 
+    protected Logger logger = LoggerFactory.getLogger( getClass() );
+
     public void rbacInit( boolean freshdb )
     {
         log( "Init - freshdb: " + freshdb );
@@ -107,6 +111,6 @@ public class RbacManagerEventTracker
 
     private void log( String msg )
     {
-        System.out.println( "[RBAC Event Tracker] " + msg );
+        logger.info( "[RBAC Event Tracker] : {}", msg );
     }
 }

Modified: archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-configurable/src/main/java/org/apache/archiva/redback/users/configurable/ConfigurableUserManager.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-configurable/src/main/java/org/apache/archiva/redback/users/configurable/ConfigurableUserManager.java?rev=1412335&r1=1412334&r2=1412335&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-configurable/src/main/java/org/apache/archiva/redback/users/configurable/ConfigurableUserManager.java (original)
+++ archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-configurable/src/main/java/org/apache/archiva/redback/users/configurable/ConfigurableUserManager.java Wed Nov 21 22:29:59 2012
@@ -60,8 +60,9 @@ public class ConfigurableUserManager
                 "User Manager Configuration Missing: " + USER_MANAGER_IMPL + " configuration property" );
         }
 
+        log.info( "use userManager impl with key: '{}'", userManagerRole );
+
         userManagerImpl = applicationContext.getBean( "userManager#" + userManagerRole, UserManager.class );
-        // (UserManager) container.lookup( UserManager.class.getName(), userManagerRole );
     }
 
     public User addUser( User user )

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=1412335&r1=1412334&r2=1412335&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 Wed Nov 21 22:29:59 2012
@@ -212,8 +212,8 @@ public class LdapUserManagerTest
         assertEquals( "jesse", jesse.getPrincipal().toString() );
         assertEquals( "jesse@apache.org", jesse.getEmail() );
         assertEquals( "foo", jesse.getFullName() );
-        System.out.println( "=====>"+jesse.getEncodedPassword());
-        System.out.println( "=====>"+passwordEncoder.encodePassword( "foo" ));
+        log.info( "=====>"+jesse.getEncodedPassword());
+        log.info( "=====>"+passwordEncoder.encodePassword( "foo" ));
         assertTrue( passwordEncoder.isPasswordValid( jesse.getEncodedPassword(), "foo" ) );
 
     }