Index: /applications/editors/josm/plugins/build-common.xml
===================================================================
--- /applications/editors/josm/plugins/build-common.xml	(revision 29006)
+++ /applications/editors/josm/plugins/build-common.xml	(revision 29007)
@@ -73,5 +73,5 @@
     </target>
     <target name="setup-dist">
-	<antcall target="setup-dist-default" />
+        <antcall target="setup-dist-default" />
     </target>
     <!--
@@ -82,5 +82,5 @@
     <target name="dist" depends="compile,revision">
         <echo message="creating ${ant.project.name}.jar ... "/>
-	<antcall target="setup-dist" />
+        <antcall target="setup-dist" />
         <delete file="MANIFEST" failonerror="no"/>
         <manifest file="MANIFEST" mode="update">
@@ -121,4 +121,8 @@
         </jar>
         <delete file="MANIFEST" failonerror="no"/>
+        <antcall target="post-dist" />
+    </target>
+    <target name="post-dist">
+    	<!-- to be overidden by plugins that need to perform additional tasks on resulting jar -->
     </target>
     <target name="add-manifest-attribute" depends="check-manifest-attribute" if="have-${propery.name}">
Index: /applications/editors/josm/plugins/geotools/META-INF/services/com.vividsolutions.xdo.SchemaBuilder
===================================================================
--- /applications/editors/josm/plugins/geotools/META-INF/services/com.vividsolutions.xdo.SchemaBuilder	(revision 29007)
+++ /applications/editors/josm/plugins/geotools/META-INF/services/com.vividsolutions.xdo.SchemaBuilder	(revision 29007)
@@ -0,0 +1,1 @@
+org.geotools.xml.SchemaFactory
Index: /applications/editors/josm/plugins/geotools/META-INF/services/javax.imageio.spi.ImageInputStreamSpi
===================================================================
--- /applications/editors/josm/plugins/geotools/META-INF/services/javax.imageio.spi.ImageInputStreamSpi	(revision 29007)
+++ /applications/editors/josm/plugins/geotools/META-INF/services/javax.imageio.spi.ImageInputStreamSpi	(revision 29007)
@@ -0,0 +1,47 @@
+#
+# $RCSfile: javax.imageio.spi.ImageInputStreamSpi,v $
+#
+# 
+# Copyright (c) 2005 Sun Microsystems, Inc. All  Rights Reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met: 
+# 
+# - Redistribution of source code must retain the above copyright 
+#   notice, this  list of conditions and the following disclaimer.
+# 
+# - Redistribution in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in 
+#   the documentation and/or other materials provided with the
+#   distribution.
+# 
+# Neither the name of Sun Microsystems, Inc. or the names of 
+# contributors may be used to endorse or promote products derived 
+# from this software without specific prior written permission.
+# 
+# This software is provided "AS IS," without a warranty of any 
+# kind. ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND 
+# WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, 
+# FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY
+# EXCLUDED. SUN MIDROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL 
+# NOT BE LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF 
+# USING, MODIFYING OR DISTRIBUTING THIS SOFTWARE OR ITS
+# DERIVATIVES. IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR 
+# ANY LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL,
+# CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND
+# REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR
+# INABILITY TO USE THIS SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGES. 
+# 
+# You acknowledge that this software is not designed or intended for 
+# use in the design, construction, operation or maintenance of any 
+# nuclear facility. 
+#
+# $Revision: 1.1 $
+# $Date: 2005/02/11 05:02:44 $
+# $State: Exp $
+#
+# --- JAI-Image I/O ImageInputStream plug-ins ---
+#
+com.sun.media.imageioimpl.stream.ChannelImageInputStreamSpi
Index: /applications/editors/josm/plugins/geotools/META-INF/services/javax.imageio.spi.ImageOutputStreamSpi
===================================================================
--- /applications/editors/josm/plugins/geotools/META-INF/services/javax.imageio.spi.ImageOutputStreamSpi	(revision 29007)
+++ /applications/editors/josm/plugins/geotools/META-INF/services/javax.imageio.spi.ImageOutputStreamSpi	(revision 29007)
@@ -0,0 +1,47 @@
+#
+# $RCSfile: javax.imageio.spi.ImageOutputStreamSpi,v $
+#
+# 
+# Copyright (c) 2005 Sun Microsystems, Inc. All  Rights Reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met: 
+# 
+# - Redistribution of source code must retain the above copyright 
+#   notice, this  list of conditions and the following disclaimer.
+# 
+# - Redistribution in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in 
+#   the documentation and/or other materials provided with the
+#   distribution.
+# 
+# Neither the name of Sun Microsystems, Inc. or the names of 
+# contributors may be used to endorse or promote products derived 
+# from this software without specific prior written permission.
+# 
+# This software is provided "AS IS," without a warranty of any 
+# kind. ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND 
+# WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, 
+# FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY
+# EXCLUDED. SUN MIDROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL 
+# NOT BE LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF 
+# USING, MODIFYING OR DISTRIBUTING THIS SOFTWARE OR ITS
+# DERIVATIVES. IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR 
+# ANY LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL,
+# CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND
+# REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR
+# INABILITY TO USE THIS SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGES. 
+# 
+# You acknowledge that this software is not designed or intended for 
+# use in the design, construction, operation or maintenance of any 
+# nuclear facility. 
+#
+# $Revision: 1.1 $
+# $Date: 2005/02/11 05:02:44 $
+# $State: Exp $
+#
+# --- JAI-Image I/O ImageReader plug-ins ---
+#
+com.sun.media.imageioimpl.stream.ChannelImageOutputStreamSpi
Index: /applications/editors/josm/plugins/geotools/META-INF/services/javax.imageio.spi.ImageReaderSpi
===================================================================
--- /applications/editors/josm/plugins/geotools/META-INF/services/javax.imageio.spi.ImageReaderSpi	(revision 29007)
+++ /applications/editors/josm/plugins/geotools/META-INF/services/javax.imageio.spi.ImageReaderSpi	(revision 29007)
@@ -0,0 +1,57 @@
+it.geosolutions.imageioimpl.plugins.tiff.TIFFImageReaderSpi
+
+#
+# $RCSfile: javax.imageio.spi.ImageReaderSpi,v $
+#
+# 
+# Copyright (c) 2005 Sun Microsystems, Inc. All  Rights Reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met: 
+# 
+# - Redistribution of source code must retain the above copyright 
+#   notice, this  list of conditions and the following disclaimer.
+# 
+# - Redistribution in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in 
+#   the documentation and/or other materials provided with the
+#   distribution.
+# 
+# Neither the name of Sun Microsystems, Inc. or the names of 
+# contributors may be used to endorse or promote products derived 
+# from this software without specific prior written permission.
+# 
+# This software is provided "AS IS," without a warranty of any 
+# kind. ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND 
+# WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, 
+# FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY
+# EXCLUDED. SUN MIDROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL 
+# NOT BE LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF 
+# USING, MODIFYING OR DISTRIBUTING THIS SOFTWARE OR ITS
+# DERIVATIVES. IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR 
+# ANY LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL,
+# CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND
+# REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR
+# INABILITY TO USE THIS SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGES. 
+# 
+# You acknowledge that this software is not designed or intended for 
+# use in the design, construction, operation or maintenance of any 
+# nuclear facility. 
+#
+# $Revision: 1.1 $
+# $Date: 2005/02/11 05:02:44 $
+# $State: Exp $
+#
+# --- JAI-Image I/O ImageReader plug-ins ---
+#
+com.sun.media.imageioimpl.plugins.jpeg.CLibJPEGImageReaderSpi
+com.sun.media.imageioimpl.plugins.png.CLibPNGImageReaderSpi
+com.sun.media.imageioimpl.plugins.jpeg2000.J2KImageReaderSpi
+com.sun.media.imageioimpl.plugins.jpeg2000.J2KImageReaderCodecLibSpi
+com.sun.media.imageioimpl.plugins.wbmp.WBMPImageReaderSpi
+com.sun.media.imageioimpl.plugins.bmp.BMPImageReaderSpi
+com.sun.media.imageioimpl.plugins.pnm.PNMImageReaderSpi
+com.sun.media.imageioimpl.plugins.raw.RawImageReaderSpi
+com.sun.media.imageioimpl.plugins.tiff.TIFFImageReaderSpi
Index: /applications/editors/josm/plugins/geotools/META-INF/services/javax.imageio.spi.ImageWriterSpi
===================================================================
--- /applications/editors/josm/plugins/geotools/META-INF/services/javax.imageio.spi.ImageWriterSpi	(revision 29007)
+++ /applications/editors/josm/plugins/geotools/META-INF/services/javax.imageio.spi.ImageWriterSpi	(revision 29007)
@@ -0,0 +1,58 @@
+it.geosolutions.imageioimpl.plugins.tiff.TIFFImageWriterSpi
+
+#
+# $RCSfile: javax.imageio.spi.ImageWriterSpi,v $
+#
+# 
+# Copyright (c) 2005 Sun Microsystems, Inc. All  Rights Reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met: 
+# 
+# - Redistribution of source code must retain the above copyright 
+#   notice, this  list of conditions and the following disclaimer.
+# 
+# - Redistribution in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in 
+#   the documentation and/or other materials provided with the
+#   distribution.
+# 
+# Neither the name of Sun Microsystems, Inc. or the names of 
+# contributors may be used to endorse or promote products derived 
+# from this software without specific prior written permission.
+# 
+# This software is provided "AS IS," without a warranty of any 
+# kind. ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND 
+# WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, 
+# FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY
+# EXCLUDED. SUN MIDROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL 
+# NOT BE LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF 
+# USING, MODIFYING OR DISTRIBUTING THIS SOFTWARE OR ITS
+# DERIVATIVES. IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR 
+# ANY LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL,
+# CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND
+# REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR
+# INABILITY TO USE THIS SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGES. 
+# 
+# You acknowledge that this software is not designed or intended for 
+# use in the design, construction, operation or maintenance of any 
+# nuclear facility. 
+#
+# $Revision: 1.1 $
+# $Date: 2005/02/11 05:02:44 $
+# $State: Exp $
+#
+# --- JAI-Image I/O ImageWriter plug-ins ---
+#
+com.sun.media.imageioimpl.plugins.jpeg.CLibJPEGImageWriterSpi
+com.sun.media.imageioimpl.plugins.png.CLibPNGImageWriterSpi
+com.sun.media.imageioimpl.plugins.jpeg2000.J2KImageWriterSpi
+com.sun.media.imageioimpl.plugins.jpeg2000.J2KImageWriterCodecLibSpi
+com.sun.media.imageioimpl.plugins.wbmp.WBMPImageWriterSpi
+com.sun.media.imageioimpl.plugins.bmp.BMPImageWriterSpi
+com.sun.media.imageioimpl.plugins.gif.GIFImageWriterSpi
+com.sun.media.imageioimpl.plugins.pnm.PNMImageWriterSpi
+com.sun.media.imageioimpl.plugins.raw.RawImageWriterSpi
+com.sun.media.imageioimpl.plugins.tiff.TIFFImageWriterSpi
Index: /applications/editors/josm/plugins/geotools/META-INF/services/javax.media.jai.OperationRegistrySpi
===================================================================
--- /applications/editors/josm/plugins/geotools/META-INF/services/javax.media.jai.OperationRegistrySpi	(revision 29007)
+++ /applications/editors/josm/plugins/geotools/META-INF/services/javax.media.jai.OperationRegistrySpi	(revision 29007)
@@ -0,0 +1,47 @@
+#
+# $RCSfile: javax.media.jai.OperationRegistrySpi,v $
+#
+# 
+# Copyright (c) 2005 Sun Microsystems, Inc. All  Rights Reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met: 
+# 
+# - Redistribution of source code must retain the above copyright 
+#   notice, this  list of conditions and the following disclaimer.
+# 
+# - Redistribution in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in 
+#   the documentation and/or other materials provided with the
+#   distribution.
+# 
+# Neither the name of Sun Microsystems, Inc. or the names of 
+# contributors may be used to endorse or promote products derived 
+# from this software without specific prior written permission.
+# 
+# This software is provided "AS IS," without a warranty of any 
+# kind. ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND 
+# WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, 
+# FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY
+# EXCLUDED. SUN MIDROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL 
+# NOT BE LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF 
+# USING, MODIFYING OR DISTRIBUTING THIS SOFTWARE OR ITS
+# DERIVATIVES. IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR 
+# ANY LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL,
+# CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND
+# REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR
+# INABILITY TO USE THIS SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGES. 
+# 
+# You acknowledge that this software is not designed or intended for 
+# use in the design, construction, operation or maintenance of any 
+# nuclear facility. 
+#
+# $Revision: 1.1 $
+# $Date: 2005/02/11 05:02:44 $
+# $State: Exp $
+#
+# --- JAI-Image I/O operations registration ---
+#
+com.sun.media.jai.imageioimpl.ImageReadWriteSpi
Index: /applications/editors/josm/plugins/geotools/META-INF/services/org.geotools.coverage.grid.GridCoverageFactory
===================================================================
--- /applications/editors/josm/plugins/geotools/META-INF/services/org.geotools.coverage.grid.GridCoverageFactory	(revision 29007)
+++ /applications/editors/josm/plugins/geotools/META-INF/services/org.geotools.coverage.grid.GridCoverageFactory	(revision 29007)
@@ -0,0 +1,1 @@
+org.geotools.coverage.grid.GridCoverageFactory
Index: /applications/editors/josm/plugins/geotools/META-INF/services/org.geotools.coverage.grid.io.GridFormatFactorySpi
===================================================================
--- /applications/editors/josm/plugins/geotools/META-INF/services/org.geotools.coverage.grid.io.GridFormatFactorySpi	(revision 29007)
+++ /applications/editors/josm/plugins/geotools/META-INF/services/org.geotools.coverage.grid.io.GridFormatFactorySpi	(revision 29007)
@@ -0,0 +1,1 @@
+org.geotools.gce.geotiff.GeoTiffFormatFactorySpi
Index: /applications/editors/josm/plugins/geotools/META-INF/services/org.geotools.data.DataSourceFactorySpi
===================================================================
--- /applications/editors/josm/plugins/geotools/META-INF/services/org.geotools.data.DataSourceFactorySpi	(revision 29007)
+++ /applications/editors/josm/plugins/geotools/META-INF/services/org.geotools.data.DataSourceFactorySpi	(revision 29007)
@@ -0,0 +1,1 @@
+org.geotools.data.gml.GMLDataSourceFactory
Index: /applications/editors/josm/plugins/geotools/META-INF/services/org.geotools.data.FeatureLockFactory
===================================================================
--- /applications/editors/josm/plugins/geotools/META-INF/services/org.geotools.data.FeatureLockFactory	(revision 29007)
+++ /applications/editors/josm/plugins/geotools/META-INF/services/org.geotools.data.FeatureLockFactory	(revision 29007)
@@ -0,0 +1,1 @@
+org.geotools.data.DefaultFeatureLockFactory
Index: /applications/editors/josm/plugins/geotools/META-INF/services/org.geotools.feature.AttributeTypeFactory
===================================================================
--- /applications/editors/josm/plugins/geotools/META-INF/services/org.geotools.feature.AttributeTypeFactory	(revision 29007)
+++ /applications/editors/josm/plugins/geotools/META-INF/services/org.geotools.feature.AttributeTypeFactory	(revision 29007)
@@ -0,0 +1,1 @@
+org.geotools.feature.DefaultAttributeTypeFactory
Index: /applications/editors/josm/plugins/geotools/META-INF/services/org.geotools.feature.FeatureCollections
===================================================================
--- /applications/editors/josm/plugins/geotools/META-INF/services/org.geotools.feature.FeatureCollections	(revision 29007)
+++ /applications/editors/josm/plugins/geotools/META-INF/services/org.geotools.feature.FeatureCollections	(revision 29007)
@@ -0,0 +1,1 @@
+org.geotools.feature.DefaultFeatureCollections
Index: /applications/editors/josm/plugins/geotools/META-INF/services/org.geotools.feature.FeatureTypeFactory
===================================================================
--- /applications/editors/josm/plugins/geotools/META-INF/services/org.geotools.feature.FeatureTypeFactory	(revision 29007)
+++ /applications/editors/josm/plugins/geotools/META-INF/services/org.geotools.feature.FeatureTypeFactory	(revision 29007)
@@ -0,0 +1,1 @@
+org.geotools.feature.DefaultFeatureTypeFactory
Index: /applications/editors/josm/plugins/geotools/META-INF/services/org.geotools.filter.FunctionFactory
===================================================================
--- /applications/editors/josm/plugins/geotools/META-INF/services/org.geotools.filter.FunctionFactory	(revision 29007)
+++ /applications/editors/josm/plugins/geotools/META-INF/services/org.geotools.filter.FunctionFactory	(revision 29007)
@@ -0,0 +1,1 @@
+org.geotools.filter.function.DefaultFunctionFactory
Index: /applications/editors/josm/plugins/geotools/META-INF/services/org.geotools.filter.expression.PropertyAccessorFactory
===================================================================
--- /applications/editors/josm/plugins/geotools/META-INF/services/org.geotools.filter.expression.PropertyAccessorFactory	(revision 29007)
+++ /applications/editors/josm/plugins/geotools/META-INF/services/org.geotools.filter.expression.PropertyAccessorFactory	(revision 29007)
@@ -0,0 +1,3 @@
+org.geotools.filter.expression.SimpleFeaturePropertyAccessorFactory
+org.geotools.filter.expression.ThisPropertyAccessorFactory
+org.geotools.filter.expression.DirectPropertyAccessorFactory
Index: /applications/editors/josm/plugins/geotools/META-INF/services/org.geotools.referencing.factory.gridshift.GridShiftLocator
===================================================================
--- /applications/editors/josm/plugins/geotools/META-INF/services/org.geotools.referencing.factory.gridshift.GridShiftLocator	(revision 29007)
+++ /applications/editors/josm/plugins/geotools/META-INF/services/org.geotools.referencing.factory.gridshift.GridShiftLocator	(revision 29007)
@@ -0,0 +1,1 @@
+org.geotools.referencing.factory.gridshift.ClasspathGridShiftLocator
Index: /applications/editors/josm/plugins/geotools/META-INF/services/org.geotools.referencing.operation.MathTransformProvider
===================================================================
--- /applications/editors/josm/plugins/geotools/META-INF/services/org.geotools.referencing.operation.MathTransformProvider	(revision 29007)
+++ /applications/editors/josm/plugins/geotools/META-INF/services/org.geotools.referencing.operation.MathTransformProvider	(revision 29007)
@@ -0,0 +1,51 @@
+org.geotools.referencing.operation.transform.LogarithmicTransform1D$Provider
+org.geotools.referencing.operation.transform.ExponentialTransform1D$Provider
+org.geotools.referencing.operation.transform.ProjectiveTransform$ProviderAffine
+org.geotools.referencing.operation.transform.ProjectiveTransform$ProviderLongitudeRotation
+org.geotools.referencing.operation.transform.GeocentricTranslation$Provider
+org.geotools.referencing.operation.transform.GeocentricTranslation$ProviderSevenParam
+org.geotools.referencing.operation.transform.GeocentricTranslation$ProviderFrameRotation
+org.geotools.referencing.operation.transform.GeocentricTransform$Provider
+org.geotools.referencing.operation.transform.GeocentricTransform$ProviderInverse
+org.geotools.referencing.operation.transform.MolodenskiTransform$Provider
+org.geotools.referencing.operation.transform.MolodenskiTransform$ProviderAbridged
+org.geotools.referencing.operation.transform.NADCONTransform$Provider
+org.geotools.referencing.operation.transform.NTv2Transform$Provider
+org.geotools.referencing.operation.transform.SimilarityTransformProvider
+org.geotools.referencing.operation.transform.WarpTransform2D$Provider
+org.geotools.referencing.operation.projection.EquidistantCylindrical$Provider
+org.geotools.referencing.operation.projection.EquidistantCylindrical$SphericalProvider
+org.geotools.referencing.operation.projection.PlateCarree$Provider
+org.geotools.referencing.operation.projection.Mercator1SP$Provider
+org.geotools.referencing.operation.projection.Mercator2SP$Provider
+org.geotools.referencing.operation.projection.MercatorPseudoProvider
+org.geotools.referencing.operation.projection.TransverseMercator$Provider
+org.geotools.referencing.operation.projection.TransverseMercator$Provider_SouthOrientated
+org.geotools.referencing.operation.projection.ObliqueMercator$Provider
+org.geotools.referencing.operation.projection.ObliqueMercator$Provider_TwoPoint
+org.geotools.referencing.operation.projection.HotineObliqueMercator$Provider
+org.geotools.referencing.operation.projection.HotineObliqueMercator$Provider_TwoPoint
+org.geotools.referencing.operation.projection.AlbersEqualArea$Provider
+org.geotools.referencing.operation.projection.LambertConformal1SP$Provider
+org.geotools.referencing.operation.projection.LambertConformal2SP$Provider
+org.geotools.referencing.operation.projection.LambertConformalBelgium$Provider
+org.geotools.referencing.operation.projection.LambertAzimuthalEqualArea$Provider
+org.geotools.referencing.operation.projection.Orthographic$Provider
+org.geotools.referencing.operation.projection.Stereographic$Provider
+org.geotools.referencing.operation.projection.ObliqueStereographic$Provider
+org.geotools.referencing.operation.projection.PolarStereographic$ProviderA
+org.geotools.referencing.operation.projection.PolarStereographic$ProviderB
+org.geotools.referencing.operation.projection.PolarStereographic$ProviderNorth
+org.geotools.referencing.operation.projection.PolarStereographic$ProviderSouth
+org.geotools.referencing.operation.projection.NewZealandMapGrid$Provider
+org.geotools.referencing.operation.projection.Krovak$Provider
+org.geotools.referencing.operation.projection.CassiniSoldner$Provider
+org.geotools.referencing.operation.projection.EquidistantConic$Provider
+org.geotools.referencing.operation.projection.Polyconic$Provider
+org.geotools.referencing.operation.projection.Robinson$Provider
+org.geotools.referencing.operation.projection.WinkelTripel$WinkelProvider
+org.geotools.referencing.operation.projection.WinkelTripel$AitoffProvider
+org.geotools.referencing.operation.projection.EckertIV$Provider
+org.geotools.referencing.operation.projection.Mollweide$MollweideProvider
+org.geotools.referencing.operation.projection.Mollweide$WagnerIVProvider
+org.geotools.referencing.operation.projection.WorldVanDerGrintenI$Provider
Index: /applications/editors/josm/plugins/geotools/META-INF/services/org.geotools.styling.StyleFactory
===================================================================
--- /applications/editors/josm/plugins/geotools/META-INF/services/org.geotools.styling.StyleFactory	(revision 29007)
+++ /applications/editors/josm/plugins/geotools/META-INF/services/org.geotools.styling.StyleFactory	(revision 29007)
@@ -0,0 +1,1 @@
+org.geotools.styling.StyleFactoryImpl
Index: /applications/editors/josm/plugins/geotools/META-INF/services/org.geotools.util.ConverterFactory
===================================================================
--- /applications/editors/josm/plugins/geotools/META-INF/services/org.geotools.util.ConverterFactory	(revision 29007)
+++ /applications/editors/josm/plugins/geotools/META-INF/services/org.geotools.util.ConverterFactory	(revision 29007)
@@ -0,0 +1,11 @@
+org.geotools.util.CommonsConverterFactory
+org.geotools.util.NumericConverterFactory
+org.geotools.util.GeometryConverterFactory
+org.geotools.util.GeometryTypeConverterFactory
+org.geotools.util.TemporalConverterFactory
+org.geotools.util.BooleanConverterFactory
+org.geotools.util.ColorConverterFactory
+org.geotools.util.CollectionConverterFactory
+org.geotools.util.CharsetConverterFactory
+org.geotools.util.UuidConverterFactory
+org.geotools.temporal.TemporalConverterFactory
Index: /applications/editors/josm/plugins/geotools/META-INF/services/org.geotools.xml.schema.Schema
===================================================================
--- /applications/editors/josm/plugins/geotools/META-INF/services/org.geotools.xml.schema.Schema	(revision 29007)
+++ /applications/editors/josm/plugins/geotools/META-INF/services/org.geotools.xml.schema.Schema	(revision 29007)
@@ -0,0 +1,3 @@
+org.geotools.xml.xLink.XLinkSchema
+org.geotools.xml.gml.GMLSchema
+org.geotools.xml.filter.FilterSchema
Index: /applications/editors/josm/plugins/geotools/META-INF/services/org.opengis.coverage.processing.Operation
===================================================================
--- /applications/editors/josm/plugins/geotools/META-INF/services/org.opengis.coverage.processing.Operation	(revision 29007)
+++ /applications/editors/josm/plugins/geotools/META-INF/services/org.opengis.coverage.processing.Operation	(revision 29007)
@@ -0,0 +1,27 @@
+org.geotools.coverage.processing.operation.Absolute
+org.geotools.coverage.processing.operation.AddConst
+org.geotools.coverage.processing.operation.Add
+org.geotools.coverage.processing.operation.Convolve
+org.geotools.coverage.processing.operation.Crop
+org.geotools.coverage.processing.operation.DivideByConst
+org.geotools.coverage.processing.operation.Exp
+org.geotools.coverage.processing.operation.FilteredSubsample
+org.geotools.coverage.processing.operation.GradientMagnitude
+org.geotools.coverage.processing.operation.Interpolate
+org.geotools.coverage.processing.operation.Invert
+org.geotools.coverage.processing.operation.Log
+org.geotools.coverage.processing.operation.MaxFilter
+org.geotools.coverage.processing.operation.MedianFilter
+org.geotools.coverage.processing.operation.MinFilter
+org.geotools.coverage.processing.operation.Multiply
+org.geotools.coverage.processing.operation.MultiplyConst
+org.geotools.coverage.processing.operation.Resample
+org.geotools.coverage.processing.operation.Rescale
+org.geotools.coverage.processing.operation.Scale
+org.geotools.coverage.processing.operation.SelectSampleDimension
+org.geotools.coverage.processing.operation.SubsampleAverage
+org.geotools.coverage.processing.operation.SubtractConst
+org.geotools.coverage.processing.operation.SubtractFromConst
+org.geotools.coverage.processing.operation.Extrema
+org.geotools.coverage.processing.operation.Histogram
+org.geotools.coverage.processing.operation.ZonalStats
Index: /applications/editors/josm/plugins/geotools/META-INF/services/org.opengis.feature.FeatureFactory
===================================================================
--- /applications/editors/josm/plugins/geotools/META-INF/services/org.opengis.feature.FeatureFactory	(revision 29007)
+++ /applications/editors/josm/plugins/geotools/META-INF/services/org.opengis.feature.FeatureFactory	(revision 29007)
@@ -0,0 +1,2 @@
+org.geotools.feature.LenientFeatureFactoryImpl
+org.geotools.feature.ValidatingFeatureFactoryImpl
Index: /applications/editors/josm/plugins/geotools/META-INF/services/org.opengis.filter.FilterFactory
===================================================================
--- /applications/editors/josm/plugins/geotools/META-INF/services/org.opengis.filter.FilterFactory	(revision 29007)
+++ /applications/editors/josm/plugins/geotools/META-INF/services/org.opengis.filter.FilterFactory	(revision 29007)
@@ -0,0 +1,1 @@
+org.geotools.filter.FilterFactoryImpl
Index: /applications/editors/josm/plugins/geotools/META-INF/services/org.opengis.filter.expression.Function
===================================================================
--- /applications/editors/josm/plugins/geotools/META-INF/services/org.opengis.filter.expression.Function	(revision 29007)
+++ /applications/editors/josm/plugins/geotools/META-INF/services/org.opengis.filter.expression.Function	(revision 29007)
@@ -0,0 +1,165 @@
+org.geotools.filter.AreaFunction
+org.geotools.filter.LengthFunction
+org.geotools.filter.function.CategorizeFunction
+org.geotools.filter.function.ClassifyFunction
+org.geotools.filter.function.EqualIntervalFunction
+org.geotools.filter.function.StandardDeviationFunction
+org.geotools.filter.function.QuantileFunction
+org.geotools.filter.function.UniqueIntervalFunction
+org.geotools.filter.function.Collection_AverageFunction
+org.geotools.filter.function.Collection_BoundsFunction
+org.geotools.filter.function.Collection_CountFunction
+org.geotools.filter.function.Collection_MinFunction
+org.geotools.filter.function.Collection_MedianFunction
+org.geotools.filter.function.Collection_MaxFunction
+org.geotools.filter.function.Collection_SumFunction
+org.geotools.filter.function.Collection_UniqueFunction
+org.geotools.filter.function.EnvFunction
+org.geotools.filter.function.FilterFunction_contains
+org.geotools.filter.function.FilterFunction_isEmpty
+org.geotools.filter.function.FilterFunction_parseDouble
+org.geotools.filter.function.FilterFunction_parseInt
+org.geotools.filter.function.FilterFunction_parseLong
+org.geotools.filter.function.FilterFunction_intersects
+org.geotools.filter.function.FilterFunction_isClosed
+org.geotools.filter.function.FilterFunction_geomFromWKT
+org.geotools.filter.function.FilterFunction_setCRS
+org.geotools.filter.function.FilterFunction_toWKT
+org.geotools.filter.function.FilterFunction_geomLength
+org.geotools.filter.function.FilterFunction_isValid
+org.geotools.filter.function.FilterFunction_geometryType
+org.geotools.filter.function.FilterFunction_numPoints
+org.geotools.filter.function.FilterFunction_isSimple
+org.geotools.filter.function.FilterFunction_distance
+org.geotools.filter.function.FilterFunction_isWithinDistance
+org.geotools.filter.function.FilterFunction_area
+org.geotools.filter.function.FilterFunction_centroid
+org.geotools.filter.function.FilterFunction_interiorPoint
+org.geotools.filter.function.FilterFunction_dimension
+org.geotools.filter.function.FilterFunction_boundary
+org.geotools.filter.function.FilterFunction_boundaryDimension
+org.geotools.filter.function.FilterFunction_envelope
+org.geotools.filter.function.FilterFunction_disjoint
+org.geotools.filter.function.FilterFunction_touches
+org.geotools.filter.function.FilterFunction_crosses
+org.geotools.filter.function.FilterFunction_within
+org.geotools.filter.function.FilterFunction_overlaps
+org.geotools.filter.function.FilterFunction_relatePattern
+org.geotools.filter.function.FilterFunction_relate
+org.geotools.filter.function.FilterFunction_bufferWithSegments
+org.geotools.filter.function.FilterFunction_buffer
+org.geotools.filter.function.FilterFunction_convexHull
+org.geotools.filter.function.FilterFunction_intersection
+org.geotools.filter.function.FilterFunction_union
+org.geotools.filter.function.FilterFunction_difference
+org.geotools.filter.function.FilterFunction_symDifference
+org.geotools.filter.function.FilterFunction_equalsExactTolerance
+org.geotools.filter.function.FilterFunction_equalsExact
+org.geotools.filter.function.FilterFunction_numGeometries
+org.geotools.filter.function.FilterFunction_getGeometryN
+org.geotools.filter.function.FilterFunction_getX
+org.geotools.filter.function.FilterFunction_getY
+org.geotools.filter.function.FilterFunction_getZ
+org.geotools.filter.function.FilterFunction_pointN
+org.geotools.filter.function.FilterFunction_startAngle
+org.geotools.filter.function.FilterFunction_startPoint
+org.geotools.filter.function.FilterFunction_endPoint
+org.geotools.filter.function.FilterFunction_endAngle
+org.geotools.filter.function.FilterFunction_isRing
+org.geotools.filter.function.FilterFunction_exteriorRing
+org.geotools.filter.function.FilterFunction_numInteriorRing
+org.geotools.filter.function.FilterFunction_minimumCircle
+org.geotools.filter.function.FilterFunction_minimumRectangle
+org.geotools.filter.function.FilterFunction_interiorRingN
+org.geotools.filter.function.FilterFunction_octagonalEnvelope
+org.geotools.filter.function.FilterFunction_minimumDiameter
+org.geotools.filter.function.FilterFunction_strConcat
+org.geotools.filter.function.FilterFunction_strEndsWith
+org.geotools.filter.function.FilterFunction_strStartsWith
+org.geotools.filter.function.FilterFunction_strCapitalize
+org.geotools.filter.function.FilterFunction_strEqualsIgnoreCase
+org.geotools.filter.function.FilterFunction_strIndexOf
+org.geotools.filter.function.FilterFunction_strLastIndexOf
+org.geotools.filter.function.FilterFunction_strLength
+org.geotools.filter.function.FilterFunction_strToLowerCase
+org.geotools.filter.function.FilterFunction_strToUpperCase
+org.geotools.filter.function.FilterFunction_strMatches
+org.geotools.filter.function.FilterFunction_strPosition
+org.geotools.filter.function.FilterFunction_strReplace
+org.geotools.filter.function.FilterFunction_strSubstring
+org.geotools.filter.function.FilterFunction_strSubstringStart
+org.geotools.filter.function.FilterFunction_strTrim
+org.geotools.filter.function.FilterFunction_strTrim2
+org.geotools.filter.function.FilterFunction_parseBoolean
+org.geotools.filter.function.FilterFunction_roundDouble
+org.geotools.filter.function.FilterFunction_int2ddouble
+org.geotools.filter.function.FilterFunction_int2bbool
+org.geotools.filter.function.FilterFunction_double2bool
+org.geotools.filter.function.FilterFunction_if_then_else
+org.geotools.filter.function.FilterFunction_equalTo
+org.geotools.filter.function.FilterFunction_notEqualTo
+org.geotools.filter.function.FilterFunction_lessThan
+org.geotools.filter.function.FilterFunction_greaterThan
+org.geotools.filter.function.FilterFunction_greaterEqualThan
+org.geotools.filter.function.FilterFunction_lessEqualThan
+org.geotools.filter.function.FilterFunction_isLike
+org.geotools.filter.function.FilterFunction_isNull
+org.geotools.filter.function.FilterFunction_between
+org.geotools.filter.function.FilterFunction_not
+org.geotools.filter.function.FilterFunction_in2
+org.geotools.filter.function.FilterFunction_in3
+org.geotools.filter.function.FilterFunction_in4
+org.geotools.filter.function.FilterFunction_in5
+org.geotools.filter.function.FilterFunction_in6
+org.geotools.filter.function.FilterFunction_in7
+org.geotools.filter.function.FilterFunction_in8
+org.geotools.filter.function.FilterFunction_in9
+org.geotools.filter.function.FilterFunction_in10
+org.geotools.filter.function.FilterFunction_dateParse
+org.geotools.filter.function.FilterFunction_dateFormat
+org.geotools.filter.function.FilterFunction_numberFormat
+org.geotools.filter.function.FilterFunction_numberFormat2
+org.geotools.filter.function.FilterFunction_Convert
+org.geotools.filter.function.FilterFunction_vertices
+org.geotools.filter.function.FilterFunction_offset
+org.geotools.filter.function.FilterFunction_isometric
+org.geotools.filter.function.FilterFunction_property
+org.geotools.filter.function.IDFunction
+org.geotools.filter.function.InterpolateFunction
+org.geotools.filter.function.RecodeFunction
+org.geotools.filter.function.math.FilterFunction_IEEEremainder
+org.geotools.filter.function.math.FilterFunction_abs
+org.geotools.filter.function.math.FilterFunction_abs_2
+org.geotools.filter.function.math.FilterFunction_abs_3
+org.geotools.filter.function.math.FilterFunction_abs_4
+org.geotools.filter.function.math.FilterFunction_acos
+org.geotools.filter.function.math.FilterFunction_asin
+org.geotools.filter.function.math.FilterFunction_atan
+org.geotools.filter.function.math.FilterFunction_atan2
+org.geotools.filter.function.math.FilterFunction_ceil
+org.geotools.filter.function.math.FilterFunction_cos
+org.geotools.filter.function.math.FilterFunction_exp
+org.geotools.filter.function.math.FilterFunction_floor
+org.geotools.filter.function.math.FilterFunction_log
+org.geotools.filter.function.math.FilterFunction_max
+org.geotools.filter.function.math.FilterFunction_max_2
+org.geotools.filter.function.math.FilterFunction_max_3
+org.geotools.filter.function.math.FilterFunction_max_4
+org.geotools.filter.function.math.FilterFunction_min
+org.geotools.filter.function.math.FilterFunction_min_2
+org.geotools.filter.function.math.FilterFunction_min_3
+org.geotools.filter.function.math.FilterFunction_min_4
+org.geotools.filter.function.math.FilterFunction_pow
+org.geotools.filter.function.math.FilterFunction_random
+org.geotools.filter.function.math.FilterFunction_rint
+org.geotools.filter.function.math.FilterFunction_round
+org.geotools.filter.function.math.FilterFunction_round_2
+org.geotools.filter.function.math.FilterFunction_sin
+org.geotools.filter.function.math.FilterFunction_sqrt
+org.geotools.filter.function.math.FilterFunction_tan
+org.geotools.filter.function.math.FilterFunction_toDegrees
+org.geotools.filter.function.math.FilterFunction_toRadians
+org.geotools.filter.function.math.ModuloFunction
+org.geotools.filter.function.math.PiFunction
+org.geotools.filter.function.string.ConcatenateFunction
+org.geotools.filter.function.JenksNaturalBreaksFunction
Index: /applications/editors/josm/plugins/geotools/META-INF/services/org.opengis.referencing.crs.CRSAuthorityFactory
===================================================================
--- /applications/editors/josm/plugins/geotools/META-INF/services/org.opengis.referencing.crs.CRSAuthorityFactory	(revision 29007)
+++ /applications/editors/josm/plugins/geotools/META-INF/services/org.opengis.referencing.crs.CRSAuthorityFactory	(revision 29007)
@@ -0,0 +1,27 @@
+#############################
+# FROM gt-referencing-8.3.jar
+#############################
+org.geotools.referencing.factory.epsg.DefaultFactory
+org.geotools.referencing.factory.epsg.FactoryUsingWKT
+org.geotools.referencing.factory.epsg.LongitudeFirstFactory
+org.geotools.referencing.factory.epsg.CartesianAuthorityFactory
+org.geotools.referencing.factory.wms.AutoCRSFactory
+org.geotools.referencing.factory.wms.WebCRSFactory
+org.geotools.referencing.factory.URN_AuthorityFactory
+org.geotools.referencing.factory.HTTP_AuthorityFactory
+org.geotools.referencing.factory.HTTP_URI_AuthorityFactory
+# pending review
+org.geotools.referencing.factory.epsg.LongitudeFirstEpsgDecorator
+
+###########################
+# FROM gt-epsg-hsql-8.3.jar
+###########################
+org.geotools.referencing.factory.epsg.ThreadedHsqlEpsgFactory
+# pending review
+# org.geotools.referencing.factory.epsg.HsqlDialectEpsgMediator
+
+################################
+# FROM gt-epsg-extension-8.3.jar
+################################
+org.geotools.referencing.factory.epsg.UnnamedExtension
+org.geotools.referencing.factory.epsg.EsriExtension
Index: /applications/editors/josm/plugins/geotools/META-INF/services/org.opengis.referencing.crs.CRSFactory
===================================================================
--- /applications/editors/josm/plugins/geotools/META-INF/services/org.opengis.referencing.crs.CRSFactory	(revision 29007)
+++ /applications/editors/josm/plugins/geotools/META-INF/services/org.opengis.referencing.crs.CRSFactory	(revision 29007)
@@ -0,0 +1,1 @@
+org.geotools.referencing.factory.ReferencingObjectFactory
Index: /applications/editors/josm/plugins/geotools/META-INF/services/org.opengis.referencing.cs.CSAuthorityFactory
===================================================================
--- /applications/editors/josm/plugins/geotools/META-INF/services/org.opengis.referencing.cs.CSAuthorityFactory	(revision 29007)
+++ /applications/editors/josm/plugins/geotools/META-INF/services/org.opengis.referencing.cs.CSAuthorityFactory	(revision 29007)
@@ -0,0 +1,17 @@
+#############################
+# FROM gt-referencing-8.3.jar
+#############################
+org.geotools.referencing.factory.epsg.DefaultFactory
+org.geotools.referencing.factory.epsg.LongitudeFirstFactory
+org.geotools.referencing.factory.URN_AuthorityFactory
+org.geotools.referencing.factory.HTTP_AuthorityFactory
+org.geotools.referencing.factory.HTTP_URI_AuthorityFactory
+# pending review
+org.geotools.referencing.factory.epsg.LongitudeFirstEpsgDecorator
+
+###########################
+# FROM gt-epsg-hsql-8.3.jar
+###########################
+org.geotools.referencing.factory.epsg.ThreadedHsqlEpsgFactory
+# pending review
+# org.geotools.referencing.factory.epsg.HsqlDialectEpsgMediator
Index: /applications/editors/josm/plugins/geotools/META-INF/services/org.opengis.referencing.cs.CSFactory
===================================================================
--- /applications/editors/josm/plugins/geotools/META-INF/services/org.opengis.referencing.cs.CSFactory	(revision 29007)
+++ /applications/editors/josm/plugins/geotools/META-INF/services/org.opengis.referencing.cs.CSFactory	(revision 29007)
@@ -0,0 +1,1 @@
+org.geotools.referencing.factory.ReferencingObjectFactory
Index: /applications/editors/josm/plugins/geotools/META-INF/services/org.opengis.referencing.datum.DatumAuthorityFactory
===================================================================
--- /applications/editors/josm/plugins/geotools/META-INF/services/org.opengis.referencing.datum.DatumAuthorityFactory	(revision 29007)
+++ /applications/editors/josm/plugins/geotools/META-INF/services/org.opengis.referencing.datum.DatumAuthorityFactory	(revision 29007)
@@ -0,0 +1,17 @@
+#############################
+# FROM gt-referencing-8.3.jar
+#############################
+org.geotools.referencing.factory.epsg.DefaultFactory
+org.geotools.referencing.factory.epsg.LongitudeFirstFactory
+org.geotools.referencing.factory.URN_AuthorityFactory
+org.geotools.referencing.factory.HTTP_AuthorityFactory
+org.geotools.referencing.factory.HTTP_URI_AuthorityFactory
+# pending review
+org.geotools.referencing.factory.epsg.LongitudeFirstEpsgDecorator
+
+###########################
+# FROM gt-epsg-hsql-8.3.jar
+###########################
+org.geotools.referencing.factory.epsg.ThreadedHsqlEpsgFactory
+# pending review
+# org.geotools.referencing.factory.epsg.HsqlDialectEpsgMediator
Index: /applications/editors/josm/plugins/geotools/META-INF/services/org.opengis.referencing.datum.DatumFactory
===================================================================
--- /applications/editors/josm/plugins/geotools/META-INF/services/org.opengis.referencing.datum.DatumFactory	(revision 29007)
+++ /applications/editors/josm/plugins/geotools/META-INF/services/org.opengis.referencing.datum.DatumFactory	(revision 29007)
@@ -0,0 +1,2 @@
+org.geotools.referencing.factory.ReferencingObjectFactory
+org.geotools.referencing.factory.DatumAliases
Index: /applications/editors/josm/plugins/geotools/META-INF/services/org.opengis.referencing.operation.CoordinateOperationAuthorityFactory
===================================================================
--- /applications/editors/josm/plugins/geotools/META-INF/services/org.opengis.referencing.operation.CoordinateOperationAuthorityFactory	(revision 29007)
+++ /applications/editors/josm/plugins/geotools/META-INF/services/org.opengis.referencing.operation.CoordinateOperationAuthorityFactory	(revision 29007)
@@ -0,0 +1,18 @@
+#############################
+# FROM gt-referencing-8.3.jar
+#############################
+org.geotools.referencing.factory.epsg.CoordinateOperationFactoryUsingWKT
+org.geotools.referencing.factory.epsg.DefaultFactory
+org.geotools.referencing.factory.epsg.LongitudeFirstFactory
+org.geotools.referencing.factory.URN_AuthorityFactory
+org.geotools.referencing.factory.HTTP_AuthorityFactory
+org.geotools.referencing.factory.HTTP_URI_AuthorityFactory
+# pending review
+org.geotools.referencing.factory.epsg.LongitudeFirstEpsgDecorator
+
+###########################
+# FROM gt-epsg-hsql-8.3.jar
+###########################
+org.geotools.referencing.factory.epsg.ThreadedHsqlEpsgFactory
+# pending review
+# org.geotools.referencing.factory.epsg.HsqlDialectEpsgMediator
Index: /applications/editors/josm/plugins/geotools/META-INF/services/org.opengis.referencing.operation.CoordinateOperationFactory
===================================================================
--- /applications/editors/josm/plugins/geotools/META-INF/services/org.opengis.referencing.operation.CoordinateOperationFactory	(revision 29007)
+++ /applications/editors/josm/plugins/geotools/META-INF/services/org.opengis.referencing.operation.CoordinateOperationFactory	(revision 29007)
@@ -0,0 +1,3 @@
+org.geotools.referencing.operation.DefaultCoordinateOperationFactory
+org.geotools.referencing.operation.AuthorityBackedFactory
+org.geotools.referencing.operation.BufferedCoordinateOperationFactory
Index: /applications/editors/josm/plugins/geotools/META-INF/services/org.opengis.referencing.operation.MathTransformFactory
===================================================================
--- /applications/editors/josm/plugins/geotools/META-INF/services/org.opengis.referencing.operation.MathTransformFactory	(revision 29007)
+++ /applications/editors/josm/plugins/geotools/META-INF/services/org.opengis.referencing.operation.MathTransformFactory	(revision 29007)
@@ -0,0 +1,1 @@
+org.geotools.referencing.operation.DefaultMathTransformFactory
Index: /applications/editors/josm/plugins/geotools/build.xml
===================================================================
--- /applications/editors/josm/plugins/geotools/build.xml	(revision 29006)
+++ /applications/editors/josm/plugins/geotools/build.xml	(revision 29007)
@@ -24,18 +24,28 @@
     -->
     <target name="setup-dist">
