Index: applications/editors/josm/plugins/build.xml
===================================================================
--- applications/editors/josm/plugins/build.xml	(revision 9940)
+++ applications/editors/josm/plugins/build.xml	(revision 9948)
@@ -24,5 +24,7 @@
     <ant	dir="osmarender"	antfile="build.xml"	target="dist"/>
     <ant	dir="plastic_laf"	antfile="build.xml"	target="dist"/>
+    <ant	dir="pluginmanager"	antfile="build.xml"	target="dist"/> 
     <ant	dir="slippymap"		antfile="build.xml"	target="dist"/>
+    <ant	dir="tagging-preset-tester"	antfile="build.xml"	target="dist"/>
     <ant	dir="utilsplugin"	antfile="build.xml"	target="dist"/>
     <ant	dir="validator"		antfile="build.xml"	target="dist"/>
@@ -34,7 +36,5 @@
     <ant	dir="grid"		antfile="build.xml"	target="dist"/>
     <ant	dir="navigator"		antfile="build.xml"	target="dist"/>
-    <ant	dir="pluginmanager"	antfile="build.xml"	target="dist"/> 
     <ant	dir="surveyor"		antfile="build.xml"     target="dist"/>
-    <ant	dir="tagging-preset-tester"	antfile="build.xml"	target="dist"/>
     <ant	dir="waypoints"		antfile="build.xml"	target="dist"/>
   </target>
Index: applications/editors/josm/plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginHelper.java
===================================================================
--- applications/editors/josm/plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginHelper.java	(revision 9940)
+++ applications/editors/josm/plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginHelper.java	(revision 9948)
@@ -32,6 +32,6 @@
         registerMenu("edit", Main.main.menu.editMenu);
         registerMenu("tools", Main.main.menu.toolsMenu);
-        registerMenu("connection", Main.main.menu.connectionMenu);
-        registerMenu("layer", Main.main.menu.layerMenu);
+//        registerMenu("connection", Main.main.menu.connectionMenu);
+//        registerMenu("layer", Main.main.menu.layerMenu);
         registerMenu("help", Main.main.menu.helpMenu);
         
Index: applications/editors/josm/plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/SiteDescription.java
===================================================================
--- applications/editors/josm/plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/SiteDescription.java	(revision 9940)
+++ applications/editors/josm/plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/SiteDescription.java	(revision 9948)
@@ -13,5 +13,10 @@
 import java.util.List;
 
+import javax.xml.parsers.SAXParserFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
 import org.openstreetmap.josm.plugins.PluginInformation;
+
+import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
@@ -88,12 +93,15 @@
 //            parser.setVariableHelper(varHelper);
             parser.setVariableHelper(PluginHelper.getInstance().getVariableHelper());
-            parser.parse(in);
+            SAXParserFactory.newInstance().newSAXParser().parse(new InputSource(in), parser);
             //System.out.println("site describes plugins: " + plugins);
         } catch (SAXException e) {
             e.printStackTrace();
-        } finally {        
+        } catch (ParserConfigurationException e1) {
+            e1.printStackTrace(); // broken SAXException chaining
+        }
+        finally {
             in.close();
         }
-        
+
         // check if the plugins are already installed:
         PluginHelper helper = PluginHelper.getInstance();
Index: applications/editors/josm/plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/SiteDescriptionParser.java
===================================================================
--- applications/editors/josm/plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/SiteDescriptionParser.java	(revision 9940)
+++ applications/editors/josm/plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/SiteDescriptionParser.java	(revision 9948)
@@ -12,6 +12,5 @@
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
-
-import uk.co.wilson.xml.MinML2;
+import org.xml.sax.helpers.DefaultHandler;
 
 /**
@@ -19,5 +18,5 @@
  *
  */
-public class SiteDescriptionParser extends MinML2 {
+public class SiteDescriptionParser extends DefaultHandler {
     private SiteDescription siteDescription;
     private PluginDescription pluginDescription;
Index: applications/editors/josm/plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java
===================================================================
--- applications/editors/josm/plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java	(revision 9940)
+++ applications/editors/josm/plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java	(revision 9948)
@@ -8,4 +8,6 @@
 import java.io.InputStream;
 import java.net.URL;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.Vector;
 
@@ -19,4 +21,5 @@
 import javax.swing.JPanel;
 
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.tagging.TaggingCellRenderer;
 import org.openstreetmap.josm.gui.tagging.TaggingPreset;
@@ -64,5 +67,6 @@
 		if (preset == null)
 			return;
-		JPanel p = preset.createPanel();
+		Collection<OsmPrimitive> x = Collections.emptySet();
+		JPanel p = preset.createPanel(x);
 		p.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
 		if (p != null)