Repository: archiva Updated Branches: refs/heads/master 2ab8942cc -> e2cdbc2b7
http://git-wip-us.apache.org/repos/asf/archiva/blob/e2cdbc2b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryContentProvider.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryContentProvider.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryContentProvider.java deleted file mode 100644 index 8234449..0000000 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryContentProvider.java +++ /dev/null @@ -1,82 +0,0 @@ -package org.apache.archiva.repository; - -/* - * 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 java.util.Set; - -/** - * A repository content provider creates repository content instances for specific repository types. - */ -public interface RepositoryContentProvider -{ - /** - * Returns true, if this content object supports the given layout otherwise, false. - * @param layout the layout string - * @return true, if layout is supported, otherwise false. - */ - boolean supportsLayout(String layout); - - /** - * Returns the repository types, this content object can be used for. - * - * @return all supported repository types. - */ - Set<RepositoryType> getSupportedRepositoryTypes(); - - - /** - * Returns true, if this content object supports the given repository type. - * - * @param type the type to check. - * @return true, if the type is supported, otherwise false. - */ - boolean supports(RepositoryType type); - - /** - * Creates a new instance of RemoteRepositoryContent. The returned instance should be initialized - * from the given repository data. - * - * @param repository the repository - * @return a repository content instance - * @throws RepositoryException if the layout is not supported, or a error occured during initialization - */ - RemoteRepositoryContent createRemoteContent(RemoteRepository repository) throws RepositoryException; - - /** - * Creates a new instance of ManagedRepositoryContent. - * - * @param repository the repository - * @return a new instance - * @throws RepositoryException if the layout is not supported, or a error occured during initialization - */ - ManagedRepositoryContent createManagedContent(ManagedRepository repository) throws RepositoryException; - - /** - * Creates a generic content object. - * - * @param repository the repository - * @param clazz the content class - * @param <T> the generic type of the content - * @param <V> the generic type of the repository (must correspond to the content class) - * @return a new instance - * @throws RepositoryException if the clazz, or layout is not supported, or something went wrong during initialization - */ - <T extends RepositoryContent, V extends Repository> T createContent(Class<T> clazz, V repository) throws RepositoryException; -} http://git-wip-us.apache.org/repos/asf/archiva/blob/e2cdbc2b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryCredentials.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryCredentials.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryCredentials.java deleted file mode 100644 index 2751bc0..0000000 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryCredentials.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.apache.archiva.repository; - -/* - * 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. - */ - - -/** - * Credentials used to login to a remote repository. - */ -public interface RepositoryCredentials { - - -} - - http://git-wip-us.apache.org/repos/asf/archiva/blob/e2cdbc2b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryException.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryException.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryException.java deleted file mode 100644 index b9dca95..0000000 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryException.java +++ /dev/null @@ -1,51 +0,0 @@ -package org.apache.archiva.repository; - -/* - * 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. - */ - -/** - * RepositoryException - * - * - */ -public class RepositoryException - extends Exception -{ - - public RepositoryException() - { - super(); - } - - public RepositoryException( String message, Throwable cause ) - { - super( message, cause ); - } - - public RepositoryException( String message ) - { - super( message ); - } - - public RepositoryException( Throwable cause ) - { - super( cause ); - } - -} http://git-wip-us.apache.org/repos/asf/archiva/blob/e2cdbc2b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryNotFoundException.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryNotFoundException.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryNotFoundException.java deleted file mode 100644 index ad4ad9b..0000000 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryNotFoundException.java +++ /dev/null @@ -1,49 +0,0 @@ -package org.apache.archiva.repository; - -/* - * 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. - */ - -/** - * RepositoryNotFoundException - * - * - */ -public class RepositoryNotFoundException - extends RepositoryException -{ - - public RepositoryNotFoundException() - { - } - - public RepositoryNotFoundException( String message, Throwable cause ) - { - super( message, cause ); - } - - public RepositoryNotFoundException( String message ) - { - super( message ); - } - - public RepositoryNotFoundException( Throwable cause ) - { - super( cause ); - } -} http://git-wip-us.apache.org/repos/asf/archiva/blob/e2cdbc2b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryProvider.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryProvider.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryProvider.java deleted file mode 100644 index a501514..0000000 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryProvider.java +++ /dev/null @@ -1,139 +0,0 @@ -package org.apache.archiva.repository; - -/* - * 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.configuration.ManagedRepositoryConfiguration; -import org.apache.archiva.configuration.RemoteRepositoryConfiguration; - -import java.util.Set; - -/** - * - * This interface must be implemented by the repository implementations. The repository provider knows all - * about the repositories and should be the only part that uses the repository specific classes and libraries - * (e.g. the maven libraries). - * - * Newly created instances should always be filled with default values that make sense. null values should - * be avoided. - * - * References like staging repositories must not be set. - * - * - */ -public interface RepositoryProvider -{ - - /** - * Returns the types of repositories this provider can handle. - * - * @return the set of supported repository types - */ - Set<RepositoryType> provides(); - - /** - * Creates a editable managed repository instance. The provider must not check the uniqueness of the - * id parameter and must not track the already created instances. Each call to this method will create - * a new instance. - * - * @param id the repository identifier - * @param name the repository name - * @return a new created managed repository instance - */ - EditableManagedRepository createManagedInstance(String id, String name); - - /** - * Creates a editable remote repository instance. The provider must not check the uniqueness of the - * id parameter and must not track the already created instances. Each call to this method will create - * a new instance. - * - * @param id the repository identifier - * @param name the repository name - * @return a new created remote repository instance - */ - EditableRemoteRepository createRemoteInstance(String id, String name); - - /** - * Creates a new managed repository instance from the given configuration. All attributes are filled from the - * provided configuration object. - * - * @param configuration the repository configuration that contains the repository data - * @return a new created managed repository instance - * @throws RepositoryException if some of the configuration values are not valid - */ - ManagedRepository createManagedInstance( ManagedRepositoryConfiguration configuration) throws RepositoryException; - - /** - * Updates the given managed repository instance from the given configuration. All attributes are filled from the - * provided configuration object. - * - * @param repo the repository instance that should be updated - * @param configuration the repository configuration that contains the repository data - * @throws RepositoryException if some of the configuration values are not valid - */ - void updateManagedInstance( EditableManagedRepository repo, ManagedRepositoryConfiguration configuration) throws RepositoryException; - - /** - * Creates a new managed staging repository instance from the given configuration. All attributes are filled from the - * provided configuration object. - * - * @param baseConfiguration the repository configuration of the base repository that references the staging repository - * @return a new created managed staging repository instance - * @throws RepositoryException if some of the configuration values are not valid - */ - ManagedRepository createStagingInstance(ManagedRepositoryConfiguration baseConfiguration) throws RepositoryException; - - /** - * Creates a new remote repository instance from the given configuration. All attributes are filled from the - * provided configuration object. - * - * @param configuration the repository configuration that contains the repository data - * @return a new created remote repository instance - * @throws RepositoryException if some of the configuration values are not valid - */ - RemoteRepository createRemoteInstance( RemoteRepositoryConfiguration configuration) throws RepositoryException; - - /** - * Updates the given remote repository instance from the given configuration. All attributes are filled from the - * provided configuration object. - * - * @param repo the repository instance that should be updated - * @param configuration the repository configuration that contains the repository data - * @throws RepositoryException if some of the configuration values are not valid - */ - void updateRemoteInstance(EditableRemoteRepository repo, RemoteRepositoryConfiguration configuration) throws RepositoryException; - - /** - * Returns a configuration object from the given remote repository instance. - * - * @param remoteRepository the remote repository instance - * @return the repository configuration with all the data that is stored in the repository instance - * @throws RepositoryException if the data cannot be converted - */ - RemoteRepositoryConfiguration getRemoteConfiguration(RemoteRepository remoteRepository) throws RepositoryException; - - /** - * Returns a configuration object from the given managed repository instance. - * - * @param managedRepository the managed repository instance - * @return the repository configuration with all the data that is stored in the repository instance - * @throws RepositoryException if the data cannot be converted - */ - ManagedRepositoryConfiguration getManagedConfiguration(ManagedRepository managedRepository) throws RepositoryException; -} http://git-wip-us.apache.org/repos/asf/archiva/blob/e2cdbc2b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryType.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryType.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryType.java deleted file mode 100644 index f60c657..0000000 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RepositoryType.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.apache.archiva.repository; - -/* - * 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. - */ - - -/** - * The repository types that are known to the system. - */ -public enum RepositoryType { - - MAVEN, NPM -} http://git-wip-us.apache.org/repos/asf/archiva/blob/e2cdbc2b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/StandardCapabilities.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/StandardCapabilities.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/StandardCapabilities.java deleted file mode 100644 index 0a41c04..0000000 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/StandardCapabilities.java +++ /dev/null @@ -1,131 +0,0 @@ -package org.apache.archiva.repository; - -/* - * 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 java.util.Collections; -import java.util.HashSet; -import java.util.Set; - -/** - * Capability implementation. - */ -public class StandardCapabilities implements RepositoryCapabilities -{ - private final Set<ReleaseScheme> supportedReleaseSchemes; - private final Set<ReleaseScheme> uSupportedReleaseSchemes; - private final Set<String> supportedLayouts; - private final Set<String> uSupportedLayouts; - private final Set<String> customCapabilities; - private final Set<String> uCustomCapabilities; - private final Set<String> supportedFeatures; - private final Set<String> uSupportedFeatures; - private final boolean indexable; - private final boolean fileBased; - private final boolean canBlockRedeployments; - private final boolean scannable; - private final boolean allowsFailover; - - - public StandardCapabilities( ReleaseScheme[] supportedReleaseSchemes, String[] supportedLayouts, - String[] customCapabilities, String[] supportedFeatures, - boolean indexable, boolean fileBased, - boolean canBlockRedeployments, boolean scannable, boolean allowsFailover ) - { - this.supportedReleaseSchemes = new HashSet(); - for (ReleaseScheme scheme : supportedReleaseSchemes) { - this.supportedReleaseSchemes.add(scheme); - } - this.uSupportedReleaseSchemes = Collections.unmodifiableSet( this.supportedReleaseSchemes); - this.supportedLayouts = new HashSet<>( ); - for (String layout : supportedLayouts) { - this.supportedLayouts.add(layout); - } - this.uSupportedLayouts = Collections.unmodifiableSet( this.supportedLayouts ); - this.customCapabilities = new HashSet<>( ); - for (String cap : customCapabilities) { - this.customCapabilities.add(cap); - } - this.uCustomCapabilities = Collections.unmodifiableSet( this.customCapabilities ); - this.supportedFeatures = new HashSet<>( ); - for (String feature : supportedFeatures) { - this.supportedFeatures.add(feature); - } - this.uSupportedFeatures = Collections.unmodifiableSet( this.supportedFeatures ); - this.indexable = indexable; - this.fileBased = fileBased; - this.canBlockRedeployments = canBlockRedeployments; - this.scannable = scannable; - this.allowsFailover = allowsFailover; - } - - @Override - public Set<ReleaseScheme> supportedReleaseSchemes( ) - { - return uSupportedReleaseSchemes; - } - - @Override - public Set<String> supportedLayouts( ) - { - return uSupportedLayouts; - } - - @Override - public Set<String> customCapabilities( ) - { - return uCustomCapabilities; - } - - @Override - public Set<String> supportedFeatures( ) - { - return uSupportedFeatures; - } - - @Override - public boolean isIndexable( ) - { - return indexable; - } - - @Override - public boolean isFileBased( ) - { - return fileBased; - } - - @Override - public boolean canBlockRedeployments( ) - { - return canBlockRedeployments; - } - - @Override - public boolean isScannable( ) - { - return scannable; - } - - @Override - public boolean allowsFailover( ) - { - return allowsFailover; - } -} http://git-wip-us.apache.org/repos/asf/archiva/blob/e2cdbc2b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/UnsupportedFeatureException.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/UnsupportedFeatureException.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/UnsupportedFeatureException.java deleted file mode 100644 index 112f307..0000000 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/UnsupportedFeatureException.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.apache.archiva.repository; - -/* - * 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. - */ - -/** - * This exception is thrown if a given feature is not supported by the repository. - * This is a runtime exception. - * - */ -public class UnsupportedFeatureException extends RuntimeException { - - public UnsupportedFeatureException() { - } - - public UnsupportedFeatureException(String message) { - super(message); - } - - public UnsupportedFeatureException(String message, Throwable cause) { - super(message, cause); - } - - public UnsupportedFeatureException(Throwable cause) { - super(cause); - } - - public UnsupportedFeatureException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) { - super(message, cause, enableSuppression, writableStackTrace); - } -} http://git-wip-us.apache.org/repos/asf/archiva/blob/e2cdbc2b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/UnsupportedURIException.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/UnsupportedURIException.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/UnsupportedURIException.java deleted file mode 100644 index 5f7f96f..0000000 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/UnsupportedURIException.java +++ /dev/null @@ -1,51 +0,0 @@ -package org.apache.archiva.repository; - -/* - * 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. - */ - -/** - * Exception is thrown, if the URI is syntactically correct, but is not - * supported by the underlying repository implementation - */ -public class UnsupportedURIException extends Exception -{ - public UnsupportedURIException( ) - { - } - - public UnsupportedURIException( String message ) - { - super( message ); - } - - public UnsupportedURIException( String message, Throwable cause ) - { - super( message, cause ); - } - - public UnsupportedURIException( Throwable cause ) - { - super( cause ); - } - - public UnsupportedURIException( String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace ) - { - super( message, cause, enableSuppression, writableStackTrace ); - } -} http://git-wip-us.apache.org/repos/asf/archiva/blob/e2cdbc2b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/PathParser.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/PathParser.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/PathParser.java index 5dc9609..ddbcb6d 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/PathParser.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/PathParser.java @@ -20,7 +20,7 @@ package org.apache.archiva.repository.content; */ import org.apache.archiva.model.ArtifactReference; -import org.apache.archiva.repository.layout.LayoutException; +import org.apache.archiva.repository.LayoutException; /** * PathParser interface. http://git-wip-us.apache.org/repos/asf/archiva/blob/e2cdbc2b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/features/RepositoryFeature.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/features/RepositoryFeature.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/features/RepositoryFeature.java deleted file mode 100644 index a4df8a2..0000000 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/features/RepositoryFeature.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.apache.archiva.repository.features; - -/* - * 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. - */ - - -/** - * Created by martin on 30.09.17. - */ -public interface RepositoryFeature<T extends RepositoryFeature<T>> { - - default String getId() { - return this.getClass().getName(); - } - - default boolean isFeature(String featureId) { - return this.getClass().getName().equals(featureId); - } - - default <K extends RepositoryFeature<K>> boolean isFeature(Class<K> clazz) { - return this.getClass().equals(clazz); - } - - T get(); -} http://git-wip-us.apache.org/repos/asf/archiva/blob/e2cdbc2b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/layout/LayoutException.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/layout/LayoutException.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/layout/LayoutException.java deleted file mode 100644 index 6e3a779..0000000 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/layout/LayoutException.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.apache.archiva.repository.layout; - -/* - * 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.common.ArchivaException; - -/** - * LayoutException - * - * - */ -public class LayoutException extends ArchivaException -{ - public LayoutException( String message, Throwable cause ) - { - super( message, cause ); - } - - public LayoutException( String message ) - { - super( message ); - } -} http://git-wip-us.apache.org/repos/asf/archiva/blob/e2cdbc2b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/MetadataTools.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/MetadataTools.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/MetadataTools.java index 8706759..0621692 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/MetadataTools.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/MetadataTools.java @@ -36,7 +36,7 @@ import org.apache.archiva.redback.components.registry.RegistryListener; import org.apache.archiva.repository.ContentNotFoundException; import org.apache.archiva.repository.ManagedRepositoryContent; import org.apache.archiva.repository.RemoteRepositoryContent; -import org.apache.archiva.repository.layout.LayoutException; +import org.apache.archiva.repository.LayoutException; import org.apache.archiva.xml.XMLException; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; http://git-wip-us.apache.org/repos/asf/archiva/blob/e2cdbc2b/archiva-modules/archiva-base/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/pom.xml b/archiva-modules/archiva-base/pom.xml index d77129d..5c3d64f 100644 --- a/archiva-modules/archiva-base/pom.xml +++ b/archiva-modules/archiva-base/pom.xml @@ -39,7 +39,7 @@ <module>archiva-checksum</module> <module>archiva-plexus-bridge</module> <module>archiva-policies</module> - <module>archiva-indexer-api</module> + <module>archiva-repository-api</module> <module>archiva-indexer</module> <module>archiva-consumers</module> <module>archiva-repository-layer</module> http://git-wip-us.apache.org/repos/asf/archiva/blob/e2cdbc2b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestConsumer.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestConsumer.java b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestConsumer.java index 9637673..519ac48 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestConsumer.java +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestConsumer.java @@ -26,7 +26,7 @@ import org.apache.archiva.model.ArtifactReference; import org.apache.archiva.repository.ManagedRepository; import org.apache.archiva.repository.ManagedRepositoryContent; import org.apache.archiva.repository.RepositoryContentFactory; -import org.apache.archiva.repository.layout.LayoutException; +import org.apache.archiva.repository.LayoutException; import org.springframework.stereotype.Service; import javax.inject.Inject; http://git-wip-us.apache.org/repos/asf/archiva/blob/e2cdbc2b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java index 6598b07..c42380e 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java @@ -65,7 +65,7 @@ import org.apache.archiva.repository.RepositoryRegistry; import org.apache.archiva.repository.content.maven2.RepositoryRequest; import org.apache.archiva.repository.events.AuditListener; import org.apache.archiva.repository.features.IndexCreationFeature; -import org.apache.archiva.repository.layout.LayoutException; +import org.apache.archiva.repository.LayoutException; import org.apache.archiva.repository.metadata.MetadataTools; import org.apache.archiva.repository.metadata.RepositoryMetadataException; import org.apache.archiva.repository.metadata.RepositoryMetadataMerge; http://git-wip-us.apache.org/repos/asf/archiva/blob/e2cdbc2b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java index 359c7eb..4678950 100644 --- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java +++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java @@ -47,7 +47,7 @@ import org.apache.archiva.proxy.common.WagonFactory; import org.apache.archiva.proxy.model.RepositoryProxyConnectors; import org.apache.archiva.repository.ManagedRepositoryContent; import org.apache.archiva.repository.content.PathParser; -import org.apache.archiva.repository.layout.LayoutException; +import org.apache.archiva.repository.LayoutException; import org.apache.archiva.xml.XMLException; import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.StringUtils; http://git-wip-us.apache.org/repos/asf/archiva/blob/e2cdbc2b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/AbstractDefaultRepositoryContent.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/AbstractDefaultRepositoryContent.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/AbstractDefaultRepositoryContent.java index a15b5d7..ae8a922 100644 --- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/AbstractDefaultRepositoryContent.java +++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/AbstractDefaultRepositoryContent.java @@ -20,7 +20,6 @@ package org.apache.archiva.repository.content.maven2; */ import org.apache.archiva.common.utils.VersionUtil; -import org.apache.archiva.configuration.FileTypes; import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator; import org.apache.archiva.metadata.repository.storage.maven2.ArtifactMappingProvider; import org.apache.archiva.metadata.repository.storage.maven2.Maven2RepositoryPathTranslator; @@ -30,13 +29,11 @@ import org.apache.archiva.model.ProjectReference; import org.apache.archiva.model.VersionedReference; import org.apache.archiva.repository.RepositoryContent; import org.apache.archiva.repository.content.PathParser; -import org.apache.archiva.repository.layout.LayoutException; +import org.apache.archiva.repository.LayoutException; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.annotation.PostConstruct; -import javax.inject.Inject; import java.util.List; /** http://git-wip-us.apache.org/repos/asf/archiva/blob/e2cdbc2b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/DefaultPathParser.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/DefaultPathParser.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/DefaultPathParser.java index c0bcaaf..d28a828 100644 --- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/DefaultPathParser.java +++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/DefaultPathParser.java @@ -27,7 +27,7 @@ import org.apache.archiva.metadata.repository.storage.maven2.DefaultArtifactMapp import org.apache.archiva.metadata.repository.storage.maven2.Maven2RepositoryPathTranslator; import org.apache.archiva.model.ArtifactReference; import org.apache.archiva.repository.content.PathParser; -import org.apache.archiva.repository.layout.LayoutException; +import org.apache.archiva.repository.LayoutException; import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; http://git-wip-us.apache.org/repos/asf/archiva/blob/e2cdbc2b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/ManagedDefaultRepositoryContent.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/ManagedDefaultRepositoryContent.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/ManagedDefaultRepositoryContent.java index 847dd7a..d5f55fc 100644 --- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/ManagedDefaultRepositoryContent.java +++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/ManagedDefaultRepositoryContent.java @@ -28,9 +28,9 @@ import org.apache.archiva.model.ArtifactReference; import org.apache.archiva.model.ProjectReference; import org.apache.archiva.model.VersionedReference; import org.apache.archiva.repository.ContentNotFoundException; +import org.apache.archiva.repository.LayoutException; import org.apache.archiva.repository.ManagedRepositoryContent; import org.apache.archiva.repository.RepositoryException; -import org.apache.archiva.repository.layout.LayoutException; import org.apache.commons.lang.StringUtils; import java.io.IOException; @@ -245,8 +245,8 @@ public class ManagedDefaultRepositoryContent * information. * * @return the Set of available versions, based on the project reference. - * @throws org.apache.archiva.repository.layout.LayoutException - * @throws org.apache.archiva.repository.layout.LayoutException + * @throws LayoutException + * @throws LayoutException */ @Override public Set<String> getVersions( ProjectReference reference ) @@ -395,7 +395,7 @@ public class ManagedDefaultRepositoryContent * Convert a path to an artifact reference. * * @param path the path to convert. (relative or full location path) - * @throws org.apache.archiva.repository.layout.LayoutException if the path cannot be converted to an artifact reference. + * @throws LayoutException if the path cannot be converted to an artifact reference. */ @Override public ArtifactReference toArtifactReference( String path ) @@ -440,7 +440,7 @@ public class ManagedDefaultRepositoryContent * @return the ArtifactReference to the first artifact located within the versioned reference. or null if * no artifact was found within the versioned reference. * @throws java.io.IOException if the versioned reference is invalid (example: doesn't exist, or isn't a directory) - * @throws org.apache.archiva.repository.layout.LayoutException + * @throws LayoutException */ private ArtifactReference getFirstArtifact( VersionedReference reference ) throws LayoutException, IOException http://git-wip-us.apache.org/repos/asf/archiva/blob/e2cdbc2b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/RemoteDefaultRepositoryContent.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/RemoteDefaultRepositoryContent.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/RemoteDefaultRepositoryContent.java index b9c2238..17426d8 100644 --- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/RemoteDefaultRepositoryContent.java +++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/RemoteDefaultRepositoryContent.java @@ -22,11 +22,9 @@ package org.apache.archiva.repository.content.maven2; import org.apache.archiva.metadata.repository.storage.maven2.ArtifactMappingProvider; import org.apache.archiva.model.ArtifactReference; import org.apache.archiva.model.RepositoryURL; +import org.apache.archiva.repository.LayoutException; import org.apache.archiva.repository.RemoteRepository; import org.apache.archiva.repository.RemoteRepositoryContent; -import org.apache.archiva.repository.layout.LayoutException; -import org.springframework.context.annotation.Scope; -import org.springframework.stereotype.Service; import java.util.List; @@ -80,7 +78,7 @@ public class RemoteDefaultRepositoryContent * Convert a path to an artifact reference. * * @param path the path to convert. (relative or full url path) - * @throws org.apache.archiva.repository.layout.LayoutException if the path cannot be converted to an artifact reference. + * @throws LayoutException if the path cannot be converted to an artifact reference. */ @Override public ArtifactReference toArtifactReference( String path ) http://git-wip-us.apache.org/repos/asf/archiva/blob/e2cdbc2b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/RepositoryRequest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/RepositoryRequest.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/RepositoryRequest.java index a1fc5bd..fa7ec89 100644 --- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/RepositoryRequest.java +++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/RepositoryRequest.java @@ -20,9 +20,9 @@ package org.apache.archiva.repository.content.maven2; */ import org.apache.archiva.model.ArtifactReference; +import org.apache.archiva.repository.LayoutException; import org.apache.archiva.repository.ManagedRepositoryContent; import org.apache.archiva.repository.content.PathParser; -import org.apache.archiva.repository.layout.LayoutException; import org.apache.archiva.repository.metadata.MetadataTools; import org.apache.commons.lang.StringUtils; @@ -45,7 +45,7 @@ public class RepositoryRequest * * @param requestedPath the relative path to the content. * @return the ArtifactReference for the requestedPath. - * @throws org.apache.archiva.repository.layout.LayoutException if the request path is not layout valid. + * @throws LayoutException if the request path is not layout valid. */ public ArtifactReference toArtifactReference( String requestedPath ) throws LayoutException @@ -236,7 +236,7 @@ public class RepositoryRequest * @param requestedPath the incoming requested path. * @param repository the repository to adjust to. * @return the adjusted (to native) path. - * @throws org.apache.archiva.repository.layout.LayoutException if the path cannot be parsed. + * @throws LayoutException if the path cannot be parsed. */ public String toNativePath( String requestedPath, ManagedRepositoryContent repository ) throws LayoutException http://git-wip-us.apache.org/repos/asf/archiva/blob/e2cdbc2b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/AbstractDefaultRepositoryContentTestCase.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/AbstractDefaultRepositoryContentTestCase.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/AbstractDefaultRepositoryContentTestCase.java index 0967e22..c3b85cc 100644 --- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/AbstractDefaultRepositoryContentTestCase.java +++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/AbstractDefaultRepositoryContentTestCase.java @@ -21,7 +21,7 @@ package org.apache.archiva.metadata.repository.storage.maven2; import org.apache.archiva.model.ArtifactReference; import org.apache.archiva.repository.AbstractRepositoryLayerTestCase; -import org.apache.archiva.repository.layout.LayoutException; +import org.apache.archiva.repository.LayoutException; import org.apache.commons.lang.StringUtils; import org.junit.Test; @@ -82,7 +82,7 @@ public abstract class AbstractDefaultRepositoryContentTestCase * [MRM-432] Oddball version spec. * Example of an oddball / unusual version spec. * - * @throws org.apache.archiva.repository.layout.LayoutException + * @throws LayoutException * */ @Test @@ -103,7 +103,7 @@ public abstract class AbstractDefaultRepositoryContentTestCase * [MRM-432] Oddball version spec. * Example of an oddball / unusual version spec. * - * @throws org.apache.archiva.repository.layout.LayoutException + * @throws LayoutException * */ @Test @@ -124,7 +124,7 @@ public abstract class AbstractDefaultRepositoryContentTestCase * Test the ejb-client type spec. * Type specs are not a 1 to 1 map to the extension. * This tests that effect. - * @throws org.apache.archiva.repository.layout.LayoutException + * @throws LayoutException */ /* TODO: Re-enabled in the future. public void testGoodFooEjbClient() @@ -145,7 +145,7 @@ public abstract class AbstractDefaultRepositoryContentTestCase * [MRM-432] Oddball version spec. * Example of an oddball / unusual version spec. * - * @throws org.apache.archiva.repository.layout.LayoutException + * @throws LayoutException * */ @Test @@ -252,7 +252,7 @@ public abstract class AbstractDefaultRepositoryContentTestCase /** * Test the classifier, and java-source type spec. * - * @throws org.apache.archiva.repository.layout.LayoutException + * @throws LayoutException * */ @Test @@ -272,7 +272,7 @@ public abstract class AbstractDefaultRepositoryContentTestCase /** * A timestamped versioned artifact, should reside in a SNAPSHOT baseversion directory. * - * @throws org.apache.archiva.repository.layout.LayoutException + * @throws LayoutException * */ @Test http://git-wip-us.apache.org/repos/asf/archiva/blob/e2cdbc2b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedDefaultRepositoryContentTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedDefaultRepositoryContentTest.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedDefaultRepositoryContentTest.java index 41e62fa..98bfac0 100644 --- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedDefaultRepositoryContentTest.java +++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedDefaultRepositoryContentTest.java @@ -27,9 +27,8 @@ import org.apache.archiva.model.ArtifactReference; import org.apache.archiva.model.ProjectReference; import org.apache.archiva.model.VersionedReference; import org.apache.archiva.repository.EditableManagedRepository; -import org.apache.archiva.repository.ManagedRepositoryContent; import org.apache.archiva.repository.content.maven2.ManagedDefaultRepositoryContent; -import org.apache.archiva.repository.layout.LayoutException; +import org.apache.archiva.repository.LayoutException; import org.apache.archiva.repository.maven2.MavenManagedRepository; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/archiva/blob/e2cdbc2b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/RemoteDefaultRepositoryContentTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/RemoteDefaultRepositoryContentTest.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/RemoteDefaultRepositoryContentTest.java index 0a1c03a..4af23f6 100644 --- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/RemoteDefaultRepositoryContentTest.java +++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/RemoteDefaultRepositoryContentTest.java @@ -23,11 +23,10 @@ import org.apache.archiva.model.ArtifactReference; import org.apache.archiva.repository.RemoteRepository; import org.apache.archiva.repository.RemoteRepositoryContent; import org.apache.archiva.repository.content.maven2.RemoteDefaultRepositoryContent; -import org.apache.archiva.repository.layout.LayoutException; +import org.apache.archiva.repository.LayoutException; import org.junit.Before; import javax.inject.Inject; -import javax.inject.Named; import java.util.List; /** http://git-wip-us.apache.org/repos/asf/archiva/blob/e2cdbc2b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/DefaultPathParserTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/DefaultPathParserTest.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/DefaultPathParserTest.java index 74b2c0d..f46dfa2 100644 --- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/DefaultPathParserTest.java +++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/DefaultPathParserTest.java @@ -20,8 +20,8 @@ package org.apache.archiva.repository.content.maven2; */ import org.apache.archiva.model.ArtifactReference; +import org.apache.archiva.repository.LayoutException; import org.apache.archiva.repository.content.PathParser; -import org.apache.archiva.repository.layout.LayoutException; import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; import org.apache.commons.lang.StringUtils; import org.junit.Test; @@ -152,7 +152,7 @@ public class DefaultPathParserTest * [MRM-432] Oddball version spec. * Example of an oddball / unusual version spec. * - * @throws org.apache.archiva.repository.layout.LayoutException + * @throws LayoutException */ @Test public void testGoodButOddVersionSpecGanymedSsh2() @@ -172,7 +172,7 @@ public class DefaultPathParserTest * [MRM-432] Oddball version spec. * Example of an oddball / unusual version spec. * - * @throws org.apache.archiva.repository.layout.LayoutException + * @throws LayoutException */ @Test public void testGoodButOddVersionSpecJavaxComm() @@ -192,7 +192,7 @@ public class DefaultPathParserTest * Test the ejb-client type spec. * Type specs are not a 1 to 1 map to the extension. * This tests that effect. - * @throws org.apache.archiva.repository.layout.LayoutException + * @throws LayoutException */ /* TODO: Re-enabled in the future. public void testGoodFooEjbClient() @@ -213,7 +213,7 @@ public class DefaultPathParserTest * [MRM-432] Oddball version spec. * Example of an oddball / unusual version spec. * - * @throws org.apache.archiva.repository.layout.LayoutException + * @throws LayoutException */ @Test public void testGoodButOddVersionSpecJavaxPersistence() @@ -333,7 +333,7 @@ public class DefaultPathParserTest /** * Test the classifier, and java-source type spec. * - * @throws org.apache.archiva.repository.layout.LayoutException + * @throws LayoutException */ @Test public void testGoodFooLibSources() @@ -352,7 +352,7 @@ public class DefaultPathParserTest /** * A timestamped versioned artifact, should reside in a SNAPSHOT baseversion directory. * - * @throws org.apache.archiva.repository.layout.LayoutException + * @throws LayoutException */ @Test public void testGoodSnapshotMavenTest() @@ -372,7 +372,7 @@ public class DefaultPathParserTest /** * A timestamped versioned artifact, should reside in a SNAPSHOT baseversion directory. * - * @throws org.apache.archiva.repository.layout.LayoutException + * @throws LayoutException */ @Test public void testGoodLongSnapshotMavenTest() @@ -401,7 +401,7 @@ public class DefaultPathParserTest /** * A timestamped versioned artifact, should reside in a SNAPSHOT baseversion directory. * - * @throws org.apache.archiva.repository.layout.LayoutException + * @throws LayoutException */ @Test public void testClassifiedSnapshotMavenTest() http://git-wip-us.apache.org/repos/asf/archiva/blob/e2cdbc2b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/RepositoryRequestTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/RepositoryRequestTest.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/RepositoryRequestTest.java index 928482b..f918c18 100644 --- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/RepositoryRequestTest.java +++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/RepositoryRequestTest.java @@ -24,7 +24,7 @@ import org.apache.archiva.configuration.ArchivaConfiguration; import org.apache.archiva.model.ArtifactReference; import org.apache.archiva.repository.ManagedRepositoryContent; import org.apache.archiva.repository.RepositoryContentProvider; -import org.apache.archiva.repository.layout.LayoutException; +import org.apache.archiva.repository.LayoutException; import org.apache.archiva.repository.maven2.MavenManagedRepository; import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; import org.apache.commons.lang.StringUtils; http://git-wip-us.apache.org/repos/asf/archiva/blob/e2cdbc2b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/metadata/MetadataToolsTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/metadata/MetadataToolsTest.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/metadata/MetadataToolsTest.java index 650f49f..7bbf4cb 100644 --- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/metadata/MetadataToolsTest.java +++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/metadata/MetadataToolsTest.java @@ -19,7 +19,6 @@ package org.apache.archiva.repository.metadata; * under the License. */ -import org.apache.archiva.admin.model.beans.ManagedRepository; import org.apache.archiva.common.utils.VersionComparator; import org.apache.archiva.configuration.ProxyConnectorConfiguration; import org.apache.archiva.metadata.repository.storage.maven2.conf.MockConfiguration; @@ -33,7 +32,7 @@ import org.apache.archiva.repository.AbstractRepositoryLayerTestCase; import org.apache.archiva.repository.ManagedRepositoryContent; import org.apache.archiva.repository.RemoteRepositoryContent; import org.apache.archiva.repository.RepositoryContentProvider; -import org.apache.archiva.repository.layout.LayoutException; +import org.apache.archiva.repository.LayoutException; import org.apache.archiva.repository.maven2.MavenManagedRepository; import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; http://git-wip-us.apache.org/repos/asf/archiva/blob/e2cdbc2b/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 8b981b6..2469fd3 100644 --- a/pom.xml +++ b/pom.xml @@ -289,11 +289,6 @@ </dependency> <dependency> <groupId>org.apache.archiva</groupId> - <artifactId>archiva-indexer-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.archiva</groupId> <artifactId>archiva-indexer</artifactId> <version>${project.version}</version> </dependency> @@ -439,6 +434,11 @@ </dependency> <dependency> <groupId>org.apache.archiva</groupId> + <artifactId>archiva-repository-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> <artifactId>archiva-repository-scanner</artifactId> <version>${project.version}</version> </dependency>
