svn commit: r1159540 - in /archiva/trunk/archiva-modules/archiva-web: archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ archiva-rest/archiva-rest-services/src/test/resources/ archiva-webapp/src/main/java/org/apache/mave...

[olamy]

Author: olamy
Date: Fri Aug 19 08:29:53 2011
New Revision: 1159540

URL: http://svn.apache.org/viewvc?rev=1159540&view=rev
Log:
oups fix bad commit

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java
    
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/log4j.xml
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoriesAction.java

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java?rev=1159540&r1=1159539&r2=1159540&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java
 Fri Aug 19 08:29:53 2011
@@ -24,8 +24,11 @@ import org.apache.archiva.rest.api.servi
 import org.apache.cxf.jaxrs.client.JAXRSClientFactory;
 import org.apache.cxf.jaxrs.client.ServerWebApplicationException;
 import org.apache.cxf.jaxrs.client.WebClient;
+import org.codehaus.plexus.taskqueue.TaskQueue;
 import org.junit.Test;
 
+import javax.inject.Inject;
+import javax.inject.Named;
 import java.util.List;
 
 /**
@@ -34,6 +37,9 @@ import java.util.List;
 public class RepositoriesServiceTest
     extends AbstractArchivaRestTest
 {
+    @Inject @Named("taskQueue#repository-scanning")
+    private TaskQueue repositoryScanningQueue;
+
     RepositoriesService getRepositoriesService()
     {
         return JAXRSClientFactory.create( "http://localhost:"; + port + 
"/services/archivaServices/",
@@ -95,6 +101,12 @@ public class RepositoriesServiceTest
         WebClient.client( service ).header( "Authorization", 
authorizationHeader );
         WebClient.getConfig( service 
).getHttpConduit().getClient().setReceiveTimeout( 300000 );
         String repoId = service.getManagedRepositories().get( 0 ).getId();
+        /*
+        while ( service.alreadyScanning( repoId ) )
+        {
+            Thread.sleep( 1 );
+        }
+        */
         assertTrue( service.scanRepository( repoId, true ) );
 
         log.info( "sanRepo call ok " );

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/log4j.xml
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/log4j.xml?rev=1159540&r1=1159539&r2=1159540&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/log4j.xml
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/log4j.xml
 Fri Aug 19 08:29:53 2011
@@ -31,10 +31,11 @@
   <logger name="org.apache.cxf.jaxrs.interceptor.JAXRSInInterceptor">
     <level value="trace"/>
   </logger>
-  -->
   <logger name="org.apache.cxf.jaxrs.utils.JAXRSUtils">
     <level value="trace"/>
   </logger>
+  -->
+
 
   <logger name="org.codehaus.redback.rest.services" >
     <level value="debug"/>

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoriesAction.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoriesAction.java?rev=1159540&r1=1159539&r2=1159540&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoriesAction.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoriesAction.java
 Fri Aug 19 08:29:53 2011
@@ -43,7 +43,7 @@ import javax.inject.Named;
  *
  * @version $Id$
  */
-public abstract class AbstractManagedReposigettoriesAction
+public abstract class AbstractManagedRepositoriesAction
     extends AbstractRepositoriesAdminAction
 {
     /**