Applying migration scripts

Author: aaime

geowebcache/core/pom.xml

@@ -122,40 +122,18 @@
 
     <!-- Java Advanced Imaging (JAI) -->
     <dependency>
-      <groupId>javax.media</groupId>
-      <artifactId>jai_core</artifactId>
+      <groupId>org.eclipse.imagen</groupId>
+      <artifactId>imagen-core</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>javax.media</groupId>
-      <artifactId>jai_codec</artifactId>
+      <groupId>org.eclipse.imagen</groupId>
+      <artifactId>utilities</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>javax.media</groupId>
-      <artifactId>jai_imageio</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>it.geosolutions.jaiext.utilities</groupId>
-      <artifactId>jt-utilities</artifactId>
-      <exclusions>
-        <exclusion>
-          <artifactId>jts-core</artifactId>
-          <groupId>org.locationtech.jts</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <dependency>
-      <groupId>it.geosolutions.jaiext.colorindexer</groupId>
-      <artifactId>jt-colorindexer</artifactId>
-      <exclusions>
-        <exclusion>
-          <artifactId>jts-core</artifactId>
-          <groupId>org.locationtech.jts</groupId>
-        </exclusion>
-      </exclusions>
+      <groupId>org.eclipse.imagen</groupId>
+      <artifactId>colorindexer</artifactId>
     </dependency>
 
     <dependency>

geowebcache/core/src/main/java/org/geowebcache/layer/MetaTile.java

@@ -13,7 +13,6 @@
  */
 package org.geowebcache.layer;
 
-import it.geosolutions.jaiext.BufferedImageAdapter;
 import java.awt.Rectangle;
 import java.awt.RenderingHints;
 import java.awt.image.BufferedImage;
@@ -34,10 +33,11 @@
 import javax.imageio.stream.ImageInputStream;
 import javax.imageio.stream.ImageOutputStream;
 import javax.imageio.stream.MemoryCacheImageOutputStream;
-import javax.media.jai.JAI;
-import javax.media.jai.PlanarImage;
-import javax.media.jai.RenderedOp;
-import javax.media.jai.operator.CropDescriptor;
+import org.eclipse.imagen.JAI;
+import org.eclipse.imagen.PlanarImage;
+import org.eclipse.imagen.RenderedOp;
+import org.eclipse.imagen.media.BufferedImageAdapter;
+import org.eclipse.imagen.media.crop.CropDescriptor;
 import org.geotools.util.logging.Logging;
 import org.geowebcache.GeoWebCacheException;
 import org.geowebcache.grid.BoundingBox;

geowebcache/core/src/main/java/org/geowebcache/mime/ImageMime.java

@@ -13,9 +13,6 @@
  */
 package org.geowebcache.mime;
 
-import it.geosolutions.jaiext.JAIExt;
-import it.geosolutions.jaiext.colorindexer.ColorIndexer;
-import it.geosolutions.jaiext.colorindexer.Quantizer;
 import java.awt.RenderingHints;
 import java.awt.image.ComponentColorModel;
 import java.awt.image.DataBuffer;
@@ -28,10 +25,13 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.imageio.ImageWriter;
-import javax.media.jai.ImageLayout;
-import javax.media.jai.JAI;
-import javax.media.jai.RenderedOp;
-import javax.media.jai.operator.ExtremaDescriptor;
+import org.eclipse.imagen.ImageLayout;
+import org.eclipse.imagen.JAI;
+import org.eclipse.imagen.RenderedOp;
+import org.eclipse.imagen.media.JAIExt;
+import org.eclipse.imagen.media.colorindexer.ColorIndexer;
+import org.eclipse.imagen.media.colorindexer.Quantizer;
+import org.eclipse.imagen.operator.ExtremaDescriptor;
 import org.geotools.util.logging.Logging;
 
 public class ImageMime extends MimeType {

geowebcache/core/src/test/java/org/geowebcache/layer/wms/MetaTileTest.java

@@ -11,7 +11,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
-import javax.media.jai.PlanarImage;
+import org.eclipse.imagen.PlanarImage;
 import org.geowebcache.config.DefaultGridsets;
 import org.geowebcache.grid.BoundingBox;
 import org.geowebcache.grid.GridSetBroker;

geowebcache/core/src/test/java/org/geowebcache/layer/wms/WMSLayerTest.java

@@ -56,10 +56,6 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.atomic.AtomicInteger;
 import javax.imageio.ImageIO;
-import javax.media.jai.ImageLayout;
-import javax.media.jai.JAI;
-import javax.media.jai.RenderedOp;
-import javax.media.jai.operator.BandSelectDescriptor;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.apache.http.Header;
@@ -72,6 +68,10 @@
 import org.easymock.CaptureType;
 import org.easymock.EasyMock;
 import org.easymock.IAnswer;
+import org.eclipse.imagen.ImageLayout;
+import org.eclipse.imagen.JAI;
+import org.eclipse.imagen.RenderedOp;
+import org.eclipse.imagen.media.bandselect.BandSelectDescriptor;
 import org.geowebcache.GeoWebCacheException;
 import org.geowebcache.TestHelpers;
 import org.geowebcache.config.DefaultGridsets;

geowebcache/wms/src/main/java/org/geowebcache/io/codec/ImageEncoderImpl.java

@@ -15,8 +15,6 @@
 
 import com.sun.media.imageioimpl.plugins.clib.CLibImageWriter;
 import it.geosolutions.imageio.stream.output.ImageOutputStreamAdapter;
-import it.geosolutions.jaiext.colorindexer.ColorIndexer;
-import it.geosolutions.jaiext.colorindexer.Quantizer;
 import java.awt.image.IndexColorModel;
 import java.awt.image.RenderedImage;
 import java.io.IOException;
@@ -34,6 +32,8 @@
 import javax.imageio.spi.ImageWriterSpi;
 import javax.imageio.stream.ImageOutputStream;
 import javax.imageio.stream.MemoryCacheImageOutputStream;
+import org.eclipse.imagen.media.colorindexer.ColorIndexer;
+import org.eclipse.imagen.media.colorindexer.Quantizer;
 import org.geotools.image.ImageWorker;
 import org.geotools.image.ImageWorker.PNGImageWriteParam;
 import org.geotools.util.logging.Logging;

geowebcache/wms/src/main/java/org/geowebcache/service/wms/WMSTileFuser.java

@@ -27,10 +27,10 @@
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.media.jai.PlanarImage;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import org.eclipse.imagen.PlanarImage;
 import org.geotools.image.util.ImageUtilities;
 import org.geotools.util.logging.Logging;
 import org.geowebcache.GeoWebCacheException;