Index: applications/editors/josm/plugins/geotools/build.xml
===================================================================
--- applications/editors/josm/plugins/geotools/build.xml	(revision 36014)
+++ applications/editors/josm/plugins/geotools/build.xml	(revision 36015)
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-  <project name="geotools" default="dist" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
+  <project name="geotools" default="dist" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:rsel="antlib:org.apache.tools.ant.types.resources.selectors">
     <!-- enter the SVN commit message -->
     <property name="commit.message" value="Commit message"/>
@@ -29,4 +29,20 @@
         <!--<include name="jackson.jar"/>-->
     </fileset>
+    <macrodef name="merge-text-files">
+      <attribute name="mergefile"/>
+      <attribute name="targetdir"/>
+      <sequential>
+        <concat destfile="@{targetdir}/@{mergefile}">
+          <restrict>
+            <rsel:name name="@{mergefile}"/>
+            <archives>
+                <zips>
+                    <fileset dir="${plugin.lib.dir}" includes="*.jar" excludes="*-sources.jar, *-javadoc.jar" erroronmissingdir="no"/>
+                </zips>
+            </archives>
+          </restrict>
+        </concat>
+      </sequential>
+    </macrodef>
 
     <target name="merge-geotools-services" depends="fetch_dependencies">
@@ -40,8 +56,12 @@
             </fileset>
         </merge-services>
-    <echo>Check the updated files in jar/META-INF/services for lines where two
-    services got merged. Example:
-    org.geotools.coverage.util.FilterFunction_isCoverageorg.geotools.filter.AreaFunction
-    </echo>
+        <echo>Check the updated files in jar/META-INF/services for lines where two
+        services got merged. Example:
+        org.geotools.coverage.util.FilterFunction_isCoverageorg.geotools.filter.AreaFunction
+        </echo>
+
+        <merge-text-files mergefile="META-INF/javax.media.jai.registryFile.jai" targetdir="jar"/>
+        <merge-text-files mergefile="META-INF/registryFile.jai"                 targetdir="jar"/>
+        <merge-text-files mergefile="META-INF/registryFile.jaiext"              targetdir="jar"/>
     </target>
 
