Index: trunk/netbeans/nbproject/project.properties
===================================================================
--- trunk/netbeans/nbproject/project.properties	(revision 8277)
+++ trunk/netbeans/nbproject/project.properties	(revision 9765)
@@ -1,3 +1,3 @@
-annotation.processing.enabled=false
+annotation.processing.enabled=true
 annotation.processing.enabled.in.editor=false
 annotation.processing.processors.list=
@@ -24,4 +24,6 @@
 debug.test.classpath=\
     ${run.test.classpath}
+# Files in build.classes.dir which should be excluded from distribution jar
+dist.archive.excludes=
 # This directory is removed when the project is cleaned:
 dist.dir=dist
@@ -29,15 +31,31 @@
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
-excludes=org/apache/commons/compress/compressors/CompressorStreamFactory.java,org/apache/commons/jcs/admin/servlet/**,org/apache/commons/jcs/auxiliary/disk/jdbc/**,org/apache/commons/jcs/auxiliary/remote/http/**,org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheStartupServlet.java,org/apache/commons/jcs/utils/servlet/**,org/apache/commons/logging/impl/AvalonLogger.java,org/apache/commons/logging/impl/Jdk13LumberjackLogger.java,org/apache/commons/logging/impl/Log4JLogger.java,org/apache/commons/logging/impl/LogKitLogger.java,org/apache/commons/logging/impl/ServletContextCleaner.java
+excludes=org/apache/commons/compress/compressors/lzma/**,org/apache/commons/compress/compressors/xz/**,org/apache/commons/compress/compressors/CompressorStreamFactory.java,org/apache/commons/compress/compressors/deflate/**,org/apache/commons/compress/compressors/gzip/**,org/apache/commons/compress/compressors/lzw/**,org/apache/commons/compress/compressors/pack200/**,org/apache/commons/compress/compressors/snappy/**,org/apache/commons/compress/compressors/z/**,org/apache/commons/jcs/admin/servlet/**,org/apache/commons/jcs/auxiliary/disk/jdbc/**,org/apache/commons/jcs/auxiliary/remote/http/**,org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheStartupServlet.java,org/apache/commons/jcs/utils/servlet/**,org/apache/commons/logging/impl/AvalonLogger.java,org/apache/commons/logging/impl/Jdk13LumberjackLogger.java,org/apache/commons/logging/impl/Log4JLogger.java,org/apache/commons/logging/impl/LogKitLogger.java,org/apache/commons/logging/impl/ServletContextCleaner.java,org/openstreetmap/gui/jmapviewer/Demo.java
+file.reference.commons-collections-3.2.jar=../test/lib/unitils-core/commons-collections-3.2.jar
+file.reference.commons-lang-2.3.jar=../test/lib/unitils-core/commons-lang-2.3.jar
+file.reference.commons-logging-1.1.jar=../test/lib/unitils-core/commons-logging-1.1.jar
 file.reference.core-src=../src
-file.reference.core=..
+file.reference.debug-1.0.jar=../test/lib/fest/debug-1.0.jar
+file.reference.equalsverifier-1.7.6.jar=../test/lib/equalsverifier-1.7.6.jar
+file.reference.fest-assert-1.0.jar=../test/lib/fest/fest-assert-1.0.jar
+file.reference.fest-reflect-1.1.jar=../test/lib/fest/fest-reflect-1.1.jar
+file.reference.fest-swing-1.1.jar=../test/lib/fest/fest-swing-1.1.jar
+file.reference.fest-util-1.0.jar=../test/lib/fest/fest-util-1.0.jar
+file.reference.findbugs.jar=../tools/findbugs/findbugs.jar
+file.reference.hamcrest-core-1.3.jar=../test/lib/junit/hamcrest-core-1.3.jar
+file.reference.jcip-annotations-1.0.jar=../test/lib/fest/jcip-annotations-1.0.jar
+file.reference.jfcunit.jar=../test/lib/jfcunit.jar
+file.reference.junit-4.12.jar=../test/lib/junit/junit-4.12.jar
+file.reference.MRJToolkitStubs-1.0.jar=../test/lib/fest/MRJToolkitStubs-1.0.jar
+file.reference.ognl-2.6.9.jar=../test/lib/unitils-core/ognl-2.6.9.jar
+file.reference.test-functional=../test/functional
+file.reference.test-performance=../test/performance
 file.reference.test-unit=../test/unit
-includes=org/apache/commons/compress/compressors/*.java,org/apache/commons/compress/compressors/bzip2/*.java,org/apache/commons/codec/**/*.java,org/glassfish/**/*.java,org/jdesktop/**/*.java,org/openstreetmap/**/*.java,org/w3/**/*.java,gnu/**/*.java,javax/**/*.java,oauth/**/*.java,com/**/*.java,org/apache/commons/logging/**/*.java,org/apache/commons/jcs/**/*.java,images/**,org/openstreetmap/gui/**/*.png,data/**,styles/**,LICENSE,README,CONTRIBUTION,gpl-2.0.txt,gpl-3.0.txt
-jar.archive.disabled=${jnlp.enabled}
+file.reference.unitils-core-3.4.2.jar=../test/lib/unitils-core/unitils-core-3.4.2.jar
+includes=**/*.java
 jar.compress=false
