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

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

Author: Rikkola
Date: 2009-08-28 04:56:33 -0400 (Fri, 28 Aug 2009)
New Revision: 29103

Modified:
   labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/AssetItem.java
   labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/AssetItemTest.java
Log:
JBRULES-2109 : Upload of Resource to Guvnor with multiple "." in file name causes resource type identification issues

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	2009-08-28 08:19:03 UTC (rev 29102)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/AssetItem.java	2009-08-28 08:56:33 UTC (rev 29103)
@@ -559,8 +559,8 @@
         boolean name = true;
         for ( int i = 0; i < cs.length; i++ ) {
             if ( name && cs[i] == '.' ) {
-                String rhs = fileName.substring( i );
-                if ( rhs.contains( "_" ) || rhs.contains( " " ) ) {
+                String rhs = fileName.substring( i + 1 );
+                if ( rhs.contains( "_" ) || rhs.contains( " " ) || rhs.contains( ".jar" ) ) {
                     r[0] = r[0] + '.'; //its part of the name
                 } else {
                     name = false;

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	2009-08-28 08:19:03 UTC (rev 29102)
+++ labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/AssetItemTest.java	2009-08-28 08:56:33 UTC (rev 29103)
@@ -182,7 +182,19 @@
     	assertEquals("Rule_261.3_Something_foo", asset[0]);
     	assertEquals("model.drl", asset[1]);
 
+    	asset = AssetItem.getAssetNameFromFileName("application-model-1.0.0.jar");
+    	assertEquals("application-model-1.0.0", asset[0]);
+    	assertEquals("jar", asset[1]);
 
+    	asset = AssetItem.getAssetNameFromFileName("SubmitApplication.rf");
+    	assertEquals("SubmitApplication", asset[0]);
+    	assertEquals("rf", asset[1]);
+
+    	asset = AssetItem.getAssetNameFromFileName("Submit.rf");
+    	assertEquals("Submit", asset[0]);
+    	assertEquals("rf", asset[1]);
+
+
 //    	System.err.println(asset[0]);
 //    	System.err.println(asset[1]);