Index: applications/editors/josm/plugins/geotools/jar/META-INF/javax.media.jai.registryFile.jai
===================================================================
--- applications/editors/josm/plugins/geotools/jar/META-INF/javax.media.jai.registryFile.jai	(revision 36015)
+++ applications/editors/josm/plugins/geotools/jar/META-INF/javax.media.jai.registryFile.jai	(revision 36015)
@@ -0,0 +1,489 @@
+#
+# $RCSfile: registryFile.jai,v $
+#
+# Copyright (c) 2005 Sun Microsystems, Inc. All rights reserved.
+#
+# Use is subject to license terms.
+#
+# $Revision: 1.2 $
+# $Date: 2005/08/31 22:35:25 $
+# $State: Exp $
+#
+# The master JAI registry initialization file
+#
+############################################################################
+#
+# Each line can be in one of the formats described below. Space or tab
+# characters separate keywords in each line. The comment character is
+# '#'; on each line all characters following the first comment character
+# are ignored. The file must be encoded in UTF-8.
+#
+# 1. To register descriptors :
+#
+#	descriptor <descriptor-class-name>
+#	odesc	   <descriptor-class-name>  <descriptor-name>
+#
+#    The second version above is deprecated and is retained for backward
+#    compatibility with JAI 1.0.2. Descriptors are always registered
+#    against <descriptor-class>.getName(). The <descriptor-name> in the
+#    second version is always ignored.
+#
+# 2. To register factory objects under a product against a specific mode :
+#
+#	<registry-mode-name>	<factory-class-name>	<product-name>	<descriptor-name>   <local-name>
+#	<registry-mode-name>	<factory-class-name>	<descriptor-name>
+#
+#    The first version above is used to register factory objects against
+#    modes that support preferences. The second version is used for those
+#    that do not support preferences. <local-name> is an arbitrary name that
+#    is unique for a given mode. This is (only) used later on in this file
+#    to set preferences between factory objects.
+#
+# 3. To set preferences between products for a descriptor under a
+#    specific mode :
+#
+#	prefProduct <modeName>	<descriptor-name>   <preferred-product-name> <other-product-name>
+#	pref	    product	<descriptor-name>   <preferred-product-name> <other-product-name>
+#
+#    The second version above is deprecated and is retained for backward
+#    compatibility with JAI 1.0.2. This version is assumed to set
+#    product preferences for the "rendered" mode.
+#
+# 4. To set preferences between factory objects for descriptor under a
+#    a specific product and registry mode :
+#
+#	pref	<modeName>  <descriptor-name>	<product-name>	<preferred-factory-local-name>	<other-factory-local-name>
+#
+############################################################################
+#
+# Image operation descriptors :
+#
+descriptor	javax.media.jai.operator.AbsoluteDescriptor
+descriptor	javax.media.jai.operator.AddCollectionDescriptor
+descriptor	javax.media.jai.operator.AddConstDescriptor
+descriptor	javax.media.jai.operator.AddConstToCollectionDescriptor
+descriptor	javax.media.jai.operator.AddDescriptor
+descriptor	javax.media.jai.operator.AffineDescriptor
+descriptor	javax.media.jai.operator.AndConstDescriptor
+descriptor	javax.media.jai.operator.AndDescriptor
+descriptor	javax.media.jai.operator.AWTImageDescriptor
+descriptor	javax.media.jai.operator.BandCombineDescriptor
+descriptor	javax.media.jai.operator.BandMergeDescriptor
+descriptor	javax.media.jai.operator.BandSelectDescriptor
+descriptor	javax.media.jai.operator.BinarizeDescriptor
+descriptor	javax.media.jai.operator.BMPDescriptor
+descriptor	javax.media.jai.operator.BorderDescriptor
+descriptor	javax.media.jai.operator.BoxFilterDescriptor
+descriptor	javax.media.jai.operator.ClampDescriptor
+descriptor	javax.media.jai.operator.ColorConvertDescriptor
+descriptor	javax.media.jai.operator.ColorQuantizerDescriptor
+descriptor	javax.media.jai.operator.ConstantDescriptor
+descriptor	javax.media.jai.operator.CompositeDescriptor
+descriptor	javax.media.jai.operator.ConjugateDescriptor
+descriptor	javax.media.jai.operator.ConvolveDescriptor
+descriptor	javax.media.jai.operator.CropDescriptor
+descriptor	javax.media.jai.operator.DCTDescriptor
+descriptor	javax.media.jai.operator.DFTDescriptor
+descriptor	javax.media.jai.operator.DilateDescriptor
+descriptor	javax.media.jai.operator.DivideDescriptor
+descriptor	javax.media.jai.operator.DivideComplexDescriptor
+descriptor	javax.media.jai.operator.DivideByConstDescriptor
+descriptor	javax.media.jai.operator.DivideIntoConstDescriptor
+descriptor	javax.media.jai.operator.ErodeDescriptor
+descriptor	javax.media.jai.operator.ErrorDiffusionDescriptor
+descriptor	javax.media.jai.operator.EncodeDescriptor
+descriptor	javax.media.jai.operator.ExpDescriptor
+descriptor	javax.media.jai.operator.ExtremaDescriptor
+descriptor	javax.media.jai.operator.FileLoadDescriptor
+descriptor	javax.media.jai.operator.FileStoreDescriptor
+descriptor	javax.media.jai.operator.FilteredSubsampleDescriptor
+descriptor	javax.media.jai.operator.FormatDescriptor
+descriptor	javax.media.jai.operator.FPXDescriptor
+descriptor	javax.media.jai.operator.GIFDescriptor
+descriptor	javax.media.jai.operator.GradientMagnitudeDescriptor
+descriptor	javax.media.jai.operator.HistogramDescriptor
+descriptor	javax.media.jai.operator.IDCTDescriptor
+descriptor	javax.media.jai.operator.IDFTDescriptor
+descriptor	javax.media.jai.operator.IIPDescriptor
+descriptor	javax.media.jai.operator.IIPResolutionDescriptor
+descriptor	javax.media.jai.operator.ImageFunctionDescriptor
+descriptor	javax.media.jai.operator.InvertDescriptor
+descriptor	javax.media.jai.operator.JPEGDescriptor
+descriptor	javax.media.jai.operator.LogDescriptor
+descriptor	javax.media.jai.operator.LookupDescriptor
+descriptor	javax.media.jai.operator.MagnitudeDescriptor
+descriptor	javax.media.jai.operator.MagnitudeSquaredDescriptor
+descriptor	javax.media.jai.operator.MaxDescriptor
+descriptor	javax.media.jai.operator.MaxFilterDescriptor
+descriptor	javax.media.jai.operator.MatchCDFDescriptor
+descriptor	javax.media.jai.operator.MeanDescriptor
+descriptor	javax.media.jai.operator.MedianFilterDescriptor
+descriptor	javax.media.jai.operator.MinDescriptor
+descriptor	javax.media.jai.operator.MinFilterDescriptor
+descriptor	javax.media.jai.operator.MosaicDescriptor
+descriptor	javax.media.jai.operator.MultiplyConstDescriptor
+descriptor	javax.media.jai.operator.MultiplyComplexDescriptor
+descriptor	javax.media.jai.operator.MultiplyDescriptor
+descriptor	javax.media.jai.operator.NotDescriptor
+descriptor	javax.media.jai.operator.NullDescriptor
+descriptor	javax.media.jai.operator.OrConstDescriptor
+descriptor	javax.media.jai.operator.OrDescriptor
+descriptor	javax.media.jai.operator.OrderedDitherDescriptor
+descriptor	javax.media.jai.operator.OverlayDescriptor
+descriptor	javax.media.jai.operator.PatternDescriptor
+descriptor	javax.media.jai.operator.PeriodicShiftDescriptor
+descriptor	javax.media.jai.operator.PhaseDescriptor
+descriptor	javax.media.jai.operator.PiecewiseDescriptor
+descriptor	javax.media.jai.operator.PNGDescriptor
+descriptor	javax.media.jai.operator.PNMDescriptor
+descriptor	javax.media.jai.operator.PolarToComplexDescriptor
+descriptor	javax.media.jai.operator.RenderableDescriptor
+descriptor	javax.media.jai.operator.RescaleDescriptor
+descriptor	javax.media.jai.operator.RotateDescriptor
+descriptor	javax.media.jai.operator.ScaleDescriptor
+descriptor	javax.media.jai.operator.ShearDescriptor
+descriptor	javax.media.jai.operator.StreamDescriptor
+descriptor	javax.media.jai.operator.SubsampleAverageDescriptor
+descriptor	javax.media.jai.operator.SubsampleBinaryToGrayDescriptor
+descriptor	javax.media.jai.operator.SubtractDescriptor
+descriptor	javax.media.jai.operator.SubtractConstDescriptor
+descriptor	javax.media.jai.operator.SubtractFromConstDescriptor
+descriptor	javax.media.jai.operator.TIFFDescriptor
+descriptor	javax.media.jai.operator.ThresholdDescriptor
+descriptor	javax.media.jai.operator.TranslateDescriptor
+descriptor	javax.media.jai.operator.TransposeDescriptor
+descriptor	javax.media.jai.operator.UnsharpMaskDescriptor
+descriptor	javax.media.jai.operator.URLDescriptor
+descriptor	javax.media.jai.operator.WarpDescriptor
+descriptor	javax.media.jai.operator.XorConstDescriptor
+descriptor	javax.media.jai.operator.XorDescriptor
+
+#
+# tile codec descriptor
+#
+descriptor	javax.media.jai.tilecodec.GZIPTileCodecDescriptor
+descriptor	javax.media.jai.tilecodec.JPEGTileCodecDescriptor
+descriptor	javax.media.jai.tilecodec.RawTileCodecDescriptor
+
+#
+# remote descriptor
+#
+descriptor    javax.media.jai.remote.JAIRMIDescriptor
+
+#
+# "rendered" factory objects
+#
+rendered    com.sun.media.jai.opimage.AbsoluteCRIF		com.sun.media.jai	absolute		sunabsoluterif
+rendered    com.sun.media.jai.mlib.MlibAbsoluteRIF		com.sun.media.jai	absolute		mlibabsoluterif
+rendered    com.sun.media.jai.opimage.AddCollectionCRIF		com.sun.media.jai	addcollection		sunaddcollectionrif
+rendered    com.sun.media.jai.opimage.AddConstCRIF		com.sun.media.jai	addconst		sunaddconstrif
+rendered    com.sun.media.jai.mlib.MlibAddConstRIF		com.sun.media.jai	addconst		mlibaddconstrif
+rendered    com.sun.media.jai.opimage.AddCRIF			com.sun.media.jai	add			sunaddrif
+rendered    com.sun.media.jai.mlib.MlibAddRIF			com.sun.media.jai	add			mlibaddrif
+rendered    com.sun.media.jai.opimage.AffineCRIF		com.sun.media.jai	affine			sunaffinerif
+rendered    com.sun.media.jai.mlib.MlibAffineRIF		com.sun.media.jai	affine			mlibaffinerif
+rendered    com.sun.media.jai.opimage.AndConstCRIF		com.sun.media.jai	andconst		sunandconstrif
+rendered    com.sun.media.jai.mlib.MlibAndConstRIF		com.sun.media.jai	andconst		mlibandconstrif
+rendered    com.sun.media.jai.opimage.AndCRIF			com.sun.media.jai	and			sunandrif
+rendered    com.sun.media.jai.mlib.MlibAndRIF			com.sun.media.jai	and			mlibandrif
+rendered    com.sun.media.jai.opimage.AWTImageRIF		com.sun.media.jai	awtimage		sunawtimagerif
+rendered    com.sun.media.jai.opimage.BandCombineCRIF		com.sun.media.jai	bandcombine		sunbandcombinerif
+rendered    com.sun.media.jai.opimage.BandMergeCRIF		com.sun.media.jai	bandmerge		sunbandmergerif
+rendered    com.sun.media.jai.mlib.MlibBandCombineRIF		com.sun.media.jai	bandcombine		mlibbandcombinerif
+rendered    com.sun.media.jai.opimage.BandSelectCRIF		com.sun.media.jai	bandselect		sunbandselectrif
+rendered    com.sun.media.jai.mlib.MlibBandSelectRIF		com.sun.media.jai	bandselect		mlibbandselectrif
+rendered    com.sun.media.jai.opimage.BinarizeCRIF		com.sun.media.jai	binarize		sunbinarizerif
+rendered    com.sun.media.jai.mlib.MlibBinarizeRIF		com.sun.media.jai	binarize		mlibbinarizerif
+rendered    com.sun.media.jai.opimage.BMPRIF			com.sun.media.jai	bmp			sunbmprif
+rendered    com.sun.media.jai.opimage.BorderRIF			com.sun.media.jai	border			sunborderrif
+rendered    com.sun.media.jai.opimage.BoxFilterRIF		com.sun.media.jai	boxfilter		sunboxfilterrif
+rendered    com.sun.media.jai.mlib.MlibBoxFilterRIF		com.sun.media.jai	boxfilter		mlibboxfilterrif
+rendered    com.sun.media.jai.opimage.ClampCRIF			com.sun.media.jai	clamp			sunclamprif
+rendered    com.sun.media.jai.mlib.MlibClampRIF			com.sun.media.jai	clamp			mlibclamprif
+rendered    com.sun.media.jai.opimage.ColorConvertCRIF		com.sun.media.jai	colorconvert		suncolorconvertrif
+rendered    com.sun.media.jai.opimage.ColorQuantizerRIF		com.sun.media.jai	colorquantizer		suncolorquantizerrif
+rendered    com.sun.media.jai.opimage.CompositeCRIF		com.sun.media.jai	composite		suncompositerif
+rendered    com.sun.media.jai.mlib.MlibCompositeRIF		com.sun.media.jai	composite		mlibcompositerif
+rendered    com.sun.media.jai.opimage.ConstantCRIF		com.sun.media.jai	constant		sunconstrif1
+rendered    com.sun.media.jai.opimage.ConjugateCRIF		com.sun.media.jai	conjugate		sunconjugaterif
+rendered    com.sun.media.jai.opimage.ConvolveRIF		com.sun.media.jai	convolve		sunconvolverif
+rendered    com.sun.media.jai.mlib.MlibConvolveRIF		com.sun.media.jai	convolve		mlibconvolverif
+rendered    com.sun.media.jai.opimage.CropCRIF			com.sun.media.jai	crop			suncroprif
+rendered    com.sun.media.jai.opimage.DCTCRIF			com.sun.media.jai	dct			sundctrif
+rendered    com.sun.media.jai.mlib.MlibDCTRIF			com.sun.media.jai	dct			mlibdctrif
+rendered    com.sun.media.jai.opimage.DFTCRIF			com.sun.media.jai	dft			sundftrif
+rendered    com.sun.media.jai.mlib.MlibDFTRIF			com.sun.media.jai	dft			mlibdftrif
+rendered    com.sun.media.jai.opimage.DilateRIF			com.sun.media.jai	dilate			sundilaterif
+rendered    com.sun.media.jai.mlib.MlibDilateRIF		com.sun.media.jai	dilate			mlibdilaterif
+rendered    com.sun.media.jai.opimage.DivideCRIF		com.sun.media.jai	divide			sundividerif
+rendered    com.sun.media.jai.opimage.DivideComplexCRIF		com.sun.media.jai	dividecomplex		sundividecomplexrif
+rendered    com.sun.media.jai.mlib.MlibDivideRIF		com.sun.media.jai	divide			mlibdividerif
+rendered    com.sun.media.jai.opimage.DivideByConstCRIF		com.sun.media.jai	dividebyconst		sundividebyconstrif
+rendered    com.sun.media.jai.mlib.MlibDivideByConstRIF		com.sun.media.jai	dividebyconst		mlibdividebyconstrif
+rendered    com.sun.media.jai.opimage.DivideIntoConstCRIF	com.sun.media.jai	divideintoconst		sundivideintoconstrif
+rendered    com.sun.media.jai.mlib.MlibDivideIntoConstRIF	com.sun.media.jai	divideintoconst		mlibdivideintoconstrif
+rendered    com.sun.media.jai.opimage.EncodeRIF			com.sun.media.jai	encode   		sunencoderif
+rendered    com.sun.media.jai.opimage.ErodeRIF			com.sun.media.jai	erode			suneroderif
+rendered    com.sun.media.jai.mlib.MlibErodeRIF			com.sun.media.jai	erode			mliberoderif
+rendered    com.sun.media.jai.opimage.ErrorDiffusionRIF		com.sun.media.jai	errordiffusion		sunerrordiffusionrif
+rendered    com.sun.media.jai.opimage.ExpCRIF		        com.sun.media.jai	exp			sunexprif
+rendered    com.sun.media.jai.mlib.MlibExpRIF		        com.sun.media.jai	exp			mlibexprif
+rendered    com.sun.media.jai.opimage.ExtremaRIF		com.sun.media.jai	extrema			sunextremarif
+rendered    com.sun.media.jai.mlib.MlibExtremaRIF		com.sun.media.jai	extrema			mlibextremarif
+rendered    com.sun.media.jai.opimage.FileLoadRIF		com.sun.media.jai	fileload		sunfileloadrif
+rendered    com.sun.media.jai.opimage.FileStoreRIF		com.sun.media.jai	filestore		sunfilestorerif
+rendered    com.sun.media.jai.opimage.FilteredSubsampleRIF      com.sun.media.jai       filteredsubsample       sunfilteredsubsamplerif
+rendered    com.sun.media.jai.mlib.MlibFilteredSubsampleRIF     com.sun.media.jai       filteredsubsample       mlibfilteredsubsamplerif
+rendered    com.sun.media.jai.opimage.FormatCRIF		com.sun.media.jai	format			sunformatrif
+rendered    com.sun.media.jai.opimage.FPXRIF		        com.sun.media.jai	fpx			sunfpxrif
+rendered    com.sun.media.jai.opimage.GIFRIF		        com.sun.media.jai	gif			sungifrif
+rendered    com.sun.media.jai.mlib.MlibGradientRIF		com.sun.media.jai	gradientmagnitude	mlibgradientrif
+rendered    com.sun.media.jai.opimage.GradientRIF		com.sun.media.jai	gradientmagnitude	sungradientrif
+rendered    com.sun.media.jai.opimage.HistogramRIF		com.sun.media.jai	histogram		sunhistogramrif
+rendered    com.sun.media.jai.mlib.MlibHistogramRIF		com.sun.media.jai	histogram		mlibhistogramrif
+rendered    com.sun.media.jai.opimage.IDCTCRIF			com.sun.media.jai	idct			sunidctrif
+rendered    com.sun.media.jai.mlib.MlibIDCTRIF			com.sun.media.jai	idct			mlibidctrif
+rendered    com.sun.media.jai.opimage.IDFTCRIF			com.sun.media.jai	idft			sunidftrif
+rendered    com.sun.media.jai.mlib.MlibIDFTRIF			com.sun.media.jai	idft			mlibidftrif
+rendered    com.sun.media.jai.opimage.IIPCRIF			com.sun.media.jai	iip			suniipcrif
+rendered    com.sun.media.jai.opimage.IIPResolutionRIF		com.sun.media.jai	iipresolution		suniipresolutionrif
+rendered    com.sun.media.jai.opimage.ImageFunctionRIF		com.sun.media.jai	imagefunction		sunimagefunctionrif
+rendered    com.sun.media.jai.opimage.InvertCRIF		com.sun.media.jai	invert			suninvertrif
+rendered    com.sun.media.jai.mlib.MlibInvertRIF		com.sun.media.jai	invert			mlibinvertrif
+rendered    com.sun.media.jai.opimage.JPEGRIF		        com.sun.media.jai	jpeg			sunjpegrif
+rendered    com.sun.media.jai.opimage.LogCRIF		        com.sun.media.jai	log			sunlogrif
+rendered    com.sun.media.jai.mlib.MlibLogRIF		        com.sun.media.jai	log			mliblogrif
+rendered    com.sun.media.jai.opimage.LookupCRIF		com.sun.media.jai	lookup			sunlookuprif
+rendered    com.sun.media.jai.mlib.MlibLookupRIF		com.sun.media.jai	lookup			mliblookuprif
+rendered    com.sun.media.jai.opimage.MagnitudeCRIF		com.sun.media.jai	magnitude		sunmagnituderif
+rendered    com.sun.media.jai.opimage.MagnitudeSquaredCRIF	com.sun.media.jai	magnitudesquared	sunmagnitudesquaredrif
+rendered    com.sun.media.jai.opimage.MatchCDFCRIF		com.sun.media.jai	matchcdf		sunmatchcdfrif
+rendered    com.sun.media.jai.opimage.MaxCRIF		        com.sun.media.jai	max			sunmaxrif
+rendered    com.sun.media.jai.mlib.MlibMaxRIF		        com.sun.media.jai	max			mlibmaxrif
+rendered    com.sun.media.jai.opimage.MaxFilterRIF		com.sun.media.jai	maxfilter		sunmaxfilterrif
+rendered    com.sun.media.jai.mlib.MlibMaxFilterRIF		com.sun.media.jai	maxfilter		mlibmaxfilterrif
+rendered    com.sun.media.jai.opimage.MeanRIF		        com.sun.media.jai	mean			sunmeanrif
+rendered    com.sun.media.jai.mlib.MlibMeanRIF		        com.sun.media.jai	mean			mlibmeanrif
+rendered    com.sun.media.jai.opimage.MedianFilterRIF		com.sun.media.jai	medianfilter		sunmedianfilterrif
+rendered    com.sun.media.jai.mlib.MlibMedianFilterRIF		com.sun.media.jai	medianfilter		mlibmedianfilterrif
+rendered    com.sun.media.jai.opimage.MinCRIF		        com.sun.media.jai	min			sunminrif
+rendered    com.sun.media.jai.mlib.MlibMinRIF		        com.sun.media.jai	min			mlibminrif
+rendered    com.sun.media.jai.opimage.MinFilterRIF		com.sun.media.jai	minfilter		sunminfilterrif
+rendered    com.sun.media.jai.mlib.MlibMinFilterRIF		com.sun.media.jai	minfilter		mlibminfilterrif
+rendered    com.sun.media.jai.opimage.MosaicRIF		com.sun.media.jai	mosaic		sunmosaicrif
+rendered    com.sun.media.jai.mlib.MlibMosaicRIF		com.sun.media.jai	mosaic		mlibmosaicrif
+rendered    com.sun.media.jai.opimage.MultiplyCRIF		com.sun.media.jai	multiply		sunmultiplyrif
+rendered    com.sun.media.jai.opimage.MultiplyComplexCRIF	com.sun.media.jai	multiplycomplex		sunmultiplycomplexrif
+rendered    com.sun.media.jai.mlib.MlibMultiplyRIF		com.sun.media.jai	multiply		mlibmultiplyrif
+rendered    com.sun.media.jai.opimage.MultiplyConstCRIF		com.sun.media.jai	multiplyconst		sunmultiplyconstrif
+rendered    com.sun.media.jai.mlib.MlibMultiplyConstRIF		com.sun.media.jai	multiplyconst		mlibmultiplyconstrif
+rendered    com.sun.media.jai.opimage.NotCRIF			com.sun.media.jai	not			sunnotrif
+rendered    com.sun.media.jai.mlib.MlibNotRIF			com.sun.media.jai	not			mlibnotrif
+rendered    javax.media.jai.NullCRIF			   	javax.media.jai		null			sunullrif
+rendered    com.sun.media.jai.opimage.OrConstCRIF		com.sun.media.jai	orconst			sunorconstrif
+rendered    com.sun.media.jai.mlib.MlibOrConstRIF		com.sun.media.jai	orconst			mliborconstrif
+rendered    com.sun.media.jai.opimage.OrCRIF			com.sun.media.jai	or			sunorrif
+rendered    com.sun.media.jai.mlib.MlibOrRIF			com.sun.media.jai	or			mliborrif
+rendered    com.sun.media.jai.opimage.OrderedDitherRIF		com.sun.media.jai	ordereddither		sunorderedditherrif
+rendered    com.sun.media.jai.opimage.OverlayCRIF		com.sun.media.jai	overlay			sunoverlayrif
+rendered    com.sun.media.jai.opimage.PatternRIF		com.sun.media.jai	pattern			sunpatternrif
+rendered    com.sun.media.jai.opimage.PhaseCRIF			com.sun.media.jai	phase			sunphaserif
+rendered    com.sun.media.jai.opimage.PeriodicShiftCRIF		com.sun.media.jai	periodicshift		sunperiodicshiftrif
+rendered    com.sun.media.jai.opimage.PiecewiseCRIF		com.sun.media.jai	piecewise		sunpiecewiserif
+rendered    com.sun.media.jai.opimage.PNGRIF			com.sun.media.jai	png			sunpngrif
+rendered    com.sun.media.jai.opimage.PNMRIF			com.sun.media.jai	pnm			sunpnmrif
+rendered    com.sun.media.jai.opimage.PolarToComplexCRIF	com.sun.media.jai	polartocomplex		sunpolartocomplexrif
+rendered    com.sun.media.jai.opimage.RescaleCRIF		com.sun.media.jai	rescale			sunrescalerif
+rendered    com.sun.media.jai.mlib.MlibRescaleRIF		com.sun.media.jai	rescale			mlibrescalerif
+rendered    com.sun.media.jai.opimage.RotateCRIF		com.sun.media.jai	rotate			sunrotaterif
+rendered    com.sun.media.jai.mlib.MlibRotateRIF		com.sun.media.jai	rotate			mlibrotaterif
+rendered    com.sun.media.jai.opimage.ScaleCRIF			com.sun.media.jai	scale			sunscalerif
+rendered    com.sun.media.jai.mlib.MlibScaleRIF			com.sun.media.jai	scale			mlibscalerif
+rendered    com.sun.media.jai.opimage.ShearRIF			com.sun.media.jai	shear			sunshearrif
+rendered    com.sun.media.jai.mlib.MlibShearRIF		        com.sun.media.jai	shear			mlibshearrif
+rendered    com.sun.media.jai.opimage.StreamRIF			com.sun.media.jai	stream			sunstreamrif
+rendered    com.sun.media.jai.opimage.SubsampleBinaryToGrayCRIF	com.sun.media.jai	subsamplebinarytogray	sunsubsamplebinarytograyrif
+rendered    com.sun.media.jai.mlib.MlibSubsampleBinaryToGrayRIF	com.sun.media.jai	subsamplebinarytogray	mlibsubsamplebinarytograyrif
+rendered    com.sun.media.jai.opimage.SubsampleAverageCRIF	com.sun.media.jai	subsampleaverage	sunsubsampleaveragerif
+rendered    com.sun.media.jai.mlib.MlibSubsampleAverageRIF	com.sun.media.jai	subsampleaverage	mlibsubsampleaveragerif
+rendered    com.sun.media.jai.opimage.SubtractCRIF		com.sun.media.jai	subtract		sunsubtractrif
+rendered    com.sun.media.jai.mlib.MlibSubtractRIF		com.sun.media.jai	subtract		mlibsubtractrif
+rendered    com.sun.media.jai.opimage.SubtractConstCRIF		com.sun.media.jai	subtractconst		sunsubtractconstrif
+rendered    com.sun.media.jai.mlib.MlibSubtractConstRIF		com.sun.media.jai	subtractconst		mlibsubtractconstrif
+rendered    com.sun.media.jai.opimage.SubtractFromConstCRIF	com.sun.media.jai	subtractfromconst	sunsubtractfromconstrif
+rendered    com.sun.media.jai.mlib.MlibSubtractFromConstRIF	com.sun.media.jai	subtractfromconst	mlibsubtractfromconstrif
+rendered    com.sun.media.jai.opimage.TIFFRIF			com.sun.media.jai	tiff			suntiffrif
+rendered    com.sun.media.jai.opimage.ThresholdCRIF		com.sun.media.jai	threshold		sunthresholdrif
+rendered    com.sun.media.jai.mlib.MlibThresholdRIF		com.sun.media.jai	threshold		mlibthresholdrif
+rendered    com.sun.media.jai.opimage.TranslateCRIF		com.sun.media.jai	translate		suntransrif
+rendered    com.sun.media.jai.mlib.MlibTranslateRIF		com.sun.media.jai	translate		mlibtranslaterif
+rendered    com.sun.media.jai.opimage.TransposeCRIF		com.sun.media.jai	transpose		suntransposerif
+rendered    com.sun.media.jai.mlib.MlibTransposeRIF		com.sun.media.jai	transpose		mlibtransposerif
+rendered    com.sun.media.jai.opimage.UnsharpMaskRIF		com.sun.media.jai	unsharpmask		sununsharpmaskrif
+rendered    com.sun.media.jai.mlib.MlibUnsharpMaskRIF		com.sun.media.jai	unsharpmask		mlibunsharpmaskrif
+rendered    com.sun.media.jai.opimage.URLRIF			com.sun.media.jai	url			sunurlrif
+rendered    com.sun.media.jai.opimage.WarpRIF			com.sun.media.jai	warp			sunwarprif
+rendered    com.sun.media.jai.mlib.MlibWarpRIF			com.sun.media.jai	warp			mlibwarprif
+rendered    com.sun.media.jai.opimage.XorConstCRIF		com.sun.media.jai	xorconst		sunxorconstrif
+rendered    com.sun.media.jai.mlib.MlibXorConstRIF		com.sun.media.jai	xorconst		mlibxorconstrif
+rendered    com.sun.media.jai.opimage.XorCRIF			com.sun.media.jai	xor			sunxorrif
+rendered    com.sun.media.jai.mlib.MlibXorRIF			com.sun.media.jai	xor			mlibxorrif
+
+
+#
+# "renderable" factory objects
+#
+renderable	com.sun.media.jai.opimage.AbsoluteCRIF		absolute
+renderable	com.sun.media.jai.opimage.AddCollectionCRIF	addcollection
+renderable	com.sun.media.jai.opimage.AddConstCRIF		addconst
+renderable	com.sun.media.jai.opimage.AddCRIF		add
+renderable	com.sun.media.jai.opimage.AffineCRIF		affine
+renderable	com.sun.media.jai.opimage.AndConstCRIF		andconst
+renderable	com.sun.media.jai.opimage.AndCRIF		and
+renderable	com.sun.media.jai.opimage.BandCombineCRIF	bandcombine
+renderable	com.sun.media.jai.opimage.BandMergeCRIF         bandmerge
+renderable	com.sun.media.jai.opimage.BandSelectCRIF	bandselect
+renderable	com.sun.media.jai.opimage.BinarizeCRIF		binarize
+renderable	com.sun.media.jai.opimage.ClampCRIF		clamp
+renderable	com.sun.media.jai.opimage.ColorConvertCRIF	colorconvert
+renderable	com.sun.media.jai.opimage.CompositeCRIF		composite
+renderable	com.sun.media.jai.opimage.ConjugateCRIF		conjugate
+renderable	com.sun.media.jai.opimage.ConstantCRIF		constant
+renderable	com.sun.media.jai.opimage.CropCRIF		crop
+renderable	com.sun.media.jai.opimage.DCTCRIF		dct
+renderable	com.sun.media.jai.opimage.DFTCRIF		dft
+renderable	com.sun.media.jai.opimage.DivideCRIF		divide
+renderable	com.sun.media.jai.opimage.DivideComplexCRIF	dividecomplex
+renderable	com.sun.media.jai.opimage.DivideByConstCRIF	dividebyconst
+renderable	com.sun.media.jai.opimage.DivideIntoConstCRIF	divideintoconst
+renderable	com.sun.media.jai.opimage.ExpCRIF		exp
+renderable	com.sun.media.jai.opimage.FormatCRIF		format
+renderable	com.sun.media.jai.opimage.IDCTCRIF		idct
+renderable	com.sun.media.jai.opimage.IDFTCRIF		idft
+renderable	com.sun.media.jai.opimage.IIPCRIF		iip
+renderable	com.sun.media.jai.opimage.InvertCRIF		invert
+renderable	com.sun.media.jai.opimage.LogCRIF		log
+renderable	com.sun.media.jai.opimage.LookupCRIF		lookup
+renderable	com.sun.media.jai.opimage.MagnitudeCRIF		magnitude
+renderable	com.sun.media.jai.opimage.MagnitudeSquaredCRIF	magnitudesquared
+renderable	com.sun.media.jai.opimage.MatchCDFCRIF		matchcdf
+renderable	com.sun.media.jai.opimage.MaxCRIF		max
+renderable	com.sun.media.jai.opimage.MinCRIF		min
+renderable	com.sun.media.jai.opimage.MultiplyCRIF		multiply
+renderable	com.sun.media.jai.opimage.MultiplyComplexCRIF	multiplycomplex
+renderable	com.sun.media.jai.opimage.MultiplyConstCRIF	multiplyconst
+renderable	com.sun.media.jai.opimage.NotCRIF		not
+renderable	javax.media.jai.NullCRIF			null
+renderable	com.sun.media.jai.opimage.OrConstCRIF		orconst
+renderable	com.sun.media.jai.opimage.OrCRIF		or
+renderable	com.sun.media.jai.opimage.OverlayCRIF		overlay
+renderable	com.sun.media.jai.opimage.PeriodicShiftCRIF	periodicshift
+renderable	com.sun.media.jai.opimage.PhaseCRIF		phase
+renderable	com.sun.media.jai.opimage.PiecewiseCRIF		piecewise
+renderable	com.sun.media.jai.opimage.PolarToComplexCRIF	polartocomplex
+renderable	com.sun.media.jai.opimage.RenderableCRIF	renderable
+renderable	com.sun.media.jai.opimage.RescaleCRIF		rescale
+renderable	com.sun.media.jai.opimage.RotateCRIF		rotate
+renderable	com.sun.media.jai.opimage.ScaleCRIF		scale
+renderable	com.sun.media.jai.opimage.SubsampleBinaryToGrayCRIF	subsamplebinarytogray
+renderable	com.sun.media.jai.opimage.SubsampleAverageCRIF	subsampleaverage
+renderable	com.sun.media.jai.opimage.SubtractCRIF		subtract
+renderable	com.sun.media.jai.opimage.SubtractConstCRIF	subtractconst
+renderable	com.sun.media.jai.opimage.SubtractFromConstCRIF	subtractfromconst
+renderable	com.sun.media.jai.opimage.ThresholdCRIF		threshold
+renderable	com.sun.media.jai.opimage.TranslateCRIF		translate
+renderable	com.sun.media.jai.opimage.TransposeCRIF		transpose
+renderable	com.sun.media.jai.opimage.XorConstCRIF		xorconst
+renderable	com.sun.media.jai.opimage.XorCRIF		xor
+
+#
+# "collection" factory objects
+#
+collection	com.sun.media.jai.opimage.AddConstToCollectionCIF	com.sun.media.jai	addconsttocollection	sunaddconsttocollectioncif
+
+#
+# tile decoder factory objects
+#
+tileDecoder com.sun.media.jai.tilecodec.GZIPTileDecoderFactory	com.sun.media.jai	gzip			sungziptiledecoderfactory
+tileDecoder com.sun.media.jai.tilecodec.JPEGTileDecoderFactory	com.sun.media.jai	jpeg			suntiledecoderfactory	
+tileDecoder com.sun.media.jai.tilecodec.RawTileDecoderFactory	com.sun.media.jai	raw			sunrawtiledecoderfactory
+
+#
+# tile encoder factory objects
+#
+tileEncoder com.sun.media.jai.tilecodec.GZIPTileEncoderFactory	com.sun.media.jai	gzip			sungziptileencoderfactory
+tileEncoder com.sun.media.jai.tilecodec.JPEGTileEncoderFactory	com.sun.media.jai	jpeg			sunjpegtileencoderfactory
+tileEncoder com.sun.media.jai.tilecodec.RawTileEncoderFactory	com.sun.media.jai	raw			sunrawtileencoderfactory
+
+#
+# remote rendered factory objects
+#
+remoterendered      com.sun.media.jai.rmi.JAIRMICRIF             jairmi
+
+#
+# remote renderable factory objects
+#
+remoterenderable    com.sun.media.jai.rmi.JAIRMICRIF             jairmi
+
+#
+# "rendered" factory object preferences
+#
+pref	rendered	absolute	com.sun.media.jai	mlibabsoluterif	sunabsoluterif
+pref	rendered	addconst	com.sun.media.jai	mlibaddconstrif	sunaddconstrif
+pref	rendered	add		com.sun.media.jai	mlibaddrif	sunaddrif
+pref	rendered	affine		com.sun.media.jai	mlibaffinerif	sunaffinerif
+pref	rendered	and		com.sun.media.jai	mlibandrif	sunandrif
+pref	rendered	andconst	com.sun.media.jai	mlibandconstrif	sunandconstrif
+pref	rendered	bandcombine	com.sun.media.jai	mlibbandcombinerif	sunbandcombinerif
+pref	rendered	bandselect	com.sun.media.jai	mlibbandselectrif	sunbandselectrif
+pref	rendered	binarize	com.sun.media.jai	mlibbinarizerif	sunbinarizerif
+pref	rendered	boxfilter	com.sun.media.jai	mlibboxfilterrif	sunboxfilterrif
+pref	rendered	clamp		com.sun.media.jai	mlibclamprif	sunclamprif
+pref	rendered	composite	com.sun.media.jai	mlibcompositerif	suncompositerif
+pref	rendered	convolve	com.sun.media.jai	mlibconvolverif	sunconvolverif
+pref	rendered	dct		com.sun.media.jai	mlibdctrif	sundctrif
+pref	rendered	dilate		com.sun.media.jai	mlibdilaterif	sundilaterif
+pref	rendered	idct		com.sun.media.jai	mlibidctrif	sunidctrif
+pref	rendered	dft		com.sun.media.jai	mlibdftrif	sundftrif
+pref	rendered	idft		com.sun.media.jai	mlibidftrif	sunidftrif
+pref	rendered	divide		com.sun.media.jai	mlibdividerif	sundividerif
+pref	rendered	dividebyconst	com.sun.media.jai	mlibdividebyconstrif	sundividebyconstrif
+pref	rendered	divideintoconst	com.sun.media.jai	mlibdivideintoconstrif	sundivideintoconstrif
+pref	rendered	erode		com.sun.media.jai	mliberoderif	suneroderif
+pref	rendered	exp		com.sun.media.jai	mlibexprif	sunexprif
+pref	rendered	extrema		com.sun.media.jai	mlibextremarif	sunextremarif
+pref	rendered	filteredsubsample com.sun.media.jai	mlibfilteredsubsamplerif	sunfilteredsubsamplerif
+pref	rendered	gradientmagnitude	com.sun.media.jai	mlibgradientrif sungradientrif
+pref	rendered	histogram	com.sun.media.jai	mlibhistogramrif sunhistogramrif
+pref	rendered	invert		com.sun.media.jai	mlibinvertrif	suninvertrif
+pref	rendered	log		com.sun.media.jai	mliblogrif	sunlogrif
+pref	rendered	lookup		com.sun.media.jai	mliblookuprif	sunlookuprif
+pref	rendered	max		com.sun.media.jai	mlibmaxrif	sunmaxrif
+pref	rendered	maxfilter	com.sun.media.jai	mlibmaxfilterrif	sunmaxfilterrif
+pref	rendered	mean		com.sun.media.jai	mlibmeanrif	sunmeanrif
+pref	rendered	medianfilter	com.sun.media.jai	mlibmedianfilterrif	sunmedianfilterrif
+pref	rendered	min		com.sun.media.jai	mlibminrif	sunminrif
+pref	rendered	minfilter	com.sun.media.jai	mlibminfilterrif	sunminfilterrif
+pref	rendered	mosaic	com.sun.media.jai	mlibmosaicrif	sunmosaicrif
+pref	rendered	multiply	com.sun.media.jai	mlibmultiplyrif	sunmultiplyrif
+pref	rendered	multiplyconst	com.sun.media.jai	mlibmultiplyconstrif	sunmultiplyconstrif
+pref	rendered	not		com.sun.media.jai	mlibnotrif	sunnotrif
+pref	rendered	or		com.sun.media.jai	mliborrif	sunorrif
+pref	rendered	orconst		com.sun.media.jai	mliborconstrif	sunorconstrif
+pref	rendered	rescale		com.sun.media.jai	mlibrescalerif	sunrescalerif
+pref	rendered	rotate		com.sun.media.jai	mlibrotaterif	sunrotaterif
+pref	rendered	scale		com.sun.media.jai	mlibscalerif	sunscalerif
+pref	rendered	shear		com.sun.media.jai	mlibshearrif	sunshearrif
+pref	rendered	subsampleaverage	com.sun.media.jai	mlibsubsampleaveragerif	sunsubsampleaveragerif
+pref	rendered	subsamplebinarytogray	com.sun.media.jai	mlibsubsamplebinarytograyrif	sunsubsamplebinarytograyrif
+pref	rendered	subtractconst	com.sun.media.jai	mlibsubtractconstrif	sunsubtractconstrif
+pref	rendered	subtractfromconst	com.sun.media.jai	mlibsubtractfromconstrif	sunsubtractfromconstrif
+pref	rendered	subtract	com.sun.media.jai	mlibsubtractrif	sunsubtractrif
+pref	rendered	threshold	com.sun.media.jai	mlibthresholdrif	sunthresholdrif
+pref	rendered	translate	com.sun.media.jai	mlibtranslaterif	suntransrif
+pref	rendered	transpose	com.sun.media.jai	mlibtransposerif	suntransposerif
+pref	rendered	unsharpmask	com.sun.media.jai	mlibunsharpmaskrif	sununsharpmaskrif
+pref	rendered	warp		com.sun.media.jai	mlibwarprif	sunwarprif
+pref	rendered	xor		com.sun.media.jai	mlibxorrif	sunxorrif
+pref	rendered	xorconst	com.sun.media.jai	mlibxorconstrif	sunxorconstrif
+
Index: applications/editors/josm/plugins/geotools/jar/META-INF/registryFile.jai
===================================================================
--- applications/editors/josm/plugins/geotools/jar/META-INF/registryFile.jai	(revision 36014)
+++ applications/editors/josm/plugins/geotools/jar/META-INF/registryFile.jai	(revision 36015)
@@ -1,12 +1,69 @@
+#
+# The registry file for Geotools Grid Coverage implementation. This file should be automatically
+# parsed by JAI under initialization. If it is not, then Registry.registerServices(...) can parse
+# it. This may happen if this file is unreachable from the JAI class loader.
+#
+# If this file is updated, remember to update Registry.registerServices(...) accordingly.
+#
+# Version: $Id$
+#
+##################################################################################################
+#
+# Each line can be in one of the formats described below. Space or tab characters separate
+# keywords in each line. The comment character is '#'; on each line all characters following
+# the first comment character are ignored. The file must be encoded in UTF-8.
+#
+# 1. To register descriptors :
+#
+#      descriptor <descriptor-class-name>
+#
+# 2. To register factory objects under a product against a specific mode :
+#
+#      <registry-mode-name>  <factory-class-name>  <product-name>  <descriptor-name>  <local-name>
+#
+#    The <local-name> is (only) used later on in this file to set preferences
+#    between factory objects, if wanted.
+#
+##################################################################################################
 #
 # Image operation descriptors :
 #
