Return-Path: X-Original-To: apmail-archiva-commits-archive@www.apache.org Delivered-To: apmail-archiva-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7778F71DA for ; Mon, 26 Sep 2011 22:50:19 +0000 (UTC) Received: (qmail 90693 invoked by uid 500); 26 Sep 2011 22:50:19 -0000 Delivered-To: apmail-archiva-commits-archive@archiva.apache.org Received: (qmail 90637 invoked by uid 500); 26 Sep 2011 22:50:19 -0000 Mailing-List: contact commits-help@archiva.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@archiva.apache.org Delivered-To: mailing list commits@archiva.apache.org Received: (qmail 90629 invoked by uid 99); 26 Sep 2011 22:50:19 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Sep 2011 22:50:19 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Sep 2011 22:50:18 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0BC6C238890A for ; Mon, 26 Sep 2011 22:49:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1176112 - in /archiva/trunk/archiva-modules: archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ archiva-web/archiva-webapp/ archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/acti... Date: Mon, 26 Sep 2011 22:49:57 -0000 To: commits@archiva.apache.org From: olamy@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20110926224958.0BC6C238890A@eris.apache.org> Author: olamy Date: Mon Sep 26 22:49:57 2011 New Revision: 1176112 URL: http://svn.apache.org/viewvc?rev=1176112&view=rev Log: [MRM-1516] missing dependency on velocity - ClassNotFoundException org.apache.velocity.tools.view.ToolboxManager and fis unit tests. Modified: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/BrowseActionTest.java archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/AddRemoteRepositoryActionTest.java Modified: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java?rev=1176112&r1=1176111&r2=1176112&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java (original) +++ archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java Mon Sep 26 22:49:57 2011 @@ -145,7 +145,7 @@ public class DefaultDownloadRemoteIndexS } @PreDestroy - private void shutdown() + public void shutdown() throws RepositoryAdminException, IOException { for ( RemoteRepository remoteRepository : remoteRepositoryAdmin.getRemoteRepositories() ) Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=1176112&r1=1176111&r2=1176112&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Mon Sep 26 22:49:57 2011 @@ -426,6 +426,22 @@ runtime + org.apache.velocity + velocity-tools + 1.3 + runtime + + + commons-logging + commons-logging + + + velocity + velocity-dep + + + + org.apache.archiva maven2-repository Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/BrowseActionTest.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/BrowseActionTest.java?rev=1176112&r1=1176111&r2=1176112&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/BrowseActionTest.java (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/BrowseActionTest.java Mon Sep 26 22:49:57 2011 @@ -25,6 +25,8 @@ import org.apache.archiva.metadata.model import org.apache.archiva.metadata.repository.RepositorySession; import org.apache.archiva.metadata.repository.memory.TestMetadataResolver; import org.apache.archiva.metadata.repository.memory.TestRepositorySessionFactory; +import org.apache.archiva.scheduler.indexing.DefaultDownloadRemoteIndexScheduler; +import org.springframework.context.support.GenericApplicationContext; import java.util.Arrays; import java.util.Collections; @@ -406,6 +408,7 @@ public class BrowseActionTest throws Exception { super.tearDown(); + applicationContext.getBean( DefaultDownloadRemoteIndexScheduler.class ).shutdown(); setObservableRepos( Lists.newArrayList( "test-repo" ) ); } } \ No newline at end of file Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/AddRemoteRepositoryActionTest.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/AddRemoteRepositoryActionTest.java?rev=1176112&r1=1176111&r2=1176112&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/AddRemoteRepositoryActionTest.java (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/AddRemoteRepositoryActionTest.java Mon Sep 26 22:49:57 2011 @@ -62,7 +62,7 @@ public class AddRemoteRepositoryActionTe } public void testSecureActionBundle() - throws SecureActionException + throws Exception { archivaConfiguration.getConfiguration(); archivaConfigurationControl.setReturnValue( new Configuration() );