adding missing dependencies for kml and iiif

diff --git a/.gitignore b/.gitignore
index a53c99500b65a06cc8027ef62e776895d7bbc55a..78b6d6c3d5a72eba7ecb996ca1cd22bfa97d1530 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,9 @@ eu.etaxonomy.taxeditor.cdmlib/dist
 eu.etaxonomy.taxeditor.cdmlib/lib/cdm-server*
 eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib*
 eu.etaxonomy.taxeditor.cdmlib/lib/http*
+eu.etaxonomy.taxeditor.cdmlib/lib/JavaAPIforKml-2.2.1.jar
+eu.etaxonomy.taxeditor.cdmlib/lib/iiif-apis-0.3.7.jar
+
 eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.servletbridge.extensionbundle-1.2.0.v20100503.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.transforms.hook-1.0.300.v20100719.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.weaving.hook-1.0.100.v20110502.jar

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index 5c1cfa5a5be50f697c8bdd7dbe38852e6aece6a9..701f1248d1a140bb2883b51f561888c64162ae3b 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -881,5 +881,7 @@ Bundle-ClassPath: .,
  lib/httpclient-4.5.11.jar,
  lib/httpclient-cache-4.2.6.jar,
  lib/httpcore-4.4.13.jar,
- lib/httpmime-4.5.1.jar
+ lib/httpmime-4.5.1.jar,
+ lib/JavaAPIforKml-2.2.1.jar,
+ lib/iiif-apis-0.3.7.jar
 Import-Package: eu.etaxonomy.cdm.api.application

diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties
index b5a8180b3ef86e00dff2630d735a4b485bedf918..9b53bc70442492a6574041a21acbcd461aac7b83 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@ -224,7 +224,9 @@ bin.includes = META-INF/,\
                lib/org.swtchart_0.10.0.v20160212.jar,\
                lib/commons-math3-3.6.1.jar,\
                lib/docx4j-6.0.1.jar,\
-               lib/mysql-connector-java-8.0.15.jar
+               lib/mysql-connector-java-8.0.15.jar,\
+               lib/JavaAPIforKml-2.2.1.jar,\
+               lib/iiif-apis-0.3.7.jar
 
 jars.compile.order = .
 output.. = bin/

diff --git a/eu.etaxonomy.taxeditor.cdmlib/pom.xml b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
index 396604b814bef2aa8234d615c2084822327da789..eee19e1bfaaa778c317d5be1de3b442f4c3e7371 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
@@ -55,7 +55,7 @@
             </goals>\r
             <configuration>\r
               <includeArtifactIds>\r
-                httpclient\r
+                httpclient,JavaAPIforKml,iiif-apis\r
               </includeArtifactIds>\r
               <outputDirectory>\r
                 ${basedir}/lib\r
@@ -524,8 +524,20 @@
       <version>1.1.0.Final</version>\r
     </dependency>\r
     <!-- For Hibernate Mapping End -->\r
-\r
     \r
+    <!-- KML/IIIF dependencies should not bee needed for the taxeditor, but at current the KMLDocumentBuilder \r
+         is used in the EditGeoService bean which is needed to display the distribution maps in the editor.\r
+     -->\r
+     <dependency>\r
+        <groupId>de.micromata.jak</groupId>\r
+        <artifactId>JavaAPIforKml</artifactId>\r
+        <version>2.2.1</version><!-- must be same version as in cdmlib -->\r
+    </dependency>\r
+    <dependency>\r
+        <groupId>de.digitalcollections.iiif</groupId>\r
+        <artifactId>iiif-apis</artifactId>\r
+        <version>0.3.7</version>\r
+    </dependency>\r
   </dependencies>\r
 </project>\r
 \r