Index: trunk/test/config/preferences.template.xml
===================================================================
--- trunk/test/config/preferences.template.xml	(revision 7068)
+++ trunk/test/config/preferences.template.xml	(revision 7068)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<preferences xmlns="http://josm.openstreetmap.de/preferences-1.0">
+  <tag key='expert' value='true'/>
+  <tag key='language' value='en'/>
+  <tag key='osm-server.url' value='http://api06.dev.openstreetmap.org/api'/>
+  <tag key='osm-server.username' value='@OSM_USERNAME@'/>
+  <tag key='osm-server.password' value='@OSM_PASSWORD@'/>
+</preferences>
Index: trunk/test/config/test-functional-env.properties
===================================================================
--- trunk/test/config/test-functional-env.properties	(revision 6532)
+++ 	(revision )
@@ -1,19 +1,0 @@
-#
-# This file includes properties which are used by all JOSM functional tests 
-#
-
-#### 
-# josm.home - the home directory of the JOSM installation to be used in functional tests
-#
-# This is the home directory for JOSM preferences: ${josm.home}\preferences
-# This is the home directory for JOSM plugins: ${josm.home}\plugins\*.jar
-#
-josm.home=C:\\data\\projekte\\osm\\josm-dev
-
-
-####
-# test.functional.tempdir - the directory in which functional test case can save
-#   temporary results 
-#
-test.functional.tempdir=C:\\data\\projekte\\osm\\josm-dev\\temp
-
Index: trunk/test/config/test-unit-env.properties
===================================================================
--- trunk/test/config/test-unit-env.properties	(revision 6532)
+++ 	(revision )
@@ -1,12 +1,0 @@
-#
-# This file includes properties which are used by all JOSM unit test 
-#
-
-#### 
-# josm.home - the home directory of the JOSM installation to be used in unit tests
-#
-# This is the home directory for JOSM preferences: ${josm.home}\preferences
-# This is the home directory for JOSM plugins: ${josm.home}\plugins\*.jar
-#
-josm.home=C:\\data\\projekte\\osm\\repositories\\josm-github-Gubaer\\test\\config\\unit-josm.home
-
Index: trunk/test/config/unit-josm.home/preferences
===================================================================
--- trunk/test/config/unit-josm.home/preferences	(revision 6532)
+++ 	(revision )
@@ -1,57 +1,0 @@
-agpifoj.visible=true
-cache.motd.html=1243869814
-color.background=#FFFFFF
-color.gps marker=#660066
-color.gps point=#660066
-commandstack.visible=true
-conflict.resolution=extended
-conflict.visible=true
-conflictresolutiondialog.height=824
-conflictresolutiondialog.width=1193
-conflictresolutiondialog.x=149
-conflictresolutiondialog.y=88
-coordinates=DECIMAL_DEGREES
-download.gps=false
-download.osm=true
-download.tab=2
-draw.rawgps.direction=true
-history.visible=true
-josm.version=1627 SVN
-laf=com.sun.java.swing.plaf.windows.WindowsLookAndFeel
-language=en
-layerlist.visible=true
-marker.audiofromstart=false
-marker.buttonlabels=false
-marker.show test.osm=hide
-osm-server.url=http://api06.dev.openstreetmap.org/api
-projection=org.openstreetmap.josm.data.projection.Epsg4326
-propertiesdialog.visible=true
-proxy.anonymous=false
-proxy.enable=false
-relationlist.visible=true
-save.keepbackup=false
-selectionlist.visible=true
-shortcut.groups.1=128
-shortcut.groups.10=64
-shortcut.groups.11=576
-shortcut.groups.12=64
-shortcut.groups.13=512
-shortcut.groups.15=640
-shortcut.groups.16=640
-shortcut.groups.17=576
-shortcut.groups.18=512
-shortcut.groups.19=128
-shortcut.groups.2=128
-shortcut.groups.20=512
-shortcut.groups.3=0
-shortcut.groups.4=512
-shortcut.groups.5=0
-shortcut.groups.6=512
-shortcut.groups.8=192
-shortcut.groups.9=192
-shortcut.groups.configured=true
-slippy_map_chooser.max_tiles=200
-upload.comment.history=automatic test upload§§§test§§§rcn84 - some fixes§§§testing JOSM ticket #2545 §§§bug hunting - please ignore§§§test uploadsdf§§§test upload§§§test swissgrid
-validator.tests=OverlappingWays=true,UnconnectedWays=true,SelfIntersectingWay=true,Coastlines=true,UnclosedWays=true,UntaggedWay=true,DuplicatedWayNodes=true,CrossingWays=true,SimilarNamedWays=true,WronglyOrderedWays=true,TagChecker=true,NodesWithSameName=true,DuplicateNode=true,UntaggedNode=true
-validator.testsBeforeUpload=OverlappingWays=true,UnconnectedWays=true,SelfIntersectingWay=true,Coastlines=true,UnclosedWays=true,UntaggedWay=true,DuplicatedWayNodes=true,CrossingWays=true,SimilarNamedWays=true,WronglyOrderedWays=true,TagChecker=true,NodesWithSameName=true,DuplicateNode=true,UntaggedNode=true
-validator.visible=true