svn commit: r1301525 - in /archiva/trunk/archiva-modules/archiva-web: archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/ archiva-security/...

olamy Fri, 16 Mar 2012 07:02:53 -0700

Author: olamy
Date: Fri Mar 16 14:02:29 2012
New Revision: 1301525

URL: http://svn.apache.org/viewvc?rev=1301525&view=rev
Log:
enhance rest method to return ManagedRepository rather than simply string


Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/BrowseService.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/DefaultBrowseService.java
    
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/DefaultUserRepositories.java
    
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/UserRepositories.java
    
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/security/UserRepositoriesStub.java

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/BrowseService.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/BrowseService.java?rev=1301525&r1=1301524&r2=1301525&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/BrowseService.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/BrowseService.java
 Fri Mar 16 14:02:29 2012
@@ -18,6 +18,7 @@ package org.apache.archiva.rest.api.serv
  * under the License.
  */
 
+import org.apache.archiva.admin.model.beans.ManagedRepository;
 import org.apache.archiva.metadata.model.ProjectVersionMetadata;
 import org.apache.archiva.rest.api.model.BrowseResult;
 import org.apache.archiva.rest.api.model.VersionsList;
@@ -70,6 +71,6 @@ public interface BrowseService
     @GET
     @Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML } )
     @RedbackAuthorization( noPermission = true, noRestriction = true )
-    List<String> getUserRepositories()
+    List<ManagedRepository> getUserRepositories()
         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=1301525&r1=1301524&r2=1301525&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
 Fri Mar 16 14:02:29 2012
@@ -59,7 +59,7 @@ public abstract class AbstractRestServic
     private List<AuditListener> auditListeners = new 
ArrayList<AuditListener>();
 
     @Inject
-    private UserRepositories userRepositories;
+    protected UserRepositories userRepositories;
 
 
     @Inject

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.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/DefaultBrowseService.java?rev=1301525&r1=1301524&r2=1301525&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
 Fri Mar 16 14:02:29 2012
@@ -18,6 +18,7 @@ package org.apache.archiva.rest.services
  * under the License.
  */
 
+import org.apache.archiva.admin.model.beans.ManagedRepository;
 import org.apache.archiva.common.utils.VersionComparator;
 import org.apache.archiva.metadata.model.ProjectVersionMetadata;
 import org.apache.archiva.metadata.repository.MetadataResolutionException;
@@ -350,10 +351,10 @@ public class DefaultBrowseService
         }
     }
 
-    public List<String> getUserRepositories()
+    public List<ManagedRepository> getUserRepositories()
         throws ArchivaRestServiceException
     {
-        return getObservableRepos();
+        return userRepositories.getAccessibleRepositories(  )
     }
 
     //---------------------------

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/DefaultUserRepositories.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/DefaultUserRepositories.java?rev=1301525&r1=1301524&r2=1301525&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/DefaultUserRepositories.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/DefaultUserRepositories.java
 Fri Mar 16 14:02:29 2012
@@ -92,7 +92,13 @@ public class DefaultUserRepositories
         return repoIds;
     }
 
-    public List<ManagedRepository> getAccessibleRepositories( String 
principal, String operation )
+    public List<ManagedRepository> getAccessibleRepositories( String principal 
)
+        throws ArchivaSecurityException, AccessDeniedException, 
PrincipalNotFoundException
+    {
+        return getAccessibleRepositories( principal, 
ArchivaRoleConstants.OPERATION_REPOSITORY_ACCESS );
+    }
+
+    private List<ManagedRepository> getAccessibleRepositories( String 
principal, String operation )
         throws ArchivaSecurityException, AccessDeniedException, 
PrincipalNotFoundException
     {
         SecuritySession securitySession = createSession( principal );

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/UserRepositories.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/UserRepositories.java?rev=1301525&r1=1301524&r2=1301525&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/UserRepositories.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/UserRepositories.java
 Fri Mar 16 14:02:29 2012
@@ -90,14 +90,13 @@ public interface UserRepositories
     /**
      *
      * @param principal
-     * @param operation
      * @since 1.4-M3
      * @return
      * @throws ArchivaSecurityException
      * @throws AccessDeniedException
      * @throws PrincipalNotFoundException
      */
-    List<ManagedRepository> getAccessibleRepositories( String principal, 
String operation )
+    List<ManagedRepository> getAccessibleRepositories( String principal )
             throws ArchivaSecurityException, AccessDeniedException, 
PrincipalNotFoundException;
     
 }

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/security/UserRepositoriesStub.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/security/UserRepositoriesStub.java?rev=1301525&r1=1301524&r2=1301525&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/security/UserRepositoriesStub.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/security/UserRepositoriesStub.java
 Fri Mar 16 14:02:29 2012
@@ -77,7 +77,7 @@ public class UserRepositoriesStub
         this.repoIds = repoIds;
     }
 
-    public List<ManagedRepository> getAccessibleRepositories( String 
principal, String operation )
+    public List<ManagedRepository> getAccessibleRepositories( String principal 
)
         throws ArchivaSecurityException, AccessDeniedException, 
PrincipalNotFoundException
     {
         return Collections.emptyList();

svn commit: r1301525 - in /archiva/trunk/archiva-modules/archiva-web: archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/ archiva-security/...

Reply via email to