You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2014/06/25 06:25:07 UTC
[1/2] git commit: [MRM-1796] support artifacts larger than 4G
Repository: archiva
Updated Branches:
refs/heads/archiva-1.3.x 11a842dc9 -> 490795668
[MRM-1796] support artifacts larger than 4G
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/ba6c9b08
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/ba6c9b08
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/ba6c9b08
Branch: refs/heads/archiva-1.3.x
Commit: ba6c9b088f8b17b648525419d1b8ada3a35c180c
Parents: 11a842d
Author: Brett Porter <br...@apache.org>
Authored: Wed Jun 25 14:22:18 2014 +1000
Committer: Brett Porter <br...@apache.org>
Committed: Wed Jun 25 14:22:18 2014 +1000
----------------------------------------------------------------------
.../org/apache/maven/archiva/webdav/ArchivaDavResource.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/ba6c9b08/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java
----------------------------------------------------------------------
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 d08a370..f359c9c 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
@@ -32,6 +32,7 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.jackrabbit.util.Text;
+import org.apache.jackrabbit.webdav.DavConstants;
import org.apache.jackrabbit.webdav.DavException;
import org.apache.jackrabbit.webdav.DavResource;
import org.apache.jackrabbit.webdav.DavResourceFactory;
@@ -199,7 +200,7 @@ public class ArchivaDavResource
{
if ( !isCollection() )
{
- outputContext.setContentLength( localResource.length() );
+ outputContext.setProperty( DavConstants.HEADER_CONTENT_LENGTH, Long.toString( localResource.length() ) );
outputContext.setContentType( mimeTypes.getMimeType( localResource.getName() ) );
}
@@ -310,7 +311,7 @@ public class ArchivaDavResource
}
// TODO: a bad deployment shouldn't delete an existing file - do we need to write to a temporary location first?
- long expectedContentLength = inputContext.getContentLength();
+ long expectedContentLength = Long.parseLong( inputContext.getProperty( DavConstants.HEADER_CONTENT_LENGTH ) );
long actualContentLength = localFile.length();
// length of -1 is given for a chunked request or unknown length, in which case we accept what was uploaded
if ( expectedContentLength >= 0 && expectedContentLength != actualContentLength )
[2/2] git commit: upgrade to latest Struts
Posted by br...@apache.org.
upgrade to latest Struts
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/49079566
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/49079566
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/49079566
Branch: refs/heads/archiva-1.3.x
Commit: 4907956681f2992f01feda9a5311b74291caecec
Parents: ba6c9b0
Author: Brett Porter <br...@apache.org>
Authored: Wed Jun 25 14:24:31 2014 +1000
Committer: Brett Porter <br...@apache.org>
Committed: Wed Jun 25 14:24:31 2014 +1000
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/49079566/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e25c2ad..f7b010c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1101,7 +1101,7 @@
<maven.version>2.0.8</maven.version>
<wagon.version>1.0-beta-5</wagon.version>
<redback.version>1.3-M3</redback.version>
- <struts.version>2.3.16.1</struts.version>
+ <struts.version>2.3.16.3</struts.version>
<jetty.version>6.1.19</jetty.version>
<slf4j.version>1.5.8</slf4j.version>
<binder.version>0.9</binder.version>