-descriptor  org.jaitools.media.jai.contour.ContourDescriptor
-descriptor  org.jaitools.media.jai.rangelookup.RangeLookupDescriptor
-descriptor  org.jaitools.media.jai.vectorbinarize.VectorBinarizeDescriptor
-descriptor  org.jaitools.media.jai.vectorize.VectorizeDescriptor
-descriptor  org.jaitools.media.jai.zonalstats.ZonalStatsDescriptor
 descriptor  org.geotools.image.palette.ColorReductionDescriptor
 descriptor  org.geotools.image.palette.ColorInversionDescriptor
+
+#
+# "rendered" factory objects
+#
+rendered  org.geotools.image.palette.ColorReductionCRIF	org.geotools  org.geotools.ColorReduction ColorReduction
+rendered  org.geotools.image.palette.ColorInversionCRIF	org.geotools  org.geotools.ColorInversion ColorInversion
+#
+# The registry file for Geotools Grid Coverage implementation. This file should be automatically
+# parsed by JAI under initialization. If it is not, then Registry.registerServices(...) can parse
+# it. This may happen if this file is unreachable from the JAI class loader.
+#
+# If this file is updated, remember to update Registry.registerServices(...) accordingly.
+#
+##################################################################################################
+#
+# Each line can be in one of the formats described below. Space or tab characters separate
+# keywords in each line. The comment character is '#'; on each line all characters following
+# the first comment character are ignored. The file must be encoded in UTF-8.
+#
+# 1. To register descriptors :
+#
+#      descriptor <descriptor-class-name>
+#
+# 2. To register factory objects under a product against a specific mode :
+#
+#      <registry-mode-name>  <factory-class-name>  <product-name>  <descriptor-name>  <local-name>
+#
+#    The <local-name> is (only) used later on in this file to set preferences
+#    between factory objects, if wanted.
+#
+##################################################################################################
+#
+# Image operation descriptors :
+#
+descriptor  it.geosolutions.imageio.imageioimpl.imagereadmt.ImageReadDescriptorMT
 
 
@@ -14,9 +71,14 @@
 # "rendered" factory objects
 #
