Fxing unit tests for RepositoryRegistry
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/6899bc54 Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/6899bc54 Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/6899bc54 Branch: refs/heads/master Commit: 6899bc54a794df885fc0d7bffc80ce48cf2592e7 Parents: 07d51cc Author: Martin Stockhammer <[email protected]> Authored: Thu Nov 9 19:10:21 2017 +0100 Committer: Martin Stockhammer <[email protected]> Committed: Thu Nov 9 19:10:21 2017 +0100 ---------------------------------------------------------------------- .../archiva/indexer/GenericIndexManager.java | 66 ++++++++++++++++++++ .../archiva-repository-layer/pom.xml | 3 +- .../mock/RepositoryContentProviderMock.java | 66 ++++++++++++++++++++ .../repository/mock/RepositoryProviderMock.java | 1 + .../archiva-rest/archiva-rest-services/pom.xml | 2 +- 5 files changed, 136 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva/blob/6899bc54/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/indexer/GenericIndexManager.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/indexer/GenericIndexManager.java b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/indexer/GenericIndexManager.java new file mode 100644 index 0000000..2e9ee17 --- /dev/null +++ b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/indexer/GenericIndexManager.java @@ -0,0 +1,66 @@ +package org.apache.archiva.indexer; + +/* + * 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.model.ArtifactReference; +import org.apache.archiva.repository.Repository; +import org.apache.archiva.repository.RepositoryType; +import org.springframework.stereotype.Service; + +import java.net.URI; + +@Service("indexManager#none") +public class GenericIndexManager implements ArchivaIndexManager { + + @Override + public void pack(ArchivaIndexingContext context) { + + } + + @Override + public void scan(ArchivaIndexingContext context, boolean update) { + + } + + @Override + public void update(ArchivaIndexingContext context, URI remoteUpdateUri, boolean fullUpdate) { + + } + + @Override + public void addArtifactToIndex(ArchivaIndexingContext context, ArtifactReference artifactReference) { + + } + + @Override + public void removeArtifactFromIndex(ArchivaIndexingContext context, ArtifactReference artifactReference) { + + } + + @Override + public boolean supportsRepository(RepositoryType type) { + return false; + } + + @Override + public ArchivaIndexingContext createContext(Repository repository) { + return null; + } +} http://git-wip-us.apache.org/repos/asf/archiva/blob/6899bc54/archiva-modules/archiva-base/archiva-repository-layer/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml index 2b03400..a33ba65 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml @@ -71,7 +71,7 @@ <artifactId>archiva-test-utils</artifactId> <version>${project.version}</version> <scope>test</scope> - </dependency> + </dependency> <dependency> <groupId>org.apache.archiva</groupId> <artifactId>metadata-model</artifactId> @@ -171,6 +171,7 @@ <configuration> <systemPropertyVariables> <basedir>${basedir}</basedir> + <appserver.base>${project.build.directory}/test-classes</appserver.base> </systemPropertyVariables> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/archiva/blob/6899bc54/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/RepositoryContentProviderMock.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/RepositoryContentProviderMock.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/RepositoryContentProviderMock.java new file mode 100644 index 0000000..3693e07 --- /dev/null +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/RepositoryContentProviderMock.java @@ -0,0 +1,66 @@ +package org.apache.archiva.repository.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.repository.*; +import org.springframework.stereotype.Service; + +import java.util.HashSet; +import java.util.Set; + +@Service("repositoryContentProvider#mock") +public class RepositoryContentProviderMock implements RepositoryContentProvider { + + private static final Set<RepositoryType> REPOSITORY_TYPES = new HashSet<>(); + static { + REPOSITORY_TYPES.add(RepositoryType.MAVEN); + REPOSITORY_TYPES.add(RepositoryType.NPM); + } + + @Override + public boolean supportsLayout(String layout) { + return true; + } + + @Override + public Set<RepositoryType> getSupportedRepositoryTypes() { + return REPOSITORY_TYPES; + } + + @Override + public boolean supports(RepositoryType type) { + return true; + } + + @Override + public RemoteRepositoryContent createRemoteContent(RemoteRepository repository) throws RepositoryException { + return new RemoteRepositoryContentMock(); + } + + @Override + public ManagedRepositoryContent createManagedContent(ManagedRepository repository) throws RepositoryException { + return new ManagedRepositoryContentMock(); + } + + @Override + public <T extends RepositoryContent, V extends Repository> T createContent(Class<T> clazz, V repository) throws RepositoryException { + return null; + } +} http://git-wip-us.apache.org/repos/asf/archiva/blob/6899bc54/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/RepositoryProviderMock.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/RepositoryProviderMock.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/RepositoryProviderMock.java index 834ce5b..95485cc 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/RepositoryProviderMock.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/mock/RepositoryProviderMock.java @@ -130,6 +130,7 @@ public class RepositoryProviderMock implements RepositoryProvider String id = configuration.getId( ) + StagingRepositoryFeature.STAGING_REPO_POSTFIX; BasicManagedRepository managedRepository = new BasicManagedRepository( id, configuration.getName( ) ); updateManagedInstance( managedRepository, configuration ); + managedRepository.getFeature(StagingRepositoryFeature.class).get().setStageRepoNeeded(false); return managedRepository; } http://git-wip-us.apache.org/repos/asf/archiva/blob/6899bc54/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml index c3c8a2f..74a963a 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml @@ -80,7 +80,7 @@ </dependency> <dependency> <groupId>org.apache.archiva</groupId> - <artifactId>archiva-indexer</artifactId> + <artifactId>archiva-maven2-indexer</artifactId> </dependency> <dependency> <groupId>org.apache.archiva</groupId>
