Author: olamy
Date: Thu Mar 1 16:34:03 2012
New Revision: 1295659
URL: http://svn.apache.org/viewvc?rev=1295659&view=rev
Log:
fix unit tests
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/AbstractDownloadTest.java
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=1295659&r1=1295658&r2=1295659&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Thu Mar 1
16:34:03 2012
@@ -352,6 +352,18 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-jaxrs</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-xc</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-bundle-jaxrs</artifactId>
<exclusions>
@@ -395,6 +407,10 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/AbstractDownloadTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/AbstractDownloadTest.java?rev=1295659&r1=1295658&r2=1295659&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/AbstractDownloadTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/AbstractDownloadTest.java
Thu Mar 1 16:34:03 2012
@@ -31,6 +31,7 @@ import org.apache.cxf.common.util.Base64
import org.apache.cxf.jaxrs.client.JAXRSClientFactory;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.transport.servlet.CXFServlet;
+import org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider;
import org.codehaus.redback.integration.security.role.RedbackRoleConstants;
import org.codehaus.redback.rest.api.model.User;
import org.codehaus.redback.rest.api.services.RoleManagementService;
@@ -47,6 +48,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.web.context.ContextLoaderListener;
+import java.util.Collections;
+
/**
* @author Olivier Lamy
*/
@@ -153,7 +156,8 @@ public abstract class AbstractDownloadTe
{
ProxyConnectorService service =
JAXRSClientFactory.create( getBaseUrl() + "/" +
getRestServicesPath() + "/archivaServices/",
- ProxyConnectorService.class );
+ ProxyConnectorService.class,
+ Collections.singletonList( new
JacksonJaxbJsonProvider() ) );
WebClient.client( service ).header( "Authorization",
authorizationHeader );
WebClient.getConfig( service
).getHttpConduit().getClient().setReceiveTimeout( 300000L );
@@ -164,7 +168,8 @@ public abstract class AbstractDownloadTe
{
RemoteRepositoriesService service =
JAXRSClientFactory.create( getBaseUrl() + "/" +
getRestServicesPath() + "/archivaServices/",
- RemoteRepositoriesService.class );
+ RemoteRepositoriesService.class,
+ Collections.singletonList( new
JacksonJaxbJsonProvider() ) );
WebClient.client( service ).header( "Authorization",
authorizationHeader );
WebClient.getConfig( service
).getHttpConduit().getClient().setReceiveTimeout( 300000L );
@@ -175,7 +180,8 @@ public abstract class AbstractDownloadTe
{
ManagedRepositoriesService service =
JAXRSClientFactory.create( getBaseUrl() + "/" +
getRestServicesPath() + "/archivaServices/",
- ManagedRepositoriesService.class );
+ ManagedRepositoriesService.class,
+ Collections.singletonList( new
JacksonJaxbJsonProvider() ) );
WebClient.client( service ).header( "Authorization",
authorizationHeader );
WebClient.getConfig( service
).getHttpConduit().getClient().setReceiveTimeout( 300000L );
@@ -187,7 +193,8 @@ public abstract class AbstractDownloadTe
{
RepositoryGroupService service =
JAXRSClientFactory.create( getBaseUrl() + "/" +
getRestServicesPath() + "/archivaServices/",
- RepositoryGroupService.class );
+ RepositoryGroupService.class,
+ Collections.singletonList( new
JacksonJaxbJsonProvider() ) );
WebClient.client( service ).header( "Authorization",
authorizationHeader );
WebClient.getConfig( service
).getHttpConduit().getClient().setReceiveTimeout( 300000L );
@@ -198,7 +205,8 @@ public abstract class AbstractDownloadTe
{
RepositoriesService service =
JAXRSClientFactory.create( getBaseUrl() + "/" +
getRestServicesPath() + "/archivaServices/",
- RepositoriesService.class );
+ RepositoriesService.class,
+ Collections.singletonList( new
JacksonJaxbJsonProvider() ) );
WebClient.client( service ).header( "Authorization",
authorizationHeader );
WebClient.getConfig( service
).getHttpConduit().getClient().setReceiveTimeout( 300000L );
@@ -209,7 +217,8 @@ public abstract class AbstractDownloadTe
{
SearchService service =
JAXRSClientFactory.create( getBaseUrl() + "/" +
getRestServicesPath() + "/archivaServices/",
- SearchService.class );
+ SearchService.class,
+ Collections.singletonList( new
JacksonJaxbJsonProvider() ) );
WebClient.client( service ).header( "Authorization",
authorizationHeader );
WebClient.getConfig( service
).getHttpConduit().getClient().setReceiveTimeout( 300000L );
@@ -227,7 +236,8 @@ public abstract class AbstractDownloadTe
{
RoleManagementService service =
JAXRSClientFactory.create( "http://localhost:"; + port + "/" +
getRestServicesPath() + "/redbackServices/",
- RoleManagementService.class );
+ RoleManagementService.class,
+ Collections.singletonList( new
JacksonJaxbJsonProvider() ) );
// for debuging purpose
WebClient.getConfig( service
).getHttpConduit().getClient().setReceiveTimeout( 3000000L );
@@ -243,7 +253,7 @@ public abstract class AbstractDownloadTe
{
UserService service =
JAXRSClientFactory.create( "http://localhost:"; + port + "/" +
getRestServicesPath() + "/redbackServices/",
- UserService.class );
+ UserService.class,
Collections.singletonList( new JacksonJaxbJsonProvider() ) );
// for debuging purpose
WebClient.getConfig( service
).getHttpConduit().getClient().setReceiveTimeout( 3000000L );
