Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MRM-1516] missing dependency on velocity - ClassNotFoundException org.apache.velocity.tools.view.ToolboxManager 

and fis unit tests.

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1176112 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2011-09-26 22:49:57 +00:00
parent 3c8c0b8554
commit d3b0682003
4 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java
View File

@ -145,7 +145,7 @@ public class DefaultDownloadRemoteIndexScheduler
}
@PreDestroy
private void shutdown()
public void shutdown()
throws RepositoryAdminException, IOException
{
for ( RemoteRepository remoteRepository : remoteRepositoryAdmin.getRemoteRepositories() )

16
archiva-modules/archiva-web/archiva-webapp/pom.xml
View File

@ -425,6 +425,22 @@
<artifactId>metadata-store-file</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-tools</artifactId>
<version>1.3</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
<groupId>velocity</groupId>
<artifactId>velocity-dep</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
<!-- FIXME: temporary coupling to plugin, should be runtime -->

3
archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/BrowseActionTest.java
View File

@ -25,6 +25,8 @@ import org.apache.archiva.metadata.model.ProjectVersionMetadata;
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.<String>newArrayList( "test-repo" ) );
}
}

2
archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/AddRemoteRepositoryActionTest.java
View File

@ -62,7 +62,7 @@ public class AddRemoteRepositoryActionTest
}
public void testSecureActionBundle()
throws SecureActionException
throws Exception
{
archivaConfiguration.getConfiguration();
archivaConfigurationControl.setReturnValue( new Configuration() );