You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/01/30 10:47:17 UTC
svn commit: r1237580 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-rest:
archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/
archiva-rest-services/src/main/java/org/apache/archiva/rest/services/
Author: olamy
Date: Mon Jan 30 09:47:16 2012
New Revision: 1237580
URL: http://svn.apache.org/viewvc?rev=1237580&view=rev
Log:
start work on proxy connector screen
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ProxyConnectorService.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultProxyConnectorService.java
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ProxyConnectorService.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/ProxyConnectorService.java?rev=1237580&r1=1237579&r2=1237580&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ProxyConnectorService.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ProxyConnectorService.java Mon Jan 30 09:47:16 2012
@@ -19,6 +19,7 @@ package org.apache.archiva.rest.api.serv
*/
import org.apache.archiva.admin.model.beans.ProxyConnector;
+import org.apache.archiva.rest.api.model.PolicyInformation;
import org.apache.archiva.security.common.ArchivaRoleConstants;
import org.codehaus.plexus.redback.authorization.RedbackAuthorization;
@@ -85,5 +86,13 @@ public interface ProxyConnectorService
Boolean updateProxyConnector( ProxyConnector proxyConnector )
throws ArchivaRestServiceException;
+ @Path( "allPolicies" )
+ @GET
+ @Consumes( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML } )
+ @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML } )
+ @RedbackAuthorization( permissions = ArchivaRoleConstants.OPERATION_MANAGE_CONFIGURATION )
+ List<PolicyInformation> getAllPolicyInformations()
+ throws ArchivaRestServiceException;
+
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.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/AbstractRestService.java?rev=1237580&r1=1237579&r2=1237580&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java Mon Jan 30 09:47:16 2012
@@ -20,17 +20,21 @@ package org.apache.archiva.rest.services
import org.apache.archiva.admin.model.AuditInformation;
import org.apache.archiva.audit.AuditListener;
+import org.apache.commons.lang.StringUtils;
import org.codehaus.plexus.redback.users.User;
import org.codehaus.redback.rest.services.RedbackAuthenticationThreadLocal;
import org.codehaus.redback.rest.services.RedbackRequestInformation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.context.ApplicationContext;
import javax.inject.Inject;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.core.Context;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* abstract class with common utilities methods
@@ -73,4 +77,21 @@ public abstract class AbstractRestServic
? ""
: ":" + req.getServerPort() ) + req.getContextPath();
}
+
+ protected <T> Map<String, T> getBeansOfType( ApplicationContext applicationContext, Class<T> clazz )
+ {
+ //TODO do some caching here !!!
+ // olamy : with plexus we get only roleHint
+ // as per convention we named spring bean role#hint remove role# if exists
+ Map<String, T> springBeans = applicationContext.getBeansOfType( clazz );
+
+ Map<String, T> beans = new HashMap<String, T>( springBeans.size() );
+
+ for ( Map.Entry<String, T> entry : springBeans.entrySet() )
+ {
+ String key = StringUtils.substringAfterLast( entry.getKey(), "#" );
+ beans.put( key, entry.getValue() );
+ }
+ return beans;
+ }
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultProxyConnectorService.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/DefaultProxyConnectorService.java?rev=1237580&r1=1237579&r2=1237580&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultProxyConnectorService.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultProxyConnectorService.java Mon Jan 30 09:47:16 2012
@@ -21,11 +21,15 @@ package org.apache.archiva.rest.services
import org.apache.archiva.admin.model.RepositoryAdminException;
import org.apache.archiva.admin.model.beans.ProxyConnector;
import org.apache.archiva.admin.model.proxyconnector.ProxyConnectorAdmin;
+import org.apache.archiva.policies.Policy;
+import org.apache.archiva.rest.api.model.PolicyInformation;
import org.apache.archiva.rest.api.services.ArchivaRestServiceException;
import org.apache.archiva.rest.api.services.ProxyConnectorService;
+import org.springframework.context.ApplicationContext;
import org.springframework.stereotype.Service;
import javax.inject.Inject;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -40,6 +44,14 @@ public class DefaultProxyConnectorServic
@Inject
private ProxyConnectorAdmin proxyConnectorAdmin;
+ private List<Policy> allPolicies;
+
+ @Inject
+ public DefaultProxyConnectorService( ApplicationContext applicationContext )
+ {
+ allPolicies = new ArrayList<Policy>( getBeansOfType( applicationContext, Policy.class ).values() );
+ }
+
public List<ProxyConnector> getProxyConnectors()
throws ArchivaRestServiceException
{
@@ -118,6 +130,21 @@ public class DefaultProxyConnectorServic
}
}
+ public List<PolicyInformation> getAllPolicyInformations()
+ throws ArchivaRestServiceException
+ {
+ List<PolicyInformation> policyInformations = new ArrayList<PolicyInformation>( allPolicies.size() );
+
+ for ( Policy policy : allPolicies )
+ {
+ policyInformations.add(
+ new PolicyInformation( policy.getOptions(), policy.getDefaultOption(), policy.getId(),
+ policy.getName() ) );
+ }
+
+ return policyInformations;
+ }
+
public ProxyConnectorAdmin getProxyConnectorAdmin()
{
return proxyConnectorAdmin;