tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From antel...@apache.org
Subject svn commit: r1347597 - /tuscany/sca-java-2.x/trunk/distribution/tomcat/testing/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java
Date Thu, 07 Jun 2012 13:10:54 GMT
Author: antelder
Date: Thu Jun  7 13:10:54 2012
New Revision: 1347597

URL: http://svn.apache.org/viewvc?rev=1347597&view=rev
Log:
TUSCANY-4058: Apply update from Andrew Potter to support IBM JDK

Modified:
    tuscany/sca-java-2.x/trunk/distribution/tomcat/testing/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java

Modified: tuscany/sca-java-2.x/trunk/distribution/tomcat/testing/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/distribution/tomcat/testing/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java?rev=1347597&r1=1347596&r2=1347597&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/distribution/tomcat/testing/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java
(original)
+++ tuscany/sca-java-2.x/trunk/distribution/tomcat/testing/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java
Thu Jun  7 13:10:54 2012
@@ -101,11 +101,14 @@ public class JarsInLICENSETestCase {
         String licenseText = readLICENSE(licenseFile);
         for (String jar : jars) {
             if (!licenseText.contains(jar)) {
-                if (jar.startsWith("tuscany-")) {
-                    // ignore tuscany jars as they're not mentioned in the LICENSE file
-                } else {
-                    badJars.add(jar);
-                }
+                 if (jar.startsWith("tuscany-")) {
+                       // ignore tuscany jars as they're not mentioned in the LICENSE file
+
+                 } else if (System.getProperty("java.vendor").equals("IBM Corporation") &&
(jar.equals("bcel-5.2.jar") || jar.equals("jaka rta-regexp-1.4.jar") || jar.equals("xalan-2.7.0.jar")
|| jar.equals("xml-apis-1.0.b2.jar"))) {
+                       // ignore IBM JDK specific jars.
+                 } else {
+                      badJars.add(jar);
+                 } 
             }
         }
         return badJars;



Mime
View raw message