Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merging back with trunk 

git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-search-improvements@726925 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
James William Dumay 2008-12-16 01:58:21 +00:00
parent 5210f5f229 679221b1ea
commit 9035bedfd7
4 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
archiva-docs/src/site/apt/quick-start.apt
View File

@ -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.

18
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java
View File

@ -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()

2
archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java
View File

@ -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,

2
pom.xml
View File

@ -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>