Merged sinchi module and fixed conflict in build.xml

.classpath

@@ -5,7 +5,7 @@
 	<classpathentry excluding="**/*.class|**/*.java" including="*.javafiles" kind="src" path="build"/>
 	<classpathentry kind="src" path="src/test"/>
 	<classpathentry exported="true" kind="lib" path="jar/jgrapht-0.6.0.jar" sourcepath="cdksrc.zip"/>
-	<classpathentry exported="true" kind="lib" path="jar/jniinchi-0.5.jar" sourcepath="cdksrc.zip"/>
+	<classpathentry exported="true" kind="lib" path="jar/jniinchi-0.7.jar" sourcepath="cdksrc.zip"/>
 	<classpathentry exported="true" kind="lib" path="jar/vecmath1.2-1.14.jar" sourcepath="cdksrc.zip"/>
 	<classpathentry exported="true" kind="lib" path="jar/xom-1.1.jar" sourcepath="cdksrc.zip"/>
 	<classpathentry exported="true" kind="lib" path="jar/jama-1.0.2.jar" sourcepath="cdksrc.zip"/>

build.xml

@@ -531,7 +531,7 @@
             list="io,structgen"/>
         <foreach target="compile-module" param="module"
             parallel="${parallel}" maxthreads="${threadCount}"
-            list="pdb,smiles,sdg,inchi,libiocml,iordf"/>
+            list="pdb,smiles,sdg,inchi,sinchi,libiocml"/>
         <foreach target="compile-module" param="module"
             parallel="${parallel}" maxthreads="${threadCount}"
             list="control,extra,reaction,pdbcml,libiomd"/>
@@ -563,7 +563,7 @@
         	      test-valencycheck,test-smarts,test-standard,test-reaction,
                   test-pcore,test-sdg,test-forcefield,test-fingerprint,
                   test-ionpot,test-qm,test-isomorphism,test-libiomd,test-dict,
-                  test-diff,test-charges,test-inchi,test-formula,
+                  test-diff,test-charges,test-inchi,test-sinchi,test-formula,
                   test-render,test-ioformats,test-log4j"/>
         <foreach target="compile-module" param="module" trim="true"
             parallel="${parallel}" maxthreads="${threadCount}"

jar/jniinchi-0.7.jar.meta

@@ -0,0 +1,30 @@
+[jniinchi-0.7.jar]
+Library=JNI-InChI
+Version=0.7
+#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.7.jar/org/apache/log4j]
+Library=Apache Log4J
+#Version=
+#Copyright=
+#License=
+#LicenseURL=
+#Download=
+#SourceCode=
+#Homepage=
+
+[jniinchi-0.7.jar/META-INF/jniinchi/1.6]
+Library=InChI Software
+Version=1.02
+#Copyright=
+License=GNU LGPL
+#LicenseURL=
+#Download=
+#SourceCode=
+Homepage=http://iupac.org/inchi/
+

src/META-INF/sinchi.cdkdepends

@@ -0,0 +1,6 @@
+cdk-annotation.jar
+cdk-core.jar
+cdk-interfaces.jar
+cdk-io.jar
+cdk-standard.jar
+cdk-valencycheck.jar

src/META-INF/sinchi.libdepends

@@ -0,0 +1,4 @@
+vecmath1.2-1.14.jar
+xom-1.1.jar
+jniinchi-0.5.jar
+cmlxom-2.5-b1.jar

src/META-INF/test-sinchi.cdkdepends

@@ -0,0 +1,10 @@
+cdk-annotation.jar
+cdk-data.jar
+cdk-core.jar
+cdk-interfaces.jar
+cdk-io.jar
+cdk-render.jar
+cdk-standard.jar
+cdk-valencycheck.jar
+cdk-test.jar
+cdk-sinchi.jar

src/META-INF/test-sinchi.devellibdepends

@@ -0,0 +1,2 @@
+junit-4.5.jar
+

src/META-INF/test-sinchi.libdepends

@@ -0,0 +1,5 @@
+vecmath1.2-1.14.jar
+xom-1.1.jar
+jniinchi-0.7.jar
+cmlxom-2.5-b1.jar
+log4j.jar