svn commit: r1549550 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav: ArchivaDavResourceFactory.java BrowserRedirectException.java

[olamy]

Author: olamy
Date: Mon Dec  9 11:22:18 2013
New Revision: 1549550

URL: http://svn.apache.org/r1549550
Log:
configure redirect type temporary or permanently

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java
    
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/BrowserRedirectException.java

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java?rev=1549550&r1=1549549&r2=1549550&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java
 Mon Dec  9 11:22:18 2013
@@ -540,8 +540,8 @@ public class ArchivaDavResourceFactory
         }
         catch ( RelocationException e )
         {
-            log.error( e.getMessage(), e );
-            throw new BrowserRedirectException( e.getPath() );
+            log.debug( "Relocation to {}", e.getPath() );
+            throw new BrowserRedirectException( e.getPath(), 
e.getRelocationType() );
         }
         catch ( XMLException e )
         {

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/BrowserRedirectException.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/BrowserRedirectException.java?rev=1549550&r1=1549549&r2=1549550&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/BrowserRedirectException.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/BrowserRedirectException.java
 Mon Dec  9 11:22:18 2013
@@ -19,6 +19,7 @@ package org.apache.archiva.webdav;
  * under the License.
  */
 
+import org.apache.archiva.metadata.repository.storage.RelocationException;
 import org.apache.jackrabbit.webdav.DavException;
 
 import javax.servlet.http.HttpServletResponse;
@@ -36,6 +37,21 @@ public class BrowserRedirectException
         this.location = location;
     }
 
+    /**
+     *
+     * @param location
+     * @param relocationType see {@link RelocationException.RelocationType}
+     * @since 2.0.0
+     */
+    public BrowserRedirectException( String location, 
RelocationException.RelocationType relocationType )
+    {
+        super( relocationType == RelocationException.RelocationType.TEMPORARY
+                   ? HttpServletResponse.SC_MOVED_TEMPORARILY
+                   : HttpServletResponse.SC_MOVED_PERMANENTLY );
+
+        this.location = location;
+    }
+
     public String getLocation()
     {
         return location;