diff options
| author | Maria Odea B. Ching <oching@apache.org> | 2008-10-20 05:59:47 +0000 |
|---|---|---|
| committer | Maria Odea B. Ching <oching@apache.org> | 2008-10-20 05:59:47 +0000 |
| commit | c303ba78c70a220c54b0501bf5239f5870d03ad9 (patch) | |
| tree | 6d95b53c96b67ccf0ddba0054080440e49d2d42b /archiva-modules/archiva-base | |
| parent | c64358cfd11f1c506afcc9cc2a4df5bc4f01b69a (diff) | |
| download | archiva-c303ba78c70a220c54b0501bf5239f5870d03ad9.tar.gz archiva-c303ba78c70a220c54b0501bf5239f5870d03ad9.zip | |
merged MRM-124 branch (-r706118) - archiva web services
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@706126 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-base')
4 files changed, 18 insertions, 1 deletions
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractLegacyRepositoryContent.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractLegacyRepositoryContent.java index f135d5aad..5ff3c783b 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractLegacyRepositoryContent.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/AbstractLegacyRepositoryContent.java @@ -117,4 +117,9 @@ public abstract class AbstractLegacyRepositoryContent // Default process. return type + "s"; } + + public void setLegacyPathParser( PathParser parser ) + { + this.legacyPathParser = parser; + } } diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedDefaultRepositoryContent.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedDefaultRepositoryContent.java index 53bfc1bcb..93545f3dd 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedDefaultRepositoryContent.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedDefaultRepositoryContent.java @@ -78,6 +78,10 @@ public class ManagedDefaultRepositoryContent // TODO: log this somewhere? } } + else + { + throw new ContentNotFoundException( "Unable to delete non-existing project directory." ); + } } public String getId() diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedLegacyRepositoryContent.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedLegacyRepositoryContent.java index 6b59d86f3..03216fd8a 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedLegacyRepositoryContent.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedLegacyRepositoryContent.java @@ -454,4 +454,9 @@ public class ManagedLegacyRepositoryContent } } } + + public void setFileTypes( FileTypes fileTypes ) + { + this.filetypes = fileTypes; + } } diff --git a/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/maven/archiva/xml/AbstractArchivaXmlTestCase.java b/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/maven/archiva/xml/AbstractArchivaXmlTestCase.java index 7fd49274a..c26889d55 100644 --- a/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/maven/archiva/xml/AbstractArchivaXmlTestCase.java +++ b/archiva-modules/archiva-base/archiva-xml-tools/src/test/java/org/apache/maven/archiva/xml/AbstractArchivaXmlTestCase.java @@ -33,10 +33,13 @@ public abstract class AbstractArchivaXmlTestCase extends TestCase { protected static final String OSLASH = "\u00f8"; + protected static final String TRYGVIS = "Trygve Laugst" + OSLASH + "l"; + protected static final String INFIN = "\u221e"; + protected static final String INFINITE_ARCHIVA = "The " + INFIN + " Archiva"; - + protected File getExampleXml( String filename ) { File examplesDir = new File( "src/test/examples" ); |