[jboss-svn-commits] JBL Code SVN: r20088 - in labs/jbossrules/trunk/drools-repository/src: test/java/org/drools/repository and 1 other directory.

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

Author: michael.neale at jboss.com
Date: 2008-05-21 01:07:55 -0400 (Wed, 21 May 2008)
New Revision: 20088

Modified:
   labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/AssetItem.java
   labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java
   labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/AssetItemTest.java
   labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/PackageItemTest.java
Log:
JBRULES-1612 WebDAV

Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/AssetItem.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/AssetItem.java	2008-05-21 01:05:57 UTC (rev 20087)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/AssetItem.java	2008-05-21 05:07:55 UTC (rev 20088)
@@ -88,7 +88,7 @@
                 return data.getValue().getString();
 
             } else {
-                return null;
+                return "";
             }
         } catch ( Exception e ) {
             log.error( "Caught Exception",
@@ -445,6 +445,34 @@
         }
     }
 
+    /**
+     * This converts a "filename" to an asset name.
+     *
+     * File name is foo.drl -> ["foo", "drl"]
+     *
+     * File name is foo.bar.xls -> ["foo", "bar.xls"]
+     * @param fileName
+     * @return
+     */
+    public static String[] getAssetNameFromFileName(String fileName) {
 
+    	String[] r = new String[] {"", ""};
+    	char[] cs = fileName.toCharArray();
+    	boolean name = true;
+    	for (int i = 0; i < cs.length; i++) {
+    		if (name && cs[i] == '.') {
+    			name = false;
+    		} else if (name) {
+				r[0] = r[0] + cs[i];
+			} else {
+				r[1] = r[1] + cs[i];
+			}
+		}
+    	return r;
 
+
+    }
+
+
+
 }
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java	2008-05-21 01:05:57 UTC (rev 20087)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java	2008-05-21 05:07:55 UTC (rev 20088)
@@ -1066,4 +1066,14 @@
         }
 
     }
+
+    @Override
+    protected void finalize() throws Throwable {
+    	//shouldn't rely on this... but
+    	try {
+    		this.logout();
+    	} catch (Exception e) {
+    		System.err.println("Finalizer error: " + e.getMessage());
+    	}
+    }
 }
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/AssetItemTest.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/AssetItemTest.java	2008-05-21 01:05:57 UTC (rev 20087)
+++ labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/AssetItemTest.java	2008-05-21 05:07:55 UTC (rev 20088)
@@ -70,7 +70,18 @@
 
     }
 
+    public void testGetAssetNameFromFileName() {
+    	String[] asset = AssetItem.getAssetNameFromFileName("foo.bar");
+    	assertEquals("foo", asset[0]);
+    	assertEquals("bar", asset[1]);
 
+    	asset = AssetItem.getAssetNameFromFileName("foo.bar.xls");
+    	assertEquals("foo", asset[0]);
+    	assertEquals("bar.xls", asset[1]);
+
+    }
+
+
     public void testGetContent() {
 
             AssetItem ruleItem1 = getRepo().loadDefaultPackage().addAsset("testGetContent", "test content");
@@ -556,7 +567,7 @@
             assertEquals(2, ruleItem1.getVersionNumber());
 
             AssetItem predecessorRuleItem = (AssetItem) ruleItem1.getPrecedingVersion();
-            assertEquals(null, predecessorRuleItem.getContent());
+            assertEquals("", predecessorRuleItem.getContent());
             succeedingRuleItem = (AssetItem) predecessorRuleItem.getSucceedingVersion();
             assertNotNull(succeedingRuleItem);
             assertEquals(ruleItem1.getContent(), succeedingRuleItem.getContent());
@@ -643,7 +654,7 @@
 
             assertEquals("test content", nextRuleItem.getContent());
 
-            assertEquals(null, ((AssetItem) iterator.next()).getContent());
+            assertEquals("", ((AssetItem) iterator.next()).getContent());
 
     }
 

Modified: labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/PackageItemTest.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/PackageItemTest.java	2008-05-21 01:05:57 UTC (rev 20087)
+++ labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/PackageItemTest.java	2008-05-21 05:07:55 UTC (rev 20088)
@@ -436,6 +436,9 @@
     public void testGetRules() {
             PackageItem rulePackageItem1 = getRepo().createPackage("testGetRules", "desc");
 
+            assertFalse(rulePackageItem1.containsAsset("goober"));
+
+
             AssetItem ruleItem1 = rulePackageItem1.addAsset("testGetRules", "desc" );
             ruleItem1.updateContent( "test lhs content" );