You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by jd...@apache.org on 2008/05/06 17:40:22 UTC
svn commit: r653817 - in /archiva/trunk: ./
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/
archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/
archiva-modules/arch...
Author: jdumay
Date: Tue May 6 08:40:22 2008
New Revision: 653817
URL: http://svn.apache.org/viewvc?rev=653817&view=rev
Log:
MRM-781 Removal of Archiva-Webdav implementation in favor of Jackrabbit-webdav
* I broke MRM-440, so this restores that functionality
* Locked down the enforcer plugin version so that Maven does not go looking for it everytime we build
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/BrowserRedirectException.java
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/RepositoryServlet.java
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavLocatorFactory.java
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceLocator.java
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/ArchivaDavResourceLocatorTest.java
archiva/trunk/pom.xml
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/RepositoryServlet.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/RepositoryServlet.java?rev=653817&r1=653816&r2=653817&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/RepositoryServlet.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/RepositoryServlet.java Tue May 6 08:40:22 2008
@@ -23,10 +23,7 @@
import org.apache.maven.archiva.configuration.ConfigurationEvent;
import org.apache.maven.archiva.configuration.ConfigurationListener;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
-import org.apache.maven.archiva.webdav.ArchivaDavLocatorFactory;
-import org.apache.maven.archiva.webdav.ArchivaDavResourceFactory;
-import org.apache.maven.archiva.webdav.ArchivaDavSessionProvider;
-import org.apache.maven.archiva.webdav.UnauthorizedDavException;
+import org.apache.maven.archiva.webdav.*;
import org.apache.jackrabbit.webdav.server.AbstractWebdavServlet;
import org.apache.jackrabbit.webdav.*;
import org.codehaus.plexus.redback.system.SecuritySystem;
@@ -121,7 +118,12 @@
webdavResponse.setHeader("WWW-Authenticate", getAuthenticateHeaderValue(e.getRepositoryName()));
webdavResponse.sendError(e.getErrorCode(), e.getStatusPhrase());
}
- catch (DavException e) {
+ catch (BrowserRedirectException e)
+ {
+ response.sendRedirect(e.getLocation());
+ }
+ catch (DavException e)
+ {
if (e.getErrorCode() == HttpServletResponse.SC_UNAUTHORIZED) {
final String msg = "Should throw " + UnauthorizedDavException.class.getName();
log.error(msg);
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavLocatorFactory.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavLocatorFactory.java?rev=653817&r1=653816&r2=653817&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavLocatorFactory.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavLocatorFactory.java Tue May 6 08:40:22 2008
@@ -66,6 +66,4 @@
final String repository = RepositoryPathUtil.getRepositoryName(path);
return new ArchivaDavResourceLocator(prefix, path, repository, this);
}
-
-
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java?rev=653817&r1=653816&r2=653817&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java Tue May 6 08:40:22 2008
@@ -129,7 +129,14 @@
{
throw new DavException(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "Could not get resource for method " + request.getMethod());
}
+
setHeaders(locator, response);
+
+ //compatibility with MRM-440 to ensure browsing the repository works ok
+ if (resource.isCollection() && !resource.getLocator().getResourcePath().endsWith("/"))
+ {
+ throw new BrowserRedirectException(resource.getHref());
+ }
}
return resource;
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceLocator.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceLocator.java?rev=653817&r1=653816&r2=653817&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceLocator.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceLocator.java Tue May 6 08:40:22 2008
@@ -43,14 +43,18 @@
this.prefix = prefix;
this.repositoryId = repositoryId;
this.davLocatorFactory = davLocatorFactory;
+ this.resourcePath = resourcePath;
+
+ String escapedPath = Text.escapePath(resourcePath);
+ String hrefPrefix = prefix;
- // remove trailing '/' that is not part of the resourcePath except for the root item.
- if (resourcePath.endsWith("/") && !"/".equals(resourcePath)) {
- resourcePath = resourcePath.substring(0, resourcePath.length()-1);
+ //Ensure no extra slashes when href is joined
+ if (hrefPrefix.endsWith("/") && escapedPath.startsWith("/"))
+ {
+ hrefPrefix = hrefPrefix.substring(0, hrefPrefix.length()-1);
}
- this.resourcePath = resourcePath;
- href = prefix + Text.escapePath(resourcePath);
+ href = hrefPrefix + escapedPath;
}
public String getRepositoryId()
Added: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/BrowserRedirectException.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/BrowserRedirectException.java?rev=653817&view=auto
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/BrowserRedirectException.java (added)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/BrowserRedirectException.java Tue May 6 08:40:22 2008
@@ -0,0 +1,43 @@
+package org.apache.maven.archiva.webdav;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.jackrabbit.webdav.DavException;
+
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * @author <a href="mailto:james@atlassian.com">James William Dumay</a>
+ */
+public class BrowserRedirectException extends DavException
+{
+ final String location;
+
+ public BrowserRedirectException(String location)
+ {
+ super(HttpServletResponse.SC_MOVED_PERMANENTLY);
+ this.location = location;
+ }
+
+ public String getLocation()
+ {
+ return location;
+ }
+}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/ArchivaDavResourceLocatorTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/ArchivaDavResourceLocatorTest.java?rev=653817&r1=653816&r2=653817&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/ArchivaDavResourceLocatorTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/ArchivaDavResourceLocatorTest.java Tue May 6 08:40:22 2008
@@ -40,7 +40,7 @@
throws Exception
{
String prefix = "http://myproxy/";
- String href = "repository/internal";
+ String href = "/repository/internal";
ArchivaDavResourceLocator locator = (ArchivaDavResourceLocator)factory.createResourceLocator(prefix, href);
assertEquals("internal", locator.getRepositoryId());
@@ -49,8 +49,8 @@
assertEquals("http://myproxy/", locator.getPrefix());
assertEquals("http://myproxy/repository/internal", locator.getHref(false));
assertEquals("http://myproxy/repository/internal/", locator.getHref(true));
- assertEquals("repository/internal", locator.getResourcePath());
- assertEquals("repository/internal", locator.getRepositoryPath());
+ assertEquals("/repository/internal", locator.getResourcePath());
+ assertEquals("/repository/internal", locator.getRepositoryPath());
}
public void testLocatorWithHrefThatContainsPrefix()
@@ -81,8 +81,8 @@
assertEquals("", locator.getWorkspaceName());
assertEquals("", locator.getWorkspacePath());
assertEquals("http://myproxy/", locator.getPrefix());
- assertEquals("http://myproxy//", locator.getHref(false));
- assertEquals("http://myproxy//", locator.getHref(true));
+ assertEquals("http://myproxy/", locator.getHref(false));
+ assertEquals("http://myproxy/", locator.getHref(true));
assertEquals("/", locator.getResourcePath());
assertEquals("/", locator.getRepositoryPath());
}
Modified: archiva/trunk/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=653817&r1=653816&r2=653817&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Tue May 6 08:40:22 2008
@@ -162,6 +162,11 @@
<jdkLevel>1.5</jdkLevel>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0-alpha-3</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>