-        <unjar dest="${plugin.build.dir}">
-            <fileset dir="lib" includes="*.jar" />
-        </unjar>
-    	<delete includeemptydirs="true">
-    		<fileset dir="${plugin.build.dir}" >
-    			<include name="*.class" />
-                <include name="*.html" />
-    		</fileset>
-            <fileset dir="${plugin.build.dir}/META-INF" includes="**/*" excludes="**/*.jai" />
-    	</delete>
         <copy todir="${plugin.build.dir}/META-INF">
-            <fileset dir="resources/META-INF"/>
+            <fileset dir="META-INF"/>
         </copy>
         <antcall target="setup-dist-default" />
     </target>
+    	
+    <!--
+    **********************************************************
+    ** post-dist - removes files from the generated jar
+    **********************************************************
+    -->
+    <target name="post-dist">
+    	<move file="${plugin.jar}" todir="${plugin.build.dir}" />
+    	<jar destfile="${plugin.jar}">
+    		<zipfileset src="${plugin.build.dir}/${ant.project.name}.jar">
+                <exclude name="*.class"/>
+    			<exclude name="*.html"/>
+                <exclude name="META-INF/*.txt"/>
+                <exclude name="META-INF/*.xml"/>
+                <exclude name="META-INF/maven/**/*" />
+                <exclude name="javax/*.txt"/>
+    		</zipfileset>
+    	</jar>
+    	<delete file="${plugin.build.dir}/${ant.project.name}.jar" />
+    </target>
 </project>