-rendered  org.jaitools.media.jai.contour.ContourRIF  org.jaitools.media.jai  Contour  Contour
-rendered  org.jaitools.media.jai.rangelookup.RangeLookupRIF  org.jaitools.media.jai  RangeLookup  RangeLookup
-rendered  org.jaitools.media.jai.vectorbinarize.VectorBinarizeRIF  org.jaitools.media.jai  VectorBinarize  VectorBinarize
-rendered  org.jaitools.media.jai.vectorize.VectorizeRIF  org.jaitools.media.jai  Vectorize  Vectorize
+rendered  it.geosolutions.imageio.imageioimpl.imagereadmt.ImageReadMTCRIF       it.geosolutions.imageio.imageioimpl.imagereadmt  ImageReadMT       ImageReadMT
+
+#
+# Image operation descriptors :
+#
+descriptor  org.jaitools.media.jai.zonalstats.ZonalStatsDescriptor
+
+
+#
+# "rendered" factory objects
+#
 rendered  org.jaitools.media.jai.zonalstats.ZonalStatsRIF  org.jaitools.media.jai  ZonalStats  ZonalStats
-rendered  org.geotools.image.palette.ColorReductionCRIF	org.geotools  org.geotools.ColorReduction ColorReduction
-rendered  org.geotools.image.palette.ColorInversionCRIF	org.geotools  org.geotools.ColorInversion ColorInversion
Index: applications/editors/josm/plugins/geotools/jar/META-INF/registryFile.jaiext
===================================================================
--- applications/editors/josm/plugins/geotools/jar/META-INF/registryFile.jaiext	(revision 36014)
+++ applications/editors/josm/plugins/geotools/jar/META-INF/registryFile.jaiext	(revision 36015)
@@ -1,15 +1,305 @@
 #
