Fixed conflict in LICENSE file due to merge from cdk-1.2.x branch

build.xml

@@ -288,6 +288,32 @@
         <target id="compile-init" name="compile-init"
                 depends="init, check, runDoclet"/>
 
+        <target id="qa-module" name="qa-module"
+                depends="check, dist.init, compile-needed-test"
+                unless="module-uptodate">
+          <echo message="Running QA for CDK's ${module} module" />
+
+          <antcall target="test-module">
+              <param name="module" value="${module}"/>
+          </antcall>
+
+          <ant antfile="pmd.xml" target="test-module">
+              <property name="pmd.test" value="custom"/>
+              <property name="module" value="${module}"/>
+              <property name="lib" value="develjar" />
+          </ant>
+          <ant antfile="pmd-unused.xml" target="test-module">
+              <property name="pmd.test" value="custom"/>
+              <property name="module" value="${module}"/>
+              <property name="lib" value="develjar" />
+          </ant>
+          <ant antfile="pmd-migrating.xml" target="test-module">
+              <property name="pmd.test" value="migrating"/>
+              <property name="module" value="${module}"/>
+              <property name="lib" value="develjar" />
+          </ant>
+        </target>
+
         <target id="compile-module" name="compile-module"
                 depends="check, dist.init, compile-needed-test"
                 unless="module-uptodate">

createModulePages.groovy

@@ -1,5 +1,26 @@
 #!/usr/bin/groovy
 
