Author: jdumay
Date: Mon Dec 15 17:58:21 2008
New Revision: 726925
URL: http://svn.apache.org/viewvc?rev=726925&view=rev
Log:
Merging back with trunk
Modified:
archiva/branches/archiva-search-improvements/ (props changed)
archiva/branches/archiva-search-improvements/archiva-docs/src/site/apt/quick-start.apt
archiva/branches/archiva-search-improvements/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java
(props changed)
archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java
archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties
(props changed)
archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
(props changed)
archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java
archiva/branches/archiva-search-improvements/pom.xml
Propchange: archiva/branches/archiva-search-improvements/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 15 17:58:21 2008
@@ -1,2 +1,3 @@
/archiva/branches/MRM-541:686983-687034
/archiva/branches/archiva-struts2:699795-705848
+/archiva/trunk:723609-726923
Modified:
archiva/branches/archiva-search-improvements/archiva-docs/src/site/apt/quick-start.apt
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-search-improvements/archiva-docs/src/site/apt/quick-start.apt?rev=726925&r1=726924&r2=726925&view=diff
==============================================================================
---
archiva/branches/archiva-search-improvements/archiva-docs/src/site/apt/quick-start.apt
(original)
+++
archiva/branches/archiva-search-improvements/archiva-docs/src/site/apt/quick-start.apt
Mon Dec 15 17:58:21 2008
@@ -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 @@
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.
Propchange:
archiva/branches/archiva-search-improvements/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 15 17:58:21 2008
@@ -1,2 +1,3 @@
/archiva/branches/MRM-541/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/BaseConsumer.java:686983-687034
/archiva/branches/archiva-struts2/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/BaseConsumer.java:699795-705848
+/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java:723609-726923
Modified:
archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java?rev=726925&r1=726924&r2=726925&view=diff
==============================================================================
---
archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java
(original)
+++
archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java
Mon Dec 15 17:58:21 2008
@@ -190,12 +190,12 @@
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 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 void setGroupId( String groupId )
{
- this.groupId = groupId;
+ this.groupId = StringUtils.trim( groupId );
}
public String getArtifactId()
@@ -230,7 +230,7 @@
public void setArtifactId( String artifactId )
{
- this.artifactId = artifactId;
+ this.artifactId = StringUtils.trim( artifactId );
}
public String getVersion()
@@ -240,7 +240,7 @@
public void setVersion( String version )
{
- this.version = version;
+ this.version = StringUtils.trim( version );
}
public String getPackaging()
@@ -250,7 +250,7 @@
public void setPackaging( String packaging )
{
- this.packaging = packaging;
+ this.packaging = StringUtils.trim( packaging );
}
public String getClassifier()
@@ -260,7 +260,7 @@
public void setClassifier( String classifier )
{
- this.classifier = classifier;
+ this.classifier = StringUtils.trim( classifier );
}
public String getRepositoryId()
Propchange:
archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 15 17:58:21 2008
@@ -1,2 +1,3 @@
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/main/resources/webwork.properties:686983-687034
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties:699795-705848
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties:723609-726923
Propchange:
archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 15 17:58:21 2008
@@ -1,2 +1,3 @@
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/main/resources/xwork.xml:686983-687034
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml:699795-705848
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml:723609-726923
Modified:
archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java?rev=726925&r1=726924&r2=726925&view=diff
==============================================================================
---
archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java
(original)
+++
archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java
Mon Dec 15 17:58:21 2008
@@ -99,6 +99,8 @@
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,
Modified: archiva/branches/archiva-search-improvements/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-search-improvements/pom.xml?rev=726925&r1=726924&r2=726925&view=diff
==============================================================================
--- archiva/branches/archiva-search-improvements/pom.xml (original)
+++ archiva/branches/archiva-search-improvements/pom.xml Mon Dec 15 17:58:21
2008
@@ -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>
