diff options
author | Olivier Lamy <olamy@apache.org> | 2015-10-01 16:02:49 +1000 |
---|---|---|
committer | Olivier Lamy <olamy@apache.org> | 2015-10-01 16:02:49 +1000 |
commit | da1216f7346d74c4b45c1b7f042a2fabb0251baa (patch) | |
tree | 2e4de29712ffb8d0086bc932bd7d57ec21b3544c | |
parent | 418042acabded2a1c6698793068d3a976e7dc5ac (diff) | |
download | archiva-da1216f7346d74c4b45c1b7f042a2fabb0251baa.tar.gz archiva-da1216f7346d74c4b45c1b7f042a2fabb0251baa.zip |
more usage of MockRepositorySessionFactory
2 files changed, 6 insertions, 44 deletions
diff --git a/archiva-modules/archiva-base/archiva-proxy/pom.xml b/archiva-modules/archiva-base/archiva-proxy/pom.xml index 09ab29469..83e0ce068 100644 --- a/archiva-modules/archiva-base/archiva-proxy/pom.xml +++ b/archiva-modules/archiva-base/archiva-proxy/pom.xml @@ -176,6 +176,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-mock</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.archiva.redback</groupId> <artifactId>redback-rbac-cached</artifactId> <scope>test</scope> @@ -254,7 +259,7 @@ <derby.system.home>${project.build.directory}/appserver-base</derby.system.home> <redback.jdbc.url>${redbackTestJdbcUrl}</redback.jdbc.url> <redback.jdbc.driver.name>${redbackTestJdbcDriver}</redback.jdbc.driver.name> - <archiva.repositorySessionFactory.id>test</archiva.repositorySessionFactory.id> + <archiva.repositorySessionFactory.id>mock</archiva.repositorySessionFactory.id> </systemPropertyVariables> </configuration> </plugin> diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java deleted file mode 100644 index 5d2e82095..000000000 --- a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.apache.archiva.metadata.repository; - -import org.codehaus.plexus.personality.plexus.lifecycle.phase.Configurable; -import org.codehaus.plexus.personality.plexus.lifecycle.phase.Startable; -import org.springframework.stereotype.Service; - -/* -* 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. -*/ -@Service("repositorySessionFactory#test") -public class TestRepositorySessionFactory - implements RepositorySessionFactory -{ - private MetadataResolver resolver; - - @Override - public RepositorySession createSession() - { - return new RepositorySession( new AbstractMetadataRepository() {}, resolver ); - } - - public void setResolver( MetadataResolver resolver ) - { - Configurable configurable; - Startable startable; - this.resolver = resolver; - } -} |