Index: trunk/.checkstyle
===================================================================
--- trunk/.checkstyle	(revision 8527)
+++ trunk/.checkstyle	(revision 8528)
@@ -15,5 +15,4 @@
     <filter-data value="src/org/jdesktop"/>
     <filter-data value="src/org/openstreetmap/gui"/>
-    <filter-data value="src/org/openstreetmap/josm/data/imagery/types"/>
     <filter-data value="src/org/openstreetmap/josm/gui/mappaint/mapcss/parsergen"/>
     <filter-data value="src/org/w3"/>
Index: trunk/build.xml
===================================================================
--- trunk/build.xml	(revision 8527)
+++ trunk/build.xml	(revision 8528)
@@ -15,5 +15,4 @@
     <property name="javacc.home" location="tools"/>
     <property name="mapcss.dir" location="${src.dir}/org/openstreetmap/josm/gui/mappaint/mapcss"/>
-    <property name="imagerytypes.dir" location="${src.dir}/org/openstreetmap/josm/data/imagery/types"/>
     <!-- build parameter: compression level (ant -Dclevel=N)
              N ranges from 0 (no compression) to 9 (maximum compression)
@@ -291,5 +290,4 @@
         <delete dir="dist"/>
         <delete dir="${mapcss.dir}/parsergen"/>
-        <delete dir="${imagerytypes.dir}"/>
     </target>
     <path id="test.classpath">
@@ -578,5 +576,5 @@
         <checkstyle config="tools/checkstyle/josm_checks.xml">
             <fileset dir="${basedir}/src/org/openstreetmap/josm" includes="**/*.java" 
-            	excludes="data/imagery/types/*.java,gui/mappaint/mapcss/parsergen/*.java"/>
+            	excludes="gui/mappaint/mapcss/parsergen/*.java"/>
             <fileset dir="${basedir}/test" includes="**/*.java"/>
             <formatter type="xml" toFile="checkstyle-josm.xml"/>
Index: trunk/netbeans/nbbuild.xml
===================================================================
--- trunk/netbeans/nbbuild.xml	(revision 8527)
+++ trunk/netbeans/nbbuild.xml	(revision 8528)
@@ -13,5 +13,4 @@
     <property name="javacc.home" location="../tools"/>
     <property name="mapcss.dir" location="../src/org/openstreetmap/josm/gui/mappaint/mapcss"/>
-    <property name="imagerytypes.dir" location="${src.dir}/org/openstreetmap/josm/data/imagery/types"/>
     <!-- For Windows-specific stuff -->
     <condition property="isWindows">
@@ -109,7 +108,4 @@
             <srcfiles dir="${mapcss.dir}" includes="MapCSSParser.jj"/>
         </uptodate>
-        <uptodate property="jaxb.notRequired" targetfile="${src.dir}/org/openstreetmap/josm/data/imagery/types/package-info.java" >
-            <srcfiles dir="../data_nodist" includes="wms-cache.xsd"/>
-        </uptodate>
     </target>	
     <target name="javacc" depends="check-javacc" unless="javacc.notRequired">