more usage of MockRepositorySessionFactory
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/56f8b575 Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/56f8b575 Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/56f8b575 Branch: refs/heads/master Commit: 56f8b575d44045d6be9960e8608946a05eaea98b Parents: d13adfd Author: Olivier Lamy <[email protected]> Authored: Thu Oct 1 15:07:38 2015 +1000 Committer: Olivier Lamy <[email protected]> Committed: Thu Oct 1 15:07:38 2015 +1000 ---------------------------------------------------------------------- .../archiva-base/archiva-indexer/pom.xml | 5 ++ .../mock/MockRepositorySessionFactory.java | 58 -------------------- .../src/test/resources/spring-context.xml | 6 +- 3 files changed, 6 insertions(+), 63 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva/blob/56f8b575/archiva-modules/archiva-base/archiva-indexer/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-indexer/pom.xml b/archiva-modules/archiva-base/archiva-indexer/pom.xml index f0ef811..cd4cbf1 100644 --- a/archiva-modules/archiva-base/archiva-indexer/pom.xml +++ b/archiva-modules/archiva-base/archiva-indexer/pom.xml @@ -109,6 +109,11 @@ </dependency> <dependency> <groupId>org.apache.archiva</groupId> + <artifactId>archiva-mock</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> <artifactId>archiva-configuration</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/archiva/blob/56f8b575/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/mock/MockRepositorySessionFactory.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/mock/MockRepositorySessionFactory.java b/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/mock/MockRepositorySessionFactory.java deleted file mode 100644 index c816296..0000000 --- a/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/mock/MockRepositorySessionFactory.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.apache.archiva.indexer.search.mock; -/* - * 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.metadata.repository.AbstractMetadataRepository; -import org.apache.archiva.metadata.repository.MetadataRepository; -import org.apache.archiva.metadata.repository.RepositorySession; -import org.apache.archiva.metadata.repository.RepositorySessionFactory; -import org.springframework.stereotype.Service; - -/** - * @author Olivier Lamy - */ -@Service( "repositorySessionFactory#mock" ) -public class MockRepositorySessionFactory - implements RepositorySessionFactory -{ - @Override - public RepositorySession createSession() - { - return new RepositorySession( null, null ) - { - @Override - public void close() - { - return; - } - - @Override - public void save() - { - // no op - } - - @Override - public MetadataRepository getRepository() - { - return new AbstractMetadataRepository() {}; - } - }; - } -} http://git-wip-us.apache.org/repos/asf/archiva/blob/56f8b575/archiva-modules/archiva-base/archiva-indexer/src/test/resources/spring-context.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/resources/spring-context.xml b/archiva-modules/archiva-base/archiva-indexer/src/test/resources/spring-context.xml index 698a00e..df44656 100644 --- a/archiva-modules/archiva-base/archiva-indexer/src/test/resources/spring-context.xml +++ b/archiva-modules/archiva-base/archiva-indexer/src/test/resources/spring-context.xml @@ -21,17 +21,13 @@ <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"; - xmlns:task="http://www.springframework.org/schema/task"; 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 - http://www.springframework.org/schema/task - http://www.springframework.org/schema/task/spring-task-3.0.xsd"; + http://www.springframework.org/schema/context/spring-context-3.0.xsd"; default-lazy-init="false"> <context:annotation-config/> - <context:component-scan base-package="org.apache.archiva.indexer.search.mock"/> <bean name="scheduler" class="org.apache.archiva.redback.components.scheduler.DefaultScheduler"> <property name="properties">