+# Image descriptors
+#
+
+descriptor  it.geosolutions.jaiext.affine.AffineDescriptor
+
+#
+# RenderedImageFactories
+#
+
+rendered  it.geosolutions.jaiext.affine.AffineCRIF  it.geosolutions.jaiext  Affine Affine#
+# Image descriptors
+#
+
+descriptor  it.geosolutions.jaiext.algebra.AlgebraDescriptor
+descriptor  it.geosolutions.jaiext.algebra.constant.OperationConstDescriptor
+
+#
+# RenderedImageFactories
+#
+
+rendered  it.geosolutions.jaiext.algebra.AlgebraCRIF  it.geosolutions.jaiext  algebric algebric 
+rendered  it.geosolutions.jaiext.algebra.constant.OperationConstCRIF  it.geosolutions.jaiext  operationConst operationConst #
+# Image descriptors
+#
+
+descriptor  it.geosolutions.jaiext.bandcombine.BandCombineDescriptor
+
+#
+# RenderedImageFactories
+#
+
+rendered  it.geosolutions.jaiext.bandcombine.BandCombineCRIF  it.geosolutions.jaiext  BandCombine BandCombine #
+# Image descriptors
+#
+
+descriptor  it.geosolutions.jaiext.bandmerge.BandMergeDescriptor
+
+#
+# RenderedImageFactories
+#
+
+rendered  it.geosolutions.jaiext.bandmerge.BandMergeCRIF  it.geosolutions.jaiext  BandMerge BandMerge #
+# Image descriptors
+#
+
+descriptor  it.geosolutions.jaiext.bandselect.BandSelectDescriptor
+
+#
+# RenderedImageFactories
+#
+
+rendered  it.geosolutions.jaiext.bandselect.BandSelectCRIF  it.geosolutions.jaiext  BandSelect BandSelect #
+# Image descriptors
+#
+
+descriptor  it.geosolutions.jaiext.binarize.BinarizeDescriptor
+
+#
+# RenderedImageFactories
+#
+
+rendered  it.geosolutions.jaiext.binarize.BinarizeCRIF  it.geosolutions.jaiext  Binarize Binarize #
+# Image descriptors
+#
+
+descriptor  it.geosolutions.jaiext.border.BorderDescriptor
+
+#
+# RenderedImageFactories
+#
+
+rendered  it.geosolutions.jaiext.border.BorderRIF  it.geosolutions.jaiext  Border Border #
+# Image descriptors
+#
+
+descriptor  it.geosolutions.jaiext.buffer.BufferDescriptor
+
+#
+# RenderedImageFactories
+#
+
+rendered  it.geosolutions.jaiext.buffer.BufferRIF it.geosolutions.jaiext  Buffer Buffer #
+# Image descriptors
+#
+
+descriptor  it.geosolutions.jaiext.classifier.RasterClassifierDescriptor
+
+#
+# RenderedImageFactories
+#
+
+rendered  it.geosolutions.jaiext.classifier.RasterClassifierCRIF  it.geosolutions.jaiext  RasterClassifier RasterClassifier#
+# Image descriptors
+#
+
+descriptor  it.geosolutions.jaiext.colorconvert.ColorConvertDescriptor
+
+#
+# RenderedImageFactories
+#
+
+rendered  it.geosolutions.jaiext.colorconvert.ColorConvertCRIF  it.geosolutions.jaiext  ColorConvert ColorConvert#
+# Image descriptors
+#
+
+descriptor  it.geosolutions.jaiext.colorindexer.ColorIndexerDescriptor
+
+#
+# RenderedImageFactories
+#
+
+rendered  it.geosolutions.jaiext.colorindexer.ColorIndexerCRIF it.geosolutions.jaiext  ColorIndexer ColorIndexer #
 # Image operation descriptors :
 #