-jar.index=${jnlp.enabled}
 javac.classpath=
 # Space-separated list of extra javac options
-javac.compilerargs=-Xlint:unchecked -Xlint:cast -Xlint:dep-ann -Xlint:divzero -Xlint:empty -Xlint:finally -Xlint:overrides -Xlint:static -Xlint:try  -Xlint:deprecation  
+javac.compilerargs=-Xlint:unchecked -Xlint:cast -Xlint:dep-ann -Xlint:divzero -Xlint:empty -Xlint:finally -Xlint:overrides -Xlint:static -Xlint:try  -Xlint:deprecation
 javac.deprecation=true
 javac.processorpath=\
@@ -48,6 +66,21 @@
     ${javac.classpath}:\
     ${build.classes.dir}:\
-    ${libs.junit.classpath}:\
-    ${libs.junit_4.classpath}
+    ${file.reference.junit-4.12.jar}:\
+    ${file.reference.equalsverifier-1.7.6.jar}:\
+    ${file.reference.jfcunit.jar}:\
+    ${file.reference.hamcrest-core-1.3.jar}:\
+    ${file.reference.MRJToolkitStubs-1.0.jar}:\
+    ${file.reference.debug-1.0.jar}:\
+    ${file.reference.fest-assert-1.0.jar}:\
+    ${file.reference.fest-reflect-1.1.jar}:\
+    ${file.reference.fest-swing-1.1.jar}:\
+    ${file.reference.fest-util-1.0.jar}:\
+    ${file.reference.jcip-annotations-1.0.jar}:\
+    ${file.reference.commons-collections-3.2.jar}:\
+    ${file.reference.commons-lang-2.3.jar}:\
+    ${file.reference.commons-logging-1.1.jar}:\
+    ${file.reference.ognl-2.6.9.jar}:\
+    ${file.reference.unitils-core-3.4.2.jar}:\
+    ${file.reference.findbugs.jar}
 javac.test.processorpath=\
     ${javac.test.classpath}
@@ -63,13 +96,4 @@
 javadoc.version=false
 javadoc.windowtitle=
-jnlp.codebase.type=no.codebase
-jnlp.descriptor=application
-jnlp.enabled=false
-jnlp.mixed.code=default
-jnlp.offline-allowed=false
-jnlp.signed=false
-jnlp.signing=
-jnlp.signing.alias=
-jnlp.signing.keystore=
 main.class=org.openstreetmap.josm.gui.MainApplication
 manifest.file=manifest.mf
@@ -84,5 +108,6 @@
     ${build.test.classes.dir}
 source.encoding=UTF-8
-src.core.dir=${file.reference.core}
 src.dir=${file.reference.core-src}
+test.functional.dir=${file.reference.test-functional}
+test.performance.dir=${file.reference.test-performance}
 test.unit.dir=${file.reference.test-unit}