[jboss-svn-commits] JBL Code SVN: r20456 - in labs/jbossrules/trunk/drools-jbrms/src: main/webapp/WEB-INF and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: michael.neale at jboss.com
Date: 2008-06-12 22:34:03 -0400 (Thu, 12 Jun 2008)
New Revision: 20456

Modified:
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/files/WebDAVImpl.java
   labs/jbossrules/trunk/drools-jbrms/src/main/webapp/WEB-INF/web.xml
   labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/files/WebDAVImplTest.java
Log:
tweak to work with rooted paths

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/files/WebDAVImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/files/WebDAVImpl.java	2008-06-12 23:36:42 UTC (rev 20455)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/files/WebDAVImpl.java	2008-06-13 02:34:03 UTC (rev 20456)
@@ -484,10 +484,19 @@
     }
 
     String[] getPath(String uri) {
+    	if (uri.equals("/")) {
+    		return new String[0];
+    	}
+
+
         if (uri.endsWith("webdav") || uri.endsWith("webdav/")) {
             return new String[0];
         }
-        return uri.split("webdav/")[1].split("/");
+        if (uri.indexOf("webdav") > -1) {
+        	return uri.split("webdav/")[1].split("/");
+        } else {
+        	return uri.substring(1).split("/");
+        }
     }
 
 

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/webapp/WEB-INF/web.xml
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/webapp/WEB-INF/web.xml	2008-06-12 23:36:42 UTC (rev 20455)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/webapp/WEB-INF/web.xml	2008-06-13 02:34:03 UTC (rev 20456)
@@ -62,11 +62,11 @@
 	</servlet-mapping>
 	<servlet-mapping>
 		<servlet-name>WebdavServlet</servlet-name>
-		<url-pattern>/org.drools.brms.JBRMS/webdav</url-pattern>
+		<url-pattern>/org.drools.brms.JBRMS/webdav/*</url-pattern>
 	</servlet-mapping>
 	<servlet-mapping>
 		<servlet-name>RestAPIServlet</servlet-name>
-		<url-pattern>/org.drools.brms.JBRMS/api</url-pattern>
+		<url-pattern>/org.drools.brms.JBRMS/api/*</url-pattern>
 	</servlet-mapping>
 
     <session-config>

Modified: labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/files/WebDAVImplTest.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/files/WebDAVImplTest.java	2008-06-12 23:36:42 UTC (rev 20455)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/files/WebDAVImplTest.java	2008-06-13 02:34:03 UTC (rev 20456)
@@ -1,21 +1,20 @@
 package org.drools.brms.server.files;
 
-import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.InputStream;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Iterator;
 
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
 import org.apache.commons.io.IOUtils;
 import org.drools.brms.server.util.TestEnvironmentSessionHelper;
 import org.drools.repository.AssetItem;
 import org.drools.repository.PackageItem;
 import org.drools.repository.RulesRepository;
 
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
 public class WebDAVImplTest extends TestCase {
 
 	public void testPath() {
@@ -28,6 +27,16 @@
 		path = imp.getPath("foo/webdav");
 		assertEquals(0, path.length);
 
+		path = imp.getPath("/");
+		assertEquals(0, path.length);
+
+		path = imp.getPath("/packages/packagename/resource.drl");
+		assertEquals("packages", path[0]);
+		assertEquals("packagename", path[1]);
+		assertEquals("resource.drl", path[2]);
+
+
+
 	}
 
 	public void testBadCopy() throws Exception {