From 17b36fb4e2cdfbc8e834d59fe22850874645902f Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Thu, 8 Mar 2012 09:33:00 +0000 Subject: [PATCH] add a module with an InvalidRepositoryContentConsumer for testing purpose git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1298322 13f79535-47bb-0310-9956-ffa450edef68 --- .../archiva-web/archiva-test-mocks/pom.xml | 26 +++++ .../MockInvalidRepositoryContentConsumer.java | 110 ++++++++++++++++++ .../resources/META-INF/spring-context.xml | 33 ++++++ .../archiva-web/archiva-webapp-js/pom.xml | 7 ++ .../main/webapp/js/archiva/general-admin.js | 29 +++++ archiva-modules/archiva-web/pom.xml | 9 +- 6 files changed, 213 insertions(+), 1 deletion(-) create mode 100644 archiva-modules/archiva-web/archiva-test-mocks/pom.xml create mode 100644 archiva-modules/archiva-web/archiva-test-mocks/src/main/java/org/apache/archiva/web/mocks/MockInvalidRepositoryContentConsumer.java create mode 100644 archiva-modules/archiva-web/archiva-test-mocks/src/main/resources/META-INF/spring-context.xml diff --git a/archiva-modules/archiva-web/archiva-test-mocks/pom.xml b/archiva-modules/archiva-web/archiva-test-mocks/pom.xml new file mode 100644 index 000000000..7ec111f59 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-test-mocks/pom.xml @@ -0,0 +1,26 @@ + + + 4.0.0 + + org.apache.archiva + archiva-web + 1.4-M3-SNAPSHOT + + + archiva-test-mocks + 1.4-M3-SNAPSHOT + + archiva-test-mocks + + + + org.apache.archiva + archiva-consumer-api + + + org.springframework + spring-context + + + + diff --git a/archiva-modules/archiva-web/archiva-test-mocks/src/main/java/org/apache/archiva/web/mocks/MockInvalidRepositoryContentConsumer.java b/archiva-modules/archiva-web/archiva-test-mocks/src/main/java/org/apache/archiva/web/mocks/MockInvalidRepositoryContentConsumer.java new file mode 100644 index 000000000..47ca211ce --- /dev/null +++ b/archiva-modules/archiva-web/archiva-test-mocks/src/main/java/org/apache/archiva/web/mocks/MockInvalidRepositoryContentConsumer.java @@ -0,0 +1,110 @@ +package org.apache.archiva.web.mocks; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import org.apache.archiva.admin.model.beans.ManagedRepository; +import org.apache.archiva.consumers.ConsumerException; +import org.apache.archiva.consumers.ConsumerMonitor; +import org.apache.archiva.consumers.InvalidRepositoryContentConsumer; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.List; + +/** + * @author Olivier Lamy + */ +@Service( "InvalidRepositoryContentConsumer#mock" ) +public class MockInvalidRepositoryContentConsumer + implements InvalidRepositoryContentConsumer +{ + public String getId() + { + return "foo"; + } + + public String getDescription() + { + return "the foo"; + } + + public boolean isPermanent() + { + return false; + } + + public void addConsumerMonitor( ConsumerMonitor monitor ) + { + //To change body of implemented methods use File | Settings | File Templates. + } + + public void removeConsumerMonitor( ConsumerMonitor monitor ) + { + //To change body of implemented methods use File | Settings | File Templates. + } + + public List getIncludes() + { + return null; //To change body of implemented methods use File | Settings | File Templates. + } + + public List getExcludes() + { + return null; //To change body of implemented methods use File | Settings | File Templates. + } + + public void beginScan( ManagedRepository repository, Date whenGathered ) + throws ConsumerException + { + //To change body of implemented methods use File | Settings | File Templates. + } + + public void beginScan( ManagedRepository repository, Date whenGathered, boolean executeOnEntireRepo ) + throws ConsumerException + { + //To change body of implemented methods use File | Settings | File Templates. + } + + public void processFile( String path ) + throws ConsumerException + { + //To change body of implemented methods use File | Settings | File Templates. + } + + public void processFile( String path, boolean executeOnEntireRepo ) + throws Exception + { + //To change body of implemented methods use File | Settings | File Templates. + } + + public void completeScan() + { + //To change body of implemented methods use File | Settings | File Templates. + } + + public void completeScan( boolean executeOnEntireRepo ) + { + //To change body of implemented methods use File | Settings | File Templates. + } + + public boolean isProcessUnmodified() + { + return false; //To change body of implemented methods use File | Settings | File Templates. + } +} diff --git a/archiva-modules/archiva-web/archiva-test-mocks/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-web/archiva-test-mocks/src/main/resources/META-INF/spring-context.xml new file mode 100644 index 000000000..20dfa27fa --- /dev/null +++ b/archiva-modules/archiva-web/archiva-test-mocks/src/main/resources/META-INF/spring-context.xml @@ -0,0 +1,33 @@ + + + + + + + + + \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml index 6a187e35e..7a744ab98 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml @@ -570,6 +570,12 @@ spring-web + + org.apache.archiva + archiva-test-mocks + test + + @@ -698,6 +704,7 @@ ${tomcatRunPort} ${tomcatRunPath} ${tomcatContextXml} + true ${archivaAppServerBase} ${archivaAppServerBase} diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js index 62a75b81e..8f908434b 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js @@ -425,6 +425,35 @@ $(function() { } }); } + + disableInvalidContentConsumer=function(adminRepositoryConsumer){ + clearUserMessages(); + var url="restServices/archivaServices/archivaAdministrationService/disabledInvalidContentConsumer/" + url+=encodeURIComponent(adminRepositoryConsumer.id()); + $.ajax(url, { + type: "GET", + dataType: 'json', + success: function(data){ + adminRepositoryConsumer.enabled(false); + displaySuccessMessage( $.i18n.prop("repository-scanning.consumers.invalid.disabled",adminRepositoryConsumer.id())); + } + }); + } + + enableInvalidContentConsumer=function(adminRepositoryConsumer){ + clearUserMessages(); + var url="restServices/archivaServices/archivaAdministrationService/enabledInvalidContentConsumer/" + url+=encodeURIComponent(adminRepositoryConsumer.id()); + $.ajax(url, { + type: "GET", + dataType: 'json', + success: function(data){ + adminRepositoryConsumer.enabled(true); + displaySuccessMessage( $.i18n.prop("repository-scanning.consumers.invalid.enabled",adminRepositoryConsumer.id())); + } + }); + } + } displayRepositoryScanning=function(){ diff --git a/archiva-modules/archiva-web/pom.xml b/archiva-modules/archiva-web/pom.xml index a9b6f9706..eb5afd8b9 100644 --- a/archiva-modules/archiva-web/pom.xml +++ b/archiva-modules/archiva-web/pom.xml @@ -47,6 +47,7 @@ archiva-security archiva-webdav archiva-rss + archiva-test-mocks archiva-rest archiva-web-common archiva-webapp @@ -75,6 +76,12 @@ + + org.apache.archiva + archiva-test-mocks + ${project.version} + test + org.seleniumhq.selenium.client-drivers selenium-java-client-driver @@ -113,4 +120,4 @@ - + \ No newline at end of file -- 2.39.5