commit 88a9e63b255788727c74e1ced3c1e7a4bff00276
author Jesse McConnell <jesse.mcconnell@gmail.com> Tue Sep 13 12:09:59 2011 -0500
committer Jesse McConnell <jesse.mcconnell@gmail.com> Tue Sep 13 12:09:59 2011 -0500
tree 7b4a832e75f7aa2116058b289a4ec4b7d5c5ff74
parent 947155ac320e6d84682003949f9bedf362738609

[Bug 357448] fix bug with _ splitting in wrong location in version
string

eclipse-signing-maven-plugin/src/main/java/org/eclipse/dash/m4e/eclipse/signing/ChecksumMojo.java

diff --git a/eclipse-signing-maven-plugin/src/main/java/org/eclipse/dash/m4e/eclipse/signing/ChecksumMojo.java b/eclipse-signing-maven-plugin/src/main/java/org/eclipse/dash/m4e/eclipse/signing/ChecksumMojo.java
index 6c8ea11..f90ba9b 100644
--- a/eclipse-signing-maven-plugin/src/main/java/org/eclipse/dash/m4e/eclipse/signing/ChecksumMojo.java
+++ b/eclipse-signing-maven-plugin/src/main/java/org/eclipse/dash/m4e/eclipse/signing/ChecksumMojo.java
@@ -19,6 +19,7 @@
 import java.security.MessageDigest;
 import java.util.Iterator;
 import java.util.List;
+import java.util.regex.Pattern;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -173,12 +174,18 @@
             
             String pluginFile = FileUtils.basename(plugin,".jar");
 
-            int lastUnderscore = pluginFile.lastIndexOf('_');
+            Pattern p = Pattern.compile("_\\d");
+        	
+        	String[] bits = p.split(pluginFile);
+        	
+        	//System.out.println(file.substring(0, bits[0].length()) + " / " + file.substring(bits[0].length() + 1 , file.length()));
+        	            
+            int versionSplitUnderscore = bits[0].length();
             
             String[] artifactBits = new String[2];
 
-            artifactBits[0] = pluginFile.substring(0,lastUnderscore);
-            artifactBits[1] = pluginFile.substring(lastUnderscore + 1, pluginFile.length());
+            artifactBits[0] = pluginFile.substring(0,versionSplitUnderscore);
+            artifactBits[1] = pluginFile.substring(versionSplitUnderscore + 1, pluginFile.length());
             
             getLog().info(" Artifact: " + artifactBits[0] + " / Version: " + artifactBits[1] + " / isPlugin: " + isPlugin );
 
@@ -457,4 +464,19 @@
         getLog().info("[FIX] " + log);
     }
 
+    public static void main(String[] args ) throws Exception
+    {
+    	String file = "org.eclipse.equinox.server.core_1.1.1.R37x_v20110907-7K7TFBYDzbeA3ypK_98cDL15A4A";
+    	Pattern p = Pattern.compile("_\\d");
+    	
+    	String[] bits = p.split(file);
+    	
+    	System.out.println(file.substring(0, bits[0].length()) + " / " + file.substring(bits[0].length() + 1 , file.length()));
+    	
+    	
+    	
+    	
+    }
+    
+    
 }