-descriptor  it.geosolutions.jaiext.colorconvert.ColorConvertDescriptor
+
+descriptor  it.geosolutions.jaiext.crop.CropDescriptor
+
+
+#
+# "rendered" factory objects
+#
+rendered  it.geosolutions.jaiext.crop.CropCRIF     it.geosolutions.jaiext  Crop   Crop
+#
+# Image descriptors
+#
+
+descriptor  it.geosolutions.jaiext.errordiffusion.ErrorDiffusionDescriptor
+
+#
+# RenderedImageFactories
+#
+
+rendered  it.geosolutions.jaiext.errordiffusion.ErrorDiffusionRIF  it.geosolutions.jaiext  ErrorDiffusion ErrorDiffusion#
+# Image descriptors
+#
+
+descriptor  it.geosolutions.jaiext.format.FormatDescriptor
+
+#
+# RenderedImageFactories
+#
+
+rendered  it.geosolutions.jaiext.format.FormatCRIF  it.geosolutions.jaiext  Format Format #
+# Image descriptors
+#
+
+descriptor  it.geosolutions.jaiext.imagefunction.ImageFunctionDescriptor
+
+#
+# RenderedImageFactories
+#
+
+rendered  it.geosolutions.jaiext.imagefunction.ImageFunctionRIF  it.geosolutions.jaiext  ImageFunction ImageFunction#
+# Image descriptors
+#
+
+descriptor  it.geosolutions.jaiext.lookup.LookupDescriptor
+
+#
+# RenderedImageFactories
+#
+
+rendered  it.geosolutions.jaiext.lookup.LookupCRIF  it.geosolutions.jaiext  Lookup Lookup #
+# Image descriptors
+#
+
+descriptor  it.geosolutions.jaiext.mosaic.MosaicDescriptor
+
+#
+# RenderedImageFactories
+#
+
+rendered  it.geosolutions.jaiext.mosaic.MosaicRIF  it.geosolutions.jaiext  Mosaic Mosaic #
+# Image descriptors
+#
+
+descriptor  it.geosolutions.jaiext.nullop.NullDescriptor
+
+#
+# RenderedImageFactories
+#
+
+rendered  it.geosolutions.jaiext.nullop.NullCRIF  it.geosolutions.jaiext  Null Null #
+# Image descriptors
+#
+
+descriptor  it.geosolutions.jaiext.orderdither.OrderedDitherDescriptor
+
+#
+# RenderedImageFactories
+#
+
+rendered  it.geosolutions.jaiext.orderdither.OrderedDitherRIF  it.geosolutions.jaiext  OrderedDither OrderedDither#
+# Image descriptors
+#
+
+descriptor  it.geosolutions.jaiext.piecewise.GenericPiecewiseDescriptor
+
+#
+# RenderedImageFactories
+#
+
+rendered  it.geosolutions.jaiext.piecewise.GenericPiecewiseCRIF  it.geosolutions.jaiext  GenericPiecewise GenericPiecewise#
+# Image descriptors
+#
+
+descriptor  it.geosolutions.jaiext.rescale.RescaleDescriptor
+
+#
+# RenderedImageFactories
+#
+
+rendered  it.geosolutions.jaiext.rescale.RescaleCRIF  it.geosolutions.jaiext  Rescale Rescale #
+# Image operation descriptors :
+#
+descriptor  it.geosolutions.jaiext.rlookup.RangeLookupDescriptor
+
+
+#
+# "rendered" factory objects
+#
+rendered  it.geosolutions.jaiext.rlookup.RangeLookupRIF  it.geosolutions.jaiext  RLookup  RLookup
+#
+# Image descriptors
+#
+
+descriptor  it.geosolutions.jaiext.scale.ScaleDescriptor
+
+#
+# RenderedImageFactories
+#
+
+rendered  it.geosolutions.jaiext.scale.ScaleCRIF  it.geosolutions.jaiext  Scale Scale #
+# Image descriptors
+#
+
+descriptor  it.geosolutions.jaiext.scale.Scale2Descriptor
+
+#
+# RenderedImageFactories
+#
+
+rendered  it.geosolutions.jaiext.scale.Scale2CRIF  it.geosolutions.jaiext  Scale2 Scale2 #
+# Image descriptors
+#
+
+descriptor  it.geosolutions.jaiext.shadedrelief.ShadedReliefDescriptor
+
+#
+# RenderedImageFactories
+#
+
+rendered  it.geosolutions.jaiext.shadedrelief.ShadedReliefRIF  it.geosolutions.jaiext  ShadedRelief ShadedRelief
+#
+# Image descriptors
+#
+
+descriptor  it.geosolutions.jaiext.stats.StatisticsDescriptor
+
+#
+# RenderedImageFactories
+#
+
+rendered  it.geosolutions.jaiext.stats.StatisticsRIF  it.geosolutions.jaiext  Stats Stats #
+# Image descriptors
+#
+
+descriptor  it.geosolutions.jaiext.translate.TranslateDescriptor
+
+#
+# RenderedImageFactories
+#
+
+rendered  it.geosolutions.jaiext.translate.TranslateCRIF  it.geosolutions.jaiext  Translate Translate #
+# Image operation descriptors :
+#
+descriptor  it.geosolutions.jaiext.vectorbin.VectorBinarizeDescriptor
+
+
+#
+# "rendered" factory objects
+#
+rendered  it.geosolutions.jaiext.vectorbin.VectorBinarizeRIF  it.geosolutions.jaiext  VectorBinarize  VectorBinarize
+#
+# Image descriptors
+#
+
 descriptor  it.geosolutions.jaiext.warp.WarpDescriptor
