From 9077dbddcd8788b8aa8befedea003d5cc1f9523a Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Fri, 19 Aug 2011 08:29:53 +0000
Subject: [PATCH] oups fix bad commit

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1159540 13f79535-47bb-0310-9956-ffa450edef68
---
 .../rest/services/RepositoriesServiceTest.java       | 12 ++++++++++++
 .../src/test/resources/log4j.xml                     |  3 ++-
 .../AbstractManagedRepositoriesAction.java           |  2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java
index e5c71db0d..5989c222d 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java
@@ -24,8 +24,11 @@ import org.apache.archiva.rest.api.services.RepositoriesService;
 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 " );
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/log4j.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/log4j.xml
index 88cce74a8..43d8a8bbb 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/log4j.xml
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/log4j.xml
@@ -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"/>
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoriesAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoriesAction.java
index 0f588d1d6..63bbb3a76 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoriesAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoriesAction.java
@@ -43,7 +43,7 @@ import javax.inject.Named;
  *
  * @version $Id$
  */
-public abstract class AbstractManagedReposigettoriesAction
+public abstract class AbstractManagedRepositoriesAction
     extends AbstractRepositoriesAdminAction
 {
     /**
-- 
2.39.5