diff options
| author | James William Dumay <jdumay@apache.org> | 2008-12-16 01:58:21 +0000 |
|---|---|---|
| committer | James William Dumay <jdumay@apache.org> | 2008-12-16 01:58:21 +0000 |
| commit | 9035bedfd7748be693edc77d5ad748d0f5b09da6 (patch) | |
| tree | 75acc2a5ea7e980b6f927d0ec33201dae467b994 /archiva-modules | |
| parent | 5210f5f2299d338434c279e8957188be324c19e4 (diff) | |
| parent | 679221b1eac8128a9f923363bbc67108057c538d (diff) | |
| download | archiva-9035bedfd7748be693edc77d5ad748d0f5b09da6.tar.gz archiva-9035bedfd7748be693edc77d5ad748d0f5b09da6.zip | |
Merging back with trunkarchiva-search-improvements
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-search-improvements@726925 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules')
2 files changed, 11 insertions, 9 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java index 1558e2d4e..5a0c3b5f9 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java @@ -190,12 +190,12 @@ public class UploadAction public void setArtifactContentType( String contentType ) { - this.artifactContentType = contentType; + this.artifactContentType = StringUtils.trim( contentType ); } public void setArtifactFileName( String filename ) { - this.artifactFilename = filename; + this.artifactFilename = StringUtils.trim( filename ); } public void setPom( File file ) @@ -205,12 +205,12 @@ public class UploadAction public void setPomContentType( String contentType ) { - this.pomContentType = contentType; + this.pomContentType = StringUtils.trim( contentType ); } public void setPomFileName( String filename ) { - this.pomFilename = filename; + this.pomFilename = StringUtils.trim( filename ); } public String getGroupId() @@ -220,7 +220,7 @@ public class UploadAction public void setGroupId( String groupId ) { - this.groupId = groupId; + this.groupId = StringUtils.trim( groupId ); } public String getArtifactId() @@ -230,7 +230,7 @@ public class UploadAction public void setArtifactId( String artifactId ) { - this.artifactId = artifactId; + this.artifactId = StringUtils.trim( artifactId ); } public String getVersion() @@ -240,7 +240,7 @@ public class UploadAction public void setVersion( String version ) { - this.version = version; + this.version = StringUtils.trim( version ); } public String getPackaging() @@ -250,7 +250,7 @@ public class UploadAction public void setPackaging( String packaging ) { - this.packaging = packaging; + this.packaging = StringUtils.trim( packaging ); } public String getClassifier() @@ -260,7 +260,7 @@ public class UploadAction public void setClassifier( String classifier ) { - this.classifier = classifier; + this.classifier = StringUtils.trim( classifier ); } public String getRepositoryId() diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java index 42ae3cdc4..fec4bb8e9 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java @@ -99,6 +99,8 @@ public class ArchivaDavResource private ArchivaXworkUser archivaXworkUser; + public static final String COMPLIANCE_CLASS = "1, 2"; + public ArchivaDavResource( String localResource, String logicalResource, ManagedRepositoryConfiguration repository, DavSession session, ArchivaDavResourceLocator locator, DavResourceFactory factory, MimeTypes mimeTypes, List<AuditListener> auditListeners, |