-descriptor  it.geosolutions.jaiext.stats.StatisticsDescriptor
+
+#
+# RenderedImageFactories
+#
+
+rendered  it.geosolutions.jaiext.warp.WarpRIF  it.geosolutions.jaiext  Warp Warp #
+# Image descriptors
+#
+
 descriptor  it.geosolutions.jaiext.zonal.ZonalStatsDescriptor
 
 #
-# "rendered" factory objects
-#
-rendered  it.geosolutions.jaiext.colorconvert.ColorConvertCRIF  it.geosolutions.jaiext  ColorConvert ColorConvert
-rendered  it.geosolutions.jaiext.warp.WarpRIF  it.geosolutions.jaiext  Warp Warp 
-rendered  it.geosolutions.jaiext.stats.StatisticsRIF  it.geosolutions.jaiext  Stats Stats
-rendered  it.geosolutions.jaiext.zonal.ZonalStatsRIF  it.geosolutions.jaiext  Zonal Zonal
+# RenderedImageFactories
+#
+
+rendered  it.geosolutions.jaiext.zonal.ZonalStatsRIF  it.geosolutions.jaiext  Zonal Zonal 
Index: applications/editors/josm/plugins/geotools/jar/META-INF/services/com.fasterxml.jackson.core.JsonFactory
===================================================================
--- applications/editors/josm/plugins/geotools/jar/META-INF/services/com.fasterxml.jackson.core.JsonFactory	(revision 36014)
+++ 	(revision )
@@ -1,1 +1,0 @@
-com.fasterxml.jackson.core.JsonFactory
Index: applications/editors/josm/plugins/geotools/jar/META-INF/services/it.geosolutions.imageio.compression.CompressorSpi
===================================================================
--- applications/editors/josm/plugins/geotools/jar/META-INF/services/it.geosolutions.imageio.compression.CompressorSpi	(revision 36015)
+++ applications/editors/josm/plugins/geotools/jar/META-INF/services/it.geosolutions.imageio.compression.CompressorSpi	(revision 36015)
@@ -0,0 +1,1 @@
+it.geosolutions.imageio.compression.zipdeflate.ZipDeflateCompressorSpi
Index: applications/editors/josm/plugins/geotools/jar/META-INF/services/it.geosolutions.imageio.compression.DecompressorSpi
===================================================================
--- applications/editors/josm/plugins/geotools/jar/META-INF/services/it.geosolutions.imageio.compression.DecompressorSpi	(revision 36015)
+++ applications/editors/josm/plugins/geotools/jar/META-INF/services/it.geosolutions.imageio.compression.DecompressorSpi	(revision 36015)
@@ -0,0 +1,1 @@
+it.geosolutions.imageio.compression.zipdeflate.ZipDeflateDecompressorSpi
Index: applications/editors/josm/plugins/geotools/src/org/openstreetmap/josm/plugins/geotools/GeoToolsPlugin.java
===================================================================
--- applications/editors/josm/plugins/geotools/src/org/openstreetmap/josm/plugins/geotools/GeoToolsPlugin.java	(revision 36014)
+++ applications/editors/josm/plugins/geotools/src/org/openstreetmap/josm/plugins/geotools/GeoToolsPlugin.java	(revision 36015)
@@ -12,4 +12,5 @@
 import javax.media.jai.OperationRegistry;
 
