diff options
Diffstat (limited to 'archiva-modules/archiva-web')
6 files changed, 213 insertions, 1 deletions
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 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-web</artifactId>
+ <version>1.4-M3-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>archiva-test-mocks</artifactId>
+ <version>1.4-M3-SNAPSHOT</version>
+
+ <name>archiva-test-mocks</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-consumer-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
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<String> getIncludes() + { + return null; //To change body of implemented methods use File | Settings | File Templates. + } + + public List<String> 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 @@ +<?xml version="1.0"?> + +<!-- + ~ 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. + --> +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:context="http://www.springframework.org/schema/context" + xsi:schemaLocation="http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/context + http://www.springframework.org/schema/context/spring-context-3.0.xsd" default-lazy-init="true"> + + <context:annotation-config/> + <context:component-scan + base-package="org.apache.archiva.web.mocks"/> + +</beans>
\ 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 @@ <artifactId>spring-web</artifactId> </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-test-mocks</artifactId> + <scope>test</scope> + </dependency> + </dependencies> <build> @@ -698,6 +704,7 @@ <port>${tomcatRunPort}</port> <path>${tomcatRunPath}</path> <contextFile>${tomcatContextXml}</contextFile> + <useTestClasspath>true</useTestClasspath> <systemProperties> <plexus.home>${archivaAppServerBase}</plexus.home> <appserver.base>${archivaAppServerBase}</appserver.base> 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 @@ <module>archiva-security</module> <module>archiva-webdav</module> <module>archiva-rss</module> + <module>archiva-test-mocks</module> <module>archiva-rest</module> <module>archiva-web-common</module> <module>archiva-webapp</module> @@ -76,6 +77,12 @@ </exclusions> </dependency> <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-test-mocks</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.seleniumhq.selenium.client-drivers</groupId> <artifactId>selenium-java-client-driver</artifactId> <version>1.0.2</version> @@ -113,4 +120,4 @@ </build> -</project> +</project>
\ No newline at end of file |