+/* Copyright (C) 2009  Egon Willighagen <egonw@users.sf.net>
+ *
+ * Contact: cdk-devel@lists.sourceforge.net
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+import java.util.regex.Matcher
+import java.util.regex.Pattern
+
 def nightly = "http://pele.farmbio.uu.se/nightly-1.2.x/"
 
 ant = new AntBuilder()
@@ -8,11 +29,16 @@ ant.delete(dir:"doc/modules")
 ant.mkdir(dir:"doc/modules")
 
 def basedir = new File("src/META-INF")
-files = basedir.listFiles().grep(~/.*cdkdepends$/)
-files.add(new File(basedir,"annotation.cdkdepends"))
-files.add(new File(basedir,"interfaces.cdkdepends"))
-files.each {
-  file = it
+files = new ArrayList();
+if (args[0] != null) {
+  files.add(new File(basedir, args[0] + ".cdkdepends"));
+} else {
+  files = basedir.listFiles().grep(~/.*cdkdepends$/)
+  files.add(new File(basedir,"annotation.cdkdepends"))
+  files.add(new File(basedir,"interfaces.cdkdepends"))
+}
+files.each { file ->
+  println "Processing $file";
   m = (file =~ ~/\/([-|\w]*)\.cdkdepends/)
   module = m[0][1]
 
@@ -27,27 +53,67 @@ files.each {
       if (!module.contains("test")) {
         h2("QA Reports")
         p(){
-          junitURL = nightly+"test/result-"+module
-          stats = "";
-          try {
-            junitURL.toURL().eachLine {
+          localReport = new File("reports/result-"+module + ".txt")
+          if (localReport.exists()) {
+            // use local
+            localReport.eachLine {
               if (it =~ ~/Tests\srun/) {
                 stats = it
               }
             }
-            a(href:junitURL,"JUnit")
-            span(": " + stats)
-          } catch (FileNotFoundException exc) {}
+            span("JUnit: " + stats)
+          } else {
+            // use remote
+            junitURL = nightly+"test/result-"+module
+            stats = "";
+            try {
+              junitURL.toURL().eachLine {
+                if (it =~ ~/Tests\srun/) {
+                  stats = it
+                }
+              }
+              a(href:junitURL,"JUnit")
+              span(": " + stats)
+            } catch (FileNotFoundException exc) {
+            } catch (SocketException exc) {}
+          }
         }
       }
       p(){
         a(href:nightly+"javadoc/$module/", "DocCheck Results")
       }
       p(){
         span("PDM: ")
-        a(href:nightly+"pmd-unused/"+module+".html", "unused")
-        a(href:nightly+"pmd-migrating/"+module+".html", "migration")
-        a(href:nightly+"pmd/"+module+".html", "all")
+        localReport = new File("reports/pmd/"+module + ".xml")
+        if (localReport.exists()) {
+          def pmd = null
+          try {
+            pmd = new XmlParser().parseText(localReport.text)
+            span("Violations=" + pmd.file.violation.size())
+          } catch (Exception exception) {}
+        } else {
+          a(href:nightly+"pmd/"+module+".html", "all")
+        }
+        localReport = new File("reports/pmd-unused/"+module + ".xml")
+        if (localReport.exists()) {
+          def pmd = null
+          try {
+            pmd = new XmlParser().parseText(localReport.text)
+            span("Violations=" + pmd.file.violation.size())
+          } catch (Exception exception) {}
+        } else {
+          a(href:nightly+"pmd-unused/"+module+".html", "unused")
+        }
+        localReport = new File("reports/pmd-migrating/"+module + ".xml")
+        if (localReport.exists()) {
+          def pmd = null
+          try {
+            pmd = new XmlParser().parseText(localReport.text)
+            span("Violations=" + pmd.file.violation.size())
+          } catch (Exception exception) {}
+        } else {
+          a(href:nightly+"pmd-migrating/"+module+".html", "migration")
+        }
       }
       h2("Depends")
       p(){
@@ -63,8 +129,35 @@ files.each {
       p(){
         if (libdepends.exists()) {
           b("Libraries")
-          libdepends.text.eachLine{
-            span(it)
+          ul() {
+            libdepends.text.eachLine{ libdep ->
+              if (libdep.length() > 0) {
+                p() {
+                  span(libdep + ": ")
+                  configFile = new File("jar/" + libdep + ".meta")
+                  if (configFile.exists()) {
+                    config = readProperties(configFile);
+                    ul() {
+                      config.keySet().each { section ->
+                        libProps = config.get(section);
+                        p() {
+                          span(libProps.get("Library"))
+                          if (libProps.containsKey("Version")) {
+                            span(" " + libProps.get("Version"))
+                          }
+                          br()
+                          if (libProps.containsKey("Copyright")) {
+                            span(libProps.get("Copyright"))
+                            br()
+                          }
+                          span(libProps.get("License"))
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
           }
         }
       }
@@ -81,3 +174,25 @@ files.each {
   new File("doc/modules/" + module + ".html").write(writer.toString())
 }
 
+public Map readProperties(File file) {
+  Map props = new HashMap();
+  Map sectionProps = null;
+  file.text.eachLine { line ->
+    line.trim();
+    if (line.startsWith("#")) {
+      // skip line
+    } else if (line.startsWith("[") && line.endsWith("]")) {
+      section = line.substring(line.indexOf("[")+1, line.indexOf("]"));
+      sectionProps = new HashMap();
+      props.put(section, sectionProps);
+    } else if (line.contains("=")) {
+      def keyValue = line.split("=")
+      if (sectionProps == null) {
+        print "ERROR: property without required section header";
+        System.exit(-1);
+      }
+      sectionProps.put(keyValue[0], keyValue[1]);
+    }
+  }
+  return props;
+}

jar/JRI.jar.meta

@@ -0,0 +1,9 @@
+[JRI.jar]
+Library=JRI
+#Version=
+#Copyright=
+#License=
+#LicenseURL=
+#Download=
+#SourceCode=
+Homepage=http://www.rforge.net/JRI/

jar/LICENSE

@@ -1,10 +1,2 @@
-This file lists the licenses for the libraries in this directory.
-
-Apache License (2.0/1.1):
-log4j.jar
-
-Artistic License:
-cmlxom-2.5.b1.jar
-
-Public Domain :
-jama-1.0.2.jar, vecmath1.2-1.14.jar
+The respective Copyright and License information for all the libraries
+in this folder are found in the .meta file matching the jar.

jar/antlr.jar.meta

@@ -0,0 +1,9 @@
+[antlr.jar]
+#Library=
+#Version=
+#Copyright=
+License=BSD
+LicenseURL=http://www.antlr.org/license.html
+#Download=
+#SourceCode=
+#Homepage=

jar/cmlxom-2.5-b1.jar.meta

@@ -0,0 +1,19 @@
+[cmlxom-2.5-b1.jar]
+Library=CMLXOM
+Version=2.5 beta1
+#Copyright=
+License=Artistic License 2.0
+#LicenseURL=
+#Download=
+#SourceCode=
+Homepage=https://sourceforge.net/projects/cml/develop
+
+[cmlxom-2.5-b1.jar/org/xmlcml/cml/base/schema.xsd]
+Library=CML 2.5 XML Schema
+#Version=
+#Copyright=
+License=Creative Commons BY-ND
+#LicenseURL=
+#Download=
+#SourceCode=
+#Homepage=

jar/commons-cli-1.0.jar.meta

@@ -0,0 +1,9 @@
+[commons-cli-1.0.jar]
+Library=Apache Commons - CLI
+#Version=
+#Copyright=
+License=Apache License Version 2.0
+LicenseURL=http://commons.apache.org/license.html
+#Download=
+#SourceCode=
+#Homepage=

jar/jama-1.0.2.jar.meta

@@ -0,0 +1,9 @@
+[commons-cli-1.0.jar]
+Library=Apache Commons - CLI
+#Version=
+#Copyright=
+License=Apache License Version 2.0
+LicenseURL=http://commons.apache.org/license.html
+#Download=
+#SourceCode=
+#Homepage=

jar/javacc.jar.meta

@@ -0,0 +1,9 @@
+[jama-1.0.2.jar]
+Library=JAMA
+#Version=1.0.2
+#Copyright=
+License=Public Domain
+#LicenseURL=
+#Download=
+#SourceCode=
+Homepage=http://math.nist.gov/javanumerics/jama/

jar/jgrapht-0.6.0.jar.meta

@@ -0,0 +1,9 @@
+[jgrapht-0.6.0.jar]
+Library=JGraphT
+Version=0.6.0
+#Copyright=
+License=GNU Lesser General Public License, 2.1
+#LicenseURL=
+#Download=
+#SourceCode=
+Homepage=http://jgrapht.sourceforge.net/

jar/jniinchi-0.5.jar.meta

@@ -0,0 +1,30 @@
+[jniinchi-0.5.jar]
+Library=JNI-InChI
+Version=0.5
+#Copyright=
+License=GNU Lesser General Public License
+LicenseURL=http://jni-inchi.sourceforge.net/license.html
+#Download=
+#SourceCode=
+Homepage=http://jni-inchi.sourceforge.net/
+
+[jniinchi-0.5.jar/org/apache/log4j]
+Library=Apache Log4J
+#Version=
+#Copyright=
+#License=
+#LicenseURL=
+#Download=
+#SourceCode=
+#Homepage=
+
+[jniinchi-0.5.jar/META-INF/jniinchi/1.6]
+Library=InChI Software
+Version=1.02
+#Copyright=
+License=GNU LGPL
+#LicenseURL=
+#Download=
+#SourceCode=
+Homepage=http://iupac.org/inchi/
+

jar/log4j.jar.meta

@@ -0,0 +1,9 @@
+[log4j.jar]
+Library=Apache Log4J
+#Version=
+#Copyright=
+License=Apache License, Version 2.0
+LicenseURL=http://logging.apache.org/log4j/1.2/index.html
+#Download=
+#SourceCode=
+#Homepage=

jar/sjava-0.68.jar.meta

@@ -0,0 +1,9 @@
+[sjava-0.68.jar]
+Library=SJava
+Version=0.68
+#Copyright=
+#License=BSD
+LicenseURL=http://www.omegahat.org/License.html
+#Download=
+#SourceCode=
+#Homepage=

jar/template.jar.meta

@@ -0,0 +1,9 @@
+[template.jar]
+Library=
+#Version=
+#Copyright=
+#License=
+#LicenseURL=
+#Download=
+#SourceCode=
+#Homepage=

jar/vecmath1.2-1.14.jar.extra

@@ -0,0 +1,14 @@
+Copyright (C) 1997,1998,1999
+Kenji Hiranabe, Eiwa System Management, Inc.
+
+This program is free software.
+Implemented by Kenji Hiranabe(hiranabe@esm.co.jp),
+conforming to the Java(TM) 3D API specification by Sun Microsystems.
+
+Permission to use, copy, modify, distribute and sell this software
+and its documentation for any purpose is hereby granted without fee,
+provided that the above copyright notice appear in all copies and
+that both that copyright notice and this permission notice appear
+in supporting documentation. Kenji Hiranabe and Eiwa System Management,Inc.
+makes no representations about the suitability of this software for any
+purpose.  It is provided "AS IS" with NO WARRANTY.