From e25c4643a5e52caa1001101ca543d46c2e846f0b Mon Sep 17 00:00:00 2001 From: Nicolas De Loof Date: Thu, 13 Dec 2007 15:02:22 +0000 Subject: [PATCH] fix missing "@since 1.1" git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@603932 13f79535-47bb-0310-9956-ffa450edef68 --- .../archiva-configuration/src/main/mdo/configuration.mdo | 8 ++++---- .../archiva/configuration/LegacyArtifactPathTest.java | 1 + .../repository/content/ArtifactClassifierMapping.java | 1 + .../archiva/repository/content/LegacyPathParserTest.java | 1 + archiva-docs/src/site/apt/adminguide/legacy.apt | 2 +- .../action/admin/legacy/AddLegacyArtifactPathAction.java | 2 +- .../admin/legacy/DeleteLegacyArtifactPathAction.java | 1 + .../web/action/admin/legacy/LegacyArtifactPathAction.java | 1 + 8 files changed, 11 insertions(+), 6 deletions(-) diff --git a/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo b/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo index 0d903b125..68c08244c 100644 --- a/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo +++ b/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo @@ -107,7 +107,7 @@ legacyArtifactPaths - 1.0.0+ + 1.1.0+ LegacyArtifactPath * @@ -443,11 +443,11 @@ LegacyArtifactPath - 1.0.0+ + 1.1.0+ path - 1.0.0+ + 1.1.0+ String true @@ -456,7 +456,7 @@ artifact - 1.0.0+ + 1.1.0+ String true diff --git a/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/LegacyArtifactPathTest.java b/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/LegacyArtifactPathTest.java index c8e16ddc9..b2f1bbccd 100644 --- a/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/LegacyArtifactPathTest.java +++ b/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/LegacyArtifactPathTest.java @@ -25,6 +25,7 @@ import org.apache.maven.archiva.model.ArtifactReference; /** * Test the generated LegacyArtifactPath class from Modello. This is primarily to test the hand coded methods. + * @since 1.1 */ public class LegacyArtifactPathTest extends TestCase diff --git a/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ArtifactClassifierMapping.java b/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ArtifactClassifierMapping.java index 1727413fb..e975f030c 100644 --- a/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ArtifactClassifierMapping.java +++ b/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ArtifactClassifierMapping.java @@ -29,6 +29,7 @@ import java.util.regex.Pattern; /** * ArtifactExtensionMapping * + * @since 1.1 */ public class ArtifactClassifierMapping { diff --git a/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/LegacyPathParserTest.java b/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/LegacyPathParserTest.java index fd8782772..b21bcacb5 100644 --- a/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/LegacyPathParserTest.java +++ b/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/LegacyPathParserTest.java @@ -363,6 +363,7 @@ public class LegacyPathParserTest /** * [MRM-594] add some hook in LegacyPathParser to allow exceptions in artifact resolution + * @since 1.1 */ public void testCustomExceptionsInArtifactResolution() throws LayoutException diff --git a/archiva-docs/src/site/apt/adminguide/legacy.apt b/archiva-docs/src/site/apt/adminguide/legacy.apt index 4982109b5..79fd5bac2 100644 --- a/archiva-docs/src/site/apt/adminguide/legacy.apt +++ b/archiva-docs/src/site/apt/adminguide/legacy.apt @@ -18,7 +18,7 @@ Apache Archiva legacy support configuration repository, but users may require support for private artifact or for artifacts with classifiers. - Archiva provides a legacy support configuration to the administrator. It + Since version 1.1, archiva provides a legacy support configuration to the administrator. It is possible to register some custom legacy path and the expected artifact reference. Archiva will check that the entered artifact reference match the legacy path, to avoid corrupted datas in repository : diff --git a/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/AddLegacyArtifactPathAction.java b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/AddLegacyArtifactPathAction.java index 1157d44cb..162fa78ca 100644 --- a/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/AddLegacyArtifactPathAction.java +++ b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/AddLegacyArtifactPathAction.java @@ -34,7 +34,7 @@ import com.opensymphony.xwork.Preparable; /** * Add a LegacyArtifactPath to archiva configuration * - * + * @since 1.1 * @plexus.component role="com.opensymphony.xwork.Action" role-hint="addLegacyArtifactPathAction" */ public class AddLegacyArtifactPathAction diff --git a/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/DeleteLegacyArtifactPathAction.java b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/DeleteLegacyArtifactPathAction.java index 028af2929..0a0f6a025 100644 --- a/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/DeleteLegacyArtifactPathAction.java +++ b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/DeleteLegacyArtifactPathAction.java @@ -32,6 +32,7 @@ import org.codehaus.plexus.xwork.action.PlexusActionSupport; * Delete a LegacyArtifactPath to archiva configuration * * + * @since 1.1 * @plexus.component role="com.opensymphony.xwork.Action" role-hint="deleteLegacyArtifactPathAction" */ public class DeleteLegacyArtifactPathAction diff --git a/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/LegacyArtifactPathAction.java b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/LegacyArtifactPathAction.java index 6fb0c5376..7efa73b6b 100644 --- a/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/LegacyArtifactPathAction.java +++ b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/LegacyArtifactPathAction.java @@ -41,6 +41,7 @@ import com.opensymphony.xwork.Preparable; /** * Shows the LegacyArtifactPath Tab for the administrator. * + * @since 1.1 * @plexus.component role="com.opensymphony.xwork.Action" role-hint="legacyArtifactPathAction" */ public class LegacyArtifactPathAction -- 2.39.5