jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1552133 - /jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java
Date Wed, 18 Dec 2013 22:28:57 GMT
Author: pmouawad
Date: Wed Dec 18 22:28:57 2013
New Revision: 1552133

URL: http://svn.apache.org/r1552133
Log:
Update to mail 1.5.0-b01

Modified:
    jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java

Modified: jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java?rev=1552133&r1=1552132&r2=1552133&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java (original)
+++ jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java Wed Dec 18 22:28:57 2013
@@ -94,6 +94,16 @@ public class JMeterVersionTest extends J
         propNames.remove("commons-lang");
     }
 
+    public static void main(String[] args) {
+        String line = "<classpathentry kind=\"lib\" path=\"lib/mail-1.5.0-b01.jar\"/>";
+        final Pattern p = Pattern.compile("\\s+<classpathentry kind=\"lib\" path=\"lib/(?:api/)?(.+)-([^-]+)\\.jar\"/>");
+        final Matcher m = p.matcher(line);
+        if (m.matches()) {
+            String jar = m.group(1);
+            String version = m.group(2);
+            System.out.println(jar);
+        }
+    }
     public void testEclipse() throws Exception {
         final BufferedReader eclipse = new BufferedReader(
                 new FileReader(getFileFromHome("eclipse.classpath"))); // assume default
charset is OK here
@@ -111,8 +121,9 @@ public class JMeterVersionTest extends J
                     jar=jar.replace("-jdk15on","");
                 } else if (jar.equals("commons-jexl") && version.startsWith("2"))
{ // special handling
                     jar="commons-jexl2";
-                } else if (jar.endsWith("mail-1.5.0-b01")) { // special handling
-                    jar = jar.replace("-b01", "");
+                } else if (jar.endsWith("mail-1.5.0")) { // special hack for mail-1.5.0-b01,
to remove when migrating to 1.5.0
+                    jar = "javamail";
+                    version = "1.5.0-b01";
                 }
                 else {
                     String tmp = JAR_TO_BUILD_PROP.get(jar);



Mime
View raw message