svn commit: r680256 - in /archiva: parent/ trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/util/ trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/

[br...@apache.org]

Author: brett
Date: Sun Jul 27 22:41:43 2008
New Revision: 680256

URL: http://svn.apache.org/viewvc?rev=680256&view=rev
Log:
[MRM-891] remove leading ./ on links in index listing
Submitted by: Dan Tran

Modified:
    archiva/parent/pom.xml
    archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/util/IndexWriter.java
    archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletBrowseTest.java

Modified: archiva/parent/pom.xml
URL: http://svn.apache.org/viewvc/archiva/parent/pom.xml?rev=680256&r1=680255&r2=680256&view=diff
==============================================================================
--- archiva/parent/pom.xml (original)
+++ archiva/parent/pom.xml Sun Jul 27 22:41:43 2008
@@ -456,6 +456,9 @@
     <contributor>
       <name>John Michael Luy</name>
     </contributor>
+    <contributor>
+      <name>Dan Tran</name>
+    </contributor>
   </contributors>
 
 </project>

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/util/IndexWriter.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/util/IndexWriter.java?rev=680256&r1=680255&r2=680256&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/util/IndexWriter.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/util/IndexWriter.java Sun Jul 27 22:41:43 2008
@@ -19,6 +19,7 @@
  * under the License.
  */
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.jackrabbit.webdav.DavResource;
 import org.apache.jackrabbit.webdav.io.OutputContext;
 
@@ -92,6 +93,9 @@
         {
             File file = new File(logicalResource);
             String parentName = file.getParent().equals("") ? "/" : file.getParent();
+            
+            //convert to unix path in case archiva is hosted on windows
+            parentName = StringUtils.replace(parentName, "\\", "/" );
 
             writer.println("<ul>");
             writer.println("<li><a href=\"../\">" + parentName + "</a> <i><small>(Parent)</small></i></li>");
@@ -154,11 +158,11 @@
     {        
         if (directory)
         {
-            writer.println("<li><a href=\"./" + resourceName + "/\">" + resourceName + "</a></li>");
+            writer.println("<li><a href=\"" + resourceName + "/\">" + resourceName + "</a></li>");
         }
         else
         {
-            writer.println("<li><a href=\"./" + resourceName + "\">" + resourceName + "</a></li>");
+            writer.println("<li><a href=\"" + resourceName + "\">" + resourceName + "</a></li>");
         }
     }    
 }

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletBrowseTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletBrowseTest.java?rev=680256&r1=680255&r2=680256&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletBrowseTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletBrowseTest.java Sun Jul 27 22:41:43 2008
@@ -58,7 +58,7 @@
 
         // dumpResponse( response );
 
-        String expectedLinks[] = new String[] { "./commons-lang/", "./net/", "./org/" };
+        String expectedLinks[] = new String[] { "commons-lang/", "net/", "org/" };
         assertLinks(expectedLinks, response.getLinks());
     }
     
@@ -69,7 +69,7 @@
         WebResponse response = sc.getResponse( request );
         assertEquals( "Response", HttpServletResponse.SC_OK, response.getResponseCode() );
         
-        String expectedLinks[] = new String[] { "../", "./apache/", "./codehaus/" };
+        String expectedLinks[] = new String[] { "../", "apache/", "codehaus/" };
         assertLinks(expectedLinks, response.getLinks());
     }