Index: trunk/netbeans/nbbuild.xml
===================================================================
--- trunk/netbeans/nbbuild.xml	(revision 3963)
+++ trunk/netbeans/nbbuild.xml	(revision 4545)
@@ -10,4 +10,8 @@
 <project name="josm" default="default" basedir=".">
     <description>Builds, tests, and runs the project josm.</description>
+
+    <property name="javacc.home" location="../tools"/>
+    <property name="mapcss.dir" location="../src/org/openstreetmap/josm/gui/mappaint/mapcss"/>
+
     <import file="nbproject/build-impl.xml"/>
     <!--
@@ -95,4 +99,15 @@
 </echo>
 	</target>
-    
+
+    <target name="-pre-compile">
+        <mkdir dir="${mapcss.dir}/parsergen"/>
+        <exec append="false" executable="java" failifexecutionfails="true">
+            <arg value="-cp"/>
+            <arg value="${javacc.home}/javacc.jar"/>
+            <arg value="javacc"/>
+            <arg value="-OUTPUT_DIRECTORY=${mapcss.dir}/parsergen"/>
+            <arg value="${mapcss.dir}/MapCSSParser.jj"/>
+        </exec>
+<!--        <javacc target="${mapcss.dir}/MapCSSParser.jj" javacchome="${javacc.home}" outputdirectory="${mapcss.dir}/parsergen"/>-->
+    </target>    
 </project>
Index: trunk/netbeans/nbproject/genfiles.properties
===================================================================
--- trunk/netbeans/nbproject/genfiles.properties	(revision 3963)
+++ trunk/netbeans/nbproject/genfiles.properties	(revision 4545)
@@ -5,4 +5,4 @@
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
 nbproject/build-impl.xml.data.CRC32=2a1d7942
-nbproject/build-impl.xml.script.CRC32=fd83ec1f
-nbproject/build-impl.xml.stylesheet.CRC32=f33e10ff@1.38.2.45
+nbproject/build-impl.xml.script.CRC32=ba6a6ad8
+nbproject/build-impl.xml.stylesheet.CRC32=0c01fd8e@1.43.1.45
Index: trunk/netbeans/nbproject/project.properties
===================================================================
--- trunk/netbeans/nbproject/project.properties	(revision 3963)
+++ trunk/netbeans/nbproject/project.properties	(revision 4545)
@@ -31,13 +31,9 @@
 file.reference.core-src=../src
 file.reference.core=..
-file.reference.metadata-extractor-2.3.1-nosun.jar=../lib/metadata-extractor-2.3.1-nosun.jar
-file.reference.signpost-core-1.2.1.1.jar=../lib/signpost-core-1.2.1.1.jar
-includes=org/**/*.java,images/**,org/openstreetmap/gui/**/*.png,data/**,styles/**,LICENSE,README,CONTRIBUTION,gpl-2.0.txt,gpl-3.0.txt
+includes=org/**/*.java,oauth/**/*.java,com/**/*.java,images/**,org/openstreetmap/gui/**/*.png,data/**,styles/**,LICENSE,README,CONTRIBUTION,gpl-2.0.txt,gpl-3.0.txt
 jar.archive.disabled=${jnlp.enabled}
 jar.compress=false
 jar.index=${jnlp.enabled}
-javac.classpath=\
-    ${file.reference.metadata-extractor-2.3.1-nosun.jar}:\
-    ${file.reference.signpost-core-1.2.1.1.jar}
+javac.classpath=
 # Space-separated list of extra javac options
 javac.compilerargs=-Xlint:unchecked
@@ -77,4 +73,5 @@
 manifest.file=manifest.mf
 meta.inf.dir=${src.dir}/META-INF
+mkdist.disabled=false
 platform.active=default_platform
 run.classpath=\