Author: olamy
Date: Fri Aug 19 07:53:42 2011
New Revision: 1159531
URL: http://svn.apache.org/viewvc?rev=1159531&view=rev
Log:
[MRM-1490] expose service tru rest
impl Repo management service
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java
- copied, changed from r1159530,
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org.apache.archiva.rest.services/DefaultPingService.java
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/ManagedRepository.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/RemoteRepository.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/RepositoriesService.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org.apache.archiva.rest.services/DefaultPingService.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org.apache.archiva.rest.services/DefaultRepositoriesService.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/PingServiceTest.java
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-api/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml?rev=1159531&r1=1159530&r2=1159531&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
Fri Aug 19 07:53:42 2011
@@ -29,6 +29,11 @@
<dependencies>
<dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-security</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.codehaus.redback</groupId>
<artifactId>redback-authorization-api</artifactId>
<exclusions>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/ManagedRepository.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/ManagedRepository.java?rev=1159531&r1=1159530&r2=1159531&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/ManagedRepository.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/ManagedRepository.java
Fri Aug 19 07:53:42 2011
@@ -28,11 +28,11 @@ import java.io.Serializable;
@XmlRootElement( name = "managedRepository" )
public class ManagedRepository
implements Serializable
-{
+{
private String id;
-
+
private String name;
-
+
private String url;
private String layout;
@@ -40,12 +40,12 @@ public class ManagedRepository
private boolean snapshots = false;
private boolean releases = false;
-
+
public ManagedRepository()
{
// no op
}
-
+
public ManagedRepository( String id, String name, String url, String
layout, boolean snapshots, boolean releases )
{
this.id = id;
@@ -55,56 +55,33 @@ public class ManagedRepository
this.snapshots = snapshots;
this.releases = releases;
}
-
- public boolean equals(Object other)
- {
- if ( this == other)
- {
- return true;
- }
-
- if ( !(other instanceof ManagedRepository) )
- {
- return false;
- }
-
- ManagedRepository that = (ManagedRepository) other;
- boolean result = true;
- result = result && ( getId() == null ? that.getId() == null :
getId().equals( that.getId() ) );
- return result;
- }
-
+
+
public String getId()
{
return this.id;
- }
+ }
public String getLayout()
{
return this.layout;
- }
+ }
public String getName()
{
return this.name;
}
-
+
public String getUrl()
{
return this.url;
- }
-
- public int hashCode()
- {
- int result = 17;
- result = 37 * result + ( id != null ? id.hashCode() : 0 );
- return result;
- }
+ }
+
public boolean isReleases()
{
return this.releases;
- }
+ }
/**
* Get null
@@ -112,35 +89,68 @@ public class ManagedRepository
public boolean isSnapshots()
{
return this.snapshots;
- }
-
- public void setId(String id)
+ }
+
+ public void setId( String id )
{
this.id = id;
- }
-
- public void setLayout(String layout)
+ }
+
+ public void setLayout( String layout )
{
this.layout = layout;
- }
+ }
- public void setName(String name)
+ public void setName( String name )
{
this.name = name;
- }
-
- public void setReleases(boolean releases)
+ }
+
+ public void setReleases( boolean releases )
{
this.releases = releases;
- }
+ }
- public void setSnapshots(boolean snapshots)
+ public void setSnapshots( boolean snapshots )
{
this.snapshots = snapshots;
- }
+ }
- public void setUrl(String url)
+ public void setUrl( String url )
{
this.url = url;
}
+
+
+ public int hashCode()
+ {
+ int result = 17;
+ result = 37 * result + ( id != null ? id.hashCode() : 0 );
+ return result;
+ }
+
+ public boolean equals( Object other )
+ {
+ if ( this == other )
+ {
+ return true;
+ }
+
+ if ( !( other instanceof ManagedRepository ) )
+ {
+ return false;
+ }
+
+ ManagedRepository that = (ManagedRepository) other;
+ boolean result = true;
+ result = result && ( getId() == null ? that.getId() == null :
getId().equals( that.getId() ) );
+ return result;
+ }
+
+ @Override
+ public String toString()
+ {
+ return "ManagedRepository{" + "id='" + id + '\'' + ", name='" + name +
'\'' + ", url='" + url + '\''
+ + ", layout='" + layout + '\'' + ", snapshots=" + snapshots + ",
releases=" + releases + '}';
+ }
}
\ No newline at end of file
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/RemoteRepository.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/RemoteRepository.java?rev=1159531&r1=1159530&r2=1159531&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/RemoteRepository.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/RemoteRepository.java
Fri Aug 19 07:53:42 2011
@@ -26,20 +26,20 @@ import java.io.Serializable;
@XmlRootElement( name = "remoteRepository" )
public class RemoteRepository
implements Serializable
-{
+{
private String id;
private String name;
private String url;
-
+
private String layout;
public RemoteRepository()
{
// no op
}
-
+
public RemoteRepository( String id, String name, String url, String layout
)
{
this.id = id;
@@ -47,69 +47,79 @@ public class RemoteRepository
this.url = url;
this.layout = layout;
}
-
- public boolean equals(Object other)
- {
- if ( this == other)
- {
- return true;
- }
-
- if ( !(other instanceof RemoteRepository) )
- {
- return false;
- }
-
- RemoteRepository that = (RemoteRepository) other;
- boolean result = true;
- result = result && ( getId() == null ? that.getId() == null :
getId().equals( that.getId() ) );
- return result;
- }
-
+
+
public String getId()
{
return this.id;
- }
-
+ }
+
public String getLayout()
{
return this.layout;
- }
-
+ }
+
public String getName()
{
return this.name;
- }
-
+ }
+
public String getUrl()
{
return this.url;
}
-
- public int hashCode()
- {
- int result = 17;
- result = 37 * result + ( id != null ? id.hashCode() : 0 );
- return result;
- }
-
- public void setId(String id)
+
+
+ public void setId( String id )
{
this.id = id;
}
-
- public void setLayout(String layout)
+
+ public void setLayout( String layout )
{
this.layout = layout;
}
-
- public void setName(String name)
+
+ public void setName( String name )
{
this.name = name;
- }
-
- public void setUrl(String url)
+ }
+
+ public void setUrl( String url )
{
this.url = url;
- }
+ }
+
+
+ public int hashCode()
+ {
+ int result = 17;
+ result = 37 * result + ( id != null ? id.hashCode() : 0 );
+ return result;
+ }
+
+ public boolean equals( Object other )
+ {
+ if ( this == other )
+ {
+ return true;
+ }
+
+ if ( !( other instanceof RemoteRepository ) )
+ {
+ return false;
+ }
+
+ RemoteRepository that = (RemoteRepository) other;
+ boolean result = true;
+ result = result && ( getId() == null ? that.getId() == null :
getId().equals( that.getId() ) );
+ return result;
+ }
+
+ @Override
+ public String toString()
+ {
+ return "RemoteRepository{" + "id='" + id + '\'' + ", name='" + name +
'\'' + ", url='" + url + '\''
+ + ", layout='" + layout + '\'' + '}';
+ }
}
\ No newline at end of file
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/RepositoriesService.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/RepositoriesService.java?rev=1159531&r1=1159530&r2=1159531&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/RepositoriesService.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/RepositoriesService.java
Fri Aug 19 07:53:42 2011
@@ -21,6 +21,7 @@ package org.apache.archiva.rest.api.serv
import org.apache.archiva.rest.api.model.ManagedRepository;
import org.apache.archiva.rest.api.model.RemoteRepository;
+import org.apache.maven.archiva.security.ArchivaRoleConstants;
import org.codehaus.plexus.redback.authorization.RedbackAuthorization;
import javax.ws.rs.GET;
@@ -40,13 +41,13 @@ public interface RepositoriesService
@Path( "getManagedRepositories" )
@GET
@Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML,
MediaType.TEXT_PLAIN } )
- @RedbackAuthorization( noRestriction = true )
+ @RedbackAuthorization( permission =
ArchivaRoleConstants.OPERATION_MANAGE_CONFIGURATION)
List<ManagedRepository> getManagedRepositories();
@Path( "getRemoteRepositories" )
@GET
@Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML,
MediaType.TEXT_PLAIN } )
- @RedbackAuthorization( noRestriction = true )
+ @RedbackAuthorization( permission =
ArchivaRoleConstants.OPERATION_MANAGE_CONFIGURATION)
List<RemoteRepository> getRemoteRepositories();
@Path( "scanRepository" )
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml?rev=1159531&r1=1159530&r2=1159531&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
Fri Aug 19 07:53:42 2011
@@ -34,6 +34,10 @@
<dependencies>
<dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-security</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.redback</groupId>
<artifactId>redback-authorization-api</artifactId>
<exclusions>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org.apache.archiva.rest.services/DefaultPingService.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org.apache.archiva.rest.services/DefaultPingService.java?rev=1159531&r1=1159530&r2=1159531&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org.apache.archiva.rest.services/DefaultPingService.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org.apache.archiva.rest.services/DefaultPingService.java
Fri Aug 19 07:53:42 2011
@@ -20,6 +20,8 @@ package org.apache.archiva.rest.services
*/
import org.apache.archiva.rest.api.services.PingService;
+import org.codehaus.plexus.redback.users.User;
+import org.codehaus.redback.rest.services.RedbackAuthenticationThreadLocal;
import org.springframework.stereotype.Service;
/**
@@ -37,6 +39,7 @@ public class DefaultPingService
public String pingWithAuthz()
{
+ User user = RedbackAuthenticationThreadLocal.get();
return ping();
}
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org.apache.archiva.rest.services/DefaultRepositoriesService.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org.apache.archiva.rest.services/DefaultRepositoriesService.java?rev=1159531&r1=1159530&r2=1159531&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org.apache.archiva.rest.services/DefaultRepositoriesService.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org.apache.archiva.rest.services/DefaultRepositoriesService.java
Fri Aug 19 07:53:42 2011
@@ -3,26 +3,62 @@ package org.apache.archiva.rest.services
import org.apache.archiva.rest.api.model.ManagedRepository;
import org.apache.archiva.rest.api.model.RemoteRepository;
import org.apache.archiva.rest.api.services.RepositoriesService;
+import org.apache.maven.archiva.configuration.ArchivaConfiguration;
+import org.apache.maven.archiva.configuration.Configuration;
+import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
+import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration;
import org.springframework.stereotype.Service;
+import javax.inject.Inject;
+import java.util.ArrayList;
import java.util.List;
/**
* @author Olivier Lamy
* @since 1.4
*/
-@Service("repositoriesService#rest")
+@Service( "repositoriesService#rest" )
public class DefaultRepositoriesService
implements RepositoriesService
{
+
+ @Inject
+ protected ArchivaConfiguration archivaConfiguration;
+
public List<ManagedRepository> getManagedRepositories()
{
- return null; //To change body of implemented methods use File |
Settings | File Templates.
+ List<ManagedRepositoryConfiguration> managedRepoConfigs =
+ archivaConfiguration.getConfiguration().getManagedRepositories();
+
+ List<ManagedRepository> managedRepos = new
ArrayList<ManagedRepository>( managedRepoConfigs.size() );
+
+ for ( ManagedRepositoryConfiguration repoConfig : managedRepoConfigs )
+ {
+ // TODO fix resolution of repo url!
+ ManagedRepository repo =
+ new ManagedRepository( repoConfig.getId(),
repoConfig.getName(), "URL", repoConfig.getLayout(),
+ repoConfig.isSnapshots(),
repoConfig.isReleases() );
+ managedRepos.add( repo );
+ }
+
+ return managedRepos;
}
public List<RemoteRepository> getRemoteRepositories()
{
- return null; //To change body of implemented methods use File |
Settings | File Templates.
+ Configuration config = archivaConfiguration.getConfiguration();
+ List<RemoteRepositoryConfiguration> remoteRepoConfigs =
config.getRemoteRepositories();
+
+ List<RemoteRepository> remoteRepos = new ArrayList<RemoteRepository>(
remoteRepoConfigs.size() );
+
+ for ( RemoteRepositoryConfiguration repoConfig : remoteRepoConfigs )
+ {
+ RemoteRepository repo = new RemoteRepository( repoConfig.getId(),
repoConfig.getName(), repoConfig.getUrl(),
+
repoConfig.getLayout() );
+ remoteRepos.add( repo );
+ }
+
+ return remoteRepos;
}
public Boolean scanRepository( String repositoryId, boolean fullScan )
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml?rev=1159531&r1=1159530&r2=1159531&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
Fri Aug 19 07:53:42 2011
@@ -41,15 +41,21 @@
<jaxrs:server id="archivaServices" address="/archivaServices">
- <jaxrs:serviceBeans>
- <ref bean="pingService#rest"/>
- </jaxrs:serviceBeans>
<jaxrs:providers>
<ref bean="authenticationInterceptor#rest"/>
<ref bean="permissionInterceptor#rest"/>
<ref bean="repositoriesService#rest"/>
</jaxrs:providers>
+ <jaxrs:serviceBeans>
+ <ref bean="pingService#rest"/>
+ <ref bean="repositoriesService#rest"/>
+ </jaxrs:serviceBeans>
+
+ <jaxrs:outInterceptors>
+ <ref bean="threadLocalUserCleaner#rest"/>
+ </jaxrs:outInterceptors>
+
</jaxrs:server>
</beans>
\ No newline at end of file
Copied:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java
(from r1159530,
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org.apache.archiva.rest.services/DefaultPingService.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?p2=archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java&p1=archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org.apache.archiva.rest.services/DefaultPingService.java&r1=1159530&r2=1159531&rev=1159531&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org.apache.archiva.rest.services/DefaultPingService.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java
Fri Aug 19 07:53:42 2011
@@ -1,5 +1,4 @@
package org.apache.archiva.rest.services;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,24 +18,16 @@ package org.apache.archiva.rest.services
* under the License.
*/
-import org.apache.archiva.rest.api.services.PingService;
-import org.springframework.stereotype.Service;
+
+import org.codehaus.redback.rest.services.AbstractRestServicesTest;
/**
* @author Olivier Lamy
- * @since 1.4
+ * @since TODO
*/
-@Service( "pingService#rest" )
-public class DefaultPingService
- implements PingService
+public abstract class AbstractArchivaRestTest
+ extends AbstractRestServicesTest
{
- public String ping()
- {
- return "Yeah Baby It rocks!";
- }
-
- public String pingWithAuthz()
- {
- return ping();
- }
+ public String guestAuthzHeader =
+ "Basic " + org.apache.cxf.common.util.Base64Utility.encode( ( "guest"
+ ":" ).getBytes() );
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/PingServiceTest.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/PingServiceTest.java?rev=1159531&r1=1159530&r2=1159531&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/PingServiceTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/PingServiceTest.java
Fri Aug 19 07:53:42 2011
@@ -24,6 +24,7 @@ import org.apache.cxf.jaxrs.client.JAXRS
import org.apache.cxf.jaxrs.client.ServerWebApplicationException;
import org.apache.cxf.jaxrs.client.WebClient;
import org.codehaus.redback.rest.services.AbstractRestServicesTest;
+import org.junit.Ignore;
import org.junit.Test;
/**
@@ -31,7 +32,7 @@ import org.junit.Test;
* @since 1.4
*/
public class PingServiceTest
- extends AbstractRestServicesTest
+ extends AbstractArchivaRestTest
{
PingService getPingService()
@@ -76,8 +77,21 @@ public class PingServiceTest
{
PingService service = getPingService();
+ WebClient.getConfig( service
).getHttpConduit().getClient().setReceiveTimeout( 300000 );
WebClient.client( service ).header( "Authorization",
authorizationHeader );
String res = service.pingWithAuthz();
assertEquals( "Yeah Baby It rocks!", res );
}
+
+ @Ignore("FIXME guest failed ???")
+ public void pingWithAuthzGuest()
+ throws Exception
+ {
+
+ PingService service = getPingService();
+ WebClient.getConfig( service
).getHttpConduit().getClient().setReceiveTimeout( 300000 );
+ WebClient.client( service ).header( "Authorization", guestAuthzHeader
);
+ String res = service.pingWithAuthz();
+ assertEquals( "Yeah Baby It rocks!", res );
+ }
}
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=1159531&r1=1159530&r2=1159531&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 07:53:42 2011
@@ -19,27 +19,55 @@ package org.apache.archiva.rest.services
* under the License.
*/
+import org.apache.archiva.rest.api.model.RemoteRepository;
import org.apache.archiva.rest.api.services.RepositoriesService;
import org.apache.cxf.jaxrs.client.JAXRSClientFactory;
-import org.codehaus.redback.rest.services.AbstractRestServicesTest;
+import org.apache.cxf.jaxrs.client.ServerWebApplicationException;
+import org.apache.cxf.jaxrs.client.WebClient;
import org.junit.Test;
+import java.util.List;
+
/**
* @author Olivier Lamy
*/
public class RepositoriesServiceTest
- extends AbstractRestServicesTest
+ extends AbstractArchivaRestTest
{
- RepositoriesService getPingService()
+ RepositoriesService getRepositoriesService()
{
return JAXRSClientFactory.create( "http://localhost:"; + port +
"/services/archivaServices/",
RepositoriesService.class );
}
+ @Test( expected = ServerWebApplicationException.class )
+ public void listRemoteRepositoriesKarmaFailed()
+ throws Exception
+ {
+ RepositoriesService service = getRepositoriesService();
+ try
+ {
+ assertFalse( service.getRemoteRepositories().isEmpty() );
+ }
+ catch ( ServerWebApplicationException e )
+ {
+ assertEquals( 403, e.getStatus() );
+ throw e;
+ }
+ }
+
@Test
- public void listRemoteRepositories() throws Exception
+ public void listRemoteRepositoriesKarma()
+ throws Exception
{
+ RepositoriesService service = getRepositoriesService();
+
+ WebClient.client( service ).header( "Authorization",
authorizationHeader );
+ WebClient.getConfig( service
).getHttpConduit().getClient().setReceiveTimeout( 300000 );
+ List<RemoteRepository> repos = service.getRemoteRepositories();
+ assertFalse( repos.isEmpty() );
+ log.info( "repos {}", repos );
}
}
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=1159531&r1=1159530&r2=1159531&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 07:53:42 2011
@@ -38,6 +38,13 @@
<logger name="org.codehaus.redback.rest.services" >
<level value="debug"/>
</logger>
+ <logger name="JPOX">
+ <level value="ERROR"/>
+ </logger>
+
+ <logger name="org.springframework">
+ <level value="ERROR"/>
+ </logger>
<root>
<priority value ="info" />
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=1159531&r1=1159530&r2=1159531&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 07:53:42 2011
@@ -43,7 +43,7 @@ import javax.inject.Named;
*
* @version $Id$
*/
-public abstract class AbstractManagedRepositoriesAction
+public abstract class AbstractManagedReposigettoriesAction
extends AbstractRepositoriesAdminAction
{
/**
