Author: olamy
Date: Thu Mar 8 09:31:51 2012
New Revision: 1298321
URL: http://svn.apache.org/viewvc?rev=1298321&view=rev
Log:
[MRM-1579] rewrite repositories scanning admin page
enabled/disabled consummers.
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ArchivaAdministrationService.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/general-admin.html
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ArchivaAdministrationService.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/ArchivaAdministrationService.java?rev=1298321&r1=1298320&r2=1298321&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ArchivaAdministrationService.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/ArchivaAdministrationService.java
Thu Mar 8 09:31:51 2012
@@ -31,6 +31,7 @@ import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
@@ -101,11 +102,11 @@ public interface ArchivaAdministrationSe
Boolean removeFileType( @QueryParam( "fileTypeId" ) String fileTypeId )
throws ArchivaRestServiceException;
- @Path( "enabledKnownContentConsumer" )
+ @Path( "enabledKnownContentConsumer/{knownContentConsumer}" )
@GET
@Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML,
MediaType.TEXT_PLAIN } )
@RedbackAuthorization( permissions =
ArchivaRoleConstants.OPERATION_MANAGE_CONFIGURATION )
- Boolean enabledKnownContentConsumer( @QueryParam( "knownContentConsumer" )
String knownContentConsumer )
+ Boolean enabledKnownContentConsumer( @PathParam( "knownContentConsumer" )
String knownContentConsumer )
throws ArchivaRestServiceException;
@Path( "enabledKnownContentConsumers" )
@@ -116,18 +117,18 @@ public interface ArchivaAdministrationSe
throws ArchivaRestServiceException;
- @Path( "disabledKnownContentConsumer" )
+ @Path( "disabledKnownContentConsumer/{knownContentConsumer}" )
@GET
@Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML,
MediaType.TEXT_PLAIN } )
@RedbackAuthorization( permissions =
ArchivaRoleConstants.OPERATION_MANAGE_CONFIGURATION )
- Boolean disabledKnownContentConsumer( @QueryParam( "knownContentConsumer"
) String knownContentConsumer )
+ Boolean disabledKnownContentConsumer( @PathParam( "knownContentConsumer" )
String knownContentConsumer )
throws ArchivaRestServiceException;
- @Path( "enabledInvalidContentConsumer" )
+ @Path( "enabledInvalidContentConsumer/{invalidContentConsumer}" )
@GET
@Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML,
MediaType.TEXT_PLAIN } )
@RedbackAuthorization( permissions =
ArchivaRoleConstants.OPERATION_MANAGE_CONFIGURATION )
- Boolean enabledInvalidContentConsumer( @QueryParam(
"invalidContentConsumer" ) String invalidContentConsumer )
+ Boolean enabledInvalidContentConsumer( @PathParam(
"invalidContentConsumer" ) String invalidContentConsumer )
throws ArchivaRestServiceException;
@Path( "enabledInvalidContentConsumers" )
@@ -137,11 +138,11 @@ public interface ArchivaAdministrationSe
void enabledInvalidContentConsumers( List<String> invalidContentConsumers )
throws ArchivaRestServiceException;
- @Path( "disabledInvalidContentConsumer" )
+ @Path( "disabledInvalidContentConsumer/{invalidContentConsumer}" )
@GET
@Produces( { MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML,
MediaType.TEXT_PLAIN } )
@RedbackAuthorization( permissions =
ArchivaRoleConstants.OPERATION_MANAGE_CONFIGURATION )
- Boolean disabledInvalidContentConsumer( @QueryParam(
"invalidContentConsumer" ) String invalidContentConsumer )
+ Boolean disabledInvalidContentConsumer( @PathParam(
"invalidContentConsumer" ) String invalidContentConsumer )
throws ArchivaRestServiceException;
@Path( "getFileTypes" )
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js?rev=1298321&r1=1298320&r2=1298321&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
Thu Mar 8 09:31:51 2012
@@ -397,6 +397,34 @@ $(function() {
}
});
}
+
+ disableKnowContentConsumer=function(adminRepositoryConsumer){
+ clearUserMessages();
+ var
url="restServices/archivaServices/archivaAdministrationService/disabledKnownContentConsumer/"
+ url+=encodeURIComponent(adminRepositoryConsumer.id());
+ $.ajax(url, {
+ type: "GET",
+ dataType: 'json',
+ success: function(data){
+ adminRepositoryConsumer.enabled(false);
+ displaySuccessMessage(
$.i18n.prop("repository-scanning.consumers.know.disabled",adminRepositoryConsumer.id()));
+ }
+ });
+ }
+
+ enableKnowContentConsumer=function(adminRepositoryConsumer){
+ clearUserMessages();
+ var
url="restServices/archivaServices/archivaAdministrationService/enabledKnownContentConsumer/"
+ url+=encodeURIComponent(adminRepositoryConsumer.id());
+ $.ajax(url, {
+ type: "GET",
+ dataType: 'json',
+ success: function(data){
+ adminRepositoryConsumer.enabled(true);
+ displaySuccessMessage(
$.i18n.prop("repository-scanning.consumers.know.enabled",adminRepositoryConsumer.id()));
+ }
+ });
+ }
}
displayRepositoryScanning=function(){
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/general-admin.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/general-admin.html?rev=1298321&r1=1298320&r2=1298321&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/general-admin.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/general-admin.html
Thu Mar 8 09:31:51 2012
@@ -216,7 +216,20 @@
<tbody>
{{each(i,knownAdminRepositoryConsumer) knownAdminRepositoryConsumers}}
<tr>
- <td>${knownAdminRepositoryConsumer.enabled}</td>
+ {{if knownAdminRepositoryConsumer.enabled()==true}}
+ <td>
+ <a href="#" data-bind="click: function(){
disableKnowContentConsumer(knownAdminRepositoryConsumer) }">
+ <img src="images/weather-clear-22-22.png"/>
+ </a>
+ </td>
+ {{else}}
+ <td>
+ <a href="#" data-bind="click: function(){
enableKnowContentConsumer(knownAdminRepositoryConsumer) }">
+ <img src="images/dialog-error-22-22.png"/>
+ </a>
+ </td>
+ {{/if}}
+
<td>${knownAdminRepositoryConsumer.id}</td>
<td>${knownAdminRepositoryConsumer.description}</td>
</tr>
