From: Joakim Erdfelt Date: Wed, 17 Oct 2007 16:39:06 +0000 (+0000) Subject: Setting deprecations on interfaces / classes not to use. X-Git-Tag: archiva-1.0-beta-3~72 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f3d43d4d4dd559b9c901f30e9128b3dee9e5c596;p=archiva.git Setting deprecations on interfaces / classes not to use. git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@585564 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/BidirectionalRepositoryLayout.java b/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/BidirectionalRepositoryLayout.java index 1cb3ada90..da43e28f6 100644 --- a/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/BidirectionalRepositoryLayout.java +++ b/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/BidirectionalRepositoryLayout.java @@ -22,6 +22,10 @@ package org.apache.maven.archiva.repository.layout; import org.apache.maven.archiva.model.ArchivaArtifact; import org.apache.maven.archiva.model.ArtifactReference; import org.apache.maven.archiva.model.VersionedReference; +import org.apache.maven.archiva.repository.ManagedRepositoryContent; +import org.apache.maven.archiva.repository.RemoteRepositoryContent; +import org.apache.maven.archiva.repository.RepositoryContentFactory; +import org.apache.maven.archiva.repository.content.RepositoryRequest; /** * BidirectionalRepositoryLayout - Similar in scope to ArtifactRepositoryLayout, but does @@ -29,6 +33,8 @@ import org.apache.maven.archiva.model.VersionedReference; * * @author Joakim Erdfelt * @version $Id$ + * + * @deprecated use {@link RepositoryContentFactory} instead. */ public interface BidirectionalRepositoryLayout { @@ -36,12 +42,16 @@ public interface BidirectionalRepositoryLayout * Get the identifier for this layout. * * @return the identifier for this layout. + * + * @deprecated use {@link ManagedRepositoryContent#getId()} or {@link RemoteRepositoryContent#getId()} instead. */ public String getId(); /** * Given a repository relative path, return true if the path is valid * according to the repository layout. + * + * @deprecated use {@link RepositoryRequest#toArtifactReference(String)} instead. */ public boolean isValidPath( String path ); @@ -50,6 +60,8 @@ public interface BidirectionalRepositoryLayout * * @param artifact the artifact to use. * @return the relative path to the artifact. + * + * @deprecated use {@link ManagedRepositoryContent#toPath(ArchivaArtifact)} instead. */ public String toPath( ArchivaArtifact artifact ); @@ -58,6 +70,9 @@ public interface BidirectionalRepositoryLayout * * @param reference the artifact reference to use. * @return the relative path to the artifact. + * + * @deprecated use {@link ManagedRepositoryContent#toPath(ArtifactReference))} or + * {@link RemoteRepositoryContent#toPath(ArtifactReference)} instead. */ public String toPath( ArtifactReference reference ); @@ -68,6 +83,9 @@ public interface BidirectionalRepositoryLayout * @return the {@link ArchivaArtifact} representing the path. (or null if path cannot be converted to * an {@link ArchivaArtifact}) * @throws LayoutException if there was a problem converting the path to an artifact. + * + * @deprecated use {@link ManagedRepositoryContent#toArtifactReference(String))} or + * {@link RemoteRepositoryContent#toArtifactReference(String)} instead. */ public ArchivaArtifact toArtifact( String path ) throws LayoutException; @@ -79,6 +97,9 @@ public interface BidirectionalRepositoryLayout * @return the {@link ArtifactReference} representing the path. (or null if path cannot be converted to * a {@link ArtifactReference}) * @throws LayoutException if there was a problem converting the path to an artifact. + * + * @deprecated use {@link ManagedRepositoryContent#toArtifactReference(String))} or + * {@link RemoteRepositoryContent#toArtifactReference(String)} instead. */ public ArtifactReference toArtifactReference( String path ) throws LayoutException; diff --git a/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/BidirectionalRepositoryLayoutFactory.java b/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/BidirectionalRepositoryLayoutFactory.java index 2ae41f58c..7c0e428f0 100644 --- a/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/BidirectionalRepositoryLayoutFactory.java +++ b/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/BidirectionalRepositoryLayoutFactory.java @@ -24,6 +24,8 @@ import org.apache.maven.archiva.configuration.AbstractRepositoryConfiguration; import org.apache.maven.archiva.configuration.ArchivaConfiguration; import org.apache.maven.archiva.configuration.ConfigurationNames; import org.apache.maven.archiva.model.ArchivaArtifact; +import org.apache.maven.archiva.repository.RepositoryContentFactory; +import org.apache.maven.archiva.repository.content.RepositoryRequest; import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable; import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException; @@ -39,6 +41,9 @@ import java.util.Map; * * @author Joakim Erdfelt * @version $Id$ + * + * @deprecated use {@link RepositoryContentFactory} instead. + * * @plexus.component role="org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayoutFactory" */ public class BidirectionalRepositoryLayoutFactory @@ -57,6 +62,10 @@ public class BidirectionalRepositoryLayoutFactory private Map repositoryMap = new HashMap(); + /** + * @deprecated use {@link RepositoryContentFactory#getManagedRepositoryContent(String)} or + * {@link RepositoryContentFactory#getRemoteRepositoryContent(String)} instead. + */ public BidirectionalRepositoryLayout getLayout( String type ) throws LayoutException { @@ -69,6 +78,9 @@ public class BidirectionalRepositoryLayoutFactory return (BidirectionalRepositoryLayout) layouts.get( type ); } + /** + * @deprecated use {@link RepositoryRequest#toArtifactReference(String)} instead. + */ public BidirectionalRepositoryLayout getLayoutForPath( String path ) throws LayoutException { @@ -84,6 +96,10 @@ public class BidirectionalRepositoryLayoutFactory } + /** + * @deprecated use {@link RepositoryContentFactory#getManagedRepositoryContent(String)} or + * {@link RepositoryContentFactory#getRemoteRepositoryContent(String)} instead. + */ public BidirectionalRepositoryLayout getLayout( ArchivaArtifact artifact ) throws LayoutException { diff --git a/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/DefaultBidirectionalRepositoryLayout.java b/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/DefaultBidirectionalRepositoryLayout.java index 0b25b0cb3..5ed0304ed 100644 --- a/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/DefaultBidirectionalRepositoryLayout.java +++ b/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/DefaultBidirectionalRepositoryLayout.java @@ -23,6 +23,8 @@ import org.apache.commons.lang.StringUtils; import org.apache.maven.archiva.common.utils.VersionUtil; import org.apache.maven.archiva.model.ArchivaArtifact; import org.apache.maven.archiva.model.ArtifactReference; +import org.apache.maven.archiva.repository.ManagedRepositoryContent; +import org.apache.maven.archiva.repository.RemoteRepositoryContent; import org.apache.maven.archiva.repository.content.ArtifactExtensionMapping; /** @@ -31,6 +33,7 @@ import org.apache.maven.archiva.repository.content.ArtifactExtensionMapping; * @author Joakim Erdfelt * @version $Id$ * @plexus.component role-hint="default" + * @deprecated to not use directly. Use {@link ManagedRepositoryContent} or {@link RemoteRepositoryContent} instead. */ public class DefaultBidirectionalRepositoryLayout implements BidirectionalRepositoryLayout diff --git a/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/FilenameParts.java b/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/FilenameParts.java index 2e172f064..e29c22986 100644 --- a/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/FilenameParts.java +++ b/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/FilenameParts.java @@ -1,5 +1,8 @@ package org.apache.maven.archiva.repository.layout; +import org.apache.maven.archiva.repository.ManagedRepositoryContent; +import org.apache.maven.archiva.repository.RemoteRepositoryContent; + /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -24,6 +27,7 @@ package org.apache.maven.archiva.repository.layout; * * @author Joakim Erdfelt * @version $Id$ + * @deprecated to not use directly. Use {@link ManagedRepositoryContent} or {@link RemoteRepositoryContent} instead. */ public class FilenameParts { diff --git a/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/LegacyBidirectionalRepositoryLayout.java b/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/LegacyBidirectionalRepositoryLayout.java index 51652c613..70c4b6152 100644 --- a/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/LegacyBidirectionalRepositoryLayout.java +++ b/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/LegacyBidirectionalRepositoryLayout.java @@ -22,6 +22,8 @@ package org.apache.maven.archiva.repository.layout; import org.apache.commons.lang.StringUtils; import org.apache.maven.archiva.model.ArchivaArtifact; import org.apache.maven.archiva.model.ArtifactReference; +import org.apache.maven.archiva.repository.ManagedRepositoryContent; +import org.apache.maven.archiva.repository.RemoteRepositoryContent; import org.apache.maven.archiva.repository.content.ArtifactExtensionMapping; import java.util.HashMap; @@ -33,6 +35,8 @@ import java.util.Map; * @author Joakim Erdfelt * @version $Id$ * @plexus.component role-hint="legacy" + * + * @deprecated to not use directly. Use {@link ManagedRepositoryContent} or {@link RemoteRepositoryContent} instead. */ public class LegacyBidirectionalRepositoryLayout implements BidirectionalRepositoryLayout diff --git a/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/RepositoryLayoutUtils.java b/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/RepositoryLayoutUtils.java index 00070c661..0705e5a12 100644 --- a/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/RepositoryLayoutUtils.java +++ b/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/layout/RepositoryLayoutUtils.java @@ -21,12 +21,18 @@ package org.apache.maven.archiva.repository.layout; import org.apache.commons.lang.StringUtils; import org.apache.maven.archiva.common.utils.VersionUtil; +import org.apache.maven.archiva.repository.ManagedRepositoryContent; +import org.apache.maven.archiva.repository.RemoteRepositoryContent; +import org.apache.maven.archiva.repository.RepositoryContentFactory; /** * RepositoryLayoutUtils - utility methods common for most BidirectionalRepositoryLayout implementation. * * @author Joakim Erdfelt * @version $Id$ + * + * @deprecated use {@link RepositoryContentFactory} and {@link ManagedRepositoryContent} + * or {@link RemoteRepositoryContent} instead. */ public class RepositoryLayoutUtils { @@ -61,6 +67,7 @@ public class RepositoryLayoutUtils * (null to allow algorithm to calculate one) * @return the parts of the filename. * @throws LayoutException + * @deprecated to not use directly. Use {@link ManagedRepositoryContent} or {@link RemoteRepositoryContent} instead. */ public static FilenameParts splitFilename( String filename, String possibleArtifactId ) throws LayoutException { @@ -85,6 +92,7 @@ public class RepositoryLayoutUtils * (null to allow algorithm to calculate one) * @return the parts of the filename. * @throws LayoutException + * @deprecated to not use directly. Use {@link ManagedRepositoryContent} or {@link RemoteRepositoryContent} instead. */ public static FilenameParts splitFilename( String filename, String possibleArtifactId, String possibleVersion ) throws LayoutException