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

4 files changed, 15 insertions, 12 deletions

diff --git a/archiva-docs/src/site/apt/quick-start.apt b/archiva-docs/src/site/apt/quick-start.apt
index 3ac0c76eb..627acb3eb 100644
--- a/archiva-docs/src/site/apt/quick-start.apt
+++ b/archiva-docs/src/site/apt/quick-start.apt
@@ -28,7 +28,8 @@
 
 Installing Archiva
 
-  The quickest way to install Archiva is to use the standalone distribution. This includes a bundled Jetty server which can be easily started.
+  The quickest way to install Archiva is to {{{http://archiva.apache.org/download.html}download}} and use the standalone distribution.
+  This includes a bundled Jetty server which can be easily started.
   For more information on advanced configuration of this instance, refer to the {{{adminguide/standalone.html} Administration Guide}}.
 
   To get started right away, you can run the following after unpacking:
@@ -67,7 +68,7 @@ Installing Archiva
   downloaded from the central repository, and then handed back to the browser and downloaded from Archiva. Future requests for the artifact will be much faster as they need not be
   downloaded from the central repository.
 
-  Once this artifact is downloaded, Archiva automatically indexes it, so you can access it's information at the following URL: {{http://localhost:8080/archiva/browse/junit/junit/3.8.1/}}.
+  Once this artifact is downloaded, Archiva automatically indexes it, so you can access its information at the following URL: {{http://localhost:8080/archiva/browse/junit/junit/3.8.1/}}.
   It will also be available from the search interface.
 
 
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,
diff --git a/pom.xml b/pom.xml
index 48f84c4cd..3f1362244 100644
--- a/pom.xml
+++ b/pom.xml
@@ -227,7 +227,7 @@
       <dependency>
         <groupId>org.apache.jackrabbit</groupId>
         <artifactId>jackrabbit-webdav</artifactId>
-        <version>1.4</version>
+        <version>1.5.0</version>
         <exclusions>
           <exclusion>
             <groupId>commons-logging</groupId>