svn commit: r1171060 - /archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java

[olamy]

Author: olamy
Date: Thu Sep 15 11:25:04 2011
New Revision: 1171060

URL: http://svn.apache.org/viewvc?rev=1171060&view=rev
Log:
rest services path for test is configurable so align to the one defined in 
web.xml

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.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/AbstractArchivaRestTest.java?rev=1171060&r1=1171059&r2=1171060&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java
 Thu Sep 15 11:25:04 2011
@@ -51,15 +51,21 @@ public abstract class AbstractArchivaRes
         return 
"classpath*:META-INF/spring-context.xml,classpath:META-INF/spring-context-test.xml";
     }
 
+    protected String getRestServicesPath()
+    {
+        return "restServices";
+    }
+
     protected RepositoriesService getRepositoriesService()
     {
         return getRepositoriesService( null );
     }
 
+
     protected RepositoriesService getRepositoriesService( String authzHeader )
     {
         RepositoriesService service =
-            JAXRSClientFactory.create( "http://localhost:"; + port + 
"/services/archivaServices/",
+            JAXRSClientFactory.create( "http://localhost:"; + port + "/" + 
getRestServicesPath() + "/archivaServices/",
                                        RepositoriesService.class );
 
         if ( authzHeader != null )
@@ -74,7 +80,7 @@ public abstract class AbstractArchivaRes
     protected ManagedRepositoriesService getManagedRepositoriesService( String 
authzHeader )
     {
         ManagedRepositoriesService service =
-            JAXRSClientFactory.create( "http://localhost:"; + port + 
"/services/archivaServices/",
+            JAXRSClientFactory.create( "http://localhost:"; + port + "/" + 
getRestServicesPath() + "/archivaServices/",
                                        ManagedRepositoriesService.class );
 
         if ( authzHeader != null )
@@ -88,28 +94,30 @@ public abstract class AbstractArchivaRes
 
     protected PingService getPingService()
     {
-        return JAXRSClientFactory.create( "http://localhost:"; + port + 
"/services/archivaServices/",
-                                          PingService.class );
+        return JAXRSClientFactory.create(
+            "http://localhost:"; + port + "/" + getRestServicesPath() + 
"/archivaServices/", PingService.class );
     }
 
     protected RemoteRepositoriesService getRemoteRepositoriesService()
     {
-        return JAXRSClientFactory.create( "http://localhost:"; + port + 
"/services/archivaServices/",
-                                          RemoteRepositoriesService.class );
+        return JAXRSClientFactory.create(
+            "http://localhost:"; + port + "/" + getRestServicesPath() + 
"/archivaServices/",
+            RemoteRepositoriesService.class );
 
 
     }
 
     protected RepositoryGroupService getRepositoryGroupService()
     {
-        return JAXRSClientFactory.create( "http://localhost:"; + port + 
"/services/archivaServices/",
-                                          RepositoryGroupService.class );
+        return JAXRSClientFactory.create(
+            "http://localhost:"; + port + "/" + getRestServicesPath() + 
"/archivaServices/",
+            RepositoryGroupService.class );
     }
 
     protected ProxyConnectorService getProxyConnectorService()
     {
         ProxyConnectorService service =
-            JAXRSClientFactory.create( "http://localhost:"; + port + 
"/services/archivaServices/",
+            JAXRSClientFactory.create( "http://localhost:"; + port + "/" + 
getRestServicesPath() + "/archivaServices/",
                                        ProxyConnectorService.class );
 
         WebClient.client( service ).header( "Authorization", 
authorizationHeader );
@@ -120,7 +128,7 @@ public abstract class AbstractArchivaRes
     protected NetworkProxyService getNetworkProxyService()
     {
         NetworkProxyService service =
-            JAXRSClientFactory.create( "http://localhost:"; + port + 
"/services/archivaServices/",
+            JAXRSClientFactory.create( "http://localhost:"; + port + "/" + 
getRestServicesPath() + "/archivaServices/",
                                        NetworkProxyService.class );
 
         WebClient.client( service ).header( "Authorization", 
authorizationHeader );
@@ -131,7 +139,7 @@ public abstract class AbstractArchivaRes
     protected ArchivaAdministrationService getArchivaAdministrationService()
     {
         ArchivaAdministrationService service =
-            JAXRSClientFactory.create( "http://localhost:"; + port + 
"/services/archivaServices/",
+            JAXRSClientFactory.create( "http://localhost:"; + port + "/" + 
getRestServicesPath() + "/archivaServices/",
                                        ArchivaAdministrationService.class );
 
         WebClient.client( service ).header( "Authorization", 
authorizationHeader );
@@ -142,7 +150,8 @@ public abstract class AbstractArchivaRes
     protected SearchService getSearchService( String authzHeader )
     {
         SearchService service =
-            JAXRSClientFactory.create( "http://localhost:"; + port + 
"/services/archivaServices/", SearchService.class );
+            JAXRSClientFactory.create( "http://localhost:"; + port + "/" + 
getRestServicesPath() + "/archivaServices/",
+                                       SearchService.class );
 
         if ( authzHeader != null )
         {