LMS-1421 ensure that DSS can open tiff files generated in LMC

SVN: 15034

datastore_server/.classpath

@@ -2,8 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="source/java"/>
 	<classpathentry kind="src" path="sourceTest/java"/>
-	<classpathentry kind="lib" path="/libraries/jai/jai_codec.jar"/>
-	<classpathentry kind="lib" path="/libraries/jai/jai_core.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/common"/>
 	<classpathentry kind="lib" path="/libraries/log4j/log4j.jar" sourcepath="/libraries/log4j/src.zip"/>
@@ -35,5 +33,6 @@
 	<classpathentry kind="lib" path="/libraries/jaxb/jsr173_1.0_api.jar"/>
 	<classpathentry kind="lib" path="/libraries/activation/activation.jar"/>
 	<classpathentry kind="lib" path="/libraries/csv/csv.jar" sourcepath="/libraries/csv/src.zip"/>
+	<classpathentry kind="lib" path="/libraries/imagej/ij.jar" sourcepath="/libraries/imagej/src.zip"/>
 	<classpathentry kind="output" path="targets/classes"/>
 </classpath>

datastore_server/build/build.xml

@@ -49,7 +49,7 @@
                 	          servlet-api-2.5.jar log4j.jar activation.jar mail.jar spring.jar fast-md5.jar
                                   commons-codec.jar commons-lang.jar commons-io.jar commons-logging.jar 
                 	          commons-httpclient.jar commons-pool.jar commons-dbcp.jar eodsql.jar postgresql.jar
-					               jai_codec.jar jai_core.jar jaxb-api.jar jaxb-impl.jar jsr173_1-0_api.jar csv.jar" />
+					               		ij.jar jaxb-api.jar jaxb-impl.jar jsr173_1-0_api.jar csv.jar" />
 				<attribute name="Version" value="${version.number}" />
 				<attribute name="Build-Number"
 				           value="${version.number} (r${revision.number},${clean.flag})" />
@@ -96,8 +96,7 @@
 		<copy file="${lib}/commons-logging/commons-logging.jar" todir="${dist.datastore_server.lib}" />
 		<copy file="${lib}/commons-httpclient/commons-httpclient.jar" todir="${dist.datastore_server.lib}" />
 		<copy file="${lib}/eodsql/eodsql.jar" todir="${dist.datastore_server.lib}" />
-		<copy file="${lib}/jai/jai_codec.jar" todir="${dist.datastore_server.lib}" />
-		<copy file="${lib}/jai/jai_core.jar" todir="${dist.datastore_server.lib}" />
+		<copy file="${lib}/imagej/ij.jar" todir="${dist.datastore_server.lib}" />
 		<copy file="${lib}/jaxb/jaxb-api.jar" todir="${dist.datastore_server.lib}" />
 		<copy file="${lib}/jaxb/jaxb-impl.jar" todir="${dist.datastore_server.lib}" />
 		<copy file="${lib}/jaxb/jsr173_1.0_api.jar" todir="${dist.datastore_server.lib}" />

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ImageUtil.java

@@ -16,6 +16,8 @@
 
 package ch.systemsx.cisd.openbis.dss.generic.shared.utils;
 
+import ij.io.Opener;
+
 import java.awt.Graphics2D;
 import java.awt.RenderingHints;
 import java.awt.image.BufferedImage;
@@ -25,9 +27,6 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.media.jai.JAI;
-import javax.media.jai.PlanarImage;
-
 /**
  * Utility function on images.
  * 
@@ -71,8 +70,7 @@ public class ImageUtil
         }
         try
         {
-            PlanarImage planarImage = JAI.create("fileload", file.getAbsolutePath());
-            return planarImage.getAsBufferedImage();
+            return new Opener().openImage(file.getAbsolutePath()).getBufferedImage();
         } catch (RuntimeException ex)
         {
             throw new IllegalArgumentException("Isn't a valid image file: "