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/03/08 10:33:01 UTC
svn commit: r1298322 - in /archiva/trunk/archiva-modules/archiva-web: ./
archiva-test-mocks/ archiva-test-mocks/src/ archiva-test-mocks/src/main/
archiva-test-mocks/src/main/java/ archiva-test-mocks/src/main/java/org/
archiva-test-mocks/src/main/java/o...
Author: olamy
Date: Thu Mar 8 09:33:00 2012
New Revision: 1298322
URL: http://svn.apache.org/viewvc?rev=1298322&view=rev
Log:
add a module with an InvalidRepositoryContentConsumer for testing purpose
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-test-mocks/
archiva/trunk/archiva-modules/archiva-web/archiva-test-mocks/pom.xml (with props)
archiva/trunk/archiva-modules/archiva-web/archiva-test-mocks/src/
archiva/trunk/archiva-modules/archiva-web/archiva-test-mocks/src/main/
archiva/trunk/archiva-modules/archiva-web/archiva-test-mocks/src/main/java/
archiva/trunk/archiva-modules/archiva-web/archiva-test-mocks/src/main/java/org/
archiva/trunk/archiva-modules/archiva-web/archiva-test-mocks/src/main/java/org/apache/
archiva/trunk/archiva-modules/archiva-web/archiva-test-mocks/src/main/java/org/apache/archiva/
archiva/trunk/archiva-modules/archiva-web/archiva-test-mocks/src/main/java/org/apache/archiva/web/
archiva/trunk/archiva-modules/archiva-web/archiva-test-mocks/src/main/java/org/apache/archiva/web/mocks/
archiva/trunk/archiva-modules/archiva-web/archiva-test-mocks/src/main/java/org/apache/archiva/web/mocks/MockInvalidRepositoryContentConsumer.java (with props)
archiva/trunk/archiva-modules/archiva-web/archiva-test-mocks/src/main/resources/
archiva/trunk/archiva-modules/archiva-web/archiva-test-mocks/src/main/resources/META-INF/
archiva/trunk/archiva-modules/archiva-web/archiva-test-mocks/src/main/resources/META-INF/spring-context.xml (with props)
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
archiva/trunk/archiva-modules/archiva-web/pom.xml
Added: archiva/trunk/archiva-modules/archiva-web/archiva-test-mocks/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-test-mocks/pom.xml?rev=1298322&view=auto
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-test-mocks/pom.xml (added)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-test-mocks/pom.xml Thu Mar 8 09:33:00 2012
@@ -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>
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-test-mocks/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-test-mocks/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: archiva/trunk/archiva-modules/archiva-web/archiva-test-mocks/src/main/java/org/apache/archiva/web/mocks/MockInvalidRepositoryContentConsumer.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-test-mocks/src/main/java/org/apache/archiva/web/mocks/MockInvalidRepositoryContentConsumer.java?rev=1298322&view=auto
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-test-mocks/src/main/java/org/apache/archiva/web/mocks/MockInvalidRepositoryContentConsumer.java (added)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-test-mocks/src/main/java/org/apache/archiva/web/mocks/MockInvalidRepositoryContentConsumer.java Thu Mar 8 09:33:00 2012
@@ -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.
+ }
+}
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-test-mocks/src/main/java/org/apache/archiva/web/mocks/MockInvalidRepositoryContentConsumer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-test-mocks/src/main/java/org/apache/archiva/web/mocks/MockInvalidRepositoryContentConsumer.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: archiva/trunk/archiva-modules/archiva-web/archiva-test-mocks/src/main/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-test-mocks/src/main/resources/META-INF/spring-context.xml?rev=1298322&view=auto
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-test-mocks/src/main/resources/META-INF/spring-context.xml (added)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-test-mocks/src/main/resources/META-INF/spring-context.xml Thu Mar 8 09:33:00 2012
@@ -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
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-test-mocks/src/main/resources/META-INF/spring-context.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-test-mocks/src/main/resources/META-INF/spring-context.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml?rev=1298322&r1=1298321&r2=1298322&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml Thu Mar 8 09:33:00 2012
@@ -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>
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=1298322&r1=1298321&r2=1298322&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:33:00 2012
@@ -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(){
Modified: archiva/trunk/archiva-modules/archiva-web/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/pom.xml?rev=1298322&r1=1298321&r2=1298322&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/pom.xml Thu Mar 8 09:33:00 2012
@@ -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