+import it.geosolutions.imageio.compression.CompressionRegistry;
 import org.geotools.image.ImageWorker;
 import org.geotools.referencing.CRS;
@@ -38,5 +39,5 @@
     }
 
-    private void initJAI() {
+    private static void initJAI() {
         // Disable mediaLib searching that produces unwanted errors
         // See https://www.java.net/node/666373
@@ -50,5 +51,5 @@
         // As the JAI jars are bundled in the geotools plugin, JAI initialization does not work,
         // so we need to perform the tasks described here ("Initialization and automatic loading of registry objects"):
-        // https://docs.oracle.com//cd/E17802_01/products/products/java-media/jai/forDevelopers/jai-apidocs/javax/media/jai/OperationRegistry.html
+        // https://docs.oracle.com/cd/E17802_01/products/products/java-media/jai/forDevelopers/jai-apidocs/javax/media/jai/OperationRegistry.html
         OperationRegistry registry = JAI.getDefaultInstance().getOperationRegistry();
         if (registry == null) {
@@ -92,11 +93,13 @@
     }
 
-    private void initGeoTools() {
+    private static void initGeoTools() {
         // Force Axis order. Fix #8248
         // See http://docs.geotools.org/stable/userguide/library/referencing/order.html
         System.setProperty("org.geotools.referencing.forceXY", "true");
+        // Force registration of compression. Fix #22303.
+        CompressionRegistry.getDefaultInstance().registerApplicationClasspathSpis();
     }
 
-    private void checkEPSG() {
+    private static void checkEPSG() {
         try {
             CRS.decode("EPSG:4326");
